Revert "thingie to display current pattern value"

This reverts commit 989b5dcc3a.

.forgejo/workflows/deploy-warm-beta.yml

@@ -1,40 +0,0 @@
-name: Build and Deploy to beta (warm.strudel.cc)
-
-on:
-  push:
-    branches:
-      - main
-
-# Allow one concurrent deployment
-concurrency:
-  group: "pages"
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: docker
-    env:
-      SSH_PRIVATE_KEY: ${{ secrets.SSH_PRIVATE_KEY }}
-    steps:
-      - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 9.12.2
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          # cache: "pnpm"
-      - name: Install Dependencies
-        run: pnpm install
-
-      - name: Build
-        run: pnpm build
-
-      - name: Deploy
-        run: |
-          eval $(ssh-agent -s)
-          echo "$SSH_PRIVATE_KEY" | ssh-add -
-          apt update && apt install -y rsync
-          mkdir ~/.ssh
-          ssh-keyscan matrix.toplap.org  > ~/.ssh/known_hosts
-          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy/warm.strudel.cc

.forgejo/workflows/deploy.yml

@@ -1,4 +1,4 @@
-name: Build and Deploy to live (strudel.cc)
+name: Build and Deploy
 
 on: [workflow_dispatch]
 
@@ -34,4 +34,4 @@ jobs:
           apt update && apt install -y rsync
           mkdir ~/.ssh
           ssh-keyscan matrix.toplap.org  > ~/.ssh/known_hosts
-          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy/strudel.cc
+          rsync -atv --delete --delete-after --progress ./website/dist/ strudel@matrix.toplap.org:/home/strudel/deploy

.gitignore

@@ -45,20 +45,6 @@ tidal-drum-machines
 webaudiofontdata
 src-tauri/target
 
-
-
-### BEGIN Visual Studio Code ###
-# Blanket, recursive exclude for .vscode directory and files
-.vscode/**/*
-# Unexclude specific files and directories within .vscode
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-### END Visual Studio Code ###
-
-
-
 # BEGIN JetBrains -> END JetBrains
 
 # for JetBrains IDE users, e.g. WebStorm. Source: https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore

.nvmrc

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

CONTRIBUTING.md

@@ -4,13 +4,20 @@ Thanks for wanting to contribute!!! There are many ways you can add value to thi
 
 ## Move to codeberg
 
-Along with many other live coding projects, we have moved from Microsoft's Github platform to Codeberg for ethical reasons. Please don't fork the project back to github.
+We are currently in the process of moving from github to codeberg -- not everything is working, please bear with us.
+
+To update your local clone, you can run this command:
+
+```
+git remote set-url origin git@codeberg.org:uzu/strudel.git
+```
+
 
 ## Communication Channels
 
-To get in touch with the community, either
+To get in touch with the contributors, either
 
-- [join the Uzulang Discord Server](https://discord.com/invite/HGEdXmRkzT) and go to the strudel channels (Uzulangs are a family of live coding languages inspired by each other, including TidalCycles as well as Strudel)
+- [join the Tidal Discord Channel](https://discord.com/invite/HGEdXmRkzT) and go to the #strudel channel
 - Find related discussions on the [tidal club forum](https://club.tidalcycles.org/)
 
 ## Ask a Question
@@ -29,35 +36,22 @@ Use one of the Communication Channels listed above and drop us a line or two!
 ## Share Music
 
 If you made some music with strudel, you can give back some love and share what you've done!
+Your creation could also be part of the random selection in the REPL if you want.
 Use one of the Communication Channels listed above.
-(There used to be a random selection of contributed patterns in the REPL, but that is unfortunately disabled for now due to abuse)
 
 ## Improve the Docs
 
-If you find some weak spots in the [docs](https://strudel.cc/workshop/getting-started/), you can edit each file directly on codeberg. There are "Edit this page" links in the right sidebar that take you to the right place.
+If you find some weak spots in the [docs](https://strudel.cc/workshop/getting-started/),
+you can edit each file directly on codeburg. (we are currently fixing the "Edit this page" links in the right sidebar)
 
 ## Propose a Feature
 
-If you want a specific feature that is not part of strudel yet, feel free to use one of the communication channels above. Please bear in mind that this is a free/open source project, oriented around collaborative discussion. Maybe you even want to help with the implementation of that feature!
-
-## Contribute a feature
-
-Pull requests welcome! Consider starting with discussion or proof-of-concept first, rather than do loads of work on something and then find it doesn't fit the collective goals of the project, or something like that.
-
-At the time of writing we have a PR backlog, and generally prioritise bugfixes and contributions that have arisen through community discussion.
-
-### AI/LLM policy
-
-Strudel is a project handmade by humans, with thought and nuance. 
-
-If you have used LLMs (so called 'AI'), please detail that in the pull request. We are still developing our response to the onslaught of LLM technology, but for practical and legal reasons are currently not accepting wholly LLM-generated code. We are also not accepting PRs that add LLM features to strudel itself.
-
-There are #llm-chat and #llm-share channels on our discord. Please do not discuss or share LLM-related things outside of those channels.
+If you want a specific feature that is not part of strudel yet, feel free to use one of the communication channels above.
+Maybe you even want to help with the implementation of that feature!
 
 ## Report a Bug
 
 If you've found a bug, or some behaviour that does not seem right, you are welcome to file an [issue](https://codeberg.org/uzu/strudel/issues).
-
 Please check that it has not been reported before.
 
 ## Fix a Bug
@@ -124,7 +118,8 @@ There are also eslint extensions / plugins for most editors.
 
 ## Running all CI Checks
 
-When opening a PR, the CI runner will (once approved by a human) check the code style and eslint, as well as run all tests. You can run the same check with `pnpm check`.
+When opening a PR, the CI runner will automatically check the code style and eslint, as well as run all tests.
+You can run the same check with `pnpm check`
 
 ## Package Workflow
 

README.md

@@ -1,22 +1,19 @@
 # strudel
 
 Live coding patterns on the web
-
+https://strudel.cc/
 
 - Try it here: <https://strudel.cc>
 - Docs: <https://strudel.cc/learn>
-- Source: https://codeberg.org/uzu/strudel/
-  * Along with many other live coding projects, we have moved from Microsoft's Github platform to Codeberg for ethical reasons. **Please don't fork the project back to github**.
 - Technical Blog Post: <https://loophole-letters.vercel.app/strudel>
 - 1 Year of Strudel Blog Post: <https://loophole-letters.vercel.app/strudel1year>
 - 2 Years of Strudel Blog Post: <https://strudel.cc/blog/#year-2>
 
-
 ## Running Locally
 
 After cloning the project, you can run the REPL locally:
 
-1. Install [Node.js](https://nodejs.org/) 18 or newer
+1. Install [Node.js](https://nodejs.org/)
 2. Install [pnpm](https://pnpm.io/installation)
 3. Install dependencies by running the following command:
    ```bash

examples/buildless/web-component-no-iframe.html

@@ -1,5 +1,4 @@
-<script src="https://unpkg.com/@strudel/repl@1.2.7"></script>
-<!-- <script src="../../packages/repl/dist/index.js"></script> -->
+<script src="https://unpkg.com/@strudel/repl@1.0.2"></script>
 <strudel-editor>
   <!--
 // @date 23-08-15

examples/codemirror-repl/package.json

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

examples/headless-repl/package.json

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

examples/minimal-repl/package.json

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

examples/superdough/package.json

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

examples/tidal-repl/package.json

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

lerna-debug.log

@@ -1,211 +0,0 @@
-0 silly argv {
-0 silly argv   _: [ 'version' ],
-0 silly argv   private: false,
-0 silly argv   lernaVersion: '8.1.9',
-0 silly argv   '$0': 'node_modules/lerna/dist/cli.js'
-0 silly argv }
-1 notice cli v8.1.9
-2 verbose packageConfigs Explicit "packages" configuration found in lerna.json. Resolving packages using the configured glob(s): ["packages/*"]
-3 verbose rootPath /Users/jaderose/Documents/Github/cstrudel/strudel
-4 info versioning independent
-5 silly isAnythingCommitted
-6 verbose isAnythingCommitted 1
-7 silly getCurrentBranch
-8 verbose currentBranch main
-9 silly remoteBranchExists
-10 silly isBehindUpstream
-11 silly isBehindUpstream main is behind origin/main by 0 commit(s) and ahead by 4
-12 silly hasTags
-13 verbose hasTags true
-14 silly git-describe.sync "@strudel/codemirror@1.2.7-4-ga3ac9646" => {"lastTagName":"@strudel/codemirror@1.2.7","lastVersion":"1.2.7","refCount":"4","sha":"a3ac9646","isDirty":false}
-15 info Looking for changed packages since @strudel/codemirror@1.2.7
-16 silly checking diff packages/codemirror
-17 silly no diff found in @strudel/codemirror
-18 silly checking diff packages/core
-19 silly no diff found in @strudel/core
-20 silly checking diff packages/csound
-21 silly no diff found in @strudel/csound
-22 silly checking diff packages/desktopbridge
-23 silly no diff found in @strudel/desktopbridge
-24 silly checking diff packages/draw
-25 silly no diff found in @strudel/draw
-26 silly checking diff packages/embed
-27 silly no diff found in @strudel/embed
-28 silly checking diff packages/gamepad
-29 silly no diff found in @strudel/gamepad
-30 silly checking diff packages/hs2js
-31 silly no diff found in hs2js
-32 silly checking diff packages/hydra
-33 silly no diff found in @strudel/hydra
-34 silly checking diff packages/midi
-35 silly no diff found in @strudel/midi
-36 silly checking diff packages/mini
-37 silly no diff found in @strudel/mini
-38 silly checking diff packages/mondo
-39 silly no diff found in mondolang
-40 silly checking diff packages/mondough
-41 silly no diff found in @strudel/mondo
-42 silly checking diff packages/motion
-43 silly no diff found in @strudel/motion
-44 silly checking diff packages/mqtt
-45 silly no diff found in @strudel/mqtt
-46 silly checking diff packages/osc
-47 silly found diff in packages/osc/server.js
-48 verbose filtered diff [ 'packages/osc/server.js' ]
-49 silly checking diff packages/reference
-50 silly no diff found in @strudel/reference
-51 silly checking diff packages/repl
-52 silly no diff found in @strudel/repl
-53 silly checking diff packages/sampler
-54 silly no diff found in @strudel/sampler
-55 silly checking diff packages/serial
-56 silly no diff found in @strudel/serial
-57 silly checking diff packages/soundfonts
-58 silly no diff found in @strudel/soundfonts
-59 silly checking diff packages/superdough
-60 silly found diff in packages/superdough/package.json
-61 verbose filtered diff [ 'packages/superdough/package.json' ]
-62 silly checking diff packages/supradough
-63 silly found diff in packages/supradough/package.json
-64 verbose filtered diff [ 'packages/supradough/package.json' ]
-65 silly checking diff packages/tidal
-66 silly no diff found in @strudel/tidal
-67 silly checking diff packages/tonal
-68 silly no diff found in @strudel/tonal
-69 silly checking diff packages/transpiler
-70 silly no diff found in @strudel/transpiler
-71 silly checking diff packages/vite-plugin-bundle-audioworklet
-72 silly no diff found in vite-plugin-bundle-audioworklet
-73 silly checking diff packages/web
-74 silly no diff found in @strudel/web
-75 silly checking diff packages/webaudio
-76 silly found diff in packages/webaudio/package.json
-77 verbose filtered diff [ 'packages/webaudio/package.json' ]
-78 silly checking diff packages/xen
-79 silly no diff found in @strudel/xen
-80 verbose updated @strudel/codemirror
-81 verbose updated @strudel/csound
-82 verbose updated @strudel/midi
-83 verbose updated @strudel/osc
-84 verbose updated @strudel/repl
-85 verbose updated @strudel/soundfonts
-86 verbose updated superdough
-87 verbose updated supradough
-88 verbose updated @strudel/web
-89 verbose updated @strudel/webaudio
-90 verbose git-describe undefined => "@strudel/codemirror@1.2.7-4-ga3ac9646"
-91 silly git-describe parsed => {"lastTagName":"@strudel/codemirror@1.2.7","lastVersion":"1.2.7","refCount":"4","sha":"a3ac9646","isDirty":false}
-92 info execute Skipping releases
-93 silly lifecycle No script for "preversion" in "@strudel/monorepo", continuing
-94 silly lifecycle No script for "preversion" in "@strudel/osc", continuing
-95 silly lifecycle No script for "preversion" in "superdough", continuing
-96 silly lifecycle No script for "preversion" in "supradough", continuing
-97 verbose version supradough has no lockfile. Skipping lockfile update.
-98 verbose version @strudel/osc has no lockfile. Skipping lockfile update.
-99 verbose version superdough has no lockfile. Skipping lockfile update.
-100 silly lifecycle No script for "version" in "supradough", continuing
-101 silly lifecycle No script for "version" in "superdough", continuing
-102 silly lifecycle No script for "preversion" in "@strudel/codemirror", continuing
-103 silly lifecycle No script for "preversion" in "@strudel/webaudio", continuing
-104 silly lifecycle No script for "version" in "@strudel/osc", continuing
-105 verbose version @strudel/webaudio has no lockfile. Skipping lockfile update.
-106 verbose version @strudel/codemirror has no lockfile. Skipping lockfile update.
-107 silly lifecycle No script for "version" in "@strudel/codemirror", continuing
-108 silly lifecycle No script for "version" in "@strudel/webaudio", continuing
-109 silly lifecycle No script for "preversion" in "@strudel/csound", continuing
-110 silly lifecycle No script for "preversion" in "@strudel/midi", continuing
-111 silly lifecycle No script for "preversion" in "@strudel/soundfonts", continuing
-112 silly lifecycle No script for "preversion" in "@strudel/web", continuing
-113 verbose version @strudel/csound has no lockfile. Skipping lockfile update.
-114 verbose version @strudel/midi has no lockfile. Skipping lockfile update.
-115 verbose version @strudel/soundfonts has no lockfile. Skipping lockfile update.
-116 verbose version @strudel/web has no lockfile. Skipping lockfile update.
-117 silly lifecycle No script for "version" in "@strudel/midi", continuing
-118 silly lifecycle No script for "version" in "@strudel/csound", continuing
-119 silly lifecycle No script for "version" in "@strudel/soundfonts", continuing
-120 silly lifecycle No script for "preversion" in "@strudel/repl", continuing
-121 verbose version @strudel/repl has no lockfile. Skipping lockfile update.
-122 silly lifecycle No script for "version" in "@strudel/web", continuing
-123 silly lifecycle No script for "version" in "@strudel/repl", continuing
-124 silly lifecycle No script for "version" in "@strudel/monorepo", continuing
-125 verbose version Updating root pnpm-lock.yaml
-126 silly version Skipped applying prettier to ignored file: packages/supradough/package.json
-127 silly version Skipped applying prettier to ignored file: packages/superdough/package.json
-128 silly version Skipped applying prettier to ignored file: packages/osc/package.json
-129 silly version Skipped applying prettier to ignored file: packages/codemirror/package.json
-130 silly version Skipped applying prettier to ignored file: packages/webaudio/package.json
-131 silly version Skipped applying prettier to ignored file: packages/midi/package.json
-132 silly version Skipped applying prettier to ignored file: packages/csound/package.json
-133 silly version Skipped applying prettier to ignored file: packages/soundfonts/package.json
-134 silly version Skipped applying prettier to ignored file: packages/web/package.json
-135 silly version Skipped applying prettier to ignored file: packages/repl/package.json
-136 silly version Skipped applying prettier to ignored file: pnpm-lock.yaml
-137 silly gitAdd [
-137 silly gitAdd   'packages/supradough/package.json',
-137 silly gitAdd   'packages/superdough/package.json',
-137 silly gitAdd   'packages/osc/package.json',
-137 silly gitAdd   'packages/codemirror/package.json',
-137 silly gitAdd   'packages/webaudio/package.json',
-137 silly gitAdd   'packages/midi/package.json',
-137 silly gitAdd   'packages/csound/package.json',
-137 silly gitAdd   'packages/soundfonts/package.json',
-137 silly gitAdd   'packages/web/package.json',
-137 silly gitAdd   'packages/repl/package.json',
-137 silly gitAdd   'pnpm-lock.yaml'
-137 silly gitAdd ]
-138 silly gitCommit Publish
-138 silly gitCommit
-138 silly gitCommit  - @strudel/codemirror@1.2.8
-138 silly gitCommit  - @strudel/csound@1.2.8
-138 silly gitCommit  - @strudel/midi@1.2.8
-138 silly gitCommit  - @strudel/osc@1.3.2
-138 silly gitCommit  - @strudel/repl@1.2.9
-138 silly gitCommit  - @strudel/soundfonts@1.2.8
-138 silly gitCommit  - superdough@1.2.5
-138 silly gitCommit  - supradough@1.2.4
-138 silly gitCommit  - @strudel/web@1.2.8
-138 silly gitCommit  - @strudel/webaudio@1.2.9
-139 verbose git [
-139 verbose git   'commit',
-139 verbose git   '-F',
-139 verbose git   '/private/var/folders/hc/yf_zr55547sbcpz5rj7q85sc0000gn/T/3c85b5d4-56ae-40e9-8df7-db2bc1048402/lerna-commit.txt'
-139 verbose git ]
-140 silly gitTag @strudel/codemirror@1.2.8 git tag %s -m %s
-141 verbose git [
-141 verbose git   'tag',
-141 verbose git   '@strudel/codemirror@1.2.8',
-141 verbose git   '-m',
-141 verbose git   '@strudel/codemirror@1.2.8'
-141 verbose git ]
-142 silly gitTag @strudel/csound@1.2.8 git tag %s -m %s
-143 verbose git [ 'tag', '@strudel/csound@1.2.8', '-m', '@strudel/csound@1.2.8' ]
-144 silly gitTag @strudel/midi@1.2.8 git tag %s -m %s
-145 verbose git [ 'tag', '@strudel/midi@1.2.8', '-m', '@strudel/midi@1.2.8' ]
-146 silly gitTag @strudel/osc@1.3.2 git tag %s -m %s
-147 verbose git [ 'tag', '@strudel/osc@1.3.2', '-m', '@strudel/osc@1.3.2' ]
-148 silly gitTag @strudel/repl@1.2.9 git tag %s -m %s
-149 verbose git [ 'tag', '@strudel/repl@1.2.9', '-m', '@strudel/repl@1.2.9' ]
-150 silly gitTag @strudel/soundfonts@1.2.8 git tag %s -m %s
-151 verbose git [
-151 verbose git   'tag',
-151 verbose git   '@strudel/soundfonts@1.2.8',
-151 verbose git   '-m',
-151 verbose git   '@strudel/soundfonts@1.2.8'
-151 verbose git ]
-152 silly gitTag superdough@1.2.5 git tag %s -m %s
-153 verbose git [ 'tag', 'superdough@1.2.5', '-m', 'superdough@1.2.5' ]
-154 silly gitTag supradough@1.2.4 git tag %s -m %s
-155 verbose git [ 'tag', 'supradough@1.2.4', '-m', 'supradough@1.2.4' ]
-156 silly gitTag @strudel/web@1.2.8 git tag %s -m %s
-157 verbose git [ 'tag', '@strudel/web@1.2.8', '-m', '@strudel/web@1.2.8' ]
-158 silly gitTag @strudel/webaudio@1.2.9 git tag %s -m %s
-159 verbose git [ 'tag', '@strudel/webaudio@1.2.9', '-m', '@strudel/webaudio@1.2.9' ]
-160 error Error: Command failed with exit code 128: git tag superdough@1.2.5 -m superdough@1.2.5
-160 error fatal: tag 'superdough@1.2.5' already exists
-160 error     at makeError (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/execa@5.0.0/node_modules/execa/lib/error.js:59:11)
-160 error     at handlePromise (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/execa@5.0.0/node_modules/execa/index.js:114:26)
-160 error     at process.processTicksAndRejections (node:internal/process/task_queues:105:5)
-160 error     at async Promise.all (index 6)
-160 error     at async VersionCommand.gitCommitAndTagVersionForUpdates (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/lerna@8.1.9_encoding@0.1.13/node_modules/lerna/dist/index.js:9957:11)
-160 error     at async VersionCommand.commitAndTagUpdates (/Users/jaderose/Documents/Github/cstrudel/strudel/node_modules/.pnpm/lerna@8.1.9_encoding@0.1.13/node_modules/lerna/dist/index.js:9933:18)
-160 error     at async Promise.all (index 0)

package.json

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

packages/codemirror/autocomplete.mjs

@@ -1,11 +1,6 @@
 import jsdoc from '../../doc.json';
 import { autocompletion } from '@codemirror/autocomplete';
 import { h } from './html';
-//TODO: fix tonal scale import
-// import { Scale } from '@tonaljs/tonal';
-// import { soundMap } from '@strudel/webaudio';
-let soundMap = undefined;
-import { complex } from '@strudel/tonal';
 
 const escapeHtml = (str) => {
   const div = document.createElement('div');
@@ -80,53 +75,6 @@ const isValidDoc = (doc) => {
 const hasExcludedTags = (doc) =>
   ['superdirtOnly', 'noAutocomplete'].some((tag) => doc.tags?.find((t) => t.originalTitle === tag));
 
-export function bankCompletions() {
-  // TODO: FIX IMPORT
-  const soundDict = soundMap?.get() ?? {};
-
-  const banks = new Set();
-  for (const key of Object.keys(soundDict)) {
-    const [bank, suffix] = key.split('_');
-    if (suffix && bank) banks.add(bank);
-  }
-  return Array.from(banks)
-    .sort()
-    .map((name) => ({ label: name, type: 'bank' }));
-}
-
-// Attempt to get all scale names from Tonal TODO: FIX IMPORT
-let scaleCompletions = [];
-// try {
-//   scaleCompletions = (Scale.names ? Scale.names() : []).map((name) => ({ label: name, type: 'scale' }));
-// } catch (e) {
-//   console.warn('[autocomplete] Could not load scale names from Tonal:', e);
-// }
-
-// Valid mode values for voicing
-const modeCompletions = [
-  { label: 'below', type: 'mode' },
-  { label: 'above', type: 'mode' },
-  { label: 'duck', type: 'mode' },
-  { label: 'root', type: 'mode' },
-];
-
-// Valid chord symbols from ireal dictionary plus empty string for major triads
-const chordSymbols = ['', ...Object.keys(complex)].sort();
-const chordSymbolCompletions = chordSymbols.map((symbol) => {
-  if (symbol === '') {
-    return {
-      label: 'major',
-      apply: '',
-      type: 'chord-symbol',
-    };
-  }
-  return {
-    label: symbol,
-    apply: symbol,
-    type: 'chord-symbol',
-  };
-});
-
 export const getSynonymDoc = (doc, synonym) => {
   const synonyms = doc.synonyms || [];
   const docLabel = getDocLabel(doc);
@@ -165,299 +113,19 @@ const jsdocCompletions = (() => {
   return completions;
 })();
 
-// --- Handler functions for each context ---
-const pitchNames = [
-  'C',
-  'C#',
-  'Db',
-  'D',
-  'D#',
-  'Eb',
-  'E',
-  'E#',
-  'Fb',
-  'F',
-  'F#',
-  'Gb',
-  'G',
-  'G#',
-  'Ab',
-  'A',
-  'A#',
-  'Bb',
-  'B',
-  'B#',
-  'Cb',
-];
-
-// Cached regex patterns for scaleHandler
-const SCALE_NO_QUOTES_REGEX = /scale\(\s*$/;
-const SCALE_AFTER_COLON_REGEX = /scale\(\s*['"][^'"]*:[^'"]*$/;
-const SCALE_PRE_COLON_REGEX = /scale\(\s*['"][^'"]*$/;
-const SCALE_PITCH_MATCH_REGEX = /([A-Ga-g][#b]*)?$/;
-const SCALE_SPACES_TO_COLON_REGEX = /\s+/g;
-
-function scaleHandler(context) {
-  // First check for scale context without quotes - block with empty completions
-  let scaleNoQuotesContext = context.matchBefore(SCALE_NO_QUOTES_REGEX);
-  if (scaleNoQuotesContext) {
-    return {
-      from: scaleNoQuotesContext.to,
-      options: [],
-    };
-  }
-
-  // Check for after-colon context first (more specific)
-  let scaleAfterColonContext = context.matchBefore(SCALE_AFTER_COLON_REGEX);
-  if (scaleAfterColonContext) {
-    const text = scaleAfterColonContext.text;
-    const colonIdx = text.lastIndexOf(':');
-    if (colonIdx !== -1) {
-      const fragment = text.slice(colonIdx + 1);
-      const filteredScales = scaleCompletions.filter((s) => s.label.startsWith(fragment));
-      const options = filteredScales.map((s) => ({
-        ...s,
-        apply: s.label.replace(SCALE_SPACES_TO_COLON_REGEX, ':'),
-      }));
-      const from = scaleAfterColonContext.from + colonIdx + 1;
-      return {
-        from,
-        options,
-      };
-    }
-  }
-
-  // Then check for pre-colon context
-  let scalePreColonContext = context.matchBefore(SCALE_PRE_COLON_REGEX);
-  if (scalePreColonContext) {
-    if (!scalePreColonContext.text.includes(':')) {
-      if (context.explicit) {
-        const text = scalePreColonContext.text;
-        const match = text.match(SCALE_PITCH_MATCH_REGEX);
-        const fragment = match ? match[0] : '';
-        const filtered = pitchNames.filter((p) => p.toLowerCase().startsWith(fragment.toLowerCase()));
-        const from = scalePreColonContext.to - fragment.length;
-        const options = filtered.map((p) => ({ label: p, type: 'pitch' }));
-        return { from, options };
-      } else {
-        return { from: scalePreColonContext.to, options: [] };
-      }
-    }
-  }
-  return null;
-}
-
-// Cached regex patterns for soundHandler
-const SOUND_NO_QUOTES_REGEX = /(s|sound)\(\s*$/;
-const SOUND_WITH_QUOTES_REGEX = /(s|sound)\(\s*['"][^'"]*$/;
-const SOUND_FRAGMENT_MATCH_REGEX = /(?:[\s[{(<])([\w]*)$/;
-
-function soundHandler(context) {
-  // First check for sound context without quotes - block with empty completions
-  let soundNoQuotesContext = context.matchBefore(SOUND_NO_QUOTES_REGEX);
-  if (soundNoQuotesContext) {
-    return {
-      from: soundNoQuotesContext.to,
-      options: [],
-    };
-  }
-
-  // Then check for sound context with quotes - provide completions
-  let soundContext = context.matchBefore(SOUND_WITH_QUOTES_REGEX);
-  if (!soundContext) return null;
-
-  const text = soundContext.text;
-  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
-  if (quoteIdx === -1) return null;
-  const inside = text.slice(quoteIdx + 1);
-  const fragMatch = inside.match(SOUND_FRAGMENT_MATCH_REGEX);
-  const fragment = fragMatch ? fragMatch[1] : inside;
-  const soundNames = Object.keys(soundMap?.get() ?? {}).sort();
-  const filteredSounds = soundNames.filter((name) => name.includes(fragment));
-  let options = filteredSounds.map((name) => ({ label: name, type: 'sound' }));
-  const from = soundContext.to - fragment.length;
-  return {
-    from,
-    options,
-  };
-}
-
-// Cached regex patterns for bankHandler
-const BANK_NO_QUOTES_REGEX = /bank\(\s*$/;
-const BANK_WITH_QUOTES_REGEX = /bank\(\s*['"][^'"]*$/;
-
-function bankHandler(context) {
-  // First check for bank context without quotes - block with empty completions
-  let bankNoQuotesContext = context.matchBefore(BANK_NO_QUOTES_REGEX);
-  if (bankNoQuotesContext) {
-    return {
-      from: bankNoQuotesContext.to,
-      options: [],
-    };
-  }
-
-  // Then check for bank context with quotes - provide completions
-  let bankMatch = context.matchBefore(BANK_WITH_QUOTES_REGEX);
-  if (!bankMatch) return null;
-
-  const text = bankMatch.text;
-  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
-  if (quoteIdx === -1) return null;
-  const inside = text.slice(quoteIdx + 1);
-  const fragment = inside;
-  let banks = bankCompletions();
-  const filteredBanks = banks.filter((b) => b.label.startsWith(fragment));
-  const from = bankMatch.to - fragment.length;
-  return {
-    from,
-    options: filteredBanks,
-  };
-}
-
-// Cached regex patterns for modeHandler
-const MODE_NO_QUOTES_REGEX = /mode\(\s*$/;
-const MODE_AFTER_COLON_REGEX = /mode\(\s*['"][^'"]*:[^'"]*$/;
-const MODE_PRE_COLON_REGEX = /mode\(\s*['"][^'"]*$/;
-const MODE_FRAGMENT_MATCH_REGEX = /(?:[\s[{(<])([\w:]*)$/;
-
-function modeHandler(context) {
-  // First check for mode context without quotes - block with empty completions
-  let modeNoQuotesContext = context.matchBefore(MODE_NO_QUOTES_REGEX);
-  if (modeNoQuotesContext) {
-    return {
-      from: modeNoQuotesContext.to,
-      options: [],
-    };
-  }
-
-  // Check for after-colon context first (more specific)
-  let modeAfterColonContext = context.matchBefore(MODE_AFTER_COLON_REGEX);
-  if (modeAfterColonContext) {
-    const text = modeAfterColonContext.text;
-    const colonIdx = text.lastIndexOf(':');
-    if (colonIdx !== -1) {
-      const fragment = text.slice(colonIdx + 1);
-      // For anchor after colon, we can suggest pitch names
-      const filtered = pitchNames.filter((p) => p.toLowerCase().startsWith(fragment.toLowerCase()));
-      const options = filtered.map((p) => ({ label: p, type: 'pitch' }));
-      const from = modeAfterColonContext.from + colonIdx + 1;
-      return {
-        from,
-        options,
-      };
-    }
-  }
-
-  // Then check for pre-colon context
-  let modeContext = context.matchBefore(MODE_PRE_COLON_REGEX);
-  if (!modeContext) return null;
-
-  const text = modeContext.text;
-  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
-  if (quoteIdx === -1) return null;
-  const inside = text.slice(quoteIdx + 1);
-  const fragMatch = inside.match(MODE_FRAGMENT_MATCH_REGEX);
-  const fragment = fragMatch ? fragMatch[1] : inside;
-  const filteredModes = modeCompletions.filter((m) => m.label.startsWith(fragment));
-  const from = modeContext.to - fragment.length;
-  return {
-    from,
-    options: filteredModes,
-  };
-}
-
-// Cached regex patterns for chordHandler
-const CHORD_NO_QUOTES_REGEX = /chord\(\s*$/;
-const CHORD_WITH_QUOTES_REGEX = /chord\(\s*['"][^'"]*$/;
-const CHORD_FRAGMENT_MATCH_REGEX = /(?:[\s[{(<])([\w#b+^:-]*)$/;
-
-function chordHandler(context) {
-  // First check for chord context without quotes - block with empty completions
-  let chordNoQuotesContext = context.matchBefore(CHORD_NO_QUOTES_REGEX);
-  if (chordNoQuotesContext) {
-    return {
-      from: chordNoQuotesContext.to,
-      options: [],
-    };
-  }
-
-  // Then check for chord context with quotes - provide completions
-  let chordContext = context.matchBefore(CHORD_WITH_QUOTES_REGEX);
-  if (!chordContext) return null;
-
-  const text = chordContext.text;
-  const quoteIdx = Math.max(text.lastIndexOf('"'), text.lastIndexOf("'"));
-  if (quoteIdx === -1) return null;
-  const inside = text.slice(quoteIdx + 1);
-
-  // Use same fragment matching as sound/mode for expressions like "<G Am>"
-  const fragMatch = inside.match(CHORD_FRAGMENT_MATCH_REGEX);
-  const fragment = fragMatch ? fragMatch[1] : inside;
-
-  // Check if fragment contains any pitch name at start (for root + symbol)
-  let rootMatch = null;
-  let symbolFragment = fragment;
-  for (const pitch of pitchNames) {
-    if (fragment.toLowerCase().startsWith(pitch.toLowerCase())) {
-      rootMatch = pitch;
-      symbolFragment = fragment.slice(pitch.length);
-      break;
-    }
-  }
-
-  if (rootMatch) {
-    // We have a root, now complete chord symbols
-    const filteredSymbols = chordSymbolCompletions.filter((s) =>
-      s.label.toLowerCase().startsWith(symbolFragment.toLowerCase()),
-    );
-
-    // Create completions that replace the entire chord, not just the symbol part
-    const options = filteredSymbols;
-
-    const from = chordContext.to - symbolFragment.length;
-    return { from, options };
-  } else {
-    // No root yet, complete with pitch names
-    const filteredPitches = pitchNames.filter((p) => p.toLowerCase().startsWith(fragment.toLowerCase()));
-    const options = filteredPitches.map((p) => ({ label: p, type: 'pitch' }));
-    const from = chordContext.to - fragment.length;
-    return { from, options };
-  }
-}
-
-// Cached regex patterns for fallbackHandler
-const FALLBACK_WORD_REGEX = /\w*/;
-
-function fallbackHandler(context) {
-  const word = context.matchBefore(FALLBACK_WORD_REGEX);
-  if (word && word.from === word.to && !context.explicit) return null;
-  if (word) {
-    return {
-      from: word.from,
-      options: jsdocCompletions,
-    };
-  }
-  return null;
-}
-
-const handlers = [
-  soundHandler,
-  bankHandler,
-  chordHandler,
-  scaleHandler,
-  modeHandler,
-  // this handler *must* be last
-  fallbackHandler,
-];
-
 export const strudelAutocomplete = (context) => {
-  for (const handler of handlers) {
-    const result = handler(context);
-    if (result) {
-      return result;
-    }
-  }
-  return null;
+  const word = context.matchBefore(/\w*/);
+  if (word.from === word.to && !context.explicit) return null;
+
+  return {
+    from: word.from,
+    options: jsdocCompletions,
+    /*     options: [
+      { label: 'match', type: 'keyword' },
+      { label: 'hello', type: 'variable', info: '(World)' },
+      { label: 'magic', type: 'text', apply: '⠁⭒*.✩.*⭒⠁', detail: 'macro' },
+    ], */
+  };
 };
 
 export const isAutoCompletionEnabled = (enabled) =>

packages/codemirror/codemirror.mjs

@@ -1,34 +1,32 @@
 import { closeBrackets } from '@codemirror/autocomplete';
-import { indentWithTab, toggleLineComment } from '@codemirror/commands';
+export { toggleComment, toggleBlockComment, toggleLineComment, toggleBlockCommentByLine } from '@codemirror/commands';
+// import { search, highlightSelectionMatches } from '@codemirror/search';
+import { indentWithTab } from '@codemirror/commands';
 import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
-import { bracketMatching, defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language';
+import { defaultHighlightStyle, syntaxHighlighting, bracketMatching } from '@codemirror/language';
 import { Compartment, EditorState, Prec } from '@codemirror/state';
 import {
-  drawSelection,
   EditorView,
-  highlightActiveLine,
   highlightActiveLineGutter,
+  highlightActiveLine,
   keymap,
   lineNumbers,
+  drawSelection,
 } from '@codemirror/view';
-import { persistentAtom } from '@nanostores/persistent';
-import { logger, registerControl, repl } from '@strudel/core';
-import { cleanupDraw, Drawer } from '@strudel/draw';
-
+import { repl, registerControl } from '@strudel/core';
+import { Drawer, cleanupDraw } from '@strudel/draw';
 import { isAutoCompletionEnabled } from './autocomplete.mjs';
-import { basicSetup } from './basicSetup.mjs';
+import { isTooltipEnabled } from './tooltip.mjs';
 import { flash, isFlashEnabled } from './flash.mjs';
 import { highlightMiniLocations, isPatternHighlightingEnabled, updateMiniLocations } from './highlight.mjs';
 import { keybindings } from './keybindings.mjs';
+import { initTheme, activateTheme, theme } from './themes.mjs';
 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 { jumpToCharacter } from './labelJump.mjs';
+import { widgetPlugin, updateWidgets } from './widget.mjs';
+import { persistentAtom } from '@nanostores/persistent';
+import { basicSetup } from './basicSetup.mjs';
 
-export { toggleBlockComment, toggleBlockCommentByLine, toggleComment, toggleLineComment } from '@codemirror/commands';
-
-export const extensions = {
+const extensions = {
   isLineWrappingEnabled: (on) => (on ? EditorView.lineWrapping : []),
   isBracketMatchingEnabled: (on) => (on ? bracketMatching({ brackets: '()[]{}<>' }) : []),
   isBracketClosingEnabled: (on) => (on ? closeBrackets() : []),
@@ -49,7 +47,7 @@ export const extensions = {
         ]
       : [],
 };
-export const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [key, new Compartment()]));
+const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [key, new Compartment()]));
 
 export const defaultSettings = {
   keybindings: 'codemirror',
@@ -96,8 +94,8 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
       }),
       sliderPlugin,
       widgetPlugin,
-      // indentOnInput(), // works without. already brought with javascript
-      // extension? bracketMatching(), // does not do anything
+      // indentOnInput(), // works without. already brought with javascript extension?
+      // bracketMatching(), // does not do anything
       syntaxHighlighting(defaultHighlightStyle),
       EditorView.updateListener.of((v) => onChange(v)),
       drawSelection({ cursorBlinkRate: 0 }),
@@ -120,22 +118,14 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
             preventDefault: true,
             run: () => onStop?.(),
           },
-          {
-            key: 'Alt-w',
-            run: (view) => jumpToCharacter(view, '$', 1),
-          },
-          {
-            key: 'Alt-q',
-            run: (view) => jumpToCharacter(view, '$', -1),
-          },
           /* {
-            key: 'Ctrl-Shift-.',
-            run: () => (onPanic ? onPanic() : onStop?.()),
-          },
-          {
-            key: 'Ctrl-Shift-Enter',
-            run: () => (onReEvaluate ? onReEvaluate() : onEvaluate?.()),
-          }, */
+          key: 'Ctrl-Shift-.',
+          run: () => (onPanic ? onPanic() : onStop?.()),
+        },
+        {
+          key: 'Ctrl-Shift-Enter',
+          run: () => (onReEvaluate ? onReEvaluate() : onEvaluate?.()),
+        }, */
         ]),
       ),
     ],
@@ -216,8 +206,7 @@ export class StrudelMirror {
         updateWidgets(this.editor, widgets);
         updateMiniLocations(this.editor, this.miniLocations);
         replOptions?.afterEval?.(options);
-        // if no painters are set (.onPaint was not called), then we only need
-        // the present moment (for highlighting)
+        // if no painters are set (.onPaint was not called), then we only need the present moment (for highlighting)
         const drawTime = options.pattern.getPainters().length ? this.drawTime : [0, 0];
         this.drawer.setDrawTime(drawTime);
         // invalidate drawer after we've set the appropriate drawTime
@@ -256,33 +245,6 @@ export class StrudelMirror {
       }
     };
     document.addEventListener('start-repl', this.onStartRepl);
-
-    // Handle global evaluation requests (e.g., from Vim :w)
-    this.onEvaluateRequest = (e) => {
-      try {
-        // Evaluate current editor on repl-evaluate
-        logger('[repl] evaluate via event');
-        this.evaluate();
-        e?.cancelable && e.preventDefault?.();
-      } catch (err) {
-        console.error('Error handling repl-evaluate event', err);
-      }
-    };
-    document.addEventListener('repl-evaluate', this.onEvaluateRequest);
-    document.addEventListener('repl-stop', this.onStopRequest);
-
-    // Toggle comments requested from Vim (gc)
-    this.onToggleComment = (e) => {
-      try {
-        // Honor selections; toggleLineComment handles both selections and
-        // single line
-        toggleLineComment(this.editor);
-        e?.cancelable && e.preventDefault?.();
-      } catch (err) {
-        console.error('Error handling repl-toggle-comment event', err);
-      }
-    };
-    document.addEventListener('repl-toggle-comment', this.onToggleComment);
   }
   draw(haps, time, painters) {
     painters?.forEach((painter) => painter(this.drawContext, time, haps, this.drawTime));
@@ -302,23 +264,13 @@ export class StrudelMirror {
       console.warn('first frame could not be painted');
     }
   }
-  async evaluate(autostart = true) {
+  async evaluate() {
     this.flash();
-    await this.repl.evaluate(this.code, autostart);
+    await this.repl.evaluate(this.code);
   }
   async stop() {
     this.repl.scheduler.stop();
   }
-
-  // Listen for global stop requests (e.g., from Vim :q)
-  onStopRequest = (e) => {
-    try {
-      this.stop();
-      e?.cancelable && e.preventDefault?.();
-    } catch (err) {
-      console.error('Error handling repl-stop event', err);
-    }
-  };
   async toggle() {
     if (this.repl.scheduler.started) {
       this.repl.stop();
@@ -394,18 +346,11 @@ export class StrudelMirror {
     }
   }
   setCode(code) {
-    const changes = {
-      from: 0,
-      to: this.editor.state.doc.length,
-      insert: code,
-    };
+    const changes = { from: 0, to: this.editor.state.doc.length, insert: code };
     this.editor.dispatch({ changes });
   }
   clear() {
     this.onStartRepl && document.removeEventListener('start-repl', this.onStartRepl);
-    this.onEvaluateRequest && document.removeEventListener('repl-evaluate', this.onEvaluateRequest);
-    this.onStopRequest && document.removeEventListener('repl-stop', this.onStopRequest);
-    this.onToggleComment && document.removeEventListener('repl-toggle-comment', this.onToggleComment);
   }
   getCursorLocation() {
     return this.editor.state.selection.main.head;
@@ -420,7 +365,7 @@ export class StrudelMirror {
   }
 }
 
-export function parseBooleans(value) {
+function parseBooleans(value) {
   return { true: true, false: false }[value] ?? value;
 }
 

packages/codemirror/index.mjs

@@ -4,4 +4,3 @@ export * from './flash.mjs';
 export * from './slider.mjs';
 export * from './themes.mjs';
 export * from './widget.mjs';
-export { Vim } from './keybindings.mjs';

packages/codemirror/keybindings.mjs

@@ -1,12 +1,11 @@
-import { defaultKeymap } from '@codemirror/commands';
-import { Prec, EditorState } from '@codemirror/state';
+import { Prec } from '@codemirror/state';
 import { keymap, ViewPlugin } from '@codemirror/view';
 // import { searchKeymap } from '@codemirror/search';
 import { emacs } from '@replit/codemirror-emacs';
-import { vim, Vim } from '@replit/codemirror-vim';
+import { vim } from '@replit/codemirror-vim';
 // import { vim } from './vim_test.mjs';
 import { vscodeKeymap } from '@replit/codemirror-vscode-keymap';
-import { logger } from '@strudel/core';
+import { defaultKeymap } from '@codemirror/commands';
 
 const vscodePlugin = ViewPlugin.fromClass(
   class {
@@ -20,110 +19,6 @@ const vscodePlugin = ViewPlugin.fromClass(
 );
 const vscodeExtension = (options) => [vscodePlugin].concat(options ?? []);
 
-// Map Vim :w to trigger the same action as evaluation. We dispatch a custom
-// event 'repl-evaluate' that the editor listens for, and also simulate
-// Ctrl+Enter/Alt+Enter as a fallback. We log to the Strudel logger so it
-// appears in the Console panel.
-try {
-  if (Vim && typeof Vim.defineEx === 'function') {
-    // Map gc to toggle line comments by dispatching a custom event that our
-    // CodeMirror integration listens to. This avoids depending on Vim's
-    // internal actions and works with current selections/visual mode.
-    try {
-      Vim.defineAction('strudelToggleComment', (cm) => {
-        const view = cm?.view || cm;
-        try {
-          const ev = new CustomEvent('repl-toggle-comment', { detail: { source: 'vim', view }, cancelable: true });
-          document.dispatchEvent(ev);
-        } catch (e) {
-          console.error('strudelToggleComment dispatch failed', e);
-        }
-      });
-      Vim.mapCommand('gc', 'action', 'strudelToggleComment', {}, { context: 'normal' });
-      Vim.mapCommand('gc', 'action', 'strudelToggleComment', {}, { context: 'visual' });
-    } catch (e) {
-      console.error('Vim gc mapping failed', e);
-    }
-
-    // :q to pause/stop
-    Vim.defineEx('quit', 'q', (cm) => {
-      try {
-        const view = cm?.view || cm;
-        // First try dispatching our custom stop event, then fallback to Alt+.
-        let handled = false;
-        try {
-          const ev = new CustomEvent('repl-stop', { detail: { source: 'vim', view }, cancelable: true });
-          handled = document.dispatchEvent(ev) === false;
-        } catch (e) {
-          console.error('Error dispatching repl-stop event', e);
-        }
-        if (!handled) {
-          const altDot = new KeyboardEvent('keydown', {
-            key: '.',
-            code: 'Period',
-            altKey: true,
-            bubbles: true,
-            cancelable: true,
-          });
-          view?.dom?.dispatchEvent?.(altDot);
-        }
-      } catch (e) {
-        console.error('Error dispatching :q stop event', e);
-      }
-    });
-
-    // :w to evaluate
-    Vim.defineEx('write', 'w', (cm) => {
-      const view = cm?.view || cm; // CM6 Vim passes either an object with view or the view itself
-      try {
-        view?.focus?.();
-        // Let the app know this came from Vim :w
-        try {
-          logger('[vim] :w — evaluating code');
-        } catch (e) {
-          console.error('Error logging Vim :w evaluation', e);
-        }
-        // Dispatch a dedicated evaluate event first
-        let handled = false;
-        try {
-          const ev = new CustomEvent('repl-evaluate', { detail: { source: 'vim', view }, cancelable: true });
-          handled = document.dispatchEvent(ev) === false; // false means preventDefault was called
-        } catch (e) {
-          console.error('Error dispatching repl-evaluate event', e);
-        }
-        if (handled) {
-          return;
-        }
-        // Try Ctrl+Enter first if not handled by custom event
-        const ctrlEnter = new KeyboardEvent('keydown', {
-          key: 'Enter',
-          code: 'Enter',
-          ctrlKey: true,
-          bubbles: true,
-          cancelable: true,
-        });
-        view?.dom?.dispatchEvent?.(ctrlEnter);
-        // If not handled (no handler called preventDefault), try Alt+Enter as
-        // fallback
-        if (!ctrlEnter.defaultPrevented) {
-          const altEnter = new KeyboardEvent('keydown', {
-            key: 'Enter',
-            code: 'Enter',
-            altKey: true,
-            bubbles: true,
-            cancelable: true,
-          });
-          view?.dom?.dispatchEvent?.(altEnter);
-        }
-      } catch (e) {
-        console.error('Error dispatching :w evaluation event', e);
-      }
-    });
-  }
-} catch (e) {
-  console.error('Vim ex command setup failed (defineEx missing or Vim unavailable)', e);
-}
-
 const keymaps = {
   vim,
   emacs,
@@ -131,13 +26,7 @@ const keymaps = {
   vscode: vscodeExtension,
 };
 
-export { Vim } from '@replit/codemirror-vim';
-
 export function keybindings(name) {
   const active = keymaps[name];
-  const extensions = active ? [Prec.high(active())] : [];
-  if (name === 'vim') {
-    extensions.push(EditorState.allowMultipleSelections.of(true));
-  }
-  return extensions;
+  return [active ? Prec.high(active()) : []];
 }

packages/codemirror/labelJump.mjs

@@ -1,31 +0,0 @@
-import { EditorSelection } from '@codemirror/state';
-import { SearchCursor } from '@codemirror/search';
-
-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;
-  while (!cursor.next().done) {
-    characterPositions.push(cursor.value.to);
-  }
-  if (!characterPositions.length) {
-    return false;
-  }
-  if (direction > 0) {
-    jumpPos = characterPositions.find((x) => x > pos + 1) ?? characterPositions.at(0); // Loop back around for convenience
-  } else {
-    jumpPos = characterPositions.reverse().find((x) => x < pos + 1) ?? characterPositions.at(0);
-  }
-
-  if (jumpPos == null) {
-    return false;
-  }
-  dispatch({
-    selection: EditorSelection.cursor(jumpPos - 1),
-    scrollIntoView: true,
-  });
-  return true;
-}

packages/codemirror/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/codemirror",
-  "version": "1.3.0",
+  "version": "1.2.5",
   "description": "Codemirror Extensions for Strudel",
   "main": "index.mjs",
   "publishConfig": {
@@ -46,16 +46,10 @@
     "@replit/codemirror-vscode-keymap": "^6.0.2",
     "@strudel/core": "workspace:*",
     "@strudel/draw": "workspace:*",
-    "@strudel/tonal": "workspace:*",
     "@strudel/transpiler": "workspace:*",
-    "@tonaljs/tonal": "^4.10.0",
-    "nanostores": "^0.11.3",
-    "superdough": "workspace:*"
+    "nanostores": "^0.11.3"
   },
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/core/bench/signal.bench.mjs

@@ -1,49 +0,0 @@
-import { describe, bench } from 'vitest';
-
-import { calculateSteps, rand, useRNG } from '../index.mjs';
-
-const testingResolution = 128;
-
-const _generateRandomPattern = () => rand.iter(testingResolution).fast(testingResolution).firstCycle();
-
-describe('old random', () => {
-  calculateSteps(true);
-  bench(
-    '+tactus',
-    () => {
-      useRNG('legacy');
-      _generateRandomPattern();
-    },
-    {
-      time: 1000,
-      teardown() {
-        useRNG('legacy');
-      },
-    },
-  );
-
-  calculateSteps(false);
-  bench(
-    '-tactus',
-    () => {
-      useRNG('precise');
-      _generateRandomPattern();
-    },
-    {
-      time: 1000,
-      teardown() {
-        useRNG('legacy');
-      },
-    },
-  );
-});
-
-describe('random', () => {
-  calculateSteps(true);
-  bench('+tactus', _generateRandomPattern, { time: 1000 });
-
-  calculateSteps(false);
-  bench('-tactus', _generateRandomPattern, { time: 1000 });
-});
-
-calculateSteps(true);

packages/core/clockworker.js

@@ -12,6 +12,8 @@ function getTime() {
 let num_cycles_at_cps_change = 0;
 let num_ticks_since_cps_change = 0;
 let num_seconds_at_cps_change = 0;
+let max_cycle = null;
+
 let cps = 0.5;
 // {id: {started: boolean}}
 const clients = new Map();
@@ -39,6 +41,7 @@ const sendTick = (phase, duration, tick, time) => {
     cps,
     time,
     cycle,
+    max_cycle,
   });
   num_ticks_since_cps_change++;
 };
@@ -60,9 +63,10 @@ const stopClock = async (id) => {
 
   const otherClientStarted = Array.from(clients.values()).some((c) => c.started);
   //dont stop the clock if other instances are running...
-  if (!started || otherClientStarted) {
-    return;
-  }
+  // actually do stop it
+  // if (!started || otherClientStarted) {
+  //   return;
+  // }
 
   clock.stop();
   setCycle(0);
@@ -74,6 +78,10 @@ const setCycle = (cycle) => {
   num_cycles_at_cps_change = cycle;
 };
 
+const setMaxCycle = (cycle) => {
+  max_cycle = cycle;
+};
+
 const processMessage = (message) => {
   const { type, payload } = message;
 
@@ -92,6 +100,10 @@ const processMessage = (message) => {
       setCycle(payload.cycle);
       break;
     }
+    case 'setmaxcycle': {
+      setMaxCycle(payload.maxcycle);
+      break;
+    }
     case 'toggle': {
       if (payload.started) {
         startClock(message.id);

packages/core/controls.mjs

@@ -4,8 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { logger } from './logger.mjs';
-import { Pattern, pure, register, reify } from './pattern.mjs';
+import { Pattern, register, reify } from './pattern.mjs';
 
 export function createParam(names) {
   let isMulti = Array.isArray(names);
@@ -73,27 +72,6 @@ export function registerControl(names, ...aliases) {
   return bag;
 }
 
-export function registerMultiControl(names, maxControls, ...aliases) {
-  names = Array.isArray(names) ? names : [names];
-  let bag = {};
-  for (let i = 1; i <= maxControls; i++) {
-    let theseAliases = [...aliases];
-    let theseNames = [...names];
-    if (i === 1) {
-      // adds e.g. fm1 as an alias for fm
-      const aliases1 = theseAliases.map((a) => `${a}1`);
-      const names1 = theseNames.map((n) => `${n}1`);
-      theseAliases = theseAliases.concat(aliases1).concat(names1);
-    } else {
-      theseAliases = theseAliases.map((a) => `${a}${i}`);
-      theseNames = theseNames.map((n) => `${n}${i}`);
-    }
-    const subBag = registerControl(theseNames, ...theseAliases);
-    bag = { ...bag, ...subBag };
-  }
-  return bag;
-}
-
 /**
  * Select a sound / sample by name. When using mininotation, you can also optionally supply 'n' and 'gain' parameters
  * separated by ':'.
@@ -402,13 +380,12 @@ export const { accelerate } = registerControl('accelerate');
  * Sets the velocity from 0 to 1. Is multiplied together with gain.
  *
  * @name velocity
- * @synonyms vel
  * @example
  * s("hh*8")
  * .gain(".4!2 1 .4!2 1 .4 1")
  * .velocity(".4 1")
  */
-export const { velocity, vel } = registerControl('velocity', 'vel');
+export const { velocity } = registerControl('velocity');
 /**
  * Controls the gain by an exponential amount.
  *
@@ -458,9 +435,6 @@ export const { attack, att } = registerControl('attack', 'att');
  * Whole numbers and simple ratios sound more natural,
  * while decimal numbers and complex ratios sound metallic.
  *
- * A number may be added afterwards to control the harmonicity of
- * any of the 8 individual FMs (e.g. `fmh2`)
- *
  * @name fmh
  * @param {number | Pattern} harmonicity
  * @example
@@ -470,40 +444,25 @@ export const { attack, att } = registerControl('attack', 'att');
  * ._scope()
  *
  */
-export const { fmh, fmh1, fmh2, fmh3, fmh4, fmh5, fmh6, fmh7, fmh8 } = registerMultiControl(['fmh', 'fmi'], 8, 'fmh');
-
+export const { fmh } = registerControl(['fmh', 'fmi'], 'fmh');
 /**
  * Sets the Frequency Modulation of the synth.
  * Controls the modulation index, which defines the brightness of the sound.
  *
- * A number may be added afterwards to control the modulation index of
- * any of the 8 individual FMs (e.g. `fm3`). Also, FMs may be routed into
- * each other with matrix commands like `fm13`, which would send `fm1` back into
- * `fm3`
- *
- * @name fmi
+ * @name fm
  * @param {number | Pattern} brightness modulation index
- * @synonyms fm
+ * @synonyms fmi
  * @example
  * note("c e g b g e")
  * .fm("<0 1 2 8 32>")
  * ._scope()
- * @example
- * s("sine").note("F1").seg(8)
- *  .fm(4).fm2(rand.mul(4)).fm3(saw.mul(8).slow(8))
- *  .fmh(1.06).fmh2(10).fmh3(0.1)
  *
  */
-export const { fmi, fmi1, fmi2, fmi3, fmi4, fmi5, fmi6, fmi7, fmi8, fm, fm1, fm2, fm3, fm4, fm5, fm6, fm7, fm8 } =
-  registerMultiControl(['fmi', 'fmh'], 8, 'fm');
-
+export const { fmi, fm } = registerControl(['fmi', 'fmh'], 'fm');
 // fm envelope
 /**
  * Ramp type of fm envelope. Exp might be a bit broken..
  *
- * A number may be added afterwards to control the envelope of
- * any of the 8 individual FMs (e.g. `fmenv4`)
- *
  * @name fmenv
  * @param {number | Pattern} type lin | exp
  * @example
@@ -515,19 +474,11 @@ export const { fmi, fmi1, fmi2, fmi3, fmi4, fmi5, fmi6, fmi7, fmi8, fm, fm1, fm2
  * ._scope()
  *
  */
-export const { fmenv, fmenv1, fmenv2, fmenv3, fmenv4, fmenv5, fmenv6, fmenv7, fmenv8 } = registerMultiControl(
-  'fmenv',
-  8,
-);
-
+export const { fmenv } = registerControl('fmenv');
 /**
  * Attack time for the FM envelope: time it takes to reach maximum modulation
  *
- * A number may be added afterwards to control the attack of the envelope of
- * any of the 8 individual FMs (e.g. `fmatt5`)
- *
  * @name fmattack
- * @synonyms fmatt
  * @param {number | Pattern} time attack time
  * @example
  * note("c e g b g e")
@@ -536,33 +487,11 @@ export const { fmenv, fmenv1, fmenv2, fmenv3, fmenv4, fmenv5, fmenv6, fmenv7, fm
  * ._scope()
  *
  */
-export const {
-  fmattack,
-  fmattack1,
-  fmattack2,
-  fmattack3,
-  fmattack4,
-  fmattack5,
-  fmattack6,
-  fmattack7,
-  fmattack8,
-  fmatt,
-  fmatt1,
-  fmatt2,
-  fmatt3,
-  fmatt4,
-  fmatt5,
-  fmatt6,
-  fmatt7,
-  fmatt8,
-} = registerMultiControl('fmattack', 8, 'fmatt');
+export const { fmattack } = registerControl('fmattack');
 
 /**
  * Waveform of the fm modulator
  *
- * A number may be added afterwards to control the waveform
- * any of the 8 individual FMs (e.g. `fmwave6`)
- *
  * @name fmwave
  * @param {number | Pattern} wave waveform
  * @example
@@ -571,19 +500,12 @@ export const {
  * n("0 1 2 3".fast(4)).chord("<Dm Am F G>").voicing().s("sawtooth").fmwave("brown").fm(.6)
  *
  */
-export const { fmwave, fmwave1, fmwave2, fmwave3, fmwave4, fmwave5, fmwave6, fmwave7, fmwave8 } = registerMultiControl(
-  'fmwave',
-  8,
-);
+export const { fmwave } = registerControl('fmwave');
 
 /**
  * Decay time for the FM envelope: seconds until the sustain level is reached after the attack phase.
  *
- * A number may be added afterwards to control the decay of the envelope of
- * any of the 8 individual FMs (e.g. `fmdec6`)
- *
  * @name fmdecay
- * @synonyms fmdec
  * @param {number | Pattern} time decay time
  * @example
  * note("c e g b g e")
@@ -593,35 +515,11 @@ export const { fmwave, fmwave1, fmwave2, fmwave3, fmwave4, fmwave5, fmwave6, fmw
  * ._scope()
  *
  */
-export const {
-  fmdecay,
-  fmdecay1,
-  fmdecay2,
-  fmdecay3,
-  fmdecay4,
-  fmdecay5,
-  fmdecay6,
-  fmdecay7,
-  fmdecay8,
-  fmdec,
-  fmdec1,
-  fmdec2,
-  fmdec3,
-  fmdec4,
-  fmdec5,
-  fmdec6,
-  fmdec7,
-  fmdec8,
-} = registerMultiControl('fmdecay', 8, 'fmdec');
-
+export const { fmdecay } = registerControl('fmdecay');
 /**
  * Sustain level for the FM envelope: how much modulation is applied after the decay phase
  *
- * A number may be added afterwards to control the sustain of the envelope of
- * any of the 8 individual FMs (e.g. `fmsus7`)
- *
  * @name fmsustain
- * @synonyms fmsus
  * @param {number | Pattern} level sustain level
  * @example
  * note("c e g b g e")
@@ -631,69 +529,10 @@ export const {
  * ._scope()
  *
  */
-export const {
-  fmsustain,
-  fmsustain1,
-  fmsustain2,
-  fmsustain3,
-  fmsustain4,
-  fmsustain5,
-  fmsustain6,
-  fmsustain7,
-  fmsustain8,
-  fmsus,
-  fmsus1,
-  fmsus2,
-  fmsus3,
-  fmsus4,
-  fmsus5,
-  fmsus6,
-  fmsus7,
-  fmsus8,
-} = registerMultiControl('fmsustain', 8, 'fmsus');
-
-/**
- * Release time for the FM envelope: how much modulation is applied after the note is released
- *
- * A number may be added afterwards to control the release of the envelope of
- * any of the 8 individual FMs (e.g. `fmrel8`)
- *
- * @name fmrelease
- * @synonyms fmrel
- * @param {number | Pattern} time release time
- *
- */
-export const {
-  fmrelease,
-  fmrelease1,
-  fmrelease2,
-  fmrelease3,
-  fmrelease4,
-  fmrelease5,
-  fmrelease6,
-  fmrelease7,
-  fmrelease8,
-  fmrel,
-  fmrel1,
-  fmrel2,
-  fmrel3,
-  fmrel4,
-  fmrel5,
-  fmrel6,
-  fmrel7,
-  fmrel8,
-} = registerMultiControl('fmrelease', 8, 'fmrel');
-
-// FM Matrix
-// Note: we do not declare top-level exports here since it would add
-// ~162 more explicit exports. This is likely fine as the most common use-case would be to at least
-// declare one other FM prior to utilizing the matrix functionality, but if we ever decide we need it,
-// TODO to add it explicitly / go with the globalThis approach
-for (let i = 0; i <= 8; i++) {
-  for (let j = 0; j <= 8; j++) {
-    registerControl(`fmi${i}${j}`, `fm${i}${j}`);
-  }
-}
+export const { fmsustain } = registerControl('fmsustain');
+// these are not really useful... skipping for now
+export const { fmrelease } = registerControl('fmrelease');
+export const { fmvelocity } = registerControl('fmvelocity');
 
 /**
  * Select the sound bank to use. To be used together with `s`. The bank name (+ "_") will be prepended to the value of `s`.
@@ -877,7 +716,7 @@ export const { coarse } = registerControl('coarse');
  * note("d d d# d".fast(4)).s("supersaw").tremolo("<3 2 100> ").tremoloskew("<.5>")
  *
  */
-export const { tremolo, trem } = registerControl(['tremolo', 'tremolodepth', 'tremoloskew', 'tremolophase'], 'trem');
+export const { tremolo } = registerControl(['tremolo', 'tremolodepth', 'tremoloskew', 'tremolophase'], 'trem');
 
 /**
  * Modulate the amplitude of a sound with a continuous waveform
@@ -1449,193 +1288,6 @@ 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
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lprate("<4 8 2 1>")
- */
-export const { lprate } = registerControl('lprate');
-
-/**
- * Cycle-synced rate of the LFO for the lowpass filter
- *
- * @name lpsync
- * @param {number | Pattern} rate rate in cycles
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lpsync("<4 8 2 1>")
- */
-export const { lpsync } = registerControl('lpsync');
-
-/**
- * Depth of the LFO for the lowpass filter
- *
- * @name lpdepth
- * @param {number | Pattern} depth depth of modulation
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lpdepth("<1 .5 1.8 0>")
- */
-
-export const { lpdepth } = registerControl('lpdepth');
-/**
- * Depth of the LFO for the lowpass filter, in HZ
- *
- * @name lpdepthfrequency
- * @synonyms lpdepthfreq
- * @param {number | Pattern} depth depth of modulation
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).lpdepthfrequency("<200 500 100 0>")
- */
-
-export const { lpdepthfrequency, lpdepthfreq } = registerControl('lpdepthfrequency', 'lpdepthfreq');
-
-/**
- * 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');
-
-/**
- * Depth of the LFO for the bandpass filter, in HZ
- *
- * @name bpdepthfrequency
- * @synonyms bpdepthfreq
- * @param {number | Pattern} depth depth of modulation
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).bpdepthfrequency("<200 500 100 0>")
- */
-
-export const { bpdepthfrequency, bpdepthfreq } = registerControl('bpdepthfrequency', 'bpdepthfreq');
-
-/**
- * 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');
-
-/**
- * Depth of the LFO for the hipass filter, in hz
- *
- * @name hpdepthfrequency
- * @synonyms hpdepthfreq
- * @param {number | Pattern} depth depth of modulation
- * @example
- * note("<c c c# c c c4>*16").s("sawtooth").lpf(600).hpdepthfrequency("<200 500 100 0>")
- */
-
-export const { hpdepthfrequency, hpdepthfreq } = registerControl('hpdepthfrequency', 'hpdepthfreq');
-
-/**
- * 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.
  *
@@ -2023,12 +1675,12 @@ export const { nudge } = registerControl('nudge');
  * Sets the default octave of a synth.
  *
  * @name octave
- * @synonyms oct
  * @param {number | Pattern} octave octave number
  * @example
- * n("0,4,7").scale("F:minor").s('supersaw').octave("<0 1 2 3>")
+ * n("0,4,7").s('supersquare').octave("<3 4 5 6>").osc()
+ * @superDirtOnly
  */
-export const { octave, oct } = registerControl('octave', 'oct');
+export const { octave } = registerControl('octave');
 
 // ['ophatdecay'],
 // TODO: example
@@ -2036,7 +1688,6 @@ export const { octave, oct } = registerControl('octave', 'oct');
  * An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share the same global effects.
  *
  * @name orbit
- * @synonyms o
  * @param {number | Pattern} number
  * @example
  * stack(
@@ -2044,29 +1695,7 @@ export const { octave, oct } = registerControl('octave', 'oct');
  *   s("~ sd ~ sd").delay(.5).delaytime(.125).orbit(2)
  * )
  */
-export const { orbit } = registerControl('orbit', 'o');
-
-/**
- * A `bus` is a send which can be used for mixing patterns. It combines with..
- *   s("bus") to play that bus through another pattern (for, say, applying non-linear
- *   effects like distortion to multiple signals)
- *
- *   otherPat.bmod(..) (to modulate another pattern with the bus)
- *
- * @name bus
- * @param {number | Pattern} number
- */
-export const { bus } = registerControl('bus');
-
-/**
- * Postgain multiplier prior to sending the signal to the audio bus.
- *
- * @name busgain
- * @synonyms bgain
- * @param {number | Pattern} number
- */
-export const { busgain, bgain } = registerControl('busgain', 'bgain');
-
+export const { orbit } = registerControl('orbit');
 // TODO: what is this? not found in tidal doc Answer: gain is limited to maximum of 2. This allows you to go over that
 export const { overgain } = registerControl('overgain');
 // TODO: what is this? not found in tidal doc. Similar to above, but limited to 1
@@ -2111,7 +1740,8 @@ export const { panorient } = registerControl('panorient');
 // ['pitch2'],
 // ['pitch3'],
 // ['portamento'],
-
+// TODO: LFO rate see https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
+export const { rate } = registerControl('rate');
 // TODO: slide param for certain synths
 export const { slide } = registerControl('slide');
 // TODO: detune? https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
@@ -2120,64 +1750,17 @@ export const { semitone } = registerControl('semitone');
 // TODO: synth param
 export const { voice } = registerControl('voice');
 // voicings // https://codeberg.org/uzu/strudel/issues/506
-/**
- * The chord to voice
- * @name chord
- * @param {string | Pattern} symbols chord symbols to voice e.g., C, Eb, Fm7, G7. The symbols can be defined via addVoicings
- * @example
- * chord("<Am C D F Am E Am E>").voicing()
- **/
+// chord to voice, like C Eb Fm7 G7. the symbols can be defined via addVoicings
 export const { chord } = registerControl('chord');
-/**
- * Which dictionary to use for the voicings. This falls back to the default dictionary if not provided
- *
- * @name dictionary
- * @param {string} dictionaryName which dictionary (having been defined with `addVoicings`) to use
- * @example
- * addVoicings('house', {
-'': ['7 12 16', '0 7 16', '4 7 12'],
-'m': ['0 3 7']
-})
-chord("<Am C D F Am E Am E>")
-.dict('house').anchor(66)
-.voicing().room(.5)
- **/
+// which dictionary to use for the voicings
 export const { dictionary, dict } = registerControl('dictionary', 'dict');
-/** The top note to align the voicing to. Defaults to c5
- *
- * @name anchor
- * @param {string | Pattern} anchorNote the note to align the voicings to
- * @example
- * anchor("<c4 g4 c5 g5>").chord("C").voicing()
- **/
+// the top note to align the voicing to, defaults to c5
 export const { anchor } = registerControl('anchor');
-/**
- * Sets how the voicing is offset from the anchored position
- *
- * @name offset
- * @param {number | Pattern} shift the amount to shift the voicing up or down
- * @example
- * chord("<Am C D F Am E Am E>").offset("<0 1 2 3 4 5>") // alter the voicing each time
- **/
+// how the voicing is offset from the anchored position
 export const { offset } = registerControl('offset');
-/**
- *  How many octaves are voicing steps spread apart, defaults to 1
- *
- *  @name octaves
- *  @param {number | Pattern} count the number of octaves
- *  @example
- *  chord("<Am C D F Am E Am E>").octaves("<2 4>").voicing()
- **/
+// how many octaves are voicing steps spread apart, defaults to 1
 export const { octaves } = registerControl('octaves');
-/**
- * Remove anchor note from the voicing. Useful for melody harmonization
- *
- * @name mode
- * @param {string | Pattern} modeName one of {below | above | duck | root}
- * @example
- * mode("<below above duck root>").chord("C").voicing()
- *
- **/
+// below = anchor note will be removed from the voicing, useful for melody harmonization
 export const { mode } = registerControl(['mode', 'anchor']);
 
 /**
@@ -2489,6 +2072,7 @@ export const { tsdelay } = registerControl('tsdelay');
 export const { real } = registerControl('real');
 export const { imag } = registerControl('imag');
 export const { enhance } = registerControl('enhance');
+export const { partials } = registerControl('partials');
 export const { comb } = registerControl('comb');
 export const { smear } = registerControl('smear');
 export const { scram } = registerControl('scram');
@@ -2537,6 +2121,7 @@ export const { curve } = registerControl('curve');
 export const { deltaSlide } = registerControl('deltaSlide');
 export const { pitchJump } = registerControl('pitchJump');
 export const { pitchJumpTime } = registerControl('pitchJumpTime');
+export const { lfo, repeatTime } = registerControl('lfo', 'repeatTime');
 // noise on the frequency or as bubo calls it "frequency fog" :)
 export const { znoise } = registerControl('znoise');
 export const { zmod } = registerControl('zmod');
@@ -2735,24 +2320,6 @@ export const { miditouch } = registerControl('miditouch');
 // TODO: what is this?
 export const { polyTouch } = registerControl('polyTouch');
 
-/**
- * The host to send open sound control messages to. Requires running the OSC bridge.
- * @name oschost
- * @param {string | Pattern} oschost e.g. 'localhost'
- * @example
- * note("c4").oschost('127.0.0.1').oscport(57120).osc();
- */
-export const { oschost } = registerControl('oschost');
-
-/**
- * The port to send open sound control messages to. Requires running the OSC bridge.
- * @name oscport
- * @param {number | Pattern} oscport e.g. 57120
- * @example
- * note("c4").oschost('127.0.0.1').oscport(57120).osc();
- */
-export const { oscport } = registerControl('oscport');
-
 export const getControlName = (alias) => {
   if (controlAlias.has(alias)) {
     return controlAlias.get(alias);
@@ -2774,13 +2341,8 @@ export const as = register('as', (mapping, pat) => {
   mapping = Array.isArray(mapping) ? mapping : [mapping];
   return pat.fmap((v) => {
     v = Array.isArray(v) ? v : [v];
-    const entries = [];
-    for (let i = 0; i < mapping.length; ++i) {
-      if (v[i] !== undefined) {
-        entries.push([getControlName(mapping[i]), v[i]]);
-      }
-    }
-    return Object.fromEntries(entries);
+    v = Object.fromEntries(mapping.map((prop, i) => [getControlName(prop), v[i]]));
+    return v;
   });
 });
 
@@ -2812,267 +2374,3 @@ export const scrub = register(
   },
   false,
 );
-
-const subControlAliases = new Map();
-const registerSubControl = (control, subControl, ...aliases) => {
-  const aliasMap = subControlAliases.get(control) ?? new Map();
-  const allKeys = new Set([subControl, ...aliases]);
-  for (const alias of allKeys) {
-    aliasMap.set(String(alias).toLowerCase(), subControl);
-  }
-  subControlAliases.set(control, aliasMap);
-};
-
-const registerSubControls = (control, subControlAliases = []) => {
-  for (const [subControl, ...aliases] of subControlAliases) {
-    registerSubControl(control, subControl, ...aliases);
-  }
-};
-
-const getMainSubcontrolName = (control, subKey) => {
-  const aliasMap = subControlAliases.get(control);
-  if (!aliasMap) return subKey;
-  return aliasMap.get(String(subKey).toLowerCase()) ?? subKey;
-};
-
-registerSubControls('lfo', [
-  ['control', 'c'],
-  ['subControl', 'sc'],
-  ['rate', 'r'],
-  ['depth', 'dep', 'dr'],
-  ['depthabs', 'da'],
-  ['dcoffset', 'dc'],
-  ['shape', 'sh'],
-  ['skew', 'sk'],
-  ['curve', 'cu'],
-  ['sync', 's'],
-  ['fxi'],
-]);
-registerSubControls('env', [
-  ['control', 'c'],
-  ['subControl', 'sc'],
-  ['attack', 'att', 'a'],
-  ['decay', 'dec', 'd'],
-  ['sustain', 'sus', 's'],
-  ['release', 'rel', 'r'],
-  ['depth', 'dep', 'dr'],
-  ['depthabs', 'da'],
-  ['acurve', 'ac'],
-  ['dcurve', 'dc'],
-  ['rcurve', 'rc'],
-  ['fxi'],
-]);
-registerSubControls('bmod', [
-  ['bus', 'b'],
-  ['control', 'c'],
-  ['subControl', 'sc'],
-  ['depth', 'dep', 'dr'],
-  ['depthabs', 'da'],
-  ['dc'],
-  ['fxi'],
-]);
-
-Pattern.prototype.modulate = function (type, config, idPat) {
-  config = { control: undefined, ...config };
-  const modulatorKeys = ['lfo', 'env', 'bmod'];
-  if (!modulatorKeys.includes(type)) {
-    logger(`[core] Modulation type ${type} not found. Please use one of 'lfo', 'env', 'bmod'`);
-    return this;
-  }
-  let output = this;
-  let defaultValue = undefined;
-  // Copy value into a temporary `v` container and attach a single `id` (to be shared across
-  // each config entry). At the output we destructure and throw away the id
-  output = output.fmap((v) => (id) => ({ v, id })).appLeft(reify(idPat));
-  for (const [rawKey, value] of Object.entries(config)) {
-    const key = getMainSubcontrolName(type, rawKey);
-    const valuePat = reify(value);
-    output = output
-      .fmap(({ v, id }) => (c) => {
-        if (defaultValue === undefined) {
-          // default control to the control set just before this in the chain
-          // e.g. pat.gain(0.5).lfo({..}) will be a gain-LFO
-          let control = getControlName(Object.keys(v).at(-1));
-          if (modulatorKeys.includes(control)) {
-            control = `${control}_${[...v[control].__ids].at(-1)}`;
-          }
-          defaultValue = control;
-        }
-        v[type] ??= { __ids: new Set() };
-        const t = v[type];
-        id ??= t.__ids.size;
-        t[id] ??= { control: defaultValue };
-        t.__ids.add(id); // keeps track of insertion order
-        if (c === undefined) return { v, id };
-        if (key === 'control' || key === 'subControl') {
-          t[id][key] = getControlName(c);
-        } else {
-          t[id][key] = c;
-        }
-        return { v, id };
-      })
-      .appLeft(valuePat);
-  }
-  return output.fmap(({ v }) => v);
-};
-
-/**
- * Configures an LFO. Can be called in sequence like pat.lfo(...).lfo(...) to set up multiple LFOs.
- * There are two ways to declare which control will be modulated:
- * 1. Explicitly put `control` in the config (e.g. `lfo({ c: "lpf" })`)
- * 2. If the control parameter is absent, the control _immediately before_ the `lfo` call will be used
- *   (e.g. `s("saw").lpf(500).lfo()` to modulate `lpf`)
- *
- * Modulators can be referred to by `id` so that they can be updated later e.g. inside
- * a `sometimes`. See example below.
- *
- * @name lfo
- * @param {Object} config LFO configuration.
- * @param {string | Pattern} [config.control] Node to modulate. Aliases: c
- * @param {string | Pattern} [config.subControl] Sub-control name to append to the control key. Aliases: sc
- * @param {number | Pattern} [config.rate] Modulation rate. Aliases: r
- * @param {number | Pattern} [config.depth] Relative modulation depth. Aliases: dep, dr
- * @param {number | Pattern} [config.depthabs] Absolute modulation depth. Aliases: da
- * @param {number | Pattern} [config.dcoffset] DC offset / bias for the waveform. Aliases: dc
- * @param {number | Pattern} [config.shape] Shape index. Aliases: sh
- * @param {number | Pattern} [config.skew] Skew amount. Aliases: sk
- * @param {number | Pattern} [config.curve] Exponential curve amount. Aliases: cu
- * @param {number | Pattern} [config.sync] Tempo-synced modulation rate. Aliases: s
- * @param {number | Pattern} [config.fxi] FX index to target
- * @param {string | Pattern} id ID to use for this modulator
- * @returns Pattern
- *
- * @example
- * s("saw").note("F1").lpf(500).lfo()
- *
- * @example
- * s("saw").lfo().lpf(500).lfo({ s: 0.3 })
- *
- * @example
- * s("saw").lpf(500).diode(0.3)
- *   .lfo({ c: "lpf" })
- *
- * @example
- * s("pulse").lpf(500).lfo()
- *   .lfo({ c: "s" })
- *   .diode(0.3)
- *   .sometimes(x => x.lfo({ s: "8" }, 1)) // lfo #1 (0-indexed)
- *
- * @example
- * s("pulse").lpf(500).lfo({ depth: 4 }, 'lpf_mod')
- *   .lfo({ c: "s" })
- *   .diode(0.3)
- *   .sometimes(x => x.lfo({ s: "8" }, 'lpf_mod'))
- */
-Pattern.prototype.lfo = function (config, id) {
-  return this.modulate('lfo', config, id);
-};
-export const lfo = (config) => pure({}).lfo(config);
-
-/**
- * Configures an envelope. Can be called in sequence like pat.env(...).env(...) to set up multiple envelopes
- * There are two ways to declare which control will be modulated:
- * 1. Explicitly put `control` in the config (e.g. `env({ c: "lpf" })`)
- * 2. If the control parameter is absent, the control _immediately before_ the `env` call will be used
- *   (e.g. `s("saw").lpf(500).env({ a: 1 })` to modulate `lpf`)
- *
- * Modulators can be referred to by `id` so that they can be updated later e.g. inside
- * a `sometimes`. See example below.
- *
- * @name env
- * @param {Object} config Envelope configuration.
- * @param {string | Pattern} [config.control] Node to modulate. Aliases: c
- * @param {string | Pattern} [config.subControl] Sub-control name to append to the control key. Aliases: sc
- * @param {number | Pattern} [config.depth] Relative modulation depth. Aliases: dep, dr
- * @param {number | Pattern} [config.depthabs] Absolute modulation depth. Aliases: da
- * @param {number | Pattern} [config.attack] Time to reach depth. Aliases: att, a
- * @param {number | Pattern} [config.decay] Time to reach sustain. Aliases: dec, d
- * @param {number | Pattern} [config.sustain] Sustain depth. Aliases: sus, s
- * @param {number | Pattern} [config.release] Time to return to nominal value. Aliases: rel, r
- * @param {number | Pattern} [config.acurve] Snappiness of attack curve (-1 = relaxed, 1 = snappy). Aliases: ac
- * @param {number | Pattern} [config.dcurve] Snappiness of decay curve (-1 = relaxed, 1 = snappy). Aliases: dc
- * @param {number | Pattern} [config.rcurve] Snappiness of release curve (-1 = relaxed, 1 = snappy). Aliases: rc
- * @param {number | Pattern} [config.fxi] FX index to target
- * @param {string | Pattern} id ID to use for this modulator
- * @returns Pattern
- *
- * @example
- * s("saw").note("F1").lpf(500).env({ a: 1 })
- *
- * @example
- * s("saw").env({ d: 1 }).note("F1")
- *   .lpq(4).lpf(50)
- *   .env({ a: 0.1, d: 1, ac: 0.8, dc: 0.3, depth: 50 })
- *
- * @example
- * s("saw").lpf(500).diode(0.3)
- *   .env({ c: "lpf", a: 0.5, d: 0.5 })
- *
- * @example
- * s("pulse").lpf(500).env({ a: 1 })
- *   .env({ c: "s", a: 1 })
- *   .diode(0.3)
- *   .sometimes(x => x.env({ a: "0.5" }, 1)) // envelope #1 (0-indexed)
- *
- * @example
- * s("pulse").lpf(500).env({ a: 1 }, 'lpf_mod')
- *   .env({ c: "s", a: 1 })
- *   .diode(0.3)
- *   .sometimes(x => x.env({ a: "0.5" }, 'lpf_mod'))
- */
-Pattern.prototype.env = function (config, id) {
-  return this.modulate('env', config, id);
-};
-export const env = (config) => pure({}).env(config);
-
-/**
- * Modulates with the output from a given `bus`.
- * Can be called in sequence like pat.bmod(...).bmod(...) to set up multiple modulators
- *
- * Send to an audio bus with `otherPat.bus(..)`.
- *
- * There are two ways to declare which control will be modulated:
- * 1. Explicitly put `control` in the config (e.g. `bmod({ id: 2, c: "lpf" })`)
- * 2. If the control parameter is absent, the control _immediately before_ the `bmod` call will be used
- *   (e.g. `s("saw").lpf(500).bmod({ id: 2 })` to modulate `lpf`)
- *
- * Modulators can be referred to by `id` so that they can be updated later e.g. inside
- * a `sometimes`. See example below.
- *
- * @name bmod
- * @param {Object} config Bus modulation configuration.
- * @param {string | Pattern} [config.bus] Bus to get modulation signal from
- * @param {string | Pattern} [config.control] Node to modulate. Aliases: c
- * @param {string | Pattern} [config.subControl] Sub-control name to append to the control key. Aliases: sc
- * @param {number | Pattern} [config.depth] Relative modulation depth. Aliases: dep, dr
- * @param {number | Pattern} [config.depthabs] Absolute modulation depth. Aliases: da
- * @param {number | Pattern} [config.dc] DC offset prior to application
- * @param {number | Pattern} [config.fxi] FX index to target
- * @param {string | Pattern} id ID to use for this modulator
- * @returns Pattern
- *
- * @example
- * modulator: s("one").seg(64).gain(slider(0, 0, 1)).bus(1).dry(0)
- * carrier: s("saw").bmod({ b: 1 })
- *
- */
-Pattern.prototype.bmod = function (config, id) {
-  return this.modulate('bmod', config, id);
-};
-export const bmod = (config) => pure({}).bmod(config);
-
-/**
- * Transient shaper. Gives independent control over the emphasis on transients
- * and sustains
- *
- * @name transient
- * @param {number | Pattern} attack Emphasis on transients; between -1 (deaccentuate) and 1 (accentuate)
- * @param {number | Pattern} sustain Emphasis on the sustains; between -1 (deaccentuate) and 1 (accentuate)
- * @example
- * s("bd").transient("<-1 -0.5 0 0.5 1>")
- * @example
- * s("hh*16").bank("tr909").transient("<-1:1 1:-1>")
- */
-export const { transient } = registerControl(['transient', 'transsustain']);
-
-export const { FXrelease, FXrel, FXr, fxr } = registerControl('FXrelease', 'FXrel', 'FXr', 'fxr');

packages/core/cyclist.mjs

@@ -14,7 +14,7 @@ export class Cyclist {
     onToggle,
     onError,
     getTime,
-    latency = 0.1,
+    latency = 0.03,
     setInterval,
     clearInterval,
     beforeStart,

packages/core/euclid.mjs

@@ -35,18 +35,18 @@ const right = function (n, x) {
   return result;
 };
 
-const _bjorklund = function (n, x) {
+const _bjork = function (n, x) {
   const [ons, offs] = n;
-  return Math.min(ons, offs) <= 1 ? [n, x] : _bjorklund(...(ons > offs ? left(n, x) : right(n, x)));
+  return Math.min(ons, offs) <= 1 ? [n, x] : _bjork(...(ons > offs ? left(n, x) : right(n, x)));
 };
 
-export const bjorklund = function (ons, steps) {
+export const bjork = function (ons, steps) {
   const inverted = ons < 0;
   const absOns = Math.abs(ons);
   const offs = steps - absOns;
   const ones = Array(absOns).fill([1]);
   const zeros = Array(offs).fill([0]);
-  const result = _bjorklund([absOns, offs], [ones, zeros]);
+  const result = _bjork([absOns, offs], [ones, zeros]);
   const pattern = flatten(result[1][0]).concat(flatten(result[1][1]));
   return inverted ? pattern.map((x) => 1 - x) : pattern;
 };
@@ -128,7 +128,7 @@ export const bjorklund = function (ons, steps) {
  */
 
 const _euclidRot = function (pulses, steps, rotation) {
-  const b = bjorklund(pulses, steps);
+  const b = bjork(pulses, steps);
   if (rotation) {
     return rotate(b, -rotation);
   }
@@ -139,7 +139,7 @@ export const euclid = register('euclid', function (pulses, steps, pat) {
   return pat.struct(_euclidRot(pulses, steps, 0));
 });
 
-export const bjork = register('bjork', function (euc, pat) {
+export const e = register('e', function (euc, pat) {
   if (!Array.isArray(euc)) {
     euc = [euc];
   }
@@ -216,6 +216,6 @@ export const euclidLegatoRot = register(['euclidLegatoRot'], function (pulses, s
  * .pan(sine.slow(8))
  */
 export const { euclidish, eish } = register(['euclidish', 'eish'], function (pulses, steps, perc, pat) {
-  const morphed = _morph(bjorklund(pulses, steps), new Array(pulses).fill(1), perc);
+  const morphed = _morph(bjork(pulses, steps), new Array(pulses).fill(1), perc);
   return pat.struct(morphed).setSteps(steps);
 });

packages/core/impure.mjs

@@ -1,90 +0,0 @@
-/*
-stateful.mjs - File of shame for stateful, impure and otherwise illegal pattern methods
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/index.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { register, reify, Pattern } from './pattern.mjs';
-
-let timelines = {};
-
-export const reset_state = function () {
-  reset_timelines();
-};
-
-export const reset_timelines = function () {
-  timelines = {};
-};
-
-/***
- * Allows you to switch a pattern between different 'timelines'. This is particularly useful when
- * live coding, for example when you want to cue a pattern up to play from its start.
- *
- * Timelines are specified by number, so that if you had a pattern like
- * `n("<0 1 2 3>").s("num").timeline(1)` playing, then changed the '1'
- * to '2', it would always align '0' to the nearest cycle. You will likely want to trigger
- * an evaluation a little bit before the cycle starts, to avoid missing events.
- *
- * After the first use, a timeline will continue with the same 'offset'. That is, if you change
- * a pattern without changing its timeline number, it will stay on that timeline without resetting.
- *
- * Rather than incrementing a timeline to reset it, it's easier to negate it, e.g. by switching between `-2`
- * and `2`. This is because when you negate a timeline it will always reset.
- *
- * You can also pattern the timeline if you want, to create strange resetting patterns.
- * @param {number | Pattern} timeline The timeline that the pattern should play on.
- * @example
- * n("<0 1 2 3>(3,8)")
- *   .sound("num")
- *   // resets the timeline every two cycles, by negating the timeline.
- *   // in a lot of cases this will be edited by a human live coder
- *   // rather than patterned!
- *   .timeline("<2 -2>".slow(2))
- */
-
-export const timeline = register(
-  'timeline',
-  function (tpat, pat) {
-    tpat = reify(tpat);
-    const f = function (state) {
-      // Is this called from the scheduler? (rather than from e.g. the visualiser)
-      const scheduler = !!state.controls.cyclist;
-      const timehaps = tpat.query(state);
-      const result = [];
-      for (const timehap of timehaps) {
-        const tlid = timehap.value;
-        let offset;
-        if (tlid === 0) {
-          offset = 0;
-        } else if (tlid in timelines) {
-          offset = timelines[tlid];
-        } else {
-          const timearc = timehap.wholeOrPart();
-          if (!scheduler || state.span.begin.lt(timearc.midpoint())) {
-            offset = timearc.begin;
-          } else {
-            // Sync to end of timearc if we first see it over halfway into its
-            // timespan. Allows 'cuing up' next timeline when live coding.
-            offset = timearc.end;
-          }
-        }
-        if (scheduler) {
-          // update state
-          timelines[tlid] = offset;
-          if (tlid !== 0) {
-            delete timelines[-tlid];
-          }
-        }
-
-        const pathaps = pat
-          .late(offset)
-          .query(state.setSpan(timehap.part))
-          .map((h) => h.setContext(h.combineContext(timehap)));
-        result.push(...pathaps);
-      }
-      return result;
-    };
-    return new Pattern(f, pat._steps);
-  },
-  false,
-);

packages/core/index.mjs

@@ -1,6 +1,6 @@
 /*
 index.mjs - <short description TODO>
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/index.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/index.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
@@ -11,21 +11,20 @@ import createClock from './zyklus.mjs';
 import { logger } from './logger.mjs';
 export { Fraction, controls, createClock };
 export * from './controls.mjs';
-export * from './cyclist.mjs';
-export * from './evaluate.mjs';
 export * from './hap.mjs';
-export * from './impure.mjs';
-export * from './logger.mjs';
 export * from './pattern.mjs';
-export * from './pick.mjs';
-export * from './repl.mjs';
 export * from './signal.mjs';
-export * from './speak.mjs';
+export * from './pick.mjs';
 export * from './state.mjs';
-export * from './schedulerState.mjs';
 export * from './timespan.mjs';
-export * from './ui.mjs';
 export * from './util.mjs';
+export * from './speak.mjs';
+export * from './evaluate.mjs';
+export * from './repl.mjs';
+export * from './cyclist.mjs';
+export * from './logger.mjs';
+export * from './time.mjs';
+export * from './ui.mjs';
 export { default as drawLine } from './drawLine.mjs';
 // below won't work with runtime.mjs (json import fails)
 /* import * as p from './package.json';

packages/core/logger.mjs

@@ -18,7 +18,7 @@ export function logger(message, type, data = {}) {
   }
   lastMessage = message;
   lastTime = t;
-  console.log(`%c${message}`, 'background-color: black;color:white;border-radius:15px');
+  console.log(`${t} %c${message}`, 'background-color: black;color:white;border-radius:15px');
   if (typeof document !== 'undefined' && typeof CustomEvent !== 'undefined') {
     document.dispatchEvent(
       new CustomEvent(logKey, {

packages/core/neocyclist.mjs

@@ -1,6 +1,6 @@
 /*
 neocyclist.mjs - event scheduler like cyclist, except recieves clock pulses from clockworker in order to sync across multiple instances.
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/neocyclist.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/neocyclist.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
@@ -11,6 +11,7 @@ export class NeoCyclist {
   constructor({ onTrigger, onToggle, getTime }) {
     this.started = false;
     this.cps = 0.5;
+    this.lastTick = 0; // absolute time when last tick (clock callback) happened
     this.getTime = getTime; // get absolute time
     this.time_at_last_tick_message = 0;
     // the clock of the worker and the audio context clock can drift apart over time
@@ -19,16 +20,18 @@ export class NeoCyclist {
     // in order to schedule events consistently.
     this.collator = new ClockCollator({ getTargetClockTime: getTime });
     this.onToggle = onToggle;
-    this.latency = 0.1; // fixed trigger time offset
+    this.latency = -0.1; // fixed trigger time offset
     this.cycle = 0;
+    this.maxcycle = null;
     this.id = Math.round(Date.now() * Math.random());
     this.worker = new SharedWorker(new URL('./clockworker.js', import.meta.url));
     this.worker.port.start();
     this.channel = new BroadcastChannel('strudeltick');
     const tickCallback = (payload) => {
-      const { cps, begin, end, cycle, time } = payload;
+      const { cps, begin, end, cycle, maxcycle, time } = payload;
       this.cps = cps;
       this.cycle = cycle;
+      this.maxcycle = maxcycle;
       const currentTime = this.collator.calculateOffset(time) + time;
       processHaps(begin, end, currentTime);
       this.time_at_last_tick_message = currentTime;

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/core",
-  "version": "1.2.6",
+  "version": "1.2.4",
   "description": "Port of Tidal Cycles to JavaScript",
   "main": "index.mjs",
   "type": "module",
@@ -31,15 +31,11 @@
   },
   "homepage": "https://strudel.cc",
   "dependencies": {
-    "@kabelsalat/web": "^0.4.1",
     "fraction.js": "^5.2.1"
   },
   "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2",
   "devDependencies": {
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/core/pattern.mjs

@@ -25,8 +25,7 @@ import {
   stringifyValues,
 } from './util.mjs';
 import drawLine from './drawLine.mjs';
-import { errorLogger, logger } from './logger.mjs';
-import { strudelScope } from './evaluate.mjs';
+import { logger } from './logger.mjs';
 
 let stringParser;
 
@@ -415,7 +414,7 @@ export class Pattern {
     try {
       return this.query(new State(new TimeSpan(begin, end), controls));
     } catch (err) {
-      errorLogger(err, 'query');
+      logger(`[query]: ${err.message}`, 'error');
       return [];
     }
   }
@@ -575,8 +574,7 @@ export class Pattern {
    * Returns a new Pattern, which only returns haps that meet the given test.
    * @param {Function} hap_test - a function which returns false for haps to be removed from the pattern
    * @returns Pattern
-   * @example
-   * s("bd*8").velocity(rand).filterHaps((h) => (h.whole.begin % 1) < h.value.velocity)
+   * @noAutocomplete
    */
   filterHaps(hap_test) {
     return new Pattern((state) => this.query(state).filter(hap_test));
@@ -587,11 +585,7 @@ export class Pattern {
    * inside haps.
    * @param {Function} value_test
    * @returns Pattern
-   * @example
-   * const drums = s("bd sd bd sd")
-   * kick: drums.filterValues((v) => v.s === 'bd').duck(2)
-   * snare: drums.filterValues((v) => v.s === 'sd')
-   * bass: s("saw!4").note("G#1").lpf(80).lpenv(4).orbit(2)
+   * @noAutocomplete
    */
   filterValues(value_test) {
     return new Pattern((state) => this.query(state).filter((hap) => value_test(hap.value))).setSteps(this._steps);
@@ -1593,13 +1587,7 @@ export const func = curry((a, b) => reify(b).func(a));
  *
  * @param {string | string[]} name name of the function, or an array of names to be used as synonyms
  * @param {function} func function with 1 or more params, where last is the current pattern
- * @param {bool} patternify defaults to true; if set to false, you will have more control over the arguments to `func` as they will be
- *   in their raw form and it will be up to you to patternify them and/or query them for values
- * @example
- * const vlpf = register('vlpf', (freq, pat) => {
- *   return pat.fmap((v) => ({...v, cutoff: freq * (v.velocity ?? 1) }));
- * })
- * s("saw").seg(8).velocity(rand).vlpf(800)
+ * @noAutocomplete
  *
  */
 export function register(name, func, patternify = true, preserveSteps = false, join = (x) => x.innerJoin()) {
@@ -1684,9 +1672,7 @@ export function register(name, func, patternify = true, preserveSteps = false, j
 
   // toplevel functions get curried as well as patternified
   // because pfunc uses spread args, we need to state the arity explicitly!
-  const curried = curry(pfunc, null, arity);
-  strudelScope[name] = curried;
-  return curried;
+  return curry(pfunc, null, arity);
 }
 
 // Like register, but defaults to stepJoin
@@ -2248,7 +2234,7 @@ export const brak = register('brak', function (pat) {
 });
 
 /**
- * Reverse all cycles in a pattern. See also `revv` for reversing a whole pattern.
+ * Reverse all haps in a pattern
  *
  * @name rev
  * @memberof Pattern
@@ -2280,23 +2266,6 @@ export const rev = register(
   true,
 );
 
-/**
- * Reverse a whole pattern. See also `rev` for reversing each cycle.
- *
- * @name revv
- * @memberof Pattern
- * @returns Pattern
- * @example
- * // This is the same as `<[g e] [d c]>`. If `rev()` is used, you get
- * // the same as `<[d c] [g e]>`, where each cycle reverses, but the order of
- * // cycles stays the same.
- * note("<[c d] [e g]>").revv()
- */
-export const revv = register('revv', function (pat) {
-  const negateSpan = (span) => new TimeSpan(Fraction(0).sub(span.end), Fraction(0).sub(span.begin));
-  return pat.withQuerySpan(negateSpan).withHapSpan(negateSpan);
-});
-
 /** Like press, but allows you to specify the amount by which each
  * event is shifted. pressBy(0.5) is the same as press, while
  * pressBy(1/3) shifts each event by a third of its timespan.
@@ -2605,8 +2574,8 @@ export const { chunkBack, chunkback } = register(
  * @returns Pattern
  * @example
  * "<0 8> 1 2 3 4 5 6 7"
- * .scale("C2:major").note()
  * .fastChunk(4, x => x.color('red')).slow(2)
+ * .scale("C2:major").note()
  */
 export const { fastchunk, fastChunk } = register(
   ['fastchunk', 'fastChunk'],
@@ -2690,13 +2659,8 @@ export const hsl = register('hsl', (h, s, l, pat) => {
 /**
  * Tags each Hap with an identifier. Good for filtering. The function populates Hap.context.tags (Array).
  * @name tag
+ * @noAutocomplete
  * @param {string} tag anything unique
- * @example
- * s("saw!16").note("F1")
- *   .lpf(tri.range(40, 80).slow(4)).lpenv(5).lpq(4).lpd(0.15)
- *   .when(rand.late(0.1).gte(0.5), x => x.transpose("12").tag('altered'))
- *   .when(rand.late(0.2).gte(0.5), x => x.s("square").tag('altered'))
- *   .when("<0 1>", x => x.filter((hap) => hap.hasTag('altered')))
  */
 Pattern.prototype.tag = function (tag) {
   return this.withContext((ctx) => ({ ...ctx, tags: (ctx.tags || []).concat([tag]) }));
@@ -2707,16 +2671,15 @@ Pattern.prototype.tag = function (tag) {
  * @name filter
  * @param {Function} test function to test Hap
  * @example
- * s("hh!7 oh").filter(hap => hap.value.s === 'hh')
+ * s("hh!7 oh").filter(hap => hap.value.s==='hh')
  */
 export const filter = register('filter', (test, pat) => pat.withHaps((haps) => haps.filter(test)));
 
 /**
  * Filters haps by their begin time
  * @name filterWhen
+ * @noAutocomplete
  * @param {Function} test function to test Hap.whole.begin
- * @example
- * oneCycle: s("bd*4").filterWhen((t) => t < 1)
  */
 export const filterWhen = register('filterWhen', (test, pat) => pat.filter((h) => test(h.whole.begin)));
 
@@ -3035,24 +2998,6 @@ export const extend = stepRegister('extend', function (factor, pat) {
   return pat.fast(factor).expand(factor);
 });
 
-/**
- * *Experimental*
- *
- * `replicate` is similar to `fast` in that it increases its density, but it also increases the step count
- * accordingly. So `stepcat("a b".replicate(2), "c d")` would be the same as `"a b a b c d"`, whereas
- * `stepcat("a b".fast(2), "c d")` would be the same as `"[a b] [a b] c d"`.
- *
- * TODO: find out how this function differs from extend
- * @example
- * stepcat(
- *   sound("bd bd - cp").replicate(2),
- *   sound("bd - sd -")
- * ).pace(8)
- */
-export const replicate = stepRegister('replicate', function (factor, pat) {
-  return pat.repeatCycles(factor).fast(factor).expand(factor);
-});
-
 /**
  * *Experimental*
  *
@@ -3589,20 +3534,6 @@ export const morph = (frompat, topat, bypat) => {
   return frompat.innerBind((from) => topat.innerBind((to) => bypat.innerBind((by) => _morph(from, to, by))));
 };
 
-const _distortWithAlg = function (name) {
-  const func = function (args, pat) {
-    const argsPat = reify(args).fmap((v) => (Array.isArray(v) ? [...v, name] : [v, 1, name]));
-    if (!pat) {
-      return pure({}).distort(argsPat);
-    }
-    return pat.distort(argsPat);
-  };
-  Pattern.prototype[name] = function (args) {
-    return func(args, this);
-  };
-  return func;
-};
-
 /**
  * Soft-clipping distortion
  *
@@ -3611,8 +3542,6 @@ const _distortWithAlg = function (name) {
  * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
-export const soft = _distortWithAlg('soft');
-
 /**
  * Hard-clipping distortion
  *
@@ -3621,8 +3550,6 @@ export const soft = _distortWithAlg('soft');
  * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
-export const hard = _distortWithAlg('hard');
-
 /**
  * Cubic polynomial distortion
  *
@@ -3631,8 +3558,6 @@ export const hard = _distortWithAlg('hard');
  * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
-export const cubic = _distortWithAlg('cubic');
-
 /**
  * Diode-emulating distortion
  *
@@ -3641,8 +3566,6 @@ export const cubic = _distortWithAlg('cubic');
  * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
-export const diode = _distortWithAlg('diode');
-
 /**
  * Asymmetrical diode distortion
  *
@@ -3651,8 +3574,6 @@ export const diode = _distortWithAlg('diode');
  * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
-export const asym = _distortWithAlg('asym');
-
 /**
  * Wavefolding distortion
  *
@@ -3661,8 +3582,6 @@ export const asym = _distortWithAlg('asym');
  * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
-export const fold = _distortWithAlg('fold');
-
 /**
  * Wavefolding distortion composed with sinusoid
  *
@@ -3671,8 +3590,6 @@ export const fold = _distortWithAlg('fold');
  * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
-export const sinefold = _distortWithAlg('sinefold');
-
 /**
  * Distortion via Chebyshev polynomials
  *
@@ -3681,179 +3598,11 @@ export const sinefold = _distortWithAlg('sinefold');
  * @param {number | Pattern} volume linear postgain of the distortion
  *
  */
-export const chebyshev = _distortWithAlg('chebyshev');
-
-/**
- * Turns a list of patterns into a single pattern which outputs list-values
- *
- * @name parray
- * @returns Pattern
- */
-export const parray = (pats) => {
-  const pack = (...xs) => xs;
-  let acc = pure(curry(pack, null, pats.length));
-  for (const p of pats) acc = acc.appBoth(reify(p));
-  return acc;
-};
-
-const _ensureListPattern = (list) => {
-  if (Array.isArray(list)) {
-    return parray(list);
-  }
-  return reify(list);
-};
-
-/**
- * Scale the magnitude of the harmonics of one of the core synths ('sine', 'tri', 'saw', ..)
- *
- * Can also be used to create a new synth via `s('user').partials(...)`
- *
- * @name partials
- * @param {number[] | Pattern} magnitudes List of [0, 1] magnitudes for partials. 0th entry is the fundamental harmonic (i.e. DC offset is skipped)
- * @example
- * s("user").seg(16).n(irand(8)).scale("A:major")
- *   .partials([1, 0, 1, 0, 0, 1])
- * @example
- * s("saw").seg(8).n(irand(12)).scale("G#:minor")
- *   .partials(binaryL(irand(256).add("1")))
- */
-Pattern.prototype.partials = function (list) {
-  return this.withValue((v) => (l) => ({ ...v, partials: l })).appLeft(_ensureListPattern(list));
-};
-
-// Also create a top-level function
-export const partials = (list) => {
-  return _ensureListPattern(list).as('partials');
-};
-
-/**
- * Rotates the harmonics of one of the core synths ('sine', 'tri', 'saw', 'user', ..) by a list of phases
- *
- * @name phases
- * @param {number[] | Pattern} phases List of [0, 1) phases for partials. 0th entry is the fundamental phase (i.e. DC offset is skipped)
- * @example
- * // Phase cancellation
- * s("saw").seg(8).n(irand(12)).scale("G#1:minor")
- *   .partials(partials([1, 1, 1]))
- *   .superimpose(x => x.phases([0.5, 0.5, 0.5]))
- */
-Pattern.prototype.phases = function (list) {
-  return this.withValue((v) => (l) => ({ ...v, phases: l })).appLeft(_ensureListPattern(list));
-};
-
-// Also create a top-level function
-export const phases = (list) => {
-  return _ensureListPattern(list).as('phases');
-};
-
-/**
- * Establishes an FX chain. Can be called by chaining .FX(fx1).FX(fx2)..
- * calls and/or in a single .FX(fx1, fx2, ..) call. The fx1, .. are _patterns_ which
- * establish the controls of the given effect. See examples.
- * @name FX
- * @memberof Pattern
- * @returns Pattern
- * @example
- * $: s("[sbd <hh [bd | lt | oh]>]*4").dec(.4)
- *   .FX(
- *     phaser(0.5).gain(2),
- *     bpf(800),
- *     distort(1.3),
- *     room(0.2),
- *     delay(0.5).gain(1.25),
- *     distort(0.3),
- *   ).fxr(1.7) // sets release time of effects (like delay)
- * @example
- * $: s("saw").fm(0.5)
- *   .delay(0.3) // outer effects are applied *last*
- *   .FX(coarse(4)) // first coarse
- *   .FX(lpf(500).lpe(4).lpa(1).lpd(2)) // then lpf
- *   .FX(distort(1)) // then distort
- */
-Pattern.prototype.FX = function (...effects) {
-  effects = effects.map(reify);
-  return this.withValue((v) => (vEff) => {
-    const currFX = v.FX ?? [];
-    return { ...v, FX: currFX.concat(vEff) };
-  }).appLeft(parray(effects));
-};
-
-const _asArrayPattern = (pats) => {
-  const pack = (...xs) => xs;
-  let acc = pure(curry(pack, null, pats.length));
-  for (const p of pats) acc = acc.appLeft(p);
-  return acc;
-};
-
-/**
- * Produces a [Kabelsalat](https://kabel.salat.dev/) modular sound engine.
- * This can be used as either an effect (by including `audioin()` at the beginning
- * of your kabel expression) or as a sound source (via any expression which doesn't
- * start with `audioin()`).
- *
- * Some helpers you have available to you:
- *   * Strudel mini notation works fine in K(..) via "" or ``
- *   * More complex Strudel expressions (like "0 1 2".fast(4) or irand(24)) can be
- *     written by wrapping them in `S(..)` inside your Kabel code
- *   * We expose Strudel's note frequency under `sFreq` and Strudel's gate
- *     information under `sGate`
- *   * You can use more complex multi-line expressions (like `let x = a; let y = b; x.lpf(y);`)
- *     by wrapping them inside a function in K (see example).
- *
- * @name K
- * @param {KabelsalatExpression | Function} expr Kabelsalat graph definition
- * @memberof Pattern
- * @returns Pattern
- *
- * @example
- * note("A c e".fast(4)).transpose("<0 2 4 6 8>")
- *   .scale("F:minor").transpose("12")
- *   .s("saw")
- *   .K(
- *     // audioin().mul(sGate.adsr(0.001, 0.3, 0, 0.2)) // as effect
- *     saw(saw(sFreq / "2!3 16").mul(8).add(sFreq).lag("0!3 0.1")).mul(0.3) // as source
- *     .mul(sGate.adsr(0, 0.15, 0.5, "0.1!3 1"))
- *     .lpf(sGate.adsr(0, 0.2, 0.3, 0.2).mul(1).add(0))
- *     .add(x => x.delay(S("0.3 0.2".fast(2))).mul(0.7))
- *     .add(x => x.delay("0.03 [0.08 0.01] 0.01 0.013").mul(0.77)).mul(0.7)
- *     .add(x => x.delay(.13).mul(0.7))
- *     .out()
- *   )
- *
- * @example
- * n("<0 1 <2 3 2 4>>*16")
- *   .scale("G#2:minor").sometimes(x => x.transpose("12 | 24"))
- *   .K(() => {
- *     const att = S(rand.range(0, 0.05))
- *     const dec = S(rand.range(0.05, 0.2))
- *     let f = n(sFreq);
- *     const mod = sine(f).mul("0.1 | 0.2 | 0.3")
- *       .add("[[1.5 1] | 1 | 2 | 4 | [6 4@3]]*2")
- *     saw(f.mul(mod))
- *     .mul(sGate.ad(att, dec))
- *     .add(x => x.delay(0.4).mul(0.3))
- *     .out()
- *   }).fxr(1).room(0.3)
- */
-/**
- * Creates a worklet effect. Typically derived by writing K(...) in the REPL which will parse
- * Kabelsalat code.
- *
- * @name worklet
- * @param {string} src Source code of the worklet update function
- * @param {...number | ...Pattern} inputs Worklet inputs
- * @memberof Pattern
- * @returns Pattern
- * @noAutocomplete
- */
-Pattern.prototype.worklet = function (src, ...inputs) {
-  inputs = inputs.map(reify);
-  return this.outerBind((v) => {
-    return _asArrayPattern(inputs).withValue((vInput) => {
-      const currInputs = v.workletInputs ?? [];
-      return { ...v, workletSrc: src, workletInputs: currInputs.concat(vInput) };
-    });
-  });
-};
-
-export const worklet = (...args) => pure({}).worklet(...args);
+const distAlgoNames = ['scurve', 'soft', 'hard', 'cubic', 'diode', 'asym', 'fold', 'sinefold', 'chebyshev'];
+for (const name of distAlgoNames) {
+  // Add aliases for distortion algorithms
+  Pattern.prototype[name] = function (args) {
+    const argsPat = reify(args).fmap((v) => (Array.isArray(v) ? [...v, name] : [v, 1, name]));
+    return this.distort(argsPat);
+  };
+}

packages/core/repl.mjs

@@ -2,17 +2,9 @@ import { NeoCyclist } from './neocyclist.mjs';
 import { Cyclist } from './cyclist.mjs';
 import { evaluate as _evaluate } from './evaluate.mjs';
 import { errorLogger, logger } from './logger.mjs';
-import {
-  setCpsFunc,
-  setIsStarted,
-  setPattern as exposeSchedulerPattern,
-  setTime,
-  setTriggerFunc,
-} from './schedulerState.mjs';
+import { setTime } from './time.mjs';
 import { evalScope } from './evaluate.mjs';
 import { register, Pattern, isPattern, silence, stack } from './pattern.mjs';
-import { reset_state } from './impure.mjs';
-import { SalatRepl } from '@kabelsalat/web';
 
 export function repl({
   defaultOutput,
@@ -31,7 +23,6 @@ export function repl({
   id,
   mondo = false,
 }) {
-  const kabel = new SalatRepl({ localScope: true });
   const state = {
     schedulerError: undefined,
     evalError: undefined,
@@ -60,11 +51,7 @@ export function repl({
     getTime,
     onToggle: (started) => {
       updateState({ started });
-      setIsStarted(started);
       onToggle?.(started);
-      if (!started) {
-        reset_state();
-      }
     },
     setInterval,
     clearInterval,
@@ -74,8 +61,6 @@ export function repl({
   // NeoCyclist uses a shared worker to communicate between instances, which is not supported on mobile chrome
   const scheduler =
     sync && typeof SharedWorker != 'undefined' ? new NeoCyclist(schedulerOptions) : new Cyclist(schedulerOptions);
-  setTriggerFunc(schedulerOptions.onTrigger);
-  setCpsFunc(() => scheduler.cps);
   let pPatterns = {};
   let anonymousIndex = 0;
   let allTransform;
@@ -89,11 +74,6 @@ export function repl({
     return silence;
   };
 
-  const compileKabel = (code) => {
-    const node = kabel.evaluate(code);
-    return node.compile({ log: false });
-  };
-
   // helper to get a patternified pure value out
   function unpure(pat) {
     if (pat._Pattern) {
@@ -105,7 +85,6 @@ export function repl({
   const setPattern = async (pattern, autostart = true) => {
     pattern = editPattern?.(pattern) || pattern;
     await scheduler.setPattern(pattern, autostart);
-    exposeSchedulerPattern(pattern);
     return pattern;
   };
   setTime(() => scheduler.now()); // TODO: refactor?
@@ -173,9 +152,9 @@ export function repl({
         // allows muting a pattern x with x_ or _x
         return silence;
       }
-      if (id.includes('$')) {
+      if (id === '$') {
         // allows adding anonymous patterns with $:
-        id = `${id}${anonymousIndex}`;
+        id = `$${anonymousIndex}`;
         anonymousIndex++;
       }
       pPatterns[id] = this;
@@ -215,7 +194,6 @@ export function repl({
       setcps: setCps,
       setCpm,
       setcpm: setCpm,
-      compileKabel,
     });
   };
 
@@ -237,19 +215,8 @@ export function repl({
       let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
       if (Object.keys(pPatterns).length) {
         let patterns = [];
-        let soloActive = false;
         for (const [key, value] of Object.entries(pPatterns)) {
-          // handle soloed patterns ex: S$: s("bd!4")
-          const isSolod = key.length > 1 && key.startsWith('S');
-          if (isSolod && soloActive === false) {
-            // first time we see a soloed pattern, clear existing patterns
-            patterns = [];
-            soloActive = true;
-          }
-          if (!soloActive || (soloActive && isSolod)) {
-            const valWithState = value.withState((state) => state.setControls({ id: key }));
-            patterns.push(valWithState);
-          }
+          patterns.push(value.withState((state) => state.setControls({ id: key })));
         }
         if (eachTransform) {
           // Explicit lambda so only element (not index and array) are passed
@@ -260,13 +227,14 @@ export function repl({
         pattern = eachTransform(pattern);
       }
       if (allTransforms.length) {
-        for (const transform of allTransforms) {
-          pattern = transform(pattern);
+        for (let i in allTransforms) {
+          pattern = allTransforms[i](pattern);
         }
       }
 
       if (!isPattern(pattern)) {
-        pattern = silence;
+        const message = `got "${typeof evaluated}" instead of pattern`;
+        throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
       }
       logger(`[eval] code updated`);
       pattern = await setPattern(pattern, autostart);

packages/core/schedulerState.mjs

@@ -1,53 +0,0 @@
-/*
-schedulerState.mjs - Module to pipe out various parameters from the scheduler for global consumption
-Copyright (C) 2026 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/schedulerState.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-let time;
-let cpsFunc;
-let pattern;
-let triggerFunc;
-let isStarted;
-export function getTime() {
-  if (!time) {
-    throw new Error('no time set! use setTime to define a time source');
-  }
-  return time();
-}
-
-export function setTime(func) {
-  time = func;
-}
-
-export function setCpsFunc(func) {
-  cpsFunc = func;
-}
-
-export function getCps() {
-  return cpsFunc?.();
-}
-
-export function setPattern(pat) {
-  pattern = pat;
-}
-
-export function getPattern() {
-  return pattern;
-}
-
-export function setTriggerFunc(func) {
-  triggerFunc = func;
-}
-
-export function getTriggerFunc() {
-  return triggerFunc;
-}
-
-export function setIsStarted(val) {
-  isStarted = !!val;
-}
-
-export function getIsStarted() {
-  return isStarted;
-}

packages/core/signal.mjs

@@ -16,7 +16,7 @@ export function steady(value) {
 }
 
 export const signal = (func) => {
-  const query = (state) => [new Hap(undefined, state.span, func(state.span.begin, state.controls))];
+  const query = (state) => [new Hap(undefined, state.span, func(state.span.begin))];
   return new Pattern(query);
 };
 
@@ -186,97 +186,38 @@ export const mouseY = signal(() => _mouseY);
 export const mousex = signal(() => _mouseX);
 export const mouseX = signal(() => _mouseX);
 
-// Random number generators
+// random signals
 
-// Produce "Avalanche effect" where flipping a single bit of x
-// results in all output bits flipping with probability 0.5
-// See e.g. https://github.com/aappleby/smhasher/blob/0ff96f7835817a27d0487325b6c16033e2992eb5/src/MurmurHash3.cpp#L68-L77
-const _murmurHashFinalizer = (x) => {
-  x |= 0;
-  x ^= x >>> 16;
-  x = Math.imul(x, 0x85ebca6b);
-  x ^= x >>> 13;
-  x = Math.imul(x, 0xc2b2ae35);
-  x ^= x >>> 16;
-  return x >>> 0; // unsigned
-};
-
-// Convert t to a 32 bit integer, preserving temporal resolution down to 1/2^29
-const _tToT = (t) => {
-  return Math.floor(t * 536870912);
-};
-
-// Used to decorrelate nearby T, i, and seed prior to hashing
-const _decorrelate = (T, i = 0, seed = 0) => {
-  const lowBits = (T >>> 0) >>> 0;
-  const highBits = Math.floor(T / 4294967296) >>> 0; // 2^32
-  let key = lowBits ^ Math.imul(highBits ^ 0x85ebca6b, 0xc2b2ae35);
-  key ^= Math.imul(i ^ 0x7f4a7c15, 0x9e3779b9);
-  key ^= Math.imul(seed ^ 0x165667b1, 0x27d4eb2d);
-  return key >>> 0;
-};
-
-const randAt = (T, i = 0, seed = 0) => {
-  return _murmurHashFinalizer(_decorrelate(T, i, seed)) / 4294967296; // 2^32
-};
-
-// n samples at time t
-const timeToRands = (t, n, seed = 0) => {
-  const T = _tToT(t);
-  if (n === 1) {
-    return randAt(T, 0, seed);
-  }
-  const out = new Array(n);
-  for (let i = 0; i < n; i++) out[i] = randAt(T, i, seed);
-  return out;
-};
-
-// Old random signals. Currently the default, but can also be chosen via
-// `useRNG('legacy')`
-
-// stretch 300 cycles over the range of [0,2**29 == 536870912) then apply the xorshift algorithm
-const __xorwise = (x) => {
+const xorwise = (x) => {
   const a = (x << 13) ^ x;
   const b = (a >> 17) ^ a;
   return (b << 5) ^ b;
 };
-const __frac = (x) => x - Math.trunc(x);
-const __timeToIntSeed = (x) => __xorwise(Math.trunc(__frac(x / 300) * 536870912));
-const __intSeedToRand = (x) => (x % 536870912) / 536870912;
-const __timeToRandsPrime = (seed, n) => {
-  if (n === 1) {
-    return Math.abs(__intSeedToRand(seed));
-  }
+
+// stretch 300 cycles over the range of [0,2**29 == 536870912) then apply the xorshift algorithm
+const _frac = (x) => x - Math.trunc(x);
+
+const timeToIntSeed = (x) => xorwise(Math.trunc(_frac(x / 300) * 536870912));
+
+const intSeedToRand = (x) => (x % 536870912) / 536870912;
+
+const timeToRand = (x) => Math.abs(intSeedToRand(timeToIntSeed(x)));
+
+const timeToRandsPrime = (seed, n) => {
   const result = [];
-  for (let i = 0; i < n; i++) {
-    result.push(__intSeedToRand(seed));
-    seed = __xorwise(seed);
+  // eslint-disable-next-line
+  for (let i = 0; i < n; ++i) {
+    result.push(intSeedToRand(seed));
+    seed = xorwise(seed);
   }
   return result;
 };
-const __timeToRands = (t, n) => __timeToRandsPrime(__timeToIntSeed(t), n);
 
-// End old random
-
-let RNG_MODE = 'legacy';
-export const getRandsAtTime = (t, n = 1, seed = 0) => {
-  return RNG_MODE === 'legacy' ? __timeToRands(t + seed, n) : timeToRands(t, n, seed);
-};
+const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);
 
 /**
- * Sets which random number generator to use. Historically Strudel would
- * use `useRNG('legacy')`, which remains the default. To use a new more statistically
- * precise RNG, try `useRNG('precise')`.
  *
- * @name useRNG
- * @param {string} mod - Mode. One of 'legacy', 'precise'
- * @example
- * useRNG('legacy')
- * // Repeats every 300 cycles
- * $: n(irand(50)).seg(16).scale("C:minor").ribbon(88, 32)
- * $: n(irand(50)).seg(16).scale("C:minor").ribbon(388, 32)
  */
-export const useRNG = (mode = 'legacy') => (RNG_MODE = mode);
 
 /**
  * A discrete pattern of numbers from 0 to n-1
@@ -287,7 +228,7 @@ export const useRNG = (mode = 'legacy') => (RNG_MODE = mode);
 export const run = (n) => saw.range(0, n).round().segment(n);
 
 /**
- * Creates a binary pattern from a number.
+ * Creates a pattern from a binary number.
  *
  * @name binary
  * @param {number} n - input number to convert to binary
@@ -301,7 +242,7 @@ export const binary = (n) => {
 };
 
 /**
- * Creates a binary pattern from a number, padded to n bits long.
+ * Creates a pattern from a binary number, padded to n bits long.
  *
  * @name binaryN
  * @param {number} n - input number to convert to binary
@@ -317,55 +258,10 @@ export const binaryN = (n, nBits = 16) => {
   return reify(n).segment(nBits).brshift(bitPos).band(pure(1));
 };
 
-/**
- * Creates a binary list pattern from a number.
- *
- * @name binaryL
- * @param {number} n - input number to convert to binary
- * s("saw").seg(8)
- *   .partials(binaryL(irand(4096).add(1)))
- */
-export const binaryL = (n) => {
-  const nBits = reify(n).log2(0).floor().add(1);
-  return binaryNL(n, nBits);
-};
-
-/**
- * Creates a binary list pattern from a number, padded to n bits long.
- *
- * @name binaryNL
- * @param {number} n - input number to convert to binary
- * @param {number} nBits - pattern length, defaults to 16
- */
-export const binaryNL = (n, nBits = 16) => {
-  return reify(n)
-    .withValue((v) => (bits) => {
-      const bList = [];
-      for (let i = bits - 1; i >= 0; i--) {
-        bList.push((v >> i) & 1);
-      }
-      return bList;
-    })
-    .appLeft(reify(nBits));
-};
-
-/**
- * Creates a list of random numbers of the given length
- *
- * @name randL
- * @param {number} n Number of random numbers to sample
- * @example
- * s("saw").seg(16).n(irand(12)).scale("F1:minor")
- *   .partials(randL(8))
- */
-export const randL = (n) => {
-  return signal((t) => (nVal) => getRandsAtTime(t, nVal).map(Math.abs)).appLeft(reify(n));
-};
-
 export const randrun = (n) => {
-  return signal((t, controls) => {
+  return signal((t) => {
     // Without adding 0.5, the first cycle is always 0,1,2,3,...
-    const rands = getRandsAtTime(t.floor().add(0.5), n, controls.randSeed);
+    const rands = timeToRands(t.floor().add(0.5), n);
     const nums = rands
       .map((n, i) => [n, i])
       .sort((a, b) => (a[0] > b[0]) - (a[0] < b[0]))
@@ -406,37 +302,6 @@ export const scramble = register('scramble', (n, pat) => {
   return _rearrangeWith(_irand(n)._segment(n), n, pat);
 });
 
-/**
- * Modify a pattern by applying a function to the `randomSeed` control if present
- *
- * @param {Function} func Function from seed (or undefined) to seed (or undefined)
- * @param {Pattern} pat Pattern to update
- * @returns Pattern
- */
-export const withSeed = (func, pat) => {
-  return new Pattern((state) => {
-    let { randSeed, ...controls } = state.controls;
-    randSeed = func(randSeed);
-    return pat.query(state.setControls({ ...controls, randSeed }));
-  }, pat._steps);
-};
-
-/**
- * Change the seed for random signals. Normally, random signals depend on time,
- * so two patterns at the same time will have the same random values. Specifying
- * a new seed changes the signal output by `rand`. This also affects other functions
- * that use randomness, like `shuffle` and `sometimes`.
- *
- * @name seed
- * @param {number} n A new seed. Can be any number.
- * @example
- * $: s("hh*4").degrade();
- * $: s("bd*4").degrade().seed(1); // Will degrade different events from the hi-hat
- */
-export const seed = register('seed', (n, pat) => {
-  return withSeed(() => n, pat);
-});
-
 /**
  * A continuous pattern of random numbers, between 0 and 1.
  *
@@ -446,7 +311,7 @@ export const seed = register('seed', (n, pat) => {
  * s("bd*4,hh*8").cutoff(rand.range(500,8000))
  *
  */
-export const rand = signal((t, controls) => getRandsAtTime(t, 1, controls.randSeed));
+export const rand = signal(timeToRand);
 /**
  * A continuous pattern of random numbers, between -1 and 1
  */
@@ -614,7 +479,7 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
  * @example
  * wchooseCycles(["bd",10], ["hh",1], ["sd",1]).s().fast(8)
  * @example
- * wchooseCycles(["c c c",5], ["a a a",3], ["f f f",1]).fast(4).note()
+ * wchooseCycles(["bd bd bd",5], ["hh hh hh",3], ["sd sd sd",1]).fast(4).s()
  * @example
  * // The probability can itself be a pattern
  * wchooseCycles(["bd(3,8)","<5 0>"], ["hh hh hh",3]).fast(4).s()
@@ -623,32 +488,36 @@ export const wchooseCycles = (...pairs) => _wchooseWith(rand.segment(1), ...pair
 
 export const wrandcat = wchooseCycles;
 
-function _perlin(t, seed = 0) {
+function _perlin(t) {
   let ta = Math.floor(t);
   let tb = ta + 1;
   const smootherStep = (x) => 6.0 * x ** 5 - 15.0 * x ** 4 + 10.0 * x ** 3;
   const interp = (x) => (a) => (b) => a + smootherStep(x) * (b - a);
-  const ra = getRandsAtTime(ta, 1, seed);
-  const rb = getRandsAtTime(tb, 1, seed);
-  const v = interp(t - ta)(ra)(rb);
+  const v = interp(t - ta)(timeToRand(ta))(timeToRand(tb));
   return v;
 }
+export const perlinWith = (tpat) => {
+  return tpat.fmap(_perlin);
+};
 
-function _berlin(t, seed = 0) {
+function _berlin(t) {
   const prevRidgeStartIndex = Math.floor(t);
   const nextRidgeStartIndex = prevRidgeStartIndex + 1;
 
-  const prevRidgeBottomPoint = getRandsAtTime(prevRidgeStartIndex, 1, seed);
-  const height = getRandsAtTime(nextRidgeStartIndex, 1, seed);
-  const nextRidgeTopPoint = prevRidgeBottomPoint + height;
+  const prevRidgeBottomPoint = timeToRand(prevRidgeStartIndex);
+  const nextRidgeTopPoint = timeToRand(nextRidgeStartIndex) + prevRidgeBottomPoint;
 
   const currentPercent = (t - prevRidgeStartIndex) / (nextRidgeStartIndex - prevRidgeStartIndex);
   const interp = (a, b, t) => {
-    return a + t * (b - a);
+    return a + (b - a) * t;
   };
   return interp(prevRidgeBottomPoint, nextRidgeTopPoint, currentPercent) / 2;
 }
 
+export const berlinWith = (tpat) => {
+  return tpat.fmap(_berlin);
+};
+
 /**
  * Generates a continuous pattern of [perlin noise](https://en.wikipedia.org/wiki/Perlin_noise), in the range 0..1.
  *
@@ -658,7 +527,7 @@ function _berlin(t, seed = 0) {
  * s("bd*4,hh*8").cutoff(perlin.range(500,8000))
  *
  */
-export const perlin = signal((t, controls) => _perlin(t, controls.randSeed));
+export const perlin = perlinWith(time.fmap((v) => Number(v)));
 
 /**
  * Generates a continuous pattern of [berlin noise](conceived by Jame Coyne and Jade Rowland as a joke but turned out to be surprisingly cool and useful,
@@ -670,7 +539,7 @@ export const perlin = signal((t, controls) => _perlin(t, controls.randSeed));
  * n("0!16".add(berlin.fast(4).mul(14))).scale("d:minor")
  *
  */
-export const berlin = signal((t, controls) => _berlin(t, controls.randSeed));
+export const berlin = berlinWith(time.fmap((v) => Number(v)));
 
 export const degradeByWith = register(
   'degradeByWith',
@@ -968,50 +837,3 @@ export const whenKey = register('whenKey', function (input, func, pat) {
 export const keyDown = register('keyDown', function (pat) {
   return pat.fmap(_keyDown);
 });
-
-/**
- * A pattern measuring the duration of events,
- * in cycles per event. `cyclesPer` doesn't have structure itself, but takes structure, and therefore
- * event durations, from the pattern that it is combined with.
- * For example `cyclesPer.struct("1 1 [1 1] 1")` would give the same as `"0.25 0.25 [0.125 0.125] 0.25"`.
- * See also its reciprocal, `per`, also known as `perCycle`.
- * @example
- * // Shorter events are lower in pitch
- * sound("saw saw [saw saw] saw")
- *   .note(cyclesPer.range(50, 100))
- * @example
- * sound("bd sd [bd bd] sd*4 [- sd] [bd [bd bd]]")
- *   .note(cyclesPer.add(20))
- */
-export const cyclesPer = new Pattern(function (state) {
-  return [new Hap(undefined, state.span, state.span.duration)];
-});
-
-/**
- * A pattern measuring the 'shortness' of events, or in other words, the duration of pattern events,
- * in events per cycle. `per` doesn't have structure itself, but takes structure, and therefore
- * event durations, from the pattern that it is combined with.
- * For example `per.struct("1 1 [1 1] 1")` would give the same as `"4 4 [8 8] 4"`.
- * See also its reciprocal, `cyclesPer`.
- * @synonyms perCycle
- * @example
- * // Shorter events are more distorted
- * n("0 0*2 0 0*2 0 [0 0 0]@2").sound("bd")
- *  .distort(per.div(2))
- */
-export const per = new Pattern(function (state) {
-  return [new Hap(undefined, state.span, Fraction(1).div(state.span.duration))];
-});
-
-export const perCycle = per;
-
-/**
- * Like `per` but measures the shortness of events according to an exponential curve. In
- * particular, where the event duration halves, the
- * returned value increases by one. `perx.struct("1 1 [1 [1 1]] 1")` would therefore be
- * the same as `"3 3 [4 [5 5]] 3"`.
- */
-export const perx = new Pattern(function (state) {
-  const n = Fraction(1).div(state.span.duration);
-  return [new Hap(undefined, state.span, Math.log(n) / Math.log(2) + 1)];
-});

packages/core/test/euclid.test.js

@@ -1,14 +1,14 @@
-import { bjorklund } from '../euclid.mjs';
+import { bjork } from '../euclid.mjs';
 import { describe, expect, it } from 'vitest';
 import { fastcat } from '../pattern.mjs';
 
-describe('bjorklund', () => {
-  it('should apply bjorklundlund to ons and steps', () => {
-    expect(bjorklund(3, 8)).toStrictEqual([1, 0, 0, 1, 0, 0, 1, 0]);
-    expect(bjorklund(-3, 8)).toStrictEqual([0, 1, 1, 0, 1, 1, 0, 1]);
-    expect(bjorklund(8, 8)).toStrictEqual([1, 1, 1, 1, 1, 1, 1, 1]);
-    expect(bjorklund(-8, 8)).toStrictEqual([0, 0, 0, 0, 0, 0, 0, 0]);
-    expect(bjorklund(5, 8)).toStrictEqual([1, 0, 1, 1, 0, 1, 1, 0]);
+describe('bjork', () => {
+  it('should apply bjorklund to ons and steps', () => {
+    expect(bjork(3, 8)).toStrictEqual([1, 0, 0, 1, 0, 0, 1, 0]);
+    expect(bjork(-3, 8)).toStrictEqual([0, 1, 1, 0, 1, 1, 0, 1]);
+    expect(bjork(8, 8)).toStrictEqual([1, 1, 1, 1, 1, 1, 1, 1]);
+    expect(bjork(-8, 8)).toStrictEqual([0, 0, 0, 0, 0, 0, 0, 0]);
+    expect(bjork(5, 8)).toStrictEqual([1, 0, 1, 1, 0, 1, 1, 0]);
   });
 });
 

packages/core/test/pattern.test.mjs

@@ -586,18 +586,6 @@ describe('Pattern', () => {
           .map((a) => a.value),
       ).toStrictEqual(['c', 'b', 'a']);
     });
-    it('Does not reverse the order of cycles', () => {
-      expect(fastcat('a', 'b', 'c', 'd').slow(2).rev().fast(2).sortHapsByPart().firstCycle()).toStrictEqual(
-        fastcat('b', 'a', 'd', 'c').firstCycle(),
-      );
-    });
-  });
-  describe('revv()', () => {
-    it('Does reverse the order of cycles', () => {
-      expect(fastcat('a', 'b', 'c', 'd').slow(2).revv().fast(2).sortHapsByPart().firstCycle()).toStrictEqual(
-        fastcat('d', 'c', 'b', 'a').firstCycle(),
-      );
-    });
   });
   describe('sequence()', () => {
     it('Can work like fastcat', () => {
@@ -740,6 +728,20 @@ describe('Pattern', () => {
       );
     });
   });
+  describe('signal()', () => {
+    it('Can make saw/saw2', () => {
+      expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(
+        sequence(0, 1 / 4, 1 / 2, 3 / 4).firstCycle(),
+      );
+
+      expect(saw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, -0.5, 0, 0.5).firstCycle());
+    });
+    it('Can make isaw/isaw2', () => {
+      expect(isaw.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.75, 0.5, 0.25).firstCycle());
+
+      expect(isaw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.5, 0, -0.5).firstCycle());
+    });
+  });
   describe('_setContext()', () => {
     it('Can set the hap context', () => {
       expect(

packages/core/test/signal.test.mjs

@@ -1,61 +0,0 @@
-/*
-signal.test.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/core/test/pattern.test.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import Fraction from 'fraction.js';
-
-import { describe, it, expect, vi } from 'vitest';
-
-import { saw, saw2, isaw, isaw2, per, perx, cyclesPer } from '../signal.mjs';
-import { fastcat, sequence, State, TimeSpan, Hap } from '../index.mjs';
-
-const st = (begin, end) => new State(ts(begin, end));
-const ts = (begin, end) => new TimeSpan(Fraction(begin), Fraction(end));
-const hap = (whole, part, value, context = {}) => new Hap(whole, part, value, context);
-
-const third = Fraction(1, 3);
-const twothirds = Fraction(2, 3);
-
-const sameFirst = (a, b) => {
-  return expect(a.sortHapsByPart().firstCycle()).toStrictEqual(b.sortHapsByPart().firstCycle());
-};
-
-describe('signal()', () => {
-  it('Can make saw/saw2', () => {
-    expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(
-      sequence(0, 1 / 4, 1 / 2, 3 / 4).firstCycle(),
-    );
-
-    expect(saw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(-1, -0.5, 0, 0.5).firstCycle());
-  });
-  it('Can make isaw/isaw2', () => {
-    expect(isaw.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.75, 0.5, 0.25).firstCycle());
-
-    expect(isaw2.struct(true, true, true, true).firstCycle()).toStrictEqual(sequence(1, 0.5, 0, -0.5).firstCycle());
-  });
-});
-
-describe('cyclesPer', () => {
-  it('gives cycles per hap', () => {
-    sameFirst(
-      cyclesPer.struct(true, true, true, fastcat(true, true)),
-      sequence(0.25, 0.25, 0.25, fastcat(0.125, 0.125)).fmap(Fraction),
-    );
-  });
-});
-describe('per', () => {
-  it('gives haps per cycle', () => {
-    sameFirst(per.struct(true, true, true, fastcat(true, true)), sequence(4, 4, 4, fastcat(8, 8)).fmap(Fraction));
-  });
-});
-
-describe('perx', () => {
-  it('gives exponential haps per cycle', () => {
-    sameFirst(
-      perx.struct(true, true, true, fastcat(true, fastcat(true, true))),
-      sequence(3, 3, 3, fastcat(4, fastcat(5, 5))),
-    );
-  });
-});

packages/core/time.mjs

@@ -0,0 +1,11 @@
+let time;
+export function getTime() {
+  if (!time) {
+    throw new Error('no time set! use setTime to define a time source');
+  }
+  return time();
+}
+
+export function setTime(func) {
+  time = func;
+}

packages/core/util.mjs

@@ -7,8 +7,8 @@ This program is free software: you can redistribute it and/or modify it under th
 import { logger } from './logger.mjs';
 
 // returns true if the given string is a note
-export const isNoteWithOctave = (name) => /^[a-gA-G][#bsf]*[0-9]*$/.test(name);
-export const isNote = (name) => /^[a-gA-G][#bsf]*-?[0-9]*$/.test(name);
+export const isNoteWithOctave = (name) => /^[a-gA-G][#bs]*[0-9]$/.test(name);
+export const isNote = (name) => /^[a-gA-G][#bsf]*-?[0-9]?$/.test(name);
 export const tokenizeNote = (note) => {
   if (typeof note !== 'string') {
     return [];
@@ -23,10 +23,6 @@ export const tokenizeNote = (note) => {
 const chromas = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
 const accs = { '#': 1, b: -1, s: 1, f: -1 };
 
-export const getAccidentalsOffset = (accidentals) => {
-  return accidentals?.split('').reduce((o, char) => o + accs[char], 0) || 0;
-};
-
 // turns the given note into its midi number representation
 export const noteToMidi = (note, defaultOctave = 3) => {
   const [pc, acc, oct = defaultOctave] = tokenizeNote(note);
@@ -34,7 +30,7 @@ export const noteToMidi = (note, defaultOctave = 3) => {
     throw new Error('not a note: "' + note + '"');
   }
   const chroma = chromas[pc.toLowerCase()];
-  const offset = getAccidentalsOffset(acc);
+  const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
   return (Number(oct) + 1) * 12 + chroma + offset;
 };
 export const midiToFreq = (n) => {

packages/csound/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/csound",
-  "version": "1.3.0",
+  "version": "1.2.5",
   "description": "csound bindings for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -38,8 +38,5 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/desktopbridge/package.json

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

packages/draw/draw.mjs

@@ -84,18 +84,9 @@ Pattern.prototype.onPaint = function (painter) {
       state.controls.painters = [];
     }
     state.controls.painters.push(painter);
-    return state;
   });
 };
 
-// TODO - Why isn't this pure deep copy not working?
-// Pattern.prototype.onPaint = function (painter) {
-//   return this.withState((state) => {
-//     const painters = state.controls.painters ? [...state.controls.painters, painter] : [painter];
-//     return new State(state.span, { ...state.controls, painters });
-//   });
-// };
-
 Pattern.prototype.getPainters = function () {
   let painters = [];
   this.queryArc(0, 0, { painters });

packages/draw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/draw",
-  "version": "1.2.6",
+  "version": "1.2.4",
   "description": "Helpers for drawing with Strudel",
   "main": "index.mjs",
   "type": "module",
@@ -33,8 +33,5 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/embed/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/embed",
-  "version": "1.1.2",
+  "version": "1.1.1",
   "description": "Embeddable Web Component to load a Strudel REPL into an iframe",
   "main": "embed.js",
   "type": "module",
@@ -20,8 +20,5 @@
   "bugs": {
     "url": "https://codeberg.org/uzu/strudel/issues"
   },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
-  "engines": {
-    "node": ">=18.0.0"
-  }
+  "homepage": "https://codeberg.org/uzu/strudel#readme"
 }

packages/gamepad/README.md

@@ -40,12 +40,6 @@ const pattern = sequence([
 - D-Pad
   - `up`, `down`, `left`, `right` (or `u`, `d`, `l`, `r` or uppercase)
   - Toggle versions: `tglUp`, `tglDown`, `tglLeft`, `tglRight`(or `tglU`, `tglD`, `tglL`, `tglR`)
-- Stick Buttons
-  - `l3`, `r3` (or `ls`, `rs`)
-  - Toggle versions: `tglL3`, `tglR3` (or `tglLS`, `tglRS`)
-- System Buttons
-  - `start`, `back` (or uppercase `START`, `BACK`)
-  - Toggle versions: `tglStart`, `tglBack` (or `tglSTART`, `tglBACK`)
 
 ### Analog Sticks
 - Left Stick

packages/gamepad/docs/gamepad.mdx

@@ -29,10 +29,6 @@ The gamepad module provides access to buttons and analog sticks as normalized si
 |                  | Toggle versions: `tglLB`, `tglRB`, `tglLT`, `tglRT`                                            |
 | D-Pad            | `up`, `down`, `left`, `right` (or `u`, `d`, `l`, `r` or uppercase)                             |
 |                  | Toggle versions: `tglUp`, `tglDown`, `tglLeft`, `tglRight` (or `tglU`, `tglD`, `tglL`, `tglR`) |
-| Stick Buttons    | `l3`, 'r3' (or `ls`, `rs`)                                                                     |
-|                  | Toggle versions: `tglL3`, 'tglR3' (or `tglLs`, `tglRs`)                                        |
-| System Buttons   | `start`, `back` (or uppercase `START`, `BACK`)                                                 |
-|                  | Toggle versions: `tglStart`, `tglBack` (or `tglSTART`, `tglBACK`)                              |
 
 ### Analog Sticks
 

packages/gamepad/gamepad.mjs

@@ -14,10 +14,6 @@ export const buttonMap = {
   rt: 7,
   back: 8,
   start: 9,
-  l3: 10,
-  ls: 10,
-  r3: 11,
-  rs: 11,
   u: 12,
   up: 12,
   d: 13,

packages/gamepad/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/gamepad",
-  "version": "1.2.6",
+  "version": "1.2.4",
   "description": "Gamepad Inputs for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -33,8 +33,5 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/hs2js/package.json

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

packages/hydra/hydra.mjs

@@ -35,7 +35,6 @@ export async function initHydra(options = {}) {
       hydra.synth.s0.init({ src: canvas });
     }
   }
-  return hydra;
 }
 
 export function clearHydra() {

packages/hydra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/hydra",
-  "version": "1.2.6",
+  "version": "1.2.4",
   "description": "Hydra integration for strudel",
   "main": "hydra.mjs",
   "type": "module",
@@ -40,8 +40,5 @@
   "devDependencies": {
     "pkg": "^5.8.1",
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/midi/midi.mjs

@@ -5,24 +5,9 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import * as _WebMidi from 'webmidi';
-import {
-  Hap,
-  Pattern,
-  TimeSpan,
-  getCps,
-  getIsStarted,
-  getPattern,
-  getTime,
-  getTriggerFunc,
-  isPattern,
-  logger,
-  ref,
-  reify,
-} from '@strudel/core';
+import { Pattern, getEventOffsetMs, isPattern, logger, ref } from '@strudel/core';
 import { noteToMidi, getControlName } from '@strudel/core';
 import { Note } from 'webmidi';
-import { getAudioContext } from '@strudel/webaudio';
-import { scheduleAtTime } from '../superdough/helpers.mjs';
 
 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const { WebMidi } = _WebMidi;
@@ -205,7 +190,7 @@ function mapCC(mapping, value) {
 }
 
 // sends a cc message to the given device on the given channel
-function sendCC(ccn, ccv, device, midichan, targetTime) {
+function sendCC(ccn, ccv, device, midichan, timeOffsetString) {
   if (typeof ccv !== 'number' || ccv < 0 || ccv > 1) {
     throw new Error('expected ccv to be a number between 0 and 1');
   }
@@ -213,23 +198,19 @@ function sendCC(ccn, ccv, device, midichan, targetTime) {
     throw new Error('expected ccn to be a number or a string');
   }
   const scaled = Math.round(ccv * 127);
-  scheduleAtTime(() => {
-    device.sendControlChange(ccn, scaled, midichan);
-  }, targetTime);
+  device.sendControlChange(ccn, scaled, midichan, { time: timeOffsetString });
 }
 
 // sends a program change message to the given device on the given channel
-function sendProgramChange(progNum, device, midichan, targetTime) {
+function sendProgramChange(progNum, device, midichan, timeOffsetString) {
   if (typeof progNum !== 'number' || progNum < 0 || progNum > 127) {
     throw new Error('expected progNum (program change) to be a number between 0 and 127');
   }
-  scheduleAtTime(() => {
-    device.sendProgramChange(progNum, midichan);
-  }, targetTime);
+  device.sendProgramChange(progNum, midichan, { time: timeOffsetString });
 }
 
 // sends a sysex message to the given device on the given channel
-function sendSysex(sysexid, sysexdata, device, targetTime) {
+function sendSysex(sysexid, sysexdata, device, timeOffsetString) {
   if (Array.isArray(sysexid)) {
     if (!sysexid.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
       throw new Error('all sysexid bytes must be integers between 0 and 255');
@@ -244,13 +225,11 @@ function sendSysex(sysexid, sysexdata, device, targetTime) {
   if (!sysexdata.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
     throw new Error('all sysex bytes must be integers between 0 and 255');
   }
-  scheduleAtTime(() => {
-    device.sendSysex(sysexid, sysexdata);
-  }, targetTime);
+  device.sendSysex(sysexid, sysexdata, { time: timeOffsetString });
 }
 
 // sends a NRPN message to the given device on the given channel
-function sendNRPN(nrpnn, nrpv, device, midichan, targetTime) {
+function sendNRPN(nrpnn, nrpv, device, midichan, timeOffsetString) {
   if (Array.isArray(nrpnn)) {
     if (!nrpnn.every((byte) => Number.isInteger(byte) && byte >= 0 && byte <= 255)) {
       throw new Error('all nrpnn bytes must be integers between 0 and 255');
@@ -258,34 +237,28 @@ function sendNRPN(nrpnn, nrpv, device, midichan, targetTime) {
   } else if (!Number.isInteger(nrpv) || nrpv < 0 || nrpv > 255) {
     throw new Error('A:sysexid must be an number between 0 and 255 or an array of such integers');
   }
-  scheduleAtTime(() => {
-    device.sendNRPN(nrpnn, nrpv, midichan);
-  }, targetTime);
+
+  device.sendNRPN(nrpnn, nrpv, midichan, { time: timeOffsetString });
 }
 
 // sends a pitch bend message to the given device on the given channel
-function sendPitchBend(midibend, device, midichan, targetTime) {
+function sendPitchBend(midibend, device, midichan, timeOffsetString) {
   if (typeof midibend !== 'number' || midibend < -1 || midibend > 1) {
     throw new Error('expected midibend to be a number between -1 and 1');
   }
-  scheduleAtTime(() => {
-    device.sendPitchBend(midibend, midichan);
-  }, targetTime);
+  device.sendPitchBend(midibend, midichan, { time: timeOffsetString });
 }
 
 // sends a channel aftertouch message to the given device on the given channel
-function sendAftertouch(miditouch, device, midichan, targetTime) {
+function sendAftertouch(miditouch, device, midichan, timeOffsetString) {
   if (typeof miditouch !== 'number' || miditouch < 0 || miditouch > 1) {
     throw new Error('expected miditouch to be a number between 0 and 1');
   }
-
-  scheduleAtTime(() => {
-    device.sendChannelAftertouch(miditouch, midichan);
-  }, targetTime);
+  device.sendChannelAftertouch(miditouch, midichan, { time: timeOffsetString });
 }
 
 // sends a note message to the given device on the given channel
-function sendNote(note, velocity, duration, device, midichan, targetTime) {
+function sendNote(note, velocity, duration, device, midichan, timeOffsetString) {
   if (note == null || note === '') {
     throw new Error('note cannot be null or empty');
   }
@@ -295,12 +268,12 @@ function sendNote(note, velocity, duration, device, midichan, targetTime) {
   if (duration != null && (typeof duration !== 'number' || duration < 0)) {
     throw new Error('duration must be a positive number');
   }
+
   const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
   const midiNote = new Note(midiNumber, { attack: velocity, duration });
-
-  scheduleAtTime(() => {
-    device.playNote(midiNote, midichan);
-  }, targetTime);
+  device.playNote(midiNote, midichan, {
+    time: timeOffsetString,
+  });
 }
 
 /**
@@ -336,6 +309,7 @@ Pattern.prototype.midi = function (midiport, options = {}) {
   let midiConfig = {
     // Default configuration values
     isController: false, // Disable sending notes for midi controllers
+    latencyMs: 34, // Default latency to get audio engine to line up in ms
     noteOffsetMs: 10, // Default note-off offset to prevent glitching in ms
     midichannel: 1, // Default MIDI channel
     velocity: 0.9, // Default velocity
@@ -359,13 +333,18 @@ Pattern.prototype.midi = function (midiport, options = {}) {
       logger(`Midi device disconnected! Available: ${getMidiDeviceNamesString(outputs)}`),
   });
 
-  return this.onTrigger((hap, _currentTime, cps, targetTime) => {
+  return this.onTrigger((hap, currentTime, cps, targetTime) => {
     if (!WebMidi.enabled) {
       logger('Midi not enabled');
       return;
     }
     hap.ensureObjectValue();
 
+    //magic number to get audio engine to line up, can probably be calculated somehow
+    const latencyMs = midiConfig.latencyMs;
+    // passing a string with a +num into the webmidi api adds an offset to the current time https://webmidijs.org/api/classes/Output
+    const timeOffsetString = `+${getEventOffsetMs(targetTime, currentTime) + latencyMs}`;
+
     // midi event values from hap with configurable defaults
     let {
       note,
@@ -401,7 +380,7 @@ Pattern.prototype.midi = function (midiport, options = {}) {
     // if midimap is set, send a cc messages from defined controls
     if (midicontrolMap.has(midimap)) {
       const ccs = mapCC(midicontrolMap.get(midimap), hap.value);
-      ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, targetTime));
+      ccs.forEach(({ ccn, ccv }) => sendCC(ccn, ccv, device, midichan, timeOffsetString));
     } else if (midimap !== 'default') {
       // Add warning when a non-existent midimap is specified
       logger(`[midi] midimap "${midimap}" not found! Available maps: ${[...midicontrolMap.keys()].join(', ')}`);
@@ -413,12 +392,12 @@ Pattern.prototype.midi = function (midiport, options = {}) {
       // try to prevent glitching by subtracting noteOffsetMs from the duration length
       const duration = (hap.duration.valueOf() / cps) * 1000 - midiConfig.noteOffsetMs;
 
-      sendNote(note, velocity, duration, device, midichan, targetTime);
+      sendNote(note, velocity, duration, device, midichan, timeOffsetString);
     }
 
     // Handle program change
     if (progNum !== undefined) {
-      sendProgramChange(progNum, device, midichan, targetTime);
+      sendProgramChange(progNum, device, midichan, timeOffsetString);
     }
 
     // Handle sysex
@@ -428,76 +407,74 @@ Pattern.prototype.midi = function (midiport, options = {}) {
     // if sysexid is an array the first byte is 0x00
 
     if (sysexid !== undefined && sysexdata !== undefined) {
-      sendSysex(sysexid, sysexdata, device, targetTime);
+      sendSysex(sysexid, sysexdata, device, timeOffsetString);
     }
 
     // Handle control change
     if (ccv !== undefined && ccn !== undefined) {
-      sendCC(ccn, ccv, device, midichan, targetTime);
+      sendCC(ccn, ccv, device, midichan, timeOffsetString);
     }
 
     // Handle NRPN non-registered parameter number
     if (nrpnn !== undefined && nrpv !== undefined) {
-      sendNRPN(nrpnn, nrpv, device, midichan, targetTime);
+      sendNRPN(nrpnn, nrpv, device, midichan, timeOffsetString);
     }
 
     // Handle midibend
     if (midibend !== undefined) {
-      sendPitchBend(midibend, device, midichan, targetTime);
+      sendPitchBend(midibend, device, midichan, timeOffsetString);
     }
 
     // Handle miditouch
     if (miditouch !== undefined) {
-      sendAftertouch(miditouch, device, midichan, targetTime);
+      sendAftertouch(miditouch, device, midichan, timeOffsetString);
     }
 
     // Handle midicmd
     if (hap.whole.begin + 0 === 0) {
       // we need to start here because we have the timing info
-      scheduleAtTime(() => {
-        device.sendStart();
-      }, targetTime);
+      device.sendStart({ time: timeOffsetString });
     }
     if (['clock', 'midiClock'].includes(midicmd)) {
-      scheduleAtTime(() => {
-        device.sendClock();
-      }, targetTime);
+      device.sendClock({ time: timeOffsetString });
     } else if (['start'].includes(midicmd)) {
-      scheduleAtTime(() => {
-        device.sendStart();
-      }, targetTime);
+      device.sendStart({ time: timeOffsetString });
     } else if (['stop'].includes(midicmd)) {
-      scheduleAtTime(() => {
-        device.sendStop();
-      }, targetTime);
+      device.sendStop({ time: timeOffsetString });
     } else if (['continue'].includes(midicmd)) {
-      scheduleAtTime(() => {
-        device.sendContinue();
-      }, targetTime);
+      device.sendContinue({ time: timeOffsetString });
     } else if (Array.isArray(midicmd)) {
       if (midicmd[0] === 'progNum') {
-        sendProgramChange(midicmd[1], device, midichan, targetTime);
+        sendProgramChange(midicmd[1], device, midichan, timeOffsetString);
       } else if (midicmd[0] === 'cc') {
         if (midicmd.length === 2) {
-          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, targetTime);
+          sendCC(midicmd[0], midicmd[1] / 127, device, midichan, timeOffsetString);
         }
       } else if (midicmd[0] === 'sysex') {
         if (midicmd.length === 3) {
           const [_, id, data] = midicmd;
-          sendSysex(id, data, device, targetTime);
+          sendSysex(id, data, device, timeOffsetString);
         }
       }
     }
   });
 };
 
+let listeners = {};
+const refs = {};
+
 /**
- * Initialize a midi device
+ * MIDI input: Opens a MIDI input port to receive MIDI control change messages.
+ * @param {string | number} input MIDI device name or index defaulting to 0
+ * @returns {Function}
+ * @example
+ * let cc = await midin('IAC Driver Bus 1')
+ * note("c a f e").lpf(cc(0).range(0, 1000)).lpq(cc(1).range(0, 10)).sound("sawtooth")
  */
-async function _initialize(input) {
+export async function midin(input) {
   if (isPattern(input)) {
     throw new Error(
-      `[midi] Midi input cannot be a pattern. Make sure to pass device name with single quotes. Example: midin('${
+      `midin: does not accept Pattern as input. Make sure to pass device name with single quotes. Example: midin('${
         WebMidi.outputs?.[0]?.name || 'IAC Driver Bus 1'
       }')`,
     );
@@ -506,191 +483,29 @@ async function _initialize(input) {
   const device = getDevice(input, WebMidi.inputs);
   if (!device) {
     throw new Error(
-      `[midi] Midi device "${input}" not found.. connected devices: ${getMidiDeviceNamesString(WebMidi.inputs)}`,
+      `midiin: device "${input}" not found.. connected devices: ${getMidiDeviceNamesString(WebMidi.inputs)}`,
     );
   }
   if (initial) {
     const otherInputs = WebMidi.inputs.filter((o) => o.name !== device.name);
     logger(
-      `[midi] Midi enabled! Using "${device.name}". ${
+      `Midi enabled! Using "${device.name}". ${
         otherInputs?.length ? `Also available: ${getMidiDeviceNamesString(otherInputs)}` : ''
       }`,
     );
   }
-  return device;
-}
-
-/**
- * MIDI input: Opens a MIDI input port to receive MIDI control change messages.
- *
- * The output is a function that accepts a midi cc value to query as well as (optionally) a midi channel
- *
- * @name midin
- * @param {string | number} input MIDI device name or index defaulting to 0
- * @returns {function(number, number=): Pattern} A function from (cc, channel?) to a pattern.
- *   When queried, the pattern will produces the most recently received midi value (normalized to 0 to 1)
- *   that came through that cc number (and channel, if provided)
- * @example
- * const cc = await midin('IAC Driver Bus 1')
- * note("c a f e").lpf(cc(0).range(0, 1000)).lpq(cc(1).range(0, 10)).sound("sawtooth")
- * @example
- * const allCC = await midin('IAC Driver Bus 1')
- * const cc = (ccNum) => allCC(ccNum, 2) // just channel 2
- * note("c a f e").s("saw")
- *   .when(cc(0).gt(0), x => x.postgain(0))
- */
-let listeners = {};
-const refs = {};
-const refsByChan = {};
-export async function midin(input) {
-  const device = await _initialize(input);
-  refs[input] ??= {};
-  refsByChan[input] ??= {};
-  const cc = (cc, chan) => {
-    if (chan !== undefined) {
-      return ref(() => refsByChan[input][cc]?.[chan] || 0);
-    }
-    return ref(() => refs[input][cc] || 0);
-  };
+  // ensure refs for this input are initialized
+  if (!refs[input]) {
+    refs[input] = {};
+  }
+  const cc = (cc) => ref(() => refs[input][cc] || 0);
 
   listeners[input] && device.removeListener('midimessage', listeners[input]);
   listeners[input] = (e) => {
-    const [ccNum, v] = e.dataBytes;
-    const chan = e.message.channel;
-    const scaled = v / 127;
-    refsByChan[input][ccNum] ??= {};
-    refsByChan[input][ccNum][chan] = scaled;
-    refs[input][ccNum] = scaled;
+    const cc = e.dataBytes[0];
+    const v = e.dataBytes[1];
+    refs[input] && (refs[input][cc] = v / 127);
   };
   device.addListener('midimessage', listeners[input]);
   return cc;
 }
-
-/**
- * MIDI keyboard: Opens a MIDI input port to receive MIDI keyboard messages.
- *
- * The note length is fixed as Superdough is not currently set up for undetermined
- * note durations
- *
- * @name midikeys
- * @param {string | number} input MIDI device name or index defaulting to 0
- * @returns {function((number | Pattern)=): Pattern} A function that produces a pattern.
- *   When queried, the pattern will produces the most recently played midi notes and velocities,
- *   lasting for the specified duration
- * @example
- * const kb = await midikeys('Arturia KeyStep 32')
- * kb().s("tri").lpf(80).lpe(6).lpd(0.1).room(2).delay(0.35)
- * @example
- * const kb = await midikeys('Arturia KeyStep 32')
- * kb("0.5 1")
- *   .s("saw")
- *   .add(note(rand.mul(0.3)))
- *   .lpf(1000).lpe(2).room(0.5)
- */
-const kHaps = {};
-const kListeners = {};
-
-function _triggerKeyboard(input, cps, now, latencyCycles) {
-  const pattern = getPattern();
-  const trigger = getTriggerFunc();
-  if (!pattern || !trigger) {
-    return false;
-  }
-  const t = now + latencyCycles;
-  const eps = 1e-6;
-  const haps = pattern.queryArc(t - eps, t + eps, { _cps: cps });
-  // Only keep haps coming from `midikeys`
-  const kbHaps = haps.filter((hap) => hap.value?.midikey?.startsWith(`${input}_`));
-  const ctxNow = getAudioContext().currentTime;
-  if (!kbHaps.length) {
-    return false;
-  }
-  kbHaps.forEach((hap) => {
-    if (!hap.hasOnset()) {
-      return;
-    }
-    const t = ctxNow + (hap.whole.begin - now) / cps;
-    const duration = hap.duration / cps;
-    trigger(hap, t - ctxNow, duration, cps, t);
-  });
-
-  return true;
-}
-export async function midikeys(input) {
-  const device = await _initialize(input);
-  if (!kHaps[input]) {
-    kHaps[input] = [];
-  }
-  kListeners[input] && device.removeListener('midimessage', kListeners[input]);
-  kListeners[input] = (e) => {
-    const { dataBytes, message } = e;
-    const noteon = message.command === 9;
-    let noteoff = message.command === 8;
-    // Don't enqueue or trigger midi notes if scheduler is not started
-    const notStarted = !getIsStarted();
-    // Ignore non-note messages (e.g. CC, pitchbend, modwheel, etc.)
-    const notANote = !noteon && !noteoff;
-    if (notStarted || notANote) {
-      return;
-    }
-    const [note, velocity] = dataBytes;
-    noteoff ||= noteon && velocity === 0; // handle devices which may use velocity = 0 to signal noteoff
-    const key = `${input}_${note}`;
-    const cps = getCps() ?? 0.5;
-    const triggerAvailable = !!(getPattern() && getTriggerFunc());
-    const latencySeconds = triggerAvailable ? 0.01 : 0.06; // avoid missing notes due to cyclist / trigger latency
-    const now = getTime();
-    const t = now + latencySeconds * cps;
-    const span = new TimeSpan(t, t);
-    let value = { midikey: key };
-    if (noteoff) {
-      /* TODO: It's a big effort, but we could modify superdough to allow for situations where
-      we don't know the hap duration in advance. This would mean, for example, that if the hap
-      is flagged as such a special note-on event, we have all effects be persistent & all ADSR
-      envelopes stop at the S stage [and store references to them by `midikey`]
-      If this is implemented, then getting full keyboard functionality should be as simple
-      as sending the corresponding note-off event below and triggering `release` on each of those
-      referenced effects/envelopes
-      
-      value = { ...value, noteoff: true };
-  
-      If this is achieved, we can remove the noteLength parameter
-      */
-      return;
-    } else {
-      value = { ...value, note: Math.round(note), velocity: velocity / 127 };
-    }
-    kHaps[input].push(new Hap(span, span, value, {}));
-    if (!noteoff && triggerAvailable) {
-      // If we have access to a trigger function, we call it to immediately
-      // dispatch to the audio engine, rather than waiting for cyclist to catch these haps
-      const triggered = _triggerKeyboard(input, cps, now, latencySeconds * cps);
-      if (triggered) {
-        kHaps[input] = [];
-      }
-    }
-  };
-  device.addListener('midimessage', kListeners[input]);
-  const kb = (noteLength = 0.5) => {
-    const nlPat = reify(noteLength);
-    const query = (state) => {
-      const haps = kHaps[input].flatMap((hap) => {
-        const lenHaps = nlPat.query(state.setSpan(hap.wholeOrPart()));
-        return lenHaps.map((lenHap) => {
-          const nl = lenHap.value ?? 0.5;
-          const whole = new TimeSpan(hap.whole.begin, hap.whole.begin.add(nl));
-          const part = new TimeSpan(hap.part.begin, hap.part.begin.add(nl));
-          const context = hap.combineContext(lenHap);
-          return new Hap(whole, part, hap.value, context);
-        });
-      });
-      if (state.controls.cyclist) {
-        // Notes have been sent; clear them
-        kHaps[input] = [];
-      }
-      return haps;
-    };
-    return new Pattern(query);
-  };
-  return kb;
-}

packages/midi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/midi",
-  "version": "1.3.0",
+  "version": "1.2.5",
   "description": "Midi API for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -35,8 +35,5 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/mini/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/mini",
-  "version": "1.2.6",
+  "version": "1.2.4",
   "description": "Mini notation for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -38,8 +38,5 @@
     "peggy": "^4.2.0",
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/mondo/mondo.mjs

@@ -21,14 +21,13 @@ export class MondoParser {
     close_curly: /^\}/,
     number: /^-?[0-9]*\.?[0-9]+/, // before pipe!
     // TODO: better error handling when "-" is used as rest, e.g "s [- bd]"
-    op: /^[*/:!@%?+\-&]|^\.{2}/, // * / : ! @ % ? ..
+    op: /^[*/:!@%?+-]|^\.{2}/, // * / : ! @ % ? ..
     // dollar: /^\$/,
     pipe: /^#/,
     stack: /^[,$]/,
     or: /^[|]/,
     plain: /^[a-zA-Z0-9-~_^#]+/,
   };
-  op_precedence = [['*', '/', ':', '!', '@', '%', '?', '+', '-', '..'], ['&']];
   // matches next token
   next_token(code, offset = 0) {
     for (let type in this.token_types) {
@@ -151,9 +150,9 @@ export class MondoParser {
     }
     return children;
   }
-  desugar_ops(children, types) {
+  desugar_ops(children) {
     while (true) {
-      let opIndex = children.findIndex((child) => child.type === 'op' && types.includes(child.value));
+      let opIndex = children.findIndex((child) => child.type === 'op');
       if (opIndex === -1) break;
       const op = { type: 'plain', value: children[opIndex].value };
       if (opIndex === children.length - 1) {
@@ -264,10 +263,8 @@ export class MondoParser {
           // the type we've removed before splitting needs to be added back
           children = [{ type: 'plain', value: type }, ...children];
         }
-        // for each precendence group, call desugar_ops once
-        this.op_precedence.forEach((ops) => {
-          children = this.desugar_ops(children, ops);
-        });
+        children = this.desugar_ops(children);
+        // children = this.desugar_pipes(children, (children) => this.desugar_dollars(children));
         children = this.desugar_pipes(children);
         return children;
       }),

packages/mondo/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mondolang",
-  "version": "1.1.2",
+  "version": "1.1.1",
   "description": "a language for functional composition that translates to js",
   "main": "mondo.mjs",
   "type": "module",
@@ -33,8 +33,5 @@
   "devDependencies": {
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/mondo/test/mondo.test.mjs

@@ -117,7 +117,6 @@ describe('mondo sugar', () => {
   it('should desugar x:y', () => expect(desguar('x:y')).toEqual('(: y x)'));
   it('should desugar x:y:z', () => expect(desguar('x:y:z')).toEqual('(: z (: y x))'));
   it('should desugar x:y*x', () => expect(desguar('bd:0*2')).toEqual('(* 2 (: 0 bd))'));
-  it('should desugar x&y:z', () => expect(desguar('bd&3:8')).toEqual('(& (: 8 3) bd)'));
   it('should desugar a..b', () => expect(desguar('0..2')).toEqual('(.. 2 0)'));
   /* it('should desugar x $ y', () => expect(desguar('x $ y')).toEqual('(x y)'));
   it('should desugar x $ y z', () => expect(desguar('x $ y z')).toEqual('(x (y z))'));

packages/mondough/mondough.mjs

@@ -5,13 +5,12 @@ import {
   slow,
   seq,
   stepcat,
-  replicate,
+  extend,
   expand,
   pace,
   chooseIn,
   degradeBy,
   silence,
-  bjork,
 } from '@strudel/core';
 import { registerLanguage } from '@strudel/transpiler';
 import { MondoRunner } from 'mondolang';
@@ -37,11 +36,10 @@ lib.square = (...args) => stepcat(...args).setSteps(1);
 lib.angle = (...args) => stepcat(...args).pace(1);
 lib['*'] = fast;
 lib['/'] = slow;
-lib['!'] = replicate;
+lib['!'] = extend;
 lib['@'] = expand;
 lib['%'] = pace;
 lib['?'] = degradeBy; // todo: default 0.5 not working..
-lib['&'] = bjork;
 lib[':'] = tail;
 lib['..'] = range;
 lib['def'] = () => silence;

packages/mondough/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/mondo",
-  "version": "1.1.6",
+  "version": "1.1.4",
   "description": "mondo notation for strudel",
   "main": "mondough.mjs",
   "type": "module",
@@ -40,8 +40,5 @@
     "mondo": "*",
     "vite": "^6.0.11",
     "vitest": "^3.0.4"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/motion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/motion",
-  "version": "1.2.6",
+  "version": "1.2.4",
   "description": "DeviceMotion API for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -33,8 +33,5 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/mqtt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/mqtt",
-  "version": "1.2.6",
+  "version": "1.2.4",
   "description": "MQTT API for strudel",
   "main": "mqtt.mjs",
   "type": "module",
@@ -34,8 +34,5 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/osc/README.md

@@ -46,4 +46,4 @@ all(osc)
 
 [open in repl](https://strudel.cc/#JDogcygiYmQqNCIpCgphbGwob3NjKQ%3D%3D)
 
-You can read more about [how to use Superdirt with Strudel](https://strudel.cc/learn/input-output/#oscsuperdirtstrudeldirt) in  the tutorial.
+You can read more about [how to use Superdirt with Strudel the Tutorial](https://strudel.cc/learn/input-output/#superdirt-api)

packages/osc/osc.mjs

@@ -4,6 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import OSC from 'osc-js';
+
 import { logger, parseNumeral, register, isNote, noteToMidi, ClockCollator } from '@strudel/core';
 
 let connection; // Promise<OSC>
@@ -11,18 +13,19 @@ function connect() {
   if (!connection) {
     // make sure this runs only once
     connection = new Promise((resolve, reject) => {
-      const ws = new WebSocket('ws://localhost:8080');
-      ws.addEventListener('open', (event) => {
-        logger(`[osc] websocket connected`);
-        resolve(ws);
+      const osc = new OSC();
+      osc.open();
+      osc.on('open', () => {
+        const url = osc.options?.plugin?.socket?.url;
+        logger(`[osc] connected${url ? ` to ${url}` : ''}`);
+        resolve(osc);
       });
-      ws.addEventListener('close', (event) => {
-        logger(`[osc] websocket closed`);
+      osc.on('close', () => {
         connection = undefined; // allows new connection afterwards
         console.log('[osc] disconnected');
         reject('OSC connection closed');
       });
-      ws.addEventListener('error', (err) => reject(err));
+      osc.on('error', (err) => reject(err));
     }).catch((err) => {
       connection = undefined;
       throw new Error('Could not connect to OSC server. Is it running?');
@@ -58,19 +61,15 @@ export function parseControlsFromHap(hap, cps) {
 const collator = new ClockCollator({});
 
 export async function oscTrigger(hap, currentTime, cps = 1, targetTime) {
-  const ws = await connect();
+  const osc = await connect();
   const controls = parseControlsFromHap(hap, cps);
   const keyvals = Object.entries(controls).flat();
-  const ts = collator.calculateTimestamp(currentTime, targetTime) * 1000;
-  const msg = { address: '/dirt/play', args: keyvals, timestamp: ts };
 
-  if ('oschost' in hap.value) {
-    msg['host'] = hap.value['oschost'];
-  }
-  if ('oscport' in hap.value) {
-    msg['port'] = hap.value['oscport'];
-  }
-  ws.send(JSON.stringify(msg));
+  const ts = Math.round(collator.calculateTimestamp(currentTime, targetTime) * 1000);
+  const message = new OSC.Message('/dirt/play', ...keyvals);
+  const bundle = new OSC.Bundle([message], ts);
+  bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60
+  osc.send(bundle);
 }
 
 /**

packages/osc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/osc",
-  "version": "1.3.2",
+  "version": "1.2.10",
   "description": "OSC messaging for strudel",
   "main": "osc.mjs",
   "bin": "./server.js",
@@ -38,14 +38,10 @@
   "homepage": "https://codeberg.org/uzu/strudel#readme",
   "dependencies": {
     "@strudel/core": "workspace:*",
-    "osc": "^2.4.5",
-    "ws": "^8.18.3"
+    "osc-js": "^2.4.1"
   },
   "devDependencies": {
     "pkg": "^5.8.1",
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/osc/server.js

@@ -6,59 +6,70 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-// import OSC from 'osc-js';
+import OSC from 'osc-js';
 
-import { WebSocketServer } from 'ws';
-import osc from 'osc';
+const args = process.argv.slice(2);
+function getArgValue(flag) {
+  const i = args.indexOf(flag);
+  if (i !== -1) {
+    const nextIsFlag = args[i + 1]?.startsWith('--') ?? true;
+    if (nextIsFlag) return true;
+    return args[i + 1];
+  }
+}
 
-const WS_PORT = 8080; // WebSocket server port
-const OSC_REMOTE_IP = '127.0.0.1';
-const OSC_REMOTE_PORT = 57120;
+let udpClientPort = Number(getArgValue('--port')) || 57120;
+let debug = Number(getArgValue('--debug')) || 0;
 
-const udpPort = new osc.UDPPort({
-  localAddress: '0.0.0.0',
-  localPort: 0,
-  remoteAddress: OSC_REMOTE_IP,
-  remotePort: OSC_REMOTE_PORT,
-});
+const config = {
+  receiver: 'ws', // @param {string} Where messages sent via 'send' method will be delivered to, 'ws' for Websocket clients, 'udp' for udp client
+  udpServer: {
+    host: 'localhost', // @param {string} Hostname of udp server to bind to
+    port: 57121, // @param {number} Port of udp client for messaging
+    // enabling the following line will receive tidal messages:
+    // port: 57120, // @param {number} Port of udp client for messaging
+    exclusive: false, // @param {boolean} Exclusive flag
+  },
+  udpClient: {
+    host: 'localhost', // @param {string} Hostname of udp client for messaging
+    port: udpClientPort, // @param {number} Port of udp client for messaging
+  },
+  wsServer: {
+    host: 'localhost', // @param {string} Hostname of WebSocket server
+    port: 8080, // @param {number} Port of WebSocket server
+  },
+};
 
-udpPort.open();
-console.log(`[Sending OSC] ${OSC_REMOTE_IP}:${OSC_REMOTE_PORT}`);
+const osc = new OSC({ plugin: new OSC.BridgePlugin(config) });
 
-udpPort.on('error', (e) => {
-  console.log('Error: ', e);
-});
-
-const wss = new WebSocketServer({ port: WS_PORT });
-console.log(`[Listening WS] ws://localhost:${WS_PORT}`);
-
-wss.on('connection', (ws) => {
-  console.log('New WebSocket connection');
-
-  ws.on('message', (message) => {
-    let osc_host = '127.0.0.1';
-    let osc_port = 57120;
-
-    try {
-      const data = JSON.parse(message);
-      if ('host' in data) {
-        osc_host = data['host'];
-      }
-      if ('port' in data) {
-        osc_port = data['port'];
-      }
-      let msg = { address: data['address'], args: data['args'] };
-      if ('timestamp' in data) {
-        msg = { timeTag: osc.timeTag(0, data['timestamp']), packets: [msg] };
-      }
-
-      udpPort.send(msg, osc_host, osc_port);
-    } catch (err) {
-      console.error('Error parsing message:', err);
+if (debug) {
+  osc.on('*', (message) => {
+    const { address, args } = message;
+    let str = '';
+    for (let i = 0; i < args.length; i += 2) {
+      str += `${args[i]}: ${args[i + 1]} `;
     }
+    console.log(`${address} ${str}`);
   });
+}
 
-  ws.on('close', () => {
-    console.log('WebSocket connection closed');
-  });
+osc.on('error', (message) => {
+  if (message.toString().includes('EADDRINUSE')) {
+    console.log(`------ ERROR -------
+a server is already running on port 57121! to stop it:
+1. run "lsof -ti :57121 | xargs kill -9" (macos / linux)
+2. re-run the osc server
+`);
+  } else {
+    console.log(message);
+  }
 });
+
+osc.open();
+
+console.log('osc client running on port', config.udpClient.port);
+console.log('osc server running on port', config.udpServer.port);
+console.log('websocket server running on port', config.wsServer.port);
+if (debug) {
+  console.log('debug logs enabled. incoming messages will appear below');
+}

packages/reference/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/reference",
-  "version": "1.2.2",
+  "version": "1.2.1",
   "description": "Headless reference of all strudel functions",
   "main": "index.mjs",
   "type": "module",
@@ -33,8 +33,5 @@
   "homepage": "https://codeberg.org/uzu/strudel#readme",
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/repl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/repl",
-  "version": "1.3.0",
+  "version": "1.2.6",
   "description": "Strudel REPL as a Web Component",
   "module": "index.mjs",
   "publishConfig": {
@@ -48,8 +48,5 @@
     "@rollup/plugin-replace": "^6.0.2",
     "vite": "^6.0.11",
     "vite-plugin-bundle-audioworklet": "workspace:*"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/repl/repl-component.mjs

@@ -1,12 +1,11 @@
 import { silence } from '@strudel/core';
 import { getDrawContext } from '@strudel/draw';
 import { transpiler } from '@strudel/transpiler';
-import { getAudioContext, webaudioOutput, initAudioOnFirstClick } from '@strudel/webaudio';
+import { getAudioContext, webaudioOutput } from '@strudel/webaudio';
 import { StrudelMirror, codemirrorSettings } from '@strudel/codemirror';
 import { prebake } from './prebake.mjs';
 
 if (typeof HTMLElement !== 'undefined') {
-  initAudioOnFirstClick();
   class StrudelRepl extends HTMLElement {
     static observedAttributes = ['code'];
     settings = codemirrorSettings.get();

packages/sampler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/sampler",
-  "version": "0.2.4",
+  "version": "0.2.3",
   "description": "",
   "keywords": [
     "tidalcycles",
@@ -15,8 +15,5 @@
   "type": "module",
   "dependencies": {
     "cowsay": "^1.6.0"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/sampler/sample-server.mjs

@@ -9,7 +9,6 @@ import readline from 'readline';
 import os from 'os';
 
 const LOG = !!process.env.LOG || false;
-const PORT = process.env.PORT || 5432;
 const VALID_AUDIO_EXTENSIONS = ['wav', 'mp3', 'ogg'];
 
 const isAudioFile = (f) => {
@@ -55,6 +54,7 @@ async function getBanks(directory, flat = false) {
     banks[bank].push(subDir);
     return subDir;
   });
+  banks._base = `http://localhost:5432`;
   return { banks, files };
 }
 
@@ -134,6 +134,8 @@ const server = http.createServer(async (req, res) => {
   readStream.pipe(res);
 });
 
+// eslint-disable-next-line
+const PORT = process.env.PORT || 5432;
 const IP_ADDRESS = '0.0.0.0';
 let IP;
 const networkInterfaces = os.networkInterfaces();

packages/serial/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/serial",
-  "version": "1.2.6",
+  "version": "1.2.4",
   "description": "Webserial API for strudel",
   "main": "serial.mjs",
   "type": "module",
@@ -33,8 +33,5 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/serial/serial.mjs

@@ -68,7 +68,7 @@ Pattern.prototype.serial = function (br = 115200, sendcrc = false, singlecharids
     if (!(name in writeMessagers)) {
       getWriter(name, br);
     }
-    const onTrigger = (hap, currentTime, _cps, targetTime) => {
+    const onTrigger = (t_deprecate, hap, currentTime, cps, targetTime) => {
       var message = '';
       var chk = 0;
       if (typeof hap.value === 'object') {

packages/soundfonts/fontloader.mjs

@@ -6,8 +6,6 @@ import {
   getADSRValues,
   getPitchEnvelope,
   getVibratoOscillator,
-  onceEnded,
-  releaseAudioNode,
 } from '@strudel/webaudio';
 import gm from './gm.mjs';
 
@@ -166,18 +164,19 @@ export function registerSoundfonts() {
         let envEnd = holdEnd + release + 0.01;
 
         // vibrato
-        const vibratoHandle = getVibratoOscillator(bufferSource.detune, value, time);
+        let vibratoOscillator = getVibratoOscillator(bufferSource.detune, value, time);
         // pitch envelope
         getPitchEnvelope(bufferSource.detune, value, time, holdEnd);
 
         bufferSource.stop(envEnd);
         const stop = (releaseTime) => {};
-        onceEnded(bufferSource, () => {
-          releaseAudioNode(bufferSource);
-          vibratoHandle?.stop();
+        bufferSource.onended = () => {
+          bufferSource.disconnect();
+          vibratoOscillator?.stop();
+          node.disconnect();
           onended();
-        });
-        return { node, stop, nodes: { source: [bufferSource], ...vibratoHandle?.nodes } };
+        };
+        return { node, stop };
       },
       { type: 'soundfont', prebake: true, fonts },
     );

packages/soundfonts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/soundfonts",
-  "version": "1.3.0",
+  "version": "1.2.5",
   "description": "Soundsfont support for strudel",
   "main": "index.mjs",
   "publishConfig": {
@@ -37,8 +37,5 @@
   "devDependencies": {
     "node-fetch": "^3.3.2",
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/superdough/README.md

@@ -89,7 +89,7 @@ superdough({ s: 'bd', delay: 0.5 }, 0, 1);
   - `decay`: seconds of decay phase
   - `sustain`: gain of sustain phase
   - `release`: seconds of release phase
-- `deadline`: seconds from audio context initialization before playing the sound (getAudioContextCurrentTime() = immediate)
+- `deadline`: seconds until the sound should play (0 = immediate)
 - `duration`: seconds the sound should last. optional for one shot samples, required for synth sounds
 
 ### registerSynthSounds()
@@ -153,7 +153,6 @@ samples('github:tidalcycles/dirt-samples')
 
 The format is `github:<user>/<repo>/<branch>`.
 
-If `<repo>` and `<branch>` are not specified, they will default to `samples` and `main` respectively.
 It expects a `strudel.json` file to be present at the root of the given repository, which declares the sample paths in the repo.
 
 The format is also expected to be the same as explained above.

packages/superdough/audioContext.mjs

@@ -1,12 +1,3 @@
-/*
-audioContext.mjs - Audio Context manager
-
-Sets up a common and accessible audio context for all superdough operations
-
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/superdough/audiocontext.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 let audioContext;
 
 export const setDefaultAudioContext = () => {
@@ -14,11 +5,6 @@ export const setDefaultAudioContext = () => {
   return audioContext;
 };
 
-export const setAudioContext = (context) => {
-  audioContext = context;
-  return audioContext;
-};
-
 export const getAudioContext = () => {
   if (!audioContext) {
     return setDefaultAudioContext();

packages/superdough/feedbackdelay.mjs

@@ -5,18 +5,19 @@ if (typeof DelayNode !== 'undefined') {
       wet = Math.abs(wet);
       this.delayTime.value = time;
 
-      this.feedbackGain = ac.createGain();
-      this.feedbackGain.gain.value = Math.min(Math.abs(feedback), 0.995);
-      this.feedback = this.feedbackGain.gain;
+      const feedbackGain = ac.createGain();
+      feedbackGain.gain.value = Math.min(Math.abs(feedback), 0.995);
+      this.feedback = feedbackGain.gain;
 
-      this.delayGain = ac.createGain();
-      this.delayGain.gain.value = wet;
+      const delayGain = ac.createGain();
+      delayGain.gain.value = wet;
+      this.delayGain = delayGain;
 
-      this.connect(this.feedbackGain);
-      this.connect(this.delayGain);
-      this.feedbackGain.connect(this);
+      this.connect(feedbackGain);
+      this.connect(delayGain);
+      feedbackGain.connect(this);
 
-      this.connect = (target) => this.delayGain.connect(target);
+      this.connect = (target) => delayGain.connect(target);
       return this;
     }
     start(t) {
@@ -24,7 +25,7 @@ if (typeof DelayNode !== 'undefined') {
     }
   }
 
-  BaseAudioContext.prototype.createFeedbackDelay = function (wet, time, feedback) {
+  AudioContext.prototype.createFeedbackDelay = function (wet, time, feedback) {
     return new FeedbackDelayNode(this, wet, time, feedback);
   };
 }

packages/superdough/helpers.mjs

@@ -1,8 +1,7 @@
 import { getAudioContext } from './audioContext.mjs';
-import { logger } from './logger.mjs';
-import { getNoiseBuffer } from './noise.mjs';
-import { getNodeFromPool } from './nodePools.mjs';
 import { clamp, nanFallback, midiToFreq, noteToMidi } from './util.mjs';
+import { getNoiseBuffer } from './noise.mjs';
+import { logger } from './logger.mjs';
 
 export const noises = ['pink', 'white', 'brown', 'crackle'];
 
@@ -43,7 +42,6 @@ export const getParamADSR = (
   decay,
   sustain,
   release,
-  // min = value at start of attack, max = value at end of attack; it is possible that max < min
   min,
   max,
   begin,
@@ -61,15 +59,17 @@ export const getParamADSR = (
     max = max === 0 ? 0.001 : max;
   }
   const range = max - min;
+  const peak = max;
   const sustainVal = min + sustain * range;
   const duration = end - begin;
 
   const envValAtTime = (time) => {
     let val;
     if (attack > time) {
-      val = time * getSlope(min, max, 0, attack) + min;
+      let slope = getSlope(min, peak, 0, attack);
+      val = time * slope + (min > peak ? min : 0);
     } else {
-      val = (time - attack) * getSlope(max, sustainVal, 0, decay) + max;
+      val = (time - attack) * getSlope(peak, sustainVal, 0, decay) + peak;
     }
     if (curve === 'exponential') {
       val = val || 0.001;
@@ -105,40 +105,22 @@ function getModulationShapeInput(val) {
   return { tri: 0, triangle: 0, sine: 1, ramp: 2, saw: 3, square: 4 }[val] ?? 0;
 }
 
-export function getEnvelope(audioContext, properties = {}) {
-  return getWorklet(audioContext, 'envelope-processor', properties);
-}
-
-export function getLfo(audioContext, properties = {}) {
-  const {
-    shape = 0,
-    begin = 0,
-    end = 0,
-    time,
-    depth = 1,
-    dcoffset = -0.5,
-    frequency = 1,
-    skew = 0.5,
-    phaseoffset = 0,
-    curve = 1,
-    min,
-    max,
-    ...props
-  } = properties;
-
+export function getLfo(audioContext, begin, end, properties = {}) {
+  const { shape = 0, ...props } = properties;
+  const { dcoffset = -0.5, depth = 1 } = properties;
   const lfoprops = {
+    frequency: 1,
+    depth,
+    skew: 0.5,
+    phaseoffset: 0,
+    time: begin,
     begin,
     end,
-    time: time ?? begin,
-    depth,
-    dcoffset,
-    frequency,
-    skew,
-    phaseoffset,
-    curve,
     shape: getModulationShapeInput(shape),
-    min: min ?? dcoffset * depth,
-    max: max ?? dcoffset * depth + depth,
+    dcoffset,
+    min: dcoffset * depth,
+    max: dcoffset * depth + depth,
+    curve: 1,
     ...props,
   };
 
@@ -146,7 +128,6 @@ export function getLfo(audioContext, properties = {}) {
 }
 
 export function getCompressor(ac, threshold, ratio, knee, attack, release) {
-  const node = getNodeFromPool('compressor', () => new DynamicsCompressorNode(ac, {}));
   const options = {
     threshold: threshold ?? -3,
     ratio: ratio ?? 10,
@@ -154,10 +135,7 @@ export function getCompressor(ac, threshold, ratio, knee, attack, release) {
     attack: attack ?? 0.005,
     release: release ?? 0.05,
   };
-  Object.entries(options).forEach(([key, value]) => {
-    node[key].value = value;
-  });
-  return node;
+  return new DynamicsCompressorNode(ac, options);
 }
 
 // changes the default values of the envelope based on what parameters the user has defined
@@ -172,31 +150,10 @@ export const getADSRValues = (params, curve = 'linear', defaultValues) => {
   if (a == null && d == null && s == null && r == null) {
     return defaultValues ?? [envmin, envmin, envmax, releaseMin];
   }
-
   const sustain = s != null ? s : (a != null && d == null) || (a == null && d == null) ? envmax : envmin;
   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, {
-      begin: 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;
@@ -213,80 +170,56 @@ 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);
   }
-  const lfo = getParamLfo(audioContext, param, start, end, lfoValues);
-  return lfo;
-}
-export function createFilter(context, start, end, params, cps, cycle) {
-  let {
-    frequency,
-    anchor,
-    env,
-    type,
-    model,
-    q = 1,
-    drive = 0.69,
-    depth,
-    depthfrequency,
-    dcoffset = -0.5,
-    skew,
-    shape,
-    rate,
-    sync,
-  } = params;
+  let lfo;
+  let { defaultDepth = 1, depth, dcoffset, ...getLfoInputs } = lfoValues;
 
-  let frequencyParam, filter;
+  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) {
+  const curve = 'exponential';
+  const [attack, decay, sustain, release] = getADSRValues([att, dec, sus, rel], curve, [0.005, 0.14, 0, 0.1]);
+  let filter;
+  let frequencyParam;
   if (model === 'ladder') {
-    filter = getWorklet(context, 'ladder-processor', { frequency, q, drive });
+    filter = getWorklet(context, 'ladder-processor', { frequency, q: Q, drive });
     frequencyParam = filter.parameters.get('frequency');
   } else {
-    const factory = () => context.createBiquadFilter();
-    filter = getNodeFromPool('filter', factory);
+    filter = context.createBiquadFilter();
     filter.type = type;
-    Object.entries({ Q: q, frequency }).forEach(([key, value]) => {
-      filter[key].value = value;
-    });
+    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 = [...envelopeValues, env].some((v) => v !== undefined);
+  const hasEnvelope = att ?? dec ?? sus ?? rel ?? fenv;
   // Apply ADSR to filter frequency
-  if (hasEnvelope) {
-    env = nanFallback(env, 1, true);
-    anchor = nanFallback(anchor, 0, true);
-    const envAbs = Math.abs(env);
-    const offset = envAbs * anchor;
+  if (hasEnvelope !== undefined) {
+    fenv = nanFallback(fenv, 1, true);
+    fanchor = nanFallback(fanchor, 0, true);
+    const fenvAbs = Math.abs(fenv);
+    const offset = fenvAbs * fanchor;
     let min = clamp(2 ** -offset * frequency, 0, 20000);
-    let max = clamp(2 ** (envAbs - offset) * frequency, 0, 20000);
-    if (env < 0) [min, max] = [max, min];
-    getParamADSR(frequencyParam, attack, decay, sustain, release, min, max, start, end, 'exponential');
+    let max = clamp(2 ** (fenvAbs - offset) * frequency, 0, 20000);
+    if (fenv < 0) [min, max] = [max, min];
+    getParamADSR(frequencyParam, attack, decay, sustain, release, min, max, start, end, curve);
+    return filter;
   }
-
-  if (sync != null) {
-    rate = cps * sync;
-  }
-  const hasLFO = [depth, depthfrequency, skew, shape, rate].some((v) => v !== undefined);
-  let lfo;
-  if (hasLFO) {
-    depth = depth ?? 1;
-    const time = cycle / cps;
-    const modDepth = depthfrequency ?? (depth ?? 1) * frequency;
-    const lfoValues = {
-      depth: modDepth,
-      dcoffset,
-      skew,
-      shape,
-      frequency: rate ?? cps,
-      min: -frequency + 30,
-      max: 20000 - frequency,
-      time,
-      curve: 1,
-    };
-    lfo = getParamLfo(context, frequencyParam, start, end, lfoValues);
-  }
-
-  return { filter, lfo };
+  return filter;
 }
 
 // stays 1 until .5, then fades out
@@ -308,18 +241,7 @@ export function drywet(dry, wet, wetAmount = 0) {
   let mix = ac.createGain();
   dry_gain.connect(mix);
   wet_gain.connect(mix);
-  return {
-    node: mix,
-    teardown: () => {
-      releaseAudioNode(dry_gain);
-      releaseAudioNode(wet_gain);
-      // it is not the responsability of drywet
-      // to call `releaseAudioNode` on
-      // the 2 external args dry and wet
-      dry.disconnect(dry_gain);
-      wet.disconnect(wet_gain);
-    },
-  };
+  return mix;
 }
 
 let curves = ['linear', 'exponential'];
@@ -354,19 +276,10 @@ export function getVibratoOscillator(param, value, t) {
     gain.gain.value = vibmod * 100;
     vibratoOscillator.connect(gain);
     gain.connect(param);
-    onceEnded(vibratoOscillator, () => {
-      releaseAudioNode(gain);
-      releaseAudioNode(vibratoOscillator);
-    });
     vibratoOscillator.start(t);
-    return { stop: (t) => vibratoOscillator.stop(t), nodes: { vib: [vibratoOscillator], vib_gain: [gain] } };
+    return vibratoOscillator;
   }
 }
-
-export function scheduleAtTime(callback, targetTime, audioContext = getAudioContext()) {
-  const currentTime = audioContext.currentTime;
-  webAudioTimeout(audioContext, callback, currentTime, targetTime);
-}
 // ConstantSource inherits AudioScheduledSourceNode, which has scheduling abilities
 // a bit of a hack, but it works very well :)
 export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
@@ -379,17 +292,25 @@ export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
   constantNode.connect(zeroGain);
 
   // Schedule the `onComplete` callback to occur at `stopTime`
-  onceEnded(constantNode, () => {
-    releaseAudioNode(zeroGain);
-    releaseAudioNode(constantNode);
+  constantNode.onended = () => {
+    // Ensure garbage collection
+    try {
+      zeroGain.disconnect();
+    } catch {
+      // pass
+    }
+    try {
+      constantNode.disconnect();
+    } catch {
+      // pass
+    }
     onComplete();
-  });
+  };
   constantNode.start(startTime);
   constantNode.stop(stopTime);
   return constantNode;
 }
-
-const mod = (freq, type = 'sine') => {
+const mod = (freq, range = 1, type = 'sine') => {
   const ctx = getAudioContext();
   let osc;
   if (noises.includes(type)) {
@@ -401,94 +322,64 @@ const mod = (freq, type = 'sine') => {
     osc.type = type;
     osc.frequency.value = freq;
   }
-  osc.start();
-  return osc;
-};
 
-const fm = (frequencyparam, harmonicityRatio, wave = 'sine') => {
+  osc.start();
+  const g = new GainNode(ctx, { gain: range });
+  osc.connect(g); // -range, range
+  return { node: g, stop: (t) => osc.stop(t) };
+};
+const fm = (frequencyparam, harmonicityRatio, modulationIndex, wave = 'sine') => {
   const carrfreq = frequencyparam.value;
   const modfreq = carrfreq * harmonicityRatio;
-  return { osc: mod(modfreq, wave), freq: modfreq };
+  const modgain = modfreq * modulationIndex;
+  return mod(modfreq, modgain, wave);
 };
-
 export function applyFM(param, value, begin) {
-  const ac = getAudioContext();
-  const toStop = []; // fm oscillators we will expose `stop` for
-  const fms = {};
-  const nodes = {};
-  // Matrix
-  for (let i = 1; i <= 8; i++) {
-    for (let j = 0; j <= 8; j++) {
-      let control;
-      if (i === j + 1) {
-        // Standard fm3 -> fm2 -> fm1 -> param usage
-        const iS = i === 1 ? '' : i;
-        control = `fmi${iS}`;
-      } else {
-        control = `fmi${i}${j}`;
-      }
-      const amt = value[control];
-      if (!amt) continue;
-      let io = [];
-      for (let [isMod, idx] of [
-        [true, i], // source
-        [false, j], // target
-      ]) {
-        if (idx === 0) {
-          io.push(param);
-          continue;
-        }
-        if (!fms[idx]) {
-          const idxS = idx === 1 ? '' : idx;
-          const { osc, freq } = fm(param, value[`fmh${idxS}`] ?? 1, value[`fmwave${idxS}`] ?? 'sine');
-          toStop.push(osc);
-          const toCleanup = [osc]; // nodes we want to cleanup after oscillator `stop`
-          const adsr = ['attack', 'decay', 'sustain', 'release'].map((s) => value[`fm${s}${idxS}`]);
-          let output = osc;
-          if (adsr.some((v) => v !== undefined)) {
-            const envGain = ac.createGain();
-            const [attack, decay, sustain, release] = getADSRValues(adsr);
-            const holdEnd = begin + value.duration;
-            const fmEnvelopeType = value[`fmenv${idxS}`] ?? 'exp';
-            getParamADSR(
-              envGain.gain,
-              attack,
-              decay,
-              sustain,
-              release,
-              0,
-              1,
-              begin,
-              holdEnd,
-              fmEnvelopeType === 'exp' ? 'exponential' : 'linear',
-            );
-            toCleanup.push(envGain);
-            output = osc.connect(envGain);
-          }
-          fms[idx] = { input: osc.frequency, output, freq, osc, toCleanup };
-          nodes[`fm_${idx}`] = [osc];
-        }
-        const { input, output, freq, osc, toCleanup } = fms[idx];
-        const gAmt = gainNode(amt);
-        const gFreq = gainNode(freq);
-        io.push(isMod ? output.connect(gAmt).connect(gFreq) : input);
-        cleanupOnEnd(osc, [...toCleanup, gAmt, gFreq]);
-        nodes[`fm_${idx}_gain`] = [gAmt];
-      }
-      if (!io[1]) {
-        logger(
-          `[superdough] control ${control} failed to connect FM ${i} to target ${j} due to missing frequency parameter (likely because fm${j} is noise)`,
-          'warning',
-        );
-        continue;
-      }
-      io[0].connect(io[1]);
+  const {
+    fmh: fmHarmonicity = 1,
+    fmi: fmModulationIndex,
+    fmenv: fmEnvelopeType = 'exp',
+    fmattack: fmAttack,
+    fmdecay: fmDecay,
+    fmsustain: fmSustain,
+    fmrelease: fmRelease,
+    fmvelocity: fmVelocity,
+    fmwave: fmWaveform = 'sine',
+    duration,
+  } = value;
+  let modulator;
+  let stop = () => {};
+
+  if (fmModulationIndex) {
+    const ac = getAudioContext();
+    const envGain = ac.createGain();
+    const fmmod = fm(param, fmHarmonicity, fmModulationIndex, fmWaveform);
+
+    modulator = fmmod.node;
+    stop = fmmod.stop;
+    if (![fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity].some((v) => v !== undefined)) {
+      // no envelope by default
+      modulator.connect(param);
+    } else {
+      const [attack, decay, sustain, release] = getADSRValues([fmAttack, fmDecay, fmSustain, fmRelease]);
+      const holdEnd = begin + duration;
+      getParamADSR(
+        envGain.gain,
+        attack,
+        decay,
+        sustain,
+        release,
+        0,
+        1,
+        begin,
+        holdEnd,
+        fmEnvelopeType === 'exp' ? 'exponential' : 'linear',
+      );
+      modulator.connect(envGain);
+      envGain.connect(param);
     }
   }
-  return {
-    nodes,
-    stop: (t) => toStop.forEach((m) => m?.stop(t)),
-  };
+  return { stop };
 }
 
 // Saturation curves
@@ -588,7 +479,7 @@ export const getDistortion = (distort, postgain, algorithm) => {
 };
 
 export const getFrequencyFromValue = (value, defaultNote = 36) => {
-  let { note, freq, octave = 0 } = value;
+  let { note, freq } = value;
   note = note || defaultNote;
   if (typeof note === 'string') {
     note = noteToMidi(note); // e.g. c3 => 48
@@ -597,64 +488,14 @@ export const getFrequencyFromValue = (value, defaultNote = 36) => {
   if (!freq && typeof note === 'number') {
     freq = midiToFreq(note); // + 48);
   }
-  freq *= Math.pow(2, octave);
+
   return Number(freq);
 };
 
-// This helper should be used instead of the `node.onended = callback` pattern
-// It adds a mechanism to help minimize gc retention
-export const onceEnded = (node, callback) => {
-  const onended = callback;
-  node.onended = function cleanup() {
-    onended && onended();
-    this.onended = null;
-  };
-};
-
-export const releaseAudioNode = (node) => {
-  if (node == null) return;
-
-  // check we received an AudioNode
-  if (!(node instanceof AudioNode)) {
-    throw new Error('releaseAudioNode can only release an AudioNode');
+export const destroyAudioWorkletNode = (node) => {
+  if (node == null) {
+    return;
   }
-
-  // https://developer.mozilla.org/en-US/docs/Web/API/AudioNode/disconnect
   node.disconnect();
-
-  // make sure all AudioScheduledSourceNodes are in a stopped state
-  // https://developer.mozilla.org/en-US/docs/Web/API/AudioScheduledSourceNode
-  if (node instanceof AudioScheduledSourceNode) {
-    if (process.env.NODE_ENV === 'development' && node.onended && node.onended.name !== 'cleanup') {
-      logger(
-        `[superdough] Deprecation warning: it seems your code path is setting 'node.onended = callback' instead of using the onceEnded helper`,
-      );
-    }
-    try {
-      node.stop();
-    } catch (e) {
-      // At the stage, `start` was not called on the node
-      // but an `onended` callback releasing resources may exist
-      // and we want it to fire :
-      // - we force a start/stop cycle so that `onended` gets called
-      // - we `lock` the node so that no-one can start it
-      node.start(node.context.currentTime + 5); // will never happen
-      node.stop();
-    }
-  }
-
-  // https://www.w3.org/TR/webaudio-1.1/#AudioNode-actively-processing
-  // An AudioWorkletNode is actively processing when its AudioWorkletProcessor's [[callable process]]
-  // returns true and either its active source flag is true or
-  // any AudioNode connected to one of its inputs is actively processing.
-  if (node instanceof AudioWorkletNode) {
-    // while `end` is not native to the web audio API, it is common practice in superdough
-    // to use that param in the worklets to trigger returning false from the processor
-    node.parameters.get('end')?.setValueAtTime(0, 0);
-  }
-};
-
-// Once the `anchor` node has ended, release all nodes in `toCleanup`
-export const cleanupOnEnd = (anchor, toCleanup) => {
-  onceEnded(anchor, () => toCleanup.forEach((n) => releaseAudioNode(n)));
+  node.parameters.get('end')?.setValueAtTime(0, 0);
 };

packages/superdough/index.mjs

@@ -10,7 +10,6 @@ export * from './helpers.mjs';
 export * from './synth.mjs';
 export * from './zzfx.mjs';
 export * from './logger.mjs';
-export * from './modulators.mjs';
 export * from './dspworklet.mjs';
 export * from './audioContext.mjs';
 export * from './wavetable.mjs';

packages/superdough/modulators.mjs

@@ -1,178 +0,0 @@
-/*
-modulators.mjs - Helpers for constructing modulators (envelopes, LFOs, etc.)
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/superdough/modulators.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { getAudioContext } from './audioContext.mjs';
-import { gainNode, getEnvelope, getLfo, webAudioTimeout } from './helpers.mjs';
-import { errorLogger } from './logger.mjs';
-import { getSuperdoughControlTargets } from './superdoughdata.mjs';
-import { clamp } from './util.mjs';
-
-const getNodeParam = (node, name) => {
-  // Worklet case
-  if (node?.parameters) {
-    const p = node.parameters.get(name);
-    if (p instanceof AudioParam) {
-      return p;
-    }
-  }
-  // Built-in node case
-  let p = node?.[name];
-  if (p === undefined && name === 'frequency') {
-    // Fallbacks for source nodes without 'frequency' params (e.g. soundfonts)
-    p = node?.['detune'] ?? node?.['playbackRate'];
-  }
-  if (p instanceof AudioParam) {
-    return p;
-  }
-  return undefined;
-};
-
-const controlTargets = getSuperdoughControlTargets();
-
-const getControlData = (control, subControl) => {
-  const controlNoIdx = control.split('_')[0];
-  return controlTargets[`${controlNoIdx}_${subControl}`] ?? controlTargets[controlNoIdx];
-};
-
-const getRangeForParam = (paramName, currentValue) => {
-  // We clamp the frequency to a reasonable range unless the currentValue
-  // is low, which indicates this may be an LFO
-  if (paramName === 'frequency' && currentValue >= 30) {
-    return { min: 20 - currentValue, max: 24000 - currentValue };
-  }
-  return { min: undefined, max: undefined };
-};
-
-const clampWithWaveShaper = (modulator, min, max) => {
-  const ac = getAudioContext();
-  const curve = new Float32Array(256);
-  for (let i = 0; i < curve.length; i++) {
-    const x = (i / (curve.length - 1)) * 2 - 1;
-    curve[i] = clamp(x * max, min, max);
-  }
-  const shaper = new WaveShaperNode(ac, { curve });
-  const scaleGain = gainNode(1 / max);
-  modulator.connect(scaleGain).connect(shaper);
-  return { modulator, toCleanup: [shaper, scaleGain] };
-};
-
-const getTargetParamsForControl = (control, nodes, subControl) => {
-  const targetInfo = getControlData(control, subControl);
-  if (!targetInfo) {
-    errorLogger(
-      new Error(`Could not find control data for target '${control}'. It may not be modulatable.`),
-      'superdough',
-    );
-    return { targetParams: [], paramName: control };
-  }
-  const paramName = targetInfo.param;
-  const nodeKey = nodes[targetInfo.node] ? targetInfo.node : control;
-  const targetNodes = nodes[nodeKey];
-  if (!targetNodes) {
-    const keys = Object.keys(nodes);
-    errorLogger(
-      new Error(`Could not connect to target '${nodeKey}' — it does not exist. Available targets: ${keys.join(', ')}`),
-      'superdough',
-    );
-    return { targetParams: [], paramName };
-  }
-  const audioParams = [];
-  targetNodes.forEach((targetNode) => {
-    const targetParam = getNodeParam(targetNode, paramName);
-    audioParams.push(targetParam);
-  });
-  return { targetParams: audioParams, paramName };
-};
-
-export const connectLFO = (id, params, nodeTracker) => {
-  const {
-    rate = 1,
-    sync,
-    cps,
-    cycle,
-    control = 'lfo',
-    subControl,
-    fxi = 'main',
-    depth = 1,
-    depthabs,
-    ...filteredParams
-  } = params;
-  const { targetParams, paramName } = getTargetParamsForControl(control, nodeTracker[fxi], subControl);
-  if (!targetParams.length) return;
-  let currentValue = targetParams[0].value;
-  currentValue = currentValue === 0 ? 1 : currentValue;
-  const { min, max } = getRangeForParam(paramName, currentValue);
-  const depthValue = depthabs != null ? depthabs : depth * currentValue;
-  const modParams = {
-    ...filteredParams,
-    frequency: sync !== undefined ? sync * cps : rate,
-    time: cycle / cps,
-    depth: depthValue,
-    min,
-    max,
-  };
-  const lfoNode = getLfo(getAudioContext(), modParams);
-  nodeTracker.main[`lfo_${id}`] = [lfoNode];
-  targetParams.forEach((t) => lfoNode.connect(t));
-  return lfoNode;
-};
-
-export const connectEnvelope = (id, params, nodeTracker) => {
-  const { control, subControl, acurve, dcurve, rcurve, depth = 1, depthabs, fxi = 'main', ...filteredParams } = params;
-  const { targetParams, paramName } = getTargetParamsForControl(control, nodeTracker[fxi], subControl);
-  if (!targetParams.length) return;
-  let currentValue = targetParams[0].value;
-  currentValue = currentValue === 0 ? 1 : currentValue;
-  const { min, max } = getRangeForParam(paramName, currentValue);
-  const depthValue = depthabs != null ? depthabs : depth * currentValue;
-  const envNode = getEnvelope(getAudioContext(), {
-    ...filteredParams,
-    depth: depthValue,
-    min,
-    max,
-    attackCurve: acurve,
-    decayCurve: dcurve,
-    releaseCurve: rcurve,
-  });
-  nodeTracker.main[`env_${id}`] = [envNode];
-  targetParams.forEach((t) => envNode.connect(t));
-  return envNode;
-};
-
-export const connectBusModulator = (params, nodeTracker, controller) => {
-  const ac = getAudioContext();
-  const { control, subControl, depth = 1, depthabs, fxi = 'main' } = params;
-  const { targetParams, paramName } = getTargetParamsForControl(control, nodeTracker[fxi], subControl);
-  if (!targetParams.length) return { toCleanup: [] };
-  const signal = controller.getBus(params.bus);
-  const dc = new ConstantSourceNode(ac, { offset: params.dc ?? 0 });
-  dc.start(params.begin);
-  const shifted = dc.connect(gainNode(1));
-  signal.connect(shifted);
-  let currentValue = targetParams[0].value;
-  currentValue = currentValue === 0 ? 1 : currentValue;
-  const { min, max } = getRangeForParam(paramName, currentValue);
-  const depthValue = depthabs != null ? depthabs : depth * currentValue;
-  const depthGain = gainNode((Math.sign(depthValue) * Math.abs(depthValue)) / 0.3);
-  const unClamped = shifted.connect(depthGain);
-  const toCleanup = [];
-  let modulator = unClamped;
-  if (min !== undefined && max !== undefined) {
-    const wsData = clampWithWaveShaper(unClamped, min, max);
-    modulator = wsData.modulator;
-    toCleanup.push(...wsData.toCleanup);
-  }
-  webAudioTimeout(
-    ac,
-    () => {
-      targetParams.forEach((t) => modulator.connect(t));
-    },
-    0,
-    params.begin,
-  );
-  toCleanup.push(dc, shifted, depthGain);
-  return { modulator, toCleanup };
-};

packages/superdough/nodePools.mjs

@@ -1,84 +0,0 @@
-/*
-nodePools.mjs - Helper functions related to pooling and re-using audio nodes
-
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/superdough/nodePools.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-const nodePools = new Map();
-const POOL_KEY = Symbol('nodePoolKey');
-
-export const isPoolable = (node) => !!node[POOL_KEY];
-
-const getNodeTime = (node) => {
-  return node.context?.currentTime ?? 0;
-};
-
-const getParams = (node) => {
-  const params = new Set();
-  node.parameters?.forEach((param) => params.add(param));
-  const visited = new Set(); // prioritize deepest definition
-  let proto = node;
-  // Move up the prototype chain
-  while (proto !== Object.prototype) {
-    for (const key of Object.getOwnPropertyNames(proto)) {
-      if (visited.has(key)) continue;
-      visited.add(key);
-      const value = node[key];
-      if (value instanceof AudioParam) {
-        params.add(value);
-      }
-    }
-    proto = Object.getPrototypeOf(proto);
-  }
-  return params;
-};
-
-export const releaseNodeToPool = (node) => {
-  node.disconnect();
-  if (node instanceof AudioScheduledSourceNode) {
-    // not reusable
-    return;
-  }
-  const key = node[POOL_KEY];
-  if (key == null) return;
-  const now = getNodeTime(node);
-  getParams(node).forEach((param) => param.cancelScheduledValues(now));
-  const pool = nodePools.get(key) ?? [];
-  pool.push(new WeakRef(node));
-  nodePools.set(key, pool);
-};
-
-// Audio worklets are given a grace period to survive (`return true`) after
-// being released. This concludes at time `end + 0.5`. We test here whether we are
-// within some safe distance of that (`end + 0.45`) and if so, permit the node to be
-// released. This helps to prevent race conditions between node termination and node
-// re-use
-const isNodeAlive = (node) => {
-  // Skip check if node is not a worklet
-  if (!(node instanceof AudioWorkletNode)) return true;
-  const now = getNodeTime(node);
-  const end = node?.parameters?.get('end').value ?? 0;
-  return now < end + 0.45;
-};
-
-// Attempt to get node from the pool. If this fails, fall back
-// to building it with the factory
-export const getNodeFromPool = (key, factory) => {
-  const pool = nodePools.get(key) ?? [];
-  let node;
-  let found = false;
-  while (pool.length) {
-    const ref = pool.pop();
-    node = ref?.deref();
-    if (node != null && isNodeAlive(node)) {
-      found = true;
-      break;
-    }
-  }
-  if (!found) {
-    node = factory();
-  }
-  node[POOL_KEY] = key;
-  return node;
-};

packages/superdough/noise.mjs

@@ -1,4 +1,4 @@
-import { drywet, onceEnded, releaseAudioNode } from './helpers.mjs';
+import { drywet } from './helpers.mjs';
 import { getAudioContext } from './audioContext.mjs';
 
 let noiseCache = {};
@@ -65,12 +65,8 @@ export function getNoiseOscillator(type = 'white', t, density = 0.02) {
 export function getNoiseMix(inputNode, wet, t) {
   const noiseOscillator = getNoiseOscillator('pink', t);
   const noiseMix = drywet(inputNode, noiseOscillator.node, wet);
-  onceEnded(noiseOscillator.node, () => {
-    releaseAudioNode(noiseOscillator.node);
-  });
   return {
-    node: noiseMix.node,
+    node: noiseMix,
     stop: (time) => noiseOscillator?.stop(time),
-    teardown: noiseMix.teardown,
   };
 }

packages/superdough/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superdough",
-  "version": "1.3.0",
+  "version": "1.2.5",
   "description": "simple web audio synth and sampler intended for live coding. inspired by superdirt and webdirt.",
   "main": "index.mjs",
   "type": "module",
@@ -36,10 +36,6 @@
     "vite-plugin-bundle-audioworklet": "workspace:*"
   },
   "dependencies": {
-    "@kabelsalat/lib": "^0.4.1",
     "nanostores": "^0.11.3"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }

packages/superdough/reverb.mjs

@@ -2,7 +2,7 @@ import reverbGen from './reverbGen.mjs';
 import { clamp } from './util.mjs';
 
 if (typeof AudioContext !== 'undefined') {
-  BaseAudioContext.prototype.adjustLength = function (duration, buffer, speed = 1, offsetAmount = 0) {
+  AudioContext.prototype.adjustLength = function (duration, buffer, speed = 1, offsetAmount = 0) {
     const sampleOffset = Math.floor(clamp(offsetAmount, 0, 1) * buffer.length);
     const newLength = buffer.sampleRate * duration;
     const newBuffer = this.createBuffer(buffer.numberOfChannels, buffer.length, buffer.sampleRate);
@@ -23,7 +23,7 @@ if (typeof AudioContext !== 'undefined') {
     return newBuffer;
   };
 
-  BaseAudioContext.prototype.createReverb = function (duration, fade, lp, dim, ir, irspeed, irbegin) {
+  AudioContext.prototype.createReverb = function (duration, fade, lp, dim, ir, irspeed, irbegin) {
     const convolver = this.createConvolver();
     convolver.generate = (d = 2, fade = 0.1, lp = 15000, dim = 1000, ir, irspeed, irbegin) => {
       convolver.duration = d;

packages/superdough/reverbGen.mjs

@@ -12,8 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import { releaseAudioNode } from './helpers.mjs';
-
 var reverbGen = {};
 
 /** Generates a reverb impulse response.
@@ -106,8 +104,6 @@ var applyGradualLowpass = function (input, lpFreqStart, lpFreqEnd, lpFreqEndAt,
   player.start();
   context.oncomplete = function (event) {
     callback(event.renderedBuffer);
-    releaseAudioNode(filter);
-    releaseAudioNode(player);
   };
   context.startRendering();
 

packages/superdough/sampler.mjs

@@ -1,14 +1,7 @@
-import { getBaseURL, getCommonSampleInfo } from './util.mjs';
+import { getCommonSampleInfo } from './util.mjs';
 import { registerSound, registerWaveTable } from './index.mjs';
 import { getAudioContext } from './audioContext.mjs';
-import {
-  getADSRValues,
-  getParamADSR,
-  getPitchEnvelope,
-  getVibratoOscillator,
-  onceEnded,
-  releaseAudioNode,
-} from './helpers.mjs';
+import { getADSRValues, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
 import { logger } from './logger.mjs';
 
 const bufferCache = {}; // string: Promise<ArrayBuffer>
@@ -65,22 +58,21 @@ export const getSampleBufferSource = async (hapValue, bank, resolveUrl) => {
   bufferSource.playbackRate.value = playbackRate;
 
   const { loopBegin = 0, loopEnd = 1, begin = 0, end = 1 } = hapValue;
-  const bufferDuration = bufferSource.buffer.duration;
 
-  // The computation of the offset into the sound is performed using the sound buffer's natural duration,
-  // rather than the playback duration, so that even if the sound is playing at twice its normal speed,
-  // the midway point through a 10-second audio buffer is still 5.
-  const offset = begin * bufferDuration;
+  // "The computation of the offset into the sound is performed using the sound buffer's natural sample rate,
+  // rather than the current playback rate, so even if the sound is playing at twice its normal speed,
+  // the midway point through a 10-second audio buffer is still 5."
+  const offset = begin * bufferSource.buffer.duration;
 
   const loop = hapValue.loop;
   if (loop) {
     bufferSource.loop = true;
-    bufferSource.loopStart = loopBegin * bufferDuration;
-    bufferSource.loopEnd = loopEnd * bufferDuration;
+    bufferSource.loopStart = loopBegin * bufferSource.buffer.duration - offset;
+    bufferSource.loopEnd = loopEnd * bufferSource.buffer.duration - offset;
   }
-  const playbackDuration = bufferDuration / bufferSource.playbackRate.value;
-  const sliceDuration = (end - begin) * playbackDuration;
-  return { bufferSource, offset, bufferDuration, playbackDuration, sliceDuration };
+  const bufferDuration = bufferSource.buffer.duration / bufferSource.playbackRate.value;
+  const sliceDuration = (end - begin) * bufferDuration;
+  return { bufferSource, offset, bufferDuration, sliceDuration };
 };
 
 export const loadBuffer = (url, ac, s, n = 0) => {
@@ -129,18 +121,13 @@ function githubPath(base, subpath = '') {
   if (!base.startsWith('github:')) {
     throw new Error('expected "github:" at the start of pseudoUrl');
   }
-  let path = base.slice('github:'.length);
+  let [_, path] = base.split('github:');
   path = path.endsWith('/') ? path.slice(0, -1) : path;
-
-  let components = path.split('/');
-  let user = components[0];
-  let repo = components.length >= 2 ? components[1] : 'samples';
-  let branch = components.length >= 3 ? components[2] : 'main';
-  let other = components.slice(3);
-  other.push(subpath ? subpath : '');
-  other = other.join('/');
-
-  return `https://raw.githubusercontent.com/${user}/${repo}/${branch}/${other}`;
+  if (path.split('/').length === 2) {
+    // assume main as default branch if none set
+    path += '/main';
+  }
+  return `https://raw.githubusercontent.com/${path}/${subpath}`;
 }
 
 export const processSampleMap = (sampleMap, fn, baseUrl = sampleMap._base || '') => {
@@ -219,7 +206,7 @@ export async function fetchSampleMap(url) {
     // not a browser
     return;
   }
-  const base = getBaseURL(url);
+  const base = url.split('/').slice(0, -1).join('/');
   if (typeof fetch === 'undefined') {
     // skip fetch when in node / testing
     return;
@@ -244,6 +231,12 @@ export async function fetchSampleMap(url) {
  *  sd: '808sd/SD0010.WAV'
  *  }, 'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/');
  * s("[bd ~]*2, [~ hh]*2, ~ sd")
+ * @example
+ * samples('shabda:noise,chimp:2')
+ * s("noise <chimp:0*2 chimp:1>")
+ * @example
+ * samples('shabda/speech/fr-FR/f:chocolat')
+ * s("chocolat*4")
  */
 
 export const samples = async (sampleMap, baseUrl = sampleMap._base || '', options = {}) => {
@@ -288,21 +281,19 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
 
   const { bufferSource, sliceDuration, offset } = await getSampleBufferSource(value, bank, resolveUrl);
 
+  // asny stuff above took too long?
+  if (ac.currentTime > t) {
+    logger(`[sampler] still loading sound "${s}:${n}"`, 'highlight');
+    // console.warn('sample still loading:', s, n);
+    return;
+  }
   if (!bufferSource) {
     logger(`[sampler] could not load "${s}:${n}"`, 'error');
     return;
   }
 
-  // async stuff above took too long?
-  if (ac.currentTime > t) {
-    logger(`[sampler] loading sound "${s}:${n}" took too long`, 'highlight');
-    // AudioBufferSourceNode will never be used. discard it
-    releaseAudioNode(bufferSource);
-    return;
-  }
-
   // vibrato
-  const vibratoHandle = getVibratoOscillator(bufferSource.detune, value, t);
+  let vibratoOscillator = getVibratoOscillator(bufferSource.detune, value, t);
 
   const time = t + nudge;
   bufferSource.start(time, offset);
@@ -323,19 +314,19 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
 
   const out = ac.createGain(); // we need a separate gain for the cutgroups because firefox...
   node.connect(out);
-  onceEnded(bufferSource, function () {
-    releaseAudioNode(bufferSource);
-    vibratoHandle?.stop();
-    releaseAudioNode(node);
-    releaseAudioNode(out);
+  bufferSource.onended = function () {
+    bufferSource.disconnect();
+    vibratoOscillator?.stop();
+    node.disconnect();
+    out.disconnect();
     onended();
-  });
+  };
   let envEnd = holdEnd + release + 0.01;
   bufferSource.stop(envEnd);
   const stop = (endTime) => {
     bufferSource.stop(endTime);
   };
-  const handle = { node: out, nodes: { source: [bufferSource], ...vibratoHandle?.nodes }, stop };
+  const handle = { node: out, bufferSource, stop };
 
   // cut groups
   if (cut !== undefined) {

packages/superdough/superdough.mjs

@@ -7,50 +7,25 @@ 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 { clamp, nanFallback, _mod, cycleToSeconds, pickAndRename } from './util.mjs';
+import { nanFallback, _mod, cycleToSeconds } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { getNodeFromPool, isPoolable, releaseNodeToPool } from './nodePools.mjs';
-import {
-  createFilter,
-  effectSend,
-  gainNode,
-  getCompressor,
-  getDistortion,
-  getFrequencyFromValue,
-  getLfo,
-  getWorklet,
-  releaseAudioNode,
-  webAudioTimeout,
-} from './helpers.mjs';
+import { createFilter, gainNode, getCompressor, getDistortion, getLfo, getWorklet, effectSend } from './helpers.mjs';
 import { map } from 'nanostores';
 import { logger } from './logger.mjs';
-import { connectLFO, connectEnvelope, connectBusModulator } from './modulators.mjs';
 import { loadBuffer } from './sampler.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import { SuperdoughAudioController } from './superdoughoutput.mjs';
-import { resetSeenKeys } from './wavetable.mjs';
 
 export const DEFAULT_MAX_POLYPHONY = 128;
 const DEFAULT_AUDIO_DEVICE_NAME = 'System Standard';
 
-export let maxPolyphony = DEFAULT_MAX_POLYPHONY;
+let maxPolyphony = DEFAULT_MAX_POLYPHONY;
 
-/**
- * Set the max polyphony. If notes are ringing out via `release` then they will
- * start to die out in first-in-first-out order once the max polyphony has been hit
- *
- * @name setMaxPolyphony
- * @param {number} Max polyphony. Defaults to 128
- * @example
- * setMaxPolyphony(4)
- * n(irand(24).seg(8)).scale("C#3:minor").room(1).release(4).gain(0.5)
- *
- */
 export function setMaxPolyphony(polyphony) {
   maxPolyphony = parseInt(polyphony) ?? DEFAULT_MAX_POLYPHONY;
 }
 
-export let multiChannelOrbits = false;
+let multiChannelOrbits = false;
 export function setMultiChannelOrbits(bool) {
   multiChannelOrbits = bool == true;
 }
@@ -68,17 +43,6 @@ export function applyGainCurve(val) {
   return gainCurveFunc(val);
 }
 
-/**
- * Apply a function to all gains provided in patterns. Can be used to rescale gain to be
- * quadratic, exponential, etc. rather than linear
- *
- * @name setGainCurve
- * @param {Function} function to apply to all gain values
- * @example
- * setGainCurve((x) => x * x) // quadratic gain
- * s("bd*4").gain(0.5) // equivalent to 0.25 gain normally
- *
- */
 export function setGainCurve(newGainCurveFunc) {
   gainCurveFunc = newGainCurveFunc;
 }
@@ -182,13 +146,17 @@ 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,
   distortvol: 1,
   distorttype: 0,
   delay: 0,
-  busgain: 1,
   byteBeatExpression: '0',
   delayfeedback: 0.5,
   delaysync: 3 / 16,
@@ -196,9 +164,6 @@ let defaultDefaultValues = {
   i: 1,
   velocity: 1,
   fft: 8,
-  tremolodepth: 1,
-  tremolophase: 0,
-  release: 0.01,
 };
 
 const defaultDefaultDefaultValues = Object.freeze({ ...defaultDefaultValues });
@@ -243,13 +208,11 @@ export function registerWorklet(url) {
 }
 
 let workletsLoading;
-export function loadWorklets() {
+function loadWorklets() {
   if (!workletsLoading) {
     const audioCtx = getAudioContext();
     const allWorkletURLs = externalWorklets.concat([workletsUrl]);
-    workletsLoading = Promise.all(allWorkletURLs.map((workletURL) => audioCtx.audioWorklet.addModule(workletURL))).then(
-      () => (workletsLoading = undefined),
-    );
+    workletsLoading = Promise.all(allWorkletURLs.map((workletURL) => audioCtx.audioWorklet.addModule(workletURL)));
   }
 
   return workletsLoading;
@@ -266,7 +229,6 @@ export async function initAudio(options = {}) {
 
   setMaxPolyphony(maxPolyphony);
   setMultiChannelOrbits(multiChannelOrbits);
-  resetSeenKeys();
   if (typeof window === 'undefined') {
     return;
   }
@@ -288,9 +250,8 @@ export async function initAudio(options = {}) {
       logger('[superdough] failed to set audio interface', 'warning');
     }
   }
-  if ((!audioCtx) instanceof OfflineAudioContext) {
-    await audioCtx.resume();
-  }
+
+  await audioCtx.resume();
   if (disableWorklets) {
     logger('[superdough]: AudioWorklets disabled with disableWorklets');
     return;
@@ -307,8 +268,8 @@ let audioReady;
 export async function initAudioOnFirstClick(options) {
   if (!audioReady) {
     audioReady = new Promise((resolve) => {
-      document.addEventListener('mousedown', async function listener() {
-        document.removeEventListener('mousedown', listener);
+      document.addEventListener('click', async function listener() {
+        document.removeEventListener('click', listener);
         await initAudio(options);
         resolve();
       });
@@ -318,43 +279,40 @@ export async function initAudioOnFirstClick(options) {
 }
 
 let controller;
-export function getSuperdoughAudioController() {
+function getSuperdoughAudioController() {
   if (controller == null) {
     controller = new SuperdoughAudioController(getAudioContext());
   }
   return controller;
 }
-
-export function setSuperdoughAudioController(newController) {
-  controller = newController;
-  return controller;
-}
-
 export function connectToDestination(input, channels) {
   const controller = getSuperdoughAudioController();
   controller.output.connectToDestination(input, channels);
 }
 
-function getPhaser(begin, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
+function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
   const ac = getAudioContext();
-  const lfo = getLfo(ac, { frequency, depth: sweep * 2, begin, end });
+  const lfoGain = getLfo(ac, time, end, { frequency, depth: sweep * 2 });
 
   //filters
-  const numStages = 1; //num of filters in series
-  let fOffset = 282; //for backward compat in #1800
+  const numStages = 2; //num of filters in series
+  let fOffset = 0;
   const filterChain = [];
   for (let i = 0; i < numStages; i++) {
-    const filter = getNodeFromPool('filter', () => ac.createBiquadFilter());
+    const filter = ac.createBiquadFilter();
     filter.type = 'notch';
     filter.gain.value = 1;
     filter.frequency.value = centerFrequency + fOffset;
     filter.Q.value = 2 - Math.min(Math.max(depth * 2, 0), 1.9);
 
-    lfo.connect(filter.detune);
+    lfoGain.connect(filter.detune);
     fOffset += 282;
+    if (i > 0) {
+      filterChain[i - 1].connect(filter);
+    }
     filterChain.push(filter);
   }
-  return { filterChain, lfo };
+  return filterChain[filterChain.length - 1];
 }
 
 function getFilterType(ftype) {
@@ -367,7 +325,7 @@ export let analysers = {},
   analysersData = {};
 
 export function getAnalyserById(id, fftSize = 1024, smoothingTimeConstant = 0.5) {
-  if (!analysers[id] || analysers[id].context != getAudioContext()) {
+  if (!analysers[id]) {
     // make sure this doesn't happen too often as it piles up garbage
     const analyserNode = getAudioContext().createAnalyser();
     analyserNode.fftSize = fftSize;
@@ -408,37 +366,7 @@ function mapChannelNumbers(channels) {
   return (Array.isArray(channels) ? channels : [channels]).map((ch) => ch - 1);
 }
 
-class Chain {
-  constructor() {
-    this.audioNodes = [];
-    this.tails = [];
-  }
-  connect(...nodes) {
-    nodes.forEach((node) => {
-      this.tails.forEach((tail) => {
-        tail.connect(node);
-      });
-    });
-    this.tails = nodes;
-    this.audioNodes.push(...nodes);
-    return this;
-  }
-  connectOne(idx, node) {
-    this.tails[idx].connect(node);
-    this.tails[idx] = node;
-    this.audioNodes.push(node);
-    return this;
-  }
-  releaseNodes() {
-    this.audioNodes.forEach((n) => (isPoolable(n) ? releaseNodeToPool(n) : releaseAudioNode(n)));
-    this.audioNodes = [];
-    this.tails = [];
-  }
-}
-
 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: {} };
   // new: t is always expected to be the absolute target onset time
   const ac = getAudioContext();
   const audioController = getSuperdoughAudioController();
@@ -459,6 +387,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   // duration is passed as value too..
   value.duration = hapDuration;
   // calculate absolute time
+
   if (t < ac.currentTime) {
     console.warn(
       `[superdough]: cannot schedule sounds in the past (target: ${t.toFixed(2)}, now: ${ac.currentTime.toFixed(2)})`,
@@ -467,24 +396,74 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   }
   // destructure
   let {
+    tremolo,
+    tremolosync,
+    tremolodepth = 1,
+    tremoloskew,
+    tremolophase = 0,
+    tremoloshape,
     s = getDefaultValue('s'),
     bank,
     source,
+    gain = getDefaultValue('gain'),
     postgain = getDefaultValue('postgain'),
+    density = getDefaultValue('density'),
     duckorbit,
     duckonset,
     duckattack,
     duckdepth,
     djf,
-    release = getDefaultValue('release'),
+    // 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,
+    phaserdepth = getDefaultValue('phaserdepth'),
+    phasersweep,
+    phasercenter,
+    //
+    coarse,
+
+    crush,
     dry,
+    shape,
+    shapevol = getDefaultValue('shapevol'),
+    distort,
+    distortvol = getDefaultValue('distortvol'),
+    distorttype = getDefaultValue('distorttype'),
+    pan,
+    vowel,
     delay = getDefaultValue('delay'),
     delayfeedback = getDefaultValue('delayfeedback'),
     delaysync = getDefaultValue('delaysync'),
     delaytime,
     orbit = getDefaultValue('orbit'),
-    bus,
-    busgain = getDefaultValue('busgain'),
     room,
     roomfade,
     roomlp,
@@ -494,10 +473,14 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     irspeed,
     irbegin,
     i = getDefaultValue('i'),
+    velocity = getDefaultValue('velocity'),
     analyze, // analyser wet
     fft = getDefaultValue('fft'), // fftSize 0 - 10
-    FX = [],
-    FXrelease,
+    compressor: compressorThreshold,
+    compressorRatio,
+    compressorKnee,
+    compressorAttack,
+    compressorRelease,
   } = value;
 
   delaytime = delaytime ?? cycleToSeconds(delaysync, cps);
@@ -512,19 +495,23 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     audioController.duck(duckorbit, t, duckonset, duckattack, duckdepth);
   }
 
+  gain = applyGainCurve(nanFallback(gain, 1));
   postgain = applyGainCurve(postgain);
+  shapevol = applyGainCurve(shapevol);
+  distortvol = applyGainCurve(distortvol);
   delay = applyGainCurve(delay);
-  busgain = applyGainCurve(busgain);
+  velocity = applyGainCurve(velocity);
+  tremolodepth = applyGainCurve(tremolodepth);
+  gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
 
   const end = t + hapDuration;
-  const fullRelease = Math.max(release, FXrelease ?? 0);
-  const endWithRelease = end + fullRelease;
+  const endWithRelease = end + release;
   const chainID = Math.round(Math.random() * 1000000);
 
   // 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].deref();
+    const source = ch.value[1];
     const chainID = ch.value[0];
     const endTime = t + 0.25;
     source?.node?.gain?.linearRampToValueAtTime(0, endTime);
@@ -532,6 +519,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     activeSoundSources.delete(chainID);
   }
 
+  let audioNodes = [];
+
   if (['-', '~', '_'].includes(s)) {
     return;
   }
@@ -540,33 +529,21 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     value.s = s;
   }
 
-  const chain = new Chain(); // connection manager which tracks audio nodes for releasing
-
   // get source AudioNode
   let sourceNode;
   if (source) {
     sourceNode = source(t, value, hapDuration, cps);
-    nodes.main['source'] = [sourceNode];
   } else if (getSound(s)) {
     const { onTrigger } = getSound(s);
-
-    const onEnded = () =>
-      webAudioTimeout(
-        ac,
-        () => {
-          chain.releaseNodes();
-          activeSoundSources.delete(chainID);
-        },
-        0,
-        endWithRelease,
-      );
-
+    const onEnded = () => {
+      audioNodes.forEach((n) => n?.disconnect());
+      activeSoundSources.delete(chainID);
+    };
     const soundHandle = await onTrigger(t, value, onEnded, cps);
 
     if (soundHandle) {
       sourceNode = soundHandle.node;
-      activeSoundSources.set(chainID, new WeakRef(soundHandle)); // allow GC
-      nodes.main = { ...nodes.main, ...soundHandle.nodes };
+      activeSoundSources.set(chainID, soundHandle);
     }
   } else {
     throw new Error(`sound ${s} not found! Is it loaded?`);
@@ -581,358 +558,140 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     logger('[webaudio] skip hap: still loading', ac.currentTime - t);
     return;
   }
+  const chain = []; // audio nodes that will be connected to each other sequentially
+  chain.push(sourceNode);
+  stretch !== undefined && chain.push(getWorklet(ac, 'phase-vocoder-processor', { pitchFactor: stretch }));
 
-  chain.connect(sourceNode);
+  // gain stage
+  chain.push(gainNode(gain));
 
-  FX = [...FX, value]; // run through the FX chain and then run through all FX outside of it as well
-  for (let [idx, fx] of Object.entries(FX)) {
-    const key = idx == FX.length - 1 ? 'main' : idx;
-    nodes[key] ??= {};
-    const fxNodes = nodes[key];
-    let {
-      gain = getDefaultValue('gain'),
-      velocity = getDefaultValue('velocity'),
-      shapevol = getDefaultValue('shapevol'),
-      distorttype = getDefaultValue('distorttype'),
-      distortvol = getDefaultValue('distortvol'),
-      tremolodepth = getDefaultValue('tremolodepth'),
-      phaserdepth = getDefaultValue('phaserdepth'),
-      delay = getDefaultValue('delay'),
-      delayfeedback = getDefaultValue('delayfeedback'),
-      delaysync = getDefaultValue('delaysync'),
-      delaytime,
-      i = getDefaultValue('i'),
-    } = fx;
-    gain = applyGainCurve(nanFallback(gain, 1));
-    shapevol = applyGainCurve(shapevol);
-    distortvol = applyGainCurve(distortvol);
-    velocity = applyGainCurve(velocity);
-    tremolodepth = applyGainCurve(tremolodepth);
-    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 });
-    }
-
-    if (fx.stretch !== undefined) {
-      const phaseVocoder = getWorklet(ac, 'phase-vocoder-processor', { pitchFactor: fx.stretch });
-      chain.connect(phaseVocoder);
-      fxNodes['stretch'] = [phaseVocoder];
-    }
-
-    if (fx.transient !== undefined) {
-      const transProcessor = getWorklet(
+  //filter
+  const ftype = getFilterType(value.ftype);
+  if (cutoff !== undefined) {
+    let lp = () =>
+      createFilter(
         ac,
-        'transient-processor',
-        {},
-        {
-          processorOptions: {
-            attack: fx.transient,
-            sustain: fx.transsustain,
-            begin: t,
-            end: endWithRelease,
-          },
-        },
-      );
-      chain.connect(transProcessor);
-      fxNodes['transient'] = transProcessor;
-    }
-
-    // gain stage
-    const initialGain = gainNode(gain);
-    fxNodes['gain'] = [initialGain];
-    chain.connect(initialGain);
-
-    // filter
-    const ftype = getFilterType(value.ftype);
-
-    const filt = (params) => createFilter(ac, t, end, params, cps, cycle);
-    if (fx.cutoff !== undefined) {
-      const lpMap = {
-        frequency: 'cutoff',
-        q: 'resonance',
-        attack: 'lpattack',
-        decay: 'lpdecay',
-        sustain: 'lpsustain',
-        release: 'lprelease',
-        env: 'lpenv',
-        anchor: 'fanchor',
-        model: 'ftype',
-        drive: 'drive',
-        rate: 'lprate',
-        sync: 'lpsync',
-        depth: 'lpdepth',
-        depthfrequency: 'lpdepthfrequency',
-        shape: 'lpshape',
-        dcoffset: 'lpdc',
-        skew: 'lpskew',
-      };
-      const lpParams = pickAndRename(fx, lpMap);
-      lpParams.type = 'lowpass';
-      const { filter: lpf1, lfo: lfo1 } = filt(lpParams);
-      fxNodes['lpf'] = [lpf1];
-      fxNodes['lpf_lfo'] = [lfo1];
-      chain.connect(lpf1);
-      lfo1 && chain.audioNodes.push(lfo1);
-      if (ftype === '24db') {
-        const { filter: lpf2, lfo: lfo2 } = filt(lpParams);
-        fxNodes['lpf'].push(lpf2);
-        fxNodes['lpf_lfo'].push(lfo2);
-        chain.connect(lpf2);
-        lfo2 && chain.audioNodes.push(lfo2);
-      }
-    }
-
-    if (fx.hcutoff !== undefined) {
-      const hpMap = {
-        frequency: 'hcutoff',
-        q: 'hresonance',
-        attack: 'hpattack',
-        decay: 'hpdecay',
-        sustain: 'hpsustain',
-        release: 'hprelease',
-        env: 'hpenv',
-        anchor: 'fanchor',
-        model: 'ftype',
-        drive: 'drive',
-        rate: 'hprate',
-        sync: 'hpsync',
-        depth: 'hpdepth',
-        depthfrequency: 'hpdepthfrequency',
-        shape: 'hpshape',
-        dcoffset: 'hpdc',
-        skew: 'hpskew',
-      };
-      const hpParams = pickAndRename(fx, hpMap);
-      hpParams.type = 'highpass';
-      const { filter: hpf1, lfo: lfo1 } = filt(hpParams);
-      fxNodes['hpf'] = [hpf1];
-      fxNodes['hpf_lfo'] = [lfo1];
-      lfo1 && chain.audioNodes.push(lfo1);
-      chain.connect(hpf1);
-      if (ftype === '24db') {
-        const { filter: hpf2, lfo: lfo2 } = filt(hpParams);
-        fxNodes['hpf'].push(hpf2);
-        fxNodes['hpf_lfo'].push(lfo2);
-        chain.connect(hpf2);
-        lfo2 && chain.audioNodes.push(lfo2);
-      }
-    }
-
-    if (fx.bandf !== undefined) {
-      const bpMap = {
-        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',
-        depthfrequency: 'bpdepthfrequency',
-        shape: 'bpshape',
-        dcoffset: 'bpdc',
-        skew: 'bpskew',
-      };
-      const bpParams = pickAndRename(fx, bpMap);
-      bpParams.type = 'bandpass';
-      const { filter: bpf1, lfo: lfo1 } = filt(bpParams);
-      fxNodes['bpf'] = [bpf1];
-      fxNodes['bpf_lfo'] = [lfo1];
-      chain.connect(bpf1);
-      lfo1 && chain.audioNodes.push(lfo1);
-      if (ftype === '24db') {
-        const { filter: bpf2, lfo: lfo2 } = filt(bpParams);
-        fxNodes['bpf'].push(bpf2);
-        fxNodes['bpf_lfo'].push(lfo2);
-        chain.connect(bpf2);
-        lfo2 && chain.audioNodes.push(lfo2);
-      }
-    }
-
-    if (fx.vowel !== undefined) {
-      const vowelNode = ac.createVowelFilter(fx.vowel);
-      fxNodes['vowel'] = vowelNode.filters;
-      chain.connect(vowelNode);
-    }
-
-    // effects
-    if (fx.coarse !== undefined) {
-      const coarseNode = getWorklet(ac, 'coarse-processor', { coarse: fx.coarse });
-      fxNodes['coarse'] = [coarseNode];
-      chain.connect(coarseNode);
-    }
-    if (fx.crush !== undefined) {
-      const crushNode = getWorklet(ac, 'crush-processor', { crush: fx.crush });
-      fxNodes['crush'] = [crushNode];
-      chain.connect(crushNode);
-    }
-    if (fx.shape !== undefined) {
-      const shapeNode = getWorklet(ac, 'shape-processor', { shape: fx.shape, postgain: shapevol });
-      fxNodes['shape'] = [shapeNode];
-      chain.connect(shapeNode);
-    }
-    if (fx.distort !== undefined) {
-      const distortNode = getDistortion(fx.distort, distortvol, distorttype);
-      fxNodes['distort'] = [distortNode];
-      chain.connect(distortNode);
-    }
-
-    let tremolo = fx.tremolo;
-    if (fx.tremolosync != null) {
-      tremolo = cps * fx.tremolosync;
-    }
-
-    if (tremolo !== undefined) {
-      // Allow clipping of modulator for more dynamic possiblities, and to prevent speaker overload
-      // EX:  a triangle waveform will clip like this /-\ when the depth is above 1
-      const gain = Math.max(1 - tremolodepth, 0);
-      const amGain = new GainNode(ac, { gain });
-
-      const time = cycle / cps;
-      const lfo = getLfo(ac, {
-        skew: fx.tremoloskew ?? (fx.tremoloshape != null ? 0.5 : 1),
-        frequency: tremolo,
-        depth: tremolodepth,
-        time,
-        dcoffset: 0,
-        shape: fx.tremoloshape,
-        phaseoffset: fx.tremolophase,
-        min: 0,
-        max: 1,
-        curve: 1.5,
-        begin: t,
-        end: endWithRelease,
-      });
-      fxNodes['tremolo'] = [lfo];
-      fxNodes['tremolo_gain'] = [amGain];
-      lfo.connect(amGain.gain);
-      chain.audioNodes.push(lfo);
-      chain.connect(amGain);
-    }
-
-    if (fx.compressor !== undefined) {
-      const compressorNode = getCompressor(
-        ac,
-        fx.compressor,
-        fx.compressorRatio,
-        fx.compressorKnee,
-        fx.compressorAttack,
-        fx.compressorRelease,
-      );
-      fxNodes['compressor'] = [compressorNode];
-      chain.connect(compressorNode);
-    }
-
-    // panning
-    if (fx.pan !== undefined) {
-      const panner = ac.createStereoPanner();
-      fxNodes['pan'] = [panner];
-      panner.pan.value = 2 * fx.pan - 1;
-      chain.connect(panner);
-    }
-    // phaser
-    if (fx.phaserrate !== undefined && phaserdepth > 0) {
-      const { filterChain, lfo } = getPhaser(
+        'lowpass',
+        cutoff,
+        resonance,
+        lpattack,
+        lpdecay,
+        lpsustain,
+        lprelease,
+        lpenv,
         t,
-        endWithRelease,
-        fx.phaserrate,
-        phaserdepth,
-        fx.phasercenter,
-        fx.phasersweep,
+        end,
+        fanchor,
+        ftype,
+        drive,
       );
-      fxNodes['phaser'] = [...filterChain];
-      fxNodes['phaser_lfo'] = [lfo];
-      filterChain.forEach((f) => chain.connect(f));
-      chain.audioNodes.push(lfo);
-    }
-    // delay
-    if (key !== 'main' && delay > 0 && delaytime > 0 && delayfeedback > 0) {
-      const dry = gainNode(1);
-      delayfeedback = clamp(delayfeedback, 0, 0.98);
-      const delayNode = ac.createFeedbackDelay(1, delaytime, delayfeedback);
-      const wetDelay = gainNode(delay);
-      const dryDelay = gainNode(fx.dry ?? 1);
-      const sum = new GainNode(ac, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
-      chain
-        .connect(dry)
-        .connect(dryDelay, delayNode)
-        .connectOne(1, wetDelay) // connect delayNode -> wetDelay
-        .connect(sum);
-      chain.audioNodes.push(delayNode.feedbackGain, delayNode.delayGain);
-      fxNodes['delay'] = [delayNode];
-      fxNodes['delay_mix'] = [wetDelay];
-    }
-    // reverb
-    if (key !== 'main' && fx.room > 0) {
-      let roomIR;
-      if (fx.ir !== undefined) {
-        let url;
-        let sample = getSound(fx.ir);
-        if (Array.isArray(sample)) {
-          url = sample.data.samples[fx.i % sample.data.samples.length];
-        } else if (typeof sample === 'object') {
-          url = Object.values(sample.data.samples).flat()[i % Object.values(sample.data.samples).length];
-        }
-        roomIR = await loadBuffer(url, ac, fx.ir, 0);
-      }
-      const dry = gainNode(1);
-      const reverbNode = ac.createReverb(
-        fx.roomsize,
-        fx.roomfade,
-        fx.roomlp,
-        fx.roomdim,
-        roomIR,
-        fx.irspeed,
-        fx.irbegin,
-      );
-      const wetReverb = gainNode(fx.room);
-      const dryReverb = gainNode(fx.dry ?? 1);
-      const sum = new GainNode(ac, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
-      chain
-        .connect(dry)
-        .connect(dryReverb, reverbNode)
-        .connectOne(1, wetReverb) // connect reverbNode -> wetReverb
-        .connect(sum);
-      fxNodes['room'] = [reverbNode];
-      fxNodes['room_mix'] = [wetReverb];
+    chain.push(lp());
+    if (ftype === '24db') {
+      chain.push(lp());
     }
   }
 
-  if (FXrelease !== undefined && FXrelease > release) {
-    const releaseNode = gainNode(1);
-    releaseNode.gain.setValueAtTime(1, end + release);
-    releaseNode.gain.linearRampToValueAtTime(0, endWithRelease);
-    chain.connect(releaseNode);
+  if (hcutoff !== undefined) {
+    let hp = () =>
+      createFilter(
+        ac,
+        'highpass',
+        hcutoff,
+        hresonance,
+        hpattack,
+        hpdecay,
+        hpsustain,
+        hprelease,
+        hpenv,
+        t,
+        end,
+        fanchor,
+      );
+    chain.push(hp());
+    if (ftype === '24db') {
+      chain.push(hp());
+    }
+  }
+
+  if (bandf !== undefined) {
+    let bp = () =>
+      createFilter(ac, 'bandpass', bandf, bandq, bpattack, bpdecay, bpsustain, bprelease, bpenv, t, end, fanchor);
+    chain.push(bp());
+    if (ftype === '24db') {
+      chain.push(bp());
+    }
+  }
+
+  if (vowel !== undefined) {
+    const vowelFilter = ac.createVowelFilter(vowel);
+    chain.push(vowelFilter);
+  }
+
+  // effects
+  coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse }));
+  crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
+  distort !== undefined && chain.push(getDistortion(distort, distortvol, distorttype));
+
+  if (tremolosync != null) {
+    tremolo = cps * tremolosync;
+  }
+
+  if (value.wtPosSynced != null) {
+    value.wtPosRate /= cps;
+  }
+
+  if (value.wtWarpSynced != null) {
+    value.wtWarpRate /= cps;
+  }
+
+  if (tremolo !== undefined) {
+    // Allow clipping of modulator for more dynamic possiblities, and to prevent speaker overload
+    // EX:  a triangle waveform will clip like this /-\ when the depth is above 1
+    const gain = Math.max(1 - tremolodepth, 0);
+    const amGain = new GainNode(ac, { gain });
+
+    const time = cycle / cps;
+    const lfo = getLfo(ac, t, endWithRelease, {
+      skew: tremoloskew ?? (tremoloshape != null ? 0.5 : 1),
+      frequency: tremolo,
+      depth: tremolodepth,
+      time,
+      dcoffset: 0,
+      shape: tremoloshape,
+      phaseoffset: tremolophase,
+      min: 0,
+      max: 1,
+      curve: 1.5,
+    });
+    lfo.connect(amGain.gain);
+    chain.push(amGain);
+  }
+
+  compressorThreshold !== undefined &&
+    chain.push(
+      getCompressor(ac, compressorThreshold, compressorRatio, compressorKnee, compressorAttack, compressorRelease),
+    );
+
+  // panning
+  if (pan !== undefined) {
+    const panner = ac.createStereoPanner();
+    panner.pan.value = 2 * pan - 1;
+    chain.push(panner);
+  }
+  // phaser
+  if (phaser !== undefined && phaserdepth > 0) {
+    const phaserFX = getPhaser(t, endWithRelease, phaser, phaserdepth, phasercenter, phasersweep);
+    chain.push(phaserFX);
   }
 
   // last gain
   const post = new GainNode(ac, { gain: postgain });
-  nodes.main['post'] = [post];
-  chain.connect(post);
+  chain.push(post);
 
   // delay
   if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
-    const delayNode = orbitBus.getDelay(delaytime, delayfeedback, t);
-    nodes.main['delay'] = [delayNode];
-    const delaySend = orbitBus.sendDelay(post, delay);
-    nodes.main['delay_mix'] = [delaySend];
-    chain.audioNodes.push(delaySend);
+    orbitBus.getDelay(delaytime, delayfeedback, t);
+    orbitBus.sendDelay(post, delay);
   }
   // reverb
   if (room > 0) {
@@ -947,84 +706,32 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
       }
       roomIR = await loadBuffer(url, ac, ir, 0);
     }
-    const roomNode = orbitBus.getReverb(roomsize, roomfade, roomlp, roomdim, roomIR, irspeed, irbegin);
-    nodes.main['room'] = [roomNode];
-    const reverbSend = orbitBus.sendReverb(post, room);
-    nodes.main['room_mix'] = [reverbSend];
-    chain.audioNodes.push(reverbSend);
-  }
-  if (bus != null) {
-    const busNode = audioController.getBus(bus);
-    const busSend = effectSend(post, busNode, busgain);
-    chain.audioNodes.push(busSend);
+    orbitBus.getReverb(roomsize, roomfade, roomlp, roomdim, roomIR, irspeed, irbegin);
+    orbitBus.sendReverb(post, room);
   }
 
   if (djf != null) {
-    const djfNode = orbitBus.getDjf(djf, t);
-    nodes.main['djf'] = [djfNode];
+    orbitBus.getDjf(djf, t);
   }
 
   // analyser
-  if (analyze && !(ac instanceof OfflineAudioContext)) {
+  if (analyze) {
     const analyserNode = getAnalyserById(analyze, 2 ** (fft + 5));
     const analyserSend = effectSend(post, analyserNode, 1);
-    chain.audioNodes.push(analyserSend);
+    audioNodes.push(analyserSend);
   }
   if (dry != null) {
     dry = applyGainCurve(dry);
     const dryGain = new GainNode(ac, { gain: dry });
-    chain.connect(dryGain);
+    chain.push(dryGain);
     orbitBus.connectToOutput(dryGain);
   } else {
     orbitBus.connectToOutput(post);
   }
 
-  // finally, now that `nodes` is populated, set up modulators
-  FX.forEach((fx, idx) => {
-    const key = idx === FX.length - 1 ? 'main' : idx;
-    if (fx.lfo) {
-      for (const id of fx.lfo.__ids) {
-        const params = fx.lfo[id];
-        params.fxi ??= key;
-        const lfo = connectLFO(
-          id,
-          {
-            ...params,
-            cps,
-            cycle,
-            begin: t,
-            end: endWithRelease,
-          },
-          nodes,
-        );
-        lfo && chain.audioNodes.push(lfo);
-      }
-    }
-    if (fx.env) {
-      for (const id of fx.env.__ids) {
-        const params = fx.env[id];
-        params.fxi ??= key;
-        const env = connectEnvelope(
-          id,
-          {
-            ...params,
-            begin: t,
-            end: endWithRelease,
-          },
-          nodes,
-        );
-        env && chain.audioNodes.push(env);
-      }
-    }
-    if (fx.bmod) {
-      for (const id of fx.bmod.__ids) {
-        const params = fx.bmod[id];
-        params.fxi ??= key;
-        const { toCleanup } = connectBusModulator({ ...params, begin: t, end: endWithRelease }, nodes, controller);
-        chain.audioNodes.push(...toCleanup);
-      }
-    }
-  });
+  // connect chain elements together
+  chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);
+  audioNodes = audioNodes.concat(chain);
 };
 
 export const superdoughTrigger = (t, hap, ct, cps) => {

packages/superdough/superdoughdata.mjs

@@ -1,150 +0,0 @@
-/*
-superdoughdata.mjs - Data needed for running superdough (defaults, mappings, etc.)
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/superdough/superdoughdata.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-// Mapping from control name to webaudio node and parameter
-const CONTROL_TARGETS = {
-  stretch: { node: 'stretch', param: 'pitchFactor' },
-  gain: { node: 'gain', param: 'gain' },
-  postgain: { node: 'post', param: 'gain' },
-  pan: { node: 'pan', param: 'pan' },
-  tremolo: { node: 'tremolo', param: 'frequency' },
-  tremolosync: { node: 'tremolo', param: 'frequency' },
-  tremolodepth: { node: 'tremolo_gain', param: 'gain' },
-  tremoloskew: { node: 'tremolo', param: 'skew' },
-  tremolophase: { node: 'tremolo', param: 'phase' },
-  tremoloshape: { node: 'tremolo', param: 'shape' },
-
-  // MODULATORS
-  lfo: { node: 'lfo', param: 'frequency' },
-  lfo_rate: { node: 'lfo', param: 'frequency' },
-  lfo_sync: { node: 'lfo', param: 'frequency' },
-  lfo_depth: { node: 'lfo', param: 'depth' },
-  lfo_depthabs: { node: 'lfo', param: 'depth' },
-  lfo_skew: { node: 'lfo', param: 'skew' },
-  lfo_curve: { node: 'lfo', param: 'curve' },
-  lfo_dcoffset: { node: 'lfo', param: 'dcoffset' },
-  env: { node: 'env', param: 'depth' },
-  env_attack: { node: 'env', param: 'attack' },
-  env_decay: { node: 'env', param: 'decay' },
-  env_sustain: { node: 'env', param: 'sustain' },
-  env_release: { node: 'env', param: 'release' },
-  bmod: { node: 'bmod', param: 'depth' },
-  bmod_depth: { node: 'bmod', param: 'depth' },
-  bmod_depthabs: { node: 'bmod', param: 'depth' },
-
-  // LPF
-  cutoff: { node: 'lpf', param: 'frequency' },
-  resonance: { node: 'lpf', param: 'Q' },
-  lprate: { node: 'lpf_lfo', param: 'rate' },
-  lpsync: { node: 'lpf_lfo', param: 'sync' },
-  lpdepth: { node: 'lpf_lfo', param: 'depth' },
-  lpdepthfrequency: { node: 'lpf_lfo', param: 'depth' },
-  lpshape: { node: 'lpf_lfo', param: 'shape' },
-  lpdc: { node: 'lpf_lfo', param: 'dcoffset' },
-  lpskew: { node: 'lpf_lfo', param: 'skew' },
-
-  // HPF
-  hcutoff: { node: 'hpf', param: 'frequency' },
-  hresonance: { node: 'hpf', param: 'Q' },
-  hprate: { node: 'hpf_lfo', param: 'rate' },
-  hpsync: { node: 'hpf_lfo', param: 'sync' },
-  hpdepth: { node: 'hpf_lfo', param: 'depth' },
-  hpdepthfrequency: { node: 'hpf_lfo', param: 'depth' },
-  hpshape: { node: 'hpf_lfo', param: 'shape' },
-  hpdc: { node: 'hpf_lfo', param: 'dcoffset' },
-  hpskew: { node: 'hpf_lfo', param: 'skew' },
-
-  // BPF
-  bandf: { node: 'bpf', param: 'frequency' },
-  bandq: { node: 'bpf', param: 'Q' },
-  bprate: { node: 'bpf_lfo', param: 'rate' },
-  bpsync: { node: 'bpf_lfo', param: 'sync' },
-  bpdepth: { node: 'bpf_lfo', param: 'depth' },
-  bpdepthfrequency: { node: 'bpf_lfo', param: 'depth' },
-  bpshape: { node: 'bpf_lfo', param: 'shape' },
-  bpdc: { node: 'bpf_lfo', param: 'dcoffset' },
-  bpskew: { node: 'bpf_lfo', param: 'skew' },
-
-  vowel: { node: 'vowel', param: 'frequency' },
-
-  // DISTORTION
-  coarse: { node: 'coarse', param: 'coarse' },
-  crush: { node: 'crush', param: 'crush' },
-  shape: { node: 'shape', param: 'shape' },
-  shapevol: { node: 'shape', param: 'postgain' },
-  distort: { node: 'distort', param: 'distort' },
-  distortvol: { node: 'distort', param: 'postgain' },
-  distorttype: { node: 'distort', param: 'distort' },
-
-  // COMPRESSOR
-  compressor: { node: 'compressor', param: 'threshold' },
-  compressorRatio: { node: 'compressor', param: 'ratio' },
-  compressorKnee: { node: 'compressor', param: 'knee' },
-  compressorAttack: { node: 'compressor', param: 'attack' },
-  compressorRelease: { node: 'compressor', param: 'release' },
-
-  // PHASER
-  phaserrate: { node: 'phaser_lfo', param: 'frequency' },
-  phasersweep: { node: 'phaser_lfo', param: 'depth' },
-  phasercenter: { node: 'phaser', param: 'frequency' },
-  phaserdepth: { node: 'phaser', param: 'Q' },
-
-  // ORBIT EFFECTS
-  delay: { node: 'delay_mix', param: 'gain' },
-  delaytime: { node: 'delay', param: 'delayTime' },
-  delayfeedback: { node: 'delay', param: 'feedback' },
-  delaysync: { node: 'delay', param: 'delayTime' },
-  dry: { node: 'dry', param: 'gain' },
-  room: { node: 'room_mix', param: 'gain' },
-  djf: { node: 'djf', param: 'value' },
-  busgain: { node: 'bus', param: 'gain' },
-
-  // SYNTHS
-  s: { node: 'source', param: 'frequency' },
-  detune: { node: 'source', param: 'freqspread' },
-  wt: { node: 'source', param: 'position' },
-  warp: { node: 'source', param: 'warp' },
-  freq: { node: 'source', param: 'frequency' },
-  note: { node: 'source', param: 'frequency' },
-  wtdc: { node: 'wt_lfo', param: 'dc' },
-  wtskew: { node: 'wt_lfo', param: 'skew' },
-  wtrate: { node: 'wt_lfo', param: 'frequency' },
-  wtsync: { node: 'wt_lfo', param: 'frequency' },
-  wtdepth: { node: 'wt_lfo', param: 'depth' },
-  warpdc: { node: 'warp_lfo', param: 'dc' },
-  warpskew: { node: 'warp_lfo', param: 'skew' },
-  warprate: { node: 'warp_lfo', param: 'frequency' },
-  warpsync: { node: 'warp_lfo', param: 'frequency' },
-  warpdepth: { node: 'warp_lfo', param: 'depth' },
-  fmi: { node: 'fm_1_gain', param: 'gain' },
-  fmi2: { node: 'fm_2_gain', param: 'gain' },
-  fmi3: { node: 'fm_3_gain', param: 'gain' },
-  fmi4: { node: 'fm_4_gain', param: 'gain' },
-  fmi5: { node: 'fm_5_gain', param: 'gain' },
-  fmi6: { node: 'fm_6_gain', param: 'gain' },
-  fmi7: { node: 'fm_7_gain', param: 'gain' },
-  fmi8: { node: 'fm_8_gain', param: 'gain' },
-  fmh: { node: 'fm_1', param: 'frequency' },
-  fmh2: { node: 'fm_2', param: 'frequency' },
-  fmh3: { node: 'fm_3', param: 'frequency' },
-  fmh4: { node: 'fm_4', param: 'frequency' },
-  fmh5: { node: 'fm_5', param: 'frequency' },
-  fmh6: { node: 'fm_6', param: 'frequency' },
-  fmh7: { node: 'fm_7', param: 'frequency' },
-  fmh8: { node: 'fm_8', param: 'frequency' },
-  pw: { node: 'source', param: 'pulsewidth' },
-  pwrate: { node: 'pw_lfo', param: 'frequency' },
-  pwsweep: { node: 'pw_lfo', param: 'depth' },
-  vib: { node: 'vib', param: 'frequency' },
-  vibmod: { node: 'vib_gain', param: 'gain' },
-  byteBeatStartTime: { node: 'source', param: 'byteBeatStartTime' },
-  spread: { node: 'source', param: 'panspread' },
-  transient: { node: 'transient', param: 'attack' },
-};
-
-export function getSuperdoughControlTargets() {
-  return CONTROL_TARGETS;
-}

packages/superdough/superdoughoutput.mjs

@@ -1,20 +1,8 @@
-/*
-superdoughoutput.mjs - Output controller for superdough
-
-Handles setting up and mixing to the outputs as well as all global (orbit) effects
-
-Copyright (C) 2025 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/superdough/superdoughoutput.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
 import { effectSend, getWorklet, webAudioTimeout } from './helpers.mjs';
 import { errorLogger } from './logger.mjs';
 import { clamp } from './util.mjs';
 
-const hasChanged = (now, before) => now !== undefined && now !== before;
-// Node with fixed stereo channel count to prevent clicking when the input signal
-// switches from mono to stereo
-const getStereoNode = (ac) => new GainNode(ac, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+let hasChanged = (now, before) => now !== undefined && now !== before;
 
 export class Orbit {
   reverbNode;
@@ -23,11 +11,10 @@ export class Orbit {
   summingNode;
   djfNode;
   audioContext;
-
   constructor(audioContext) {
     this.audioContext = audioContext;
-    this.output = getStereoNode(audioContext);
-    this.summingNode = getStereoNode(audioContext);
+    this.output = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
+    this.summingNode = new GainNode(audioContext, { gain: 1, channelCount: 2, channelCountMode: 'explicit' });
     this.summingNode.connect(this.output);
   }
 
@@ -47,7 +34,6 @@ export class Orbit {
     }
     const val = this.djfNode.parameters.get('value');
     val.setValueAtTime(value, t);
-    return this.djfNode;
   }
 
   getDelay(delaytime = 0, feedback = 0.5, t) {
@@ -92,11 +78,11 @@ export class Orbit {
     return this.reverbNode;
   }
   sendReverb(node, amount) {
-    return effectSend(node, this.reverbNode, amount);
+    effectSend(node, this.reverbNode, amount);
   }
 
   sendDelay(node, amount) {
-    return effectSend(node, this.delayNode, amount);
+    effectSend(node, this.delayNode, amount);
   }
 
   duck(t, onsettime = 0, attacktime = 0.1, depth = 1) {
@@ -178,7 +164,6 @@ export class SuperdoughAudioController {
   audioContext;
   output;
   nodes = {};
-  buses = {};
 
   constructor(audioContext) {
     this.audioContext = audioContext;
@@ -186,14 +171,10 @@ export class SuperdoughAudioController {
   }
 
   reset() {
-    Object.values(this.nodes).forEach((node) => {
+    Array.from(this.nodes).forEach((node) => {
       node.disconnect();
     });
-    Object.values(this.buses).forEach((bus) => {
-      bus.disconnect();
-    });
     this.nodes = {};
-    this.buses = {};
     this.output.reset();
   }
 
@@ -225,11 +206,4 @@ export class SuperdoughAudioController {
     }
     return this.nodes[orbitNum];
   }
-
-  getBus(busNum) {
-    if (this.buses[busNum] == null) {
-      this.buses[busNum] = getStereoNode(this.audioContext);
-    }
-    return this.buses[busNum];
-  }
 }

packages/superdough/synth.mjs

@@ -1,8 +1,9 @@
 import { clamp } from './util.mjs';
-import { getSuperdoughAudioController, registerSound, soundMap } from './superdough.mjs';
+import { registerSound, soundMap } from './superdough.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import {
   applyFM,
+  destroyAudioWorkletNode,
   gainNode,
   getADSRValues,
   getFrequencyFromValue,
@@ -12,15 +13,11 @@ import {
   getVibratoOscillator,
   getWorklet,
   noises,
-  onceEnded,
-  releaseAudioNode,
   webAudioTimeout,
 } from './helpers.mjs';
-import { logger } from './logger.mjs';
 import { getNoiseMix, getNoiseOscillator } from './noise.mjs';
-import { getNodeFromPool, releaseNodeToPool } from './nodePools.mjs';
 
-const waveforms = ['triangle', 'square', 'sawtooth', 'sine', 'user', 'one'];
+const waveforms = ['triangle', 'square', 'sawtooth', 'sine'];
 const waveformAliases = [
   ['tri', 'triangle'],
   ['sqr', 'square'],
@@ -50,20 +47,22 @@ export function registerSynthSounds() {
           [0.001, 0.05, 0.6, 0.01],
         );
 
+        let sound = getOscillator(s, t, value);
+        let { node: o, stop, triggerRelease } = sound;
+
         // turn down
         const g = gainNode(0.3);
 
-        const sound = getOscillator(s, t, value, () => {
-          releaseAudioNode(g);
-          onended();
-        });
-
-        const { node: o, nodes, stop, triggerRelease } = sound;
-
         const { duration } = value;
 
+        o.onended = () => {
+          o.disconnect();
+          g.disconnect();
+          onended();
+        };
+
         const envGain = gainNode(1);
-        const node = o.connect(g).connect(envGain);
+        let node = o.connect(g).connect(envGain);
         const holdEnd = t + duration;
         getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
         const envEnd = holdEnd + release + 0.01;
@@ -71,7 +70,6 @@ export function registerSynthSounds() {
         stop(envEnd);
         return {
           node,
-          nodes,
           stop: (endTime) => {
             stop(endTime);
           },
@@ -113,15 +111,15 @@ export function registerSynthSounds() {
 
       const mix = gainNode(mixGain);
 
-      onceEnded(o, () => {
-        releaseAudioNode(o);
-        releaseAudioNode(g);
-        releaseAudioNode(sat);
-        releaseAudioNode(noise.node);
-        releaseAudioNode(noiseGain);
-        releaseAudioNode(mix);
+      o.onended = () => {
+        o.disconnect();
+        g.disconnect();
+        sat.disconnect();
+        noise.node.disconnect();
+        noiseGain.disconnect();
+        mix.disconnect();
         onended();
-      });
+      };
 
       const node = o.connect(sat).connect(g).connect(mix);
       noise.node.connect(noiseGain).connect(mix);
@@ -141,7 +139,6 @@ export function registerSynthSounds() {
 
       return {
         node,
-        nodes: { source: [o] },
         stop: (endTime) => {
           o.stop(endTime);
         },
@@ -168,26 +165,26 @@ export function registerSynthSounds() {
       const end = holdend + release + 0.01;
       const voices = clamp(unison, 1, 100);
       let panspread = voices > 1 ? clamp(spread, 0, 1) : 0;
-      const params = {
-        frequency,
-        begin,
-        end,
-        freqspread: detune,
-        voices,
-        panspread,
-      };
-      const factory = () => new AudioWorkletNode(ac, 'supersaw-oscillator', { outputChannelCount: [2] });
-      const o = getNodeFromPool('supersaw', factory);
-      Object.entries(params).forEach(([key, value]) => {
-        const param = o.parameters.get(key);
-        const target = value !== undefined ? value : param.defaultValue;
-        param.value = target;
-      });
-      o.port.postMessage({ type: 'initialize' });
+      let o = getWorklet(
+        ac,
+        'supersaw-oscillator',
+        {
+          frequency,
+          begin,
+          end,
+          freqspread: detune,
+          voices,
+          panspread,
+        },
+        {
+          outputChannelCount: [2],
+        },
+      );
+
       const gainAdjustment = 1 / Math.sqrt(voices);
       getPitchEnvelope(o.parameters.get('detune'), value, begin, holdend);
-      const vibratoHandle = getVibratoOscillator(o.parameters.get('detune'), value, begin);
-      const fmHandle = applyFM(o.parameters.get('frequency'), value, begin);
+      const vibratoOscillator = getVibratoOscillator(o.parameters.get('detune'), value, begin);
+      const fm = applyFM(o.parameters.get('frequency'), value, begin);
       let envGain = gainNode(1);
       envGain = o.connect(envGain);
 
@@ -196,10 +193,11 @@ export function registerSynthSounds() {
       let timeoutNode = webAudioTimeout(
         ac,
         () => {
-          releaseNodeToPool(o);
+          destroyAudioWorkletNode(o);
+          envGain.disconnect();
           onended();
-          fmHandle?.stop();
-          vibratoHandle?.stop();
+          fm?.stop();
+          vibratoOscillator?.stop();
         },
         begin,
         end,
@@ -207,7 +205,6 @@ export function registerSynthSounds() {
 
       return {
         node: envGain,
-        nodes: { source: [o], ...fmHandle?.nodes, ...vibratoHandle?.nodes },
         stop: (time) => {
           timeoutNode.stop(time);
         },
@@ -274,7 +271,8 @@ export function registerSynthSounds() {
       let timeoutNode = webAudioTimeout(
         ac,
         () => {
-          releaseAudioNode(o);
+          destroyAudioWorkletNode(o);
+          envGain.disconnect();
           onended();
         },
         begin,
@@ -283,7 +281,6 @@ export function registerSynthSounds() {
 
       return {
         node: envGain,
-        source: o,
         stop: (time) => {
           timeoutNode.stop(time);
         },
@@ -334,25 +331,26 @@ export function registerSynthSounds() {
       );
 
       getPitchEnvelope(o.parameters.get('detune'), value, begin, holdend);
-      const vibratoHandle = getVibratoOscillator(o.parameters.get('detune'), value, begin);
-      const fmHandle = applyFM(o.parameters.get('frequency'), value, begin);
+      const vibratoOscillator = getVibratoOscillator(o.parameters.get('detune'), value, begin);
+      const fm = applyFM(o.parameters.get('frequency'), value, begin);
       let envGain = gainNode(1);
       envGain = o.connect(envGain);
 
       getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
-      let pw_lfo;
+      let lfo;
       if (pwsweep != 0) {
-        pw_lfo = getLfo(ac, { frequency: pwrate, depth: pwsweep, begin, end });
-        pw_lfo.connect(o.parameters.get('pulsewidth'));
+        lfo = getLfo(ac, begin, end, { frequency: pwrate, depth: pwsweep });
+        lfo.connect(o.parameters.get('pulsewidth'));
       }
       let timeoutNode = webAudioTimeout(
         ac,
         () => {
-          releaseAudioNode(o);
-          releaseAudioNode(pw_lfo);
+          destroyAudioWorkletNode(o);
+          destroyAudioWorkletNode(lfo);
+          envGain.disconnect();
           onended();
-          fmHandle?.stop();
-          vibratoHandle?.stop();
+          fm?.stop();
+          vibratoOscillator?.stop();
         },
         begin,
         end,
@@ -360,7 +358,6 @@ export function registerSynthSounds() {
 
       return {
         node: envGain,
-        nodes: { source: [o], pw_lfo: [pw_lfo], ...fmHandle?.nodes, ...vibratoHandle?.nodes },
         stop: (time) => {
           timeoutNode.stop(time);
         },
@@ -369,41 +366,6 @@ export function registerSynthSounds() {
     { prebake: true, type: 'synth' },
   );
 
-  registerSound(
-    'bus',
-    (begin, value, onended) => {
-      const ac = getAudioContext();
-      const [attack, decay, sustain, release] = getADSRValues(
-        [value.attack, value.decay, value.sustain, value.release],
-        'linear',
-        [0.001, 0.05, 1, 0.01],
-      );
-      const holdend = begin + value.duration;
-      const end = holdend + release + 0.01;
-      const bus = getSuperdoughAudioController().getBus(value.n ?? 0);
-      const envGain = bus.connect(gainNode(0));
-      getParamADSR(envGain.gain, attack, decay, sustain, release, 0, 1, begin, holdend, 'linear');
-      const timeoutNode = webAudioTimeout(
-        ac,
-        () => {
-          bus.disconnect(envGain);
-          onended();
-        },
-        begin,
-        end,
-      );
-
-      return {
-        node: envGain,
-        nodes: { source: [bus] },
-        stop: (time) => {
-          timeoutNode.stop(time);
-        },
-      };
-    },
-    { prebake: true, type: 'input' },
-  );
-
   [...noises].forEach((s) => {
     registerSound(
       s,
@@ -426,11 +388,11 @@ export function registerSynthSounds() {
 
         const { duration } = value;
 
-        onceEnded(o, () => {
-          releaseAudioNode(o);
-          releaseAudioNode(g);
+        o.onended = () => {
+          o.disconnect();
+          g.disconnect();
           onended();
-        });
+        };
 
         const envGain = gainNode(1);
         let node = o.connect(g).connect(envGain);
@@ -441,7 +403,6 @@ export function registerSynthSounds() {
         stop(envEnd);
         return {
           node,
-          nodes: { source: [o] },
           stop: (endTime) => {
             stop(endTime);
           },
@@ -453,13 +414,9 @@ export function registerSynthSounds() {
   waveformAliases.forEach(([alias, actual]) => soundMap.set({ ...soundMap.get(), [alias]: soundMap.get()[actual] }));
 }
 
-const PI2 = 2 * Math.PI;
-export function waveformN(partials, phases, type) {
-  const isList = typeof partials === 'object';
-  partials = isList ? partials : new Float32Array(partials).fill(1);
-  const len = partials.length;
-  const real = new Float32Array(len + 1);
-  const imag = new Float32Array(len + 1);
+export function waveformN(partials, type) {
+  const real = new Float32Array(partials + 1);
+  const imag = new Float32Array(partials + 1);
   const ac = getAudioContext();
   const osc = ac.createOscillator();
 
@@ -467,29 +424,20 @@ export function waveformN(partials, phases, type) {
     sawtooth: (n) => [0, -1 / n],
     square: (n) => [0, n % 2 === 0 ? 0 : 1 / n],
     triangle: (n) => [n % 2 === 0 ? 0 : 1 / (n * n), 0],
-    user: (_n) => [0, 1],
   };
 
   if (!terms[type]) {
     throw new Error(`unknown wave type ${type}`);
   }
 
-  for (let n = 0; n < len; n++) {
-    const mag = partials[n];
-    const [r, i] = terms[type](n + 1); // we skip n === 0 as this is dc offset
-    const phase = phases?.[n] ?? 0;
-    // Scale by `partials`
-    let R = r * mag;
-    let I = i * mag;
-    // Apply rotation by the phase
-    if (phase !== 0) {
-      const c = Math.cos(PI2 * phase);
-      const s = Math.sin(PI2 * phase);
-      R = c * R - s * I;
-      I = s * R + c * I;
-    }
-    real[n + 1] = R;
-    imag[n + 1] = I;
+  real[0] = 0; // dc offset
+  imag[0] = 0;
+  let n = 1;
+  while (n <= partials) {
+    const [r, i] = terms[type](n);
+    real[n] = r;
+    imag[n] = i;
+    n++;
   }
 
   const wave = ac.createPeriodicWave(real, imag);
@@ -498,63 +446,38 @@ export function waveformN(partials, phases, type) {
 }
 
 // expects one of waveforms as s
-export function getOscillator(s, t, value, onended) {
-  const { duration, noise = 0 } = value;
-  const partials = value.partials ?? value.n;
+export function getOscillator(s, t, value) {
+  let { n: partials, duration, noise = 0 } = value;
   let o;
-  if (s === 'user' && !partials) {
-    logger(
-      `[superdough] Synth 'user' was selected, but partials not specified. Defaulting to triangle. Use pat.partials to setup custom waveform`,
-    );
-    s = 'triangle';
-  }
-  s = s === 'user' && !partials ? 'triangle' : s;
-  if (s === 'one') {
-    // Constant 1 oscillator (used for modulation)
-    o = new ConstantSourceNode(getAudioContext(), { offset: 1 });
-    o.start(t);
-    return {
-      node: o,
-      nodes: { source: o },
-      stop: (time) => o?.stop(time),
-    };
-  } else if (!partials || partials?.length === 0 || s === 'sine') {
-    // If no partials are given, use stock waveforms
+  // If no partials are given, use stock waveforms
+  if (!partials || s === 'sine') {
     o = getAudioContext().createOscillator();
     o.type = s || 'triangle';
   }
   // generate custom waveform if partials are given
   else {
-    o = waveformN(partials, value.phases, s);
+    o = waveformN(partials, s);
   }
   // set frequency
   o.frequency.value = getFrequencyFromValue(value);
+  o.start(t);
 
-  const vibratoHandle = getVibratoOscillator(o.detune, value, t);
+  let vibratoOscillator = getVibratoOscillator(o.detune, value, t);
 
   // pitch envelope
   getPitchEnvelope(o.detune, value, t, t + duration);
-  const fmHandle = applyFM(o.frequency, value, t);
+  const fmModulator = applyFM(o.frequency, value, t);
 
   let noiseMix;
   if (noise) {
     noiseMix = getNoiseMix(o, noise, t);
   }
 
-  onceEnded(o, () => {
-    noiseMix?.teardown();
-    releaseAudioNode(o);
-    releaseAudioNode(noiseMix?.node);
-    onended();
-  });
-  o.start(t);
-
   return {
     node: noiseMix?.node || o,
-    nodes: { source: [o], ...vibratoHandle?.nodes, ...fmHandle?.nodes },
     stop: (time) => {
-      fmHandle.stop(time);
-      vibratoHandle?.stop(time);
+      fmModulator.stop(time);
+      vibratoOscillator?.stop(time);
       noiseMix?.stop(time);
       o.stop(time);
     },

packages/superdough/util.mjs

@@ -16,17 +16,13 @@ export const tokenizeNote = (note) => {
 const chromas = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
 const accs = { '#': 1, b: -1, s: 1, f: -1 };
 
-export const getAccidentalsOffset = (accidentals) => {
-  return accidentals?.split('').reduce((o, char) => o + accs[char], 0) || 0;
-};
-
 export const noteToMidi = (note, defaultOctave = 3) => {
   const [pc, acc, oct = defaultOctave] = tokenizeNote(note);
   if (!pc) {
     throw new Error('not a note: "' + note + '"');
   }
   const chroma = chromas[pc.toLowerCase()];
-  const offset = getAccidentalsOffset(acc);
+  const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
   return (Number(oct) + 1) * 12 + chroma + offset;
 };
 export const midiToFreq = (n) => {
@@ -109,18 +105,3 @@ 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]]));
-};
-
-export const getBaseURL = (url) => {
-  try {
-    // For real URLs
-    return new URL('.', new URL(url)).href.replace(/\/$/, ''); // removes trailing slash
-  } catch {
-    // For pseudo URLS
-    return url.split('/').slice(0, -1).join('/');
-  }
-};

packages/superdough/vowel.mjs

@@ -1,5 +1,3 @@
-import { releaseAudioNode } from './helpers.mjs';
-
 // credits to webdirt: https://github.com/dktr0/WebDirt/blob/41342e81d6ad694a2310d491fef7b7e8b0929efe/js-src/Graph.js#L597
 export var vowelFormant = {
   a: { freqs: [660, 1120, 2750, 3000, 3350], gains: [1, 0.5012, 0.0708, 0.0631, 0.0126], qs: [80, 90, 120, 130, 140] },
@@ -47,9 +45,7 @@ if (typeof GainNode !== 'undefined') {
         throw new Error('vowel: unknown vowel ' + letter);
       }
       const { gains, qs, freqs } = vowelFormant[letter];
-      this.makeupGain = ac.createGain();
-      this.filters = [];
-      this.gains = [];
+      const makeupGain = ac.createGain();
       for (let i = 0; i < 5; i++) {
         const gain = ac.createGain();
         gain.gain.value = gains[i];
@@ -57,30 +53,17 @@ if (typeof GainNode !== 'undefined') {
         filter.type = 'bandpass';
         filter.Q.value = qs[i];
         filter.frequency.value = freqs[i];
-        super.connect(filter);
+        this.connect(filter);
         filter.connect(gain);
-        this.filters.push(filter);
-        gain.connect(this.makeupGain);
-        this.gains.push(gain);
+        gain.connect(makeupGain);
       }
-      this.makeupGain.gain.value = 8; // how much makeup gain to add?
+      makeupGain.gain.value = 8; // how much makeup gain to add?
+      this.connect = (target) => makeupGain.connect(target);
       return this;
     }
-    connect(target) {
-      this.makeupGain.connect(target);
-    }
-    disconnect() {
-      releaseAudioNode(this.makeupGain);
-      this.filters.forEach(releaseAudioNode);
-      this.gains.forEach(releaseAudioNode);
-      super.disconnect();
-      this.makeupGain = null;
-      this.filters = null;
-      this.gains = null;
-    }
   }
 
-  BaseAudioContext.prototype.createVowelFilter = function (letter) {
+  AudioContext.prototype.createVowelFilter = function (letter) {
     return new VowelNode(this, letter);
   };
 }

packages/superdough/wavetable.mjs

@@ -1,17 +1,17 @@
 import { getAudioContext, registerSound } from './index.mjs';
-import { getBaseURL, getCommonSampleInfo } from './util.mjs';
+import { getCommonSampleInfo } from './util.mjs';
 import {
   applyFM,
   applyParameterModulators,
+  destroyAudioWorkletNode,
   getADSRValues,
   getFrequencyFromValue,
   getParamADSR,
   getPitchEnvelope,
   getVibratoOscillator,
+  getWorklet,
   webAudioTimeout,
-  releaseAudioNode,
 } from './helpers.mjs';
-import { getNodeFromPool, releaseNodeToPool } from './nodePools.mjs';
 import { logger } from './logger.mjs';
 
 export const Warpmode = Object.freeze({
@@ -40,11 +40,6 @@ export const Warpmode = Object.freeze({
 });
 
 const seenKeys = new Set();
-
-export function resetSeenKeys() {
-  seenKeys.clear();
-}
-
 async function getPayload(url, label, frameLen = 2048) {
   const key = `${url},${frameLen}`;
   if (!seenKeys.has(key)) {
@@ -195,7 +190,6 @@ export const tables = async (url, frameLen, json, options = {}) => {
   if (url.startsWith('local:')) {
     url = `http://localhost:5432`;
   }
-  const base = getBaseURL(url);
   if (typeof fetch !== 'function') {
     // not a browser
     return;
@@ -206,7 +200,7 @@ export const tables = async (url, frameLen, json, options = {}) => {
   }
   return fetch(url)
     .then((res) => res.json())
-    .then((json) => _processTables(json, base, frameLen, options))
+    .then((json) => _processTables(json, url, frameLen, options))
     .catch((error) => {
       console.error(error);
       throw new Error(`error loading "${url}"`);
@@ -230,26 +224,24 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
   }
   const endWithRelease = holdEnd + release;
   const envEnd = endWithRelease + 0.01;
-  const params = {
-    begin: t,
-    end: envEnd,
-    frequency,
-    freqspread: value.detune,
-    position: value.wt,
-    warp: value.warp,
-    warpMode: warpmode,
-    voices: Math.max(value.unison ?? 1, 1),
-    panspread: value.spread,
-    phaserand: (value.wtphaserand ?? value.unison > 1) ? 1 : 0,
-  };
-  const factory = () => new AudioWorkletNode(ac, 'wavetable-oscillator-processor', { outputChannelCount: [2] });
-  const source = getNodeFromPool('wavetable', factory);
-  Object.entries(params).forEach(([key, value]) => {
-    const param = source.parameters.get(key);
-    const target = value !== undefined ? value : param.defaultValue;
-    param.value = target;
-  });
-  source.port.postMessage({ type: 'initialize', payload });
+  const source = getWorklet(
+    ac,
+    'wavetable-oscillator-processor',
+    {
+      begin: t,
+      end: envEnd,
+      frequency,
+      detune: value.detune,
+      position: value.wt,
+      warp: value.warp,
+      warpMode: warpmode,
+      voices: Math.max(value.unison ?? 1, 1),
+      spread: value.spread,
+      phaserand: (value.wtphaserand ?? value.unison > 1) ? 1 : 0,
+    },
+    { outputChannelCount: [2] },
+  );
+  source.port.postMessage({ type: 'table', payload });
   if (ac.currentTime > t) {
     logger(`[wavetable] still loading sound "${s}:${n}"`, 'highlight');
     return;
@@ -316,30 +308,22 @@ export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
       dcoffset: value.warpdc ?? 0,
     },
   );
-  const vibratoHandle = getVibratoOscillator(source.parameters.get('detune'), value, t);
-  const fmHandle = applyFM(source.parameters.get('frequency'), value, t);
+  const vibratoOscillator = getVibratoOscillator(source.parameters.get('detune'), value, t);
+  const fm = applyFM(source.parameters.get('frequency'), value, t);
   const envGain = ac.createGain();
   const node = source.connect(envGain);
   getParamADSR(node.gain, attack, decay, sustain, release, 0, 0.3, t, holdEnd, 'linear');
   getPitchEnvelope(source.parameters.get('detune'), value, t, holdEnd);
-  const handle = {
-    node,
-    nodes: {
-      source: [source],
-      wt_lfo: [wtPosModulators],
-      warp_lfo: [wtWarpModulators],
-      ...fmHandle?.nodes,
-      ...vibratoHandle?.nodes,
-    },
-  };
+  const handle = { node, source };
   const timeoutNode = webAudioTimeout(
     ac,
     () => {
-      releaseNodeToPool(source);
-      vibratoHandle?.stop();
-      fmHandle?.stop();
-      releaseAudioNode(wtPosModulators);
-      releaseAudioNode(wtWarpModulators);
+      destroyAudioWorkletNode(source);
+      vibratoOscillator?.stop();
+      fm?.stop();
+      node.disconnect();
+      wtPosModulators?.disconnect();
+      wtWarpModulators?.disconnect();
       onended();
     },
     t,

packages/superdough/zzfx.mjs

@@ -3,7 +3,6 @@ import { midiToFreq, noteToMidi } from './util.mjs';
 import { registerSound } from './superdough.mjs';
 import { getAudioContext } from './audioContext.mjs';
 import { buildSamples } from './zzfx_fork.mjs';
-import { onceEnded, releaseAudioNode } from './helpers.mjs';
 
 export const getZZFX = (value, t) => {
   let {
@@ -84,13 +83,12 @@ export function registerZZFXSounds() {
       wave,
       (t, value, onended) => {
         const { node: o } = getZZFX({ s: wave, ...value }, t);
-        onceEnded(o, () => {
-          releaseAudioNode(o);
+        o.onended = () => {
+          o.disconnect();
           onended();
-        });
+        };
         return {
           node: o,
-          nodes: { source: [o] },
           stop: () => {},
         };
       },

packages/supradough/dough.mjs

@@ -1,12 +1,11 @@
 // this is dough, the superdough without dependencies
-// @ts-nocheck
+// @ts-check
 // @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);
@@ -152,8 +151,7 @@ export class TwoPoleFilter {
     resonance = Math.max(resonance, 0);
 
     cutoff = Math.min(cutoff, 20000);
-    let c = 2 * Math.sin(cutoff * PI_DIV_SR);
-    c = clamp(c, 0, 1.14); // this line prevents instability TODO: test
+    const c = 2 * Math.sin(cutoff * PI_DIV_SR);
 
     const r = Math.pow(0.5, (resonance + 0.125) / 0.125);
     const mrc = 1 - r * c;

packages/supradough/package.json

@@ -1,6 +1,6 @@
 {
   "name": "supradough",
-  "version": "1.2.4",
+  "version": "1.2.3",
   "description": "platform agnostic synth and sampler intended for live coding. a reimplementation of superdough.",
   "main": "index.mjs",
   "type": "module",
@@ -13,7 +13,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://codeberg.org/uzu/strudel.git"
+    "url": "git+https://github.com/tidalcycles/strudel.git"
   },
   "keywords": [
     "tidalcycles",
@@ -25,15 +25,13 @@
   "author": "Felix Roos <flix91@gmail.com>",
   "license": "AGPL-3.0-or-later",
   "bugs": {
-    "url": "https://codeberg.org/uzu/strudel/issues"
+    "url": "https://github.com/tidalcycles/strudel/issues"
   },
-  "homepage": "https://codeberg.org/uzu/strudel#readme",
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
   "devDependencies": {
     "vite": "^6.0.11",
     "vite-plugin-bundle-audioworklet": "workspace:*",
     "wav-encoder": "^1.3.0"
   },
-  "engines": {
-    "node": ">=18.0.0"
-  }
+  "dependencies": {}
 }

packages/supradough/vite.config.js

@@ -1,16 +0,0 @@
-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,8 +25,5 @@
   },
   "devDependencies": {
     "vite": "^6.0.11"
-  },
-  "engines": {
-    "node": ">=18.0.0"
   }
 }