Merge branch 'main' into glossing/optimizations

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

.nvmrc

@@ -0,0 +1 @@
+22

README.md

@@ -13,7 +13,7 @@ https://strudel.cc/
 
 After cloning the project, you can run the REPL locally:
 
-1. Install [Node.js](https://nodejs.org/)
+1. Install [Node.js](https://nodejs.org/) 18 or newer
 2. Install [pnpm](https://pnpm.io/installation)
 3. Install dependencies by running the following command:
    ```bash

examples/codemirror-repl/package.json

@@ -20,5 +20,8 @@
     "@strudel/tonal": "workspace:*",
     "@strudel/transpiler": "workspace:*",
     "@strudel/webaudio": "workspace:*"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

examples/headless-repl/package.json

@@ -14,5 +14,8 @@
   },
   "dependencies": {
     "@strudel/web": "workspace:*"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

examples/minimal-repl/package.json

@@ -18,5 +18,8 @@
     "@strudel/transpiler": "workspace:*",
     "@strudel/webaudio": "workspace:*",
     "@strudel/tonal": "workspace:*"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

examples/superdough/package.json

@@ -13,5 +13,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

examples/tidal-repl/package.json

@@ -32,5 +32,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

package.json

@@ -73,5 +73,8 @@
     "prettier": "^3.4.2",
     "vitest": "^3.0.4",
     "vite-plugin-bundle-audioworklet": "workspace:*"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
-}
+}

packages/codemirror/package.json

@@ -54,5 +54,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/core/controls.mjs

@@ -1288,6 +1288,151 @@ export const { fanchor } = registerControl('fanchor');
  */
 // currently an alias of 'hcutoff' https://codeberg.org/uzu/strudel/issues/496
 // ['hpf'],
+
+/**
+ * Rate of the LFO for the lowpass filter
+ *
+ * @name lprate
+ * @param {number | Pattern} rate rate in hertz
+ */
+export const { lprate } = registerControl('lprate');
+
+/**
+ * Cycle-synced rate of the LFO for the lowpass filter
+ *
+ * @name lpsync
+ * @param {number | Pattern} rate rate in cycles
+ */
+export const { lpsync } = registerControl('lpsync');
+
+/**
+ * Depth of the LFO for the lowpass filter
+ *
+ * @name lpdepth
+ * @param {number | Pattern} depth depth of modulation
+ */
+export const { lpdepth } = registerControl('lpdepth');
+
+/**
+ * Shape of the LFO for the lowpass filter
+ *
+ * @name lpshape
+ * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
+ */
+export const { lpshape } = registerControl('lpshape');
+
+/**
+ * DC offset of the LFO for the lowpass filter
+ *
+ * @name lpdc
+ * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
+ */
+export const { lpdc } = registerControl('lpdc');
+
+/**
+ * Skew of the LFO for the lowpass filter
+ *
+ * @name lpskew
+ * @param {number | Pattern} skew How much to bend the LFO shape
+ */
+export const { lpskew } = registerControl('lpskew');
+
+/**
+ * Rate of the LFO for the bandpass filter
+ *
+ * @name bprate
+ * @param {number | Pattern} rate rate in hertz
+ */
+export const { bprate } = registerControl('bprate');
+
+/**
+ * Cycle-synced rate of the LFO for the bandpass filter
+ *
+ * @name bpsync
+ * @param {number | Pattern} rate rate in cycles
+ */
+export const { bpsync } = registerControl('bpsync');
+
+/**
+ * Depth of the LFO for the bandpass filter
+ *
+ * @name bpdepth
+ * @param {number | Pattern} depth depth of modulation
+ */
+export const { bpdepth } = registerControl('bpdepth');
+
+/**
+ * Shape of the LFO for the bandpass filter
+ *
+ * @name bpshape
+ * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
+ */
+export const { bpshape } = registerControl('bpshape');
+
+/**
+ * DC offset of the LFO for the bandpass filter
+ *
+ * @name bpdc
+ * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
+ */
+export const { bpdc } = registerControl('bpdc');
+
+/**
+ * Skew of the LFO for the bandpass filter
+ *
+ * @name bpskew
+ * @param {number | Pattern} skew How much to bend the LFO shape
+ */
+export const { bpskew } = registerControl('bpskew');
+
+/**
+ * Rate of the LFO for the highpass filter
+ *
+ * @name hprate
+ * @param {number | Pattern} rate rate in hertz
+ */
+export const { hprate } = registerControl('hprate');
+
+/**
+ * Cycle-synced rate of the LFO for the highpass filter
+ *
+ * @name hpsync
+ * @param {number | Pattern} rate rate in cycles
+ */
+export const { hpsync } = registerControl('hpsync');
+
+/**
+ * Depth of the LFO for the highpass filter
+ *
+ * @name hpdepth
+ * @param {number | Pattern} depth depth of modulation
+ */
+export const { hpdepth } = registerControl('hpdepth');
+
+/**
+ * Shape of the LFO for the highpass filter
+ *
+ * @name hpshape
+ * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
+ */
+export const { hpshape } = registerControl('hpshape');
+
+/**
+ * DC offset of the LFO for the highpass filter
+ *
+ * @name hpdc
+ * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
+ */
+export const { hpdc } = registerControl('hpdc');
+
+/**
+ * Skew of the LFO for the highpass filter
+ *
+ * @name hpskew
+ * @param {number | Pattern} skew How much to bend the LFO shape
+ */
+export const { hpskew } = registerControl('hpskew');
+
 /**
  * Applies a vibrato to the frequency of the oscillator.
  *

packages/core/package.json

@@ -37,5 +37,8 @@
   "devDependencies": {
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/csound/package.json

@@ -38,5 +38,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/desktopbridge/package.json

@@ -25,5 +25,8 @@
     "@strudel/core": "workspace:*",
     "@tauri-apps/api": "^2.2.0"
   },
-  "homepage": "https://codeberg.org/uzu/strudel#readme"
+  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "engines": {
+    "node": ">=18.0.0"
+  }
 }

packages/draw/package.json

@@ -33,5 +33,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/embed/package.json

@@ -20,5 +20,8 @@
   "bugs": {
     "url": "https://codeberg.org/uzu/strudel/issues"
   },
-  "homepage": "https://codeberg.org/uzu/strudel#readme"
+  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "engines": {
+    "node": ">=18.0.0"
+  }
 }

packages/gamepad/package.json

@@ -33,5 +33,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/hs2js/package.json

@@ -34,5 +34,8 @@
   "devDependencies": {
     "tree-sitter-haskell": "^0.23.1",
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/hydra/package.json

@@ -40,5 +40,8 @@
   "devDependencies": {
     "pkg": "^5.8.1",
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/midi/package.json

@@ -35,5 +35,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/mini/package.json

@@ -38,5 +38,8 @@
     "peggy": "^4.2.0",
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/mondo/package.json

@@ -33,5 +33,8 @@
   "devDependencies": {
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/mondough/package.json

@@ -40,5 +40,8 @@
     "mondo": "*",
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/motion/package.json

@@ -33,5 +33,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/mqtt/package.json

@@ -34,5 +34,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/osc/package.json

@@ -44,5 +44,8 @@
   "devDependencies": {
     "pkg": "^5.8.1",
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/reference/package.json

@@ -33,5 +33,8 @@
   "homepage": "https://codeberg.org/uzu/strudel#readme",
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/repl/package.json

@@ -48,5 +48,8 @@
     "@rollup/plugin-replace": "^6.0.2",
     "vite": "^6.0.11",
     "vite-plugin-bundle-audioworklet": "workspace:*"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/sampler/package.json

@@ -15,5 +15,8 @@
   "type": "module",
   "dependencies": {
     "cowsay": "^1.6.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/serial/package.json

@@ -33,5 +33,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/soundfonts/package.json

@@ -37,5 +37,8 @@
   "devDependencies": {
     "node-fetch": "^3.3.2",
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/superdough/helpers.mjs

@@ -154,6 +154,24 @@ export const getADSRValues = (params, curve = 'linear', defaultValues) => {
   return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)];
 };
 
+export function getParamLfo(audioContext, param, start, end, lfoValues) {
+  let { defaultDepth = 1, depth, dcoffset, ...getLfoInputs } = lfoValues;
+  if (depth == null) {
+    const hasLFOParams = Object.values(getLfoInputs).some((v) => v != null);
+    depth = hasLFOParams ? defaultDepth : 0;
+  }
+  let lfo;
+  if (depth) {
+    lfo = getLfo(audioContext, start, end, {
+      depth,
+      dcoffset,
+      ...getLfoInputs,
+    });
+    lfo.connect(param);
+  }
+  return lfo;
+}
+
 // helper utility for applying standard modulators to a parameter
 export function applyParameterModulators(audioContext, param, start, end, envelopeValues, lfoValues) {
   let { amount, offset, defaultAmount = 1, curve = 'linear', values, holdEnd, defaultValues } = envelopeValues;
@@ -170,55 +188,58 @@ export function applyParameterModulators(audioContext, param, start, end, envelo
     const [attack, decay, sustain, release] = getADSRValues(values, curve, defaultValues);
     getParamADSR(param, attack, decay, sustain, release, min, max, start, holdEnd, curve);
   }
-  let lfo;
+  const lfo = getParamLfo(audioContext, param, start, end, lfoValues);
-  let { defaultDepth = 1, depth, dcoffset, ...getLfoInputs } = lfoValues;
-
-  if (depth == null) {
-    const hasLFOParams = Object.values(getLfoInputs).some((v) => v != null);
-    depth = hasLFOParams ? defaultDepth : 0;
-  }
-  if (depth) {
-    lfo = getLfo(audioContext, start, end, {
-      depth,
-      dcoffset,
-      ...getLfoInputs,
-    });
-    lfo.connect(param);
-  }
-
   return { lfo, disconnect: () => lfo?.disconnect() };
 }
 
-export function createFilter(context, type, frequency, Q, att, dec, sus, rel, fenv, start, end, fanchor, model, drive) {
+export function createFilter(context, start, end, params, cps) {
-  const curve = 'exponential';
+  let {
-  const [attack, decay, sustain, release] = getADSRValues([att, dec, sus, rel], curve, [0.005, 0.14, 0, 0.1]);
+    frequency,
-  let filter;
+    anchor,
-  let frequencyParam;
+    env,
+    type,
+    model,
+    q = 1,
+    drive = 0.69,
+    depth,
+    dcoffset = -0.5,
+    skew,
+    shape,
+    rate,
+    sync,
+  } = params;
+  let frequencyParam, filter;
   if (model === 'ladder') {
-    filter = getWorklet(context, 'ladder-processor', { frequency, q: Q, drive });
+    filter = getWorklet(context, 'ladder-processor', { frequency, q, drive });
     frequencyParam = filter.parameters.get('frequency');
   } else {
     filter = context.createBiquadFilter();
     filter.type = type;
-    filter.Q.value = Q;
+    filter.Q.value = q;
     filter.frequency.value = frequency;
     frequencyParam = filter.frequency;
   }
-
+  const envelopeValues = [params.attack, params.decay, params.sustain, params.release];
+  const [attack, decay, sustain, release] = getADSRValues(envelopeValues, 'exponential', [0.005, 0.14, 0, 0.1]);
   // envelope is active when any of these values is set
-  const hasEnvelope = att ?? dec ?? sus ?? rel ?? fenv;
+  const hasEnvelope = [...envelopeValues, env].some((v) => v !== undefined);
   // Apply ADSR to filter frequency
-  if (hasEnvelope !== undefined) {
+  if (hasEnvelope) {
-    fenv = nanFallback(fenv, 1, true);
+    env = nanFallback(env, 1, true);
-    fanchor = nanFallback(fanchor, 0, true);
+    anchor = nanFallback(anchor, 0, true);
-    const fenvAbs = Math.abs(fenv);
+    const envAbs = Math.abs(env);
-    const offset = fenvAbs * fanchor;
+    const offset = envAbs * anchor;
     let min = clamp(2 ** -offset * frequency, 0, 20000);
-    let max = clamp(2 ** (fenvAbs - offset) * frequency, 0, 20000);
+    let max = clamp(2 ** (envAbs - offset) * frequency, 0, 20000);
-    if (fenv < 0) [min, max] = [max, min];
+    if (env < 0) [min, max] = [max, min];
-    getParamADSR(frequencyParam, attack, decay, sustain, release, min, max, start, end, curve);
+    getParamADSR(frequencyParam, attack, decay, sustain, release, min, max, start, end, 'exponential');
-    return filter;
   }
+
+  if (sync != null) {
+    rate = cps * sync;
+  }
+  const lfoValues = { depth, dcoffset, skew, shape, frequency: rate };
+  getParamLfo(context, frequencyParam, start, end, lfoValues);
   return filter;
 }
 

packages/superdough/package.json

@@ -37,5 +37,8 @@
   },
   "dependencies": {
     "nanostores": "^0.11.3"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/superdough/reverbGen.mjs

@@ -104,6 +104,8 @@ var applyGradualLowpass = function (input, lpFreqStart, lpFreqEnd, lpFreqEndAt,
   player.start();
   context.oncomplete = function (event) {
     callback(event.renderedBuffer);
+    filter.disconnect();
+    player.disconnect();
   };
   context.startRendering();
 

packages/superdough/superdough.mjs

@@ -7,7 +7,7 @@ This program is free software: you can redistribute it and/or modify it under th
 import './feedbackdelay.mjs';
 import './reverb.mjs';
 import './vowel.mjs';
-import { nanFallback, _mod, cycleToSeconds } from './util.mjs';
+import { nanFallback, _mod, cycleToSeconds, pickAndRename } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
 import { createFilter, gainNode, getCompressor, getDistortion, getLfo, getWorklet, effectSend } from './helpers.mjs';
 import { map } from 'nanostores';
@@ -146,11 +146,6 @@ let defaultDefaultValues = {
   gain: 0.8,
   postgain: 1,
   density: '.03',
-  ftype: '12db',
-  fanchor: 0,
-  resonance: 1,
-  hresonance: 1,
-  bandq: 1,
   channels: [1, 2],
   phaserdepth: 0.75,
   shapevol: 1,
@@ -415,32 +410,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     djf,
     // filters
     fanchor = getDefaultValue('fanchor'),
-    drive = 0.69,
     release = 0,
-    // low pass
-    cutoff,
-    lpenv,
-    lpattack,
-    lpdecay,
-    lpsustain,
-    lprelease,
-    resonance = getDefaultValue('resonance'),
-    // high pass
-    hpenv,
-    hcutoff,
-    hpattack,
-    hpdecay,
-    hpsustain,
-    hprelease,
-    hresonance = getDefaultValue('hresonance'),
-    // band pass
-    bpenv,
-    bandf,
-    bpattack,
-    bpdecay,
-    bpsustain,
-    bprelease,
-    bandq = getDefaultValue('bandq'),
 
     //phaser
     phaserrate: phaser,
@@ -511,7 +481,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   // oldest audio nodes will be destroyed if maximum polyphony is exceeded
   for (let i = 0; i <= activeSoundSources.size - maxPolyphony; i++) {
     const ch = activeSoundSources.entries().next();
-    const source = ch.value[1];
+    const source = ch.value[1].deref();
     const chainID = ch.value[0];
     const endTime = t + 0.25;
     source?.node?.gain?.linearRampToValueAtTime(0, endTime);
@@ -543,7 +513,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
 
     if (soundHandle) {
       sourceNode = soundHandle.node;
-      activeSoundSources.set(chainID, soundHandle);
+      activeSoundSources.set(chainID, new WeakRef(soundHandle)); // allow GC
     }
   } else {
     throw new Error(`sound ${s} not found! Is it loaded?`);
@@ -565,57 +535,87 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   // gain stage
   chain.push(gainNode(gain));
 
-  //filter
+  // filter
   const ftype = getFilterType(value.ftype);
-  if (cutoff !== undefined) {
+
-    let lp = () =>
+  if (value.cutoff !== undefined) {
-      createFilter(
+    const lpMap = {
-        ac,
+      frequency: 'cutoff',
-        'lowpass',
+      q: 'resonance',
-        cutoff,
+      attack: 'lpattack',
-        resonance,
+      decay: 'lpdecay',
-        lpattack,
+      sustain: 'lpsustain',
-        lpdecay,
+      release: 'lprelease',
-        lpsustain,
+      env: 'lpenv',
-        lprelease,
+      anchor: 'fanchor',
-        lpenv,
+      model: 'ftype',
-        t,
+      drive: 'drive',
-        end,
+      rate: 'lprate',
-        fanchor,
+      sync: 'lpsync',
-        ftype,
+      depth: 'lpdepth',
-        drive,
+      shape: 'lpshape',
-      );
+      dcoffset: 'lpdc',
+      skew: 'lpskew',
+    };
+    const lpParams = pickAndRename(value, lpMap);
+    lpParams.type = 'lowpass';
+    let lp = () => createFilter(ac, t, end, lpParams, cps);
     chain.push(lp());
     if (ftype === '24db') {
       chain.push(lp());
     }
   }
 
-  if (hcutoff !== undefined) {
+  if (value.hcutoff !== undefined) {
-    let hp = () =>
+    const hpMap = {
-      createFilter(
+      frequency: 'hcutoff',
-        ac,
+      q: 'hresonance',
-        'highpass',
+      attack: 'hpattack',
-        hcutoff,
+      decay: 'hpdecay',
-        hresonance,
+      sustain: 'hpsustain',
-        hpattack,
+      release: 'hprelease',
-        hpdecay,
+      env: 'hpenv',
-        hpsustain,
+      anchor: 'fanchor',
-        hprelease,
+      model: 'ftype',
-        hpenv,
+      drive: 'drive',
-        t,
+      rate: 'hprate',
-        end,
+      sync: 'hpsync',
-        fanchor,
+      depth: 'hpdepth',
-      );
+      shape: 'hpshape',
+      dcoffset: 'hpdc',
+      skew: 'hpskew',
+    };
+    const hpParams = pickAndRename(value, hpMap);
+    hpParams.type = 'highpass';
+    let hp = () => createFilter(ac, t, end, hpParams, cps);
     chain.push(hp());
     if (ftype === '24db') {
       chain.push(hp());
     }
   }
 
-  if (bandf !== undefined) {
+  if (value.bandf !== undefined) {
-    let bp = () =>
+    const bpMap = {
-      createFilter(ac, 'bandpass', bandf, bandq, bpattack, bpdecay, bpsustain, bprelease, bpenv, t, end, fanchor);
+      frequency: 'bandf',
+      q: 'bandq',
+      attack: 'bpattack',
+      decay: 'bpdecay',
+      sustain: 'bpsustain',
+      release: 'bprelease',
+      env: 'bpenv',
+      anchor: 'fanchor',
+      model: 'ftype',
+      drive: 'drive',
+      rate: 'bprate',
+      sync: 'bpsync',
+      depth: 'bpdepth',
+      shape: 'bpshape',
+      dcoffset: 'bpdc',
+      skew: 'bpskew',
+    };
+    const bpParams = pickAndRename(value, bpMap);
+    bpParams.type = 'bandpass';
+    let bp = () => createFilter(ac, t, end, bpParams, cps);
     chain.push(bp());
     if (ftype === '24db') {
       chain.push(bp());
@@ -708,7 +708,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
       roomIR = await loadBuffer(url, ac, ir, 0);
     }
     orbitBus.getReverb(roomsize, roomfade, roomlp, roomdim, roomIR, irspeed, irbegin);
-    orbitBus.sendReverb(post, room);
+    const send = orbitBus.sendReverb(post, room);
+    audioNodes.push(send);
   }
 
   if (djf != null) {

packages/superdough/superdoughoutput.mjs

@@ -78,7 +78,7 @@ export class Orbit {
     return this.reverbNode;
   }
   sendReverb(node, amount) {
-    effectSend(node, this.reverbNode, amount);
+    return effectSend(node, this.reverbNode, amount);
   }
 
   sendDelay(node, amount) {

packages/superdough/util.mjs

@@ -109,3 +109,8 @@ export function getCommonSampleInfo(hapValue, bank) {
   const label = `${s}:${index}`;
   return { transpose, url, index, midi, label };
 }
+
+/** Selects entries from `source` and renames them via `map` */
+export const pickAndRename = (source, map) => {
+  return Object.fromEntries(Object.entries(map).map(([newKey, oldKey]) => [newKey, source[oldKey]]));
+};

packages/superdough/worklets.mjs

@@ -6,51 +6,57 @@ import OLAProcessor from './ola-processor';
 import FFT from './fft.js';
 import { getDistortionAlgorithm } from './helpers.mjs';
 
+const blockSize = 128;
+const PI = Math.PI;
+const TWO_PI = 2 * PI;
+const INVSR = 1 / sampleRate;
+
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const mod = (n, m) => ((n % m) + m) % m;
 const lerp = (a, b, n) => n * (b - a) + a;
 const pv = (arr, n) => arr[n] ?? arr[0];
 const frac = (x) => x - Math.floor(x);
-const ffloor = (x) => x | 0; // fast floor for non-negative
 
-const getUnisonDetune = (unison, detune, voiceIndex) => {
+// Fast integer ops for non-negative values
-  if (unison < 2) {
+const ffloor = (x) => x | 0;
-    return 0;
+const fround = (x) => ffloor(x + 0.5);
-  }
+const fceil = (x) => ffloor(x + 1);
-  return lerp(-detune * 0.5, detune * 0.5, voiceIndex / (unison - 1));
+const ffrac = (x) => x - ffloor(x);
+
+const fast_tanh = (x) => {
+  const x2 = x ** 2;
+  return (x * (27.0 + x2)) / (27.0 + 9.0 * x2);
 };
+
+// Optimized per-voice detuner which precomputes constants
+const getDetuner = (unison, detune) => {
+  if (unison < 2) {
+    return (_voiceIdx) => 0;
+  }
+  const scale = detune / (unison - 1);
+  const center = detune * 0.5;
+  return (voiceIdx) => voiceIdx * scale - center;
+};
+
 const applySemitoneDetuneToFrequency = (frequency, detune) => {
   return frequency * Math.pow(2, detune / 12);
 };
 
-// Restrict phase to the range [0, maxPhase) via wrapping
-function wrapPhase(phase, maxPhase = 1) {
-  if (phase >= maxPhase) {
-    phase -= maxPhase;
-  } else if (phase < 0) {
-    phase += maxPhase;
-  }
-  return phase;
-}
-const blockSize = 128;
 // Smooth waveshape near discontinuities to remove frequencies above Nyquist and prevent aliasing
 // referenced from https://www.kvraudio.com/forum/viewtopic.php?t=375517
 function polyBlep(phase, dt) {
   dt = Math.min(dt, 1 - dt);
+  const invdt = 1 / dt;
   // Start of cycle
   if (phase < dt) {
-    phase /= dt;
+    phase *= invdt;
-    // 2 * (phase - phase^2/2 - 0.5)
+    return 2 * phase - phase ** 2 - 1;
-    return phase + phase - phase * phase - 1;
   }
-
   // End of cycle
   else if (phase > 1 - dt) {
-    phase = (phase - 1) / dt;
+    phase = (phase - 1) * invdt;
-    // 2 * (phase^2/2 + phase + 0.5)
+    return phase ** 2 + 2 * phase + 1;
-    return phase * phase + phase + phase + 1;
   }
-
   // 0 otherwise
   else {
     return 0;
@@ -66,7 +72,7 @@ const waveshapes = {
     return phase / skew;
   },
   sine(phase) {
-    return Math.sin(Math.PI * 2 * phase) * 0.5 + 0.5;
+    return Math.sin(TWO_PI * phase) * 0.5 + 0.5;
   },
   ramp(phase) {
     return phase;
@@ -100,12 +106,6 @@ const waveshapes = {
     return v - polyBlep(phase, dt);
   },
 };
-function getParamValue(block, param) {
-  if (param.length > 1) {
-    return param[block];
-  }
-  return param[0];
-}
 
 const waveShapeNames = Object.keys(waveshapes);
 class LFOProcessor extends AudioWorkletProcessor {
@@ -165,9 +165,9 @@ class LFOProcessor extends AudioWorkletProcessor {
     const blockSize = output[0].length ?? 0;
 
     if (this.phase == null) {
-      this.phase = mod(time * frequency + phaseoffset, 1);
+      this.phase = ffrac(time * frequency + phaseoffset);
     }
-    const dt = frequency / sampleRate;
+    const dt = frequency * INVSR;
     for (let n = 0; n < blockSize; n++) {
       for (let i = 0; i < output.length; i++) {
         let modval = (waveshapes[shape](this.phase, skew) + dcoffset) * depth;
@@ -293,8 +293,8 @@ class TwoPoleFilter {
     // Out of bound values can produce NaNs
     resonance = clamp(resonance, 0, 1);
     cutoff = clamp(cutoff, 0, sampleRate / 2 - 1);
-    const c = clamp(2 * Math.sin(cutoff * (_PI / sampleRate)), 0, 1.14);
+    const c = clamp(2 * Math.sin(cutoff * PI * INVSR), 0, 1.14);
-    const r = Math.pow(0.5, (resonance + 0.125) / 0.125);
+    const r = Math.pow(0.5, 8 * resonance + 1);
     const mrc = 1 - r * c;
     this.s0 = mrc * this.s0 - c * this.s1 + c * s; // bpf
     this.s1 = mrc * this.s1 + c * this.s0; // lpf
@@ -353,11 +353,6 @@ class DJFProcessor extends AudioWorkletProcessor {
 }
 registerProcessor('djf-processor', DJFProcessor);
 
-function fast_tanh(x) {
-  const x2 = x * x;
-  return (x * (27.0 + x2)) / (27.0 + 9.0 * x2);
-}
-const _PI = 3.14159265359;
 //adapted from https://github.com/TheBouteillacBear/webaudioworklet-wasm?tab=MIT-1-ov-file
 class LadderProcessor extends AudioWorkletProcessor {
   static get parameterDescriptors() {
@@ -395,7 +390,7 @@ class LadderProcessor extends AudioWorkletProcessor {
     const drive = clamp(Math.exp(parameters.drive[0]), 0.1, 2000);
 
     let cutoff = parameters.frequency[0];
-    cutoff = (cutoff * 2 * _PI) / sampleRate;
+    cutoff = cutoff * TWO_PI * INVSR;
     cutoff = cutoff > 1 ? 1 : cutoff;
 
     const k = Math.min(8, resonance * 0.13);
@@ -508,6 +503,7 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
         name: 'voices',
         defaultValue: 5,
         min: 1,
+        automationRate: 'k-rate',
       },
     ];
   }
@@ -519,40 +515,36 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
       // this.port.postMessage({ type: 'onended' });
       return false;
     }
-
     const output = outputs[0];
-
+    const voices = params.voices[0]; // k-rate
     for (let i = 0; i < output[0].length; i++) {
       const detune = pv(params.detune, i);
-      const voices = pv(params.voices, i);
       const freqspread = pv(params.freqspread, i);
       const panspread = pv(params.panspread, i) * 0.5 + 0.5;
-      const gain1 = Math.sqrt(1 - panspread);
+      let gainL = Math.sqrt(1 - panspread);
-      const gain2 = Math.sqrt(panspread);
+      let gainR = Math.sqrt(panspread);
       let freq = pv(params.frequency, i);
       // Main detuning
       freq = applySemitoneDetuneToFrequency(freq, detune / 100);
+      const detuner = getDetuner(voices, freqspread);
       for (let n = 0; n < voices; n++) {
-        const isOdd = (n & 1) == 1;
-        let gainL = gain1;
-        let gainR = gain2;
-        // invert right and left gain
-        if (isOdd) {
-          gainL = gain2;
-          gainR = gain1;
-        }
         // Individual voice detuning
-        const freqVoice = applySemitoneDetuneToFrequency(freq, getUnisonDetune(voices, freqspread, n));
+        const freqVoice = applySemitoneDetuneToFrequency(freq, detuner(n));
         // We must wrap this here because it is passed into sawblep below which
         // has domain [0, 1]
-        const dt = mod(freqVoice / sampleRate, 1);
+        const dt = ffrac(freqVoice * INVSR);
         this.phase[n] = this.phase[n] ?? Math.random();
         const v = waveshapes.sawblep(this.phase[n], dt);
 
-        output[0][i] = output[0][i] + v * gainL;
+        output[0][i] += v * gainL;
-        output[1][i] = output[1][i] + v * gainR;
+        output[1][i] += v * gainR;
 
-        this.phase[n] = wrapPhase(this.phase[n] + dt);
+        let pn = this.phase[n] + dt;
+        if (pn >= 1.0) pn -= 1.0;
+        this.phase[n] = pn;
+        // invert right and left gain
+        gainL = gainR;
+        gainR = gainL;
       }
     }
     return true;
@@ -564,12 +556,16 @@ registerProcessor('supersaw-oscillator', SuperSawOscillatorProcessor);
 // Phase Vocoder sourced from https://github.com/olvb/phaze/tree/master?tab=readme-ov-file
 const BUFFERED_BLOCK_SIZE = 2048;
 
+const hannCache = new Map();
 function genHannWindow(length) {
-  let win = new Float32Array(length);
+  if (!hannCache.has(length)) {
-  for (var i = 0; i < length; i++) {
+    const win = new Float32Array(length);
-    win[i] = 0.5 * (1 - Math.cos((2 * Math.PI * i) / length));
+    for (let i = 0; i < length; i++) {
+      win[i] = 0.5 * (1 - Math.cos((TWO_PI * i) / length));
+    }
+    hannCache.set(length, win);
   }
-  return win;
+  return hannCache.get(length);
 }
 
 class PhaseVocoderProcessor extends OLAProcessor {
@@ -587,11 +583,10 @@ class PhaseVocoderProcessor extends OLAProcessor {
       blockSize: BUFFERED_BLOCK_SIZE,
     };
     super(options);
-
-    this.fftSize = this.blockSize;
     this.timeCursor = 0;
-
+    this.fftSize = this.blockSize;
-    this.hannWindow = genHannWindow(this.blockSize);
+    this.invfftSize = 1 / this.fftSize;
+    this.hannWindow = genHannWindow(this.fftSize);
     // prepare FFT and pre-allocate buffers
     this.fft = new FFT(this.fftSize);
     this.freqComplexBuffer = this.fft.createComplexArray();
@@ -604,52 +599,43 @@ class PhaseVocoderProcessor extends OLAProcessor {
 
   processOLA(inputs, outputs, parameters) {
     // no automation, take last value
-
     let pitchFactor = parameters.pitchFactor[parameters.pitchFactor.length - 1];
-
     if (pitchFactor < 0) {
       pitchFactor = pitchFactor * 0.25;
     }
     pitchFactor = Math.max(0, pitchFactor + 1);
-
+    for (let i = 0; i < this.nbInputs; i++) {
-    for (var i = 0; i < this.nbInputs; i++) {
+      for (let j = 0; j < inputs[i].length; j++) {
-      for (var j = 0; j < inputs[i].length; j++) {
+        const input = inputs[i][j];
-        // big assumption here: output is symetric to input
+        const output = outputs[i][j];
-        var input = inputs[i][j];
-        var output = outputs[i][j];
-
         this.applyHannWindow(input);
-
         this.fft.realTransform(this.freqComplexBuffer, input);
-
         this.computeMagnitudes();
         this.findPeaks();
         this.shiftPeaks(pitchFactor);
-
         this.fft.completeSpectrum(this.freqComplexBufferShifted);
         this.fft.inverseTransform(this.timeComplexBuffer, this.freqComplexBufferShifted);
         this.fft.fromComplexArray(this.timeComplexBuffer, output);
         this.applyHannWindow(output);
       }
     }
-
     this.timeCursor += this.hopSize;
   }
 
   /** Apply Hann window in-place */
   applyHannWindow(input) {
-    for (var i = 0; i < this.blockSize; i++) {
+    for (let i = 0; i < this.blockSize; i++) {
-      input[i] = input[i] * this.hannWindow[i] * 1.62;
+      input[i] *= this.hannWindow[i] * 1.62;
     }
   }
 
   /** Compute squared magnitudes for peak finding **/
   computeMagnitudes() {
-    var i = 0,
+    let i = 0,
       j = 0;
     while (i < this.magnitudes.length) {
-      let real = this.freqComplexBuffer[j];
+      const real = this.freqComplexBuffer[j];
-      let imag = this.freqComplexBuffer[j + 1];
+      const imag = this.freqComplexBuffer[j + 1];
       // no need to sqrt for peak finding
       this.magnitudes[i] = real ** 2 + imag ** 2;
       i += 1;
@@ -660,12 +646,10 @@ class PhaseVocoderProcessor extends OLAProcessor {
   /** Find peaks in spectrum magnitudes **/
   findPeaks() {
     this.nbPeaks = 0;
-    var i = 2;
+    let i = 2;
-    let end = this.magnitudes.length - 2;
+    const end = this.magnitudes.length - 2;
-
     while (i < end) {
-      let mag = this.magnitudes[i];
+      const mag = this.magnitudes[i];
-
       if (this.magnitudes[i - 1] >= mag || this.magnitudes[i - 2] >= mag) {
         i++;
         continue;
@@ -674,7 +658,6 @@ class PhaseVocoderProcessor extends OLAProcessor {
         i++;
         continue;
       }
-
       this.peakIndexes[this.nbPeaks] = i;
       this.nbPeaks++;
       i += 2;
@@ -685,53 +668,44 @@ class PhaseVocoderProcessor extends OLAProcessor {
   shiftPeaks(pitchFactor) {
     // zero-fill new spectrum
     this.freqComplexBufferShifted.fill(0);
-
+    for (let i = 0; i < this.nbPeaks; i++) {
-    for (var i = 0; i < this.nbPeaks; i++) {
+      const peakIndex = this.peakIndexes[i];
-      let peakIndex = this.peakIndexes[i];
+      const peakIndexShifted = fround(peakIndex * pitchFactor);
-      let peakIndexShifted = Math.round(peakIndex * pitchFactor);
-
       if (peakIndexShifted > this.magnitudes.length) {
         break;
       }
-
       // find region of influence
-      var startIndex = 0;
+      let startIndex = 0;
-      var endIndex = this.fftSize;
+      let endIndex = this.fftSize;
       if (i > 0) {
-        let peakIndexBefore = this.peakIndexes[i - 1];
+        startIndex = peakIndex - fround((peakIndex - this.peakIndexes[i - 1]) / 2);
-        startIndex = peakIndex - Math.floor((peakIndex - peakIndexBefore) / 2);
       }
       if (i < this.nbPeaks - 1) {
-        let peakIndexAfter = this.peakIndexes[i + 1];
+        endIndex = peakIndex + fceil((this.peakIndexes[i + 1] - peakIndex) / 2);
-        endIndex = peakIndex + Math.ceil((peakIndexAfter - peakIndex) / 2);
       }
-
       // shift whole region of influence around peak to shifted peak
-      let startOffset = startIndex - peakIndex;
+      const startOffset = startIndex - peakIndex;
-      let endOffset = endIndex - peakIndex;
+      const endOffset = endIndex - peakIndex;
-      for (var j = startOffset; j < endOffset; j++) {
+      const omegaDelta = TWO_PI * this.invfftSize * (peakIndexShifted - peakIndex);
-        let binIndex = peakIndex + j;
+      const phaseShiftReal = Math.cos(omegaDelta * this.timeCursor);
-        let binIndexShifted = peakIndexShifted + j;
+      const phaseShiftImag = Math.sin(omegaDelta * this.timeCursor);
-
+      for (let j = startOffset; j < endOffset; j++) {
+        const binIndex = peakIndex + j;
+        const binIndexShifted = peakIndexShifted + j;
         if (binIndexShifted >= this.magnitudes.length) {
           break;
         }
-
         // apply phase correction
-        let omegaDelta = (2 * Math.PI * (binIndexShifted - binIndex)) / this.fftSize;
+        const indexReal = 2 * binIndex;
-        let phaseShiftReal = Math.cos(omegaDelta * this.timeCursor);
+        const indexImag = indexReal + 1;
-        let phaseShiftImag = Math.sin(omegaDelta * this.timeCursor);
+        const valueReal = this.freqComplexBuffer[indexReal];
+        const valueImag = this.freqComplexBuffer[indexImag];
 
-        let indexReal = binIndex * 2;
+        const valueShiftedReal = valueReal * phaseShiftReal - valueImag * phaseShiftImag;
-        let indexImag = indexReal + 1;
+        const valueShiftedImag = valueReal * phaseShiftImag + valueImag * phaseShiftReal;
-        let valueReal = this.freqComplexBuffer[indexReal];
-        let valueImag = this.freqComplexBuffer[indexImag];
 
-        let valueShiftedReal = valueReal * phaseShiftReal - valueImag * phaseShiftImag;
+        const indexShiftedReal = 2 * binIndexShifted;
-        let valueShiftedImag = valueReal * phaseShiftImag + valueImag * phaseShiftReal;
+        const indexShiftedImag = indexShiftedReal + 1;
-
-        let indexShiftedReal = binIndexShifted * 2;
-        let indexShiftedImag = indexShiftedReal + 1;
         this.freqComplexBufferShifted[indexShiftedReal] += valueShiftedReal;
         this.freqComplexBufferShifted[indexShiftedImag] += valueShiftedImag;
       }
@@ -745,11 +719,10 @@ registerProcessor('phase-vocoder-processor', PhaseVocoderProcessor);
 class PulseOscillatorProcessor extends AudioWorkletProcessor {
   constructor() {
     super();
-    this.pi = _PI;
+    this.phi = -PI; // phase
-    this.phi = -this.pi; // phase
     this.Y0 = 0; // feedback memories
     this.Y1 = 0;
-    this.PW = this.pi; // pulse width
+    this.PW = PI; // pulse width
     this.B = 2.3; // feedback coefficient
     this.dphif = 0; // filtered phase increment
     this.envf = 0; // filtered envelope
@@ -806,11 +779,11 @@ class PulseOscillatorProcessor extends AudioWorkletProcessor {
       dphi;
 
     for (let i = 0; i < (output[0].length ?? 0); i++) {
-      const pw = (1 - clamp(getParamValue(i, params.pulsewidth), -0.99, 0.99)) * this.pi;
+      const pw = (1 - clamp(pv(params.pulsewidth, i), -0.99, 0.99)) * PI;
-      const detune = getParamValue(i, params.detune);
+      const detune = pv(params.detune, i);
-      const freq = applySemitoneDetuneToFrequency(getParamValue(i, params.frequency), detune / 100);
+      const freq = applySemitoneDetuneToFrequency(pv(params.frequency, i), detune / 100);
 
-      dphi = freq * (this.pi / (sampleRate * 0.5)); // phase increment
+      dphi = freq * TWO_PI * INVSR; // phase increment
       this.dphif += 0.1 * (dphi - this.dphif);
 
       env *= 0.9998; // exponential decay envelope
@@ -822,7 +795,7 @@ class PulseOscillatorProcessor extends AudioWorkletProcessor {
 
       // Waveform generation (half-Tomisawa oscillators)
       this.phi += this.dphif; // phase increment
-      if (this.phi >= this.pi) this.phi -= 2 * this.pi; // phase wrapping
+      if (this.phi >= PI) this.phi -= TWO_PI; // phase wrapping
 
       // First half-Tomisawa generator
       let out0 = Math.cos(this.phi + this.B * this.Y0); // self-phase modulation
@@ -852,24 +825,23 @@ const chyx = {
   /*bit reverse*/ br: function (x, size = 8) {
     if (size > 32) {
       throw new Error('br() Size cannot be greater than 32');
-    } else {
-      let result = 0;
-      for (let idx = 0; idx < size - 0; idx++) {
-        result += chyx.bitC(x, 2 ** idx, 2 ** (size - (idx + 1)));
-      }
-      return result;
     }
+    let result = 0;
+    for (let idx = 0; idx < size; idx++) {
+      result |= chyx.bitC(x, 1 << idx, 1 << (size - (idx + 1)));
+    }
+    return result;
   },
   /*sin that loops every 128 "steps", instead of every pi steps*/ sinf: function (x) {
-    return Math.sin(x / (128 / Math.PI));
+    return Math.sin((x * PI) / 128);
   },
   /*cos that loops every 128 "steps", instead of every pi steps*/ cosf: function (x) {
-    return Math.cos(x / (128 / Math.PI));
+    return Math.cos((x * PI) / 128);
   },
   /*tan that loops every 128 "steps", instead of every pi steps*/ tanf: function (x) {
-    return Math.tan(x / (128 / Math.PI));
+    return Math.tan((x * PI) / 128);
   },
-  /*converts t into a string composed of it's bits, regex's that*/ regG: function (t, X) {
+  /*converts t into a string composed of its bits; regexes that*/ regG: function (t, X) {
     return X.test(t.toString(2));
   },
 };
@@ -877,7 +849,7 @@ const chyx = {
 // Create shortened Math functions
 let mathParams, byteBeatHelperFuncs;
 function getByteBeatFunc(codetext) {
-  if ((mathParams || byteBeatHelperFuncs) == null) {
+  if (mathParams == null) {
     mathParams = Object.getOwnPropertyNames(Math);
     byteBeatHelperFuncs = mathParams.map((k) => Math[k]);
     const chyxNames = Object.getOwnPropertyNames(chyx);
@@ -910,7 +882,7 @@ class ByteBeatProcessor extends AudioWorkletProcessor {
 
       this.func = getByteBeatFunc(codeText);
     };
-    this.initialOffset = null;
+    this.initialOffset = 0;
     this.t = null;
     this.func = null;
   }
@@ -957,18 +929,19 @@ class ByteBeatProcessor extends AudioWorkletProcessor {
       this.t = params.begin[0] * sampleRate;
     }
     const output = outputs[0];
+    const scale = 256 * INVSR;
     for (let i = 0; i < output[0].length; i++) {
-      const detune = getParamValue(i, params.detune);
+      const detune = pv(params.detune, i);
-      const freq = applySemitoneDetuneToFrequency(getParamValue(i, params.frequency), detune / 100);
+      const freq = applySemitoneDetuneToFrequency(pv(params.frequency, i), detune / 100);
-      let local_t = (this.t / (sampleRate / 256)) * freq + this.initialOffset;
+      const local_t = scale * freq * this.t + this.initialOffset;
       const funcValue = this.func(local_t);
-      let signal = (funcValue & 255) / 127.5 - 1;
+      const signal = (funcValue & 255) / 127.5 - 1;
-      const out = signal * 0.2;
+      //prevent speaker blowout via clipping if threshold exceeds
+      const out = clamp(signal * 0.2, -0.4, 0.4);
       for (let c = 0; c < output.length; c++) {
-        //prevent speaker blowout via clipping if threshold exceeds
+        output[c][i] = out;
-        output[c][i] = clamp(out, -0.4, 0.4);
       }
-      this.t = this.t + 1;
+      this.t++;
     }
 
     return true; // keep the audio processing going
@@ -1056,7 +1029,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       { name: 'position', defaultValue: 0, min: 0, max: 1 },
       { name: 'warp', defaultValue: 0, min: 0, max: 1 },
       { name: 'warpMode', defaultValue: 0 },
-      { name: 'voices', defaultValue: 1, min: 1 },
+      { name: 'voices', defaultValue: 1, min: 1, automationRate: 'k-rate' },
       { name: 'panspread', defaultValue: 0.7, min: 0, max: 1 },
       { name: 'phaserand', defaultValue: 0, min: 0, max: 1 },
     ];
@@ -1067,7 +1040,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
     this.frameLen = 0;
     this.numFrames = 0;
     this.phase = [];
-    this.invSR = 1 / sampleRate;
 
     this.port.onmessage = (e) => {
       const { type, payload } = e.data || {};
@@ -1104,7 +1076,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
 
   _toBits(amt, min = 2, max = 12) {
     const b = max + (min - max) * amt;
-    return { b, n: Math.round(Math.pow(2, b)) };
+    return { b, n: fround(Math.pow(2, b)) };
   }
 
   _warpPhase(phase, amt, mode) {
@@ -1130,7 +1102,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         return amt < 0.5 ? this._warpPhase(phase, 1 - 2 * amt, 3) : this._warpPhase(phase, 2 * amt - 1, 2);
       }
       case WarpMode.SYNC: {
-        const syncRatio = Math.pow(16, amt * amt);
+        const syncRatio = Math.pow(16, amt ** 2);
         return (phase * syncRatio) % 1;
       }
       case WarpMode.QUANT: {
@@ -1139,8 +1111,8 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       }
       case WarpMode.FOLD: {
         const K = 7;
-        const k = 1 + Math.max(1, Math.round(K * amt));
+        const k = 1 + Math.max(1, fround(K * amt));
-        return Math.abs(frac(k * phase) - 0.5) * 2;
+        return Math.abs(ffrac(k * phase) - 0.5) * 2;
       }
       case WarpMode.PWM: {
         const w = clamp(0.5 + 0.49 * (2 * amt - 1), 0, 1);
@@ -1150,12 +1122,12 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       case WarpMode.ORBIT: {
         const depth = 0.5 * amt;
         const n = 3;
-        return frac(phase + depth * Math.sin(2 * Math.PI * n * phase));
+        return frac(phase + depth * Math.sin(TWO_PI * n * phase));
       }
       case WarpMode.SPIN: {
         const depth = 0.5 * amt;
         const { n } = this._toBits(amt, 1, 6);
-        return frac(phase + depth * Math.sin(2 * Math.PI * n * phase));
+        return frac(phase + depth * Math.sin(TWO_PI * n * phase));
       }
       case WarpMode.CHAOS: {
         const r = 3.7 + 0.3 * amt;
@@ -1166,7 +1138,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         const isPrime = (n) => {
           if (n < 2) return false;
           if (n % 2 === 0) return n === 2;
-          for (let d = 3; d * d <= n; d += 2) if (n % d === 0) return false;
+          for (let d = 3; d ** 2 <= n; d += 2) if (n % d === 0) return false;
           return true;
         };
         let { n } = this._toBits(amt, 3);
@@ -1175,18 +1147,12 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       }
       case WarpMode.BINARY: {
         let { b } = this._toBits(amt, 3);
-        b = Math.round(b);
+        b = fround(b);
         const n = 1 << b;
         const idx = ffloor(phase * n);
         const ridx = bitReverse(idx, b);
         return ridx / n;
       }
-      case WarpMode.MODULAR: {
-        const { n } = this._toBits(amt);
-        const depth = 0.5 * amt;
-        const jump = frac(phase * n) / n;
-        return frac(phase + depth * jump);
-      }
       case WarpMode.BROWNIAN: {
         const disp = 0.25 * amt * brownian(64 * phase, 4);
         return frac(phase + disp);
@@ -1209,7 +1175,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       case WarpMode.LOGISTIC: {
         let x = phase;
         const r = 3.6 + 0.4 * amt;
-        const iters = 1 + Math.round(2 * amt);
+        const iters = 1 + fround(2 * amt);
         for (let i = 0; i < iters; i++) x = r * x * (1 - x);
         return clamp(x, 0, 1);
       }
@@ -1222,7 +1188,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         return (y - y0) / (y1 - y0);
       }
       case WarpMode.FRACTAL: {
-        const d = 0.5 * Math.sin(2 * Math.PI * phase) * amt;
+        const d = 0.5 * Math.sin(TWO_PI * phase) * amt;
         return frac(phase + d);
       }
       case WarpMode.FLIP: {
@@ -1269,6 +1235,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       if (outR !== outL) outR.set(outL);
       return true;
     }
+    const voices = parameters.voices[0]; // k-rate
     for (let i = 0; i < outL.length; i++) {
       const detune = pv(parameters.detune, i);
       const freqspread = pv(parameters.freqspread, i);
@@ -1278,7 +1245,6 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       const frac = idx - fIdx;
       const warpAmount = clamp(pv(parameters.warp, i), 0, 1);
       const warpMode = pv(parameters.warpMode, i);
-      const voices = pv(parameters.voices, i);
       const phaseRand = clamp(pv(parameters.phaserand, i), 0, 1);
       const panspread = voices > 1 ? clamp(pv(parameters.panspread, i), 0, 1) : 0;
       const gain1 = Math.sqrt(0.5 - 0.5 * panspread);
@@ -1286,6 +1252,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
       let f = pv(parameters.frequency, i);
       f = applySemitoneDetuneToFrequency(f, detune / 100); // overall detune
       const normalizer = 1 / Math.sqrt(voices);
+      const detuner = getDetuner(voices, freqspread);
       for (let n = 0; n < voices; n++) {
         const isOdd = (n & 1) == 1;
         let gainL = gain1;
@@ -1295,8 +1262,8 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
           gainL = gain2;
           gainR = gain1;
         }
-        const fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, freqspread, n)); // voice detune
+        const fVoice = applySemitoneDetuneToFrequency(f, detuner(n)); // voice detune
-        const dPhase = fVoice * this.invSR;
+        const dPhase = fVoice * INVSR;
         const level = this._chooseMip(dPhase);
         const table = this.tables[level];
 
@@ -1311,7 +1278,7 @@ class WavetableOscillatorProcessor extends AudioWorkletProcessor {
         }
         outL[i] += s * gainL * normalizer;
         outR[i] += s * gainR * normalizer;
-        this.phase[n] = wrapPhase(this.phase[n] + dPhase);
+        this.phase[n] = ffrac(this.phase[n] + dPhase);
       }
     }
     return true;

packages/supradough/dough.mjs

@@ -1,11 +1,12 @@
 // this is dough, the superdough without dependencies
-// @ts-check
+// @ts-nocheck
 // @ts-ignore ignore next line because sampleRate is unknown
 const SAMPLE_RATE = typeof sampleRate !== 'undefined' ? sampleRate : 48000;
 const PI_DIV_SR = Math.PI / SAMPLE_RATE;
 const ISR = 1 / SAMPLE_RATE;
 
 let gainCurveFunc = (val) => Math.pow(val, 2);
+const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 
 function applyGainCurve(val) {
   return gainCurveFunc(val);
@@ -151,7 +152,8 @@ export class TwoPoleFilter {
     resonance = Math.max(resonance, 0);
 
     cutoff = Math.min(cutoff, 20000);
-    const c = 2 * Math.sin(cutoff * PI_DIV_SR);
+    let c = 2 * Math.sin(cutoff * PI_DIV_SR);
+    c = clamp(c, 0, 1.14); // this line prevents instability TODO: test
 
     const r = Math.pow(0.5, (resonance + 0.125) / 0.125);
     const mrc = 1 - r * c;

packages/supradough/package.json

@@ -13,7 +13,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/tidalcycles/strudel.git"
+    "url": "git+https://codeberg.org/uzu/strudel.git"
   },
   "keywords": [
     "tidalcycles",
@@ -25,12 +25,15 @@
   "author": "Felix Roos <flix91@gmail.com>",
   "license": "AGPL-3.0-or-later",
   "bugs": {
-    "url": "https://github.com/tidalcycles/strudel/issues"
+    "url": "https://codeberg.org/uzu/strudel/issues"
   },
-  "homepage": "https://github.com/tidalcycles/strudel#readme",
+  "homepage": "https://codeberg.org/uzu/strudel#readme",
   "devDependencies": {
     "vite": "^6.0.11",
     "vite-plugin-bundle-audioworklet": "workspace:*",
     "wav-encoder": "^1.3.0"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/supradough/vite.config.js

@@ -0,0 +1,16 @@
+import { defineConfig } from 'vite';
+import { resolve } from 'path';
+import bundleAudioWorkletPlugin from 'vite-plugin-bundle-audioworklet';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [bundleAudioWorkletPlugin()],
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'index.mjs'),
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
+    },
+    target: 'esnext',
+  },
+});

packages/tidal/package.json

@@ -25,5 +25,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/tonal/package.json

@@ -38,5 +38,8 @@
   "devDependencies": {
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/tonal/tonal.mjs

@@ -229,6 +229,9 @@ function _getNearestScaleNote(scaleName, note, preferHigher = true) {
  *
  * A scale consists of a root note (e.g. `c4`, `c`, `f#`, `bb4`) followed by semicolon (':') and then a [scale type](https://github.com/tonaljs/tonal/blob/main/packages/scale-type/data.ts).
  *
+ * The scale name must be written without spaces (because it would be interpreted as a multi-step pattern otherwise).
+ * If your scale name includes spaces, replace them with colons.
+ *
  * The root note defaults to octave 3, if no octave number is given.
  *
  * @name scale
@@ -250,6 +253,8 @@ function _getNearestScaleNote(scaleName, note, preferHigher = true) {
  * .s("piano")
  * @example
  * note("C1*16").transpose(irand(36)).scale('Cb2 major').scaleTranspose(3)
+ * @example
+ * n("[0 0] [1 2] [3 4] [5 6]").scale("C:major:blues")
  */
 export const scale = register(
   'scale',

packages/transpiler/package.json

@@ -39,5 +39,8 @@
   "devDependencies": {
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/vite-plugin-bundle-audioworklet/package.json

@@ -12,5 +12,8 @@
   "type": "module",
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/web/README.md

@@ -62,7 +62,7 @@ initStrudel();
 document.getElementById('play').addEventListener('click', 
   () => evaluate('note("c a f e").jux(rev)')
 );
-document.getElementById('play').addEventListener('stop', 
+document.getElementById('stop').addEventListener('click', 
   () => hush()
 );
 ```

packages/web/package.json

@@ -43,5 +43,8 @@
     "@rollup/plugin-replace": "^6.0.2",
     "vite": "^6.0.11",
     "vite-plugin-bundle-audioworklet": "workspace:*"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/webaudio/package.json

@@ -40,5 +40,8 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

packages/xen/package.json

@@ -35,5 +35,8 @@
   "devDependencies": {
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

test/__snapshots__/examples.test.mjs.snap

@@ -9337,6 +9337,43 @@ exports[`runs examples > example "scale" example index 4 1`] = `
 ]
 `;
 
+exports[`runs examples > example "scale" example index 5 1`] = `
+[
+  "[ 0/1 → 1/8 | note:C3 ]",
+  "[ 1/8 → 1/4 | note:C3 ]",
+  "[ 1/4 → 3/8 | note:D3 ]",
+  "[ 3/8 → 1/2 | note:Eb3 ]",
+  "[ 1/2 → 5/8 | note:E3 ]",
+  "[ 5/8 → 3/4 | note:G3 ]",
+  "[ 3/4 → 7/8 | note:A3 ]",
+  "[ 7/8 → 1/1 | note:C4 ]",
+  "[ 1/1 → 9/8 | note:C3 ]",
+  "[ 9/8 → 5/4 | note:C3 ]",
+  "[ 5/4 → 11/8 | note:D3 ]",
+  "[ 11/8 → 3/2 | note:Eb3 ]",
+  "[ 3/2 → 13/8 | note:E3 ]",
+  "[ 13/8 → 7/4 | note:G3 ]",
+  "[ 7/4 → 15/8 | note:A3 ]",
+  "[ 15/8 → 2/1 | note:C4 ]",
+  "[ 2/1 → 17/8 | note:C3 ]",
+  "[ 17/8 → 9/4 | note:C3 ]",
+  "[ 9/4 → 19/8 | note:D3 ]",
+  "[ 19/8 → 5/2 | note:Eb3 ]",
+  "[ 5/2 → 21/8 | note:E3 ]",
+  "[ 21/8 → 11/4 | note:G3 ]",
+  "[ 11/4 → 23/8 | note:A3 ]",
+  "[ 23/8 → 3/1 | note:C4 ]",
+  "[ 3/1 → 25/8 | note:C3 ]",
+  "[ 25/8 → 13/4 | note:C3 ]",
+  "[ 13/4 → 27/8 | note:D3 ]",
+  "[ 27/8 → 7/2 | note:Eb3 ]",
+  "[ 7/2 → 29/8 | note:E3 ]",
+  "[ 29/8 → 15/4 | note:G3 ]",
+  "[ 15/4 → 31/8 | note:A3 ]",
+  "[ 31/8 → 4/1 | note:C4 ]",
+]
+`;
+
 exports[`runs examples > example "scaleTranspose" example index 0 1`] = `
 [
   "[ 0/1 → 1/2 | note:C3 ]",

test/tunes.test.mjs

@@ -4,11 +4,25 @@ import { describe, it } from 'vitest';
 
 const tuneKeys = Object.keys(tunes);
 
+// Node 24 tightened Number→string rounding; clamp decimals so snapshots stay stable across engines.
+const roundFloatStrings = (input, precision = 12) => {
+  // if matches a decimal number ex: 12.34, -0.5, 0.123, 99.0, 1.932093850293
+  const regex = /-?\d+\.\d+/g;
+  return input.replace(regex, (match) => {
+    // converts the literal to a number, performs round to nearest (ties to even)
+    // at the requested precision, and returns the rounded decimal string
+    const rounded = Number(match).toFixed(precision);
+    // trims trailing zeros (and a dangling dot) after rounding, so the displayed string looks tidy
+    return rounded.replace(/\.?0+$/, '').replace(/\.$/, '');
+  });
+};
+
 describe('renders tunes', () => {
   tuneKeys.forEach((key) => {
     it(`tune: ${key}`, async ({ expect }) => {
       const haps = await queryCode(tunes[key], testCycles[key] || 1);
-      expect(haps).toMatchSnapshot();
+      const normalized = haps.map((hap) => roundFloatStrings(hap));
+      expect(normalized).toMatchSnapshot();
     });
   });
 });

tools/dbpatch/package.json

@@ -1,5 +1,8 @@
 {
   "dependencies": {
     "csv": "^6.3.11"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

website/package.json

@@ -75,5 +75,8 @@
     "sharp": "^0.33.5",
     "workbox-window": "^7.3.0",
     "vite-plugin-bundle-audioworklet": "workspace:*"
+  },
+  "engines": {
+    "node": ">=18.0.0"
   }
 }

website/src/pages/learn/samples.mdx

@@ -63,7 +63,7 @@ You can also create custom aliases for existing sounds using the `soundAlias` fu
 
 <MiniRepl
   client:idle
-  tune={`soundAlias("RolandTR808_bd", "kick")
+  tune={`soundAlias('RolandTR808_bd', 'kick')
 s("kick")`}
 />
 

website/src/pages/technical-manual/project-start.mdx

@@ -32,7 +32,7 @@ There are 3 quick ways to embed strudel in your website:
 
 ### Inside an iframe
 
-Using an iframe is the most easy way to embed a studel tune.
+Using an iframe is the most easy way to embed a strudel tune.
 You can embed any pattern of your choice via an iframe and the URL of the pattern of your choice:
 
 ```html
@@ -133,7 +133,7 @@ If you'd rather use your own UI, you can use the `@strudel/web` package:
 </script>
 ```
 
-For more info on this package, see the [@strudel/web README]https://codeberg.org/uzu/strudel/src/branch/main/packages/web#strudel-web).
+For more info on this package, see the [@strudel/web README](https://codeberg.org/uzu/strudel/src/branch/main/packages/web#strudel-web).
 
 ## Via npm