Merge remote-tracking branch 'origin/main' into kabelsalat-adapter

superdough to load it

packages/codemirror/codemirror.mjs

@@ -11,7 +11,6 @@ import {
   keymap,
   lineNumbers,
 } from '@codemirror/view';
-import {repeatCharKeymap} from './repeatcharacter.mjs';
 import { persistentAtom } from '@nanostores/persistent';
 import { registerControl, repl } from '@strudel/core';
 import { cleanupDraw, Drawer } from '@strudel/draw';
@@ -25,12 +24,7 @@ import { sliderPlugin, updateSliderWidgets } from './slider.mjs';
 import { activateTheme, initTheme, theme } from './themes.mjs';
 import { isTooltipEnabled } from './tooltip.mjs';
 import { updateWidgets, widgetPlugin } from './widget.mjs';
-import {
-  deleteAllInlineBeforeCharacter,
-  InsertCharBeforeChar,
-  jumpToCharacter,
-  jumpToNextCharacter,
-} from './labelJump.mjs';
+import { jumpToCharacter } from './labelJump.mjs';
 
 export { toggleBlockComment, toggleBlockCommentByLine, toggleComment, toggleLineComment } from '@codemirror/commands';
 
@@ -50,9 +44,9 @@ export const extensions = {
   isMultiCursorEnabled: (on) =>
     on
       ? [
-        EditorState.allowMultipleSelections.of(true),
-        EditorView.clickAddsSelectionRange.of((ev) => ev.metaKey || ev.ctrlKey),
-      ]
+          EditorState.allowMultipleSelections.of(true),
+          EditorView.clickAddsSelectionRange.of((ev) => ev.metaKey || ev.ctrlKey),
+        ]
       : [],
 };
 export const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [key, new Compartment()]));
@@ -80,10 +74,6 @@ export const codemirrorSettings = persistentAtom('codemirror-settings', defaultS
   decode: JSON.parse,
 });
 
-const ANON_LABEL = '$';
-const SOLO_LABEL = 'S';
-const MUTE_LABEL = '_';
-
 // https://codemirror.net/docs/guide/
 export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, root, mondo }) {
   const settings = codemirrorSettings.get();
@@ -111,7 +101,6 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
       syntaxHighlighting(defaultHighlightStyle),
       EditorView.updateListener.of((v) => onChange(v)),
       drawSelection({ cursorBlinkRate: 0 }),
-      repeatCharKeymap,
       Prec.highest(
         keymap.of([
           {
@@ -133,74 +122,12 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
           },
           {
             key: 'Alt-w',
-            run: (view) => jumpToNextCharacter(view, ANON_LABEL, 1),
+            run: (view) => jumpToCharacter(view, '$', 1),
           },
           {
             key: 'Alt-q',
-            run: (view) => {
-              return jumpToNextCharacter(view, ANON_LABEL, -1);
-            },
+            run: (view) => jumpToCharacter(view, '$', -1),
           },
-          // clear all muted
-          {
-            key: `Alt-Ctrl-0`,
-            run: (view) => {
-              return deleteAllInlineBeforeCharacter(view, MUTE_LABEL + ANON_LABEL);
-            },
-          },
-          // clear all solod
-          {
-            key: `Alt-Shift-0`,
-            run: (view) => {
-              return deleteAllInlineBeforeCharacter(view, SOLO_LABEL + ANON_LABEL);
-            },
-          },
-          // clear all solo and mute
-          {
-            key: `Ctrl-Shift-0`,
-            run: (view) => {
-              return deleteAllInlineBeforeCharacter(view, ANON_LABEL);
-            },
-          },
-          ...Array.from({ length: 9 }).map((_, i) => {
-            let num = i + 1;
-            return {
-              key: `Alt-${num}`,
-              run: (view) => {
-                return jumpToCharacter(view, ANON_LABEL, i);
-              },
-            };
-          }),
-          // handle solo toggles 1-9
-          ...Array.from({ length: 9 }).map((_, i) => {
-            let num = i + 1;
-            return {
-              key: `Alt-Shift-${num}`,
-              run: (view) => {
-                return InsertCharBeforeChar(view, ANON_LABEL, SOLO_LABEL, i);
-              },
-            };
-          }),
-          // handle mute toggles 1-9
-          ...Array.from({ length: 9 }).map((_, i) => {
-            let num = i + 1;
-            return {
-              key: `Alt-Ctrl-${num}`,
-              run: (view) => {
-                return InsertCharBeforeChar(view, ANON_LABEL, MUTE_LABEL, i);
-              },
-            };
-          }),
-          // Handle clearing mutes and solos 1-9
-          ...Array.from({ length: 9 }).map((_, i) => {
-            let num = i + 1;
-            return {
-              key: `Ctrl-Shift-${num}`,
-              run: (view) => {
-                return InsertCharBeforeChar(view, ANON_LABEL, '', i);
-              },
-            };
-          }),
           /* {
             key: 'Ctrl-Shift-.',
             run: () => (onPanic ? onPanic() : onStop?.()),

packages/codemirror/labelJump.mjs

@@ -1,54 +1,18 @@
 import { EditorSelection } from '@codemirror/state';
 import { SearchCursor } from '@codemirror/search';
-import { EditorView } from '@codemirror/view';
-import { syntaxTree } from '@codemirror/language';
 
-/**
- * gets all of the positions of a character in a document, excluding commented out lines
- * @param { EditorState} state 
- * @param {String} character 
- * @returns {number[]}
- */
-function getCharacterPositions(state, character) {
-  const cursor = new SearchCursor(state.doc, character);
- 
-  const characterPositions = [];
-  while (!cursor.next().done) {
-
-    const linestartpos = state.doc.lineAt(cursor.value.to).from
-    if (!isLineCommentedOut(state, linestartpos)) {
-
-      characterPositions.push(cursor.value.to);
-    }
-  }
-  return characterPositions;
-}
-
-function isLineCommentedOut(state, pos) {
-
-  const line = state.doc.lineAt(pos);
-  // remove white space
-  pos = line.from + line.text.search(/\S/)
-
-  const tree = syntaxTree(state);
-  const node = tree.resolveInner(pos, 1)
-  return node.name.includes("Comment")
-}
-
-/**
- * jump to the next character in a document
- * @param {EditorView} view 
- * @param {String} character 
- * @param {number} direction 0 or 1
- * @returns {boolean}
- */
-export function jumpToNextCharacter(view, character, direction = 1) {
+export function jumpToCharacter(view, character, direction = 1) {
   const { state, dispatch } = view;
   const pos = state.selection.main.head;
+  const cursor = new SearchCursor(state.doc, character);
+
+  let characterPositions = [];
   let jumpPos;
-  const characterPositions = getCharacterPositions(state, character);
+  while (!cursor.next().done) {
+    characterPositions.push(cursor.value.to);
+  }
   if (!characterPositions.length) {
-    return true;
+    return false;
   }
   if (direction > 0) {
     jumpPos = characterPositions.find((x) => x > pos + 1) ?? characterPositions.at(0); // Loop back around for convenience
@@ -57,97 +21,11 @@ export function jumpToNextCharacter(view, character, direction = 1) {
   }
 
   if (jumpPos == null) {
-    return true;
+    return false;
   }
-  const selection = EditorSelection.cursor(jumpPos - 1);
   dispatch({
-    selection,
-    effects: EditorView.scrollIntoView(
-      selection.head,
-      { y: "start" }
-    )
+    selection: EditorSelection.cursor(jumpPos - 1),
+    scrollIntoView: true,
   });
   return true;
 }
-/**
- * 
- * @param {EditorView} view 
- * @param {String} character 
- * @param {number} index the instance of the character  
- * @returns {true}
- */
-export function jumpToCharacter(view, character, index) {
-  const { state, dispatch } = view;
-  const characterPositions = getCharacterPositions(state, character);
-  const pos = characterPositions.at(index) ?? characterPositions.at(-1);
-  if (pos == null) {
-    return true;
-  }
-
-  const selection = EditorSelection.cursor(pos - 1);
-  dispatch({
-    selection,
-    effects: EditorView.scrollIntoView(
-      selection.head,
-      { y: "start" }
-    )
-  });
-  return true;
-}
-/**
- * 
- * @param {EditorView} view 
- * @param {String} character 
- * @returns {true}
- */
-export function deleteAllInlineBeforeCharacter(view, character) {
-  const { state, dispatch } = view;
-  const characterPositions = getCharacterPositions(state, character);
-
-  const changes = [];
-  characterPositions.forEach((pos) => {
-    const line = state.doc.lineAt(pos);
-    if (state.doc.sliceString(line.from, line.from + 2) === COMMENT_STRING) {
-      return;
-    }
-    changes.push({
-      from: line.from,
-      to: pos - 1,
-      insert: '',
-    });
-  });
-  dispatch({ changes });
-  return true;
-}
-
-/**
- * 
- * @param {EditorView} view 
- * @param {String} character 
- * @param {String} character2 
- * @param {number} index 
- * @returns {true}
- */
-export function InsertCharBeforeChar(view, character, character2, index) {
-  const { state, dispatch } = view;
-
-  const changes = [];
-  const characterPositions = getCharacterPositions(state, character);
-  const labelpos = characterPositions.at(index) ?? characterPositions.at(-1);
-  const line = state.doc.lineAt(labelpos);
-
-  //delete preceeding characters
-  changes.push({
-    from: line.from,
-    to: labelpos - 1,
-    insert: '',
-  });
-
-  changes.push({
-    insert: character2,
-    from: line.from,
-  });
-
-  dispatch({ changes });
-  return true;
-}

packages/codemirror/repeatcharacter.mjs

@@ -1,55 +0,0 @@
-import { Compartment } from "@codemirror/state";
-import { keymap } from "@codemirror/view";
-
-const repeatMode = new Compartment();
-
-function repeatPreviousChar(times) {
-  return ({ state, dispatch }) => {
-    const { from, empty } = state.selection.main;
-    if (!empty || from === 0) return false;
-
-    const prevChar = state.doc.sliceString(from - 1, from);
-    const text = Array(times).fill(prevChar).join(" ");
-
-    dispatch(state.update({
-      changes: {
-        from,
-        insert: " " + text
-      }
-    }));
-
-    return true;
-  };
-}
-
-function exitRepeatMode(view) {
-  view.dispatch({
-    effects: repeatMode.reconfigure([])
-  });
-}
-
-const digitBindings = Array.from({ length: 9 }, (_, i) => ({
-  key: String(i + 1),
-  run(view) {
-    repeatPreviousChar(i + 1)(view);
-    exitRepeatMode(view);
-    return true;
-  }
-}));
-
-export const repeatCharKeymap = [
-    
-  repeatMode.of([]),
-
-  keymap.of([
-    {
-      key: "Alt-r",
-      run(view) {
-        view.dispatch({
-          effects: repeatMode.reconfigure(keymap.of(digitBindings))
-        });
-        return true;
-      }
-    }
-  ])
-];

packages/hs2js/package.json

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

packages/hs2js/src/parser.mjs

@@ -1,8 +1,6 @@
 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;
 }
@@ -12,15 +10,11 @@ let isReady = false,
 async function _loadParser() {
   await Parser.init({
     locateFile(scriptName, scriptDirectory) {
-      if (base) {
-        return `${base}${scriptName}`;
-      }
-      return treeSitterWasm;
+      return `${base}${scriptName}`;
     },
   });
   parser = new Parser();
-  let grammarUrl = base ? `${base}tree-sitter-haskell.wasm` : grammarWasm;
-  const Lang = await Parser.Language.load(grammarUrl);
+  const Lang = await Parser.Language.load(`${base}tree-sitter-haskell.wasm`);
   parser.setLanguage(Lang);
   isReady = true;
   return parser;

packages/kabelsalat/kabelsalat.mjs

@@ -0,0 +1,41 @@
+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

@@ -0,0 +1,43 @@
+{
+  "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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,83 @@
+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,8 +36,6 @@
     "vite-plugin-bundle-audioworklet": "workspace:*"
   },
   "dependencies": {
-    "@kabelsalat/lib": "^0.4.1",
-    "@kabelsalat/web": "^0.4.1",
     "nanostores": "^0.11.3"
   },
   "engines": {

packages/superdough/sampler.mjs

@@ -1,4 +1,4 @@
-import { BASE_MIDI_NOTE, getBaseURL, getCommonSampleInfo, noteToFreq, noteToMidi } from './util.mjs';
+import { getBaseURL, getCommonSampleInfo } from './util.mjs';
 import { registerSound, registerWaveTable, soundMap } from './index.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import {
@@ -14,13 +14,6 @@ import { logger } from './logger.mjs';
 const bufferCache = {}; // string: Promise<ArrayBuffer>
 const loadCache = {}; // string: Promise<ArrayBuffer>
 
-/**
- *
- * @typedef {Object} SampleMetaData
- * @property {string} url
- * @property {midi} number
- */
-
 export const getCachedBuffer = (url) => bufferCache[url];
 
 function humanFileSize(bytes, si) {
@@ -63,9 +56,8 @@ export const getDur = getDuration;
 
 export function getSampleInfo(hapValue, bank) {
   const { speed = 1.0 } = hapValue;
-  const { transpose, url, index, midi, label, baseFrequency } = getCommonSampleInfo(hapValue, bank);
-
-  const playbackRate = Math.abs(speed) * Math.pow(2, transpose / 12);
+  const { transpose, url, index, midi, label } = getCommonSampleInfo(hapValue, bank);
+  let playbackRate = Math.abs(speed) * Math.pow(2, transpose / 12);
   return { transpose, url, index, midi, label, playbackRate };
 }
 
@@ -188,12 +180,7 @@ export const processSampleMap = (sampleMap, fn, baseUrl = sampleMap._base || '')
     if (baseUrl.startsWith('github:')) {
       baseUrl = githubPath(baseUrl, '');
     }
-    /**
-     *
-     * @param {string} v
-     * @returns {SampleMetaData}
-     */
-    const fullUrl = (v) => ({ url: baseUrl + v, midi: extractMidiNoteFromString(v) });
+    const fullUrl = (v) => baseUrl + v;
     if (Array.isArray(value)) {
       //return [key, value.map(replaceUrl)];
       value = value.map(fullUrl);
@@ -404,16 +391,3 @@ export function registerSampleSource(key, bank, params) {
     registerSample(key, bank, params);
   }
 }
-
-export function extractMidiNoteFromString(str) {
-  const regex = /_([a-gA-G])([#b])?([1-9])?\b/;
-  const match = str.match(regex);
-  if (match == null) {
-    return BASE_MIDI_NOTE;
-  }
-  const base = match[1].toUpperCase();
-  const accidental = match[2] ?? '';
-  const octave_str = match[3] ?? '';
-  const parsedVal = base + accidental + octave_str;
-  return noteToMidi(parsedVal);
-}

packages/superdough/superdough.mjs

@@ -16,7 +16,6 @@ import {
   gainNode,
   getCompressor,
   getDistortion,
-  getFrequencyFromValue,
   getLfo,
   getWorklet,
   releaseAudioNode,
@@ -63,6 +62,11 @@ 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) {
@@ -260,14 +264,6 @@ 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 {
@@ -314,7 +310,6 @@ export async function initAudio(options = {}) {
   } catch (err) {
     console.warn('could not load AudioWorklet effects', err);
   }
-  await initKabelsalat();
   logger('[superdough] ready');
 }
 let audioReady;
@@ -450,14 +445,6 @@ 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: {} };
@@ -633,17 +620,21 @@ 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);
 
-    // 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 });
+    // 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);
+      }
     }
 
     if (fx.stretch !== undefined) {

packages/superdough/util.mjs

@@ -19,12 +19,7 @@ const accs = { '#': 1, b: -1, s: 1, f: -1 };
 export const getAccidentalsOffset = (accidentals) => {
   return accidentals?.split('').reduce((o, char) => o + accs[char], 0) || 0;
 };
-/**
- *
- * @param {string} note
- * @param {number} defaultOctave
- * @returns {number}
- */
+
 export const noteToMidi = (note, defaultOctave = 3) => {
   const [pc, acc, oct = defaultOctave] = tokenizeNote(note);
   if (!pc) {
@@ -34,11 +29,6 @@ export const noteToMidi = (note, defaultOctave = 3) => {
   const offset = getAccidentalsOffset(acc);
   return (Number(oct) + 1) * 12 + chroma + offset;
 };
-/**
- *
- * @param {number} n
- * @returns {number}
- */
 export const midiToFreq = (n) => {
   return Math.pow(2, (n - 69) / 12) * 440;
 };
@@ -48,17 +38,7 @@ export const freqToMidi = (freq) => {
   return (12 * Math.log(freq / 440)) / Math.LN2 + 69;
 };
 
-/**
- *
- * @param {string} note
- * @param {number} defaultOctave
- * @returns {number}
- */
-
-export const noteToFreq = (note, defaultOctave = 3) => {
-  return midiToFreq(noteToMidi(note, defaultOctave));
-};
-function __valueToMidi(value) {
+export const valueToMidi = (value, fallbackValue) => {
   if (typeof value !== 'object') {
     throw new Error('valueToMidi: expected object value');
   }
@@ -72,15 +52,10 @@ function __valueToMidi(value) {
   if (typeof note === 'number') {
     return note;
   }
-  return;
-}
-
-export const valueToMidi = (value, fallbackValue) => {
-  const parsedValue = __valueToMidi(value) ?? fallbackValue;
-  if (parsedValue == null) {
+  if (!fallbackValue) {
     throw new Error('valueToMidi: expected freq or note to be set');
   }
-  return parsedValue;
+  return fallbackValue;
 };
 
 export function nanFallback(value, fallback = 0, silent) {
@@ -109,18 +84,15 @@ export function secondsToCycle(t, cps) {
 // deduces relevant info for sample loading from hap.value and sample definition
 // it encapsulates the core sampler logic into a pure and synchronous function
 // hapValue: Hap.value, bank: sample bank definition for sound "s" (values in strudel.json format)
-export const BASE_MIDI_NOTE = 36;
-
 export function getCommonSampleInfo(hapValue, bank) {
   const { s, n = 0 } = hapValue;
-  const maybeMidiNote = __valueToMidi(hapValue);
-  const midi = maybeMidiNote ?? BASE_MIDI_NOTE;
-  let transpose = midi - BASE_MIDI_NOTE; // C3 is middle C;
+  let midi = valueToMidi(hapValue, 36);
+  let transpose = midi - 36; // C3 is middle C;
+  let url;
   let index = 0;
-  let samplemeta;
   if (Array.isArray(bank)) {
     index = getSoundIndex(n, bank.length);
-    samplemeta = bank[index];
+    url = bank[index];
   } else {
     const midiDiff = (noteA) => noteToMidi(noteA) - midi;
     // object format will expect keys as notes
@@ -132,14 +104,10 @@ export function getCommonSampleInfo(hapValue, bank) {
       );
     transpose = -midiDiff(closest); // semitones to repitch
     index = getSoundIndex(n, bank[closest].length);
-    samplemeta = bank[closest][index];
+    url = bank[closest][index];
   }
   const label = `${s}:${index}`;
-  if (maybeMidiNote != null) {
-    transpose = transpose + (BASE_MIDI_NOTE - samplemeta.midi);
-  }
-
-  return { transpose, index, midi, label, url: samplemeta.url };
+  return { transpose, url, index, midi, label };
 }
 
 /** Selects entries from `source` and renames them via `map`

packages/superdough/worklets.mjs

@@ -5,9 +5,6 @@
 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;
@@ -1492,81 +1489,3 @@ 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,7 +3,6 @@
   "version": "0.2.0",
   "private": true,
   "description": "Experimental Tidal Code interpreter",
-  "main": "tidal.mjs",
   "module": "tidal.mjs",
   "repository": {
     "type": "git",

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,6 +389,25 @@ 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':
@@ -589,12 +608,6 @@ 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
@@ -821,6 +834,9 @@ 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,6 +50,7 @@
     "@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/components/panel/PatternsTab.jsx

@@ -9,7 +9,9 @@ import {
   userPattern,
 } from '../../../user_pattern_utils.mjs';
 import { useMemo, useRef } from 'react';
+import { getMetadata } from '../../../metadata_parser.js';
 import { useExamplePatterns } from '../../useExamplePatterns.jsx';
+import { parseJSON, isUdels } from '../../util.mjs';
 import { useSettings } from '../../../settings.mjs';
 import { ActionButton } from '../button/action-button.jsx';
 import { Pagination } from '../pagination/Pagination.jsx';
@@ -18,13 +20,8 @@ import { useDebounce } from '../usedebounce.jsx';
 import cx from '@src/cx.mjs';
 import { Textbox } from '@src/repl/components/panel/SettingsTab.jsx';
 
-const PATTERN_SORT = {
-  "NEWEST": "most recent",
-  "A-Z": "A-Z",
-}
-
 export function PatternLabel({ pattern } /* : { pattern: Tables<'code'> } */) {
-  const meta = pattern.meta
+  const meta = useMemo(() => getMetadata(pattern.code), [pattern]);
 
   let title = meta.title;
   if (title == null) {
@@ -61,10 +58,6 @@ function PatternButtons({ patterns, activePattern, onClick, started }) {
   return (
     <div className="p-2">
       {Object.values(patterns)
-        .sort((a, b) => {
-          return (b.meta.title ?? "").localeCompare(a.meta.title ?? "")
-
-        })
         .reverse()
         .map((pattern) => {
           const id = pattern.id;
@@ -100,7 +93,7 @@ export function PatternsTab({ context }) {
     }
     return Object.fromEntries(
       Object.entries(userPatterns).filter(([_key, pattern]) => {
-        const meta = pattern.meta;
+        const meta = getMetadata(pattern.code);
 
         // Search for specific meta keys
         const searchLowercaseTrimmed = search.trim().toLowerCase();

website/src/repl/idbutils.mjs

@@ -1,4 +1,4 @@
-import { extractMidiNoteFromString, registerSampleSource } from '@strudel/webaudio';
+import { registerSampleSource } from '@strudel/webaudio';
 import { isAudioFile } from './files.mjs';
 import { logger } from '@strudel/core';
 
@@ -47,7 +47,7 @@ export function registerSamplesFromDB(config = userSamplesDBConfig, onComplete =
       Promise.all(
         [...soundFiles]
           .sort((a, b) => a.title.localeCompare(b.title, undefined, { numeric: true, sensitivity: 'base' }))
-          .map((soundFile) => {
+          .map((soundFile, i) => {
             const title = soundFile.title;
             if (!isAudioFile(title)) {
               return;
@@ -58,26 +58,25 @@ export function registerSamplesFromDB(config = userSamplesDBConfig, onComplete =
               splitRelativePath[splitRelativePath.length - 2] ?? soundFile.id.split(/\W+/)[0] ?? 'user';
             const blob = soundFile.blob;
 
-            return blobToDataUrl(blob).then((path) => {
-              const sampleInfoMap = sounds.get(parentDirectory) ?? new Map();
-              const midi = extractMidiNoteFromString(title);
-              /** @type {import('@strudel/webaudio').SampleMetaData} */
-              const samplemetadata = { url: path, midi };
-              sampleInfoMap.set(title, samplemetadata);
+            return blobToDataUrl(blob).then((soundPath) => {
+              const titlePathMap = sounds.get(parentDirectory) ?? new Map();
 
-              sounds.set(parentDirectory, sampleInfoMap);
+              titlePathMap.set(title, soundPath);
+
+              sounds.set(parentDirectory, titlePathMap);
               return;
             });
           }),
       )
         .then(() => {
-          sounds.forEach((sampleInfoMap, key) => {
-            const bank = Array.from(sampleInfoMap.keys())
+          sounds.forEach((titlePathMap, key) => {
+            const value = Array.from(titlePathMap.keys())
               .sort((a, b) => {
                 return a.localeCompare(b);
               })
-              .map((title) => sampleInfoMap.get(title));
-            registerSampleSource(key, bank, { prebake: false });
+              .map((title) => titlePathMap.get(title));
+
+            registerSampleSource(key, value, { prebake: false });
           });
 
           logger('imported sounds registered!', 'success');

website/src/repl/util.mjs

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

website/src/settings.mjs

@@ -3,7 +3,6 @@ import { useStore } from '@nanostores/react';
 import { register } from '@strudel/core';
 import { isUdels } from './repl/util.mjs';
 import { computed } from 'nanostores';
-import { getMetadata } from './metadata_parser';
 
 export const audioEngineTargets = {
   webaudio: 'webaudio',
@@ -19,10 +18,6 @@ export const soundFilterType = {
   ALL: 'all',
 };
 
-export const PATTERN_SORT = {
-  "NEWEST": "most recent",
-  "A-Z": "A-Z",
-}
 const initialPrebakeScript = `// Prebake script
 //
 // This is code that is loaded before your pattern is run.
@@ -90,7 +85,6 @@ export const $settings = computed(settingsMap, (state) => {
   Object.keys(userPatterns).forEach((key) => {
     const data = userPatterns[key];
     data.id = data.id ?? key;
-    data.meta = getMetadata(data.code)
     userPatterns[key] = data;
   });
   return {