fix: tests

Reviewed-on: https://codeberg.org/uzu/strudel/pulls/1461

CONTRIBUTING.md

@@ -150,6 +150,7 @@ Important: Always publish with `pnpm`, as `npm` does not support overriding main
 
 
 ## useful commands
+
 ```sh
 #regenerate the test snapshots (ex: when updating or creating new pattern functions)
 pnpm snapshot 
@@ -160,6 +161,81 @@ pnpm run osc
 #build the standalone version
 pnpm tauri build
 ```
+
+## version tag patching
+
+here's a little guide on how to patch patterns in the database to prevent breaking old patterns due to breaking changes in newer versions.
+
+the general tactic is to use `// @version x.y` to tag a pattern with a specific strudel version. when a pattern is evaluated, this metadata will de-activate any breaking changes that came after the specified version. 
+for example, in version 1.1, the default value for `fanchor` was changed from `0.5` to `0`.
+if play a pattern that was made before that change, sounds that use filter evenlopes can sound very different, so by adding `// @version 1.0` will make it sound like it used to.
+before releasing a new version with breaking changes, we can edit all patterns in the database, inserting the version tag they were created under:
+
+as an example, to release version 1.2, do the following:
+
+1. get date range
+
+```sh
+# get date of last version:
+git log -1 --format=%aI @strudel/core@1.1.0
+# 2024-05-31T23:07:26+02:00
+
+# get date of current version:
+git log -1 --format=%aI @strudel/core@1.2.0
+# 2025-05-01T12:39:24+02:00
+# might also use todays timestamp if version is not yet released
+```
+
+now we know, all patterns between these 2 dates have to receive a version tag (unless they already have one).
+
+2. get patterns in question
+
+```sql
+SELECT *
+FROM code_v1
+WHERE code NOT LIKE '%@version%'
+AND created_at > '2024-05-31T23:07:26+02:00'
+AND created_at < '2025-05-01T12:39:24+02:00'
+ORDER BY created_at ASC;
+```
+
+this gives us all unversioned patterns that were saved between 1.1.0 and 1.2.0. in this case, it's 9373 patterns!
+
+3. insert version tags
+
+we are now ready to insert the version tag to these patterns.
+before updating thousands of patterns, it's probably a good idea to test if a single one gets udpated:
+
+```sql
+UPDATE code_v1
+SET code = code || E'\n// @version 1.1'
+WHERE hash = 'Ns2sMB40yIw4';
+```
+
+after [verifying](https://strudel.cc/?Ns2sMB40yIw4) that the version tag has been added, let's insert it everywhere:
+
+```sql
+UPDATE code_v1
+SET code = code || E'\n// @version 1.1'
+WHERE code NOT LIKE '%@version%'
+AND created_at > '2024-05-31T23:07:26+02:00'
+AND created_at < '2025-05-01T12:39:24+02:00'
+```
+
+4. verify
+
+we can verify that the edits worked by querying all patterns that contain the new version tag:
+
+```sql
+SELECT *
+FROM code_v1
+WHERE code LIKE '%@version 1.1%'
+AND created_at > '2024-05-31T23:07:26+02:00'
+AND created_at < '2025-05-01T12:39:24+02:00'
+ORDER BY created_at ASC;
+```
+
+
 ## Have Fun
 
 Remember to have fun, and that this project is driven by the passion of volunteers!

README.md

@@ -38,13 +38,7 @@ Licensing info for the default sound banks can be found over on the [dough-sampl
 
 ## Contributing
 
-There are many ways to contribute to this project! See [contribution guide](./CONTRIBUTING.md).
-
-<a href="https://codeberg.org/uzu/strudel/activity/contributors">
-  <img src="https://contrib.rocks/image?repo=tidalcycles/strudel" />
-</a>
-
-Made with [contrib.rocks](https://contrib.rocks).
+There are many ways to contribute to this project! See [contribution guide](./CONTRIBUTING.md). You can find the full list of contributors [here](https://codeberg.org/uzu/strudel/activity/contributors).
 
 ## Community
 

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:*",
@@ -74,4 +75,4 @@
     "vitest": "^3.0.4",
     "vite-plugin-bundle-audioworklet": "workspace:*"
   }
-}
+}

packages/codemirror/codemirror.mjs

@@ -1,7 +1,7 @@
 import { closeBrackets } from '@codemirror/autocomplete';
 export { toggleComment, toggleBlockComment, toggleLineComment, toggleBlockCommentByLine } from '@codemirror/commands';
 // import { search, highlightSelectionMatches } from '@codemirror/search';
-import { history } from '@codemirror/commands';
+import { history, indentWithTab } from '@codemirror/commands';
 import { javascript } from '@codemirror/lang-javascript';
 import { defaultHighlightStyle, syntaxHighlighting, bracketMatching } from '@codemirror/language';
 import { Compartment, EditorState, Prec } from '@codemirror/state';
@@ -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';
@@ -37,6 +38,14 @@ const extensions = {
   isActiveLineHighlighted: (on) => (on ? [highlightActiveLine(), highlightActiveLineGutter()] : []),
   isFlashEnabled,
   keybindings,
+  isTabIndentationEnabled: (on) => (on ? keymap.of([indentWithTab]) : []),
+  isMultiCursorEnabled: (on) =>
+    on
+      ? [
+          EditorState.allowMultipleSelections.of(true),
+          EditorView.clickAddsSelectionRange.of((ev) => ev.metaKey || ev.ctrlKey),
+        ]
+      : [],
 };
 const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [key, new Compartment()]));
 
@@ -51,6 +60,8 @@ export const defaultSettings = {
   isFlashEnabled: true,
   isTooltipEnabled: false,
   isLineWrappingEnabled: false,
+  isTabIndentationEnabled: false,
+  isMultiCursorEnabled: false,
   theme: 'strudelTheme',
   fontFamily: 'monospace',
   fontSize: 18,

packages/codemirror/keybindings.mjs

@@ -21,11 +21,11 @@ const vscodeExtension = (options) => [vscodePlugin].concat(options ?? []);
 const keymaps = {
   vim,
   emacs,
+  codemirror: () => keymap.of(defaultKeymap),
   vscode: vscodeExtension,
 };
 
 export function keybindings(name) {
   const active = keymaps[name];
-  return [keymap.of(defaultKeymap), keymap.of(historyKeymap), active ? active() : []];
-  // keymap.of(searchKeymap),
+  return [active ? active() : [], keymap.of(historyKeymap)];
 }

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/core/signal.mjs

@@ -264,7 +264,7 @@ export const randrun = (n) => {
     const rands = timeToRands(t.floor().add(0.5), n);
     const nums = rands
       .map((n, i) => [n, i])
-      .sort((a, b) => a[0] > b[0] - a[0] < b[0])
+      .sort((a, b) => (a[0] > b[0]) - (a[0] < b[0]))
       .map((x) => x[1]);
     const i = t.cyclePos().mul(n).floor() % n;
     return nums[i];

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 {
-  strudelScope,
-  reify,
-  fast,
-  slow,
-  seq,
-  stepcat,
-  extend,
-  expand,
-  pace,
-  chooseIn,
-  degradeBy,
-  silence,
-} from '@strudel/core';
+import { reify, fast, slow, seq, stepcat, extend, expand, pace, chooseIn, degradeBy, silence } from '@strudel/core';
+import { strudelScope } from '@strudel/cyclist';
 import { registerLanguage } from '@strudel/transpiler';
 import { MondoRunner } from 'mondolang';
 
@@ -42,6 +30,7 @@ lib['%'] = pace;
 lib['?'] = degradeBy; // todo: default 0.5 not working..
 lib[':'] = tail;
 lib['..'] = range;
+lib['def'] = () => silence;
 lib['or'] = (...children) => chooseIn(...children); // always has structure but is cyclewise.. e.g. "s oh*8.dec[.04 | .5]"
 //lib['or'] = (...children) => chooseOut(...children); // "s oh*8.dec[.04 | .5]" is better but "dec[.04 | .5].s oh*8" has no struct
 

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/soundfonts/gm.mjs

@@ -537,7 +537,7 @@ export default {
   ],
   gm_synth_bass_1: [
     // Synth Bass 1: Bass
-    '0380_Aspirin_sf2_file',
+    // '0380_Aspirin_sf2_file', // broken in safari https://codeberg.org/uzu/strudel/issues/1384
     '0380_Chaos_sf2_file',
     '0380_FluidR3_GM_sf2_file',
     // 0380_GeneralUserGS_sf2_file // laut

packages/superdough/superdough.mjs

@@ -126,7 +126,7 @@ export const getAudioDevices = async () => {
   return devicesMap;
 };
 
-const defaultDefaultValues = {
+let defaultDefaultValues = {
   s: 'triangle',
   gain: 0.8,
   postgain: 1,
@@ -150,6 +150,17 @@ const defaultDefaultValues = {
   fft: 8,
 };
 
+const defaultDefaultDefaultValues = Object.freeze({ ...defaultDefaultValues });
+
+export function setDefault(control, value) {
+  // const main = getControlName(control); // we cant do this because superdough is independent of strudel/core
+  defaultDefaultValues[control] = value;
+}
+
+export function resetDefaults() {
+  defaultDefaultValues = { ...defaultDefaultDefaultValues };
+}
+
 let defaultControls = new Map(Object.entries(defaultDefaultValues));
 
 export function setDefaultValue(key, value) {

packages/superdough/synth.mjs

@@ -121,7 +121,10 @@ export function registerSynthSounds() {
       const gainAdjustment = 1 / Math.sqrt(voices);
       getPitchEnvelope(o.parameters.get('detune'), value, begin, holdend);
       const vibratoOscillator = getVibratoOscillator(o.parameters.get('detune'), value, begin);
-      const fm = applyFM(o.parameters.get('frequency'), value, begin);
+      // const fm = applyFM(o.parameters.get('frequency'), value, begin);
+      // https://codeberg.org/uzu/strudel/issues/1428
+      // if you think about re-enabling this, please test with fm > 1 first
+      // it's like 10x gain, so it's really dangerous
       let envGain = gainNode(1);
       envGain = o.connect(envGain);
 
@@ -133,7 +136,7 @@ export function registerSynthSounds() {
           destroyAudioWorkletNode(o);
           envGain.disconnect();
           onended();
-          fm?.stop();
+          // fm?.stop();
           vibratoOscillator?.stop();
         },
         begin,

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/__snapshots__/examples.test.mjs.snap

@@ -8813,46 +8813,46 @@ exports[`runs examples > example "shrink" example index 3 1`] = `
 
 exports[`runs examples > example "shuffle" example index 0 1`] = `
 [
-  "[ 0/1 → 1/4 | note:c s:piano ]",
+  "[ 0/1 → 1/4 | note:e s:piano ]",
   "[ 1/4 → 1/2 | note:d s:piano ]",
-  "[ 1/2 → 3/4 | note:e s:piano ]",
-  "[ 3/4 → 1/1 | note:f s:piano ]",
-  "[ 1/1 → 5/4 | note:c s:piano ]",
-  "[ 5/4 → 3/2 | note:d s:piano ]",
-  "[ 3/2 → 7/4 | note:e s:piano ]",
-  "[ 7/4 → 2/1 | note:f s:piano ]",
-  "[ 2/1 → 9/4 | note:c s:piano ]",
-  "[ 9/4 → 5/2 | note:d s:piano ]",
+  "[ 1/2 → 3/4 | note:f s:piano ]",
+  "[ 3/4 → 1/1 | note:c s:piano ]",
+  "[ 1/1 → 5/4 | note:e s:piano ]",
+  "[ 5/4 → 3/2 | note:c s:piano ]",
+  "[ 3/2 → 7/4 | note:f s:piano ]",
+  "[ 7/4 → 2/1 | note:d s:piano ]",
+  "[ 2/1 → 9/4 | note:d s:piano ]",
+  "[ 9/4 → 5/2 | note:c s:piano ]",
   "[ 5/2 → 11/4 | note:e s:piano ]",
   "[ 11/4 → 3/1 | note:f s:piano ]",
   "[ 3/1 → 13/4 | note:c s:piano ]",
-  "[ 13/4 → 7/2 | note:d s:piano ]",
-  "[ 7/2 → 15/4 | note:e s:piano ]",
-  "[ 15/4 → 4/1 | note:f s:piano ]",
+  "[ 13/4 → 7/2 | note:e s:piano ]",
+  "[ 7/2 → 15/4 | note:f s:piano ]",
+  "[ 15/4 → 4/1 | note:d s:piano ]",
 ]
 `;
 
 exports[`runs examples > example "shuffle" example index 1 1`] = `
 [
-  "[ 0/1 → 1/8 | note:c s:piano ]",
+  "[ 0/1 → 1/8 | note:e s:piano ]",
   "[ 1/8 → 1/4 | note:d s:piano ]",
-  "[ 1/4 → 3/8 | note:e s:piano ]",
-  "[ 3/8 → 1/2 | note:f s:piano ]",
+  "[ 1/4 → 3/8 | note:f s:piano ]",
+  "[ 3/8 → 1/2 | note:c s:piano ]",
   "[ 1/2 → 1/1 | note:g s:piano ]",
-  "[ 1/1 → 9/8 | note:c s:piano ]",
-  "[ 9/8 → 5/4 | note:d s:piano ]",
-  "[ 5/4 → 11/8 | note:e s:piano ]",
-  "[ 11/8 → 3/2 | note:f s:piano ]",
+  "[ 1/1 → 9/8 | note:e s:piano ]",
+  "[ 9/8 → 5/4 | note:c s:piano ]",
+  "[ 5/4 → 11/8 | note:f s:piano ]",
+  "[ 11/8 → 3/2 | note:d s:piano ]",
   "[ 3/2 → 2/1 | note:g s:piano ]",
-  "[ 2/1 → 17/8 | note:c s:piano ]",
-  "[ 17/8 → 9/4 | note:d s:piano ]",
+  "[ 2/1 → 17/8 | note:d s:piano ]",
+  "[ 17/8 → 9/4 | note:c s:piano ]",
   "[ 9/4 → 19/8 | note:e s:piano ]",
   "[ 19/8 → 5/2 | note:f s:piano ]",
   "[ 5/2 → 3/1 | note:g s:piano ]",
   "[ 3/1 → 25/8 | note:c s:piano ]",
-  "[ 25/8 → 13/4 | note:d s:piano ]",
-  "[ 13/4 → 27/8 | note:e s:piano ]",
-  "[ 27/8 → 7/2 | note:f s:piano ]",
+  "[ 25/8 → 13/4 | note:e s:piano ]",
+  "[ 13/4 → 27/8 | note:f s:piano ]",
+  "[ 27/8 → 7/2 | note:d s:piano ]",
   "[ 7/2 → 4/1 | note:g s:piano ]",
 ]
 `;

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/pages/de/workshop/first-sounds.mdx

@@ -95,7 +95,7 @@ Diese Kombinationen von Buchstaben stehen für verschiedene Teile eines Schlagze
 - `mt` = **m**iddle tom
 - `ht` = **h**igh tom
 - `rd` = **r**i**d**e cymbal
-- `rd` = **cr**ash cymbal
+- `cr` = **cr**ash cymbal
 
 Probier verschiedene Sounds aus!
 

website/src/pages/learn/mondo-notation.mdx

@@ -176,3 +176,16 @@ $ chord <Dm9!3 Db7> # voicing
 />
 
 The `$` sign is an alias for `,` so it will create a stack behind the scenes.
+
+## variables
+
+using the `def` keyword, you can define variables:
+
+<MiniRepl
+  client:idle
+  mondo
+  tune={`
+$ def melody [0 1 2 3]
+$ n melody # scale C:minor
+`}
+/>

website/src/pages/understand/cycles.mdx

@@ -67,6 +67,8 @@ Or using 2 beats per cycle:
 s("bd sd, hh*4")`}
 />
 
+You can use the `setcps` method to set the global tempo in cycles per second. `setcpm(x)` is the same as `setcps(x / 60)`.
+
 <Box>
 
 To set a specific bpm, use `setcpm(bpm/bpc)`

website/src/repl/components/panel/SettingsTab.jsx

@@ -109,6 +109,8 @@ export function SettingsTab({ started }) {
     togglePanelTrigger,
     maxPolyphony,
     multiChannelOrbits,
+    isTabIndentationEnabled,
+    isMultiCursorEnabled,
   } = useSettings();
   const shouldAlwaysSync = isUdels();
   const canChangeAudioDevice = AudioContext.prototype.setSinkId != null;
@@ -262,6 +264,16 @@ export function SettingsTab({ started }) {
           onChange={(cbEvent) => settingsMap.setKey('isLineWrappingEnabled', cbEvent.target.checked)}
           value={isLineWrappingEnabled}
         />
+        <Checkbox
+          label="Enable Tab indentation"
+          onChange={(cbEvent) => settingsMap.setKey('isTabIndentationEnabled', cbEvent.target.checked)}
+          value={isTabIndentationEnabled}
+        />
+        <Checkbox
+          label="Enable Multi-Cursor (Cmd/Ctrl+Click)"
+          onChange={(cbEvent) => settingsMap.setKey('isMultiCursorEnabled', cbEvent.target.checked)}
+          value={isMultiCursorEnabled}
+        />
         <Checkbox
           label="Enable flashing on evaluation"
           onChange={(cbEvent) => settingsMap.setKey('isFlashEnabled', cbEvent.target.checked)}

website/src/repl/useReplContext.jsx

@@ -13,6 +13,7 @@ import {
   resetGlobalEffects,
   resetLoadedSounds,
   initAudioOnFirstClick,
+  resetDefaults,
 } from '@strudel/webaudio';
 import { setVersionDefaultsFrom } from './util.mjs';
 import { StrudelMirror, defaultSettings } from '@strudel/codemirror';
@@ -181,6 +182,7 @@ export function useReplContext() {
 
   const resetEditor = async () => {
     (await getModule('@strudel/tonal'))?.resetVoicings();
+    resetDefaults();
     resetGlobalEffects();
     clearCanvas();
     clearHydra();

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';

website/src/settings.mjs

@@ -21,6 +21,8 @@ export const defaultSettings = {
   isSyncEnabled: false,
   isLineWrappingEnabled: false,
   isPatternHighlightingEnabled: true,
+  isTabIndentationEnabled: false,
+  isMultiCursorEnabled: false,
   theme: 'strudelTheme',
   fontFamily: 'monospace',
   fontSize: 18,
@@ -77,6 +79,8 @@ export function useSettings() {
     isLineWrappingEnabled: parseBoolean(state.isLineWrappingEnabled),
     isFlashEnabled: parseBoolean(state.isFlashEnabled),
     isSyncEnabled: isUdels() ? true : parseBoolean(state.isSyncEnabled),
+    isTabIndentationEnabled: parseBoolean(state.isTabIndentationEnabled),
+    isMultiCursorEnabled: parseBoolean(state.isMultiCursorEnabled),
     fontSize: Number(state.fontSize),
     panelPosition: state.activeFooter !== '' && !isUdels() ? state.panelPosition : 'bottom', // <-- keep this 'bottom' where it is!
     isPanelPinned: parseBoolean(state.isPanelPinned),