li

working
2026-07-14 14:53:45 -04:00 · 2025-06-17 15:00:27 +02:00 · 2025-06-17 14:58:27 +02:00
156 changed files with 1073 additions and 10082 deletions
@@ -11,15 +11,13 @@ jobs:

    steps:
      - uses: actions/checkout@v4
-      - name: apt install ztd
-        run: apt update && apt install -y zstd
      - uses: pnpm/action-setup@v4
        with:
          version: 9.12.2
      - uses: actions/setup-node@v4
        with:
          node-version: ${{ matrix.node-version }}
-          cache: "pnpm"
+          # cache: 'pnpm'
      - run: pnpm install
      - run: pnpm run format-check
      - run: pnpm run lint
@@ -17,7 +17,7 @@ git remote set-url origin git@codeberg.org:uzu/strudel.git

 To get in touch with the contributors, either

- [join the Tidal Discord Channel](https://discord.com/invite/HGEdXmRkzT) and go to the #strudel channel
+- [join the Tidal Discord Channel](https://discord.gg/remJ6gQA) and go to the #strudel channel
 - Find related discussions on the [tidal club forum](https://club.tidalcycles.org/)

 ## Ask a Question
@@ -150,7 +150,6 @@ Important: Always publish with `pnpm`, as `npm` does not support overriding main


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

 Remember to have fun, and that this project is driven by the passion of volunteers!
@@ -1,21 +0,0 @@
-FROM node:24
-
-WORKDIR /app
-
-RUN npm install pnpm --global
-
-COPY pnpm-workspace.yaml ./
-COPY package.json pnpm-lock.yaml ./
-COPY packages/ ./packages/
-COPY examples/ ./examples/
-RUN mkdir -p website/public
-COPY website/package.json ./website/
-
-RUN pnpm install
-
-
-COPY . .
-
-EXPOSE 4321
-
-CMD ["pnpm", "dev"]
@@ -3,6 +3,8 @@
 Live coding patterns on the web
 https://strudel.cc/

+Development is moving to https://codeberg.org/uzu/strudel
+
 - Try it here: <https://strudel.cc>
 - Docs: <https://strudel.cc/learn>
 - Technical Blog Post: <https://loophole-letters.vercel.app/strudel>
@@ -30,13 +32,19 @@ This project is organized into many [packages](./packages), which are also avail

 Read more about how to use these in your own project [here](https://strudel.cc/technical-manual/project-start).

-You will need to abide by the terms of the [GNU Affero Public Licence v3](LICENSE). As such, Strudel code can only be shared within free/open source projects under the same license -- see the license for details.
+You will need to abide by the terms of the [GNU Affero Public Licence v3](LICENSE.md). As such, Strudel code can only be shared within free/open source projects under the same license -- see the license for details.

 Licensing info for the default sound banks can be found over on the [dough-samples](https://github.com/felixroos/dough-samples/blob/main/README.md) repository.

 ## Contributing

-There are many ways to contribute to this project! See [contribution guide](./CONTRIBUTING.md). You can find the full list of contributors [here](https://codeberg.org/uzu/strudel/activity/contributors).
+There are many ways to contribute to this project! See [contribution guide](./CONTRIBUTING.md).
+
+<a href="https://codeberg.org/uzu/strudel/activity/contributors">
+  <img src="https://contrib.rocks/image?repo=tidalcycles/strudel" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).

 ## Community

@@ -45,5 +53,3 @@ There is a #strudel channel on the TidalCycles discord: <https://discord.com/inv
 You can also ask questions and find related discussions on the tidal club forum: <https://club.tidalcycles.org/>

 The discord and forum is shared with the haskell (tidal) and python (vortex) siblings of this project.
-
-We also have a mastodon account: <a rel="me" href="https://social.toplap.org/@strudel">social.toplap.org/@strudel</a>
@@ -42,7 +42,6 @@ export default [
      '**/hydra.mjs',
      '**/jsdoc-synonyms.js',
      'packages/hs2js/src/hs2js.mjs',
-      'packages/supradough/dough-export.mjs',
      '**/samples',
    ],
  },
@@ -84,14 +83,4 @@ export default [
      ],
    },
  },
-  {
-    // Properties provided by AudioWorkletGlobalScope
-    files: ['packages/superdough/worklets.mjs'],
-    languageOptions: {
-      globals: {
-        currentTime: 'readonly',
-        sampleRate: 'readonly',
-      },
-    },
-  },
 ];
@@ -1,5 +1,5 @@
 /*
-jsdoc-synonyms.js - Add support for @synonyms tag
+jsdoc-synonyms.js - Add support for @synonym tag
 Copyright (C) 2023 Strudel contributors - see <https://codeberg.org/uzu/strudel/activity/contributors>
 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/>.
 */
@@ -1,122 +1,68 @@
 import jsdoc from '../../doc.json';
+// import { javascriptLanguage } from '@codemirror/lang-javascript';
 import { autocompletion } from '@codemirror/autocomplete';
 import { h } from './html';

-const escapeHtml = (str) => {
+function plaintext(str) {
  const div = document.createElement('div');
  div.innerText = str;
  return div.innerHTML;
-};
+}

-const stripHtml = (html) => {
-  const div = document.createElement('div');
+const getDocLabel = (doc) => doc.name || doc.longname;
+const getInnerText = (html) => {
+  var div = document.createElement('div');
  div.innerHTML = html;
  return div.textContent || div.innerText || '';
 };

-const getDocLabel = (doc) => doc.name || doc.longname;
+export function Autocomplete({ doc, label }) {
+  return h`<div class="prose dark:prose-invert max-h-[400px] overflow-auto p-2">
+<h1 class="pt-0 mt-0">${label || getDocLabel(doc)}</h1>
+${doc.description}
+<ul>
+  ${doc.params?.map(
+    ({ name, type, description }) =>
+      `<li>${name} : ${type.names?.join(' | ')} ${description ? ` - ${getInnerText(description)}` : ''}</li>`,
+  )}
+</ul>
+<div>
+  ${doc.examples?.map((example) => `<div><pre>${plaintext(example)}</pre></div>`)}
+</div>
+</div>`[0];
+  /*
+<pre
+className="cursor-pointer"
+onMouseDown={(e) => {
+  console.log('ola!');
+  navigator.clipboard.writeText(example);
+  e.stopPropagation();
+}}
+>
+{example}
+</pre>
+*/
+}

-const buildParamsList = (params) =>
-  params?.length
-    ? `
-    <div class="autocomplete-info-params-section">
-      <h4 class="autocomplete-info-section-title">Parameters</h4>
-      <ul class="autocomplete-info-params-list">
-        ${params
-          .map(
-            ({ name, type, description }) => `
-          <li class="autocomplete-info-param-item">
-            <span class="autocomplete-info-param-name">${name}</span>
-            <span class="autocomplete-info-param-type">${type.names?.join(' | ')}</span>
-            ${description ? `<div class="autocomplete-info-param-desc">${stripHtml(description)}</div>` : ''}
-          </li>
-        `,
-          )
-          .join('')}
-      </ul>
-    </div>
-  `
-    : '';
-
-const buildExamples = (examples) =>
-  examples?.length
-    ? `
-    <div class="autocomplete-info-examples-section">
-      <h4 class="autocomplete-info-section-title">Examples</h4>
-      ${examples
-        .map(
-          (example) => `
-        <pre class="autocomplete-info-example-code">${escapeHtml(example)}</pre>
-      `,
-        )
-        .join('')}
-    </div>
-  `
-    : '';
-
-export const Autocomplete = (doc) =>
-  h`
-  <div class="autocomplete-info-container">
-    <div class="autocomplete-info-tooltip">
-      <h3 class="autocomplete-info-function-name">${getDocLabel(doc)}</h3>
-      ${doc.synonyms_text ? `<div class="autocomplete-info-function-synonyms">Synonyms: ${doc.synonyms_text}</div>` : ''}
-      ${doc.description ? `<div class="autocomplete-info-function-description">${doc.description}</div>` : ''}
-      ${buildParamsList(doc.params)}
-      ${buildExamples(doc.examples)}
-    </div>
-  </div>
-`[0];
-
-const isValidDoc = (doc) => {
-  const label = getDocLabel(doc);
-  return label && !label.startsWith('_') && !['package'].includes(doc.kind);
-};
-
-const hasExcludedTags = (doc) =>
-  ['superdirtOnly', 'noAutocomplete'].some((tag) => doc.tags?.find((t) => t.originalTitle === tag));
-
-export const getSynonymDoc = (doc, synonym) => {
-  const synonyms = doc.synonyms || [];
-  const docLabel = getDocLabel(doc);
-  // Swap `doc.name` in for `s` in the list of synonyms
-  const synonymsWithDoc = [docLabel, ...synonyms].filter((x) => x && x !== synonym);
-  return {
-    ...doc,
-    name: synonym,
-    longname: synonym,
-    synonyms: synonymsWithDoc,
-    synonyms_text: synonymsWithDoc.join(', '),
-  };
-};
-
-const jsdocCompletions = (() => {
-  const seen = new Set(); // avoid repetition
-  const completions = [];
-  for (const doc of jsdoc.docs) {
-    if (!isValidDoc(doc) || hasExcludedTags(doc)) continue;
-    const docLabel = getDocLabel(doc);
-    // Remove duplicates
-    const synonyms = doc.synonyms || [];
-    let labels = [docLabel, ...synonyms];
-    for (const label of labels) {
-      // https://codemirror.net/docs/ref/#autocomplete.Completion
-      if (label && !seen.has(label)) {
-        seen.add(label);
-        completions.push({
-          label,
-          info: () => Autocomplete(getSynonymDoc(doc, label)),
-          type: 'function', // https://codemirror.net/docs/ref/#autocomplete.Completion.type
-        });
-      }
-    }
-  }
-  return completions;
-})();
-
-export const strudelAutocomplete = (context) => {
-  const word = context.matchBefore(/\w*/);
-  if (word.from === word.to && !context.explicit) return null;
+const jsdocCompletions = jsdoc.docs
+  .filter(
+    (doc) =>
+      getDocLabel(doc) &&
+      !getDocLabel(doc).startsWith('_') &&
+      !['package'].includes(doc.kind) &&
+      !['superdirtOnly', 'noAutocomplete'].some((tag) => doc.tags?.find((t) => t.originalTitle === tag)),
+  )
+  // https://codemirror.net/docs/ref/#autocomplete.Completion
+  .map((doc) /*: Completion */ => ({
+    label: getDocLabel(doc),
+    // detail: 'xxx', // An optional short piece of information to show (with a different style) after the label.
+    info: () => Autocomplete({ doc }),
+    type: 'function', // https://codemirror.net/docs/ref/#autocomplete.Completion.type
+  }));

+export const strudelAutocomplete = (context /* : CompletionContext */) => {
+  let word = context.matchBefore(/\w*/);
+  if (word.from == word.to && !context.explicit) return null;
  return {
    from: word.from,
    options: jsdocCompletions,
@@ -128,5 +74,11 @@ export const strudelAutocomplete = (context) => {
  };
 };

-export const isAutoCompletionEnabled = (enabled) =>
-  enabled ? [autocompletion({ override: [strudelAutocomplete], closeOnBlur: false })] : [];
+export function isAutoCompletionEnabled(on) {
+  return on
+    ? [
+        autocompletion({ override: [strudelAutocomplete] }),
+        //javascriptLanguage.data.of({ autocomplete: strudelAutocomplete }),
+      ]
+    : []; // autocompletion({ override: [] })
+}
@@ -1,63 +0,0 @@
-import {
-  keymap,
-  highlightSpecialChars,
-  drawSelection,
-  highlightActiveLine,
-  dropCursor,
-  rectangularSelection,
-  crosshairCursor,
-  lineNumbers,
-  highlightActiveLineGutter,
-} from '@codemirror/view';
-import {
-  defaultHighlightStyle,
-  syntaxHighlighting,
-  bracketMatching,
-  foldGutter,
-  foldKeymap,
-} from '@codemirror/language';
-import { defaultKeymap, history, historyKeymap } from '@codemirror/commands';
-import { searchKeymap, highlightSelectionMatches } from '@codemirror/search';
-import { completionKeymap, closeBracketsKeymap } from '@codemirror/autocomplete';
-
-// Taken + slightly modified from https://github.com/codemirror/basic-setup/blob/main/src/codemirror.ts
-
-export const basicSetup = (() => [
-  //   lineNumbers(),
-  //   highlightActiveLineGutter(),
-  highlightSpecialChars(),
-  history(),
-  // foldGutter(),
-  // drawSelection(),
-  dropCursor(),
-  // EditorState.allowMultipleSelections.of(true),
-  // indentOnInput(),
-  // syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
-  // autocompletion(),
-  rectangularSelection(),
-  crosshairCursor(),
-  // highlightActiveLine(),
-  // highlightSelectionMatches(),
-  keymap.of([
-    ...closeBracketsKeymap,
-    ...defaultKeymap,
-    // ...searchKeymap,
-    ...historyKeymap,
-    // ...foldKeymap,
-    // ...completionKeymap,
-  ]),
-])();
-
-/// A minimal set of extensions to create a functional editor. Only
-/// includes [the default keymap](#commands.defaultKeymap), [undo
-/// history](#commands.history), [special character
-/// highlighting](#view.highlightSpecialChars), [custom selection
-/// drawing](#view.drawSelection), and [default highlight
-/// style](#language.defaultHighlightStyle).
-export const minimalSetup = (() => [
-  highlightSpecialChars(),
-  history(),
-  drawSelection(),
-  syntaxHighlighting(defaultHighlightStyle, { fallback: true }),
-  keymap.of([...defaultKeymap, ...historyKeymap]),
-])();
@@ -1,8 +1,8 @@
 import { closeBrackets } from '@codemirror/autocomplete';
 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 { history } from '@codemirror/commands';
+import { javascript } from '@codemirror/lang-javascript';
 import { defaultHighlightStyle, syntaxHighlighting, bracketMatching } from '@codemirror/language';
 import { Compartment, EditorState, Prec } from '@codemirror/state';
 import {
@@ -24,7 +24,6 @@ import { initTheme, activateTheme, theme } from './themes.mjs';
 import { sliderPlugin, updateSliderWidgets } from './slider.mjs';
 import { widgetPlugin, updateWidgets } from './widget.mjs';
 import { persistentAtom } from '@nanostores/persistent';
-import { basicSetup } from './basicSetup.mjs';

 const extensions = {
  isLineWrappingEnabled: (on) => (on ? EditorView.lineWrapping : []),
@@ -38,14 +37,6 @@ const extensions = {
  isActiveLineHighlighted: (on) => (on ? [highlightActiveLine(), highlightActiveLineGutter()] : []),
  isFlashEnabled,
  keybindings,
-  isTabIndentationEnabled: (on) => (on ? keymap.of([indentWithTab]) : []),
-  isMultiCursorEnabled: (on) =>
-    on
-      ? [
-          EditorState.allowMultipleSelections.of(true),
-          EditorView.clickAddsSelectionRange.of((ev) => ev.metaKey || ev.ctrlKey),
-        ]
-      : [],
 };
 const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [key, new Compartment()]));

@@ -60,8 +51,6 @@ export const defaultSettings = {
  isFlashEnabled: true,
  isTooltipEnabled: false,
  isLineWrappingEnabled: false,
-  isTabIndentationEnabled: false,
-  isMultiCursorEnabled: false,
  theme: 'strudelTheme',
  fontFamily: 'monospace',
  fontSize: 18,
@@ -73,7 +62,7 @@ export const codemirrorSettings = persistentAtom('codemirror-settings', defaultS
 });

 // https://codemirror.net/docs/guide/
-export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, root, mondo }) {
+export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, root }) {
  const settings = codemirrorSettings.get();
  const initialSettings = Object.keys(compartments).map((key) =>
    compartments[key].of(extensions[key](parseBooleans(settings[key]))),
@@ -86,17 +75,13 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
      /* search(),
      highlightSelectionMatches(), */
      ...initialSettings,
-      basicSetup,
-      mondo ? [] : javascript(),
-      javascriptLanguage.data.of({
-        closeBrackets: { brackets: ['(', '[', '{', "'", '"', '<'] },
-        bracketMatching: { brackets: ['(', '[', '{', "'", '"', '<'] },
-      }),
+      javascript(),
      sliderPlugin,
      widgetPlugin,
      // indentOnInput(), // works without. already brought with javascript extension?
      // bracketMatching(), // does not do anything
      syntaxHighlighting(defaultHighlightStyle),
+      history(),
      EditorView.updateListener.of((v) => onChange(v)),
      drawSelection({ cursorBlinkRate: 0 }),
      Prec.highest(
@@ -224,7 +209,6 @@ export class StrudelMirror {
      },
      onEvaluate: () => this.evaluate(),
      onStop: () => this.stop(),
-      mondo: replOptions.mondo,
    });
    const cmEditor = this.root.querySelector('.cm-editor');
    if (cmEditor) {
@@ -1,4 +1,4 @@
-import { RangeSetBuilder, StateEffect, StateField, Prec } from '@codemirror/state';
+import { RangeSetBuilder, StateEffect, StateField } from '@codemirror/state';
 import { Decoration, EditorView } from '@codemirror/view';

 export const setMiniLocations = StateEffect.define();
@@ -134,5 +134,5 @@ export const isPatternHighlightingEnabled = (on, config) => {
    setTimeout(() => {
      updateMiniLocations(config.editor, config.miniLocations);
    }, 100);
-  return on ? Prec.highest(highlightExtension) : [];
+  return on ? highlightExtension : [];
 };
@@ -1,7 +1,6 @@
+const parser = typeof DOMParser !== 'undefined' ? new DOMParser() : null;
 export let html = (string) => {
-  const template = document.createElement('template');
-  template.innerHTML = string.trim();
-  return template.content.childNodes;
+  return parser?.parseFromString(string, 'text/html').querySelectorAll('*');
 };
 let parseChunk = (chunk) => {
  if (Array.isArray(chunk)) return chunk.flat().join('');
@@ -3,9 +3,8 @@ import { keymap, ViewPlugin } from '@codemirror/view';
 // import { searchKeymap } from '@codemirror/search';
 import { emacs } from '@replit/codemirror-emacs';
 import { vim } from '@replit/codemirror-vim';
-// import { vim } from './vim_test.mjs';
 import { vscodeKeymap } from '@replit/codemirror-vscode-keymap';
-import { defaultKeymap } from '@codemirror/commands';
+import { defaultKeymap, historyKeymap } from '@codemirror/commands';

 const vscodePlugin = ViewPlugin.fromClass(
  class {
@@ -22,11 +21,11 @@ const vscodeExtension = (options) => [vscodePlugin].concat(options ?? []);
 const keymaps = {
  vim,
  emacs,
-  codemirror: () => keymap.of(defaultKeymap),
  vscode: vscodeExtension,
 };

 export function keybindings(name) {
  const active = keymaps[name];
-  return [active ? Prec.high(active()) : []];
+  return [keymap.of(defaultKeymap), keymap.of(historyKeymap), active ? active() : []];
+  // keymap.of(searchKeymap),
 }
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/codemirror",
-  "version": "1.2.5",
+  "version": "1.2.2",
  "description": "Codemirror Extensions for Strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -42,7 +42,7 @@
    "@lezer/highlight": "^1.2.1",
    "@nanostores/persistent": "^0.10.2",
    "@replit/codemirror-emacs": "^6.1.0",
-    "@replit/codemirror-vim": "^6.3.0",
+    "@replit/codemirror-vim": "^6.2.1",
    "@replit/codemirror-vscode-keymap": "^6.0.2",
    "@strudel/core": "workspace:*",
    "@strudel/draw": "workspace:*",
@@ -8,11 +8,6 @@ import CutiePi, { settings as CutiePiSettings } from './themes/CutiePi.mjs';
 import sonicPink, { settings as sonicPinkSettings } from './themes/sonic-pink.mjs';
 import redText, { settings as redTextSettings } from './themes/red-text.mjs';
 import greenText, { settings as greenTextSettings } from './themes/green-text.mjs';
-import archBtw, { settings as archBtwSettings } from './themes/archBtw.mjs';
-import fruitDaw, { settings as fruitDawSettings } from './themes/fruitDaw.mjs';
-
-import bluescreenlight, { settings as bluescreenlightsettings } from './themes/bluescreenlight.mjs';
-
 import androidstudio, { settings as androidstudioSettings } from './themes/androidstudio.mjs';
 import atomone, { settings as atomOneSettings } from './themes/atomone.mjs';
 import aura, { settings as auraSettings } from './themes/aura.mjs';
@@ -44,20 +39,17 @@ import { setTheme } from '@strudel/draw';
 export const themes = {
  strudelTheme,
  algoboy,
-  archBtw,
  androidstudio,
  atomone,
  aura,
  bbedit,
  blackscreen,
  bluescreen,
-  bluescreenlight,
  CutiePi,
  darcula,
  dracula,
  duotoneDark,
  eclipse,
-  fruitDaw,
  githubDark,
  githubLight,
  greenText,
@@ -86,12 +78,10 @@ export const themes = {
 export const settings = {
  strudelTheme: strudelThemeSettings,
  bluescreen: bluescreenSettings,
-  bluescreenlight: bluescreenlightsettings,
  blackscreen: blackscreenSettings,
  whitescreen: whitescreenSettings,
  teletext: teletextSettings,
  algoboy: algoboySettings,
-  archBtw: archBtwSettings,
  androidstudio: androidstudioSettings,
  atomone: atomOneSettings,
  aura: auraSettings,
@@ -102,11 +92,9 @@ export const settings = {
  eclipse: eclipseSettings,
  CutiePi: CutiePiSettings,
  sonicPink: sonicPinkSettings,
-  fruitDaw: fruitDawSettings,
  githubLight: githubLightSettings,
  githubDark: githubDarkSettings,
  greenText: greenTextSettings,
-
  gruvboxDark: gruvboxDarkSettings,
  gruvboxLight: gruvboxLightSettings,
  materialDark: materialDarkSettings,
@@ -1,38 +0,0 @@
-/*
- * Arch Btw
- * Modern terminal inspired theme
- * made by Jade
- */
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-
-const hex = ['rgb(0, 0, 0)', 'rgb(82, 208, 250)', 'rgba(113, 208, 250, .4)', 'rgba(113, 208, 250, .15)'];
-
-export const settings = {
-  background: hex[0],
-  lineBackground: 'transparent',
-  foreground: hex[1],
-  selection: hex[2],
-  selectionMatch: hex[0],
-  gutterBackground: hex[0],
-  gutterForeground: hex[2],
-  gutterBorder: 'transparent',
-  lineHighlight: hex[0],
-};
-
-export default createTheme({
-  theme: 'dark',
-  settings,
-  styles: [
-    {
-      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
-      color: hex[1],
-    },
-    { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[1] },
-    { tag: [t.comment, t.brace, t.bracket], color: hex[2] },
-    { tag: [t.variableName, t.propertyName, t.labelName], color: hex[1] },
-    { tag: [t.attributeName, t.number], color: hex[1] },
-    { tag: t.keyword, color: hex[1] },
-    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[1] },
-  ],
-});
@@ -1,37 +0,0 @@
-/*
- * A lighter blue screen theme
- * made by Jade
- */
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-
-const hex = ['rgb(75, 130, 247)', 'rgb(47, 108, 246)', 'rgb(255, 255, 255)', 'rgba(255, 255, 255,.3)'];
-
-export const settings = {
-  background: hex[0],
-  lineBackground: 'transparent',
-  foreground: hex[2],
-  selection: hex[3],
-  selectionMatch: hex[0],
-  gutterBackground: hex[0],
-  gutterForeground: hex[2],
-  gutterBorder: 'transparent',
-  lineHighlight: hex[1],
-};
-
-export default createTheme({
-  theme: 'dark',
-  settings,
-  styles: [
-    {
-      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
-      color: hex[2],
-    },
-    { tag: [t.atom, t.bool, t.special(t.variableName)], color: hex[2] },
-    { tag: [t.comment, t.bracket, t.brace, t.compareOperator], color: hex[3] },
-    { tag: [t.variableName, t.propertyName, t.labelName], color: hex[2] },
-    { tag: [t.attributeName, t.number], color: hex[2] },
-    { tag: t.keyword, color: hex[2] },
-    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[2] },
-  ],
-});
@@ -1,50 +0,0 @@
-/*
- * Fruit Daw
- * made by Jade
- */
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from './theme-helper.mjs';
-
-const hex = [
-  'rgb(84, 93, 98)',
-  'rgb(255, 255, 255)',
-  'rgba(255, 255, 255, .25)',
-  'rgb(67, 76, 81)',
-  'rgb(186, 230, 115)',
-  'rgb(252, 184, 67)',
-  'rgb(124, 206, 254)',
-  'rgb(83, 101, 102)',
-  'rgba(46, 62, 72,.5)',
-  'rgb(94, 100, 108)',
-  'rgb(167, 216, 177)',
-];
-
-export const settings = {
-  background: hex[0],
-  lineBackground: 'transparent',
-  foreground: hex[10],
-  selection: hex[8],
-  selectionMatch: hex[0],
-  gutterBackground: hex[3],
-  gutterForeground: hex[2],
-  gutterBorder: 'transparent',
-  lineHighlight: hex[3],
-};
-
-export default createTheme({
-  theme: 'dark',
-  settings,
-  styles: [
-    {
-      tag: [t.function(t.variableName), t.function(t.propertyName), t.url, t.processingInstruction],
-      color: hex[1],
-    },
-    { tag: [t.bool, t.special(t.variableName)], color: hex[1] },
-    { tag: [t.comment, t.brace, t.bracket], color: hex[2] },
-    { tag: [t.variableName], color: hex[1] },
-    { tag: [t.labelName, t.propertyName, t.self, t.atom], color: hex[5] },
-    { tag: [t.attributeName, t.number], color: hex[6] },
-    { tag: t.keyword, color: hex[5] },
-    { tag: [t.string, t.regexp, t.special(t.propertyName)], color: hex[4] },
-  ],
-});
@@ -1,6 +1,6 @@
 import { hoverTooltip } from '@codemirror/view';
 import jsdoc from '../../doc.json';
-import { Autocomplete, getSynonymDoc } from './autocomplete.mjs';
+import { Autocomplete } from './autocomplete.mjs';

 const getDocLabel = (doc) => doc.name || doc.longname;

@@ -52,11 +52,10 @@ export const strudelTooltip = hoverTooltip(
    let entry = jsdoc.docs.filter((doc) => getDocLabel(doc) === word)[0];
    if (!entry) {
      // Try for synonyms
-      const doc = jsdoc.docs.filter((doc) => doc.synonyms && doc.synonyms.includes(word))[0];
-      if (!doc) {
+      entry = jsdoc.docs.filter((doc) => doc.synonyms && doc.synonyms.includes(word))[0];
+      if (!entry) {
        return null;
      }
-      entry = getSynonymDoc(doc, word);
    }

    return {
@@ -67,7 +66,7 @@ export const strudelTooltip = hoverTooltip(
      create(view) {
        let dom = document.createElement('div');
        dom.className = 'strudel-tooltip';
-        const ac = Autocomplete(entry);
+        const ac = Autocomplete({ doc: entry, label: word });
        dom.appendChild(ac);
        return { dom };
      },
@@ -1,11 +1,11 @@
 import { describe, bench } from 'vitest';

-import { calculateSteps, sequence, stack } from '../index.mjs';
+import { calculateTactus, sequence, stack } from '../index.mjs';

 const pat64 = sequence(...Array(64).keys());

 describe('steps', () => {
-  calculateSteps(true);
+  calculateTactus(true);
  bench(
    '+tactus',
    () => {
@@ -14,7 +14,7 @@ describe('steps', () => {
    { time: 1000 },
  );

-  calculateSteps(false);
+  calculateTactus(false);
  bench(
    '-tactus',
    () => {
@@ -25,7 +25,7 @@ describe('steps', () => {
 });

 describe('stack', () => {
-  calculateSteps(true);
+  calculateTactus(true);
  bench(
    '+tactus',
    () => {
@@ -34,7 +34,7 @@ describe('stack', () => {
    { time: 1000 },
  );

-  calculateSteps(false);
+  calculateTactus(false);
  bench(
    '-tactus',
    () => {
@@ -43,4 +43,4 @@ describe('stack', () => {
    { time: 1000 },
  );
 });
-calculateSteps(true);
+calculateTactus(true);
@@ -4,14 +4,13 @@ Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { Pattern, register, reify } from './pattern.mjs';
+import { Pattern, register, sequence } from './pattern.mjs';

 export function createParam(names) {
  let isMulti = Array.isArray(names);
  names = !isMulti ? [names] : names;
  const name = names[0];

-  // todo: make this less confusing
  const withVal = (xs) => {
    let bag;
    // check if we have an object with an unnamed control (.value)
@@ -36,34 +35,25 @@ export function createParam(names) {
    }
  };

-  // todo: make this less confusing
-  const func = function (value, pat) {
-    if (!pat) {
-      return reify(value).withValue(withVal);
+  const func = (...pats) => sequence(...pats).withValue(withVal);
+
+  const setter = function (...pats) {
+    if (!pats.length) {
+      return this.fmap(withVal);
    }
-    if (typeof value === 'undefined') {
-      return pat.fmap(withVal);
-    }
-    return pat.set(reify(value).withValue(withVal));
-  };
-  Pattern.prototype[name] = function (value) {
-    return func(value, this);
+    return this.set(func(...pats));
  };
+  Pattern.prototype[name] = setter;
  return func;
 }

 // maps control alias names to the "main" control name
 const controlAlias = new Map();

-export function isControlName(name) {
-  return controlAlias.has(name);
-}
-
 export function registerControl(names, ...aliases) {
  const name = Array.isArray(names) ? names[0] : names;
  let bag = {};
  bag[name] = createParam(names);
-  controlAlias.set(name, name);
  aliases.forEach((alias) => {
    bag[alias] = bag[name];
    controlAlias.set(alias, name);
@@ -87,244 +77,10 @@ export function registerControl(names, ...aliases) {
 */
 export const { s, sound } = registerControl(['s', 'n', 'gain'], 'sound');

-/**
- * Position in the wavetable of the wavetable oscillator
- *
- * @name wt
- * @param {number | Pattern} position Position in the wavetable from 0 to 1
- * @synonyms wavetablePosition
- * @example
- * s("squelch").bank("wt_digital").seg(8).note("F1").wt("0 0.25 0.5 0.75 1")
- */
-export const { wt, wavetablePosition } = registerControl('wt', 'wavetablePosition');
-
-/**
- * Amount of envelope applied wavetable oscillator's position envelope
- *
- * @name wtenv
- * @param {number | Pattern} amount between 0 and 1
- */
-export const { wtenv } = registerControl('wtenv');
-/**
- * Attack time of the wavetable oscillator's position envelope
- *
- * @name wtattack
- * @synonyms wtatt
- * @param {number | Pattern} time attack time in seconds
- */
-export const { wtattack, wtatt } = registerControl('wtattack', 'wtatt');
-
-/**
- * Decay time of the wavetable oscillator's position envelope
- *
- * @name wtdecay
- * @synonyms wtdec
- * @param {number | Pattern} time decay time in seconds
- */
-export const { wtdecay, wtdec } = registerControl('wtdecay', 'wtdec');
-
-/**
- * Sustain time of the wavetable oscillator's position envelope
- *
- * @name wtsustain
- * @synonyms wtsus
- * @param {number | Pattern} gain sustain level (0 to 1)
- */
-export const { wtsustain, wtsus } = registerControl('wtsustain', 'wtsus');
-
-/**
- * Release time of the wavetable oscillator's position envelope
- *
- * @name wtrelease
- * @synonyms wtrel
- * @param {number | Pattern} time release time in seconds
- */
-export const { wtrelease, wtrel } = registerControl('wtrelease', 'wtrel');
-
-/**
- * Rate of the LFO for the wavetable oscillator's position
- *
- * @name wtrate
- * @param {number | Pattern} rate rate in hertz
- */
-export const { wtrate } = registerControl('wtrate');
-/**
- * cycle synced rate of the LFO for the wavetable oscillator's position
- *
- * @name wtsync
- * @param {number | Pattern} rate rate in cycles
- */
-export const { wtsync } = registerControl('wtsync');
-
-/**
- * Depth of the LFO for the wavetable oscillator's position
- *
- * @name wtdepth
- * @param {number | Pattern} depth depth of modulation
- */
-export const { wtdepth } = registerControl('wtdepth');
-
-/**
- * Shape of the LFO for the wavetable oscillator's position
- *
- * @name wtshape
- * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
- */
-export const { wtshape } = registerControl('wtshape');
-
-/**
- * DC offset of the LFO for the wavetable oscillator's position
- *
- * @name wtdc
- * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
- */
-export const { wtdc } = registerControl('wtdc');
-
-/**
- * Skew of the LFO for the wavetable oscillator's position
- *
- * @name wtskew
- * @param {number | Pattern} skew How much to bend the LFO shape
- */
-export const { wtskew } = registerControl('wtskew');
-
-/**
- * Amount of warp (alteration of the waveform) to apply to the wavetable oscillator
- *
- * @name warp
- * @param {number | Pattern} amount Warp of the wavetable from 0 to 1
- * @synonyms wavetableWarp
- * @example
- * s("basique").bank("wt_digital").seg(8).note("F1").warp("0 0.25 0.5 0.75 1")
- *   .warpmode("spin")
- */
-export const { warp, wavetableWarp } = registerControl('warp', 'wavetableWarp');
-
-/**
- * Attack time of the wavetable oscillator's warp envelope
- *
- * @name warpattack
- * @synonyms warpatt
- * @param {number | Pattern} time attack time in seconds
- */
-export const { warpattack, warpatt } = registerControl('warpattack', 'warpatt');
-
-/**
- * Decay time of the wavetable oscillator's warp envelope
- *
- * @name warpdecay
- * @synonyms warpdec
- * @param {number | Pattern} time decay time in seconds
- */
-export const { warpdecay, warpdec } = registerControl('warpdecay', 'warpdec');
-
-/**
- * Sustain time of the wavetable oscillator's warp envelope
- *
- * @name warpsustain
- * @synonyms warpsus
- * @param {number | Pattern} gain sustain level (0 to 1)
- */
-export const { warpsustain, warpsus } = registerControl('warpsustain', 'warpsus');
-
-/**
- * Release time of the wavetable oscillator's warp envelope
- *
- * @name warprelease
- * @synonyms warprel
- * @param {number | Pattern} time release time in seconds
- */
-export const { warprelease, warprel } = registerControl('warprelease', 'warprel');
-
-/**
- * Rate of the LFO for the wavetable oscillator's warp
- *
- * @name warprate
- * @param {number | Pattern} rate rate in hertz
- */
-export const { warprate } = registerControl('warprate');
-
-/**
- * Depth of the LFO for the wavetable oscillator's warp
- *
- * @name warpdepth
- * @param {number | Pattern} depth depth of modulation
- */
-export const { warpdepth } = registerControl('warpdepth');
-
-/**
- * Shape of the LFO for the wavetable oscillator's warp
- *
- * @name warpshape
- * @param {number | Pattern} shape Shape of the lfo (0, 1, 2, ..)
- */
-export const { warpshape } = registerControl('warpshape');
-
-/**
- * DC offset of the LFO for the wavetable oscillator's warp
- *
- * @name warpdc
- * @param {number | Pattern} dcoffset dc offset. set to 0 for unipolar
- */
-export const { warpdc } = registerControl('warpdc');
-
-/**
- * Skew of the LFO for the wavetable oscillator's warp
- *
- * @name warpskew
- * @param {number | Pattern} skew How much to bend the LFO shape
- */
-export const { warpskew } = registerControl('warpskew');
-
-/**
- * Type of warp (alteration of the waveform) to apply to the wavetable oscillator.
- *
- * The current options are: none, asym, bendp, bendm, bendmp, sync, quant, fold, pwm, orbit,
- * spin, chaos, primes, binary, brownian, reciprocal, wormhole, logistic, sigmoid, fractal, flip
- *
- * @name warpmode
- * @param {number | string | Pattern} mode Warp mode
- * @synonyms wavetableWarpMode
- * @example
- * s("morgana").bank("wt_digital").seg(8).note("F1").warp("0 0.25 0.5 0.75 1")
- *   .warpmode("<asym bendp spin logistic sync wormhole brownian>*2")
- *
- */
-export const { warpmode, wavetableWarpMode } = registerControl('warpmode', 'wavetableWarpMode');
-
-/**
- * Amount of randomness of the initial phase of the wavetable oscillator.
- *
- * @name wtphaserand
- * @param {number | Pattern} amount Randomness of the initial phase. Between 0 (not random) and 1 (fully random)
- * @synonyms wavetablePhaseRand
- * @example
- * s("basique").bank("wt_digital").seg(16).wtphaserand("<0 1>")
- *
- */
-export const { wtphaserand, wavetablePhaseRand } = registerControl('wtphaserand', 'wavetablePhaseRand');
-
-/**
- * Amount of envelope applied wavetable oscillator's position envelope
- *
- * @name warpenv
- * @param {number | Pattern} amount between 0 and 1
- */
-export const { warpenv } = registerControl('warpenv');
-
-/**
- * cycle synced rate of the LFO for the wavetable warp position
- *
- * @name warpsync
- * @param {number | Pattern} rate rate in cycles
- */
-export const { warpsync } = registerControl('warpsync');
-
 /**
 * Define a custom webaudio node to use as a sound source.
 *
 * @name source
- * @synonyms src
 * @param {function} getSource
 * @synonyms src
 *
@@ -347,7 +103,7 @@ export const { n } = registerControl('n');
 *
 * - a letter (a-g or A-G)
 * - optional accidentals (b or #)
- * - optional (possibly negative) octave number (0-9). Defaults to 3
+ * - optional octave number (0-9). Defaults to 3
 *
 * Examples of valid note names: `c`, `bb`, `Bb`, `f#`, `c3`, `A4`, `Eb2`, `c#5`
 *
@@ -360,8 +116,6 @@ export const { n } = registerControl('n');
 * note("c4 a4 f4 e4")
 * @example
 * note("60 69 65 64")
- * @example
- * note("fbb1 a#0 cbbb-1 e##-2").sound("saw")
 */
 export const { note } = registerControl(['note', 'n']);

@@ -377,8 +131,8 @@ export const { note } = registerControl(['note', 'n']);
 */
 export const { accelerate } = registerControl('accelerate');
 /**
- * Sets the velocity from 0 to 1. Is multiplied together with gain.
 *
+ * Sets the velocity from 0 to 1. Is multiplied together with gain.
 * @name velocity
 * @example
 * s("hh*8")
@@ -488,20 +242,6 @@ export const { fmenv } = registerControl('fmenv');
 *
 */
 export const { fmattack } = registerControl('fmattack');
-
-/**
- * Waveform of the fm modulator
- *
- * @name fmwave
- * @param {number | Pattern} wave waveform
- * @example
- * n("0 1 2 3".fast(4)).scale("d:minor").s("sine").fmwave("<sine square sawtooth crackle>").fm(4).fmh(2.01)
- * @example
- * n("0 1 2 3".fast(4)).chord("<Dm Am F G>").voicing().s("sawtooth").fmwave("brown").fm(.6)
- *
- */
-export const { fmwave } = registerControl('fmwave');
-
 /**
 * Decay time for the FM envelope: seconds until the sustain level is reached after the attack phase.
 *
@@ -545,17 +285,6 @@ export const { fmvelocity } = registerControl('fmvelocity');
 */
 export const { bank } = registerControl('bank');

-/**
- * mix control for the chorus effect
- *
- * @name chorus
- * @param {string | Pattern} chorus mix amount between 0 and 1
- * @example
- * note("d d a# a").s("sawtooth").chorus(.5)
- *
- */
-export const { chorus } = registerControl('chorus');
-
 // analyser node send amount 0 - 1 (used by scope)
 export const { analyze } = registerControl('analyze');
 // fftSize of analyser
@@ -567,7 +296,6 @@ export const { fft } = registerControl('fft');
 *
 * @name decay
 * @param {number | Pattern} time decay time in seconds
- * @synonyms dec
 * @example
 * note("c3 e3 f3 g3").decay("<.1 .2 .3 .4>").sustain(0)
 *
@@ -624,7 +352,7 @@ export const { bandf, bpf, bp } = registerControl(['bandf', 'bandq', 'bpenv'], '
 // ['bpq'],
 export const { bandq, bpq } = registerControl('bandq', 'bpq');
 /**
- * A pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.
+ * a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.
 *
 * @memberof Pattern
 * @name begin
@@ -685,7 +413,7 @@ export const { loopBegin, loopb } = registerControl('loopBegin', 'loopb');
 */
 export const { loopEnd, loope } = registerControl('loopEnd', 'loope');
 /**
- * Bit crusher effect.
+ * bit crusher effect.
 *
 * @name crush
 * @param {number | Pattern} depth between 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).
@@ -696,7 +424,7 @@ export const { loopEnd, loope } = registerControl('loopEnd', 'loope');
 // ['clhatdecay'],
 export const { crush } = registerControl('crush');
 /**
- * Fake-resampling for lowering the sample rate. Caution: This effect seems to only work in chromium based browsers
+ * fake-resampling for lowering the sample rate. Caution: This effect seems to only work in chromium based browsers
 *
 * @name coarse
 * @param {number | Pattern} factor 1 for original 2 for half, 3 for a third and so on.
@@ -707,80 +435,7 @@ export const { crush } = registerControl('crush');
 export const { coarse } = registerControl('coarse');

 /**
- * Modulate the amplitude of a sound with a continuous waveform
- *
- * @name tremolo
- * @synonyms trem
- * @param {number | Pattern} speed modulation speed in HZ
- * @example
- * note("d d d# d".fast(4)).s("supersaw").tremolo("<3 2 100> ").tremoloskew("<.5>")
- *
- */
-export const { tremolo } = registerControl(['tremolo', 'tremolodepth', 'tremoloskew', 'tremolophase'], 'trem');
-
-/**
- * Modulate the amplitude of a sound with a continuous waveform
- *
- * @name tremolosync
- * @synonyms tremsync
- * @param {number | Pattern} cycles modulation speed in cycles
- * @example
- * note("d d d# d".fast(4)).s("supersaw").tremolosync("4").tremoloskew("<1 .5 0>")
- *
- */
-export const { tremolosync } = registerControl(
-  ['tremolosync', 'tremolodepth', 'tremoloskew', 'tremolophase'],
-  'tremsync',
-);
-
-/**
- * Depth of amplitude modulation
- *
- * @name tremolodepth
- * @synonyms tremdepth
- * @param {number | Pattern} depth
- * @example
- * note("a1 a1 a#1 a1".fast(4)).s("pulse").tremsync(4).tremolodepth("<1 2 .7>")
- *
- */
-export const { tremolodepth } = registerControl('tremolodepth', 'tremdepth');
-/**
- * Alter the shape of the modulation waveform
- *
- * @name tremoloskew
- * @synonyms tremskew
- * @param {number | Pattern} amount between 0 & 1, the shape of the waveform
- * @example
- * note("{f a c e}%16").s("sawtooth").tremsync(4).tremoloskew("<.5 0 1>")
- *
- */
-export const { tremoloskew } = registerControl('tremoloskew', 'tremskew');
-
-/**
- * Alter the phase of the modulation waveform
- *
- * @name tremolophase
- * @synonyms tremphase
- * @param {number | Pattern} offset the offset in cycles of the modulation
- * @example
- * note("{f a c e}%16").s("sawtooth").tremsync(4).tremolophase("<0 .25 .66>")
- *
- */
-export const { tremolophase } = registerControl('tremolophase', 'tremphase');
-
-/**
- * Shape of amplitude modulation
- *
- * @name tremoloshape
- * @synonyms tremshape
- * @param {number | Pattern} shape tri | square | sine | saw | ramp
- * @example
- * note("{f g c d}%16").tremsync(4).tremoloshape("<sine tri square>").s("sawtooth")
- *
- */
-export const { tremoloshape } = registerControl('tremoloshape', 'tremshape');
-/**
- * Filter overdrive for supported filter types
+ * filter overdrive for supported filter types
 *
 * @name drive
 * @param {number | Pattern} amount
@@ -790,92 +445,6 @@ export const { tremoloshape } = registerControl('tremoloshape', 'tremshape');
 */
 export const { drive } = registerControl('drive');

-/**
- * Modulate the amplitude of an orbit to create a "sidechain" like effect.
- *
- * Can be applied to multiple orbits with the ':' mininotation, e.g. `duckorbit("2:3")`
- *
- * @name duckorbit
- * @synonyms duck
- * @param {number | Pattern} orbit target orbit
- * @example
- * $: n(run(16)).scale("c:minor:pentatonic").s("sawtooth").delay(.7).orbit(2)
- * $: s("bd:4!4").beat("0,4,8,11,14",16).duckorbit(2).duckattack(0.2).duckdepth(1)
- * @example
- * $: n(run(16)).scale("c:minor:pentatonic").s("sawtooth").delay(.7).orbit(2)
- * $: s("hh*16").orbit(3)
- * $: s("bd:4!4").beat("0,4,8,11,14",16).duckorbit("2:3").duckattack(0.2).duckdepth(1)
- *
- */
-export const { duck } = registerControl('duckorbit', 'duck');
-
-/**
- * The amount of ducking applied to target orbit
- *
- * Can vary across orbits with the ':' mininotation, e.g. `duckdepth("0.3:0.1")`.
- * Note: this requires first applying the effect to multiple orbits with e.g. `duckorbit("2:3")`.
- *
- * @name duckdepth
- * @param {number | Pattern} depth depth of modulation from 0 to 1
- * @example
- * stack( n(run(8)).scale("c:minor").s("sawtooth").delay(.7).orbit(2), s("bd:4!4").beat("0,4,8,11,14",16).duckorbit(2).duckattack(0.2).duckdepth("<1 .9 .6 0>"))
- * @example
- * $: n(run(16)).scale("c:minor:pentatonic").s("sawtooth").delay(.7).orbit(2)
- * $: s("hh*16").orbit(3)
- * $: s("bd:4!4").beat("0,4,8,11,14",16).duckorbit("2:3").duckattack(0.2).duckdepth("1:0.5")
- *
- */
-export const { duckdepth } = registerControl('duckdepth');
-
-/**
- * The time required for the ducked signal(s) to reach their lowest volume.
- * Can be used to prevent clicking or for creative rhythmic effects.
- *
- * Can vary across orbits with the ':' mininotation, e.g. `duckonset("0:0.003")`.
- * Note: this requires first applying the effect to multiple orbits with e.g. `duckorbit("2:3")`.
- *
- * @name duckonset
- * @synonyms duckons
- *
- * @param {number | Pattern} time The onset time in seconds
- * @example
- * // Clicks
- * sound: freq("63.2388").s("sine").orbit(2).gain(4)
- * duckerWithClick: s("bd*4").duckorbit(2).duckattack(0.3).duckonset(0).postgain(0)
- * @example
- * // No clicks
- * sound: freq("63.2388").s("sine").orbit(2).gain(4)
- * duckerWithoutClick: s("bd*4").duckorbit(2).duckattack(0.3).duckonset(0.01).postgain(0)
- * @example
- * // Rhythmic
- * noise: s("pink").distort("2:1").orbit(4) // used rhythmically with 0.3 onset below
- * hhat: s("hh*16").orbit(7)
- * ducker: s("bd*4").bank("tr909").duckorbit("4:7").duckonset("0.3:0.003").duckattack(0.25)
- *
- */
-export const { duckonset } = registerControl('duckonset', 'duckons');
-
-/**
- * The time required for the ducked signal(s) to return to their normal volume.
- *
- * Can vary across orbits with the ':' mininotation, e.g. `duckonset("0:0.003")`.
- * Note: this requires first applying the effect to multiple orbits with e.g. `duckorbit("2:3")`.
- *
- * @name duckattack
- * @synonyms duckatt
- *
- * @param {number | Pattern} time The attack time in seconds
- * @example
- * sound: n(run(8)).scale("c:minor").s("sawtooth").delay(.7).orbit(2)
- * ducker: s("bd:4!4").beat("0,4,8,11,14",16).duckorbit(2).duckattack("<0.2 0 0.4>").duckdepth(1)
- * @example
- * moreduck: n(run(8)).scale("c:minor").s("sawtooth").delay(.7).orbit(2)
- * lessduck: s("hh*16").orbit(5)
- * ducker: s("bd:4!4").beat("0,4,8,11,14",16).duckorbit("2:5").duckattack("0.4:0.1")
- *
- */
-export const { duckattack } = registerControl('duckattack', 'duckatt');
-
 /**
 * Create byte beats with custom expressions
 *
@@ -916,7 +485,7 @@ export const { byteBeatStartTime, bbst } = registerControl('byteBeatStartTime',
 export const { channels, ch } = registerControl('channels', 'ch');

 /**
- * Controls the pulsewidth of the pulse oscillator
+ * controls the pulsewidth of the pulse oscillator
 *
 * @name pw
 * @param {number | Pattern} pulsewidth
@@ -928,7 +497,7 @@ export const { channels, ch } = registerControl('channels', 'ch');
 export const { pw } = registerControl(['pw', 'pwrate', 'pwsweep']);

 /**
- * Controls the lfo rate for the pulsewidth of the pulse oscillator
+ * controls the lfo rate for the pulsewidth of the pulse oscillator
 *
 * @name pwrate
 * @param {number | Pattern} rate
@@ -940,7 +509,7 @@ export const { pw } = registerControl(['pw', 'pwrate', 'pwsweep']);
 export const { pwrate } = registerControl('pwrate');

 /**
- * Controls the lfo sweep for the pulsewidth of the pulse oscillator
+ * controls the lfo sweep for the pulsewidth of the pulse oscillator
 *
 * @name pwsweep
 * @param {number | Pattern} sweep
@@ -981,7 +550,7 @@ export const { phaserrate, ph, phaser } = registerControl(
 export const { phasersweep, phs } = registerControl('phasersweep', 'phs');

 /**
- * The center frequency of the phaser in HZ. Defaults to 1000
+ *  The center frequency of the phaser in HZ. Defaults to 1000
 *
 * @name phasercenter
 * @synonyms phc
@@ -998,7 +567,7 @@ export const { phasercenter, phc } = registerControl('phasercenter', 'phc');
 * The amount the signal is affected by the phaser effect. Defaults to 0.75
 *
 * @name phaserdepth
- * @synonyms phd, phasdp
+ * @synonyms phd
 * @param {number | Pattern} depth number between 0 and 1
 * @example
 * n(run(8)).scale("D:pentatonic").s("sawtooth").release(0.5)
@@ -1009,7 +578,7 @@ export const { phasercenter, phc } = registerControl('phasercenter', 'phc');
 export const { phaserdepth, phd, phasdp } = registerControl('phaserdepth', 'phd', 'phasdp');

 /**
- * Choose the channel the pattern is sent to in superdirt
+ * choose the channel the pattern is sent to in superdirt
 *
 * @name channel
 * @param {number | Pattern} channel channel number
@@ -1361,7 +930,7 @@ export const { resonance, lpq } = registerControl('resonance', 'lpq');
 * @name djf
 * @param {number | Pattern} cutoff below 0.5 is low pass filter, above is high pass filter
 * @example
- * n(irand(16).seg(8)).scale("d:phrygian").s("supersaw").djf("<.5 .3 .2 .75>")
+ * n("0 3 7 [10,24]").s('superzow').octave(3).djf("<.5 .25 .5 .75>").osc()
 *
 */
 export const { djf } = registerControl('djf');
@@ -1395,55 +964,26 @@ export const { delay } = registerControl(['delay', 'delaytime', 'delayfeedback']
 *
 */
 export const { delayfeedback, delayfb, dfb } = registerControl('delayfeedback', 'delayfb', 'dfb');
-
-/**
- * Sets the level of the signal that is fed back into the delay.
- * Caution: Values >= 1 will result in a signal that gets louder and louder! Don't do it
- *
- * @name delayfeedback
- * @param {number | Pattern} feedback between 0 and 1
- * @synonyms delayfb, dfb
- * @example
- * s("bd").delay(.25).delayfeedback("<.25 .5 .75 1>")
- *
- */
-export const { delayspeed } = registerControl('delayspeed');
 /**
 * Sets the time of the delay effect.
 *
- * @name delayspeed
- * @param {number | Pattern} delayspeed controls the pitch of the delay feedback
+ * @name delaytime
+ * @param {number | Pattern} seconds between 0 and Infinity
 * @synonyms delayt, dt
 * @example
- * note("d d a# a".fast(2)).s("sawtooth").delay(.8).delaytime(1/2).delayspeed("<2 .5 -1 -2>")
+ * s("bd bd").delay(.25).delaytime("<.125 .25 .5 1>")
 *
 */
 export const { delaytime, delayt, dt } = registerControl('delaytime', 'delayt', 'dt');
-
-/**
- * Sets the time of the delay effect in cycles.
- *
- * @name delaysync
- * @param {number | Pattern} cycles delay length in cycles
- * @synonyms delayt, dt
- * @example
- * s("bd bd").delay(.25).delaysync("<1 2 3 5>".div(8))
- *
- */
-export const { delaysync } = registerControl('delaysync');
-
-/**
+/* // TODO: test
 * Specifies whether delaytime is calculated relative to cps.
 *
 * @name lock
 * @param {number | Pattern} enable When set to 1, delaytime is a direct multiple of a cycle.
- * @superdirtOnly
 * @example
 * s("sd").delay().lock(1).osc()
 *
- *
 */
-
 export const { lock } = registerControl('lock');
 /**
 * Set detune for stacked voices of supported oscillators
@@ -1493,7 +1033,6 @@ export const { dry } = registerControl('dry');
 * Used when using `begin`/`end` or `chop`/`striate` and friends, to change the fade out time of the 'grain' envelope.
 *
 * @name fadeTime
- * @synonyms fadeOutTime
 * @param {number | Pattern} time between 0 and 1
 * @example
 * s("oh*4").end(.1).fadeTime("<0 .2 .4 .8>").osc()
@@ -1828,29 +1367,6 @@ export const { roomfade, rfade } = registerControl('roomfade', 'rfade');
 *
 */
 export const { ir, iresponse } = registerControl(['ir', 'i'], 'iresponse');
-
-/**
- * Sets speed of the sample for the impulse response.
- * @name irspeed
- * @param {string | Pattern} speed
- * @example
- * samples('github:switchangel/pad')
- * $: s("brk/2").fit().scrub(irand(16).div(16).seg(8)).ir("swpad:4").room(.2).irspeed("<2 1 .5>/2").irbegin(.5).roomsize(.5)
- *
- */
-export const { irspeed } = registerControl('irspeed');
-
-/**
- * Sets the beginning of the IR response sample
- * @name irbegin
- * @param {string | Pattern} begin between 0 and 1
- * @synonyms ir
- * @example
- * samples('github:switchangel/pad')
- * $: s("brk/2").fit().scrub(irand(16).div(16).seg(8)).ir("swpad:4").room(.65).irspeed("-2").irbegin("<0 .5 .75>/2").roomsize(.6)
- *
- */
-export const { irbegin } = registerControl('irbegin');
 /**
 * Sets the room size of the reverb, see `room`.
 * When this property is changed, the reverb will be recaculated, so only change this sparsely..
@@ -2019,6 +1535,18 @@ export const { density } = registerControl('density');
 // ['modwheel'],
 export const { expression } = registerControl('expression');
 export const { sustainpedal } = registerControl('sustainpedal');
+/* // TODO: doesn't seem to do anything
+ *
+ * Tremolo Audio DSP effect
+ *
+ * @name tremolodepth
+ * @param {number | Pattern} depth between 0 and 1
+ * @example
+ * n("0,4,7").tremolodepth("<0 .3 .6 .9>").osc()
+ *
+ */
+export const { tremolodepth, tremdp } = registerControl('tremolodepth', 'tremdp');
+export const { tremolorate, tremr } = registerControl('tremolorate', 'tremr');

 export const { fshift } = registerControl('fshift');
 export const { fshiftnote } = registerControl('fshiftnote');
@@ -2095,6 +1623,7 @@ export const { zmod } = registerControl('zmod');
 // like crush but scaled differently
 export const { zcrush } = registerControl('zcrush');
 export const { zdelay } = registerControl('zdelay');
+export const { tremolo } = registerControl('tremolo');
 export const { zzfx } = registerControl('zzfx');

 /**
@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import createClock from './zyklus.mjs';
-import { errorLogger, logger } from './logger.mjs';
+import { logger } from './logger.mjs';

 export class Cyclist {
  constructor({
@@ -67,7 +67,6 @@ export class Cyclist {
              // the following line is dumb and only here for backwards compatibility
              // see https://codeberg.org/uzu/strudel/pulls/1004
              const deadline = targetTime - phase;
-              // this onTrigger has another signature
              onTrigger?.(hap, deadline, duration, this.cps, targetTime);
              if (hap.value.cps !== undefined && this.cps != hap.value.cps) {
                this.cps = hap.value.cps;
@@ -76,7 +75,7 @@ export class Cyclist {
            }
          });
        } catch (e) {
-          errorLogger(e);
+          logger(`[cyclist] error: ${e.message}`);
          onError?.(e);
        }
      },
@@ -10,7 +10,7 @@ https://rohandrape.net/?t=hmt
 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 { timeCat, register, silence, stack, pure, _morph } from './pattern.mjs';
+import { timeCat, register, silence } from './pattern.mjs';
 import { rotate, flatten, splitAt, zipWith } from './util.mjs';
 import Fraction, { lcm } from './fraction.mjs';

@@ -139,14 +139,6 @@ export const euclid = register('euclid', function (pulses, steps, pat) {
  return pat.struct(_euclidRot(pulses, steps, 0));
 });

-export const e = register('e', function (euc, pat) {
-  if (!Array.isArray(euc)) {
-    euc = [euc];
-  }
-  const [pulses, steps = pulses, rot = 0] = euc;
-  return pat.struct(_euclidRot(pulses, steps, rot));
-});
-
 export const { euclidrot, euclidRot } = register(['euclidrot', 'euclidRot'], function (pulses, steps, rotation, pat) {
  return pat.struct(_euclidRot(pulses, steps, rotation));
 });
@@ -196,26 +188,3 @@ export const euclidLegato = register(['euclidLegato'], function (pulses, steps,
 export const euclidLegatoRot = register(['euclidLegatoRot'], function (pulses, steps, rotation, pat) {
  return _euclidLegato(pulses, steps, rotation, pat);
 });
-
-/**
- * A 'euclid' variant with an additional parameter that morphs the resulting
- * rhythm from 0 (no morphing) to 1 (completely 'even'). For example
- * `sound("bd").euclidish(3,8,0)` would be the same as
- * `sound("bd").euclid(3,8)`, and `sound("bd").euclidish(3,8,1)` would be the
- * same as `sound("bd bd bd")`. `sound("bd").euclidish(3,8,0.5)` would have a
- * groove somewhere between.
- * Inspired by the work of Malcom Braff.
- * @name euclidish
- * @synonyms eish
- * @memberof Pattern
- * @param {number} pulses the number of onsets
- * @param {number} steps the number of steps to fill
- * @param {number} groove exists between the extremes of 0 (straight euclidian) and 1 (straight pulse)
- * @example
- * sound("hh").euclidish(7,12,sine.slow(8))
- * .pan(sine.slow(8))
- */
-export const { euclidish, eish } = register(['euclidish', 'eish'], function (pulses, steps, perc, pat) {
-  const morphed = _morph(bjork(pulses, steps), new Array(pulses).fill(1), perc);
-  return pat.struct(morphed).setSteps(steps);
-});
@@ -4,8 +4,6 @@ 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/>.
 */

-export const strudelScope = {};
-
 export const evalScope = async (...args) => {
  const results = await Promise.allSettled(args);
  const modules = results.filter((result) => result.status === 'fulfilled').map((r) => r.value);
@@ -20,7 +18,6 @@ export const evalScope = async (...args) => {
  modules.forEach((module) => {
    Object.entries(module).forEach(([name, value]) => {
      globalThis[name] = value;
-      strudelScope[name] = value;
    });
  });
  return modules;
@@ -126,8 +126,6 @@ export const lcm = (...fractions) => {
  );
 };

-export const isFraction = (x) => x instanceof Fraction;
-
 fraction._original = Fraction;

 export default fraction;
@@ -4,7 +4,6 @@ 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 Fraction from './fraction.mjs';
-import { stringifyValues } from './util.mjs';

 export class Hap {
  /*
@@ -149,7 +148,13 @@ export class Hap {
  }

  showWhole(compact = false) {
-    return `${this.whole == undefined ? '~' : this.whole.show()}: ${stringifyValues(this.value, compact)}`;
+    return `${this.whole == undefined ? '~' : this.whole.show()}: ${
+      typeof this.value === 'object'
+        ? compact
+          ? JSON.stringify(this.value).slice(1, -1).replaceAll('"', '').replaceAll(',', ' ')
+          : JSON.stringify(this.value)
+        : this.value
+    }`;
  }

  combineContext(b) {
@@ -4,13 +4,6 @@ let debounce = 1000,
  lastMessage,
  lastTime;

-export function errorLogger(e, origin = 'cyclist') {
-  if (process.env.NODE_ENV === 'development') {
-    console.error(e);
-  }
-  logger(`[${origin}] error: ${e.message}`);
-}
-
 export function logger(message, type, data = {}) {
  let t = performance.now();
  if (lastMessage === message && t - lastTime < debounce) {
@@ -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
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/core",
-  "version": "1.2.4",
+  "version": "1.2.2",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import TimeSpan from './timespan.mjs';
-import Fraction, { isFraction, lcm } from './fraction.mjs';
+import Fraction, { lcm } from './fraction.mjs';
 import Hap from './hap.mjs';
 import State from './state.mjs';
 import { unionWithObj } from './value.mjs';
@@ -21,8 +21,7 @@ import {
  numeralArgs,
  parseNumeral,
  pairs,
-  zipWith,
-  stringifyValues,
+  noteToMidi,
 } from './util.mjs';
 import drawLine from './drawLine.mjs';
 import { logger } from './logger.mjs';
@@ -854,29 +853,14 @@ export class Pattern {
    );
  }

-  /**
-   * Writes the content of the current event to the console (visible in the side menu).
-   * @name log
-   * @memberof Pattern
-   * @example
-   * s("bd sd").log()
-   */
-  log(func = (hap) => `[hap] ${hap.showWhole(true)}`, getData = (hap) => ({ hap })) {
+  log(func = (_, hap) => `[hap] ${hap.showWhole(true)}`, getData = (_, hap) => ({ hap })) {
    return this.onTrigger((...args) => {
      logger(func(...args), undefined, getData(...args));
    }, false);
  }

-  /**
-   * A simplified version of `log` which writes all "values" (various configurable parameters)
-   * within the event to the console (visible in the side menu).
-   * @name logValues
-   * @memberof Pattern
-   * @example
-   * s("bd sd").gain("0.25 0.5 1").n("2 1 0").logValues()
-   */
-  logValues(func = (value) => `[hap] ${stringifyValues(value, true)}`) {
-    return this.log((hap) => func(hap.value));
+  logValues(func = id) {
+    return this.log((_, hap) => func(hap.value));
  }

  //////////////////////////////////////////////////////////////////////
@@ -886,31 +870,6 @@ export class Pattern {
    console.log(drawLine(this));
    return this;
  }
-
-  //////////////////////////////////////////////////////////////////////
-  // methods relating to breaking patterns into subcycles
-
-  // Breaks a pattern into a pattern of patterns, according to the structure of the given binary pattern.
-  unjoin(pieces, func = id) {
-    return pieces.withHap((hap) =>
-      hap.withValue((v) => (v ? func(this.ribbon(hap.whole.begin, hap.whole.duration)) : this)),
-    );
-  }
-
-  /**
-   * Breaks a pattern into pieces according to the structure of a given pattern.
-   * True values in the given pattern cause the corresponding subcycle of the
-   * source pattern to be looped, and for an (optional) given function to be
-   * applied. False values result in the corresponding part of the source pattern
-   * to be played unchanged.
-   * @name into
-   * @memberof Pattern
-   * @example
-   * sound("bd sd ht lt").into("1 0", hurry(2))
-   */
-  into(pieces, func) {
-    return this.unjoin(pieces, func).innerJoin();
-  }
 }

 //////////////////////////////////////////////////////////////////////
@@ -946,13 +905,12 @@ Pattern.prototype.collect = function () {
 * note("<[c,eb,g]!2 [c,f,ab] [d,f,ab]>")
 * .arpWith(haps => haps[2])
 * */
-export const arpWith = register('arpWith', (func, pat) => {
-  return pat
-    .collect()
+Pattern.prototype.arpWith = function (func) {
+  return this.collect()
    .fmap((v) => reify(func(v)))
    .innerJoin()
    .withHap((h) => new Hap(h.whole, h.part, h.value.value, h.combineContext(h.value)));
-});
+};

 /**
 * Selects indices in in stacked notes.
@@ -960,11 +918,9 @@ export const arpWith = register('arpWith', (func, pat) => {
 * note("<[c,eb,g]!2 [c,f,ab] [d,f,ab]>")
 * .arp("0 [0,2] 1 [0,2]")
 * */
-export const arp = register(
-  'arp',
-  (indices, pat) => pat.arpWith((haps) => reify(indices).fmap((i) => haps[i % haps.length])),
-  false,
-);
+Pattern.prototype.arp = function (pat) {
+  return this.arpWith((haps) => pat.fmap((i) => haps[i % haps.length]));
+};

 /*
 * Takes a time duration followed by one or more patterns, and shifts the given patterns in time, so they are
@@ -999,7 +955,7 @@ addToPrototype('weaveWith', function (t, ...funcs) {
 // compose matrix functions

 function _nonArrayObject(x) {
-  return !Array.isArray(x) && typeof x === 'object' && !isFraction(x);
+  return !Array.isArray(x) && typeof x === 'object';
 }
 function _composeOp(a, b, func) {
  if (_nonArrayObject(a) || _nonArrayObject(b)) {
@@ -1246,8 +1202,7 @@ export const silence = gap(1);
 /* Like silence, but with a 'steps' (relative duration) of 0 */
 export const nothing = gap(0);

-/**
- * A discrete value that repeats once per cycle.
+/** A discrete value that repeats once per cycle.
 *
 * @returns {Pattern}
 * @example
@@ -1300,14 +1255,13 @@ export function sequenceP(pats) {
  return result;
 }

-/**
- * The given items are played at the same time at the same length.
+/** The given items are played at the same time at the same length.
 *
 * @return {Pattern}
 * @synonyms polyrhythm, pr
 * @example
 * stack("g3", "b3", ["e4", "d4"]).note()
- * // "g3,b3,[e4 d4]".note()
+ * // "g3,b3,[e4,d4]".note()
 *
 * @example
 * // As a chained function:
@@ -1384,11 +1338,11 @@ export function stackBy(by, ...pats) {
    .setSteps(steps);
 }

-/**
- * Concatenation: combines a list of patterns, switching between them successively, one per cycle.
+/** Concatenation: combines a list of patterns, switching between them successively, one per cycle:
+ *
+ * synonyms: `cat`
 *
 * @return {Pattern}
- * @synonyms cat
 * @example
 * slowcat("e5", "b4", ["d5", "c5"])
 *
@@ -1588,7 +1542,7 @@ export const func = curry((a, b) => reify(b).func(a));
 /**
 * Registers a new pattern method. The method is added to the Pattern class + the standalone function is returned from register.
 *
- * @param {string | string[]} name name of the function, or an array of names to be used as synonyms
+ * @param {string} name name of the function
 * @param {function} func function with 1 or more params, where last is the current pattern
 * @noAutocomplete
 *
@@ -2028,7 +1982,6 @@ export const apply = register('apply', function (func, pat) {

 /**
 * Plays the pattern at the given cycles per minute.
- * @deprecated
 * @example
 * s("<bd sd>,hh*2").cpm(90) // = 90 bpm
 */
@@ -2399,57 +2352,6 @@ export const stut = register('stut', function (times, feedback, time, pat) {
  return pat._echoWith(times, time, (pat, i) => pat.gain(Math.pow(feedback, i)));
 });

-export const applyN = register('applyN', function (n, func, p) {
-  let result = p;
-  for (let i = 0; i < n; i++) {
-    result = func(result);
-  }
-  return result;
-});
-
-/**
- * The plyWith function repeats each event the given number of times, applying the given function to each event.\n
- * @name plyWith
- * @synonyms plywith
- * @param {number} factor how many times to repeat
- * @param {function} func function to apply, given the pattern
- * @example
- * "<0 [2 4]>"
- * .plyWith(4, (p) => p.add(2))
- * .scale("C:minor").note()
- */
-export const plyWith = register(['plyWith', 'plywith'], function (factor, func, pat) {
-  const result = pat
-    .fmap((x) => cat(...listRange(0, factor - 1).map((i) => applyN(i, func, x)))._fast(factor))
-    .squeezeJoin();
-  if (__steps) {
-    result._steps = Fraction(factor).mulmaybe(pat._steps);
-  }
-  return result;
-});
-
-/**
- * The plyForEach function repeats each event the given number of times, applying the given function to each event.
- * This version of ply uses the iteration index as an argument to the function, similar to echoWith.
- * @name plyForEach
- * @synonyms plyforeach
- * @param {number} factor how many times to repeat
- * @param {function} func function to apply, given the pattern and the iteration index
- * @example
- * "<0 [2 4]>"
- * .plyForEach(4, (p,n) => p.add(n*2))
- * .scale("C:minor").note()
- */
-export const plyForEach = register(['plyForEach', 'plyforeach'], function (factor, func, pat) {
-  const result = pat
-    .fmap((x) => cat(cat(pure(x), ...listRange(1, factor - 1).map((i) => func(pure(x), i))))._fast(factor))
-    .squeezeJoin();
-  if (__steps) {
-    result._steps = Fraction(factor).mulmaybe(pat._steps);
-  }
-  return result;
-});
-
 /**
 * Divides a pattern into a given number of subdivisions, plays the subdivisions in order, but increments the starting subdivision each cycle. The pattern wraps to the first subdivision after the last subdivision is played.
 * @name iter
@@ -2589,37 +2491,6 @@ export const { fastchunk, fastChunk } = register(
  true,
 );

-/**
- * Like `chunk`, but the function is applied to a looped subcycle of the source pattern.
- * @name chunkInto
- * @synonyms chunkinto
- * @memberof Pattern
- * @example
- * sound("bd sd ht lt bd - cp lt").chunkInto(4, hurry(2))
- *   .bank("tr909")
- */
-export const { chunkinto, chunkInto } = register(['chunkinto', 'chunkInto'], function (n, func, pat) {
-  return pat.into(fastcat(true, ...Array(n - 1).fill(false))._iterback(n), func);
-});
-
-/**
- * Like `chunkInto`, but moves backwards through the chunks.
- * @name chunkBackInto
- * @synonyms chunkbackinto
- * @memberof Pattern
- * @example
- * sound("bd sd ht lt bd - cp lt").chunkInto(4, hurry(2))
- *   .bank("tr909")
- */
-export const { chunkbackinto, chunkBackInto } = register(['chunkbackinto', 'chunkBackInto'], function (n, func, pat) {
-  return pat.into(
-    fastcat(true, ...Array(n - 1).fill(false))
-      ._iter(n)
-      ._early(1),
-    func,
-  );
-});
-
 // TODO - redefine elsewhere in terms of mask
 export const bypass = register(
  'bypass',
@@ -2635,7 +2506,7 @@ export const bypass = register(
 * Loops the pattern inside an `offset` for `cycles`.
 * If you think of the entire span of time in cycles as a ribbon, you can cut a single piece and loop it.
 * @name ribbon
- * @synonyms rib
+ * @synonym rib
 * @param {number} offset start point of loop in cycles
 * @param {number} cycles loop length in cycles
 * @example
@@ -2849,7 +2720,7 @@ export function stepcat(...timepats) {
  if (timepats.length === 0) {
    return nothing;
  }
-  const findsteps = (x) => (Array.isArray(x) ? x : [x._steps ?? 1, x]);
+  const findsteps = (x) => (Array.isArray(x) ? x : [x._steps, x]);
  timepats = timepats.map(findsteps);
  if (timepats.find((x) => x[0] === undefined)) {
    const times = timepats.map((a) => a[0]).filter((x) => x !== undefined);
@@ -3330,10 +3201,10 @@ export const slice = register(
 * @memberof Pattern
 *  @returns Pattern
 * @example
- * s("bd!8").onTriggerTime((hap) => {console.log(hap)})
+ * s("bd!8").onTriggerTime((hap) => {console.info(hap)})
 */
 Pattern.prototype.onTriggerTime = function (func) {
-  return this.onTrigger((hap, currentTime, _cps, targetTime) => {
+  return this.onTrigger((t_deprecate, hap, currentTime, cps = 1, targetTime) => {
    const diff = targetTime - currentTime;
    window.setTimeout(() => {
      func(hap);
@@ -3471,68 +3342,44 @@ export const { beat } = register(
  __beat((x) => x.innerJoin()),
 );

-export const _morph = (from, to, by) => {
-  by = Fraction(by);
-  const dur = Fraction(1).div(from.length);
-  const positions = (list) => {
-    const result = [];
-    for (const [pos, value] of list.entries()) {
-      if (value) {
-        result.push([Fraction(pos).div(list.length), value]);
-      }
-    }
-    return result;
-  };
-  const arcs = zipWith(
-    ([posa, valuea], [posb, valueb]) => {
-      const b = by.mul(posb - posa).add(posa);
-      const e = b.add(dur);
-      return new TimeSpan(b, e);
-    },
-    positions(from),
-    positions(to),
+const __quantizeBy = (lens, scale, pat) => {
+  // Supports ':' list syntax in mininotation
+  scale = (Array.isArray(scale) ? scale.flat() : [scale]).flatMap((val) =>
+    typeof val === 'number' ? val : noteToMidi(val) - 48,
  );
-  function query(state) {
-    const cycle = state.span.begin.sam();
-    const cycleArc = state.span.cycleArc();
-    const result = [];
-    for (const whole of arcs) {
-      const part = whole.intersection(cycleArc);
-      if (part !== undefined) {
-        result.push(
-          new Hap(
-            whole.withTime((x) => x.add(cycle)),
-            part.withTime((x) => x.add(cycle)),
-            true,
-          ),
-        );
-      }
+
+  return pat.withHap((hap) => {
+    const isObject = typeof hap.value === 'object';
+    let note = isObject ? hap.value.n : hap.value;
+    if (typeof note === 'number') {
+      note = note;
    }
-    return result;
-  }
-  return new Pattern(query).splitQueries();
+    if (typeof note === 'string') {
+      note = noteToMidi(note);
+    }
+
+    if (isObject) {
+      delete hap.value.n; // remove n so it won't cause trouble
+    }
+    const octave = (note / lens) >> 0;
+    const transpose = octave * lens;
+
+    const goal = note - transpose;
+    note =
+      scale.reduce((prev, curr) => {
+        return Math.abs(curr - goal) < Math.abs(prev - goal) ? curr : prev;
+      }) + transpose;
+
+    return hap.withValue(() => (isObject ? { ...hap.value, note } : note));
+  });
 };

 /**
- * Takes two binary rhythms represented as lists of 1s and 0s, and a number
- * between 0 and 1 that morphs between them. The two lists should contain the same
- * number of true values.
+ * Snap note values to a chosen array of notes within a 12 note/octave scale
+ * @name quantize
 * @example
- * sound("hh").struct(morph([1,0,1,0,1,0,1,0], // straight rhythm
- *                          [1,1,0,1,0,1,0], // wonky rhythm
- *                          0.25 // creates a slightly wonky rhythm
- *                         )
- *                   )
- * @example
- * sound("hh").struct(morph("1:0:1:0:1:0:1:0", // straight rhythm
- *                          "1:1:0:1:0:1:0", // wonky rhythm
- *                          sine.slow(8) // slowly morph between the rhythms
- *                         )
- *                   )
+ * note(irand(35).add(48).seg(16).quantize("d:a:a#:f")).s("pulse")
 */
-export const morph = (frompat, topat, bypat) => {
-  frompat = reify(frompat);
-  topat = reify(topat);
-  bypat = reify(bypat);
-  return frompat.innerBind((from) => topat.innerBind((to) => bypat.innerBind((by) => _morph(from, to, by))));
-};
+export const { quantize } = register(['quantize'], (scale, pat) => {
+  return __quantizeBy(12, scale, pat);
+});
@@ -1,7 +1,7 @@
 import { NeoCyclist } from './neocyclist.mjs';
 import { Cyclist } from './cyclist.mjs';
 import { evaluate as _evaluate } from './evaluate.mjs';
-import { errorLogger, logger } from './logger.mjs';
+import { logger } from './logger.mjs';
 import { setTime } from './time.mjs';
 import { evalScope } from './evaluate.mjs';
 import { register, Pattern, isPattern, silence, stack } from './pattern.mjs';
@@ -21,7 +21,6 @@ export function repl({
  setInterval,
  clearInterval,
  id,
-  mondo = false,
 }) {
  const state = {
    schedulerError: undefined,
@@ -74,14 +73,6 @@ export function repl({
    return silence;
  };

-  // helper to get a patternified pure value out
-  function unpure(pat) {
-    if (pat._Pattern) {
-      return pat.__pure;
-    }
-    return pat;
-  }
-
  const setPattern = async (pattern, autostart = true) => {
    pattern = editPattern?.(pattern) || pattern;
    await scheduler.setPattern(pattern, autostart);
@@ -93,25 +84,8 @@ export function repl({
  const start = () => scheduler.start();
  const pause = () => scheduler.pause();
  const toggle = () => scheduler.toggle();
-  const setCps = (cps) => {
-    scheduler.setCps(unpure(cps));
-    return silence;
-  };
-
-  /**
-   * Changes the global tempo to the given cycles per minute
-   *
-   * @name setcpm
-   * @alias setCpm
-   * @param {number} cpm cycles per minute
-   * @example
-   * setcpm(140/4) // =140 bpm in 4/4
-   * $: s("bd*4,[- sd]*2").bank('tr707')
-   */
-  const setCpm = (cpm) => {
-    scheduler.setCps(unpure(cpm) / 60);
-    return silence;
-  };
+  const setCps = (cps) => scheduler.setCps(cps);
+  const setCpm = (cpm) => scheduler.setCps(cpm / 60);

  // TODO - not documented as jsdoc examples as the test framework doesn't simulate enough context for `each` and `all`..

@@ -128,9 +102,8 @@ export function repl({
   * all(x => x.pianoroll())
   * ```
   */
-  let allTransforms = [];
  const all = function (transform) {
-    allTransforms.push(transform);
+    allTransform = transform;
    return silence;
  };
  /** Applies a function to each of the running patterns separately. This is intended for future use with upcoming 'stepwise' features. See `all` for a version that applies the function to all the patterns stacked together into a single pattern.
@@ -206,12 +179,7 @@ export function repl({
      await injectPatternMethods();
      setTime(() => scheduler.now()); // TODO: refactor?
      await beforeEval?.({ code });
-      allTransforms = []; // reset all transforms
      shouldHush && hush();
-
-      if (mondo) {
-        code = `mondolang\`${code}\``;
-      }
      let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
      if (Object.keys(pPatterns).length) {
        let patterns = Object.values(pPatterns);
@@ -223,10 +191,8 @@ export function repl({
      } else if (eachTransform) {
        pattern = eachTransform(pattern);
      }
-      if (allTransforms.length) {
-        for (let i in allTransforms) {
-          pattern = allTransforms[i](pattern);
-        }
+      if (allTransform) {
+        pattern = allTransform(pattern);
      }
      if (!isPattern(pattern)) {
        const message = `got "${typeof evaluated}" instead of pattern`;
@@ -259,7 +225,6 @@ export function repl({
 export const getTrigger =
  ({ getTime, defaultOutput }) =>
  async (hap, deadline, duration, cps, t) => {
-    //   ^ this signature is different from hap.context.onTrigger, as set by Pattern.onTrigger(onTrigger)
    // TODO: get rid of deadline after https://codeberg.org/uzu/strudel/pulls/1004
    try {
      if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
@@ -267,9 +232,9 @@ export const getTrigger =
      }
      if (hap.context.onTrigger) {
        // call signature of output / onTrigger is different...
-        await hap.context.onTrigger(hap, getTime(), cps, t);
+        await hap.context.onTrigger(getTime() + deadline, hap, getTime(), cps, t);
      }
    } catch (err) {
-      errorLogger(err, 'getTrigger');
+      logger(`[cyclist] error: ${err.message}`, 'error');
    }
  };
@@ -71,6 +71,7 @@ export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));

 /**
 *  A sine signal between 0 and 1.
+ *
 * @return {Pattern}
 * @example
 * n(sine.segment(16).range(0,15))
@@ -99,6 +100,7 @@ export const cosine2 = sine2._early(Fraction(1).div(4));

 /**
 *  A square signal between 0 and 1.
+ *
 * @return {Pattern}
 * @example
 * n(square.segment(4).range(0,7)).scale("C:minor")
@@ -264,7 +266,7 @@ export const randrun = (n) => {
    const rands = timeToRands(t.floor().add(0.5), n);
    const nums = rands
      .map((n, i) => [n, i])
-      .sort((a, b) => (a[0] > b[0]) - (a[0] < b[0]))
+      .sort((a, b) => a[0] > b[0] - a[0] < b[0])
      .map((x) => x[1]);
    const i = t.cyclePos().mul(n).floor() % n;
    return nums[i];
@@ -283,7 +285,7 @@ const _rearrangeWith = (ipat, n, pat) => {
 * @example
 * note("c d e f").sound("piano").shuffle(4)
 * @example
- * seq("c d e f".shuffle(4), "g").note().sound("piano")
+ * note("c d e f".shuffle(4), "g").sound("piano")
 */
 export const shuffle = register('shuffle', (n, pat) => {
  return _rearrangeWith(randrun(n), n, pat);
@@ -296,7 +298,7 @@ export const shuffle = register('shuffle', (n, pat) => {
 * @example
 * note("c d e f").sound("piano").scramble(4)
 * @example
- * seq("c d e f".scramble(4), "g").note().sound("piano")
+ * note("c d e f".scramble(4), "g").sound("piano")
 */
 export const scramble = register('scramble', (n, pat) => {
  return _rearrangeWith(_irand(n)._segment(n), n, pat);
@@ -396,10 +398,6 @@ export const chooseInWith = (pat, xs) => {
 */
 export const choose = (...xs) => chooseWith(rand, xs);

-// todo: doc
-export const chooseIn = (...xs) => chooseInWith(rand, xs);
-export const chooseOut = choose;
-
 /**
 * Chooses from the given list of values (or patterns of values), according
 * to the pattern that the method is called on. The pattern should be in
@@ -32,7 +32,7 @@ function triggerSpeech(words, lang, voice) {
 }

 export const speak = register('speak', function (lang, voice, pat) {
-  return pat.onTrigger((hap) => {
+  return pat.onTrigger((_, hap) => {
    triggerSpeech(hap.value, lang, voice);
  });
 });
@@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th

 import Fraction from 'fraction.js';

-import { describe, it, expect, vi } from 'vitest';
+import { describe, it, expect } from 'vitest';

 import {
  TimeSpan,
@@ -52,11 +52,8 @@ import {
  stackCentre,
  stepcat,
  sometimes,
-  expand,
 } from '../index.mjs';

-import { log, logValues } from '../pattern.mjs';
-
 import { steady } from '../signal.mjs';

 import { n, s } from '../controls.mjs';
@@ -1004,7 +1001,7 @@ describe('Pattern', () => {
  });
  describe('hurry', () => {
    it('Can speed up patterns and sounds', () => {
-      sameFirst(s(sequence('a', 'b')).hurry(2), s(sequence('a', 'b')).fast(2).speed(2));
+      sameFirst(s('a', 'b').hurry(2), s('a', 'b').fast(2).speed(2));
    });
  });
  /*describe('composable functions', () => {
@@ -1182,9 +1179,6 @@ describe('Pattern', () => {
    it('calculates undefined steps as the average', () => {
      expect(sameFirst(stepcat(pure(1), pure(2), pure(3).setSteps(undefined)), fastcat(1, 2, 3)));
    });
-    it('works with auto-reified values', () => {
-      expect(sameFirst(stepcat(expand(3, 'bd'), 'rim'), stepcat(expand(3, 'bd'), pure('rim'))));
-    });
  });
  describe('shrink', () => {
    it('can shrink', () => {
@@ -1273,75 +1267,4 @@ describe('Pattern', () => {
      );
    });
  });
-  describe('unjoin', () => {
-    it('destructures a pattern into subcycles', () => {
-      sameFirst(
-        fastcat('a', 'b', 'c', 'd')
-          .unjoin(fastcat(true, fastcat(true, true)))
-          .fmap(fast(2))
-          .join(),
-        fastcat('a', 'b', 'a', 'b', 'c', 'c', 'd', 'd'),
-      );
-    });
-  });
-  describe('into', () => {
-    it('applies a function to subcycles of a pattern', () => {
-      sameFirst(
-        fastcat('a', 'b', 'c', 'd').into(fastcat(fastcat('true', 'true'), 'true'), fast(2)),
-        fastcat('a', 'a', 'b', 'b', 'c', 'd', 'c', 'd'),
-      );
-    });
-  });
-  describe('chunkinto', () => {
-    it('chunks into subcycles', () => {
-      sameFirst(
-        fastcat('a', 'b', 'c').chunkInto(3, fast(2)).fast(3),
-        fastcat(fastcat('a', 'a'), 'b', 'c', 'a', fastcat('b', 'b'), 'c', 'a', 'b', fastcat('c', 'c')),
-      );
-    });
-  });
-  describe('chunkbackinto', () => {
-    it('chunks into subcycles backwards', () => {
-      sameFirst(
-        fastcat('a', 'b', 'c').chunkBackInto(3, fast(2)).fast(3),
-        fastcat('a', 'b', fastcat('c', 'c'), 'a', fastcat('b', 'b'), 'c', fastcat('a', 'a'), 'b', 'c'),
-      );
-    });
-  });
-  describe('log', () => {
-    it('logs to console', () => {
-      const mockConsoleLog = vi.spyOn(console, 'log').mockImplementation(() => {});
-      const pattern = pure('a').log();
-      const haps = pattern.queryArc(0, 1);
-
-      // Force a trigger
-      haps.forEach((hap) => {
-        hap.context?.onTrigger?.(hap);
-      });
-
-      expect(mockConsoleLog).toHaveBeenCalledWith(
-        '%c[hap] 0/1 → 1/1: a',
-        'background-color: black;color:white;border-radius:15px',
-      );
-      mockConsoleLog.mockRestore();
-    });
-  });
-  describe('logValues', () => {
-    it('logs values to console', () => {
-      const mockConsoleLog = vi.spyOn(console, 'log').mockImplementation(() => {});
-      const pattern = pure('a').note('c#').logValues();
-      const haps = pattern.queryArc(0, 1);
-
-      // Force a trigger
-      haps.forEach((hap) => {
-        hap.context?.onTrigger?.(hap);
-      });
-
-      expect(mockConsoleLog).toHaveBeenCalledWith(
-        '%c[hap] value:a note:c#',
-        'background-color: black;color:white;border-radius:15px',
-      );
-      mockConsoleLog.mockRestore();
-    });
-  });
 });
@@ -72,7 +72,7 @@ export class TimeSpan {
  }

  intersection(other) {
-    // Intersection of two timespans, returns undefined if they don't intersect.
+    // Intersection of two timespans, returns None if they don't intersect.
    const intersect_begin = this.begin.max(other.begin);
    const intersect_end = this.end.min(other.end);

@@ -8,12 +8,12 @@ import { logger } from './logger.mjs';

 // returns true if the given string is a note
 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 isNote = (name) => /^[a-gA-G][#bsf]*[0-9]?$/.test(name);
 export const tokenizeNote = (note) => {
  if (typeof note !== 'string') {
    return [];
  }
-  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bsf]*)(-?[0-9]*)$/)?.slice(1) || [];
+  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bsf]*)([0-9]*)$/)?.slice(1) || [];
  if (!pc) {
    return [];
  }
@@ -487,13 +487,3 @@ export function getCurrentKeyboardState() {
 //   }
 //   return lcm((x * y) / gcd(x, y), ...z);
 // };
-
-// Takes values -- typically derived from events, i.e. `hap`s -- and renders them
-// into a readable format
-export function stringifyValues(value, compact = false) {
-  return typeof value === 'object'
-    ? compact
-      ? JSON.stringify(value).slice(1, -1).replaceAll('"', '').replaceAll(',', ' ')
-      : JSON.stringify(value)
-    : value;
-}
@@ -23,7 +23,7 @@ export const csound = register('csound', (instrument, pat) => {
  instrument = instrument || 'triangle';
  init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
  // TODO: find a alternative way to wait for csound to load (to wait with first time playback)
-  return pat.onTrigger((hap, currentTime, _cps, targetTime) => {
+  return pat.onTrigger((time_deprecate, hap, currentTime, _cps, targetTime) => {
    if (!_csound) {
      logger('[csound] not loaded yet', 'warning');
      return;
@@ -142,7 +142,7 @@ export const csoundm = register('csoundm', (instrument, pat) => {
    p1 = `"${instrument}"`;
  }
  init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
-  return pat.onTrigger((hap, currentTime, _cps, targetTime) => {
+  return pat.onTrigger((tidal_time, hap) => {
    if (!_csound) {
      logger('[csound] not loaded yet', 'warning');
      return;
@@ -151,7 +151,7 @@ export const csoundm = register('csoundm', (instrument, pat) => {
      throw new Error('csound only support objects as hap values');
    }
    // Time in seconds counting from now.
-    const p2 = targetTime - currentTime;
+    const p2 = tidal_time - getAudioContext().currentTime;
    const p3 = hap.duration.valueOf() + 0;
    const frequency = getFrequency(hap);
    let { gain = 1, velocity = 0.9 } = hap.value;
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/csound",
-  "version": "1.2.5",
+  "version": "1.2.3",
  "description": "csound bindings for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -6,7 +6,7 @@ const OFF_MESSAGE = 0x80;
 const CC_MESSAGE = 0xb0;

 Pattern.prototype.midi = function (output) {
-  return this.onTrigger((hap, currentTime, cps, targetTime) => {
+  return this.onTrigger((time_deprecate, hap, currentTime, cps, targetTime) => {
    let { note, nrpnn, nrpv, ccn, ccv, velocity = 0.9, gain = 1 } = hap.value;
    //magic number to get audio engine to line up, can probably be calculated somehow
    const latencyMs = 34;
@@ -4,7 +4,7 @@ import { Invoke } from './utils.mjs';

 const collator = new ClockCollator({});

-export async function oscTriggerTauri(hap, currentTime, cps = 1, targetTime) {
+export async function oscTriggerTauri(t_deprecate, hap, currentTime, cps = 1, targetTime) {
  const controls = parseControlsFromHap(hap, cps);
  const params = [];
  const timestamp = collator.calculateTimestamp(currentTime, targetTime);
@@ -150,7 +150,7 @@ export class Drawer {
        this.lastFrame = phase;
        this.visibleHaps = (this.visibleHaps || [])
          // filter out haps that are too far in the past (think left edge of screen for pianoroll)
-          .filter((h) => h.whole && h.endClipped >= phase - lookbehind - lookahead)
+          .filter((h) => h.endClipped >= phase - lookbehind - lookahead)
          // add new haps with onset (think right edge bars scrolling in)
          .concat(haps.filter((h) => h.hasOnset()));
        const time = phase - lookahead;
@@ -175,7 +175,7 @@ export class Drawer {
    // +0.1 = workaround for weird holes in query..
    const [begin, end] = [Math.max(t, 0), t + lookahead + 0.1];
    // remove all future haps
-    this.visibleHaps = this.visibleHaps.filter((h) => h.whole?.begin < t);
+    this.visibleHaps = this.visibleHaps.filter((h) => h.whole.begin < t);
    this.painters = []; // will get populated by .onPaint calls attached to the pattern
    // query future haps
    const futureHaps = scheduler.pattern.queryArc(begin, end, { painters: this.painters });
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/draw",
-  "version": "1.2.4",
+  "version": "1.2.2",
  "description": "Helpers for drawing with Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/embed",
-  "version": "1.1.1",
+  "version": "1.1.0",
  "description": "Embeddable Web Component to load a Strudel REPL into an iframe",
  "main": "embed.js",
  "type": "module",
@@ -56,15 +56,14 @@ You can use button inputs to control different aspects of your music, such as ga
 <MiniRepl
  client:idle
  tune={`const gp = gamepad(0)
-setcpm(120) 
-// Use button values to control amplitude
+  // Use button values to control amplitude
 $: stack(
  s("[[hh hh] oh hh oh]/2").mask(gp.tglX).bank("RolandTR909"), // X btn for HH
   s("cr*1").mask(gp.Y).bank("RolandTR909"), // LB btn for CR
  s("bd").mask(gp.tglA).bank("RolandTR909"), // A btn for BD
  s("[ht - - mt - - lt - ]/2").mask(gp.tglB).bank("RolandTR909"), // B btn for Toms
  s("sd*4").mask(gp.RB).bank("RolandTR909"), // RB btn for SD
-)
+).cpm(120)
 `}
 />

@@ -75,13 +74,14 @@ Analog sticks can be used for continuous control, such as pitch shifting or pann
 <MiniRepl
  client:idle
  tune={`const gp = gamepad(0)
-setcpm(120)
-// Use analog stick for continuous control
+  // Use analog stick for continuous control
 $: note("c4 d3 a3 e3").sound("sawtooth") 
  .lpf(gp.x1.range(100,4000)) 
  .lpq(gp.y1.range(5,30))
  .decay(gp.y2.range(0.1,2))
-  .lpenv(gp.x2.range(-5,5))`}
+  .lpenv(gp.x2.range(-5,5))
+  .cpm(120)
+  `}
 />

 ### Button Sequences
@@ -89,7 +89,6 @@ $: note("c4 d3 a3 e3").sound("sawtooth")
 You can define button sequences to trigger specific actions, like playing a sound when a sequence is detected.

 <MiniRepl client:idle tune={`const gp = gamepad(0)
-setcpm(120)
 // Define button sequences
 const HADOUKEN = [
  'd',               // Down
@@ -100,7 +99,7 @@ const KONAMI = 'uuddlrlrba' //Konami Code ↑↑↓↓←→←→BA

 // Check butto-n sequence (returns 1 while detected, 0 when not within last 1 second)
 $: s("free_hadouken -").slow(2)
-.mask(gp.btnSequence(HADOUKEN)).room(1)
+.mask(gp.btnSequence(HADOUKEN)).room(1).cpm(120)

 // hadouken.wav by Syna-Max
 //https://freesound.org/people/Syna-Max/sounds/67674/
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/gamepad",
-  "version": "1.2.4",
+  "version": "1.2.2",
  "description": "Gamepad Inputs for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/hydra",
-  "version": "1.2.4",
+  "version": "1.2.2",
  "description": "Hydra integration for strudel",
  "main": "hydra.mjs",
  "type": "module",
@@ -333,7 +333,7 @@ Pattern.prototype.midi = function (midiport, options = {}) {
      logger(`Midi device disconnected! Available: ${getMidiDeviceNamesString(outputs)}`),
  });

-  return this.onTrigger((hap, currentTime, cps, targetTime) => {
+  return this.onTrigger((time_deprecate, hap, currentTime, cps, targetTime) => {
    if (!WebMidi.enabled) {
      logger('Midi not enabled');
      return;
@@ -493,9 +493,6 @@ export async function midin(input) {
        otherInputs?.length ? `Also available: ${getMidiDeviceNamesString(otherInputs)}` : ''
      }`,
    );
-  }
-  // ensure refs for this input are initialized
-  if (!refs[input]) {
    refs[input] = {};
  }
  const cc = (cc) => ref(() => refs[input][cc] || 0);
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/midi",
-  "version": "1.2.5",
+  "version": "1.2.3",
  "description": "Midi API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,10 +1,10 @@
 import { describe, bench } from 'vitest';

-import { calculateSteps } from '../../core/index.mjs';
+import { calculateTactus } from '../../core/index.mjs';
 import { mini } from '../index.mjs';

 describe('mini', () => {
-  calculateSteps(true);
+  calculateTactus(true);
  bench(
    '+tactus',
    () => {
@@ -13,7 +13,7 @@ describe('mini', () => {
    { time: 1000 },
  );

-  calculateSteps(false);
+  calculateTactus(false);
  bench(
    '-tactus',
    () => {
@@ -21,5 +21,5 @@ describe('mini', () => {
    },
    { time: 1000 },
  );
-  calculateSteps(true);
+  calculateTactus(true);
 });
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/mini",
-  "version": "1.2.4",
+  "version": "1.2.2",
  "description": "Mini notation for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,39 +0,0 @@
-# mondo
-
-a lisp-based language intended to be used as a custom dsl for patterns that can stand on its own feet. 
-see the `test` folder for usage examples
-
-more info:
-
- [uzulang I](https://garten.salat.dev/uzu/uzulang1.html)
- [uzulang II](https://garten.salat.dev/uzu/uzulang2.html)
-
-## Example Usage
-
-```js
-import { MondoRunner } from 'mondolang'
-// define our library of functions and variables
-let lib = {
-  add: (a, b) => a + b,
-  mul: (a, b) => a * b,
-  PI: Math.PI,
-};
-// this function will evaluate nodes in the syntax tree
-function evaluator(node) {
-  // check if node is a leaf node (!= list)
-  if (node.type !== 'list') {
-    // check lib if we find a match in the lib, otherwise return value
-    return lib[node.value] ?? node.value;
-  }
-  // now it can only be a list..
-  const [fn, ...args] = node.children;
-  // children in a list will already be evaluated
-  // the first child is expected to be a function
-  if (typeof fn !== 'function') {
-    throw new Error(`"${fn}" is not a function`);
-  }
-  return fn(...args);
-}
-const runner = new MondoRunner({ evaluator });
-const pat = runner.run('add 1 (mul 2 PI)') // 7.283185307179586
-```
@@ -1,484 +0,0 @@
-/*
-mondo.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/test/mini.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/>.
-*/
-
-// evolved from https://garten.salat.dev/lisp/parser.html
-export class MondoParser {
-  // these are the tokens we expect
-  token_types = {
-    comment: /^\/\/(.*?)(?=\n|$)/,
-    quotes_double: /^"(.*?)"/,
-    quotes_single: /^'(.*?)'/,
-    open_list: /^\(/,
-    close_list: /^\)/,
-    open_angle: /^</,
-    close_angle: /^>/,
-    open_square: /^\[/,
-    close_square: /^\]/,
-    open_curly: /^\{/,
-    close_curly: /^\}/,
-    number: /^-?[0-9]*\.?[0-9]+/, // before pipe!
-    // TODO: better error handling when "-" is used as rest, e.g "s [- bd]"
-    op: /^[*/:!@%?+-]|^\.{2}/, // * / : ! @ % ? ..
-    // dollar: /^\$/,
-    pipe: /^#/,
-    stack: /^[,$]/,
-    or: /^[|]/,
-    plain: /^[a-zA-Z0-9-~_^#]+/,
-  };
-  // matches next token
-  next_token(code, offset = 0) {
-    for (let type in this.token_types) {
-      const match = code.match(this.token_types[type]);
-      if (match) {
-        let token = { type, value: match[0] };
-        if (offset !== -1) {
-          // add location
-          token.loc = [offset, offset + match[0].length];
-        }
-        return token;
-      }
-    }
-    throw new Error(`mondo: could not match '${code}'`);
-  }
-  // takes code string, returns list of matched tokens (if valid)
-  tokenize(code, offset = 0) {
-    let tokens = [];
-    let locEnabled = offset !== -1;
-    let trim = () => {
-      // trim whitespace at start, update offset
-      offset += code.length - code.trimStart().length;
-      // trim start and end to not confuse parser
-      return code.trim();
-    };
-    code = trim();
-    while (code.length > 0) {
-      code = trim();
-      const token = this.next_token(code, locEnabled ? offset : -1);
-      code = code.slice(token.value.length);
-      offset += token.value.length;
-      tokens.push(token);
-    }
-    return tokens;
-  }
-  // take code, return abstract syntax tree
-  parse(code, offset) {
-    this.code = code;
-    this.offset = offset;
-    this.tokens = this.tokenize(code, offset);
-    const expressions = [];
-    while (this.tokens.length) {
-      expressions.push(this.parse_expr());
-    }
-    if (expressions.length === 0) {
-      // empty case
-      return { type: 'list', children: [] };
-    }
-    // do we have multiple top level expressions or a single non list?
-    if (expressions.length > 1 || expressions[0].type !== 'list') {
-      return {
-        type: 'list',
-        children: this.desugar(expressions),
-      };
-    }
-    // we have a single list
-    return expressions[0];
-  }
-  // parses any valid expression
-  parse_expr() {
-    if (!this.tokens[0]) {
-      throw new Error(`unexpected end of file`);
-      // TODO: could we allow that? like (((((((( s bd
-      // return { type: 'list', children: [] };
-    }
-    let next = this.tokens[0]?.type;
-    if (next === 'open_list') {
-      return this.parse_list();
-    }
-    if (next === 'open_angle') {
-      return this.parse_angle();
-    }
-    if (next === 'open_square') {
-      return this.parse_square();
-    }
-    if (next === 'open_curly') {
-      return this.parse_curly();
-    }
-    return this.consume(next);
-  }
-  // Token[] => Token[][], e.g. (x , y z) => [['x'],['y','z']]
-  split_children(children, split_type) {
-    const chunks = [];
-    while (true) {
-      let splitIndex = children.findIndex((child) => child.type === split_type);
-      if (splitIndex === -1) break;
-      const chunk = children.slice(0, splitIndex);
-      chunks.push(chunk);
-      children = children.slice(splitIndex + 1);
-    }
-    chunks.push(children);
-    return chunks;
-  }
-  desugar_split(children, split_type, next) {
-    const chunks = this.split_children(children, split_type);
-    if (chunks.length === 1) {
-      return next(children);
-    }
-    // collect args of stack function
-    const args = chunks
-      .map((chunk) => {
-        if (!chunk.length) {
-          return; // useful for things like "$ s bd $ s hh*8" (first chunk is empty)
-        }
-        if (chunk.length === 1) {
-          // chunks of one element can be added to the stack as is
-          return chunk[0];
-        }
-        // chunks of multiple args
-        chunk = next(chunk);
-        return { type: 'list', children: chunk };
-      })
-      .filter(Boolean); // ignore empty chunks
-    return [{ type: 'plain', value: split_type }, ...args];
-  }
-  // prevents to get a list, e.g. ((x y)) => (x y)
-  unwrap_children(children) {
-    if (children.length === 1) {
-      return children[0].children;
-    }
-    return children;
-  }
-  desugar_ops(children) {
-    while (true) {
-      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) {
-        //throw new Error(`cannot use operator as last child.`);
-        children[opIndex] = op; // ignore operator if last child.. e.g. "note [c -]"
-        continue;
-      }
-      if (opIndex === 0) {
-        // regular function call (assuming each operator exists as function)
-        children[opIndex] = op;
-        continue;
-      }
-      // convert infix to prefix notation
-      const left = children[opIndex - 1];
-      const right = children[opIndex + 1];
-      if (left.type === 'pipe') {
-        // "x !* 2" => (* 2 x)
-        children[opIndex] = op;
-        continue;
-      }
-      // some careful error handling
-      if (left.type === 'op') {
-        throw new Error(`got 2 ops in a row: "${left.value}${op.value}"`);
-      }
-      if (right.type === 'op') {
-        let err = `got 2 ops in a row: "${op.value}${right.value}"`;
-        if (op.value === '-') {
-          // yes i know this file is not supposed to know about rests x.X
-          err += '. you probably want a rest, which is "_" in mondo!';
-        }
-        throw new Error(err);
-      }
-      const call = { type: 'list', children: [op, right, left] };
-      // insert call while keeping other siblings
-      children = [...children.slice(0, opIndex - 1), call, ...children.slice(opIndex + 2)];
-      children = this.unwrap_children(children);
-    }
-    return children;
-  }
-  get_lambda(args, children) {
-    // (.fast 2) = (fn (_) (fast _ 2))
-    children = this.desugar(children);
-    const body = children.length === 1 ? children[0] : { type: 'list', children };
-    return [{ type: 'plain', value: 'fn' }, { type: 'list', children: args }, body];
-  }
-  // returns location range of given ast (even if desugared)
-  get_range(ast, range = [Infinity, 0]) {
-    let union = (a, b) => [Math.min(a[0], b[0]), Math.max(a[1], b[1])];
-    if (ast.loc) {
-      return union(range, ast.loc);
-    }
-    if (ast.type !== 'list') {
-      return range;
-    }
-    return ast.children.reduce((range, child) => {
-      const childrange = this.get_range(child, range);
-      return union(range, childrange);
-    }, range);
-  }
-  errorhead(ast) {
-    return `[mondo ${this.get_range(ast)?.join(':') || '?'}]`;
-  }
-  // returns original user code where the given ast originates (even if desugared)
-  get_code_snippet(ast) {
-    const [min, max] = this.get_range(ast);
-    return this.code.slice(min - this.offset, max - this.offset);
-  }
-  desugar_pipes(children) {
-    let chunks = this.split_children(children, 'pipe');
-    while (chunks.length > 1) {
-      let [left, right, ...rest] = chunks;
-
-      if (!left.length) {
-        const arg = { type: 'plain', value: '_' };
-        return this.get_lambda([arg], [arg, ...children]);
-      }
-      // s jazz hh.fast 2 => (fast 2 (s jazz hh))
-      const call = left.length > 1 ? { type: 'list', children: left } : left[0];
-      chunks = [[...right, call], ...rest];
-    }
-    // return next(chunks[0]);
-    return chunks[0];
-  }
-  parse_pair(open_type, close_type) {
-    const begin = this.tokens[0].loc?.[0];
-    this.consume(open_type);
-    const children = [];
-    while (this.tokens[0]?.type !== close_type) {
-      children.push(this.parse_expr());
-    }
-    const end = this.tokens[0].loc?.[1];
-    this.consume(close_type);
-    const node = { type: 'list', children };
-    if (begin !== undefined) {
-      node.loc = [begin, end];
-      node.raw = this.code.slice(begin, end);
-    }
-    return node;
-  }
-  desugar(children, type) {
-    // if type is given, the first element is expected to contain it as plain value
-    // e.g. with (square a b, c), we want to split (a b, c) and ignore "square"
-    children = type ? children.slice(1) : children;
-    children = this.desugar_split(children, 'stack', (children) =>
-      this.desugar_split(children, 'or', (children) => {
-        // chunks of multiple args
-        if (type) {
-          // the type we've removed before splitting needs to be added back
-          children = [{ type: 'plain', value: type }, ...children];
-        }
-        children = this.desugar_ops(children);
-        // children = this.desugar_pipes(children, (children) => this.desugar_dollars(children));
-        children = this.desugar_pipes(children);
-        return children;
-      }),
-    );
-    return children;
-  }
-  parse_list() {
-    let node = this.parse_pair('open_list', 'close_list');
-    node.children = this.desugar(node.children);
-    return node;
-  }
-  parse_angle() {
-    let node = this.parse_pair('open_angle', 'close_angle');
-    node.children.unshift({ type: 'plain', value: 'angle' });
-    node.children = this.desugar(node.children, 'angle');
-    return node;
-  }
-  parse_square() {
-    let node = this.parse_pair('open_square', 'close_square');
-    node.children.unshift({ type: 'plain', value: 'square' });
-    node.children = this.desugar(node.children, 'square');
-    return node;
-  }
-  parse_curly() {
-    let node = this.parse_pair('open_curly', 'close_curly');
-    node.children.unshift({ type: 'plain', value: 'curly' });
-    node.children = this.desugar(node.children, 'curly');
-    return node;
-  }
-  consume(type) {
-    // shift removes first element and returns it
-    const token = this.tokens.shift();
-    if (token.type !== type) {
-      throw new Error(`expected token type ${type}, got ${token.type}`);
-    }
-    return token;
-  }
-  get_locations(code, offset = 0) {
-    let walk = (ast, locations = []) => {
-      if (ast.type === 'list') {
-        return ast.children.forEach((child) => walk(child, locations));
-      }
-      if (ast.loc) {
-        locations.push(ast.loc);
-      }
-    };
-    const ast = this.parse(code, offset);
-    let locations = [];
-    walk(ast, locations);
-    return locations;
-  }
-}
-
-export function printAst(ast, compact = false, lvl = 0) {
-  const br = compact ? '' : '\n';
-  const spaces = compact ? '' : Array(lvl).fill(' ').join('');
-  if (ast.type === 'list') {
-    return `${lvl ? br : ''}${spaces}(${ast.children.map((child) => printAst(child, compact, lvl + 1)).join(' ')}${
-      ast.children.find((child) => child.type === 'list') ? `${br}${spaces})` : ')'
-    }`;
-  }
-  return `${ast.value}`;
-}
-
-// lisp runner
-export class MondoRunner {
-  constructor({ evaluator } = {}) {
-    this.parser = new MondoParser();
-    this.evaluator = evaluator;
-    this.assert(typeof evaluator === 'function', `expected an evaluator function to be passed to new MondoRunner`);
-  }
-  // a helper to check conditions and throw if they are not met
-  assert(condition, error) {
-    if (!condition) {
-      throw new Error(error);
-    }
-  }
-  run(code, scope, offset = 0) {
-    const ast = this.parser.parse(code, offset);
-    //console.log(printAst(ast));
-    return this.evaluate(ast, scope);
-  }
-  evaluate_let(ast, scope) {
-    // (let ((x 3) (y 4)) ...body)
-    // = ((fn (x y) ...body) 3 4)
-    const defs = ast.children[1].children;
-    const args = defs.map((pair) => pair.children[0]);
-    const vals = defs.map((pair) => pair.children[1]);
-    const body = ast.children.slice(2);
-    const lambda = {
-      type: 'list',
-      children: [{ type: 'plain', value: 'fn' }, { type: 'list', children: args }, ...body],
-    };
-    return this.evaluate({ type: 'list', children: [lambda, ...vals] }, scope);
-  }
-  evaluate_def(ast, scope) {
-    // function definition special form?
-    if (ast.children[1].type === 'list') {
-      // (def (add a b) (+ a b))
-      // => (def add (fn (a b) (+ a b)) )
-      const args = ast.children[1].children.slice(1);
-      const lambda = {
-        // lambda
-        type: 'list',
-        children: [
-          { type: 'plain', value: 'fn' },
-          { type: 'list', children: args },
-          ...ast.children.slice(2), // body
-        ],
-      };
-      // we mutate to make sure the old ast wont make a mess later
-      ast.children[1] = ast.children[1].children[0];
-      ast.children[2] = lambda;
-      ast.children = ast.children.slice(0, 3); // throw away rest
-    }
-    // (def name body)
-    if (ast.children.length !== 3) {
-      throw new Error(`expected "def" to have 3 children, but got ${ast.children.length}`);
-    }
-    const name = ast.children[1].value;
-    const body = this.evaluate(ast.children[2], scope);
-    scope[name] = body;
-    // def with fall through
-  }
-  evaluate_match(ast, scope) {
-    // (match (p1 e1) (p2 e2) ... (pn en))
-    // = cond in lisp
-    if (ast.children.length < 2) {
-      return;
-    }
-    const [_, ...body] = ast.children;
-    for (let i = 0; i < body.length; ++i) {
-      const [predicate, exp] = body[i].children;
-      if (predicate.value === 'else') {
-        return this.evaluate(exp, scope);
-      }
-      const outcome = this.evaluate(predicate, scope);
-      if (outcome) {
-        return this.evaluate(exp, scope);
-      }
-    }
-    return undefined; // nothing was matched
-  }
-  evaluate_if(ast, scope) {
-    // if is a special case of match
-    if (ast.children.length !== 4) {
-      return;
-    }
-    // (if predicate consequent alternative)
-    const [_, predicate, consequent, alternative] = ast.children;
-    // (match (predicate consequent) (else alternative))
-    const matcher = {
-      type: 'list',
-      children: [
-        { type: 'plain', value: 'match' },
-        { type: 'list', children: [predicate, consequent] },
-        { type: 'list', children: [{ type: 'plain', value: 'else' }, alternative] },
-      ],
-    };
-    return this.evaluate_match(matcher, scope);
-  }
-  evaluate_lambda(ast, scope) {
-    // (fn (_)   (ply 2 _)
-    //     ^args ^ body
-    const [_, formalArgs, ...body] = ast.children;
-    return (...args) => {
-      const params = Object.fromEntries(formalArgs.children.map((arg, i) => [arg.value, args[i]]));
-      const closure = {
-        ...scope,
-        ...params,
-      };
-      // body can have multiple expressions
-      const res = body.map((exp) => this.evaluate(exp, closure));
-      // last expression is the return value
-      return res[res.length - 1];
-    };
-  }
-  evaluate_list(ast, scope) {
-    // evaluate all children before evaluating list (dont mutate!!!)
-    const args = ast.children
-      .filter((child) => child.type !== 'comment') // ignore comments
-      .map((arg) => this.evaluate(arg, scope));
-    const node = { type: 'list', children: args };
-    return this.evaluator(node, scope);
-  }
-  evaluate_leaf(ast, scope) {
-    if (ast.type === 'number') {
-      ast.value = Number(ast.value);
-    } else if (['quotes_double', 'quotes_single'].includes(ast.type)) {
-      ast.value = ast.value.slice(1, -1);
-      ast.type = 'string';
-    }
-    return this.evaluator(ast, scope);
-  }
-  evaluate(ast, scope = {}) {
-    if (ast.type !== 'list') {
-      return this.evaluate_leaf(ast, scope);
-    }
-    const name = ast.children[0]?.value;
-    if (name === 'fn') {
-      return this.evaluate_lambda(ast, scope);
-    }
-    if (name === 'match') {
-      return this.evaluate_match(ast, scope);
-    }
-    if (name === 'if') {
-      return this.evaluate_if(ast, scope);
-    }
-    if (name === 'let') {
-      return this.evaluate_let(ast, scope);
-    }
-    if (name === 'def') {
-      this.evaluate_def(ast, scope);
-    }
-    return this.evaluate_list(ast, scope);
-  }
-}
@@ -1,37 +0,0 @@
-{
-  "name": "mondolang",
-  "version": "1.1.1",
-  "description": "a language for functional composition that translates to js",
-  "main": "mondo.mjs",
-  "type": "module",
-  "publishConfig": {
-    "main": "dist/mondo.mjs"
-  },
-  "scripts": {
-    "test": "vitest run",
-    "bench": "vitest bench",
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tidalcycles/strudel.git"
-  },
-  "keywords": [
-    "tidalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://github.com/tidalcycles/strudel/issues"
-  },
-  "homepage": "https://github.com/tidalcycles/strudel/blob/main/packages/mondo/README.md",
-  "devDependencies": {
-    "vite": "^6.0.11",
-    "vitest": "^3.0.4"
-  }
-}
@@ -1,978 +0,0 @@
-/*
-mondo.test.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/test/mini.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 { describe, expect, it } from 'vitest';
-import { MondoParser, printAst, MondoRunner } from '../mondo.mjs';
-
-const parser = new MondoParser();
-const p = (code) => parser.parse(code, -1);
-
-describe('mondo tokenizer', () => {
-  const parser = new MondoParser();
-  it('should tokenize with locations', () =>
-    expect(
-      parser
-        .tokenize('(one two three)')
-        .map((t) => t.value + '=' + t.loc.join('-'))
-        .join(' '),
-    ).toEqual('(=0-1 one=1-4 two=5-8 three=9-14 )=14-15'));
-  // it('should parse with loangleions', () => expect(parser.parse('(one two three)')).toEqual());
-  it('should get loangleions', () =>
-    expect(parser.get_locations('s bd rim')).toEqual([
-      [0, 1],
-      [2, 4],
-      [5, 8],
-    ]));
-});
-describe('mondo s-expressions parser', () => {
-  it('should parse an empty string', () => expect(p('')).toEqual({ type: 'list', children: [] }));
-  it('should parse a single item', () =>
-    expect(p('a')).toEqual({ type: 'list', children: [{ type: 'plain', value: 'a' }] }));
-  it('should parse an empty list', () => expect(p('()')).toEqual({ type: 'list', children: [] }));
-  it('should parse a list with 1 item', () =>
-    expect(p('(a)')).toEqual({ type: 'list', children: [{ type: 'plain', value: 'a' }] }));
-  it('should parse a list with 2 items', () =>
-    expect(p('(a b)')).toEqual({
-      type: 'list',
-      children: [
-        { type: 'plain', value: 'a' },
-        { type: 'plain', value: 'b' },
-      ],
-    }));
-  it('should parse a list with 2 items', () =>
-    expect(p('(a (b c))')).toEqual({
-      type: 'list',
-      children: [
-        { type: 'plain', value: 'a' },
-        {
-          type: 'list',
-          children: [
-            { type: 'plain', value: 'b' },
-            { type: 'plain', value: 'c' },
-          ],
-        },
-      ],
-    }));
-  it('should parse numbers', () =>
-    expect(p('(1 .2 1.2 10 22.3)')).toEqual({
-      type: 'list',
-      children: [
-        { type: 'number', value: '1' },
-        { type: 'number', value: '.2' },
-        { type: 'number', value: '1.2' },
-        { type: 'number', value: '10' },
-        { type: 'number', value: '22.3' },
-      ],
-    }));
-  it('should parse comments', () =>
-    expect(p('a // hello')).toEqual({
-      type: 'list',
-      children: [
-        { type: 'plain', value: 'a' },
-        { type: 'comment', value: '// hello' },
-      ],
-    }));
-});
-
-let desguar = (a) => {
-  return printAst(parser.parse(a), true);
-};
-
-describe('mondo sugar', () => {
-  it('should desugar []', () => expect(desguar('[a b c]')).toEqual('(square a b c)'));
-  it('should desugar [] nested', () => expect(desguar('[a [b c] d]')).toEqual('(square a (square b c) d)'));
-  it('should desugar <>', () => expect(desguar('<a b c>')).toEqual('(angle a b c)'));
-  it('should desugar <> nested', () => expect(desguar('<a <b c> d>')).toEqual('(angle a (angle b c) d)'));
-  it('should desugar mixed [] <>', () => expect(desguar('[a <b c>]')).toEqual('(square a (angle b c))'));
-  it('should desugar mixed <> []', () => expect(desguar('<a [b c]>')).toEqual('(angle a (square b c))'));
-
-  it('should desugar #', () => expect(desguar('s jazz # fast 2')).toEqual('(fast 2 (s jazz))'));
-  it('should desugar # square', () => expect(desguar('[bd cp # fast 2]')).toEqual('(fast 2 (square bd cp))'));
-  it('should desugar # twice', () => expect(desguar('s jazz # fast 2 # slow 2')).toEqual('(slow 2 (fast 2 (s jazz)))'));
-  it('should desugar # nested', () => expect(desguar('(s cp # fast 2)')).toEqual('(fast 2 (s cp))'));
-  it('should desugar # within []', () => expect(desguar('[bd cp # fast 2]')).toEqual('(fast 2 (square bd cp))'));
-  it('should desugar # within , within []', () =>
-    expect(desguar('[bd cp # fast 2, x]')).toEqual('(stack (fast 2 (square bd cp)) x)'));
-
-  // it('should desugar .(.', () => expect(desguar('[jazz hh.(.fast 2)]')).toEqual('(square jazz (fast 2 hh))'));
-
-  it('should desugar , |', () => expect(desguar('[bd, hh | oh]')).toEqual('(stack bd (or hh oh))'));
-  it('should desugar , | of []', () =>
-    expect(desguar('[bd, hh | [oh rim]]')).toEqual('(stack bd (or hh (square oh rim)))'));
-  it('should desugar , square', () => expect(desguar('[bd, hh]')).toEqual('(stack bd hh)'));
-  it('should desugar , square 2', () => expect(desguar('[bd, hh oh]')).toEqual('(stack bd (square hh oh))'));
-  it('should desugar , square 3', () =>
-    expect(desguar('[bd cp, hh oh]')).toEqual('(stack (square bd cp) (square hh oh))'));
-  it('should desugar , angle', () => expect(desguar('<bd, hh>')).toEqual('(stack bd hh)'));
-  it('should desugar , angle 2', () => expect(desguar('<bd, hh oh>')).toEqual('(stack bd (angle hh oh))'));
-  it('should desugar , angle 3', () =>
-    expect(desguar('<bd cp, hh oh>')).toEqual('(stack (angle bd cp) (angle hh oh))'));
-  it('should desugar , ()', () => expect(desguar('(s bd, s cp)')).toEqual('(stack (s bd) (s cp))'));
-  it('should desugar * /', () => expect(desguar('[a b*2 c d/3 e]')).toEqual('(square a (* 2 b) c (/ 3 d) e)'));
-  it('should desugar []*x', () => expect(desguar('[a [b c]*3]')).toEqual('(square a (* 3 (square b c)))'));
-  it('should desugar []*<x y>', () => expect(desguar('[a b*<2 3> c]')).toEqual('(square a (* (angle 2 3) b) c)'));
-  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 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))'));
-  it('should desugar x $ y . z', () => expect(desguar('x $ y . z')).toEqual('(z (x y))')); */
-
-  it('should desugar README example', () =>
-    expect(desguar('s [bd hh*2 (cp # crush 4) <mt ht lt>] # speed .8')).toEqual(
-      '(speed .8 (s (square bd (* 2 hh) (crush 4 cp) (angle mt ht lt))))',
-    ));
-
-  it('should desugar (#)', () => expect(desguar('(#)')).toEqual('(fn (_) _)'));
-  it('should desugar lambda', () => expect(desguar('(# fast 2)')).toEqual('(fn (_) (fast 2 _))'));
-  it('should desugar lambda call', () => expect(desguar('((# mul 2) 2)')).toEqual('((fn (_) (mul 2 _)) 2)'));
-  it('should desugar lambda with pipe', () =>
-    expect(desguar('(# fast 2 # room 1)')).toEqual('(fn (_) (room 1 (fast 2 _)))'));
-  /* const lambda = parser.parse('(lambda (_) (fast 2 _))');
-  const target = { type: 'plain', value: 'xyz' };
-  it('should desugar_lambda', () =>
-    expect(printAst(parser.desugar_lambda(lambda.children, target))).toEqual('(fast 2 xyz)')); */
-});
-
-describe('mondo arithmetic', () => {
-  let multi =
-    (op) =>
-    (init, ...rest) =>
-      rest.reduce((acc, arg) => op(acc, arg), init);
-
-  let lib = {
-    '+': multi((a, b) => a + b),
-    add: multi((a, b) => a + b),
-    '-': multi((a, b) => a - b),
-    sub: multi((a, b) => a - b),
-    '*': multi((a, b) => a * b),
-    '/': multi((a, b) => a / b),
-    mod: multi((a, b) => a % b),
-    eq: (a, b) => a === b,
-    lt: (a, b) => a < b,
-    gt: (a, b) => a > b,
-    and: (a, b) => a && b,
-    or: (a, b) => a || b,
-    not: (a) => !a,
-    run: (...args) => args[args.length - 1],
-    def: () => 0,
-    sin: Math.sin,
-    cos: Math.cos,
-    PI: Math.PI,
-    cons: (a, b) => [a, ...(Array.isArray(b) ? b : [b])],
-    car: (pair) => pair[0],
-    cdr: (pair) => pair.slice(1),
-    list: (...items) => items,
-    nil: [],
-    isnull: (items) => items.length === 0,
-    concat: (...msgs) => msgs.join(''),
-    error: (...msgs) => {
-      throw new Error(msgs.join(' '));
-    },
-  };
-  function evaluator(node, scope) {
-    if (node.type !== 'list') {
-      // is leaf
-      return scope[node.value] ?? lib[node.value] ?? node.value;
-    }
-    // is list
-    const [fn, ...args] = node.children;
-    if (typeof fn !== 'function') {
-      throw new Error(`"${fn}": expected function, got ${typeof fn} "${fn}"`);
-    }
-    return fn(...args);
-  }
-  const runner = new MondoRunner({ evaluator });
-  let evaluate = (exp, scope) => runner.run(`run ${exp}`, scope);
-  let pretty = (exp) => printAst(runner.parser.parse(exp), false);
-  //it('should eval nested expression', () => expect(runner.run('add 1 (mul 2 PI)').toFixed(2)).toEqual('7.28'));
-
-  it('eval number', () => expect(evaluate('2')).toEqual(2));
-  it('eval string', () => expect(evaluate('abc')).toEqual('abc'));
-  it('eval list', () => expect(evaluate('(+ 1 2)')).toEqual(3));
-  it('eval nested list', () => expect(evaluate('(+ 1 (+ 2 3))')).toEqual(6));
-  it('def number', () => expect(evaluate('(def a 2) a')).toEqual(2));
-  it('def + ref number', () => expect(evaluate('(def a 2) (* a a)')).toEqual(4));
-  it('def + call lambda', () => expect(evaluate('(def sqr (fn (x) (* x x))) (sqr 3)')).toEqual(9));
-
-  // sicp
-  it('sicp 8.1', () => expect(evaluate('(+ 137 349)')).toEqual(486));
-  it('sicp 8.2', () => expect(evaluate('(- 1000 334)')).toEqual(666));
-  it('sicp 8.3', () => expect(evaluate('(* 5 99)')).toEqual(495));
-  it('sicp 8.4', () => expect(evaluate('(/ 10 5)')).toEqual(2));
-  it('sicp 8.5', () => expect(evaluate('(+ 2.7 10)')).toEqual(12.7));
-  it('sicp 9.1', () => expect(evaluate('(+ 21 35 12 7)')).toEqual(75));
-  it('sicp 9.2', () => expect(evaluate('(* 25 4 12)')).toEqual(1200));
-  it('sicp 9.3', () => expect(evaluate('(+ (* 3 5) (- 10 6))')).toEqual(19));
-  it('sicp 9.4', () =>
-    expect(pretty('(+ (* 3 (+ (* 2 4) (+ 3 5))) (+ (- 10 7) 6))')).toEqual(`(+ 
- (* 3 
-  (+ 
-   (* 2 4) 
-   (+ 3 5)
-  )
- ) 
- (+ 
-  (- 10 7) 6
- )
-)`)); // this is not exactly pretty printing by convention..
-
-  let scope = {};
-  it('sicp 11.1', () => expect(evaluate('(def size 2) (* 5 size)', scope)).toEqual(10));
-  it('sicp 11.2', () =>
-    expect(evaluate('(def pi 3.14159) (def radius 10) (* pi (* radius radius))', scope)).toEqual(314.159));
-  it('sicp 11.3', () => expect(evaluate('(def circumference (* 2 pi radius))', scope)).toEqual(0));
-  it('sicp 11.4', () => expect(evaluate('circumference', scope)).toEqual(62.8318));
-  it('sicp 13.1', () => expect(evaluate('(* (+ 2 (* 4 6)) (+ 3 5 7))')).toEqual(390));
-  it('sicp 16.1', () => expect(evaluate('(def (square x) (* x x))', scope)).toEqual(0));
-  // it('sicp 16.1', () => expect(evaluate('(def (square x) (* x x))', scope)).toEqual(0));
-  it('sicp 17.1', () => expect(evaluate('(square 21)', scope)).toEqual(441));
-  it('sicp 17.2', () => expect(evaluate('(square (+ 2 5))', scope)).toEqual(49));
-  it('sicp 17.3', () => expect(evaluate('(square (square 3))', scope)).toEqual(81));
-  it('sicp 17.4', () => expect(evaluate(`(def (sumofsquares x y) (+ (square x) (square y)))`, scope)).toEqual(0));
-  it('sicp 17.5', () => expect(evaluate(`(sumofsquares 3 4)`, scope)).toEqual(25));
-  it('sicp 17.6', () => expect(evaluate(`(def (f a) (sumofsquares (+ a 1) (* a 2))) (f 5)`, scope)).toEqual(136));
-  it('sicp 21.1', () => expect(evaluate(`(sumofsquares (+ 5 1) (* 5 2))`, scope)).toEqual(136));
-
-  it('sicp 22.1', () =>
-    expect(
-      evaluate(
-        `(def (abs x) 
-        (match 
-         ((gt x 0) x) 
-         ((eq x 0) 0)
-         ((lt x 0) (- 0 x))
-      ))`, // sicp was doing (- x), which doesnt work with our -
-        scope,
-      ),
-    ).toEqual(0));
-
-  it('sicp gt1', () => expect(evaluate(`(gt -12 0)`, scope)).toEqual(false));
-  it('sicp gt2', () => expect(evaluate(`(gt 0 -12)`, scope)).toEqual(true));
-  it('sicp lt1', () => expect(evaluate(`(lt -12 0)`, scope)).toEqual(true));
-  it('sicp lt2', () => expect(evaluate(`(lt 0 -12)`, scope)).toEqual(false));
-
-  it('sicp 24.1', () => expect(evaluate(`(abs (- 3))`, scope)).toEqual(3));
-  it('sicp 24.2', () => expect(evaluate(`(abs (+ 3))`, scope)).toEqual(3));
-  it('sicp 24.3', () => expect(evaluate(`(abs -12)`, scope)).toEqual(12));
-
-  it('sicp 24.4', () => expect(evaluate(`(def (abs x) (if (lt x 0) (- 0 x) x))`, scope)).toEqual(0));
-  it('sicp 24.5', () => expect(evaluate(`(abs -13)`, scope)).toEqual(13));
-  it('sicp 25.1', () => expect(evaluate(`(and (gt 6 5) (lt 6 10))`, scope)).toEqual(true));
-  it('sicp 25.2', () => expect(evaluate(`(and (gt 4 5) (lt 6 10))`, scope)).toEqual(false));
-
-  it('sicp ex1.1.1', () => expect(evaluate(`(def a 3)`, scope)).toEqual(0));
-  it('sicp ex1.1.2', () => expect(evaluate(`(def b (+ a 1))`, scope)).toEqual(0));
-  it('sicp ex1.1.3', () => expect(evaluate(`(+ a b (* a b))`, scope)).toEqual(19));
-  it('sicp ex1.1.4', () => expect(evaluate(`(if (and (gt b a) (lt b (* a b))) b a)`, scope)).toEqual(4));
-  it('sicp ex1.1.5', () => expect(evaluate(`(match ((eq a 4) 6) ((eq b 4) (+ 6 7 a)) (else 25))`, scope)).toEqual(16));
-  it('sicp ex1.1.6', () => expect(evaluate(`(+ 2 (if (gt b a) b a))`, scope)).toEqual(6));
-  it('sicp ex1.1.7', () =>
-    expect(evaluate(`(* (match ((gt a b) a) ((lt a b) b) (else -1)) (+ a 1))`, scope)).toEqual(16));
-
-  // .. cant use "+" and "-" as standalone expressions, because they are parsed as operators...
-  it('sicp ex1.4.1', () => expect(evaluate(`(def (foo a b) ((if (gt b 0) add sub) a b))`, scope)).toEqual(0));
-  it('sicp ex1.4.1', () => expect(evaluate(`(foo 3 1)`, scope)).toEqual(4));
-  it('sicp ex1.4.2', () => expect(evaluate(`(foo 3 -1)`, scope)).toEqual(4));
-
-  // 1.1.7 Example: Square Roots by Newton’s Method
-  it('sicp 30.1', () =>
-    expect(evaluate(`(def (goodenuf guess x) (lt (abs (- (square guess) x)) 0.001))`, scope)).toEqual(0));
-  it('sicp 30.2', () => expect(evaluate(`(goodenuf 1 1.001)`, scope)).toEqual(true));
-  it('sicp 30.3', () => expect(evaluate(`(goodenuf 1 1.002)`, scope)).toEqual(false));
-  it('sicp 30.4', () => expect(evaluate(`(def (average x y) (/ (+ x y) 2))`, scope)).toEqual(0));
-  it('sicp 30.5', () => expect(evaluate(`(average 18 20)`, scope)).toEqual(19));
-  it('sicp 30.6', () => expect(evaluate(`(def (improve guess x) (average guess (/ x guess)))`, scope)).toEqual(0));
-  it('sicp 31.1', () =>
-    expect(
-      evaluate(
-        `(def (sqrtiter guess x) (if (goodenuf guess x)
-      guess
-      (sqrtiter (improve guess x) x)))`,
-        scope,
-      ),
-    ).toEqual(0));
-  it('sicp 31.2', () => expect(evaluate(`(def (sqrt x) (sqrtiter 1.0 x))`, scope)).toEqual(0));
-  it('sicp 31.3', () => expect(evaluate(`(sqrt 9)`, scope)).toEqual(3.00009155413138));
-  it('sicp 31.4', () => expect(evaluate(`(sqrt (+ 100 37))`, scope)).toEqual(11.704699917758145));
-  // eslint-disable-next-line no-loss-of-precision
-  it('sicp 31.5', () => expect(evaluate(`(sqrt (+ (sqrt 2) (sqrt 3)))`, scope)).toEqual(1.77392790232078925));
-  it('sicp 31.6', () => expect(evaluate(`(square (sqrt 1000))`, scope)).toEqual(1000.000369924366));
-
-  // lexical scoping
-  it('sicp 39.1', () =>
-    expect(
-      evaluate(
-        `
-(def (sqrt x)
- (def (goodenough guess)
-  (lt (abs (- (square guess) x)) 0.001)) 
-(def (improve guess)
- (average guess (/ x guess))) 
-(def (sqrt-iter guess)
- (if (goodenough guess) guess (sqrt-iter (improve guess))))
-(sqrtiter 1.0))
-  
-  `,
-        scope,
-      ),
-    ).toEqual(0));
-
-  // recursive fac
-  it('sicp 41.1', () => expect(evaluate(`(def (fac n) (if (eq n 1) 1 (* n (fac (- n 1)))))`, scope)).toEqual(0));
-  it('sicp 41.2', () => expect(evaluate(`(fac 4)`, scope)).toEqual(24));
-
-  // iterative fac
-  it('sicp 41.3', () =>
-    expect(
-      evaluate(
-        `
-(def (factorial n) (factiter 1 1 n))
-(def (factiter product counter maxcount) 
- (if (gt counter maxcount)
-  product
-  (factiter (* counter product)
-             (+ counter 1)
-             maxcount)))
-`,
-        scope,
-      ),
-    ).toEqual(0));
-  it('sicp 41.4', () => expect(evaluate(`(fac 4)`, scope)).toEqual(24));
-
-  // 46.1
-  /* (def (+ a b)
-(if (= a 0) b (inc (+ (dec a) b))))
-(def (+ a b)
-(if (= a 0) b (+ (dec a) (inc b)))) */
-
-  // Exercise 1.10
-  //  Ackermann’s function
-  it('sicp 47.1', () =>
-    expect(
-      evaluate(
-        `
-(def (A x y) (match ((eq y 0) 0) 
-((eq x 0) (* 2 y))
-((eq y 1) 2)
-(else (A (- x 1) (A x (- y 1))))))
-`,
-        scope,
-      ),
-    ).toEqual(0));
-  it('sicp 47.2', () => expect(evaluate(`(A 1 10)`, scope)).toEqual(1024));
-  it('sicp 47.3', () => expect(evaluate(`(A 2 4)`, scope)).toEqual(65536));
-  it('sicp 47.4', () => expect(evaluate(`(A 3 3)`, scope)).toEqual(65536));
-  it('sicp 47.5', () =>
-    expect(
-      evaluate(
-        `
-(def (f n) (A 0 n))
-(def (g n) (A 1 n)))
-(def (h n) (A 2 n))
-(def (k n) (* 5 n n))
-    `,
-        scope,
-      ),
-    ).toEqual(0));
-
-  // Tree Recursion
-  // recursive process
-  it('sicp 48.1', () =>
-    expect(
-      evaluate(
-        `
-(def (fib n) (match ((eq n 0) 0) ((eq n 1) 1)
-(else (+ (fib (- n 1)) (fib (- n 2))))))
-(fib 7)
-    `,
-        scope,
-      ),
-    ).toEqual(13));
-
-  // iterative process
-  it('sicp 48.2', () =>
-    expect(
-      evaluate(
-        `
-(def (fib n) (fibiter 1 0 n))
-(def (fibiter a b count) (if (eq count 0)
-      b
-      (fibiter (+ a b) a (- count 1))))
-(fib 7)
-    `,
-        scope,
-      ),
-    ).toEqual(13));
-
-  // example: counting change
-  it('sicp 52.2', () =>
-    expect(
-      evaluate(
-        `
-(def (countchange amount) (cc amount 5))
-(def (cc amount kindsofcoins)
- (match 
-  ((eq amount 0) 1)
-  ((or (lt amount 0) (eq kindsofcoins 0)) 0)
-  (else (+ 
-   (cc amount (- kindsofcoins 1))
-   (cc (- amount (firstdenomination kindsofcoins)) kindsofcoins)))))
-
-(def (firstdenomination kindsofcoins)
-(match 
- ((eq kindsofcoins 1) 1) 
- ((eq kindsofcoins 2) 5)
- ((eq kindsofcoins 3) 10)
- ((eq kindsofcoins 4) 25)
- ((eq kindsofcoins 5) 50)))
-
-(countchange 100)
-    `,
-        scope,
-      ),
-    ).toEqual(292));
-
-  // todo: pascals triangle
-  it('sicp 57.1', () =>
-    expect(
-      evaluate(
-        `
-(def (cube x) (* x x x))
-(def (p x) (sub (* 3 x) (* 4 (cube x))))
-(def (sine angle)
-(if (not (gt (abs angle) 0.1)) angle
-(p (sine (/ angle 3.0)))))
-
-(sine 12.15)
-    `,
-        scope,
-      ),
-    ).toEqual(-0.39980345741334));
-
-  // exponentiation recursive
-  it('sicp 57.2', () =>
-    expect(
-      evaluate(
-        `
-(def (expt b n) (if (eq n 0) 1 (* b (expt b (- n 1)))))
-(expt 2 4)
-`,
-        scope,
-      ),
-    ).toEqual(16));
-
-  // exponentiation iterative
-  it('sicp 58.1b', () =>
-    expect(
-      evaluate(
-        `
-(def (expt b n) (exptiter b n 1))
-(def (exptiter b counter product) (if (eq counter 0)
-      product
-      (exptiter b (- counter 1) (* b product))))
-(expt 2 5)
-  `,
-        scope,
-      ),
-    ).toEqual(32));
-
-  // exponentiation fast
-  it('sicp 58.2', () =>
-    expect(
-      evaluate(
-        `
-(def (fastexpt b n) (match ((eq n 0) 1)
-((iseven n) (square (fastexpt b (/ n 2)))) (else (* b (fastexpt b (- n 1))))))
-(def (iseven n)
-(eq (mod n 2) 0))
-(fastexpt 2 5)
-   `,
-        scope,
-      ),
-    ).toEqual(32));
-
-  // * = repeated addition
-  it('sicp 60.1', () =>
-    expect(
-      evaluate(
-        `(def (mult a b) (if (eq b 0)
-        0
-        (+ a (* a (- b 1)))))
-        (mult 3 15)
-   `,
-      ),
-    ).toEqual(45));
-
-  // gcd / euclid
-  it('sicp 63.1', () =>
-    expect(
-      evaluate(
-        `(def (gcd a b) (if (eq b 0)
-      a
-      (gcd b (mod a b))))
-      (gcd 20 6)
-     `,
-        scope,
-      ),
-    ).toEqual(2));
-
-  // 65 smallest divisor
-  // 67 fermat test
-  // ....
-
-  // higher order procedures
-
-  it('sicp 77.1', () =>
-    expect(
-      evaluate(
-        `
-(def (sum term a next b)
-(if (gt a b) 0 (+ (term a)
-(sum term (next a) next b))))
-`,
-        scope,
-      ),
-    ).toEqual(0));
-
-  it('sicp 78.1', () =>
-    expect(
-      evaluate(
-        `
-(def (inc n) (+ n 1))
-(def (cube a) (* a a a))
-(def (sumcubes a b)
-(sum cube a inc b))
-(sumcubes 1 10)
-  `,
-        scope,
-      ),
-    ).toEqual(3025));
-
-  it('sicp 78.2', () =>
-    expect(
-      evaluate(
-        `
-    (def (identity x) x)
-    (def (sumintegers a b)
-    (sum identity a inc b))
-    (sumintegers 1 10)
-    `,
-        scope,
-      ),
-    ).toEqual(55));
-
-  // pisum
-  it('sicp 79.1', () =>
-    expect(
-      evaluate(
-        `
-(def (pisum a b) 
- (def (piterm x)
-  (/ 1.0 (* x (+ x 2)))) 
-(def (pinext x) (+ x 4))
-(sum piterm a pinext b))
-(* 8 (pisum 1 1000))
-`,
-        scope,
-      ),
-    ).toEqual(3.139592655589783));
-
-  // integral
-  it('sicp 79.2', () =>
-    expect(
-      evaluate(
-        `
-(def (integral f a b dx) 
- (def (adddx x) (+ x dx))
-(* (sum f (+ a (/ dx 2.0)) adddx b) dx))
-(integral cube 0 1 0.01)
-  `,
-        scope,
-      ),
-    ).toEqual(0.24998750000000042));
-  // maximum callstack...
-  //it('sicp 79.3', () => expect(evaluate(`(integral cube 0 1 0.001)`, scope)).toEqual(0.249999875000001));
-
-  //lambdas
-  it('sicp 83.1', () => expect(evaluate(`((fn (x) (+ x 4)) 5)`)).toEqual(9));
-
-  it('sicp 83.2', () =>
-    expect(
-      evaluate(
-        `
-(def (pisum a b)
-  (sum (fn (x) (/ 1.0 (* x (+ x 2))))
-        a
-        (fn (x) (+ x 4)) 
-        b))
-(* 8 (pisum 1 1000))
-`,
-        scope,
-      ),
-    ).toEqual(3.139592655589783));
-  it('sicp 83.3', () =>
-    expect(
-      evaluate(
-        `
-(def (integral f a b dx) 
- (* (sum f
-         (+ a (/ dx 2.0)) 
-         (fn (x) (+ x dx)) 
-         b)
-    dx))
-(integral cube 0 1 0.01)
-`,
-        scope,
-      ),
-    ).toEqual(0.24998750000000042));
-  it('sicp 84.1', () => expect(evaluate(`((fn (x y z) (+ x y (square z))) 1 2 3)`, scope)).toEqual(12));
-
-  // let expressions
-  it('sicp 87.1', () =>
-    expect(
-      evaluate(
-        `
-(+ (let ((x 3))
-(+ x (* x 10))) x)
-`,
-        { x: 5 },
-      ),
-    ).toEqual(38));
-  it('sicp 87.2', () =>
-    expect(
-      evaluate(
-        `
-(let ((x 3)
-(y (+ x 2)))
-(* x y))
-  `,
-        { x: 2 },
-      ),
-    ).toEqual(12));
-  it('sicp 88.1', () =>
-    expect(
-      evaluate(
-        `
-(def (f g) (g 2))
-(f square)
-      `,
-        scope,
-      ),
-    ).toEqual(4));
-  it('sicp 88.2', () =>
-    expect(
-      evaluate(
-        `
-  (def (f g) (g 2))
-  (f (fn (z) (* z (+ z 1))))
-            `,
-        scope,
-      ),
-    ).toEqual(6));
-
-  // Finding roots of equations by the half-interval method
-  it('sicp 89.1', () =>
-    expect(
-      evaluate(
-        `
-(def (search f negpoint pospoint)
- (let ((midpoint (average negpoint pospoint)))
- (if (closeenough negpoint pospoint) 
-  midpoint
-  (let ((testvalue (f midpoint))) 
-   (match ((positive testvalue)
-           (search f negpoint midpoint))
-          ((negative testvalue)
-           (search f midpoint pospoint)) 
-          (else midpoint))))))
-
-(def (closeenough x y) (lt (abs (- x y)) 0.001))
-
-(def (negative x) (lt x 0))
-(def (positive x) (gt x 0))
-
-(def (halfintervalmethod f a b) (let ((avalue (f a))
-(bvalue (f b)))
-(match ((and (negative avalue) (positive bvalue))
-(search f a b))
-((and (negative bvalue) (positive avalue))
-(search f b a)) (else
-(error "Values are not of opposite sign" a b)))))
-
-(halfintervalmethod sin 2.0 4.0)
-`,
-        scope,
-      ),
-    ).toEqual(3.14111328125));
-
-  it('sicp 89.1', () =>
-    expect(evaluate(`(halfintervalmethod (fn (x) (- (* x x x) (* 2 x) 3)) 1.0 2.0)`, scope)).toEqual(1.89306640625));
-
-  // Finding fixed points of functions
-  it('sicp 92.1', () =>
-    expect(
-      evaluate(
-        `
-(def tolerance 0.00001)
-(def (fixedpoint f first-guess)
- (def (closeenough v1 v2) (lt (abs (- v1 v2)) tolerance)) 
- (def (try guess)
-  (let ((next (f guess)))
-  (if (closeenough guess next) next (try next))))
- (try first-guess))
-
-(fixedpoint cos 1.0)
-`,
-        scope,
-      ),
-    ).toEqual(0.7390822985224023));
-  it('sicp 93.1', () =>
-    expect(evaluate(`(fixedpoint (fn (y) (+ (sin y) (cos y))) 1.0)`, scope)).toEqual(1.2587315962971173));
-  // Maximum call stack size exceeded (expected)
-  /* it('sicp 93.2', () =>
-    expect(evaluate(`(def (sqrt x) (fixedpoint (fn (y) (/ x y)) 1.0)) (sqrt 4)`, scope)).toEqual(0)); */
-  it('sicp 93.3', () =>
-    expect(evaluate(`(def (sqrt x) (fixedpoint (fn (y) (average y (/ x y))) 1.0)) (sqrt 7)`, scope)).toEqual(
-      2.6457513110645907,
-    ));
-  // Procedures as Returned Values
-  it('sicp 97.1', () =>
-    expect(evaluate(`(def (averagedamp f) (fn (x) (average x (f x)))) ((averagedamp square) 10)`, scope)).toEqual(55));
-  it('sicp 98.1', () =>
-    expect(evaluate(`(def (sqrt x) (fixedpoint (averagedamp (fn (y) (/ x y))) 1.0)) (sqrt 7)`, scope)).toEqual(
-      2.6457513110645907,
-    ));
-  it('sicp 98.2', () =>
-    expect(
-      evaluate(`(def (cuberoot x) (fixedpoint (averagedamp (fn (y) (/ x (square y)))) 1.0)) (cuberoot 7)`, scope),
-    ).toEqual(1.912934258514886));
-  it('sicp 99.1', () =>
-    expect(
-      evaluate(
-        `
-        (def (deriv g) (fn (x) (/ (- (g (+ x dx)) (g x)) dx))) 
-        (def dx 0.00001)
-        (def (cube x) (* x x x))
-        ((deriv cube) 5)
-        `,
-        scope,
-      ),
-    ).toEqual(75.00014999664018));
-  // With the aid of deriv, we can express Newton’s method as a fixed-point process:
-  it('sicp 100.1', () =>
-    expect(
-      evaluate(
-        `
-(def (newtontransform g)
-(fn (x) (- x (/ (g x) ((deriv g) x)))))
-(def (newtonsmethod g guess) (fixedpoint (newtontransform g) guess))
-(def (sqrt x) (newtonsmethod (fn (y) (- (square y) x)) 1.0))
-(sqrt 7)
-          `,
-        scope,
-      ),
-    ).toEqual(2.6457513110645907));
-  // whatever this is
-  it('sicp 101.1', () =>
-    expect(
-      evaluate(
-        `
-  (def (fixedpointoftransform g transform guess) (fixedpoint (transform g) guess))
-  (def (sqrt x) (fixedpointoftransform
-  (fn (y) (/ x y)) averagedamp 1.0))
-  (sqrt 7)
-  `,
-        scope,
-      ),
-    ).toEqual(2.6457513110645907));
-  it('sicp 101.2', () =>
-    expect(
-      evaluate(
-        `
-(def (sqrt x) (fixedpointoftransform
-(fn (y) (- (square y) x)) newtontransform 1.0))
-(sqrt 7)
-    `,
-        scope,
-      ),
-    ).toEqual(2.6457513110645907));
-
-  // data abstraction
-
-  // rational arithmetic
-  it('sicp 114.1', () =>
-    expect(
-      evaluate(
-        `
-(def (addrat x y)
- (makerat (+ (* 
-   (numer x) (denom y))
-   (* (numer y) (denom x)))
-  (* (denom x) (denom y))))
-(def (subrat x y)
- (makerat (- (* (numer x) (denom y))
-   (* (numer y) (denom x)))
-  (* (denom x) (denom y))))
-(def (mulrat x y)
- (makerat (* (numer x) (numer y))
-  (* (denom x) (denom y)))) 
-(def (divrat x y)
-  (makerat (* (numer x) (denom y))
-   (* (denom x) (numer y))))
-(def (equalrat x y)
-  (eq (* (numer x) (denom y))
-     (* (numer y) (denom x))))
-        `,
-        scope,
-      ),
-    ).toEqual(0));
-
-  // markerat number denom
-  it('sicp 117.1', () =>
-    expect(
-      evaluate(
-        `
-(def (makerat n d) (cons n d)) 
-(def (numer x) (car x))
-(def (denom x) (cdr x))
-(def (printrat x) (concat (numer x) ':' (denom x)))
-      `,
-        scope,
-      ),
-    ).toEqual(0));
-
-  it('sicp 117.1', () => expect(evaluate(`(def onehalf (makerat 1 2)) (printrat onehalf)`, scope)).toEqual('1:2'));
-  it('sicp 117.2', () =>
-    expect(evaluate(`(def onethird (makerat 1 3)) (printrat (addrat onehalf onethird))`, scope)).toEqual('5:6'));
-  it('sicp 117.3', () => expect(evaluate(`(printrat (mulrat onehalf onethird))`, scope)).toEqual('1:6'));
-  it('sicp 117.4', () => expect(evaluate(`(printrat (addrat onethird onethird))`, scope)).toEqual('6:9'));
-  it('sicp 118.1', () =>
-    expect(evaluate(`(def (makerat n d) (let ((g (gcd n d))) (cons (/ n g) (/ d g))))`, scope)).toEqual(0));
-  it('sicp 118.1', () => expect(evaluate(`(printrat (addrat onethird onethird))`, scope)).toEqual('2:3'));
-
-  let lscope = {};
-  // pairs with lambda
-  it('sicp 124.1', () =>
-    expect(
-      evaluate(
-        `
-(def (cons x y) 
- (def (dispatch m)
-  (match 
-   ((eq m 0) x) 
-   ((eq m 1) y)
-   (else (error "argument not 0 or 1: CONS" m)))
-  ) dispatch)
- (def (car z) (z 0)) 
- (def (cdr z) (z 1))
-      `,
-        lscope,
-      ),
-    ).toEqual(0));
-  it('sicp 124.1', () => expect(evaluate(`(car (cons first second))`, lscope)).toEqual('first'));
-  it('sicp 124.2', () => expect(evaluate(`(cdr (cons first second))`, lscope)).toEqual('second'));
-  // lists
-  it('sicp 135.1', () => expect(evaluate(`(list 1 2 3 4)`)).toEqual([1, 2, 3, 4]));
-  it('sicp 137.1', () => expect(evaluate(`(car (list 1 2 3 4))`)).toEqual(1));
-  it('sicp 137.2', () => expect(evaluate(`(cdr (list 1 2 3 4))`)).toEqual([2, 3, 4]));
-  it('sicp 137.3', () => expect(evaluate(`(car (cdr (list 1 2 3 4)))`)).toEqual(2));
-  it('sicp 137.4', () => expect(evaluate(`(cons 10 (list 1 2 3 4))`)).toEqual([10, 1, 2, 3, 4]));
-  // listref
-  it('sicp 138.1', () =>
-    expect(
-      evaluate(
-        `
-(def (listref items n) (if (eq n 0) (car items) 
- (listref (cdr items) (- n 1)))) 
-(def squares (list 1 4 9 16 25)) 
-(listref squares 3)`,
-        scope,
-      ),
-    ).toEqual(16));
-  // length recursive
-  it('sicp 138.2', () =>
-    expect(
-      evaluate(
-        `
-  (def (length items) 
-   (if (isnull items) 0
-    (+ 1 (length (cdr items))))) 
-  (def odds (list 1 3 5 7)) 
-  (length odds)`,
-      ),
-    ).toEqual(4));
-  // length iterative
-  it('sicp 139.1', () =>
-    expect(
-      evaluate(
-        `
-  (def (length items)
-  (def (lengthiter a count)
-   (if (isnull a) count
-    (lengthiter (cdr a) (+ 1 count))))
-    (lengthiter items 0))
-  (def odds (list 1 3 5 7)) 
-  (length odds)
-  `,
-        scope,
-      ),
-    ).toEqual(4));
-  // append
-  it('sicp 139.1', () =>
-    expect(
-      evaluate(
-        `
-(def (append list1 list2) 
-(if (isnull list1)
-  list2
-  (cons (car list1) (append (cdr list1) list2))))
-  (append squares odds)
-    `,
-        scope,
-      ),
-    ).toEqual([1, 4, 9, 16, 25, 1, 3, 5, 7]));
-  // (define (f x y . z) ⟨body⟩) <- tbd: variable argument count
-  // Mapping over lists
-
-  it('sicp 143.1', () =>
-    expect(
-      evaluate(
-        `
-(def (scalelist items factor) (if (isnull items) nil
-    (cons (* (car items) factor)
-          (scalelist (cdr items) factor))))
-(scalelist (list 1 2 3 4 5) 10)
-    `,
-        scope,
-      ),
-    ).toEqual([10, 20, 30, 40, 50]));
-
-  it('sicp 143.1', () =>
-    expect(
-      evaluate(
-        `
-  (def (map proc items) (if (isnull items) nil
-        (cons (proc (car items))
-              (map proc (cdr items)))))
-  (map abs (list -10 2.5 -11.6 17))
-  `,
-        scope,
-      ),
-    ).toEqual([10, 2.5, 11.6, 17]));
-  it('sicp 143.1', () => expect(evaluate(`(map (fn (x) (* x x)) (list 1 2 3 4))`, scope)).toEqual([1, 4, 9, 16]));
-  it('sicp 143.1', () =>
-    expect(
-      evaluate(
-        `
-(def (scalelist items factor) (map (fn (x) (* x factor)) items))
-(scalelist (list 1 2 3 4 5) 10)
-`,
-        scope,
-      ),
-    ).toEqual([10, 20, 30, 40, 50]));
-});
@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-//import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'mondo.mjs'),
-      formats: ['es'],
-      fileName: (ext) => ({ es: 'mondo.mjs' })[ext],
-    },
-    rollupOptions: {
-      // external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});
@@ -1,3 +0,0 @@
-# @strudel/mondough
-
-connects mondo to strudel.
@@ -1,132 +0,0 @@
-import {
-  strudelScope,
-  reify,
-  fast,
-  slow,
-  seq,
-  stepcat,
-  extend,
-  expand,
-  pace,
-  chooseIn,
-  degradeBy,
-  silence,
-} from '@strudel/core';
-import { registerLanguage } from '@strudel/transpiler';
-import { MondoRunner } from 'mondolang';
-
-const tail = (friend, pat) => pat.fmap((a) => (b) => (Array.isArray(a) ? [...a, b] : [a, b])).appLeft(friend);
-
-const arrayRange = (start, stop, step = 1) =>
-  Array.from({ length: Math.abs(stop - start) / step + 1 }, (_, index) =>
-    start < stop ? start + index * step : start - index * step,
-  );
-const range = (max, min) => min.squeezeBind((a) => max.bind((b) => seq(...arrayRange(a, b))));
-
-let nope = (...args) => args[args.length - 1];
-
-let lib = {};
-lib['nope'] = nope;
-lib['-'] = (a, b) => b.early(a);
-lib['+'] = (a, b) => b.late(a);
-lib['_'] = silence;
-lib['~'] = silence;
-lib.curly = stepcat;
-lib.square = (...args) => stepcat(...args).setSteps(1);
-lib.angle = (...args) => stepcat(...args).pace(1);
-lib['*'] = fast;
-lib['/'] = slow;
-lib['!'] = extend;
-lib['@'] = expand;
-lib['%'] = pace;
-lib['?'] = degradeBy; // todo: default 0.5 not working..
-lib[':'] = tail;
-lib['..'] = range;
-lib['def'] = () => silence;
-lib['or'] = (...children) => chooseIn(...children); // always has structure but is cyclewise.. e.g. "s oh*8.dec[.04 | .5]"
-//lib['or'] = (...children) => chooseOut(...children); // "s oh*8.dec[.04 | .5]" is better but "dec[.04 | .5].s oh*8" has no struct
-
-function evaluator(node, scope) {
-  const { type } = node;
-  // node is list
-  if (type === 'list') {
-    const { children } = node;
-    const [name, ...args] = children;
-    // some functions wont be reified to make sure they work (e.g. see extend below)
-    if (typeof name === 'function') {
-      return name(...args);
-    }
-    if (name.value === 'def') {
-      return silence;
-    }
-    // name is expected to be a pattern of functions!
-    const first = name.firstCycle(true)[0];
-    const type = typeof first?.value;
-    if (type !== 'function') {
-      throw new Error(`[mondough] expected function, got "${first?.value}"`);
-    }
-    return name
-      .fmap((fn) => {
-        if (typeof fn !== 'function') {
-          throw new Error(`[mondough] "${fn}" is not a function b`);
-        }
-        return fn(...args);
-      })
-      .innerJoin();
-  }
-  // node is leaf
-  let { value } = node;
-  if (type === 'plain' && scope[value]) {
-    return reify(scope[value]); // -> local scope has no location
-  }
-  const variable = lib[value] ?? strudelScope[value];
-  // problem: collisions when we want a string that happens to also be a variable name
-  // example: "s sine" -> sine is also a variable
-  let pat;
-  if (type === 'plain' && typeof variable !== 'undefined') {
-    // some function names are not patternable, so we skip reification here
-    if (['!', 'extend', '@', 'expand', 'square', 'angle', 'all', 'setcpm', 'setcps'].includes(value)) {
-      return variable;
-    }
-    pat = reify(variable);
-  } else {
-    pat = reify(value);
-  }
-  if (node.loc) {
-    pat = pat.withLoc(node.loc[0], node.loc[1]);
-  }
-  return pat;
-}
-
-let runner = new MondoRunner({ evaluator });
-
-export function mondo(code, offset = 0) {
-  if (Array.isArray(code)) {
-    code = code.join('');
-  }
-  const pat = runner.run(code, undefined, offset);
-  return pat.markcss('color: var(--caret,--foreground);text-decoration:underline');
-}
-
-export let getLocations = (code, offset) => runner.parser.get_locations(code, offset);
-
-export const mondi = (str, offset) => {
-  const code = `[${str}]`;
-  return mondo(code, offset);
-};
-
-// tell transpiler how to get locations for mondo`` calls
-registerLanguage('mondo', {
-  getLocations,
-});
-
-// this is like mondo, but with a zero offset
-export const mondolang = (code) => mondo(code, 0);
-registerLanguage('mondolang', {
-  getLocations: (code) => getLocations(code, 0),
-});
-// uncomment the following to use mondo as mini notation language
-/* registerLanguage('minilang', {
-  name: 'mondi',
-  getLocations,
-}); */
@@ -1,44 +0,0 @@
-{
-  "name": "@strudel/mondo",
-  "version": "1.1.4",
-  "description": "mondo notation for strudel",
-  "main": "mondough.mjs",
-  "type": "module",
-  "publishConfig": {
-    "main": "dist/mondough.mjs"
-  },
-  "scripts": {
-    "test": "vitest run",
-    "bench": "vitest bench",
-    "build:parser": "peggy -o krill-parser.js --format es ./krill.pegjs",
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tidalcycles/strudel.git"
-  },
-  "keywords": [
-    "tidalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://github.com/tidalcycles/strudel/issues"
-  },
-  "homepage": "https://github.com/tidalcycles/strudel#readme",
-  "dependencies": {
-    "@strudel/core": "workspace:*",
-    "@strudel/transpiler": "workspace:*",
-    "mondolang": "workspace:*"
-  },
-  "devDependencies": {
-    "mondo": "*",
-    "vite": "^6.0.11",
-    "vitest": "^3.0.4"
-  }
-}
@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'mondough.mjs'),
-      formats: ['es'],
-      fileName: (ext) => ({ es: 'mondough.mjs' })[ext],
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/motion",
-  "version": "1.2.4",
+  "version": "1.2.2",
  "description": "DeviceMotion API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/mqtt",
-  "version": "1.2.4",
+  "version": "1.2.2",
  "description": "MQTT API for strudel",
  "main": "mqtt.mjs",
  "type": "module",
@@ -4,13 +4,21 @@ OSC output for strudel patterns! Currently only tested with super collider / sup

 ## Usage

-Assuming you have [node.js](https://nodejs.org/) installed, you can run the osc bridge server via:
+OSC will only work if you run the REPL locally + the OSC server besides it:

-```sh
-npx @strudel/osc
+From the project root:
+
+```js
+npm run repl
 ```

-You should see something like:
+and in a seperate shell:
+
+```js
+npm run osc
+```
+
+This should give you

 ```log
 osc client running on port 57120
@@ -18,32 +26,14 @@ osc server running on port 57121
 websocket server running on port 8080
 ```

-### --port
+Now open Supercollider (with the super dirt startup file)

-By default it will use port 57120 for the osc client, which is what [superdirt](https://github.com/musikinformatik/SuperDirt) uses. You can change it via the `--port` option:
-
-```sh
-npx @strudel/osc --port 7771 # classic dirt
-```
-
-### --debug
-
-To log all incoming osc messages, add the `--debug` flag:
-
-```sh
-npx @strudel/osc --debug
-```
-
-## Usage in Strudel
-
-To test it in strudel, you have can use `all(osc)` to send all events through osc:
+Now open the REPL and type:

 ```js
-$: s("bd*4")
-
-all(osc)
+s("<bd sd> hh").osc()
 ```

-[open in repl](https://strudel.cc/#JDogcygiYmQqNCIpCgphbGwob3NjKQ%3D%3D)
+or just [click here](https://strudel.cc/#cygiPGJkIHNkPiBoaCIpLm9zYygp)...

 You can read more about [how to use Superdirt with Strudel the Tutorial](https://strudel.cc/learn/input-output/#superdirt-api)
@@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th

 import OSC from 'osc-js';

-import { logger, parseNumeral, register, isNote, noteToMidi, ClockCollator } from '@strudel/core';
+import { logger, parseNumeral, Pattern, isNote, noteToMidi, ClockCollator } from '@strudel/core';

 let connection; // Promise<OSC>
 function connect() {
@@ -60,7 +60,7 @@ export function parseControlsFromHap(hap, cps) {

 const collator = new ClockCollator({});

-export async function oscTrigger(hap, currentTime, cps = 1, targetTime) {
+export async function oscTrigger(t_deprecate, hap, currentTime, cps = 1, targetTime) {
  const osc = await connect();
  const controls = parseControlsFromHap(hap, cps);
  const keyvals = Object.entries(controls).flat();
@@ -81,4 +81,6 @@ export async function oscTrigger(hap, currentTime, cps = 1, targetTime) {
 * @memberof Pattern
 * @returns Pattern
 */
-export const osc = register('osc', (pat) => pat.onTrigger(oscTrigger));
+Pattern.prototype.osc = function () {
+  return this.onTrigger(oscTrigger);
+};
@@ -1,9 +1,8 @@
 {
  "name": "@strudel/osc",
-  "version": "1.2.10",
+  "version": "1.2.2",
  "description": "OSC messaging for strudel",
  "main": "osc.mjs",
-  "bin": "./server.js",
  "type": "module",
  "publishConfig": {
    "main": "dist/index.mjs"
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
 /*
 server.js - <short description TODO>
 Copyright (C) 2022 Strudel contributors - see <https://codeberg.org/uzu/strudel/src/branch/main/packages/osc/server.js>
@@ -8,19 +6,6 @@ This program is free software: you can redistribute it and/or modify it under th

 import OSC from 'osc-js';

-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];
-  }
-}
-
-let udpClientPort = Number(getArgValue('--port')) || 57120;
-let debug = Number(getArgValue('--debug')) || 0;
-
 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: {
@@ -32,7 +17,7 @@ const config = {
  },
  udpClient: {
    host: 'localhost', // @param {string} Hostname of udp client for messaging
-    port: udpClientPort, // @param {number} Port of udp client for messaging
+    port: 57120, // @param {number} Port of udp client for messaging
  },
  wsServer: {
    host: 'localhost', // @param {string} Hostname of WebSocket server
@@ -42,34 +27,8 @@ const config = {

 const osc = new OSC({ plugin: new OSC.BridgePlugin(config) });

-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}`);
-  });
-}
-
-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();
+osc.open(); // start a WebSocket server on port 8080

 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');
-}
@@ -1,10 +1,10 @@
-/* import { oscTriggerTauri } from '../desktopbridge/oscbridge.mjs';
-import { isTauri } from '../desktopbridge/utils.mjs'; */
+import { oscTriggerTauri } from '../desktopbridge/oscbridge.mjs';
+import { isTauri } from '../desktopbridge/utils.mjs';
 import { oscTrigger } from './osc.mjs';

-const trigger = /* isTauri() ? oscTriggerTauri : */ oscTrigger;
+const trigger = isTauri() ? oscTriggerTauri : oscTrigger;

 export const superdirtOutput = (hap, deadline, hapDuration, cps, targetTime) => {
  const currentTime = performance.now() / 1000;
-  return trigger(hap, currentTime, cps, targetTime);
+  return trigger(null, hap, currentTime, cps, targetTime);
 };
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/reference",
-  "version": "1.2.1",
+  "version": "1.2.0",
  "description": "Headless reference of all strudel functions",
  "main": "index.mjs",
  "type": "module",
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/repl",
-  "version": "1.2.6",
+  "version": "1.2.3",
  "description": "Strudel REPL as a Web Component",
  "module": "index.mjs",
  "publishConfig": {
@@ -36,7 +36,7 @@ export async function prebake() {
    samples(`${ds}/tidal-drum-machines.json`),
    samples(`${ds}/piano.json`),
    samples(`${ds}/Dirt-Samples.json`),
-    samples(`${ds}/uzu-drumkit.json`),
+    samples(`${ds}/EmuSP12.json`),
    samples(`${ds}/vcsl.json`),
    samples(`${ds}/mridangam.json`),
  ]);
@@ -20,13 +20,3 @@ samples('http://localhost:5432')
 LOG=1 npx @strudel/sampler # adds logging
 PORT=5555 npx @strudel/sampler # changes port
 ```
-
-## static json
-
-when running with `--json`, you will simply get the json logged back:
-
-```sh
-npx --yes @strudel/sampler --json > strudel.json
-```
-
-this is useful if you want to create a sample pack from the current folder.
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/sampler",
-  "version": "0.2.3",
+  "version": "0.2.0",
  "description": "",
  "keywords": [
    "tidalcycles",
@@ -1,20 +1,22 @@
 #!/usr/bin/env node

 import cowsay from 'cowsay';
-import { createReadStream, existsSync, writeFileSync } from 'fs';
+import { createReadStream, existsSync } from 'fs';
 import { readdir } from 'fs/promises';
 import http from 'http';
-import { join, resolve, sep } from 'path';
-import readline from 'readline';
+import { join, sep } from 'path';
 import os from 'os';

+// eslint-disable-next-line
 const LOG = !!process.env.LOG || false;
-const VALID_AUDIO_EXTENSIONS = ['wav', 'mp3', 'ogg'];

-const isAudioFile = (f) => {
-  const ext = f.split('.').slice(-1)[0].toLowerCase();
-  return VALID_AUDIO_EXTENSIONS.includes(ext);
-};
+console.log(
+  cowsay.say({
+    text: 'welcome to @strudel/sampler',
+    e: 'oO',
+    T: 'U ',
+  }),
+);

 async function getFilesInDirectory(directory) {
  let files = [];
@@ -27,90 +29,42 @@ async function getFilesInDirectory(directory) {
        continue;
      }
      try {
-        const subFiles = (await getFilesInDirectory(fullPath)).filter(isAudioFile);
+        const subFiles = (await getFilesInDirectory(fullPath)).filter((f) =>
+          ['wav', 'mp3', 'ogg'].includes(f.split('.').slice(-1)[0].toLowerCase()),
+        );
        files = files.concat(subFiles);
        LOG && console.log(`${dirent.name} (${subFiles.length})`);
      } catch (err) {
        LOG && console.warn(`skipped due to error: ${fullPath}`);
      }
    } else {
-      isAudioFile(fullPath) && files.push(fullPath);
+      files.push(fullPath);
    }
  }
  return files;
 }

-async function getBanks(directory, flat = false) {
+async function getBanks(directory) {
  let files = await getFilesInDirectory(directory);
  let banks = {};
  directory = directory.split(sep).join('/');
  files = files.map((path) => {
    path = path.split(sep).join('/');
-    const subDir = path.replace(directory, '');
-    const subDirFlat = subDir.replaceAll('/', '_').slice(1); // remove initial underscore
-    const subDirFlatStem = subDirFlat.replace(/\.[^.]+$/, ''); // remove extension
-    let bank = flat ? subDirFlatStem : path.split('/').slice(-2)[0];
+    const [bank] = path.split('/').slice(-2);
    banks[bank] = banks[bank] || [];
-    banks[bank].push(subDir);
-    return subDir;
+    const relativeUrl = path.replace(directory, '');
+    banks[bank].push(relativeUrl);
+    return relativeUrl;
  });
  banks._base = `http://localhost:5432`;
  return { banks, files };
 }

-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];
-  }
-}
-
-function getInput(query) {
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-  });
-
-  return new Promise((resolve) =>
-    rl.question(query, (response) => {
-      rl.close();
-      resolve(response);
-    }),
-  );
-}
-
-let directory = getArgValue('--dir') || process.cwd();
-directory = resolve(directory);
-if (args.includes('--json')) {
-  const { banks } = await getBanks(directory, getArgValue('--flat'));
-  const json = JSON.stringify(banks);
-  const outFile = resolve(directory, 'strudel.json');
-  if (existsSync(outFile)) {
-    const answer = await getInput(`Warning: File already exists at ${outFile}. Overwrite? (y/N): `);
-    if (answer.toLowerCase() !== 'y') {
-      console.log('Aborted.');
-      process.exit(0);
-    }
-  }
-  writeFileSync(outFile, json, 'utf8');
-  console.log(`Wrote json to ${outFile}`);
-}
-
-console.log(
-  cowsay.say({
-    text: 'welcome to @strudel/sampler',
-    e: 'oO',
-    T: 'U ',
-  }),
-);
-
+// eslint-disable-next-line
+const directory = process.cwd();
 const server = http.createServer(async (req, res) => {
  res.setHeader('Access-Control-Allow-Origin', '*');
-  const { banks, files } = await getBanks(directory, getArgValue('--flat'));
+  const { banks, files } = await getBanks(directory);
  if (req.url === '/') {
    res.setHeader('Content-Type', 'application/json');
    return res.end(JSON.stringify(banks));
@@ -118,7 +72,7 @@ const server = http.createServer(async (req, res) => {
  let subpath = decodeURIComponent(req.url);
  const filePath = join(directory, subpath.split('/').join(sep));

-  // console.log('GET:', filePath);
+  //console.log('GET:', filePath);
  const isFound = existsSync(filePath);
  if (!isFound) {
    res.statusCode = 404;
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/serial",
-  "version": "1.2.4",
+  "version": "1.2.2",
  "description": "Webserial API for strudel",
  "main": "serial.mjs",
  "type": "module",
@@ -537,7 +537,7 @@ export default {
  ],
  gm_synth_bass_1: [
    // Synth Bass 1: Bass
-    // '0380_Aspirin_sf2_file', // broken in safari https://codeberg.org/uzu/strudel/issues/1384
+    '0380_Aspirin_sf2_file',
    '0380_Chaos_sf2_file',
    '0380_FluidR3_GM_sf2_file',
    // 0380_GeneralUserGS_sf2_file // laut
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/soundfonts",
-  "version": "1.2.5",
+  "version": "1.2.3",
  "description": "Soundsfont support for strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -3,7 +3,7 @@ import { getAudioContext, registerSound } from '@strudel/webaudio';
 import { loadSoundfont as _loadSoundfont, startPresetNote } from 'sfumato';

 Pattern.prototype.soundfont = function (sf, n = 0) {
-  return this.onTrigger((h, ct, cps, targetTime) => {
+  return this.onTrigger((time_deprecate, h, ct, cps, targetTime) => {
    const ctx = getAudioContext();
    const note = getPlayableNoteValue(h);
    const preset = sf.presets[n % sf.presets.length];
@@ -74,6 +74,6 @@ export const dough = async (code) => {
  worklet.node.connect(ac.destination);
 };

-export function doughTrigger(hap, currentTime, cps, targetTime) {
+export function doughTrigger(time_deprecate, hap, currentTime, cps, targetTime) {
  window.postMessage({ time: targetTime, dough: hap.value, currentTime, duration: hap.duration, cps });
 }
@@ -1,8 +1,5 @@
 import { getAudioContext } from './superdough.mjs';
-import { clamp, nanFallback, midiToFreq, noteToMidi } from './util.mjs';
-import { getNoiseBuffer } from './noise.mjs';
-
-export const noises = ['pink', 'white', 'brown', 'crackle'];
+import { clamp, nanFallback } from './util.mjs';

 export function gainNode(value) {
  const node = getAudioContext().createGain();
@@ -10,13 +7,6 @@ export function gainNode(value) {
  return node;
 }

-export function effectSend(input, effect, wet) {
-  const send = gainNode(wet);
-  input.connect(send);
-  send.connect(effect);
-  return send;
-}
-
 const getSlope = (y1, y2, x1, x2) => {
  const denom = x2 - x1;
  if (denom === 0) {
@@ -28,9 +18,7 @@ const getSlope = (y1, y2, x1, x2) => {
 export function getWorklet(ac, processor, params, config) {
  const node = new AudioWorkletNode(ac, processor, config);
  Object.entries(params).forEach(([key, value]) => {
-    if (value !== undefined) {
-      node.parameters.get(key).value = value;
-    }
+    node.parameters.get(key).value = value;
  });
  return node;
 }
@@ -97,35 +85,6 @@ export const getParamADSR = (
  param[ramp](min, end + release);
 };

-function getModulationShapeInput(val) {
-  if (typeof val === 'number') {
-    return val % 5;
-  }
-  return { tri: 0, triangle: 0, sine: 1, ramp: 2, saw: 3, square: 4 }[val] ?? 0;
-}
-
-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,
-    shape: getModulationShapeInput(shape),
-    dcoffset,
-    min: dcoffset * depth,
-    max: dcoffset * depth + depth,
-    curve: 1,
-    ...props,
-  };
-
-  return getWorklet(audioContext, 'lfo-processor', lfoprops);
-}
-
 export function getCompressor(ac, threshold, ratio, knee, attack, release) {
  const options = {
    threshold: threshold ?? -3,
@@ -153,41 +112,6 @@ export const getADSRValues = (params, curve = 'linear', defaultValues) => {
  return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)];
 };

-// 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;
-
-  if (amount == null) {
-    const hasADSRParams = values.some((p) => p != null);
-    amount = hasADSRParams ? defaultAmount : 0;
-  }
-
-  const min = offset ?? 0;
-  const max = amount + min;
-  const diff = Math.abs(max - min);
-  if (diff) {
-    const [attack, decay, sustain, release] = getADSRValues(values, curve, defaultValues);
-    getParamADSR(param, attack, decay, sustain, release, min, max, start, holdEnd, curve);
-  }
-  let lfo;
-  let { defaultDepth = 1, depth, dcoffset, ...getLfoInputs } = lfoValues;
-
-  if (depth == null) {
-    const hasLFOParams = Object.values(getLfoInputs).some((v) => v != null);
-    depth = hasLFOParams ? defaultDepth : 0;
-  }
-  if (depth) {
-    lfo = getLfo(audioContext, start, end, {
-      depth,
-      dcoffset,
-      ...getLfoInputs,
-    });
-    lfo.connect(param);
-  }
-
-  return { lfo, disconnect: () => lfo?.disconnect() };
-}
-
 export function createFilter(context, type, frequency, Q, att, dec, sus, rel, fenv, start, end, fanchor, model, drive) {
  const curve = 'exponential';
  const [attack, decay, sustain, release] = getADSRValues([att, dec, sus, rel], curve, [0.005, 0.14, 0, 0.1]);
@@ -247,7 +171,7 @@ let curves = ['linear', 'exponential'];
 export function getPitchEnvelope(param, value, t, holdEnd) {
  // envelope is active when any of these values is set
  const hasEnvelope = value.pattack ?? value.pdecay ?? value.psustain ?? value.prelease ?? value.penv;
-  if (hasEnvelope === undefined) {
+  if (!hasEnvelope) {
    return;
  }
  const penv = nanFallback(value.penv, 1, true);
@@ -282,46 +206,19 @@ export function getVibratoOscillator(param, value, t) {
 // ConstantSource inherits AudioScheduledSourceNode, which has scheduling abilities
 // a bit of a hack, but it works very well :)
 export function webAudioTimeout(audioContext, onComplete, startTime, stopTime) {
-  const constantNode = new ConstantSourceNode(audioContext);
-
-  // Certain browsers requires audio nodes to be connected in order for their onended events
-  // to fire, so we _mute it_ and then connect it to the destination
-  const zeroGain = gainNode(0);
-  zeroGain.connect(audioContext.destination);
-  constantNode.connect(zeroGain);
-
-  // Schedule the `onComplete` callback to occur at `stopTime`
-  constantNode.onended = () => {
-    // Ensure garbage collection
-    try {
-      zeroGain.disconnect();
-    } catch {
-      // pass
-    }
-    try {
-      constantNode.disconnect();
-    } catch {
-      // pass
-    }
-    onComplete();
-  };
+  const constantNode = audioContext.createConstantSource();
  constantNode.start(startTime);
  constantNode.stop(stopTime);
+  constantNode.onended = () => {
+    onComplete();
+  };
  return constantNode;
 }
 const mod = (freq, range = 1, type = 'sine') => {
  const ctx = getAudioContext();
-  let osc;
-  if (noises.includes(type)) {
-    osc = ctx.createBufferSource();
-    osc.buffer = getNoiseBuffer(type, 2);
-    osc.loop = true;
-  } else {
-    osc = ctx.createOscillator();
-    osc.type = type;
-    osc.frequency.value = freq;
-  }
-
+  const osc = ctx.createOscillator();
+  osc.type = type;
+  osc.frequency.value = freq;
  osc.start();
  const g = new GainNode(ctx, { gain: range });
  osc.connect(g); // -range, range
@@ -356,7 +253,7 @@ export function applyFM(param, value, begin) {

    modulator = fmmod.node;
    stop = fmmod.stop;
-    if (![fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity].some((v) => v !== undefined)) {
+    if (![fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity].find((v) => v !== undefined)) {
      // no envelope by default
      modulator.connect(param);
    } else {
@@ -380,25 +277,3 @@ export function applyFM(param, value, begin) {
  }
  return { stop };
 }
-
-export const getFrequencyFromValue = (value, defaultNote = 36) => {
-  let { note, freq } = value;
-  note = note || defaultNote;
-  if (typeof note === 'string') {
-    note = noteToMidi(note); // e.g. c3 => 48
-  }
-  // get frequency
-  if (!freq && typeof note === 'number') {
-    freq = midiToFreq(note); // + 48);
-  }
-
-  return Number(freq);
-};
-
-export const destroyAudioWorkletNode = (node) => {
-  if (node == null) {
-    return;
-  }
-  node.disconnect();
-  node.parameters.get('end')?.setValueAtTime(0, 0);
-};
@@ -11,4 +11,3 @@ export * from './synth.mjs';
 export * from './zzfx.mjs';
 export * from './logger.mjs';
 export * from './dspworklet.mjs';
-export * from './wavetable.mjs';
@@ -1,12 +1,5 @@
 let log = (msg) => console.log(msg);

-export function errorLogger(e, origin = 'superdough') {
-  if (process.env.NODE_ENV === 'development') {
-    console.error(e);
-  }
-  logger(`[${origin}] error: ${e.message}`);
-}
-
 export const logger = (...args) => log(...args);

 export const setLogger = (fn) => {
@@ -4,7 +4,7 @@ import { getAudioContext } from './superdough.mjs';
 let noiseCache = {};

 // lazy generates noise buffers and keeps them forever
-export function getNoiseBuffer(type, density) {
+function getNoiseBuffer(type, density) {
  const ac = getAudioContext();
  if (noiseCache[type]) {
    return noiseCache[type];
@@ -1,6 +1,6 @@
 {
  "name": "superdough",
-  "version": "1.2.5",
+  "version": "1.2.3",
  "description": "simple web audio synth and sampler intended for live coding. inspired by superdirt and webdirt.",
  "main": "index.mjs",
  "type": "module",
@@ -1,9 +1,7 @@
 import reverbGen from './reverbGen.mjs';
-import { clamp } from './util.mjs';

 if (typeof AudioContext !== 'undefined') {
-  AudioContext.prototype.adjustLength = function (duration, buffer, speed = 1, offsetAmount = 0) {
-    const sampleOffset = Math.floor(clamp(offsetAmount, 0, 1) * buffer.length);
+  AudioContext.prototype.adjustLength = function (duration, buffer) {
    const newLength = buffer.sampleRate * duration;
    const newBuffer = this.createBuffer(buffer.numberOfChannels, buffer.length, buffer.sampleRate);
    for (let channel = 0; channel < buffer.numberOfChannels; channel++) {
@@ -11,30 +9,22 @@ if (typeof AudioContext !== 'undefined') {
      let newData = newBuffer.getChannelData(channel);

      for (let i = 0; i < newLength; i++) {
-        // loop the buffer around to prevent
-        let position = (sampleOffset + i * Math.abs(speed)) % oldData.length;
-        if (speed < 1) {
-          position = position * -1;
-        }
-
-        newData[i] = oldData.at(position) || 0;
+        newData[i] = oldData[i] || 0;
      }
    }
    return newBuffer;
  };

-  AudioContext.prototype.createReverb = function (duration, fade, lp, dim, ir, irspeed, irbegin) {
+  AudioContext.prototype.createReverb = function (duration, fade, lp, dim, ir) {
    const convolver = this.createConvolver();
-    convolver.generate = (d = 2, fade = 0.1, lp = 15000, dim = 1000, ir, irspeed, irbegin) => {
+    convolver.generate = (d = 2, fade = 0.1, lp = 15000, dim = 1000, ir) => {
      convolver.duration = d;
      convolver.fade = fade;
      convolver.lp = lp;
      convolver.dim = dim;
      convolver.ir = ir;
-      convolver.irspeed = irspeed;
-      convolver.irbegin = irbegin;
      if (ir) {
-        convolver.buffer = this.adjustLength(d, ir, irspeed, irbegin);
+        convolver.buffer = this.adjustLength(d, ir);
      } else {
        reverbGen.generateReverb(
          {
@@ -51,7 +41,7 @@ if (typeof AudioContext !== 'undefined') {
        );
      }
    };
-    convolver.generate(duration, fade, lp, dim, ir, irspeed, irbegin);
+    convolver.generate(duration, fade, lp, dim, ir);
    return convolver;
  };
 }
@@ -1,5 +1,5 @@
-import { noteToMidi, valueToMidi, getSoundIndex, getCommonSampleInfo } from './util.mjs';
-import { getAudioContext, registerSound, registerWaveTable } from './index.mjs';
+import { noteToMidi, valueToMidi, getSoundIndex } from './util.mjs';
+import { getAudioContext, registerSound } from './index.mjs';
 import { getADSRValues, getParamADSR, getPitchEnvelope, getVibratoOscillator } from './helpers.mjs';
 import { logger } from './logger.mjs';

@@ -22,16 +22,39 @@ function humanFileSize(bytes, si) {
  return bytes.toFixed(1) + ' ' + units[u];
 }

+// deduces relevant info for sample loading from hap.value and sample definition
+// it encapsulates the core sampler logic into a pure and synchronous function
+// hapValue: Hap.value, bank: sample bank definition for sound "s" (values in strudel.json format)
 export function getSampleInfo(hapValue, bank) {
-  const { speed = 1.0 } = hapValue;
-  const { transpose, url, index, midi, label } = getCommonSampleInfo(hapValue, bank);
+  const { s, n = 0, speed = 1.0 } = hapValue;
+  let midi = valueToMidi(hapValue, 36);
+  let transpose = midi - 36; // C3 is middle C;
+  let sampleUrl;
+  let index = 0;
+  if (Array.isArray(bank)) {
+    index = getSoundIndex(n, bank.length);
+    sampleUrl = bank[index];
+  } else {
+    const midiDiff = (noteA) => noteToMidi(noteA) - midi;
+    // object format will expect keys as notes
+    const closest = Object.keys(bank)
+      .filter((k) => !k.startsWith('_'))
+      .reduce(
+        (closest, key, j) => (!closest || Math.abs(midiDiff(key)) < Math.abs(midiDiff(closest)) ? key : closest),
+        null,
+      );
+    transpose = -midiDiff(closest); // semitones to repitch
+    index = getSoundIndex(n, bank[closest].length);
+    sampleUrl = bank[closest][index];
+  }
+  const label = `${s}:${index}`;
  let playbackRate = Math.abs(speed) * Math.pow(2, transpose / 12);
-  return { transpose, url, index, midi, label, playbackRate };
+  return { transpose, sampleUrl, index, midi, label, playbackRate };
 }

 // takes hapValue and returns buffer + playbackRate.
 export const getSampleBuffer = async (hapValue, bank, resolveUrl) => {
-  let { url: sampleUrl, label, playbackRate } = getSampleInfo(hapValue, bank);
+  let { sampleUrl, label, playbackRate } = getSampleInfo(hapValue, bank);
  if (resolveUrl) {
    sampleUrl = await resolveUrl(sampleUrl);
  }
@@ -56,14 +79,14 @@ export const getSampleBufferSource = async (hapValue, bank, resolveUrl) => {
  bufferSource.buffer = buffer;
  bufferSource.playbackRate.value = playbackRate;

-  const { loopBegin = 0, loopEnd = 1, begin = 0, end = 1 } = hapValue;
+  const { s, loopBegin = 0, loopEnd = 1, begin = 0, end = 1 } = hapValue;

  // "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;
+  const loop = s.startsWith('wt_') ? 1 : hapValue.loop;
  if (loop) {
    bufferSource.loop = true;
    bufferSource.loopStart = loopBegin * bufferSource.buffer.duration - offset;
@@ -173,52 +196,6 @@ function getSamplesPrefixHandler(url) {
  return;
 }

-export async function fetchSampleMap(url) {
-  // check if custom prefix handler
-  const handler = getSamplesPrefixHandler(url);
-  if (handler) {
-    return handler(url);
-  }
-  url = resolveSpecialPaths(url);
-  if (url.startsWith('github:')) {
-    url = githubPath(url, 'strudel.json');
-  }
-  if (url.startsWith('local:')) {
-    url = `http://localhost:5432`;
-  }
-  if (url.startsWith('shabda:')) {
-    let [_, path] = url.split('shabda:');
-    url = `https://shabda.ndre.gr/${path}.json?strudel=1`;
-  }
-  if (url.startsWith('shabda/speech')) {
-    let [_, path] = url.split('shabda/speech');
-    path = path.startsWith('/') ? path.substring(1) : path;
-    let [params, words] = path.split(':');
-    let gender = 'f';
-    let language = 'en-GB';
-    if (params) {
-      [language, gender] = params.split('/');
-    }
-    url = `https://shabda.ndre.gr/speech/${words}.json?gender=${gender}&language=${language}&strudel=1'`;
-  }
-  if (typeof fetch !== 'function') {
-    // not a browser
-    return;
-  }
-  const base = url.split('/').slice(0, -1).join('/');
-  if (typeof fetch === 'undefined') {
-    // skip fetch when in node / testing
-    return;
-  }
-  const json = await fetch(url)
-    .then((res) => res.json())
-    .catch((error) => {
-      console.error(error);
-      throw new Error(`error loading "${url}"`);
-    });
-  return [json, json._base || base];
-}
-
 /**
 * Loads a collection of samples to use with `s`
 * @example
@@ -240,16 +217,61 @@ export async function fetchSampleMap(url) {

 export const samples = async (sampleMap, baseUrl = sampleMap._base || '', options = {}) => {
  if (typeof sampleMap === 'string') {
-    const [json, base] = await fetchSampleMap(sampleMap);
-    return samples(json, baseUrl || base, options);
+    // check if custom prefix handler
+    const handler = getSamplesPrefixHandler(sampleMap);
+    if (handler) {
+      return handler(sampleMap);
+    }
+    sampleMap = resolveSpecialPaths(sampleMap);
+    if (sampleMap.startsWith('github:')) {
+      sampleMap = githubPath(sampleMap, 'strudel.json');
+    }
+    if (sampleMap.startsWith('local:')) {
+      sampleMap = `http://localhost:5432`;
+    }
+    if (sampleMap.startsWith('shabda:')) {
+      let [_, path] = sampleMap.split('shabda:');
+      sampleMap = `https://shabda.ndre.gr/${path}.json?strudel=1`;
+    }
+    if (sampleMap.startsWith('shabda/speech')) {
+      let [_, path] = sampleMap.split('shabda/speech');
+      path = path.startsWith('/') ? path.substring(1) : path;
+      let [params, words] = path.split(':');
+      let gender = 'f';
+      let language = 'en-GB';
+      if (params) {
+        [language, gender] = params.split('/');
+      }
+      sampleMap = `https://shabda.ndre.gr/speech/${words}.json?gender=${gender}&language=${language}&strudel=1'`;
+    }
+    if (typeof fetch !== 'function') {
+      // not a browser
+      return;
+    }
+    const base = sampleMap.split('/').slice(0, -1).join('/');
+    if (typeof fetch === 'undefined') {
+      // skip fetch when in node / testing
+      return;
+    }
+    return fetch(sampleMap)
+      .then((res) => res.json())
+      .then((json) => samples(json, baseUrl || json._base || base, options))
+      .catch((error) => {
+        console.error(error);
+        throw new Error(`error loading "${sampleMap}"`);
+      });
  }
  const { prebake, tag } = options;
-
  processSampleMap(
    sampleMap,
-    (key, bank) => {
-      registerSampleSource(key, bank, { baseUrl, prebake, tag });
-    },
+    (key, bank) =>
+      registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, bank), {
+        type: 'sample',
+        samples: bank,
+        baseUrl,
+        prebake,
+        tag,
+      }),
    baseUrl,
  );
 };
@@ -339,20 +361,3 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {

  return handle;
 }
-
-function registerSample(key, bank, params) {
-  registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, bank), {
-    type: 'sample',
-    samples: bank,
-    ...params,
-  });
-}
-
-export function registerSampleSource(key, bank, params) {
-  const isWavetable = key.startsWith('wt_');
-  if (isWavetable) {
-    registerWaveTable(key, bank, params);
-  } else {
-    registerSample(key, bank, params);
-  }
-}
@@ -7,13 +7,12 @@ This program is free software: you can redistribute it and/or modify it under th
 import './feedbackdelay.mjs';
 import './reverb.mjs';
 import './vowel.mjs';
-import { nanFallback, _mod, cycleToSeconds } from './util.mjs';
+import { clamp, nanFallback, _mod } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { createFilter, gainNode, getCompressor, getLfo, getWorklet, effectSend } from './helpers.mjs';
+import { createFilter, gainNode, getCompressor, getWorklet } from './helpers.mjs';
 import { map } from 'nanostores';
 import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
-import { SuperdoughAudioController } from './superdoughoutput.mjs';

 export const DEFAULT_MAX_POLYPHONY = 128;
 const DEFAULT_AUDIO_DEVICE_NAME = 'System Standard';
@@ -107,24 +106,7 @@ export async function aliasBank(...args) {
  }
 }

-/**
- * Register an alias for a sound.
- * @param {string} original - The original sound name
- * @param {string} alias - The alias to use for the sound
- */
-export function soundAlias(original, alias) {
-  if (getSound(original) == null) {
-    logger('soundAlias: original sound not found');
-    return;
-  }
-  soundMap.setKey(alias, getSound(original));
-}
-
 export function getSound(s) {
-  if (typeof s !== 'string') {
-    console.warn(`getSound: expected string got "${s}". fall back to triangle`);
-    return soundMap.get().triangle; // is this good?
-  }
  return soundMap.get()[s.toLowerCase()];
 }

@@ -140,7 +122,7 @@ export const getAudioDevices = async () => {
  return devicesMap;
 };

-let defaultDefaultValues = {
+const defaultDefaultValues = {
  s: 'triangle',
  gain: 0.8,
  postgain: 1,
@@ -157,24 +139,13 @@ let defaultDefaultValues = {
  delay: 0,
  byteBeatExpression: '0',
  delayfeedback: 0.5,
-  delaysync: 3 / 16,
+  delaytime: 0.25,
  orbit: 1,
  i: 1,
  velocity: 1,
  fft: 8,
 };

-const defaultDefaultDefaultValues = Object.freeze({ ...defaultDefaultValues });
-
-export function setDefault(control, value) {
-  // const main = getControlName(control); // we cant do this because superdough is independent of strudel/core
-  defaultDefaultValues[control] = value;
-}
-
-export function resetDefaults() {
-  defaultDefaultValues = { ...defaultDefaultDefaultValues };
-}
-
 let defaultControls = new Map(Object.entries(defaultDefaultValues));

 export function setDefaultValue(key, value) {
@@ -203,7 +174,7 @@ export const resetLoadedSounds = () => soundMap.set({});
 let audioContext;

 export const setDefaultAudioContext = () => {
-  audioContext = new AudioContext({ latencyHint: 'playback' });
+  audioContext = new AudioContext();
  return audioContext;
 };

@@ -219,17 +190,11 @@ export function getAudioContextCurrentTime() {
  return getAudioContext().currentTime;
 }

-let externalWorklets = [];
-export function registerWorklet(url) {
-  externalWorklets.push(url);
-}
-
 let workletsLoading;
 function loadWorklets() {
  if (!workletsLoading) {
    const audioCtx = getAudioContext();
-    const allWorkletURLs = externalWorklets.concat([workletsUrl]);
-    workletsLoading = Promise.all(allWorkletURLs.map((workletURL) => audioCtx.audioWorklet.addModule(workletURL)));
+    workletsLoading = audioCtx.audioWorklet.addModule(workletsUrl);
  }

  return workletsLoading;
@@ -295,16 +260,79 @@ export async function initAudioOnFirstClick(options) {
  return audioReady;
 }

-let controller;
-function getSuperdoughAudioController() {
-  if (controller == null) {
-    controller = new SuperdoughAudioController(getAudioContext());
-  }
-  return controller;
+let delays = {};
+const maxfeedback = 0.98;
+
+let channelMerger, destinationGain;
+//update the output channel configuration to match user's audio device
+export function initializeAudioOutput() {
+  const audioContext = getAudioContext();
+  const maxChannelCount = audioContext.destination.maxChannelCount;
+  audioContext.destination.channelCount = maxChannelCount;
+  channelMerger = new ChannelMergerNode(audioContext, { numberOfInputs: audioContext.destination.channelCount });
+  destinationGain = new GainNode(audioContext);
+  channelMerger.connect(destinationGain);
+  destinationGain.connect(audioContext.destination);
 }
-export function connectToDestination(input, channels) {
-  const controller = getSuperdoughAudioController();
-  controller.output.connectToDestination(input, channels);
+
+// input: AudioNode, channels: ?Array<int>
+export const connectToDestination = (input, channels = [0, 1]) => {
+  const ctx = getAudioContext();
+  if (channelMerger == null) {
+    initializeAudioOutput();
+  }
+  //This upmix can be removed if correct channel counts are set throughout the app,
+  // and then strudel could theoretically support surround sound audio files
+  const stereoMix = new StereoPannerNode(ctx);
+  input.connect(stereoMix);
+
+  const splitter = new ChannelSplitterNode(ctx, {
+    numberOfOutputs: stereoMix.channelCount,
+  });
+  stereoMix.connect(splitter);
+  channels.forEach((ch, i) => {
+    splitter.connect(channelMerger, i % stereoMix.channelCount, ch % ctx.destination.channelCount);
+  });
+};
+
+export const panic = () => {
+  if (destinationGain == null) {
+    return;
+  }
+  destinationGain.gain.linearRampToValueAtTime(0, getAudioContext().currentTime + 0.01);
+  destinationGain = null;
+  channelMerger == null;
+};
+
+function getDelay(orbit, delaytime, delayfeedback, t, channels) {
+  if (delayfeedback > maxfeedback) {
+    //logger(`delayfeedback was clamped to ${maxfeedback} to save your ears`);
+  }
+  delayfeedback = clamp(delayfeedback, 0, 0.98);
+  if (!delays[orbit]) {
+    const ac = getAudioContext();
+    const dly = ac.createFeedbackDelay(1, delaytime, delayfeedback);
+    dly.start?.(t); // for some reason, this throws when audion extension is installed..
+    connectToDestination(dly, channels);
+    delays[orbit] = dly;
+  }
+  delays[orbit].delayTime.value !== delaytime && delays[orbit].delayTime.setValueAtTime(delaytime, t);
+  delays[orbit].feedback.value !== delayfeedback && delays[orbit].feedback.setValueAtTime(delayfeedback, t);
+  return delays[orbit];
+}
+
+export function getLfo(audioContext, time, end, properties = {}) {
+  return getWorklet(audioContext, 'lfo-processor', {
+    frequency: 1,
+    depth: 1,
+    skew: 0,
+    phaseoffset: 0,
+    time,
+    end,
+    shape: 1,
+    dcoffset: -0.5,
+    ...properties,
+  });
 }

 function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
@@ -338,6 +366,33 @@ function getFilterType(ftype) {
  return typeof ftype === 'number' ? filterTypes[Math.floor(_mod(ftype, filterTypes.length))] : ftype;
 }

+let reverbs = {};
+let hasChanged = (now, before) => now !== undefined && now !== before;
+function getReverb(orbit, duration, fade, lp, dim, ir, channels) {
+  // If no reverb has been created for a given orbit, create one
+  if (!reverbs[orbit]) {
+    const ac = getAudioContext();
+    const reverb = ac.createReverb(duration, fade, lp, dim, ir);
+    connectToDestination(reverb, channels);
+    reverbs[orbit] = reverb;
+  }
+  if (
+    hasChanged(duration, reverbs[orbit].duration) ||
+    hasChanged(fade, reverbs[orbit].fade) ||
+    hasChanged(lp, reverbs[orbit].lp) ||
+    hasChanged(dim, reverbs[orbit].dim) ||
+    reverbs[orbit].ir !== ir
+  ) {
+    // only regenerate when something has changed
+    // avoids endless regeneration on things like
+    // stack(s("a"), s("b").rsize(8)).room(.5)
+    // this only works when args may stay undefined until here
+    // setting default values breaks this
+    reverbs[orbit].generate(duration, fade, lp, dim, ir);
+  }
+  return reverbs[orbit];
+}
+
 export let analysers = {},
  analysersData = {};

@@ -370,8 +425,16 @@ export function getAnalyzerData(type = 'time', id = 1) {
  return analysersData[id];
 }

+function effectSend(input, effect, wet) {
+  const send = gainNode(wet);
+  input.connect(send);
+  send.connect(effect);
+  return send;
+}
+
 export function resetGlobalEffects() {
-  controller?.reset();
+  delays = {};
+  reverbs = {};
  analysers = {};
  analysersData = {};
 }
@@ -383,11 +446,9 @@ function mapChannelNumbers(channels) {
  return (Array.isArray(channels) ? channels : [channels]).map((ch) => ch - 1);
 }

-export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5) => {
-  // new: t is always expected to be the absolute target onset time
+export const superdough = async (value, t, hapDuration, cps) => {
  const ac = getAudioContext();
-  const audioController = getSuperdoughAudioController();
-
+  t = typeof t === 'string' && t.startsWith('=') ? Number(t.slice(1)) : ac.currentTime + t;
  let { stretch } = value;
  if (stretch != null) {
    //account for phase vocoder latency
@@ -413,27 +474,15 @@ 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,
    // filters
    fanchor = getDefaultValue('fanchor'),
    drive = 0.69,
-    release = 0,
    // low pass
    cutoff,
    lpenv,
@@ -466,9 +515,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
    phasercenter,
    //
    coarse,
-
    crush,
-    dry,
    shape,
    shapevol = getDefaultValue('shapevol'),
    distort,
@@ -477,8 +524,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
    vowel,
    delay = getDefaultValue('delay'),
    delayfeedback = getDefaultValue('delayfeedback'),
-    delaysync = getDefaultValue('delaysync'),
-    delaytime,
+    delaytime = getDefaultValue('delaytime'),
    orbit = getDefaultValue('orbit'),
    room,
    roomfade,
@@ -486,8 +532,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
    roomdim,
    roomsize,
    ir,
-    irspeed,
-    irbegin,
    i = getDefaultValue('i'),
    velocity = getDefaultValue('velocity'),
    analyze, // analyser wet
@@ -499,17 +543,10 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
    compressorRelease,
  } = value;

-  delaytime = delaytime ?? cycleToSeconds(delaysync, cps);
-
  const orbitChannels = mapChannelNumbers(
    multiChannelOrbits && orbit > 0 ? [orbit * 2 - 1, orbit * 2] : getDefaultValue('channels'),
  );
-
  const channels = value.channels != null ? mapChannelNumbers(value.channels) : orbitChannels;
-  const orbitBus = audioController.getOrbit(orbit, channels);
-  if (duckorbit != null) {
-    audioController.duck(duckorbit, t, duckonset, duckattack, duckdepth);
-  }

  gain = applyGainCurve(nanFallback(gain, 1));
  postgain = applyGainCurve(postgain);
@@ -517,11 +554,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
  distortvol = applyGainCurve(distortvol);
  delay = applyGainCurve(delay);
  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 endWithRelease = end + release;
  const chainID = Math.round(Math.random() * 1000000);

  // oldest audio nodes will be destroyed if maximum polyphony is exceeded
@@ -537,9 +571,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)

  let audioNodes = [];

-  if (['-', '~', '_'].includes(s)) {
-    return;
-  }
  if (bank && s) {
    s = `${bank}_${s}`;
    value.s = s;
@@ -555,7 +586,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
      audioNodes.forEach((n) => n?.disconnect());
      activeSoundSources.delete(chainID);
    };
-    const soundHandle = await onTrigger(t, value, onEnded, cps);
+    const soundHandle = await onTrigger(t, value, onEnded);

    if (soundHandle) {
      sourceNode = soundHandle.node;
@@ -596,7 +627,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
        lprelease,
        lpenv,
        t,
-        end,
+        t + hapDuration,
        fanchor,
        ftype,
        drive,
@@ -620,7 +651,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
        hprelease,
        hpenv,
        t,
-        end,
+        t + hapDuration,
        fanchor,
      );
    chain.push(hp());
@@ -631,7 +662,20 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)

  if (bandf !== undefined) {
    let bp = () =>
-      createFilter(ac, 'bandpass', bandf, bandq, bpattack, bpdecay, bpsustain, bprelease, bpenv, t, end, fanchor);
+      createFilter(
+        ac,
+        'bandpass',
+        bandf,
+        bandq,
+        bpattack,
+        bpdecay,
+        bpsustain,
+        bprelease,
+        bpenv,
+        t,
+        t + hapDuration,
+        fanchor,
+      );
    chain.push(bp());
    if (ftype === '24db') {
      chain.push(bp());
@@ -649,41 +693,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
  shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape, postgain: shapevol }));
  distort !== undefined && chain.push(getWorklet(ac, 'distort-processor', { distort, postgain: distortvol }));

-  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),
@@ -697,20 +706,24 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
  }
  // phaser
  if (phaser !== undefined && phaserdepth > 0) {
-    const phaserFX = getPhaser(t, endWithRelease, phaser, phaserdepth, phasercenter, phasersweep);
+    const phaserFX = getPhaser(t, t + hapDuration, phaser, phaserdepth, phasercenter, phasersweep);
    chain.push(phaserFX);
  }

  // last gain
  const post = new GainNode(ac, { gain: postgain });
  chain.push(post);
+  connectToDestination(post, channels);

  // delay
+  let delaySend;
  if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
-    orbitBus.getDelay(delaytime, delayfeedback, t);
-    orbitBus.sendDelay(post, delay);
+    const delyNode = getDelay(orbit, delaytime, delayfeedback, t, orbitChannels);
+    delaySend = effectSend(post, delyNode, delay);
+    audioNodes.push(delaySend);
  }
  // reverb
+  let reverbSend;
  if (room > 0) {
    let roomIR;
    if (ir !== undefined) {
@@ -723,28 +736,18 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
      }
      roomIR = await loadBuffer(url, ac, ir, 0);
    }
-    orbitBus.getReverb(roomsize, roomfade, roomlp, roomdim, roomIR, irspeed, irbegin);
-    orbitBus.sendReverb(post, room);
-  }
-
-  if (djf != null) {
-    orbitBus.getDjf(djf, t);
+    const reverbNode = getReverb(orbit, roomsize, roomfade, roomlp, roomdim, roomIR, orbitChannels);
+    reverbSend = effectSend(post, reverbNode, room);
+    audioNodes.push(reverbSend);
  }

  // analyser
+  let analyserSend;
  if (analyze) {
    const analyserNode = getAnalyserById(analyze, 2 ** (fft + 5));
-    const analyserSend = effectSend(post, analyserNode, 1);
+    analyserSend = effectSend(post, analyserNode, 1);
    audioNodes.push(analyserSend);
  }
-  if (dry != null) {
-    dry = applyGainCurve(dry);
-    const dryGain = new GainNode(ac, { gain: dry });
-    chain.push(dryGain);
-    orbitBus.connectToOutput(dryGain);
-  } else {
-    orbitBus.connectToOutput(post);
-  }

  // connect chain elements together
  chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);
@@ -1,206 +0,0 @@
-import { effectSend, getWorklet, webAudioTimeout } from './helpers.mjs';
-import { errorLogger } from './logger.mjs';
-import { clamp } from './util.mjs';
-
-let hasChanged = (now, before) => now !== undefined && now !== before;
-
-export class Orbit {
-  reverbNode;
-  delayNode;
-  output;
-  summingNode;
-  djfNode;
-  audioContext;
-  constructor(audioContext) {
-    this.audioContext = 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);
-  }
-
-  disconnect() {
-    this.output.disconnect();
-    this.summingNode.disconnect();
-    this.delayNode?.disconnect();
-    this.reverbNode?.disconnect();
-  }
-
-  getDjf(value, t = 0) {
-    if (this.djfNode == null) {
-      this.djfNode = getWorklet(this.audioContext, 'djf-processor', { value });
-      this.summingNode.disconnect();
-      this.summingNode.connect(this.djfNode);
-      this.djfNode.connect(this.output);
-    }
-    const val = this.djfNode.parameters.get('value');
-    val.setValueAtTime(value, t);
-  }
-
-  getDelay(delaytime = 0, feedback = 0.5, t) {
-    const maxfeedback = 0.98;
-    if (feedback > maxfeedback) {
-      //logger(`feedback was clamped to ${maxfeedback} to save your ears`);
-    }
-    feedback = clamp(feedback, 0, 0.98);
-    if (this.delayNode == null) {
-      this.delayNode = this.audioContext.createFeedbackDelay(1, delaytime, feedback);
-      this.delayNode.connect(this.summingNode);
-      this.delayNode.start?.(t); // for some reason, this throws when audion extension is installed..
-    }
-    this.delayNode.delayTime.value !== delaytime && this.delayNode.delayTime.setValueAtTime(delaytime, t);
-    this.delayNode.feedback.value !== feedback && this.delayNode.feedback.setValueAtTime(feedback, t);
-    return this.delayNode;
-  }
-
-  getReverb(duration, fade, lp, dim, ir, irspeed, irbegin) {
-    // If no reverb has been created for a given orbit, create one
-    if (this.reverbNode == null) {
-      this.reverbNode = this.audioContext.createReverb(duration, fade, lp, dim, ir, irspeed, irbegin);
-      this.reverbNode.connect(this.summingNode);
-    }
-
-    if (
-      hasChanged(duration, this.reverbNode.duration) ||
-      hasChanged(fade, this.reverbNode.fade) ||
-      hasChanged(lp, this.reverbNode.lp) ||
-      hasChanged(dim, this.reverbNode.dim) ||
-      hasChanged(irspeed, this.reverbNode.irspeed) ||
-      hasChanged(irbegin, this.reverbNode.irbegin) ||
-      this.reverbNode.ir !== ir
-    ) {
-      // only regenerate when something has changed
-      // avoids endless regeneration on things like
-      // stack(s("a"), s("b").rsize(8)).room(.5)
-      // this only works when args may stay undefined until here
-      // setting default values breaks this
-      this.reverbNode.generate(duration, fade, lp, dim, ir, irspeed, irbegin);
-    }
-    return this.reverbNode;
-  }
-  sendReverb(node, amount) {
-    effectSend(node, this.reverbNode, amount);
-  }
-
-  sendDelay(node, amount) {
-    effectSend(node, this.delayNode, amount);
-  }
-
-  duck(t, onsettime = 0, attacktime = 0.1, depth = 1) {
-    const onset = onsettime;
-    const attack = Math.max(attacktime, 0.002);
-    const gainParam = this.output.gain;
-    webAudioTimeout(
-      this.audioContext,
-      () => {
-        const now = this.audioContext.currentTime;
-
-        // cancelScheduledValues and setValueAtTime together emulate cancelAndHoldAtTime
-        // on browsers which lack that method
-        const currVal = gainParam.value;
-        gainParam.cancelScheduledValues(now);
-        gainParam.setValueAtTime(currVal, now);
-
-        const t0 = Math.max(t, now); // guard against now > t
-        const duckedVal = clamp(1 - Math.sqrt(depth), 0.01, currVal);
-        gainParam.exponentialRampToValueAtTime(duckedVal, t0 + onset);
-        gainParam.exponentialRampToValueAtTime(1, t0 + onset + attack);
-      },
-      0,
-      t - 0.01,
-    );
-  }
-
-  connectToOutput(node) {
-    node.connect(this.summingNode);
-  }
-}
-
-export class SuperdoughOutput {
-  channelMerger;
-  destinationGain;
-
-  constructor(audioContext) {
-    this.audioContext = audioContext;
-    this.initializeAudio();
-  }
-
-  initializeAudio() {
-    const audioContext = this.audioContext;
-    const maxChannelCount = audioContext.destination.maxChannelCount;
-    this.audioContext.destination.channelCount = maxChannelCount;
-    this.channelMerger = new ChannelMergerNode(audioContext, { numberOfInputs: audioContext.destination.channelCount });
-    this.destinationGain = new GainNode(audioContext);
-    this.channelMerger.connect(this.destinationGain);
-    this.destinationGain.connect(audioContext.destination);
-  }
-
-  reset() {
-    this.channelMerger.disconnect();
-    this.destinationGain.disconnect();
-    this.destinationGain = null;
-    this.channelMerger = null;
-    this.nodes = {};
-    this.initializeAudio();
-  }
-  connectToDestination = (input, channels = [0, 1]) => {
-    //This upmix can be removed if correct channel counts are set throughout the app,
-    // and then strudel could theoretically support surround sound audio files
-    const stereoMix = new StereoPannerNode(this.audioContext);
-    input.connect(stereoMix);
-
-    const splitter = new ChannelSplitterNode(this.audioContext, {
-      numberOfOutputs: stereoMix.channelCount,
-    });
-    stereoMix.connect(splitter);
-    channels.forEach((ch, i) => {
-      splitter.connect(this.channelMerger, i % stereoMix.channelCount, ch % this.audioContext.destination.channelCount);
-    });
-  };
-}
-
-export class SuperdoughAudioController {
-  audioContext;
-  output;
-  nodes = {};
-
-  constructor(audioContext) {
-    this.audioContext = audioContext;
-    this.output = new SuperdoughOutput(audioContext);
-  }
-
-  reset() {
-    Array.from(this.nodes).forEach((node) => {
-      node.disconnect();
-    });
-    this.output.reset();
-  }
-
-  duck(targetOrbits, t, onsettime = 0, attacktime = 0.1, depth = 1) {
-    const targetArr = [targetOrbits].flat();
-    const onsetArr = [onsettime].flat();
-    const attackArr = [attacktime].flat();
-    const depthArr = [depth].flat();
-
-    targetArr.forEach((target, idx) => {
-      const orbit = this.nodes[target];
-
-      if (orbit == null) {
-        errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
-        return;
-      }
-      const onset = onsetArr[idx] ?? onsetArr[0];
-      const attack = Math.max(attackArr[idx] ?? attackArr[0], 0.002);
-      const depth = depthArr[idx] ?? depthArr[0];
-
-      orbit.duck(t, onset, attack, depth);
-    });
-  }
-
-  getOrbit(orbitNum, channels) {
-    if (this.nodes[orbitNum] == null) {
-      this.nodes[orbitNum] = new Orbit(this.audioContext);
-      this.output.connectToDestination(this.nodes[orbitNum].output, channels);
-    }
-    return this.nodes[orbitNum];
-  }
-}
@@ -1,40 +1,41 @@
-import { clamp } from './util.mjs';
-import { registerSound, getAudioContext, soundMap } from './superdough.mjs';
+import { clamp, midiToFreq, noteToMidi } from './util.mjs';
+import { registerSound, getAudioContext, getLfo } from './superdough.mjs';
 import {
  applyFM,
-  destroyAudioWorkletNode,
  gainNode,
  getADSRValues,
-  getFrequencyFromValue,
-  getLfo,
  getParamADSR,
  getPitchEnvelope,
  getVibratoOscillator,
-  getWorklet,
-  noises,
  webAudioTimeout,
+  getWorklet,
 } from './helpers.mjs';
 import { getNoiseMix, getNoiseOscillator } from './noise.mjs';

-const waveforms = ['triangle', 'square', 'sawtooth', 'sine'];
-const waveformAliases = [
-  ['tri', 'triangle'],
-  ['sqr', 'square'],
-  ['saw', 'sawtooth'],
-  ['sin', 'sine'],
-];
-
-function makeSaturationCurve(amount, n_samples) {
-  const k = typeof amount === 'number' ? amount : 50;
-  const curve = new Float32Array(n_samples);
-
-  for (let i = 0; i < n_samples; i++) {
-    const x = (i * 2) / n_samples - 1;
-    curve[i] = Math.tanh(x * k);
+const getFrequencyFromValue = (value) => {
+  let { note, freq } = value;
+  note = note || 36;
+  if (typeof note === 'string') {
+    note = noteToMidi(note); // e.g. c3 => 48
  }
-  return curve;
+  // get frequency
+  if (!freq && typeof note === 'number') {
+    freq = midiToFreq(note); // + 48);
+  }
+
+  return Number(freq);
+};
+function destroyAudioWorkletNode(node) {
+  if (node == null) {
+    return;
+  }
+  node.disconnect();
+  node.parameters.get('end')?.setValueAtTime(0, 0);
 }

+const waveforms = ['triangle', 'square', 'sawtooth', 'sine'];
+const noises = ['pink', 'white', 'brown', 'crackle'];
+
 export function registerSynthSounds() {
  [...waveforms].forEach((s) => {
    registerSound(
@@ -77,75 +78,6 @@ export function registerSynthSounds() {
      { type: 'synth', prebake: true },
    );
  });
-
-  registerSound(
-    'sbd',
-    (t, value, onended) => {
-      const { duration, decay = 0.5, pdecay = 0.5, penv = 36, clip } = value;
-      const ctx = getAudioContext();
-      const attackhold = 0.02;
-      const noiselvl = 1.2;
-      const noisedecay = 0.025;
-      const mixGain = 1;
-
-      const o = ctx.createOscillator();
-      o.type = 'triangle';
-      o.frequency.value = getFrequencyFromValue(value, 29);
-      o.detune.setValueAtTime(penv * 100, 0);
-      o.detune.setValueAtTime(penv * 100, t);
-      o.detune.exponentialRampToValueAtTime(0.001, t + pdecay);
-      const g = gainNode(1);
-      g.gain.setValueAtTime(1, t + attackhold);
-      g.gain.exponentialRampToValueAtTime(0.001, t + attackhold + decay);
-      o.start(t);
-
-      const noise = getNoiseOscillator('brown', t, 2);
-      const noiseGain = gainNode(1);
-      noiseGain.gain.setValueAtTime(noiselvl, t);
-      noiseGain.gain.exponentialRampToValueAtTime(0.001, t + noisedecay);
-
-      const sat = new WaveShaperNode(ctx);
-      // tri to sine diode shaper emulation
-      sat.curve = makeSaturationCurve(2, ctx.sampleRate);
-
-      const mix = gainNode(mixGain);
-
-      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);
-
-      const holdEnd = t + decay;
-      let end = holdEnd + 0.01;
-      if (clip != null) {
-        end = Math.min(t + clip * duration, end);
-      }
-
-      // prevent clicking
-      mix.gain.setValueAtTime(mixGain, end - 0.01);
-      mix.gain.linearRampToValueAtTime(0, end);
-
-      o.stop(end);
-      noise.stop(end);
-
-      return {
-        node,
-        stop: (endTime) => {
-          o.stop(endTime);
-        },
-      };
-    },
-    { type: 'synth', prebake: true },
-  );
-
  registerSound(
    'supersaw',
    (begin, value, onended) => {
@@ -410,7 +342,6 @@ export function registerSynthSounds() {
      { type: 'synth', prebake: true },
    );
  });
-  waveformAliases.forEach(([alias, actual]) => soundMap.set({ ...soundMap.get(), [alias]: soundMap.get()[actual] }));
 }

 export function waveformN(partials, type) {
@@ -7,7 +7,7 @@ export const tokenizeNote = (note) => {
  if (typeof note !== 'string') {
    return [];
  }
-  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bsf]*)(-?[0-9]*)$/)?.slice(1) || [];
+  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bsf]*)([0-9]*)$/)?.slice(1) || [];
  if (!pc) {
    return [];
  }
@@ -68,40 +68,3 @@ export const _mod = (n, m) => ((n % m) + m) % m;
 export const getSoundIndex = (n, numSounds) => {
  return _mod(Math.round(nanFallback(n, 0)), numSounds);
 };
-
-export function cycleToSeconds(cycle, cps) {
-  return cycle / cps;
-}
-
-export function secondsToCycle(t, cps) {
-  return t * cps;
-}
-
-// deduces relevant info for sample loading from hap.value and sample definition
-// it encapsulates the core sampler logic into a pure and synchronous function
-// hapValue: Hap.value, bank: sample bank definition for sound "s" (values in strudel.json format)
-export function getCommonSampleInfo(hapValue, bank) {
-  const { s, n = 0 } = hapValue;
-  let midi = valueToMidi(hapValue, 36);
-  let transpose = midi - 36; // C3 is middle C;
-  let url;
-  let index = 0;
-  if (Array.isArray(bank)) {
-    index = getSoundIndex(n, bank.length);
-    url = bank[index];
-  } else {
-    const midiDiff = (noteA) => noteToMidi(noteA) - midi;
-    // object format will expect keys as notes
-    const closest = Object.keys(bank)
-      .filter((k) => !k.startsWith('_'))
-      .reduce(
-        (closest, key, j) => (!closest || Math.abs(midiDiff(key)) < Math.abs(midiDiff(closest)) ? key : closest),
-        null,
-      );
-    transpose = -midiDiff(closest); // semitones to repitch
-    index = getSoundIndex(n, bank[closest].length);
-    url = bank[closest][index];
-  }
-  const label = `${s}:${index}`;
-  return { transpose, url, index, midi, label };
-}
@@ -1,346 +0,0 @@
-import { getAudioContext, registerSound } from './index.mjs';
-import { getCommonSampleInfo } from './util.mjs';
-import {
-  applyParameterModulators,
-  destroyAudioWorkletNode,
-  getADSRValues,
-  getFrequencyFromValue,
-  getLfo,
-  getParamADSR,
-  getPitchEnvelope,
-  getVibratoOscillator,
-  getWorklet,
-  webAudioTimeout,
-} from './helpers.mjs';
-import { logger } from './logger.mjs';
-
-const WT_MAX_MIP_LEVELS = 6;
-export const Warpmode = Object.freeze({
-  NONE: 0,
-  ASYM: 1,
-  MIRROR: 2,
-  BENDP: 3,
-  BENDM: 4,
-  BENDMP: 5,
-  SYNC: 6,
-  QUANT: 7,
-  FOLD: 8,
-  PWM: 9,
-  ORBIT: 10,
-  SPIN: 11,
-  CHAOS: 12,
-  PRIMES: 13,
-  BINARY: 14,
-  BROWNIAN: 15,
-  RECIPROCAL: 16,
-  WORMHOLE: 17,
-  LOGISTIC: 18,
-  SIGMOID: 19,
-  FRACTAL: 20,
-  FLIP: 21,
-});
-
-async function loadWavetableFrames(url, label, frameLen = 2048) {
-  const buf = await loadBuffer(url, label);
-  const ch0 = buf.getChannelData(0);
-  const total = ch0.length;
-  const numFrames = Math.max(1, Math.floor(total / frameLen));
-  const frames = new Array(numFrames);
-  for (let i = 0; i < numFrames; i++) {
-    const start = i * frameLen;
-    frames[i] = ch0.subarray(start, start + frameLen);
-  }
-
-  // build mipmaps
-  const mipmaps = [frames];
-  let levelFrames = frames;
-  for (let level = 1; level < WT_MAX_MIP_LEVELS; level++) {
-    const prevLen = levelFrames[0].length;
-    if (prevLen <= 32) break;
-    const nextLen = prevLen >> 1;
-    const next = levelFrames.map((src) => {
-      const out = new Float32Array(nextLen);
-      for (let j = 0; j < nextLen; j++) {
-        out[j] = (src[2 * j] + src[2 * j + 1]) / 2;
-      }
-      return out;
-    });
-    mipmaps.push(next);
-    levelFrames = next;
-  }
-  return { frames, mipmaps, frameLen, numFrames };
-}
-
-const loadCache = {};
-
-function humanFileSize(bytes, si) {
-  var thresh = si ? 1000 : 1024;
-  if (bytes < thresh) return bytes + ' B';
-  var units = si
-    ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
-    : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
-  var u = -1;
-  do {
-    bytes /= thresh;
-    ++u;
-  } while (bytes >= thresh);
-  return bytes.toFixed(1) + ' ' + units[u];
-}
-
-// Extract the sample rate of a .wav file
-function parseWavSampleRate(arrBuf) {
-  const dv = new DataView(arrBuf);
-  // Header is "RIFF<chunk size (4 bytes)>WAVE", so 12 bytes
-  let p = 12;
-  // Look through chunks for the format header
-  // (they will always have an 8 byte header (id and size) followed by a payload)
-  while (p + 8 <= dv.byteLength) {
-    // Parse id
-    const id = String.fromCharCode(dv.getUint8(p), dv.getUint8(p + 1), dv.getUint8(p + 2), dv.getUint8(p + 3));
-    // Parse chunk size
-    const size = dv.getUint32(p + 4, true);
-    if (id === 'fmt ') {
-      // The format chunk contains the sample rate after
-      // 8 bytes of header, 2 bytes of format tag, 2 bytes of num channels
-      // (for a total of 12)
-      return dv.getUint32(p + 12, true);
-    }
-    // Advance to next chunk
-    p += 8 + size + (size & 1);
-  }
-  return null;
-}
-
-async function decodeAtNativeRate(arr) {
-  const sr = parseWavSampleRate(arr) || 44100;
-  const tempAC = new OfflineAudioContext(1, 1, sr);
-  return await tempAC.decodeAudioData(arr);
-}
-
-const loadBuffer = (url, label) => {
-  url = url.replace('#', '%23');
-  if (!loadCache[url]) {
-    logger(`[wavetable] load table ${label}..`, 'load-table', { url });
-    const timestamp = Date.now();
-    loadCache[url] = fetch(url)
-      .then((res) => res.arrayBuffer())
-      .then(async (res) => {
-        const took = Date.now() - timestamp;
-        const size = humanFileSize(res.byteLength);
-        logger(`[wavetable] load table ${label}... done! loaded ${size} in ${took}ms`, 'loaded-table', { url });
-        const decoded = await decodeAtNativeRate(res);
-        return decoded;
-      });
-  }
-  return loadCache[url];
-};
-
-function githubPath(base, subpath = '') {
-  if (!base.startsWith('github:')) {
-    throw new Error('expected "github:" at the start of pseudoUrl');
-  }
-  let [_, path] = base.split('github:');
-  path = path.endsWith('/') ? path.slice(0, -1) : path;
-  if (path.split('/').length === 2) {
-    // assume main as default branch if none set
-    path += '/main';
-  }
-  return `https://raw.githubusercontent.com/${path}/${subpath}`;
-}
-
-const _processTables = (json, baseUrl, frameLen, options = {}) => {
-  baseUrl = json._base || baseUrl;
-  return Object.entries(json).forEach(([key, tables]) => {
-    if (key === '_base') return false;
-    if (typeof tables === 'string') {
-      tables = [tables];
-    }
-    if (typeof tables !== 'object') {
-      throw new Error('wrong json format for ' + key);
-    }
-    let resolvedUrl = baseUrl;
-    if (resolvedUrl.startsWith('github:')) {
-      resolvedUrl = githubPath(resolvedUrl, '');
-    }
-    tables = tables
-      .map((t) => resolvedUrl + t)
-      .filter((t) => {
-        if (!t.toLowerCase().endsWith('.wav')) {
-          logger(`[wavetable] skipping ${t} -- wavetables must be ".wav" format`);
-          return false;
-        }
-        return true;
-      });
-    if (tables.length) {
-      registerWaveTable(key, tables, { baseUrl, frameLen });
-    }
-  });
-};
-
-export function registerWaveTable(key, tables, params) {
-  registerSound(
-    key,
-    (t, hapValue, onended, cps) => {
-      return onTriggerSynth(t, hapValue, onended, tables, cps, params?.frameLen ?? 2048);
-    },
-    {
-      type: 'wavetable',
-      tables,
-      ...params,
-    },
-  );
-}
-
-/**
- * Loads a collection of wavetables to use with `s`
- *
- * @name tables
- */
-export const tables = async (url, frameLen, json, options = {}) => {
-  if (json !== undefined) return _processTables(json, url, frameLen);
-  if (url.startsWith('github:')) {
-    url = githubPath(url, 'strudel.json');
-  }
-  if (url.startsWith('local:')) {
-    url = `http://localhost:5432`;
-  }
-  if (typeof fetch !== 'function') {
-    // not a browser
-    return;
-  }
-  if (typeof fetch === 'undefined') {
-    // skip fetch when in node / testing
-    return;
-  }
-  return fetch(url)
-    .then((res) => res.json())
-    .then((json) => _processTables(json, url, frameLen, options))
-    .catch((error) => {
-      console.error(error);
-      throw new Error(`error loading "${url}"`);
-    });
-};
-
-export async function onTriggerSynth(t, value, onended, tables, cps, frameLen) {
-  const { s, n = 0, duration } = value;
-  const ac = getAudioContext();
-  const [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
-  let { warpmode } = value;
-  if (typeof warpmode === 'string') {
-    warpmode = Warpmode[warpmode.toUpperCase()] ?? Warpmode.NONE;
-  }
-  const frequency = getFrequencyFromValue(value);
-  const { url, label } = getCommonSampleInfo(value, tables);
-  const payload = await loadWavetableFrames(url, label, frameLen);
-  const holdEnd = t + duration;
-  const endWithRelease = holdEnd + release;
-  const envEnd = endWithRelease + 0.01;
-  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: 'tables', payload });
-  if (ac.currentTime > t) {
-    logger(`[wavetable] still loading sound "${s}:${n}"`, 'highlight');
-    return;
-  }
-  const posADSRParams = [value.wtattack, value.wtdecay, value.wtsustain, value.wtrelease];
-  const warpADSRParams = [value.warpattack, value.warpdecay, value.warpsustain, value.warprelease];
-  const wtParams = source.parameters;
-  const positionParam = wtParams.get('position');
-  const warpParam = wtParams.get('warp');
-
-  let wtrate = value.wtrate;
-  if (value.wtsync != null) {
-    wtrate = cps * value.wtsync;
-  }
-
-  const wtPosModulators = applyParameterModulators(
-    ac,
-    positionParam,
-    t,
-    endWithRelease,
-    {
-      offset: value.wt,
-      amount: value.wtenv,
-      defaultAmount: 0.5,
-      shape: 'linear',
-      values: posADSRParams,
-      holdEnd,
-      defaultValues: [0, 0.5, 0, 0.1],
-    },
-    {
-      frequency: wtrate,
-      depth: value.wtdepth,
-      defaultDepth: 0.5,
-      shape: value.wtshape,
-      skew: value.wtskew,
-      dcoffset: value.wtdc ?? 0,
-    },
-  );
-
-  let warprate = value.warprate;
-  if (value.warpsync != null) {
-    warprate = warprate = cps * value.warpsync;
-  }
-  const wtWarpModulators = applyParameterModulators(
-    ac,
-    warpParam,
-    t,
-    endWithRelease,
-    {
-      offset: value.warp,
-      amount: value.warpenv,
-      defaultAmount: 0.5,
-      shape: 'linear',
-      values: warpADSRParams,
-      holdEnd,
-      defaultValues: [0, 0.5, 0, 0.1],
-    },
-    {
-      frequency: warprate,
-      depth: value.warpdepth,
-      defaultDepth: 0.5,
-      shape: value.warpshape,
-      skew: value.warpskew,
-      dcoffset: value.warpdc ?? 0,
-    },
-  );
-  const vibratoOscillator = getVibratoOscillator(source.parameters.get('detune'), value, t);
-  const envGain = ac.createGain();
-  const node = source.connect(envGain);
-  getParamADSR(node.gain, attack, decay, sustain, release, 0, 1, t, holdEnd, 'linear');
-  getPitchEnvelope(source.parameters.get('detune'), value, t, holdEnd);
-  const handle = { node, source };
-  const timeoutNode = webAudioTimeout(
-    ac,
-    () => {
-      source.disconnect();
-      destroyAudioWorkletNode(source);
-      vibratoOscillator?.stop();
-      node.disconnect();
-      wtPosModulators?.disconnect();
-      wtWarpModulators?.disconnect();
-      onended();
-    },
-    t,
-    envEnd,
-  );
-  handle.stop = (time) => {
-    timeoutNode.stop(time);
-  };
-  return handle;
-}
@@ -6,44 +6,20 @@ import OLAProcessor from './ola-processor';
 import FFT from './fft.js';

 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
-const mod = (n, m) => ((n % m) + m) % m;
-const lerp = (a, b, n) => n * (b - a) + a;
-const pv = (arr, n) => arr[n] ?? arr[0];
-const frac = (x) => x - Math.floor(x);
-const ffloor = (x) => x | 0; // fast floor for non-negative
+const _mod = (n, m) => ((n % m) + m) % m;

-const getUnisonDetune = (unison, detune, voiceIndex) => {
-  if (unison < 2) {
-    return 0;
-  }
-  return lerp(-detune * 0.5, detune * 0.5, voiceIndex / (unison - 1));
-};
-const applySemitoneDetuneToFrequency = (frequency, detune) => {
-  return frequency * Math.pow(2, detune / 12);
-};
-
-// Restrict phase to the range [0, maxPhase) via wrapping
-function wrapPhase(phase, maxPhase = 1) {
-  if (phase >= maxPhase) {
-    phase -= maxPhase;
-  } else if (phase < 0) {
-    phase += maxPhase;
-  }
-  return phase;
-}
 const blockSize = 128;
-// Smooth waveshape near discontinuities to remove frequencies above Nyquist and prevent aliasing
+// adjust waveshape to remove frequencies above nyquist to prevent aliasing
 // referenced from https://www.kvraudio.com/forum/viewtopic.php?t=375517
 function polyBlep(phase, dt) {
-  dt = Math.min(dt, 1 - dt);
-  // Start of cycle
+  // 0 <= phase < 1
  if (phase < dt) {
    phase /= dt;
    // 2 * (phase - phase^2/2 - 0.5)
    return phase + phase - phase * phase - 1;
  }

-  // End of cycle
+  // -1 < phase < 0
  else if (phase > 1 - dt) {
    phase = (phase - 1) / dt;
    // 2 * (phase^2/2 + phase + 0.5)
@@ -55,7 +31,7 @@ function polyBlep(phase, dt) {
    return 0;
  }
 }
-// The order is important for dough integration
+
 const waveshapes = {
  tri(phase, skew = 0.5) {
    const x = 1 - skew;
@@ -105,12 +81,10 @@ function getParamValue(block, param) {
  }
  return param[0];
 }
-
 const waveShapeNames = Object.keys(waveshapes);
 class LFOProcessor extends AudioWorkletProcessor {
  static get parameterDescriptors() {
    return [
-      { name: 'begin', defaultValue: 0 },
      { name: 'time', defaultValue: 0 },
      { name: 'end', defaultValue: 0 },
      { name: 'frequency', defaultValue: 0.5 },
@@ -118,10 +92,7 @@ class LFOProcessor extends AudioWorkletProcessor {
      { name: 'depth', defaultValue: 1 },
      { name: 'phaseoffset', defaultValue: 0 },
      { name: 'shape', defaultValue: 0 },
-      { name: 'curve', defaultValue: 1 },
      { name: 'dcoffset', defaultValue: 0 },
-      { name: 'min', defaultValue: 0 },
-      { name: 'max', defaultValue: 1 },
    ];
  }

@@ -138,13 +109,10 @@ class LFOProcessor extends AudioWorkletProcessor {
  }

  process(inputs, outputs, parameters) {
-    const begin = parameters['begin'][0];
+    // eslint-disable-next-line no-undef
    if (currentTime >= parameters.end[0]) {
      return false;
    }
-    if (currentTime <= begin) {
-      return true;
-    }

    const output = outputs[0];
    const frequency = parameters['frequency'][0];
@@ -154,24 +122,20 @@ class LFOProcessor extends AudioWorkletProcessor {
    const skew = parameters['skew'][0];
    const phaseoffset = parameters['phaseoffset'][0];

-    const curve = parameters['curve'][0];
-
    const dcoffset = parameters['dcoffset'][0];
-    const min = parameters['min'][0];
-    const max = parameters['max'][0];
    const shape = waveShapeNames[parameters['shape'][0]];

    const blockSize = output[0].length ?? 0;

    if (this.phase == null) {
-      this.phase = mod(time * frequency + phaseoffset, 1);
+      this.phase = _mod(time * frequency + phaseoffset, 1);
    }
+    // eslint-disable-next-line no-undef
    const dt = frequency / sampleRate;
    for (let n = 0; n < blockSize; n++) {
      for (let i = 0; i < output.length; i++) {
-        let modval = (waveshapes[shape](this.phase, skew) + dcoffset) * depth;
-        modval = Math.pow(modval, curve);
-        output[i][n] = clamp(modval, min, max);
+        const modval = (waveshapes[shape](this.phase, skew) + dcoffset) * depth;
+        output[i][n] = modval;
      }
      this.incrementPhase(dt);
    }
@@ -285,73 +249,6 @@ class ShapeProcessor extends AudioWorkletProcessor {
 }
 registerProcessor('shape-processor', ShapeProcessor);

-class TwoPoleFilter {
-  s0 = 0;
-  s1 = 0;
-  update(s, cutoff, resonance = 0) {
-    // Out of bound values can produce NaNs
-    resonance = clamp(resonance, 0, 1);
-    cutoff = clamp(cutoff, 0, sampleRate / 2 - 1);
-    const c = clamp(2 * Math.sin(cutoff * (_PI / sampleRate)), 0, 1.14);
-    const r = Math.pow(0.5, (resonance + 0.125) / 0.125);
-    const mrc = 1 - r * c;
-    this.s0 = mrc * this.s0 - c * this.s1 + c * s; // bpf
-    this.s1 = mrc * this.s1 + c * this.s0; // lpf
-    return this.s1; // return lpf by default
-  }
-}
-
-class DJFProcessor extends AudioWorkletProcessor {
-  static get parameterDescriptors() {
-    return [{ name: 'value', defaultValue: 0.5 }];
-  }
-
-  constructor() {
-    super();
-    this.filters = [new TwoPoleFilter(), new TwoPoleFilter()];
-  }
-
-  process(inputs, outputs, parameters) {
-    const input = inputs[0];
-    const output = outputs[0];
-
-    const hasInput = !(input[0] === undefined);
-    this.started = hasInput;
-
-    const value = clamp(parameters.value[0], 0, 1);
-    let filterType = 'none';
-    let cutoff;
-    let v = 1;
-    if (value > 0.51) {
-      filterType = 'hipass';
-      v = (value - 0.5) * 2;
-    } else if (value < 0.49) {
-      filterType = 'lopass';
-      v = value * 2;
-    }
-    cutoff = Math.pow(v * 11, 4);
-
-    for (let i = 0; i < input.length; i++) {
-      for (let n = 0; n < blockSize; n++) {
-        if (filterType == 'none') {
-          output[i][n] = input[i][n];
-        } else {
-          this.filters[i].update(input[i][n], cutoff, 0.1);
-          if (filterType === 'lopass') {
-            output[i][n] = this.filters[i].s1;
-          } else if (filterType === 'hipass') {
-            output[i][n] = input[i][n] - this.filters[i].s1;
-          } else {
-            output[i][n] = input[i][n];
-          }
-        }
-      }
-    }
-    return true;
-  }
-}
-registerProcessor('djf-processor', DJFProcessor);
-
 function fast_tanh(x) {
  const x2 = x * x;
  return (x * (27.0 + x2)) / (27.0 + 9.0 * x2);
@@ -394,6 +291,7 @@ class LadderProcessor extends AudioWorkletProcessor {
    const drive = clamp(Math.exp(parameters.drive[0]), 0.1, 2000);

    let cutoff = parameters.frequency[0];
+    // eslint-disable-next-line no-undef
    cutoff = (cutoff * 2 * _PI) / sampleRate;
    cutoff = cutoff > 1 ? 1 : cutoff;

@@ -459,6 +357,21 @@ class DistortProcessor extends AudioWorkletProcessor {
 registerProcessor('distort-processor', DistortProcessor);

 // SUPERSAW
+function lerp(a, b, n) {
+  return n * (b - a) + a;
+}
+
+function getUnisonDetune(unison, detune, voiceIndex) {
+  if (unison < 2) {
+    return 0;
+  }
+  return lerp(-detune * 0.5, detune * 0.5, voiceIndex / (unison - 1));
+}
+
+function applySemitoneDetuneToFrequency(frequency, detune) {
+  return frequency * Math.pow(2, detune / 12);
+}
+
 class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
  constructor() {
    super();
@@ -511,47 +424,53 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
    ];
  }
  process(input, outputs, params) {
+    // eslint-disable-next-line no-undef
    if (currentTime <= params.begin[0]) {
      return true;
    }
+    // eslint-disable-next-line no-undef
    if (currentTime >= params.end[0]) {
      // this.port.postMessage({ type: 'onended' });
      return false;
    }
+    let frequency = params.frequency[0];
+    //apply detune in cents
+    frequency = frequency * Math.pow(2, params.detune[0] / 1200);

    const output = outputs[0];
+    const voices = params.voices[0];
+    const freqspread = params.freqspread[0];
+    const panspread = params.panspread[0] * 0.5 + 0.5;
+    const gain1 = Math.sqrt(1 - panspread);
+    const gain2 = Math.sqrt(panspread);

-    for (let i = 0; i < output[0].length; i++) {
-      const detune = pv(params.detune, i);
-      const voices = pv(params.voices, i);
-      const freqspread = pv(params.freqspread, i);
-      const panspread = pv(params.panspread, i) * 0.5 + 0.5;
-      const gain1 = Math.sqrt(1 - panspread);
-      const gain2 = Math.sqrt(panspread);
-      let freq = pv(params.frequency, i);
-      // Main detuning
-      freq = applySemitoneDetuneToFrequency(freq, detune / 100);
-      for (let n = 0; n < voices; n++) {
-        const isOdd = (n & 1) == 1;
-        let gainL = gain1;
-        let gainR = gain2;
-        // invert right and left gain
-        if (isOdd) {
-          gainL = gain2;
-          gainR = gain1;
-        }
-        // Individual voice detuning
-        const freqVoice = applySemitoneDetuneToFrequency(freq, getUnisonDetune(voices, freqspread, n));
-        // We must wrap this here because it is passed into sawblep below which
-        // has domain [0, 1]
-        const dt = mod(freqVoice / sampleRate, 1);
+    for (let n = 0; n < voices; n++) {
+      const isOdd = (n & 1) == 1;
+
+      //applies unison "spread" detune in semitones
+      const freq = applySemitoneDetuneToFrequency(frequency, getUnisonDetune(voices, freqspread, n));
+      let gainL = gain1;
+      let gainR = gain2;
+      // invert right and left gain
+      if (isOdd) {
+        gainL = gain2;
+        gainR = gain1;
+      }
+      // eslint-disable-next-line no-undef
+      const dt = freq / sampleRate;
+
+      for (let i = 0; i < output[0].length; i++) {
        this.phase[n] = this.phase[n] ?? Math.random();
        const v = waveshapes.sawblep(this.phase[n], dt);

        output[0][i] = output[0][i] + v * gainL;
        output[1][i] = output[1][i] + v * gainR;

-        this.phase[n] = wrapPhase(this.phase[n] + dt);
+        this.phase[n] += dt;
+
+        if (this.phase[n] > 1.0) {
+          this.phase[n] = this.phase[n] - 1;
+        }
      }
    }
    return true;
@@ -560,7 +479,7 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {

 registerProcessor('supersaw-oscillator', SuperSawOscillatorProcessor);

-// Phase Vocoder sourced from https://github.com/olvb/phaze/tree/master?tab=readme-ov-file
+// Phase Vocoder sourced from // sourced from https://github.com/olvb/phaze/tree/master?tab=readme-ov-file
 const BUFFERED_BLOCK_SIZE = 2048;

 function genHannWindow(length) {
@@ -975,323 +894,3 @@ class ByteBeatProcessor extends AudioWorkletProcessor {
 }

 registerProcessor('byte-beat-processor', ByteBeatProcessor);
-
-export const WarpMode = Object.freeze({
-  NONE: 0,
-  ASYM: 1,
-  MIRROR: 2,
-  BENDP: 3,
-  BENDM: 4,
-  BENDMP: 5,
-  SYNC: 6,
-  QUANT: 7,
-  FOLD: 8,
-  PWM: 9,
-  ORBIT: 10,
-  SPIN: 11,
-  CHAOS: 12,
-  PRIMES: 13,
-  BINARY: 14,
-  BROWNIAN: 15,
-  RECIPROCAL: 16,
-  WORMHOLE: 17,
-  LOGISTIC: 18,
-  SIGMOID: 19,
-  FRACTAL: 20,
-  FLIP: 21,
-});
-
-function hash32(u) {
-  u = u + 0x7ed55d16 + (u << 12);
-  u = u ^ 0xc761c23c ^ (u >>> 19);
-  u = u + 0x165667b1 + (u << 5);
-  u = (u + 0xd3a2646c) ^ (u << 9);
-  u = u + 0xfd7046c5 + (u << 3);
-  u = u ^ 0xb55a4f09 ^ (u >>> 16);
-  return u >>> 0;
-}
-const hash01 = (i) => (hash32(i) >>> 8) / 0x01000000;
-
-function bitReverse(i, n) {
-  let r = 0;
-  for (let b = 0; b < n; b++) {
-    r = (r << 1) | (i & 1);
-    i >>>= 1;
-  }
-  return r;
-}
-
-function noise(x) {
-  const i = Math.floor(x),
-    f = x - i;
-  const a = hash01(i),
-    b = hash01(i + 1);
-  return a + (b - a) * f;
-}
-
-function brownian(x, oct = 4) {
-  let amp = 0.5,
-    sum = 0,
-    norm = 0,
-    freq = 1;
-  for (let o = 0; o < oct; o++) {
-    sum += amp * noise(x * freq);
-    norm += amp;
-    amp *= 0.5;
-    freq *= 2;
-  }
-  return (sum / norm) * 2 - 1;
-}
-
-class WavetableOscillatorProcessor extends AudioWorkletProcessor {
-  static get parameterDescriptors() {
-    return [
-      { name: 'begin', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
-      { name: 'end', defaultValue: 0, min: 0, max: Number.POSITIVE_INFINITY },
-      { name: 'frequency', defaultValue: 220, minValue: 0.01, maxValue: 20000 },
-      { name: 'detune', defaultValue: 0.18 },
-      { name: 'position', defaultValue: 0, minValue: 0, maxValue: 1 },
-      { name: 'warp', defaultValue: 0, minValue: 0, maxValue: 1 },
-      { name: 'warpMode', defaultValue: 0 },
-      { name: 'voices', defaultValue: 1, minValue: 1, maxValue: 32 },
-      { name: 'spread', defaultValue: 0.7, minValue: 0, maxValue: 1 },
-      { name: 'phaserand', defaultValue: 0, minValue: 0, maxValue: 1 },
-    ];
-  }
-
-  constructor(options) {
-    super(options);
-    this.tables = null;
-    this.frameLen = 0;
-    this.numFrames = 0;
-    this.phase = [];
-    this.syncRatio = 1;
-
-    this.port.onmessage = (e) => {
-      const { type, payload } = e.data || {};
-      if (type === 'tables') {
-        this.tables = payload.mipmaps;
-        this.frameLen = payload.frameLen;
-        this.numFrames = this.tables[0].length;
-      }
-    };
-  }
-
-  _chooseMip(dphi) {
-    const approxHarm = Math.min(64, 1 / Math.max(1e-6, dphi));
-    let level = 0;
-    while (level + 1 < (this.tables?.length || 1) && approxHarm < this.tables[level][0].length / 8) {
-      level++;
-    }
-    return level;
-  }
-
-  _mirror(x) {
-    return 1 - Math.abs(2 * x - 1);
-  }
-
-  _toBits(amt, min = 2, max = 12) {
-    const b = max + (min - max) * amt;
-    return { b, n: Math.round(Math.pow(2, b)) };
-  }
-
-  _warpPhase(phase, amt, mode) {
-    switch (mode) {
-      case WarpMode.NONE: {
-        return phase;
-      }
-      case WarpMode.ASYM: {
-        const a = 0.01 + 0.99 * amt;
-        return phase < a ? (0.5 * phase) / a : 0.5 + (0.5 * (phase - a)) / (1 - a);
-      }
-      case WarpMode.MIRROR: {
-        // Asym, then mirror
-        return this._mirror(this._warpPhase(phase, amt, WarpMode.ASYM));
-      }
-      case WarpMode.BENDP: {
-        return Math.pow(phase, 1 + 3 * amt);
-      }
-      case WarpMode.BENDM: {
-        return Math.pow(phase, 1 / (1 + 3 * amt));
-      }
-      case WarpMode.BENDMP: {
-        return amt < 0.5 ? this._warpPhase(phase, 1 - 2 * amt, 3) : this._warpPhase(phase, 2 * amt - 1, 2);
-      }
-      case WarpMode.SYNC: {
-        const syncRatio = Math.pow(16, amt * amt);
-        return (phase * syncRatio) % 1;
-      }
-      case WarpMode.QUANT: {
-        const { n } = this._toBits(amt);
-        return ffloor(phase * n) / n;
-      }
-      case WarpMode.FOLD: {
-        const K = 7;
-        const k = 1 + Math.max(1, Math.round(K * amt));
-        return Math.abs(frac(k * phase) - 0.5) * 2;
-      }
-      case WarpMode.PWM: {
-        const w = clamp(0.5 + 0.49 * (2 * amt - 1), 0, 1);
-        if (phase < w) return (phase / w) * 0.5;
-        return 0.5 + ((phase - w) / (1 - w)) * 0.5;
-      }
-      case WarpMode.ORBIT: {
-        const depth = 0.5 * amt;
-        const n = 3;
-        return frac(phase + depth * Math.sin(2 * Math.PI * n * phase));
-      }
-      case WarpMode.SPIN: {
-        const depth = 0.5 * amt;
-        const { n } = this._toBits(amt, 1, 6);
-        return frac(phase + depth * Math.sin(2 * Math.PI * n * phase));
-      }
-      case WarpMode.CHAOS: {
-        const r = 3.7 + 0.3 * amt;
-        const logistic = r * phase * (1 - phase);
-        return clamp((1 - amt) * phase + amt * logistic, 0, 1);
-      }
-      case WarpMode.PRIMES: {
-        const isPrime = (n) => {
-          if (n < 2) return false;
-          if (n % 2 === 0) return n === 2;
-          for (let d = 3; d * d <= n; d += 2) if (n % d === 0) return false;
-          return true;
-        };
-        let { n } = this._toBits(amt, 3);
-        while (!isPrime(n)) n++;
-        return ffloor(phase * n) / n;
-      }
-      case WarpMode.BINARY: {
-        let { b } = this._toBits(amt, 3);
-        b = Math.round(b);
-        const n = 1 << b;
-        const idx = ffloor(phase * n);
-        const ridx = bitReverse(idx, b);
-        return ridx / n;
-      }
-      case WarpMode.MODULAR: {
-        const { n } = this._toBits(amt);
-        const depth = 0.5 * amt;
-        const jump = frac(phase * n) / n;
-        return frac(phase + depth * jump);
-      }
-      case WarpMode.BROWNIAN: {
-        const disp = 0.25 * amt * brownian(64 * phase, 4);
-        return frac(phase + disp);
-      }
-      case WarpMode.RECIPROCAL: {
-        const g = 2 + 4 * amt;
-        const num = phase * g;
-        const den = phase + (1 - phase) * g;
-        const y = den > 1e-12 ? num / den : 0;
-        return clamp(y, 0, 1);
-      }
-      case WarpMode.WORMHOLE: {
-        const gap = clamp(0.8 * amt, 0, 1);
-        const a = 0.5 * (1 - gap);
-        const b = 0.5 * (1 + gap);
-        if (phase < a) return (phase / a) * 0.5;
-        if (phase > b) return 0.5 * (1 + (phase - b) / (1 - b));
-        return 0.5;
-      }
-      case WarpMode.LOGISTIC: {
-        let x = phase;
-        const r = 3.6 + 0.4 * amt;
-        const iters = 1 + Math.round(2 * amt);
-        for (let i = 0; i < iters; i++) x = r * x * (1 - x);
-        return clamp(x, 0, 1);
-      }
-      case WarpMode.SIGMOID: {
-        const k = 1 + 10 * amt;
-        const x = phase - 0.5;
-        const y = 1 / (1 + Math.exp(-k * x));
-        const y0 = 1 / (1 + Math.exp(0.5 * k));
-        const y1 = 1 / (1 + Math.exp(-0.5 * k));
-        return (y - y0) / (y1 - y0);
-      }
-      case WarpMode.FRACTAL: {
-        const d = 0.5 * Math.sin(2 * Math.PI * phase) * amt;
-        return frac(phase + d);
-      }
-      case WarpMode.FLIP: {
-        return phase;
-      }
-      default:
-        return phase;
-    }
-  }
-
-  _sampleFrame(frame, phase) {
-    const pos = phase * frame.length;
-    const i = pos | 0;
-    const frac = pos - i;
-    const a = frame[i % frame.length];
-    const b = frame[(i + 1) % frame.length];
-    return a + (b - a) * frac;
-  }
-
-  process(_inputs, outputs, parameters) {
-    if (currentTime >= parameters.end[0]) {
-      return false;
-    }
-    if (currentTime <= parameters.begin[0]) {
-      return true;
-    }
-    const outL = outputs[0][0];
-    const outR = outputs[0][1] || outputs[0][0];
-
-    if (!this.tables) {
-      outL.fill(0);
-      if (outR !== outL) outR.set(outL);
-      return true;
-    }
-
-    for (let i = 0; i < outL.length; i++) {
-      const detune = pv(parameters.detune, i);
-      const tablePos = pv(parameters.position, i);
-      const idx = tablePos * (this.numFrames - 1);
-      const fIdx = idx | 0;
-      const frac = idx - fIdx;
-      const warpAmount = pv(parameters.warp, i);
-      const warpMode = pv(parameters.warpMode, i);
-      const voices = pv(parameters.voices, i);
-      const phaseRand = pv(parameters.phaserand, i);
-      const spread = voices > 1 ? pv(parameters.spread, i) : 0;
-      const gain1 = Math.sqrt(0.5 - 0.5 * spread);
-      const gain2 = Math.sqrt(0.5 + 0.5 * spread);
-      let f = pv(parameters.frequency, i);
-      f = applySemitoneDetuneToFrequency(f, detune / 100); // overall detune
-      const normalizer = 0.3 / Math.sqrt(voices);
-      for (let n = 0; n < voices; n++) {
-        const isOdd = (n & 1) == 1;
-        let gainL = gain1;
-        let gainR = gain2;
-        // invert right and left gain
-        if (isOdd) {
-          gainL = gain2;
-          gainR = gain1;
-        }
-        const fVoice = applySemitoneDetuneToFrequency(f, getUnisonDetune(voices, detune, n)); // voice detune
-        const dPhase = fVoice / sampleRate;
-        const level = this._chooseMip(dPhase);
-        const table = this.tables[level];
-
-        // warp phase then sample
-        this.phase[n] = this.phase[n] ?? Math.random() * phaseRand;
-        const ph = this._warpPhase(this.phase[n], warpAmount, warpMode);
-        const s0 = this._sampleFrame(table[fIdx], ph);
-        const s1 = this._sampleFrame(table[Math.min(this.numFrames - 1, fIdx + 1)], ph);
-        let s = s0 + (s1 - s0) * frac;
-        if (warpMode === WarpMode.FLIP && this.phase[n] < warpAmount) {
-          s = -s;
-        }
-        outL[i] += s * gainL * normalizer;
-        outR[i] += s * gainR * normalizer;
-        this.phase[n] = wrapPhase(this.phase[n] + dPhase);
-      }
-    }
-    return true;
-  }
-}
-
-registerProcessor('wavetable-oscillator-processor', WavetableOscillatorProcessor);
@@ -1 +0,0 @@
-pattern.wav
@@ -1,3 +0,0 @@
-# supradough
-
-platform agnostic synth and sampler intended for live coding. a reimplementation of superdough.
@@ -1,123 +0,0 @@
-// this is a poc of how a pattern can be rendered as a wav file using node
-// run via: node dough-export.mjs
-import fs from 'node:fs';
-import WavEncoder from 'wav-encoder';
-import { evalScope } from '@strudel/core';
-import { miniAllStrings } from '@strudel/mini';
-import { Dough } from './dough.mjs';
-
-await evalScope(
-  import('@strudel/core'),
-  import('@strudel/mini'),
-  import('@strudel/tonal'),
-  // import('@strudel/tonal'),
-);
-
-miniAllStrings(); // allows using single quotes for mini notation / skip transpilation
-
-let sampleRate = 48000,
-  cps = 0.4;
-
-/* await doughsamples('github:eddyflux/crate');
-await doughsamples('github:eddyflux/wax'); */
-
-let pat = note('c,eb,g,<bb c4 d4 eb4>')
-  .s('sine')
-  .press()
-  .add(note(24))
-  .fmi(3)
-  .fmh(5.01)
-  .dec(0.4)
-  .delay('.6:<.12 .22>:.8')
-  .jux(press)
-  .rarely(add(note('12')))
-  .lpf(400)
-  .lpq(0.2)
-  .lpd(0.4)
-  .lpenv(3)
-  .fmdecay(0.4)
-  .fmenv(1)
-  .postgain(0.6)
-  .stack(s('<pink white>*8').dec(0.07).rarely(ply('2')).delay(0.5).hpf(sine.range(200, 2000).slow(4)).hpq(0.2))
-  .stack(
-    s('[- white@3]*2')
-      .dec(0.4)
-      .hpf('<2000!3 <4000 8000>>*4')
-      .hpq(0.6)
-      .ply('<1 2>*4')
-      .postgain(0.5)
-      .delay(0.5)
-      .jux(rev)
-      .lpf(5000),
-  )
-  .stack(
-    note('<c2 - [- f1] ->*2')
-      .s('square')
-      .lpf(sine.range(100, 300).slow(4))
-      .lpe(1)
-      .segment(8)
-      .lpd(0.3)
-      .lpq(0.2)
-      .dec(0.2)
-      .speed('<1 2>')
-      .ply('<1 2>')
-      .postgain(1),
-  )
-  .stack(
-    chord('<Cm Cm7 Cm9 Cm11 Fm Fm7 Fm9 Fm11>')
-      .voicing()
-      .s('<sine>')
-      .clip(1)
-      .rel(0.4)
-      .vib('4:.2')
-      .gain(0.7)
-      .hpf(1200)
-      .fm(0.5)
-      .att(1)
-      .lpa(0.5)
-      .lpf(200)
-      .lpenv(4)
-      .chorus(0.8),
-  )
-  .slow(1 / cps);
-
-let cycles = 30;
-let seconds = cycles + 1; // 1s release tail
-const haps = pat.queryArc(0, cycles);
-
-const dough = new Dough(sampleRate);
-
-console.log('spawn voices...');
-haps.forEach((hap) => {
-  hap.value._begin = Number(hap.whole.begin);
-  hap.value._duration = hap.duration /*  / cps */;
-  dough.scheduleSpawn(hap.value);
-});
-console.log(`render ${seconds}s long buffer, each dot is 1 second:`);
-const buffers = [new Float32Array(seconds * sampleRate), new Float32Array(seconds * sampleRate)];
-let t = performance.now();
-while (dough.t <= buffers[0].length) {
-  dough.update();
-  buffers[0][dough.t] = dough.out[0];
-  buffers[1][dough.t] = dough.out[1];
-  if (dough.t % sampleRate === 0) {
-    process.stdout.write('.');
-  }
-}
-const took = (performance.now() - t) / 1000;
-const load = (took / seconds) * 100;
-const speed = (seconds / took).toFixed(2);
-console.log('');
-console.log(`done!
-rendered ${seconds}s in ${took.toFixed(2)}s 
-speed: ${speed}x
-load: ${load.toFixed(2)}%`);
-
-const patternAudio = {
-  sampleRate,
-  channelData: buffers,
-};
-
-WavEncoder.encode(patternAudio).then((buffer) => {
-  fs.writeFileSync('pattern.wav', new Float32Array(buffer));
-});
@@ -1,39 +0,0 @@
-import { Dough } from './dough.mjs';
-
-const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
-
-class DoughProcessor extends AudioWorkletProcessor {
-  constructor() {
-    super();
-    this.dough = new Dough(sampleRate, currentTime);
-    this.port.onmessage = (event) => {
-      if (event.data.spawn) {
-        this.dough.scheduleSpawn(event.data.spawn);
-      } else if (event.data.sample) {
-        this.dough.loadSample(event.data.sample, event.data.channels, event.data.sampleRate);
-      } else if (event.data.samples) {
-        event.data.samples.forEach(([name, channels, sampleRate]) => {
-          this.dough.loadSample(name, channels, sampleRate);
-        });
-      } else {
-        console.log('unrecognized event type', event.data);
-      }
-    };
-  }
-  process(inputs, outputs, params) {
-    if (this.disconnected) {
-      return false;
-    }
-    const output = outputs[0];
-    for (let i = 0; i < output[0].length; i++) {
-      this.dough.update();
-      for (let c = 0; c < output.length; c++) {
-        //prevent speaker blowout via clipping if threshold exceeds
-        output[c][i] = clamp(this.dough.out[c], -1, 1);
-      }
-    }
-    return true; // keep the audio processing going
-  }
-}
-
-registerProcessor('dough-processor', DoughProcessor);
@@ -1,5 +0,0 @@
-// import _workletUrl from './dough-worklet.mjs?url'; // only for dev (breaks for production build)
-import _workletUrl from './dough-worklet.mjs?audioworklet'; // only for prod (breaks in development?!)
-
-export * from './dough.mjs';
-export const workletUrl = _workletUrl;
@@ -1,37 +0,0 @@
-{
-  "name": "supradough",
-  "version": "1.2.3",
-  "description": "platform agnostic synth and sampler intended for live coding. a reimplementation of superdough.",
-  "main": "index.mjs",
-  "type": "module",
-  "publishConfig": {
-    "main": "dist/index.mjs"
-  },
-  "scripts": {
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tidalcycles/strudel.git"
-  },
-  "keywords": [
-    "tidalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://github.com/tidalcycles/strudel/issues"
-  },
-  "homepage": "https://github.com/tidalcycles/strudel#readme",
-  "devDependencies": {
-    "vite": "^6.0.11",
-    "vite-plugin-bundle-audioworklet": "workspace:*",
-    "wav-encoder": "^1.3.0"
-  },
-  "dependencies": {}
-}
@@ -1,6 +1,6 @@
 {
  "name": "@strudel/tonal",
-  "version": "1.2.4",
+  "version": "1.2.2",
  "description": "Tonal functions for strudel",
  "main": "index.mjs",
  "publishConfig": {
@@ -7,130 +7,73 @@ This program is free software: you can redistribute it and/or modify it under th
 // import { strict as assert } from 'assert';

 import '../tonal.mjs'; // need to import this to add prototypes
-import { pure, n, seq, note, noteToMidi } from '@strudel/core';
+import { pure, n, seq, note } from '@strudel/core';
 import { describe, it, expect } from 'vitest';
 import { mini } from '../../mini/mini.mjs';

 describe('tonal', () => {
-  describe('scaleTranspose', () => {
-    it('transposes notes by scale degrees', () => {
-      expect(pure('c3').scale('C major').scaleTranspose(1).firstCycleValues).toEqual(['D3']);
-    });
+  it('Should run tonal functions ', () => {
+    expect(pure('c3').scale('C major').scaleTranspose(1).firstCycleValues).toEqual(['D3']);
  });
-  describe('scale', () => {
-    it('converts plain values', () => {
-      expect(
-        seq(0, 1, 2)
-          .scale('C major')
-          .note()
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(['C3', 'D3', 'E3']);
-    });
-    it('converts n values', () => {
-      expect(
-        n(seq(0, 1, 2))
-          .scale('C major')
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(['C3', 'D3', 'E3']);
-    });
-    it('converts n values (mini notation)', () => {
-      expect(
-        n(seq(0, 1, 2))
-          .scale('C:major')
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(['C3', 'D3', 'E3']);
-    });
-    it('converts n values (no tonic)', () => {
-      expect(
-        n(seq(0, 1, 2))
-          .scale('major')
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(['C3', 'D3', 'E3']);
-    });
-    it('converts n values (explicit mini notation)', () => {
-      expect(
-        n(seq(0, 1, 2))
-          .scale(mini('C:major'))
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(['C3', 'D3', 'E3']);
-    });
-    it('converts decorated n values', () => {
-      expect(
-        n(seq('0b', '1#', '-2', '3##', '4bb'))
-          .scale('C major')
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(['B2', 'Eb3', 'A2', 'G3', 'F3']);
-    });
-    it('produces silence for mixed sharps and flats', () => {
-      expect(
-        n(seq('0b#', '1#b', '2#b#'))
-          .scale('C major')
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual([]);
-    });
-    it('snaps notes (upwards) to scale', () => {
-      const inputNotes = ['Cb', 'Eb', 'G', 'A#', 'Bb'];
-      const expectedNotes = ['B2', 'E3', 'G3', 'B3', 'B3'];
-
-      expect(
-        note(seq(inputNotes))
-          .scale('C major')
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(expectedNotes);
-    });
-    it('snaps notes to the correct octave', () => {
-      const inputNotes = ['Cb0', 'Eb4', 'G1', 'A#19', 'Bb8'];
-      const expectedNotes = ['B#-1', 'D#4', 'G#1', 'A#19', 'A#8'];
-
-      expect(
-        note(seq(inputNotes))
-          .scale('A# minor') // A#, B#, C#, D#, E#, F#, G#
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(expectedNotes);
-    });
-    it('handles scale names provided with colons', () => {
-      const inputNotes = ['Cb', 'E', 'G', 'A#', 'Bb'];
-      const expectedNotes = ['A#2', 'D#3', 'G#3', 'A#3', 'A#3'];
-
-      expect(
-        note(seq(inputNotes))
-          .scale('F#:pentatonic') // F#, G#, A#, C#, and D#
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(expectedNotes);
-    });
+  it('scale with plain values', () => {
+    expect(
+      seq(0, 1, 2)
+        .scale('C major')
+        .note()
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual(['C3', 'D3', 'E3']);
  });
-  describe('transpose', () => {
-    it('transposes note numbers with interval numbers', () => {
-      expect(
-        note(seq(40, 40, 40))
-          .transpose(0, 1, 2)
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual([40, 41, 42]);
-      expect(seq(40, 40, 40).transpose(0, 1, 2).firstCycleValues).toEqual([40, 41, 42]);
-    });
-    it('transposes note numbers with interval strings', () => {
-      expect(
-        note(seq(40, 40, 40))
-          .transpose('1P', '2M', '3m')
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual([40, 42, 43]);
-      expect(seq(40, 40, 40).transpose('1P', '2M', '3m').firstCycleValues).toEqual([40, 42, 43]);
-    });
-    it('transposes note strings with interval numbers', () => {
-      expect(
-        note(seq('c', 'c', 'c'))
-          .transpose(0, 1, 2)
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(['C', 'Db', 'D']);
-      expect(seq('c', 'c', 'c').transpose(0, 1, 2).firstCycleValues).toEqual(['C', 'Db', 'D']);
-    });
-    it('transposes note strings with interval strings', () => {
-      expect(
-        note(seq('c', 'c', 'c'))
-          .transpose('1P', '2M', '3m')
-          .firstCycleValues.map((h) => h.note),
-      ).toEqual(['C', 'D', 'Eb']);
-      expect(seq('c', 'c', 'c').transpose('1P', '2M', '3m').firstCycleValues).toEqual(['C', 'D', 'Eb']);
-    });
+  it('scale with n values', () => {
+    expect(
+      n(0, 1, 2)
+        .scale('C major')
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual(['C3', 'D3', 'E3']);
+  });
+  it('scale with colon', () => {
+    expect(
+      n(0, 1, 2)
+        .scale('C:major')
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual(['C3', 'D3', 'E3']);
+  });
+  it('scale with mininotation colon', () => {
+    expect(
+      n(0, 1, 2)
+        .scale(mini('C:major'))
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual(['C3', 'D3', 'E3']);
+  });
+  it('transposes note numbers with interval numbers', () => {
+    expect(
+      note(40, 40, 40)
+        .transpose(0, 1, 2)
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual([40, 41, 42]);
+    expect(seq(40, 40, 40).transpose(0, 1, 2).firstCycleValues).toEqual([40, 41, 42]);
+  });
+  it('transposes note numbers with interval strings', () => {
+    expect(
+      note(40, 40, 40)
+        .transpose('1P', '2M', '3m')
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual([40, 42, 43]);
+    expect(seq(40, 40, 40).transpose('1P', '2M', '3m').firstCycleValues).toEqual([40, 42, 43]);
+  });
+  it('transposes note strings with interval numbers', () => {
+    expect(
+      note('c', 'c', 'c')
+        .transpose(0, 1, 2)
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual(['C', 'Db', 'D']);
+    expect(seq('c', 'c', 'c').transpose(0, 1, 2).firstCycleValues).toEqual(['C', 'Db', 'D']);
+  });
+  it('transposes note strings with interval strings', () => {
+    expect(
+      note('c', 'c', 'c')
+        .transpose('1P', '2M', '3m')
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual(['C', 'D', 'Eb']);
+    expect(seq('c', 'c', 'c').transpose('1P', '2M', '3m').firstCycleValues).toEqual(['C', 'D', 'Eb']);
  });
 });
@@ -6,28 +6,19 @@ This program is free software: you can redistribute it and/or modify it under th

 import { Note, Interval, Scale } from '@tonaljs/tonal';
 import { register, _mod, silence, logger, pure, isNote } from '@strudel/core';
-import { stepInNamedScale, nearestNumberIndex } from './tonleiter.mjs';
-import { noteToMidi } from '../core/util.mjs';
+import { stepInNamedScale } from './tonleiter.mjs';

 const octavesInterval = (octaves) => (octaves <= 0 ? -1 : 1) + octaves * 7 + 'P';

-function getScale(scaleName) {
-  scaleName = scaleName.replaceAll(':', ' ');
-  const scale = Scale.get(scaleName);
-  const { tonic, empty } = scale;
-  if ((empty && isNote(scaleName)) || (empty && !tonic)) {
-    throw new Error(
-      `Scale name ${scaleName} is incomplete. Make sure to use ":" instead of spaces, example: .scale("C:major")`,
-    );
-  } else if (empty) {
-    throw new Error(`Invalid scale name "${scaleName}"`);
-  }
-  return scale;
-}
-
 function scaleStep(step, scale) {
+  scale = scale.replaceAll(':', ' ');
  step = Math.ceil(step);
-  let { intervals, tonic } = getScale(scale);
+  let { intervals, tonic, empty } = Scale.get(scale);
+  if ((empty && isNote(scale)) || (!empty && !tonic)) {
+    throw new Error(`incomplete scale. Make sure to use ":" instead of spaces, example: .scale("C:major")`);
+  } else if (empty) {
+    throw new Error(`invalid scale "${scale}"`);
+  }
  tonic = tonic || 'C';
  const { pc, oct = 3 } = Note.get(tonic);
  const octaveOffset = Math.floor(step / intervals.length);
@@ -39,7 +30,8 @@ function scaleStep(step, scale) {
 // transpose note inside scale by offset steps
 // function scaleOffset(scale: string, offset: number, note: string) {
 function scaleOffset(scale, offset, note) {
-  let { notes } = getScale(scale);
+  let [tonic, scaleName] = Scale.tokenize(scale);
+  let { notes } = Scale.get(`${tonic} ${scaleName}`);
  notes = notes.map((note) => Note.get(note).pc); // use only pc!
  offset = Number(offset);
  if (isNaN(offset)) {
@@ -96,14 +88,13 @@ function scaleOffset(scale, offset, note) {
 * @returns Pattern
 * @memberof Pattern
 * @name transpose
- * @synonyms trans
 * @example
 * "c2 c3".fast(2).transpose("<0 -2 5 3>".slow(2)).note()
 * @example
 * "c2 c3".fast(2).transpose("<1P -2M 4P 3m>".slow(2)).note()
 */

-export const { transpose, trans } = register(['transpose', 'trans'], function transposeFn(intervalOrSemitones, pat) {
+export const transpose = register('transpose', function (intervalOrSemitones, pat) {
  return pat.withHap((hap) => {
    const note = hap.value.note ?? hap.value;
    if (typeof note === 'number') {
@@ -128,7 +119,10 @@ export const { transpose, trans } = register(['transpose', 'trans'], function tr
    const interval = !isNaN(Number(intervalOrSemitones))
      ? Interval.fromSemitones(intervalOrSemitones)
      : String(intervalOrSemitones);
-    const targetNote = Note.transpose(note, interval);
+    // TODO: move simplify to player to preserve enharmonics
+    // tone.js doesn't understand multiple sharps flats e.g. F##3 has to be turned into G3
+    // TODO: check if this is still relevant..
+    const targetNote = Note.simplify(Note.transpose(note, interval));
    if (typeof hap.value === 'object') {
      return hap.withValue(() => ({ ...hap.value, note: targetNote }));
    }
@@ -148,7 +142,6 @@ export const { transpose, trans } = register(['transpose', 'trans'], function tr
 * @name scaleTranspose
 * @param {offset} offset number of steps inside the scale
 * @returns Pattern
- * @synonyms scaleTrans, strans
 * @example
 * "-8 [2,4,6]"
 * .scale('C4 bebop major')
@@ -156,79 +149,25 @@ export const { transpose, trans } = register(['transpose', 'trans'], function tr
 * .note()
 */

-export const { scaleTranspose, scaleTrans, strans } = register(
-  ['scaleTranspose', 'scaleTrans', 'strans'],
-  function (offset /* : number | string */, pat) {
-    return pat.withHap((hap) => {
-      if (!hap.context.scale) {
-        throw new Error('can only use scaleTranspose after .scale');
-      }
-      if (typeof hap.value === 'object')
-        return hap.withValue(() => ({
-          ...hap.value,
-          note: scaleOffset(hap.context.scale, Number(offset), hap.value.note),
-        }));
-      if (typeof hap.value !== 'string') {
-        throw new Error('can only use scaleTranspose with notes');
-      }
-      return hap.withValue(() => scaleOffset(hap.context.scale, Number(offset), hap.value));
-    });
-  },
-);
-
-// Converts a step value, which is a number optionally decorated with sharps and flats,
-// to a number and an `offset` number of semitones
-function _convertStepToNumberAndOffset(step) {
-  let asNumber = Number(step);
-  let offset = 0;
-  if (isNaN(asNumber)) {
-    step = String(step);
-    // Check to see if the step matches the expected format:
-    // - A number (possibly negative)
-    // - Some number of sharps or flats (but not both)
-    const match = /^(-?\d+)(#+|b+)?$/.exec(step);
-
-    if (!match) {
-      throw new Error(`invalid scale step "${step}", expected number or integer with optional # b suffixes`);
+export const scaleTranspose = register('scaleTranspose', function (offset /* : number | string */, pat) {
+  return pat.withHap((hap) => {
+    if (!hap.context.scale) {
+      throw new Error('can only use scaleTranspose after .scale');
    }
-    asNumber = Number(match[1]);
-    // These decorations will determine the semitone offset based on the number of
-    // sharps or flats
-    const decorations = match[2] || '';
-    offset = decorations[0] === '#' ? decorations.length : -decorations.length;
-  }
-  return [asNumber, offset];
-}
-
-let scaleToMidisAndNotes = {};
-// Finds the nearest scale note to `note`
-function _getNearestScaleNote(scaleName, note, preferHigher = true) {
-  let noteMidi = typeof note === 'string' ? noteToMidi(note) : note;
-  if (scaleToMidisAndNotes[scaleName] === undefined) {
-    const { intervals, tonic } = getScale(scaleName);
-    const { pc } = Note.get(tonic);
-    const expandedIntervals = intervals.concat('8P'); // add the octave for wrapping
-    const sNotes = expandedIntervals.map((interval) => Note.transpose(pc + '0', interval));
-    const sMidi = sNotes.map(noteToMidi);
-    // Cache
-    scaleToMidisAndNotes[scaleName] = [sMidi, sNotes];
-  }
-  const [scaleMidis, scaleNotes] = scaleToMidisAndNotes[scaleName];
-  const rootMidi = scaleMidis[0];
-  const octaveDiff = Math.floor((noteMidi - rootMidi) / 12);
-  const alignedMidis = scaleMidis.map((m) => m + 12 * octaveDiff);
-  const noteIdx = nearestNumberIndex(noteMidi, alignedMidis, preferHigher);
-  const noteMatch = scaleNotes[noteIdx];
-  return Note.transpose(noteMatch, Interval.fromSemitones(12 * octaveDiff));
-}
+    if (typeof hap.value === 'object')
+      return hap.withValue(() => ({
+        ...hap.value,
+        note: scaleOffset(hap.context.scale, Number(offset), hap.value.note),
+      }));
+    if (typeof hap.value !== 'string') {
+      throw new Error('can only use scaleTranspose with notes');
+    }
+    return hap.withValue(() => scaleOffset(hap.context.scale, Number(offset), hap.value));
+  });
+});

 /**
- * Turns numbers into notes in the scale (zero indexed) or quantizes notes to a scale.
- *
- * When describing notes via numbers, note that negative numbers can be used to wrap backwards
- * in the scale as well as sharps or flats (but not both) to produce notes outside of the scale.
- *
- * Also sets scale for other scale operations, like {@link Pattern#scaleTranspose}.
+ * Turns numbers into notes in the scale (zero indexed). Also sets scale for other scale operations, like {@link Pattern#scaleTranspose}.
 *
 * A scale consists of a root note (e.g. `c4`, `c`, `f#`, `bb4`) followed by semicolon (':') and then a [scale type](https://github.com/tonaljs/tonal/blob/main/packages/scale-type/data.ts).
 *
@@ -247,12 +186,6 @@ function _getNearestScaleNote(scaleName, note, preferHigher = true) {
 * n(rand.range(0,12).segment(8))
 * .scale("C:ritusen")
 * .s("piano")
- * @example
- * n("<[0,7b] [-4# -4] [-2,7##] 4 [0,7] [-4# -4b] [-2,7###] 4b>*4")
- * .scale("C:<major minor>/2")
- * .s("piano")
- * @example
- * note("C1*16").transpose(irand(36)).scale('Cb2 major').scaleTranspose(3)
 */

 export const scale = register(
@@ -266,35 +199,49 @@ export const scale = register(
      pat
        .fmap((value) => {
          const isObject = typeof value === 'object';
-          // The case where the note has been defined via `n` or `pure`
-          if (!isObject || (isObject && ('n' in value || 'value' in value))) {
-            const step = isObject ? (value.n ?? value.value) : value;
+          let step = isObject ? value.n : value;
+          if (isObject) {
            delete value.n; // remove n so it won't cause trouble
-            if (isNote(step)) {
-              // legacy..
-              return pure(step);
-            }
-            try {
-              const [number, offset] = _convertStepToNumberAndOffset(step);
-              let note;
-              if (isObject && value.anchor) {
-                note = stepInNamedScale(number, scale, value.anchor);
-              } else {
-                note = scaleStep(number, scale);
-              }
-              if (offset != 0) note = Note.transpose(note, Interval.fromSemitones(offset));
-              value = pure(isObject ? { ...value, note } : note);
-            } catch (err) {
-              logger(`[tonal] ${err.message}`, 'error');
+          }
+          if (isNote(step)) {
+            // legacy..
+            return pure(step);
+          }
+          let asNumber = Number(step);
+          let semitones = 0;
+          if (isNaN(asNumber)) {
+            step = String(step);
+            if (!/^[-+]?\d+(#*|b*){1}$/.test(step)) {
+              logger(
+                `[tonal] invalid scale step "${step}", expected number or integer with optional # b suffixes`,
+                'error',
+              );
              return silence;
            }
-            return value;
+            const isharp = step.indexOf('#');
+            if (isharp >= 0) {
+              asNumber = Number(step.substring(0, isharp));
+              semitones = step.length - isharp;
+            } else {
+              const iflat = step.indexOf('b');
+              asNumber = Number(step.substring(0, iflat));
+              semitones = iflat - step.length;
+            }
          }
-          // The case where the note has been defined via `note`
-          else {
-            const note = _getNearestScaleNote(scale, value.note);
-            return pure(isObject ? { ...value, note } : note);
+          try {
+            let note;
+            if (isObject && value.anchor) {
+              note = stepInNamedScale(asNumber, scale, value.anchor);
+            } else {
+              note = scaleStep(asNumber, scale);
+            }
+            if (semitones != 0) note = Note.transpose(note, Interval.fromSemitones(semitones));
+            value = pure(isObject ? { ...value, note } : note);
+          } catch (err) {
+            logger(`[tonal] ${err.message}`, 'error');
+            value = silence;
          }
+          return value;
        })
        .outerJoin()
        // legacy:
@@ -101,11 +101,11 @@ export function nearestNumberIndex(target, numbers, preferHigher) {
 let scaleSteps = {}; // [scaleName]: semitones[]

 export function stepInNamedScale(step, scale, anchor, preferHigher) {
-  const [root, scaleName] = Scale.tokenize(scale);
+  let [root, scaleName] = Scale.tokenize(scale);
  const rootMidi = x2midi(root);
  const rootChroma = midi2chroma(rootMidi);
  if (!scaleSteps[scaleName]) {
-    const { intervals } = Scale.get(`C ${scaleName}`);
+    let { intervals } = Scale.get(`C ${scaleName}`);
    // cache result
    scaleSteps[scaleName] = intervals.map(step2semitones);
  }
@@ -222,7 +222,6 @@ export const Note = {
 };

 // TODO: support octave numbers
-// Example: Note("Bb3").transpose("c3")
 export function transpose(note, step) {
  // example: E, 3
  const stepNumber = Step.tokenize(step)[1]; // 3
@@ -236,3 +235,5 @@ export function transpose(note, step) {
  const offsetAccidentals = accidentalString(Step.accidentals(step) + Note.accidentals(note) + stepIndex - indexOffset); // "we need to add a # to to the G to make it a major third from E"
  return [targetNote, offsetAccidentals].join('');
 }
+
+//Note("Bb3").transpose("c3")
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jade (Rose) Rowland	376db2f7c2	li	2025-06-17 15:00:27 +02:00
Jade (Rose) Rowland	294581f824	working	2025-06-17 14:58:27 +02:00