Bug fix: Remove left-over widget id line from block-based evals

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

packages/hs2js/package.json

@@ -29,10 +29,10 @@
   },
   "homepage": "https://codeberg.org/uzu/strudel/",
   "dependencies": {
-    "web-tree-sitter": "^0.24.7"
+    "web-tree-sitter": "^0.24.7",
+    "tree-sitter-haskell": "^0.23.1"
   },
   "devDependencies": {
-    "tree-sitter-haskell": "^0.23.1",
     "vite": "^6.0.11"
   },
   "engines": {

packages/hs2js/src/parser.mjs

@@ -1,6 +1,8 @@
 import Parser from 'web-tree-sitter';
+import treeSitterWasm from 'web-tree-sitter/tree-sitter.wasm?url';
+import grammarWasm from 'tree-sitter-haskell/tree-sitter-haskell.wasm?url';
 
-let base = '/';
+let base;
 export function setBase(path) {
   base = path;
 }
@@ -10,11 +12,15 @@ let isReady = false,
 async function _loadParser() {
   await Parser.init({
     locateFile(scriptName, scriptDirectory) {
-      return `${base}${scriptName}`;
+      if (base) {
+        return `${base}${scriptName}`;
+      }
+      return treeSitterWasm;
     },
   });
   parser = new Parser();
-  const Lang = await Parser.Language.load(`${base}tree-sitter-haskell.wasm`);
+  let grammarUrl = base ? `${base}tree-sitter-haskell.wasm` : grammarWasm;
+  const Lang = await Parser.Language.load(grammarUrl);
   parser.setLanguage(Lang);
   isReady = true;
   return parser;

packages/kabelsalat/kabelsalat.mjs

@@ -1,41 +0,0 @@
-import { registerChainEffect, getFrequencyFromValue, getWorklet, logger, registerWorklet } from 'superdough';
-import workletUrl from './worklet.mjs?audioworklet';
-
-let kabel;
-async function initKabelsalat() {
-  const { SalatRepl } = await import('@kabelsalat/web');
-  logger('[kabelsalat] ready');
-  kabel = new SalatRepl({ localScope: true });
-  return kabel;
-}
-
-initKabelsalat().catch((err) => {
-  logger(`kabelsalat init failed: ${err}`);
-});
-
-const compileKabel = (code) => {
-  if (!kabel) {
-    throw new Error('kabelsalat still loading');
-  }
-  const node = kabel.evaluate(code);
-  return node.compile({ log: false });
-};
-
-registerWorklet(workletUrl);
-
-registerChainEffect('workletSrc', ({ audioContext, fx, value, chainID, start, gateEnd, releaseEnd }) => {
-  const workletSrc = fx.workletSrc
-    .replace(/\bpat\[(\d+)\]/g, (_, i) => fx.workletInputs[i])
-    .replaceAll('sFreq', getFrequencyFromValue(value))
-    .replaceAll('sGate', `cc('strudel-gate-${chainID}')`);
-  const { src, ugens, registers } = compileKabel(workletSrc);
-  const workletNode = getWorklet(audioContext, 'generic-processor', {}, { outputChannelCount: [2] });
-  workletNode.port.postMessage({
-    src,
-    schema: { ugens, registers },
-    start,
-    gateEnd,
-    end: releaseEnd,
-  });
-  return workletNode;
-});

packages/kabelsalat/package.json

@@ -1,43 +0,0 @@
-{
-  "name": "@strudel/kabelsalat",
-  "version": "1.2.6",
-  "description": "kabelsalat integration for superdough",
-  "main": "kabelsalat.mjs",
-  "type": "module",
-  "publishConfig": {
-    "main": "dist/kabelsalat.mjs"
-  },
-  "scripts": {
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
-  },
-  "keywords": [
-    "titdalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
-  },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
-  "dependencies": {
-    "superdough": "workspace:*",
-    "@kabelsalat/lib": "^0.4.1",
-    "@kabelsalat/web": "^0.4.1"
-  },
-  "devDependencies": {
-    "vite": "^6.0.11",
-    "vite-plugin-bundle-audioworklet":"workspace:*"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  }
-}

packages/kabelsalat/vite.config.js

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

packages/kabelsalat/worklet.mjs

@@ -1,83 +0,0 @@
-import * as ugens from '@kabelsalat/lib/src/ugens.js';
-
-const blockSize = 128;
-
-const UGENS = new Map(Object.entries(ugens));
-
-class GenericProcessor extends AudioWorkletProcessor {
-  constructor() {
-    super();
-    this.playPos = 0;
-    const channels = 16;
-    this.outputs = new Array(channels).fill(0);
-    this.sources = new Array(channels).fill(0);
-    this.gateEnded = false;
-    this.started = false;
-    this.port.onmessage = (event) => {
-      let {
-        src,
-        schema: { ugens, registers },
-        start,
-        gateEnd,
-        end,
-      } = event.data;
-      this.start = start;
-      this.gateEnd = gateEnd;
-      this.end = end;
-      this.registers = new Array(registers).fill(0);
-      this.src = `o.fill(0); // reset outputs\n${src}`;
-      this.nodes = [];
-      for (let i = 0; i < ugens.length; i++) {
-        const ugen = ugens[i];
-        const nodeClass = UGENS.get(ugen.type);
-        const node = new nodeClass(i, ugen, sampleRate);
-        if (node.type === 'cc' && ugen.inputs?.[0]?.includes('strudel-gate')) {
-          node.setValue(1);
-          this.gateNode = node;
-        }
-        this.nodes[i] = node;
-      }
-      this.genSample = new Function(
-        'time',
-        'nodes',
-        'input',
-        'r', // registers
-        'o', // outputs
-        's', // sources
-        this.src,
-      );
-    };
-  }
-  process(inputs, outputs) {
-    const input = inputs[0]?.[0];
-    if (currentTime >= this.end) {
-      return false;
-    } else if (this.genSample === undefined || currentTime < this.start) {
-      // pending
-      return true;
-    }
-    this.started = true;
-    if (!this.gateEnded && currentTime > this.gateEnd) {
-      this.gateNode?.setValue(0);
-      this.gateEnded = true;
-    }
-    const output = outputs[0];
-    const outL = output[0];
-    const outR = output[1];
-    for (let n = 0; n < blockSize; n++) {
-      this.genSample(this.playPos, this.nodes, input ? input[n] : 0, this.registers, this.outputs, this.sources);
-      const left = this.outputs[0];
-      const right = this.outputs[1];
-      // Spread to stereo if possible; else mixdown to mono
-      if (outR) {
-        outL[n] = left;
-        outR[n] = right;
-      } else {
-        outL[n] = 0.5 * (left + right);
-      }
-      this.playPos += 1 / sampleRate;
-    }
-    return true;
-  }
-}
-registerProcessor('generic-processor', GenericProcessor);

packages/superdough/package.json

@@ -36,6 +36,8 @@
     "vite-plugin-bundle-audioworklet": "workspace:*"
   },
   "dependencies": {
+    "@kabelsalat/lib": "^0.4.1",
+    "@kabelsalat/web": "^0.4.1",
     "nanostores": "^0.11.3"
   },
   "engines": {

packages/superdough/superdough.mjs

@@ -16,6 +16,7 @@ import {
   gainNode,
   getCompressor,
   getDistortion,
+  getFrequencyFromValue,
   getLfo,
   getWorklet,
   releaseAudioNode,
@@ -62,11 +63,6 @@ export function registerSound(key, onTrigger, data = {}) {
   soundMap.setKey(key, { onTrigger, data });
 }
 
-const chainEffects = {};
-export function registerChainEffect(name, effect) {
-  chainEffects[name] = effect;
-}
-
 let gainCurveFunc = (val) => val;
 
 export function applyGainCurve(val) {
@@ -264,6 +260,14 @@ export function loadWorklets() {
   return workletsLoading;
 }
 
+let kabel;
+async function initKabelsalat() {
+  const { SalatRepl } = await import('@kabelsalat/web');
+  logger('[kabelsalat] ready');
+  kabel = new SalatRepl({ localScope: true });
+  return kabel;
+}
+
 // this function should be called on first user interaction (to avoid console warning)
 export async function initAudio(options = {}) {
   const {
@@ -310,6 +314,7 @@ export async function initAudio(options = {}) {
   } catch (err) {
     console.warn('could not load AudioWorklet effects', err);
   }
+  await initKabelsalat();
   logger('[superdough] ready');
 }
 let audioReady;
@@ -445,6 +450,14 @@ class Chain {
   }
 }
 
+const compileKabel = (code) => {
+  if (!kabel) {
+    throw new Error('kabelsalat not loaded');
+  }
+  const node = kabel.evaluate(code);
+  return node.compile({ log: false });
+};
+
 export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5) => {
   // mapping from main FX and numbered FX chains to nodes
   const nodes = { main: {} };
@@ -620,21 +633,17 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
     delaytime = delaytime ?? cycleToSeconds(delaysync, cps);
 
-    // custom chain effect sink (used for kabelsalat)
-    for (let key in chainEffects) {
-      const effect = chainEffects[key];
-      if (fx[key] !== undefined) {
-        const node = effect({
-          audioContext: ac,
-          fx,
-          chainID,
-          value,
-          start: t,
-          gateEnd: end,
-          releaseEnd: endWithRelease,
-        });
-        node && chain.connect(node);
-      }
+    // Kabelsalat
+    if (fx.workletSrc !== undefined) {
+      const workletNode = getWorklet(ac, 'generic-processor', {}, { outputChannelCount: [2] });
+      chain.connect(workletNode);
+      const workletSrc = fx.workletSrc
+        .replace(/\bpat\[(\d+)\]/g, (_, i) => fx.workletInputs[i])
+        .replaceAll('sFreq', getFrequencyFromValue(value))
+        .replaceAll('sGate', `cc('strudel-gate-${chainID}')`);
+      /* global compileKabel */
+      const { src, ugens, registers } = compileKabel(workletSrc);
+      workletNode.port.postMessage({ src, schema: { ugens, registers }, start: t, gateEnd: end, end: endWithRelease });
     }
 
     if (fx.stretch !== undefined) {

packages/superdough/worklets.mjs

@@ -5,6 +5,9 @@
 import OLAProcessor from './ola-processor';
 import FFT from './fft.js';
 import { getDistortionAlgorithm } from './helpers.mjs';
+import * as ugens from '@kabelsalat/lib/src/ugens.js';
+
+const UGENS = new Map(Object.entries(ugens));
 
 const blockSize = 128;
 const PI = Math.PI;
@@ -1489,3 +1492,81 @@ class TransientProcessor extends AudioWorkletProcessor {
 }
 
 registerProcessor('transient-processor', TransientProcessor);
+
+class GenericProcessor extends AudioWorkletProcessor {
+  constructor() {
+    super();
+    this.playPos = 0;
+    const channels = 16;
+    this.outputs = new Array(channels).fill(0);
+    this.sources = new Array(channels).fill(0);
+    this.gateEnded = false;
+    this.started = false;
+    this.port.onmessage = (event) => {
+      let {
+        src,
+        schema: { ugens, registers },
+        start,
+        gateEnd,
+        end,
+      } = event.data;
+      this.start = start;
+      this.gateEnd = gateEnd;
+      this.end = end;
+      this.registers = new Array(registers).fill(0);
+      this.src = `o.fill(0); // reset outputs\n${src}`;
+      this.nodes = [];
+      for (let i = 0; i < ugens.length; i++) {
+        const ugen = ugens[i];
+        const nodeClass = UGENS.get(ugen.type);
+        const node = new nodeClass(i, ugen, sampleRate);
+        if (node.type === 'cc' && ugen.inputs?.[0]?.includes('strudel-gate')) {
+          node.setValue(1);
+          this.gateNode = node;
+        }
+        this.nodes[i] = node;
+      }
+      this.genSample = new Function(
+        'time',
+        'nodes',
+        'input',
+        'r', // registers
+        'o', // outputs
+        's', // sources
+        this.src,
+      );
+    };
+  }
+  process(inputs, outputs) {
+    const input = inputs[0]?.[0];
+    if (currentTime >= this.end) {
+      return false;
+    } else if (this.genSample === undefined || currentTime < this.start) {
+      // pending
+      return true;
+    }
+    this.started = true;
+    if (!this.gateEnded && currentTime > this.gateEnd) {
+      this.gateNode?.setValue(0);
+      this.gateEnded = true;
+    }
+    const output = outputs[0];
+    const outL = output[0];
+    const outR = output[1];
+    for (let n = 0; n < blockSize; n++) {
+      this.genSample(this.playPos, this.nodes, input ? input[n] : 0, this.registers, this.outputs, this.sources);
+      const left = this.outputs[0];
+      const right = this.outputs[1];
+      // Spread to stereo if possible; else mixdown to mono
+      if (outR) {
+        outL[n] = left;
+        outR[n] = right;
+      } else {
+        outL[n] = 0.5 * (left + right);
+      }
+      this.playPos += 1 / sampleRate;
+    }
+    return true;
+  }
+}
+registerProcessor('generic-processor', GenericProcessor);

packages/tidal/package.json

@@ -3,6 +3,7 @@
   "version": "0.2.0",
   "private": true,
   "description": "Experimental Tidal Code interpreter",
+  "main": "tidal.mjs",
   "module": "tidal.mjs",
   "repository": {
     "type": "git",

packages/transpiler/plugin-widgets.mjs

@@ -94,9 +94,6 @@ export function getWidgetID(widgetConfig) {
 
 function widgetWithLocation(node, widgetConfig) {
   const id = getWidgetID(widgetConfig);
-  // Store the unique ID back into the config so it's available for widget management
-  // This is critical for block-based evaluation to match existing widgets with new ones
-  widgetConfig.id = id;
   // add loc as identifier to first argument
   // the sliderWithID function is assumed to be sliderWithID(id, value, min?, max?)
   node.arguments.unshift({

pnpm-lock.yaml

@@ -359,13 +359,13 @@ importers:
 
   packages/hs2js:
     dependencies:
+      tree-sitter-haskell:
+        specifier: ^0.23.1
+        version: 0.23.1(tree-sitter@0.21.1)
       web-tree-sitter:
         specifier: ^0.24.7
         version: 0.24.7
     devDependencies:
-      tree-sitter-haskell:
-        specifier: ^0.23.1
-        version: 0.23.1(tree-sitter@0.21.1)
       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)
@@ -389,25 +389,6 @@ 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/kabelsalat:
-    dependencies:
-      '@kabelsalat/lib':
-        specifier: ^0.4.1
-        version: 0.4.1
-      '@kabelsalat/web':
-        specifier: ^0.4.1
-        version: 0.4.1
-      superdough:
-        specifier: workspace:*
-        version: link:../superdough
-    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)
-      vite-plugin-bundle-audioworklet:
-        specifier: workspace:*
-        version: link:../vite-plugin-bundle-audioworklet
-
   packages/midi:
     dependencies:
       '@strudel/core':
@@ -608,6 +589,12 @@ importers:
 
   packages/superdough:
     dependencies:
+      '@kabelsalat/lib':
+        specifier: ^0.4.1
+        version: 0.4.1
+      '@kabelsalat/web':
+        specifier: ^0.4.1
+        version: 0.4.1
       nanostores:
         specifier: ^0.11.3
         version: 0.11.3
@@ -834,9 +821,6 @@ importers:
       '@strudel/hydra':
         specifier: workspace:*
         version: link:../packages/hydra
-      '@strudel/kabelsalat':
-        specifier: workspace:*
-        version: link:../packages/kabelsalat
       '@strudel/midi':
         specifier: workspace:*
         version: link:../packages/midi

website/package.json

@@ -50,7 +50,6 @@
     "@strudel/webaudio": "workspace:*",
     "@strudel/mondo": "workspace:*",
     "@strudel/xen": "workspace:*",
-    "@strudel/kabelsalat": "workspace:*",
     "@supabase/supabase-js": "^2.48.1",
     "@tailwindcss/forms": "^0.5.10",
     "@tailwindcss/postcss": "^4.0.0",

website/src/repl/util.mjs

@@ -89,7 +89,6 @@ export function loadModules() {
     import('@strudel/mqtt'),
     import('@strudel/mondo'),
     import('@strudel/dough'),
-    import('@strudel/kabelsalat'),
   ];
   if (isTauri()) {
     modules = modules.concat([