fix: tests

package.json

@@ -48,6 +48,7 @@
   "homepage": "https://strudel.cc",
   "dependencies": {
     "@strudel/core": "workspace:*",
+    "@strudel/cyclist": "workspace:*",
     "@strudel/mini": "workspace:*",
     "@strudel/tonal": "workspace:*",
     "@strudel/transpiler": "workspace:*",

packages/codemirror/codemirror.mjs

@@ -13,7 +13,8 @@ import {
   lineNumbers,
   drawSelection,
 } from '@codemirror/view';
-import { repl, registerControl } from '@strudel/core';
+import { registerControl } from '@strudel/core';
+import { repl } from '@strudel/cyclist';
 import { Drawer, cleanupDraw } from '@strudel/draw';
 import { isAutoCompletionEnabled } from './autocomplete.mjs';
 import { isTooltipEnabled } from './tooltip.mjs';

packages/codemirror/package.json

@@ -45,6 +45,7 @@
     "@replit/codemirror-vim": "^6.2.1",
     "@replit/codemirror-vscode-keymap": "^6.0.2",
     "@strudel/core": "workspace:*",
+    "@strudel/cyclist": "workspace:*",
     "@strudel/draw": "workspace:*",
     "@strudel/transpiler": "workspace:*",
     "nanostores": "^0.11.3"

packages/core/index.mjs

@@ -7,9 +7,8 @@ This program is free software: you can redistribute it and/or modify it under th
 import * as controls from './controls.mjs'; // legacy
 export * from './euclid.mjs';
 import Fraction from './fraction.mjs';
-import createClock from './zyklus.mjs';
 import { logger } from './logger.mjs';
-export { Fraction, controls, createClock };
+export { Fraction, controls };
 export * from './controls.mjs';
 export * from './hap.mjs';
 export * from './pattern.mjs';
@@ -18,13 +17,7 @@ export * from './pick.mjs';
 export * from './state.mjs';
 export * from './timespan.mjs';
 export * from './util.mjs';
-export * from './speak.mjs';
-export * from './evaluate.mjs';
-export * from './repl.mjs';
-export * from './cyclist.mjs';
 export * from './logger.mjs';
-export * from './time.mjs';
-export * from './ui.mjs';
 export { default as drawLine } from './drawLine.mjs';
 // below won't work with runtime.mjs (json import fails)
 /* import * as p from './package.json';

packages/cyclist/cyclist.mjs

@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import createClock from './zyklus.mjs';
-import { logger } from './logger.mjs';
+import { logger } from '@strudel/core';
 
 export class Cyclist {
   constructor({

packages/cyclist/index.mjs

@@ -0,0 +1,8 @@
+export * from './speak.mjs';
+export * from './evaluate.mjs';
+export * from './repl.mjs';
+export * from './cyclist.mjs';
+export * from './time.mjs';
+export * from './ui.mjs';
+import createClock from './zyklus.mjs';
+export { createClock };

packages/cyclist/logger.mjs

@@ -0,0 +1,28 @@
+export const logKey = 'strudel.log';
+
+let debounce = 1000,
+  lastMessage,
+  lastTime;
+
+export function logger(message, type, data = {}) {
+  let t = performance.now();
+  if (lastMessage === message && t - lastTime < debounce) {
+    return;
+  }
+  lastMessage = message;
+  lastTime = t;
+  console.log(`%c${message}`, 'background-color: black;color:white;border-radius:15px');
+  if (typeof document !== 'undefined' && typeof CustomEvent !== 'undefined') {
+    document.dispatchEvent(
+      new CustomEvent(logKey, {
+        detail: {
+          message,
+          type,
+          data,
+        },
+      }),
+    );
+  }
+}
+
+logger.key = logKey;

packages/cyclist/neocyclist.mjs

@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { logger } from './logger.mjs';
-import { ClockCollator, cycleToSeconds } from './util.mjs';
+import { ClockCollator, cycleToSeconds } from '@strudel/core';
 
 export class NeoCyclist {
   constructor({ onTrigger, onToggle, getTime }) {

packages/cyclist/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "@strudel/cyclist",
+  "version": "1.2.2",
+  "description": "Event Scheduler for Strudel",
+  "main": "index.mjs",
+  "type": "module",
+  "publishConfig": {
+    "main": "dist/index.mjs"
+  },
+  "scripts": {
+    "test": "vitest run",
+    "bench": "vitest bench",
+    "build": "vite build",
+    "prepublishOnly": "pnpm build"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://codeberg.org/uzu/strudel.git"
+  },
+  "keywords": [
+    "tidalcycles",
+    "strudel",
+    "pattern",
+    "livecoding",
+    "algorave"
+  ],
+  "author": "Alex McLean <alex@slab.org> (https://slab.org)",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://codeberg.org/uzu/strudel/issues"
+  },
+  "homepage": "https://strudel.cc",
+  "dependencies": {
+    "@strudel/core": "*"
+  },
+  "devDependencies": {
+    "vite": "^6.0.11",
+    "vitest": "^3.0.4"
+  }
+}

packages/cyclist/repl.mjs

@@ -4,7 +4,7 @@ import { evaluate as _evaluate } from './evaluate.mjs';
 import { logger } from './logger.mjs';
 import { setTime } from './time.mjs';
 import { evalScope } from './evaluate.mjs';
-import { register, Pattern, isPattern, silence, stack } from './pattern.mjs';
+import { register, Pattern, isPattern, silence, stack } from '@strudel/core';
 
 export function repl({
   defaultOutput,

packages/cyclist/speak.mjs

@@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { register } from './index.mjs';
+import { register } from '@strudel/core';
 
 let synth;
 try {

packages/cyclist/vite.config.js

@@ -0,0 +1,20 @@
+import { defineConfig } from 'vite';
+import { dependencies } from './package.json';
+import { resolve } from 'path';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  base: './',
+  plugins: [],
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'index.mjs'),
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
+    },
+    rollupOptions: {
+      external: [...Object.keys(dependencies)],
+    },
+    target: 'esnext',
+  },
+});

packages/draw/draw.mjs

@@ -4,7 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern, getTime, State, TimeSpan } from '@strudel/core';
+import { Pattern, State, TimeSpan } from '@strudel/core';
+import { getTime } from '@strudel/cyclist';
 
 export const getDrawContext = (id = 'test-canvas', options) => {
   let { contextType = '2d', pixelated = false, pixelRatio = window.devicePixelRatio } = options || {};

packages/draw/package.json

@@ -29,7 +29,8 @@
   },
   "homepage": "https://codeberg.org/uzu/strudel#readme",
   "dependencies": {
-    "@strudel/core": "workspace:*"
+    "@strudel/core": "workspace:*",
+    "@strudel/cyclist": "workspace:*"
   },
   "devDependencies": {
     "vite": "^6.0.11"

packages/hydra/hydra.mjs

@@ -1,5 +1,6 @@
 import { getDrawContext } from '@strudel/draw';
-import { controls, getTime, reify } from '@strudel/core';
+import { controls, reify } from '@strudel/core';
+import { getTime } from '@strudel/cyclist';
 
 let latestOptions;
 let hydra;

packages/hydra/package.json

@@ -34,6 +34,7 @@
   "homepage": "https://codeberg.org/uzu/strudel#readme",
   "dependencies": {
     "@strudel/core": "workspace:*",
+    "@strudel/cyclist": "workspace:*",
     "@strudel/draw": "workspace:*",
     "hydra-synth": "^1.3.29"
   },

packages/mondough/mondough.mjs

@@ -1,17 +1,5 @@
-import {
+import { reify, fast, slow, seq, stepcat, extend, expand, pace, chooseIn, degradeBy, silence } from '@strudel/core';
-  strudelScope,
+import { strudelScope } from '@strudel/cyclist';
-  reify,
-  fast,
-  slow,
-  seq,
-  stepcat,
-  extend,
-  expand,
-  pace,
-  chooseIn,
-  degradeBy,
-  silence,
-} from '@strudel/core';
 import { registerLanguage } from '@strudel/transpiler';
 import { MondoRunner } from 'mondolang';
 

packages/mondough/package.json

@@ -33,6 +33,7 @@
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
     "@strudel/core": "workspace:*",
+    "@strudel/cyclist": "workspace:*",
     "@strudel/transpiler": "workspace:*",
     "mondolang": "workspace:*"
   },

packages/osc/server.js

@@ -17,7 +17,7 @@ const config = {
   },
   udpClient: {
     host: 'localhost', // @param {string} Hostname of udp client for messaging
-    port: 57120, // @param {number} Port of udp client for messaging
+    port: 7771, // @param {number} Port of udp client for messaging
   },
   wsServer: {
     host: 'localhost', // @param {string} Hostname of WebSocket server

packages/transpiler/index.mjs

@@ -1,4 +1,4 @@
-import { evaluate as _evaluate } from '@strudel/core';
+import { evaluate as _evaluate } from '@strudel/cyclist';
 import { transpiler } from './transpiler.mjs';
 export * from './transpiler.mjs';
 

packages/transpiler/package.json

@@ -31,6 +31,7 @@
   "homepage": "https://codeberg.org/uzu/strudel#readme",
   "dependencies": {
     "@strudel/core": "workspace:*",
+    "@strudel/cyclist": "workspace:*",
     "@strudel/mini": "workspace:*",
     "acorn": "^8.14.0",
     "escodegen": "^2.1.0",

pnpm-lock.yaml

@@ -11,6 +11,9 @@ importers:
       '@strudel/core':
         specifier: workspace:*
         version: link:packages/core
+      '@strudel/cyclist':
+        specifier: workspace:*
+        version: link:packages/cyclist
       '@strudel/mini':
         specifier: workspace:*
         version: link:packages/mini
@@ -209,6 +212,9 @@ importers:
       '@strudel/core':
         specifier: workspace:*
         version: link:../core
+      '@strudel/cyclist':
+        specifier: workspace:*
+        version: link:../cyclist
       '@strudel/draw':
         specifier: workspace:*
         version: link:../draw
@@ -252,6 +258,19 @@ importers:
         specifier: ^6.0.11
         version: 6.0.11(@types/node@22.10.10)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
 
+  packages/cyclist:
+    dependencies:
+      '@strudel/core':
+        specifier: '*'
+        version: 1.2.2
+    devDependencies:
+      vite:
+        specifier: ^6.0.11
+        version: 6.0.11(@types/node@22.10.10)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
+      vitest:
+        specifier: ^3.0.4
+        version: 3.0.4(@types/debug@4.1.12)(@types/node@22.10.10)(@vitest/ui@3.0.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
+
   packages/desktopbridge:
     dependencies:
       '@strudel/core':
@@ -266,6 +285,9 @@ importers:
       '@strudel/core':
         specifier: workspace:*
         version: link:../core
+      '@strudel/cyclist':
+        specifier: workspace:*
+        version: link:../cyclist
     devDependencies:
       vite:
         specifier: ^6.0.11
@@ -301,6 +323,9 @@ importers:
       '@strudel/core':
         specifier: workspace:*
         version: link:../core
+      '@strudel/cyclist':
+        specifier: workspace:*
+        version: link:../cyclist
       '@strudel/draw':
         specifier: workspace:*
         version: link:../draw
@@ -361,6 +386,9 @@ importers:
       '@strudel/core':
         specifier: workspace:*
         version: link:../core
+      '@strudel/cyclist':
+        specifier: workspace:*
+        version: link:../cyclist
       '@strudel/transpiler':
         specifier: workspace:*
         version: link:../transpiler
@@ -560,6 +588,9 @@ importers:
       '@strudel/core':
         specifier: workspace:*
         version: link:../core
+      '@strudel/cyclist':
+        specifier: workspace:*
+        version: link:../cyclist
       '@strudel/mini':
         specifier: workspace:*
         version: link:../mini
@@ -696,6 +727,9 @@ importers:
       '@strudel/csound':
         specifier: workspace:*
         version: link:../packages/csound
+      '@strudel/cyclist':
+        specifier: workspace:*
+        version: link:../packages/cyclist
       '@strudel/desktopbridge':
         specifier: workspace:*
         version: link:../packages/desktopbridge
@@ -2453,6 +2487,9 @@ packages:
   '@sinclair/typebox@0.27.8':
     resolution: {integrity: sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==}
 
+  '@strudel/core@1.2.2':
+    resolution: {integrity: sha512-rPFAwV7Emz85HyKwfVVn+2cNOHCGBbWw6XImv0elnzRiXxKWMdmZfuSL3xgpheEg9WUgacgmzJL9kbvfCitGtA==}
+
   '@supabase/auth-js@2.67.3':
     resolution: {integrity: sha512-NJDaW8yXs49xMvWVOkSIr8j46jf+tYHV0wHhrwOaLLMZSFO4g6kKAf+MfzQ2RaD06OCUkUHIzctLAxjTgEVpzw==}
 
@@ -7657,6 +7694,7 @@ packages:
 
   workbox-google-analytics@7.0.0:
     resolution: {integrity: sha512-MEYM1JTn/qiC3DbpvP2BVhyIH+dV/5BjHk756u9VbwuAhu0QHyKscTnisQuz21lfRpOwiS9z4XdqeVAKol0bzg==}
+    deprecated: It is not compatible with newer versions of GA starting with v4, as long as you are using GAv3 it should be ok, but the package is not longer being maintained
 
   workbox-navigation-preload@7.0.0:
     resolution: {integrity: sha512-juWCSrxo/fiMz3RsvDspeSLGmbgC0U9tKqcUPZBCf35s64wlaLXyn2KdHHXVQrb2cqF7I0Hc9siQalainmnXJA==}
@@ -9808,6 +9846,10 @@ snapshots:
 
   '@sinclair/typebox@0.27.8': {}
 
+  '@strudel/core@1.2.2':
+    dependencies:
+      fraction.js: 5.2.1
+
   '@supabase/auth-js@2.67.3':
     dependencies:
       '@supabase/node-fetch': 2.6.15

test/runtime.mjs

@@ -4,7 +4,7 @@
 
 // import * as tunes from './tunes.mjs';
 import { evaluate } from '@strudel/transpiler';
-import { evalScope } from '@strudel/core';
+import { evalScope } from '@strudel/cyclist';
 import * as strudel from '@strudel/core';
 import * as webaudio from '@strudel/webaudio';
 // import gist from '@strudel/core/gist.js';

website/package.json

@@ -26,6 +26,7 @@
     "@nanostores/react": "^0.8.4",
     "@strudel/codemirror": "workspace:*",
     "@strudel/core": "workspace:*",
+    "@strudel/cyclist": "workspace:*",
     "@strudel/csound": "workspace:*",
     "@strudel/desktopbridge": "workspace:*",
     "@strudel/draw": "workspace:*",

website/src/repl/util.mjs

@@ -1,4 +1,5 @@
-import { evalScope, hash2code, logger } from '@strudel/core';
+import { hash2code, logger } from '@strudel/core';
+import { evalScope } from '@strudel/cyclist';
 import { settingPatterns } from '../settings.mjs';
 import { setVersionDefaults } from '@strudel/webaudio';
 import { getMetadata } from '../metadata_parser';