li

.forgejo/workflows/test.yml

@@ -1,6 +1,6 @@
 name: Strudel tests
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   build:
@@ -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

CONTRIBUTING.md

@@ -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!

README.md

@@ -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>

eslint.config.mjs

@@ -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',
-      },
-    },
-  },
 ];

jsdoc/jsdoc-synonyms.js

@@ -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/>.
 */

packages/codemirror/autocomplete.mjs

@@ -1,91 +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;
-
-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, label }) =>
-  h`
-  <div class="autocomplete-info-tooltip">
-    <h3 class="autocomplete-info-function-name">${label || getDocLabel(doc)}</h3>
-    ${doc.description ? `<p class="autocomplete-info-function-description">${doc.description}</p>` : ''}
-    ${buildParamsList(doc.params)}
-    ${buildExamples(doc.examples)}
-  </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 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 jsdocCompletions = jsdoc.docs
-  .filter((doc) => isValidDoc(doc) && !hasExcludedTags(doc))
+  .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) => ({
+  .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) => {
-  const word = context.matchBefore(/\w*/);
-  if (word.from === word.to && !context.explicit) return null;
-
+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,
@@ -97,5 +74,11 @@ export const strudelAutocomplete = (context) => {
   };
 };
 
-export const isAutoCompletionEnabled = (enabled) =>
-  enabled ? [autocompletion({ override: [strudelAutocomplete] })] : [];
+export function isAutoCompletionEnabled(on) {
+  return on
+    ? [
+        autocompletion({ override: [strudelAutocomplete] }),
+        //javascriptLanguage.data.of({ autocomplete: strudelAutocomplete }),
+      ]
+    : []; // autocompletion({ override: [] })
+}

packages/codemirror/codemirror.mjs

@@ -1,7 +1,7 @@
 import { closeBrackets } from '@codemirror/autocomplete';
 export { toggleComment, toggleBlockComment, toggleLineComment, toggleBlockCommentByLine } from '@codemirror/commands';
 // import { search, highlightSelectionMatches } from '@codemirror/search';
-import { history, indentWithTab } from '@codemirror/commands';
+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';
@@ -37,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()]));
 
@@ -59,8 +51,6 @@ export const defaultSettings = {
   isFlashEnabled: true,
   isTooltipEnabled: false,
   isLineWrappingEnabled: false,
-  isTabIndentationEnabled: false,
-  isMultiCursorEnabled: false,
   theme: 'strudelTheme',
   fontFamily: 'monospace',
   fontSize: 18,
@@ -72,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]))),
@@ -85,7 +75,7 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
       /* search(),
       highlightSelectionMatches(), */
       ...initialSettings,
-      mondo ? [] : javascript(),
+      javascript(),
       sliderPlugin,
       widgetPlugin,
       // indentOnInput(), // works without. already brought with javascript extension?
@@ -219,7 +209,6 @@ export class StrudelMirror {
       },
       onEvaluate: () => this.evaluate(),
       onStop: () => this.stop(),
-      mondo: replOptions.mondo,
     });
     const cmEditor = this.root.querySelector('.cm-editor');
     if (cmEditor) {

packages/codemirror/highlight.mjs

@@ -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 : [];
 };

packages/codemirror/keybindings.mjs

@@ -21,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 ? active() : [], keymap.of(historyKeymap)];
+  return [keymap.of(defaultKeymap), keymap.of(historyKeymap), active ? active() : []];
+  // keymap.of(searchKeymap),
 }

packages/codemirror/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/codemirror",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Codemirror Extensions for Strudel",
   "main": "index.mjs",
   "publishConfig": {

packages/codemirror/themes.mjs

@@ -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,

packages/codemirror/themes/archBtw.mjs

@@ -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] },
-  ],
-});

packages/codemirror/themes/bluescreenlight.mjs

@@ -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] },
-  ],
-});

packages/codemirror/themes/fruitDaw.mjs

@@ -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] },
-  ],
-});

packages/core/bench/pattern.bench.mjs

@@ -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);

packages/core/controls.mjs

@@ -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);
@@ -252,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.
  *
@@ -309,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
@@ -331,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)
  *
@@ -470,78 +434,6 @@ 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
- * @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
  *
@@ -551,42 +443,6 @@ export const { tremoloshape } = registerControl('tremoloshape', 'tremshape');
  * note("{f g g c d a a#}%16".sub(17)).s("supersaw").lpenv(8).lpf(150).lpq(.8).ftype('ladder').drive("<.5 4>")
  *
  */
-
-/**
- * modulate the amplitude of an orbit to create a "sidechain" like effect
- *
- * @name duckorbit
- * @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)
- *
- */
-export const { duck } = registerControl('duckorbit', 'duck');
-
-/**
- *  the amount of ducking applied to target orbit
- *
- * @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>"))
- *
- */
-
-export const { duckdepth } = registerControl('duckdepth');
-
-/**
- *  the attack time of the duck effect
- *
- * @name duckattack
- * @param {number | Pattern} time
- * @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 0 0.4>").duckdepth(1))
- *
- */
-export const { duckattack } = registerControl('duckattack', 'duckatt');
-
 export const { drive } = registerControl('drive');
 
 /**
@@ -1108,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
@@ -1708,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');
@@ -1784,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');
 
 /**

packages/core/cyclist.mjs

@@ -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);
         }
       },

packages/core/euclid.mjs

@@ -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);
-});

packages/core/evaluate.mjs

@@ -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;

packages/core/hap.mjs

@@ -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) {

packages/core/logger.mjs

@@ -4,12 +4,6 @@ let debounce = 1000,
   lastMessage,
   lastTime;
 
-export function errorLogger(e, origin = 'cyclist') {
-  //TODO: add some kind of debug flag that enables this  while in dev mode
-  // console.error(e);
-  logger(`[${origin}] error: ${e.message}`);
-}
-
 export function logger(message, type, data = {}) {
   let t = performance.now();
   if (lastMessage === message && t - lastTime < debounce) {

packages/core/neocyclist.mjs

@@ -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

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/core",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Port of Tidal Cycles to JavaScript",
   "main": "index.mjs",
   "type": "module",

packages/core/pattern.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
@@ -1305,7 +1261,7 @@ export function sequenceP(pats) {
  * @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:
@@ -1586,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
  *
@@ -2026,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
  */
@@ -2536,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',
@@ -2582,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
@@ -2796,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);
@@ -3280,7 +3204,7 @@ export const slice = register(
  * 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);
@@ -3418,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);
+});

packages/core/repl.mjs

@@ -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,
@@ -86,17 +85,6 @@ export function repl({
   const pause = () => scheduler.pause();
   const toggle = () => scheduler.toggle();
   const setCps = (cps) => scheduler.setCps(cps);
-
-  /**
-   * 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(cpm / 60);
 
   // TODO - not documented as jsdoc examples as the test framework doesn't simulate enough context for `each` and `all`..
@@ -114,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.
@@ -192,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);
@@ -209,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`;
@@ -245,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) {
@@ -253,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');
     }
   };

packages/core/signal.mjs

@@ -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

packages/core/speak.mjs

@@ -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);
   });
 });

packages/core/test/pattern.test.mjs

@@ -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();
-    });
-  });
 });

packages/core/timespan.mjs

@@ -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);
 

packages/core/util.mjs

@@ -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;
-}

packages/csound/index.mjs

@@ -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;

packages/csound/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/csound",
-  "version": "1.2.4",
+  "version": "1.2.3",
   "description": "csound bindings for strudel",
   "main": "index.mjs",
   "type": "module",

packages/desktopbridge/midibridge.mjs

@@ -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;

packages/desktopbridge/oscbridge.mjs

@@ -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);

packages/draw/draw.mjs

@@ -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 });

packages/draw/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/draw",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Helpers for drawing with Strudel",
   "main": "index.mjs",
   "type": "module",

packages/embed/package.json

@@ -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",

packages/gamepad/docs/gamepad.mdx

@@ -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/

packages/gamepad/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/gamepad",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Gamepad Inputs for strudel",
   "main": "index.mjs",
   "type": "module",

packages/hydra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/hydra",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Hydra integration for strudel",
   "main": "hydra.mjs",
   "type": "module",

packages/midi/midi.mjs

@@ -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);

packages/midi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/midi",
-  "version": "1.2.4",
+  "version": "1.2.3",
   "description": "Midi API for strudel",
   "main": "index.mjs",
   "type": "module",

packages/mini/bench/mini.bench.mjs

@@ -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);
 });

packages/mini/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/mini",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Mini notation for strudel",
   "main": "index.mjs",
   "type": "module",

packages/mondo/README.md

@@ -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
-```

packages/mondo/mondo.mjs

@@ -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);
-  }
-}

packages/mondo/package.json

@@ -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"
-  }
-}

packages/mondo/test/mondo.test.mjs

@@ -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]));
-});

packages/mondo/vite.config.js

@@ -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',
-  },
-});

packages/mondough/README.md

@@ -1,3 +0,0 @@
-# @strudel/mondough
-
-connects mondo to strudel.

packages/mondough/mondough.mjs

@@ -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'].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');
-}
-
-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,
-}); */

packages/mondough/package.json

@@ -1,44 +0,0 @@
-{
-  "name": "@strudel/mondo",
-  "version": "1.1.1",
-  "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"
-  }
-}

packages/mondough/vite.config.js

@@ -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',
-  },
-});

packages/motion/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/motion",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "DeviceMotion API for strudel",
   "main": "index.mjs",
   "type": "module",

packages/mqtt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/mqtt",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "MQTT API for strudel",
   "main": "mqtt.mjs",
   "type": "module",

packages/osc/osc.mjs

@@ -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();

packages/osc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/osc",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "OSC messaging for strudel",
   "main": "osc.mjs",
   "type": "module",

packages/reference/package.json

@@ -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",

packages/repl/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/repl",
-  "version": "1.2.4",
+  "version": "1.2.3",
   "description": "Strudel REPL as a Web Component",
   "module": "index.mjs",
   "publishConfig": {

packages/repl/prebake.mjs

@@ -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`),
   ]);

packages/sampler/README.md

@@ -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.

packages/sampler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/sampler",
-  "version": "0.2.2",
+  "version": "0.2.0",
   "description": "",
   "keywords": [
     "tidalcycles",

packages/sampler/sample-server.mjs

@@ -10,6 +10,14 @@ import os from 'os';
 // eslint-disable-next-line
 const LOG = !!process.env.LOG || false;
 
+console.log(
+  cowsay.say({
+    text: 'welcome to @strudel/sampler',
+    e: 'oO',
+    T: 'U ',
+  }),
+);
+
 async function getFilesInDirectory(directory) {
   let files = [];
   const dirents = await readdir(directory, { withFileTypes: true });
@@ -52,26 +60,8 @@ async function getBanks(directory) {
   return { banks, files };
 }
 
-const args = process.argv.slice(2);
-
 // eslint-disable-next-line
 const directory = process.cwd();
-
-if (args.includes('--json')) {
-  const { banks, files } = await getBanks(directory);
-  const json = JSON.stringify(banks);
-  console.log(json);
-  process.exit(0);
-}
-
-console.log(
-  cowsay.say({
-    text: 'welcome to @strudel/sampler',
-    e: 'oO',
-    T: 'U ',
-  }),
-);
-
 const server = http.createServer(async (req, res) => {
   res.setHeader('Access-Control-Allow-Origin', '*');
   const { banks, files } = await getBanks(directory);

packages/serial/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/serial",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Webserial API for strudel",
   "main": "serial.mjs",
   "type": "module",

packages/soundfonts/gm.mjs

@@ -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

packages/soundfonts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/soundfonts",
-  "version": "1.2.4",
+  "version": "1.2.3",
   "description": "Soundsfont support for strudel",
   "main": "index.mjs",
   "publishConfig": {

packages/soundfonts/sfumato.mjs

@@ -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];

packages/superdough/dspworklet.mjs

@@ -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 });
 }

packages/superdough/helpers.mjs

@@ -1,8 +1,5 @@
 import { getAudioContext } from './superdough.mjs';
 import { clamp, nanFallback } from './util.mjs';
-import { getNoiseBuffer } from './noise.mjs';
-
-export const noises = ['pink', 'white', 'brown', 'crackle'];
 
 export function gainNode(value) {
   const node = getAudioContext().createGain();
@@ -209,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
@@ -283,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 {

packages/superdough/logger.mjs

@@ -1,11 +1,5 @@
 let log = (msg) => console.log(msg);
 
-export function errorLogger(e, origin = 'cyclist') {
-  //TODO: add some kind of debug flag that enables this  while in dev mode
-  // console.error(e);
-  logger(`[${origin}] error: ${e.message}`);
-}
-
 export const logger = (...args) => log(...args);
 
 export const setLogger = (fn) => {

packages/superdough/noise.mjs

@@ -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];

packages/superdough/package.json

@@ -1,6 +1,6 @@
 {
   "name": "superdough",
-  "version": "1.2.4",
+  "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",

packages/superdough/sampler.mjs

@@ -196,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
@@ -263,8 +217,49 @@ 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(

packages/superdough/superdough.mjs

@@ -7,11 +7,11 @@ This program is free software: you can redistribute it and/or modify it under th
 import './feedbackdelay.mjs';
 import './reverb.mjs';
 import './vowel.mjs';
-import { clamp, nanFallback, _mod, cycleToSeconds, secondsToCycle } from './util.mjs';
+import { clamp, nanFallback, _mod } from './util.mjs';
 import workletsUrl from './worklets.mjs?audioworklet';
-import { createFilter, gainNode, getCompressor, getWorklet, webAudioTimeout } from './helpers.mjs';
+import { createFilter, gainNode, getCompressor, getWorklet } from './helpers.mjs';
 import { map } from 'nanostores';
-import { logger, errorLogger } from './logger.mjs';
+import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
 
 export const DEFAULT_MAX_POLYPHONY = 128;
@@ -28,13 +28,6 @@ export function setMultiChannelOrbits(bool) {
   multiChannelOrbits = bool == true;
 }
 
-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 const soundMap = map();
 
 export function registerSound(key, onTrigger, data = {}) {
@@ -114,10 +107,6 @@ export async function aliasBank(...args) {
 }
 
 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()];
 }
 
@@ -133,7 +122,7 @@ export const getAudioDevices = async () => {
   return devicesMap;
 };
 
-let defaultDefaultValues = {
+const defaultDefaultValues = {
   s: 'triangle',
   gain: 0.8,
   postgain: 1,
@@ -150,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) {
@@ -196,7 +174,7 @@ export const resetLoadedSounds = () => soundMap.set({});
 let audioContext;
 
 export const setDefaultAudioContext = () => {
-  audioContext = new AudioContext({ latencyHint: 'playback' });
+  audioContext = new AudioContext();
   return audioContext;
 };
 
@@ -212,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;
@@ -337,40 +309,30 @@ function getDelay(orbit, delaytime, delayfeedback, t, channels) {
     //logger(`delayfeedback was clamped to ${maxfeedback} to save your ears`);
   }
   delayfeedback = clamp(delayfeedback, 0, 0.98);
-  if (!orbits[orbit].delayNode) {
+  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..
-    connectToOrbit(dly, orbit);
-    orbits[orbit].delayNode = dly;
+    connectToDestination(dly, channels);
+    delays[orbit] = dly;
   }
-  orbits[orbit].delayNode.delayTime.value !== delaytime &&
-    orbits[orbit].delayNode.delayTime.setValueAtTime(delaytime, t);
-  orbits[orbit].delayNode.feedback.value !== delayfeedback &&
-    orbits[orbit].delayNode.feedback.setValueAtTime(delayfeedback, t);
-  return orbits[orbit].delayNode;
+  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, begin, end, properties = {}) {
-  const { shape = 0, ...props } = properties;
-  const { dcoffset = -0.5, depth = 1 } = properties;
-  const lfoprops = {
+export function getLfo(audioContext, time, end, properties = {}) {
+  return getWorklet(audioContext, 'lfo-processor', {
     frequency: 1,
-    depth,
-    skew: 0.5,
+    depth: 1,
+    skew: 0,
     phaseoffset: 0,
-    time: begin,
-    begin,
+    time,
     end,
-    shape: getModulationShapeInput(shape),
-    dcoffset,
-    min: dcoffset * depth,
-    max: dcoffset * depth + depth,
-    curve: 1,
-    ...props,
-  };
-
-  return getWorklet(audioContext, 'lfo-processor', lfoprops);
+    shape: 1,
+    dcoffset: -0.5,
+    ...properties,
+  });
 }
 
 function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
@@ -404,73 +366,31 @@ function getFilterType(ftype) {
   return typeof ftype === 'number' ? filterTypes[Math.floor(_mod(ftype, filterTypes.length))] : ftype;
 }
 
-//type orbit {
-// gain: number,
-// reverbNode: reverbNode
-// delayNode: delayNode
-//}
-let orbits = {};
-function connectToOrbit(node, orbit) {
-  if (orbits[orbit] == null) {
-    errorLogger(new Error('target orbit does not exist'), 'superdough');
-  }
-  node.connect(orbits[orbit].gain);
-}
-
-function setOrbit(audioContext, orbit, channels) {
-  if (orbits[orbit] == null) {
-    orbits[orbit] = {
-      gain: new GainNode(audioContext, { gain: 1 }),
-    };
-    connectToDestination(orbits[orbit].gain, channels);
-  }
-}
-function duckOrbit(audioContext, targetOrbit, t, attacktime = 0.1, duckdepth = 1) {
-  const targetArr = [targetOrbit].flat();
-
-  targetArr.forEach((target) => {
-    if (orbits[target] == null) {
-      errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
-      return;
-    }
-    webAudioTimeout(
-      audioContext,
-      () => {
-        orbits[target].gain.gain.cancelScheduledValues(t);
-        const currVal = orbits[target].gain.gain.value;
-        orbits[target].gain.gain.linearRampToValueAtTime(clamp(1 - Math.pow(duckdepth, 0.5), 0.01, currVal), t);
-        orbits[target].gain.gain.exponentialRampToValueAtTime(1, t + Math.max(0.002, attacktime));
-      },
-      0,
-      t - 0.01,
-    );
-  });
-}
-
+let reverbs = {};
 let hasChanged = (now, before) => now !== undefined && now !== before;
-function getReverb(orbit, duration, fade, lp, dim, ir) {
+function getReverb(orbit, duration, fade, lp, dim, ir, channels) {
   // If no reverb has been created for a given orbit, create one
-  if (!orbits[orbit].reverbNode) {
+  if (!reverbs[orbit]) {
     const ac = getAudioContext();
     const reverb = ac.createReverb(duration, fade, lp, dim, ir);
-    connectToOrbit(reverb, orbit);
-    orbits[orbit].reverbNode = reverb;
+    connectToDestination(reverb, channels);
+    reverbs[orbit] = reverb;
   }
   if (
-    hasChanged(duration, orbits[orbit].reverbNode.duration) ||
-    hasChanged(fade, orbits[orbit].reverbNode.fade) ||
-    hasChanged(lp, orbits[orbit].reverbNode.lp) ||
-    hasChanged(dim, orbits[orbit].reverbNode.dim) ||
-    orbits[orbit].reverbNode.ir !== ir
+    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
-    orbits[orbit].reverbNode.generate(duration, fade, lp, dim, ir);
+    reverbs[orbit].generate(duration, fade, lp, dim, ir);
   }
-  return orbits[orbit].reverbNode;
+  return reverbs[orbit];
 }
 
 export let analysers = {},
@@ -513,7 +433,8 @@ function effectSend(input, effect, wet) {
 }
 
 export function resetGlobalEffects() {
-  orbits = {};
+  delays = {};
+  reverbs = {};
   analysers = {};
   analysersData = {};
 }
@@ -525,10 +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();
-
+  t = typeof t === 'string' && t.startsWith('=') ? Number(t.slice(1)) : ac.currentTime + t;
   let { stretch } = value;
   if (stretch != null) {
     //account for phase vocoder latency
@@ -554,25 +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,
-    duckattack,
-    duckdepth,
     // filters
     fanchor = getDefaultValue('fanchor'),
     drive = 0.69,
-    release = 0,
     // low pass
     cutoff,
     lpenv,
@@ -605,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,
@@ -616,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,
@@ -636,18 +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;
-  setOrbit(ac, orbit, channels, t, cycle, cps);
-
-  if (duckorbit != null) {
-    duckOrbit(ac, duckorbit, t, duckattack, duckdepth);
-  }
 
   gain = applyGainCurve(nanFallback(gain, 1));
   postgain = applyGainCurve(postgain);
@@ -655,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
@@ -675,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;
@@ -734,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,
@@ -758,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());
@@ -769,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());
@@ -787,33 +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 (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),
@@ -827,19 +706,20 @@ 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) {
-    const delayNode = getDelay(orbit, delaytime, delayfeedback, t, orbitChannels);
-    delaySend = effectSend(post, delayNode, delay);
+    const delyNode = getDelay(orbit, delaytime, delayfeedback, t, orbitChannels);
+    delaySend = effectSend(post, delyNode, delay);
     audioNodes.push(delaySend);
   }
   // reverb
@@ -868,14 +748,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     analyserSend = effectSend(post, analyserNode, 1);
     audioNodes.push(analyserSend);
   }
-  if (dry != null) {
-    dry = applyGainCurve(dry);
-    const dryGain = new GainNode(ac, { gain: dry });
-    chain.push(dryGain);
-    connectToOrbit(dryGain, orbit);
-  } else {
-    connectToOrbit(post, orbit);
-  }
 
   // connect chain elements together
   chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);

packages/superdough/synth.mjs

@@ -1,5 +1,5 @@
 import { clamp, midiToFreq, noteToMidi } from './util.mjs';
-import { registerSound, getAudioContext, soundMap, getLfo } from './superdough.mjs';
+import { registerSound, getAudioContext, getLfo } from './superdough.mjs';
 import {
   applyFM,
   gainNode,
@@ -9,13 +9,12 @@ import {
   getVibratoOscillator,
   webAudioTimeout,
   getWorklet,
-  noises,
 } from './helpers.mjs';
 import { getNoiseMix, getNoiseOscillator } from './noise.mjs';
 
-const getFrequencyFromValue = (value, defaultNote = 36) => {
+const getFrequencyFromValue = (value) => {
   let { note, freq } = value;
-  note = note || defaultNote;
+  note = note || 36;
   if (typeof note === 'string') {
     note = noteToMidi(note); // e.g. c3 => 48
   }
@@ -35,23 +34,7 @@ function destroyAudioWorkletNode(node) {
 }
 
 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);
-  }
-  return curve;
-}
+const noises = ['pink', 'white', 'brown', 'crackle'];
 
 export function registerSynthSounds() {
   [...waveforms].forEach((s) => {
@@ -95,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) => {
@@ -428,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) {

packages/superdough/util.mjs

@@ -68,11 +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;
-}

packages/superdough/worklets.mjs

@@ -8,28 +8,18 @@ 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;
 
-// 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)
@@ -41,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;
@@ -91,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 },
@@ -104,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 },
     ];
   }
 
@@ -124,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];
@@ -140,11 +122,7 @@ 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;
@@ -152,12 +130,12 @@ class LFOProcessor extends AudioWorkletProcessor {
     if (this.phase == null) {
       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);
     }
@@ -313,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;
 
@@ -445,13 +424,18 @@ 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];
@@ -462,6 +446,9 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
 
     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
@@ -469,21 +456,21 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
         gainL = gain2;
         gainR = gain1;
       }
+      // eslint-disable-next-line no-undef
+      const dt = freq / sampleRate;
+
       for (let i = 0; i < output[0].length; i++) {
-        // Main detuning
-        let freq = applySemitoneDetuneToFrequency(params.frequency[i] ?? params.frequency[0], params.detune[0] / 100);
-        // Individual voice detuning
-        freq = 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(freq / sampleRate, 1);
         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;
@@ -492,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) {

packages/supradough/.gitignore

@@ -1 +0,0 @@
-pattern.wav

packages/supradough/README.md

@@ -1,3 +0,0 @@
-# supradough
-
-platform agnostic synth and sampler intended for live coding. a reimplementation of superdough.

packages/supradough/dough-export.mjs

@@ -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));
-});

packages/supradough/dough-worklet.mjs

@@ -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);

packages/supradough/dough.mjs

@@ -1,976 +0,0 @@
-// this is dough, the superdough without dependencies
-const SAMPLE_RATE = typeof sampleRate !== 'undefined' ? sampleRate : 48000;
-const PI_DIV_SR = Math.PI / SAMPLE_RATE;
-const ISR = 1 / SAMPLE_RATE;
-
-let gainCurveFunc = (val) => Math.pow(val, 2);
-
-function applyGainCurve(val) {
-  return gainCurveFunc(val);
-}
-
-/**
- * Equal Power Crossfade function.
- * Smoothly transitions between signals A and B, maintaining consistent perceived loudness.
- *
- * @param {number} a - Signal A (can be a single value or an array value in buffer processing).
- * @param {number} b - Signal B (can be a single value or an array value in buffer processing).
- * @param {number} m - Crossfade parameter (0.0 = all A, 1.0 = all B, 0.5 = equal mix).
- * @returns {number} Crossfaded output value.
- */
-function crossfade(a, b, m) {
-  const aGain = Math.sin((1 - m) * 0.5 * Math.PI);
-  const bGain = Math.sin(m * 0.5 * Math.PI);
-  return a * aGain + b * bGain;
-}
-
-// function setGainCurve(newGainCurveFunc) {
-//   gainCurveFunc = newGainCurveFunc;
-// }
-// https://garten.salat.dev/audio-DSP/oscillators.html
-export class SineOsc {
-  phase = 0;
-  update(freq) {
-    const value = Math.sin(this.phase * 2 * Math.PI);
-    this.phase = (this.phase + freq / SAMPLE_RATE) % 1;
-    return value;
-  }
-}
-
-export class ZawOsc {
-  phase = 0;
-  update(freq) {
-    this.phase += ISR * freq;
-    return (this.phase % 1) * 2 - 1;
-  }
-}
-
-function polyBlep(t, dt) {
-  // 0 <= t < 1
-  if (t < dt) {
-    t /= dt;
-    // 2 * (t - t^2/2 - 0.5)
-    return t + t - t * t - 1;
-  }
-  // -1 < t < 0
-  if (t > 1 - dt) {
-    t = (t - 1) / dt;
-    // 2 * (t^2/2 + t + 0.5)
-    return t * t + t + t + 1;
-  }
-  // 0 otherwise
-  return 0;
-}
-
-export class SawOsc {
-  constructor(props = {}) {
-    this.phase = props.phase ?? 0;
-  }
-  update(freq) {
-    const dt = freq / SAMPLE_RATE;
-    let p = polyBlep(this.phase, dt);
-    let s = 2 * this.phase - 1 - p;
-    this.phase += dt;
-    if (this.phase > 1) {
-      this.phase -= 1;
-    }
-    return s;
-  }
-}
-
-function getUnisonDetune(unison, detune, voiceIndex) {
-  if (unison < 2) {
-    return 0;
-  }
-  const lerp = (a, b, n) => {
-    return n * (b - a) + a;
-  };
-  return lerp(-detune * 0.5, detune * 0.5, voiceIndex / (unison - 1));
-}
-function applySemitoneDetuneToFrequency(frequency, detune) {
-  return frequency * Math.pow(2, detune / 12);
-}
-export class SupersawOsc {
-  constructor(props = {}) {
-    //TODO: figure out a good way to pass in these params
-    this.voices = props.voices ?? 5;
-    this.freqspread = props.freqspread ?? 0.2;
-    this.panspread = props.panspread ?? 0.4;
-    this.phase = new Float32Array(this.voices).map(() => Math.random());
-  }
-  update(freq) {
-    const gain1 = Math.sqrt(1 - this.panspread);
-    const gain2 = Math.sqrt(this.panspread);
-    let sl = 0;
-    let sr = 0;
-    for (let n = 0; n < this.voices; n++) {
-      const freqAdjusted = applySemitoneDetuneToFrequency(freq, getUnisonDetune(this.voices, this.freqspread, n));
-      const dt = freqAdjusted / SAMPLE_RATE;
-      const isOdd = (n & 1) == 1;
-      let gainL = gain1;
-      let gainR = gain2;
-      // invert right and left gain
-      if (isOdd) {
-        gainL = gain2;
-        gainR = gain1;
-      }
-      let p = polyBlep(this.phase[n], dt);
-      let s = 2 * this.phase[n] - 1 - p;
-      sl = sl + s * gainL;
-      sr = sr + s * gainL;
-
-      this.phase[n] += dt;
-      if (this.phase[n] > 1) {
-        this.phase[n] -= 1;
-      }
-    }
-
-    return sl + sr;
-    //TODO: make stereo
-    // return [sl, sr];
-  }
-}
-
-export class TriOsc {
-  phase = 0;
-  update(freq) {
-    this.phase += ISR * freq;
-    let phase = this.phase % 1;
-    let value = phase < 0.5 ? 2 * phase : 1 - 2 * (phase - 0.5);
-    return value * 2 - 1;
-  }
-}
-
-export class TwoPoleFilter {
-  s0 = 0;
-  s1 = 0;
-  update(s, cutoff, resonance = 0) {
-    // Out of bound values can produce NaNs
-    resonance = Math.max(resonance, 0);
-
-    cutoff = Math.min(cutoff, 20000);
-    const c = 2 * Math.sin(cutoff * PI_DIV_SR);
-
-    const r = Math.pow(0.5, (resonance + 0.125) / 0.125);
-    const mrc = 1 - r * c;
-
-    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 PulseOsc {
-  constructor(phase = 0) {
-    this.phase = phase;
-  }
-  saw(offset, dt) {
-    let phase = (this.phase + offset) % 1;
-    let p = polyBlep(phase, dt);
-    return 2 * phase - 1 - p;
-  }
-  update(freq, pw = 0.5) {
-    const dt = freq / SAMPLE_RATE;
-    let pulse = this.saw(0, dt) - this.saw(pw, dt);
-    this.phase = (this.phase + dt) % 1;
-    return pulse + pw * 2 - 1;
-  }
-}
-
-// non bandlimited (has aliasing)
-export class PulzeOsc {
-  phase = 0;
-  update(freq, duty = 0.5) {
-    this.phase += ISR * freq;
-    let cyclePos = this.phase % 1;
-    return cyclePos < duty ? 1 : -1;
-  }
-}
-
-export class Dust {
-  update = (density) => (Math.random() < density * ISR ? Math.random() : 0);
-}
-
-export class WhiteNoise {
-  update() {
-    return Math.random() * 2 - 1;
-  }
-}
-
-export class BrownNoise {
-  constructor() {
-    this.out = 0;
-  }
-  update() {
-    let white = Math.random() * 2 - 1;
-    this.out = (this.out + 0.02 * white) / 1.02;
-    return this.out;
-  }
-}
-
-export class PinkNoise {
-  constructor() {
-    this.b0 = 0;
-    this.b1 = 0;
-    this.b2 = 0;
-    this.b3 = 0;
-    this.b4 = 0;
-    this.b5 = 0;
-    this.b6 = 0;
-  }
-
-  update() {
-    const white = Math.random() * 2 - 1;
-
-    this.b0 = 0.99886 * this.b0 + white * 0.0555179;
-    this.b1 = 0.99332 * this.b1 + white * 0.0750759;
-    this.b2 = 0.969 * this.b2 + white * 0.153852;
-    this.b3 = 0.8665 * this.b3 + white * 0.3104856;
-    this.b4 = 0.55 * this.b4 + white * 0.5329522;
-    this.b5 = -0.7616 * this.b5 - white * 0.016898;
-
-    const pink = this.b0 + this.b1 + this.b2 + this.b3 + this.b4 + this.b5 + this.b6 + white * 0.5362;
-    this.b6 = white * 0.115926;
-
-    return pink * 0.11;
-  }
-}
-
-export class Impulse {
-  phase = 1;
-  update(freq) {
-    this.phase += ISR * freq;
-    let v = this.phase >= 1 ? 1 : 0;
-    this.phase = this.phase % 1;
-    return v;
-  }
-}
-
-export class ClockDiv {
-  inSgn = true;
-  outSgn = true;
-  clockCnt = 0;
-  update(clock, factor) {
-    let curSgn = clock > 0;
-    if (this.inSgn != curSgn) {
-      this.clockCnt++;
-      if (this.clockCnt >= factor) {
-        this.clockCnt = 0;
-        this.outSgn = !this.outSgn;
-      }
-    }
-
-    this.inSgn = curSgn;
-    return this.outSgn ? 1 : -1;
-  }
-}
-
-export class Hold {
-  value = 0;
-  trigSgn = false;
-  update(input, trig) {
-    if (!this.trigSgn && trig > 0) this.value = input;
-    this.trigSgn = trig > 0;
-    return this.value;
-  }
-}
-
-function lerp(x, y0, y1, exponent = 1) {
-  if (x <= 0) return y0;
-  if (x >= 1) return y1;
-
-  let curvedX;
-
-  if (exponent === 0) {
-    curvedX = x; // linear
-  } else if (exponent > 0) {
-    curvedX = Math.pow(x, exponent); // ease-in
-  } else {
-    curvedX = 1 - Math.pow(1 - x, -exponent); // ease-out
-  }
-
-  return y0 + (y1 - y0) * curvedX;
-}
-
-export class ADSR {
-  constructor(props = {}) {
-    this.state = 'off';
-    this.startTime = 0;
-    this.startVal = 0;
-    this.decayCurve = props.decayCurve ?? 1;
-  }
-
-  update(curTime, gate, attack, decay, susVal, release) {
-    switch (this.state) {
-      case 'off': {
-        if (gate > 0) {
-          this.state = 'attack';
-          this.startTime = curTime;
-          this.startVal = 0;
-        }
-        return 0;
-      }
-      case 'attack': {
-        let time = curTime - this.startTime;
-        if (time > attack) {
-          this.state = 'decay';
-          this.startTime = curTime;
-          return 1;
-        }
-        return lerp(time / attack, this.startVal, 1, 1);
-      }
-      case 'decay': {
-        let time = curTime - this.startTime;
-        let curVal = lerp(time / decay, 1, susVal, -this.decayCurve);
-        if (gate <= 0) {
-          this.state = 'release';
-          this.startTime = curTime;
-          this.startVal = curVal;
-          return curVal;
-        }
-        if (time > decay) {
-          this.state = 'sustain';
-          this.startTime = curTime;
-          return susVal;
-        }
-        return curVal;
-      }
-      case 'sustain': {
-        if (gate <= 0) {
-          this.state = 'release';
-          this.startTime = curTime;
-          this.startVal = susVal;
-        }
-        return susVal;
-      }
-      case 'release': {
-        let time = curTime - this.startTime;
-
-        if (time > release) {
-          this.state = 'off';
-          return 0;
-        }
-        let curVal = lerp(time / release, this.startVal, 0, -this.decayCurve);
-        if (gate > 0) {
-          this.state = 'attack';
-          this.startTime = curTime;
-          this.startVal = curVal;
-        }
-        return curVal;
-      }
-    }
-    throw 'invalid envelope state';
-  }
-}
-
-/*
-        impulse(1).ad(.1).mul(sine(200))
-.add(x=>x.delay(.1).mul(.8))
-.out()*/
-const MAX_DELAY_TIME = 10;
-export class PitchDelay {
-  lpf = new TwoPoleFilter();
-  constructor(_props = {}) {
-    this.buffer = new Float32Array(MAX_DELAY_TIME * SAMPLE_RATE);
-    this.writeIdx = 0;
-    this.readIdx = 0;
-    this.numSamples = 0;
-  }
-  write(s, delayTime) {
-    // Calculate how far in the past to read
-    this.numSamples = Math.min(Math.floor(SAMPLE_RATE * delayTime), this.buffer.length - 1);
-    this.writeIdx = (this.writeIdx + 1) % this.numSamples;
-    this.buffer[this.writeIdx] = s;
-    this.readIdx = this.writeIdx - this.numSamples + 1;
-
-    // If past the start of the buffer, wrap around (Q: is this possible?)
-    if (this.readIdx < 0) this.readIdx += this.numSamples;
-  }
-  update(input, delayTime, speed = 1) {
-    this.write(input, delayTime);
-    let index = this.readIdx;
-    if (speed < 0) {
-      index = this.numSamples - Math.floor(Math.abs(this.readIdx * speed) % this.numSamples);
-    } else {
-      index = Math.floor(this.readIdx * speed) % this.numSamples;
-    }
-    const s = this.lpf.update(this.buffer[index], 0.9, 0);
-
-    return s;
-  }
-}
-
-export class Delay {
-  writeIdx = 0;
-  readIdx = 0;
-  buffer = new Float32Array(MAX_DELAY_TIME * SAMPLE_RATE); //.fill(0)
-  write(s, delayTime) {
-    this.writeIdx = (this.writeIdx + 1) % this.buffer.length;
-    this.buffer[this.writeIdx] = s;
-    // Calculate how far in the past to read
-    let numSamples = Math.min(Math.floor(SAMPLE_RATE * delayTime), this.buffer.length - 1);
-    this.readIdx = this.writeIdx - numSamples;
-    // If past the start of the buffer, wrap around
-    if (this.readIdx < 0) this.readIdx += this.buffer.length;
-  }
-  update(input, delayTime) {
-    this.write(input, delayTime);
-    return this.buffer[this.readIdx];
-  }
-}
-//TODO: Figure out why clicking at the start off the buffer
-export class Chorus {
-  delay = new Delay();
-  modulator = new TriOsc();
-  update(input, mix, delayTime, modulationFreq, modulationDepth) {
-    const m = this.modulator.update(modulationFreq) * modulationDepth;
-    const c = this.delay.update(input, delayTime * (1 + m));
-    return crossfade(input, c, mix);
-  }
-}
-
-export class Fold {
-  update(input = 0, rate = 0) {
-    if (rate < 0) rate = 0;
-    rate = rate + 1;
-    input = input * rate;
-    return 4 * (Math.abs(0.25 * input + 0.25 - Math.round(0.25 * input + 0.25)) - 0.25);
-  }
-}
-
-export class Lag {
-  lagUnit = 4410;
-  s = 0;
-  update(input, rate) {
-    // Remap so the useful range is around [0, 1]
-    rate = rate * this.lagUnit;
-    if (rate < 1) rate = 1;
-    this.s += (1 / rate) * (input - this.s);
-    return this.s;
-  }
-}
-
-export class Slew {
-  last = 0;
-  update(input, up, dn) {
-    const upStep = up * ISR;
-    const downStep = dn * ISR;
-    let delta = input - this.last;
-    if (delta > upStep) {
-      delta = upStep;
-    } else if (delta < -downStep) {
-      delta = -downStep;
-    }
-    this.last += delta;
-    return this.last;
-  }
-}
-
-// overdrive style distortion (adapted from noisecraft) currently unused
-export function applyDistortion(x, amount) {
-  amount = Math.min(Math.max(amount, 0), 1);
-  amount -= 0.01;
-  var k = (2 * amount) / (1 - amount);
-  var y = ((1 + k) * x) / (1 + k * Math.abs(x));
-  return y;
-}
-
-export class Sequence {
-  clockSgn = true;
-  step = 0;
-  first = true;
-  update(clock, ...ins) {
-    if (!this.clockSgn && clock > 0) {
-      this.step = (this.step + 1) % ins.length;
-      this.clockSgn = clock > 0;
-      return 0; // set first sample to zero to retrigger gates on step change...
-    }
-    this.clockSgn = clock > 0;
-    return ins[this.step];
-  }
-}
-
-// sample rate bit crusher
-export class Coarse {
-  hold = 0;
-  t = 0;
-  update(input, coarse) {
-    if (this.t++ % coarse === 0) {
-      this.t = 0;
-      this.hold = input;
-    }
-    return this.hold;
-  }
-}
-
-// amplitude bit crusher
-export class Crush {
-  update(input, crush) {
-    crush = Math.max(1, crush);
-    const x = Math.pow(2, crush - 1);
-    return Math.round(input * x) / x;
-  }
-}
-
-// this is the distort from superdough
-export class Distort {
-  update(input, distort = 0, postgain = 1) {
-    postgain = Math.max(0.001, Math.min(1, postgain));
-    const shape = Math.expm1(distort);
-    return (((1 + shape) * input) / (1 + shape * Math.abs(input))) * postgain;
-  }
-}
-// distortion could be expressed as a function, because it's stateless
-
-export class BufferPlayer {
-  static samples = new Map(); // string -> { channels, sampleRate }
-  buffer; // Float32Array
-  sampleRate;
-  pos = 0;
-  sampleFreq = note2freq();
-  constructor(buffer, sampleRate, normalize) {
-    this.buffer = buffer;
-    this.sampleRate = sampleRate;
-    this.duration = this.buffer.length / this.sampleRate;
-    this.speed = SAMPLE_RATE / this.sampleRate;
-    if (normalize) {
-      // this will make the buffer last 1s if freq = sampleFreq
-      // it's useful to loop samples (e.g. fit function)
-      this.speed *= this.duration;
-    }
-  }
-  update(freq) {
-    if (this.pos >= this.buffer.length) {
-      return 0;
-    }
-    const speed = (freq / this.sampleFreq) * this.speed;
-    let s = this.buffer[Math.floor(this.pos)];
-    this.pos = this.pos + speed;
-    return s;
-  }
-}
-
-export function _rangex(sig, min, max) {
-  let logmin = Math.log(min);
-  let range = Math.log(max) - logmin;
-  const unipolar = (sig + 1) / 2;
-  return Math.exp(unipolar * range + logmin);
-}
-
-// duplicate
-export const getADSR = (params, curve = 'linear', defaultValues) => {
-  const envmin = curve === 'exponential' ? 0.001 : 0.001;
-  const releaseMin = 0.01;
-  const envmax = 1;
-  const [a, d, s, r] = params;
-  if (a == null && d == null && s == null && r == null) {
-    return defaultValues ?? [envmin, envmin, envmax, releaseMin];
-  }
-  const sustain = s != null ? s : (a != null && d == null) || (a == null && d == null) ? envmax : envmin;
-  return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)];
-};
-
-let shapes = {
-  sine: SineOsc,
-  saw: SawOsc,
-  zaw: ZawOsc,
-  sawtooth: SawOsc,
-  zawtooth: ZawOsc,
-  supersaw: SupersawOsc,
-  tri: TriOsc,
-  triangle: TriOsc,
-  pulse: PulseOsc,
-  square: PulseOsc,
-  pulze: PulzeOsc,
-  dust: Dust,
-  crackle: Dust,
-  impulse: Impulse,
-  white: WhiteNoise,
-  brown: BrownNoise,
-  pink: PinkNoise,
-};
-
-const defaultDefaultValues = {
-  chorus: 0,
-  note: 48,
-  s: 'triangle',
-  bank: '',
-  gain: 1,
-  postgain: 1,
-  velocity: 1,
-  density: '.03',
-  ftype: '12db',
-  fanchor: 0,
-  //resonance: 1, // superdough resonance is scaled differently
-  resonance: 0,
-  //hresonance: 1, // superdough resonance is scaled differently
-  hresonance: 0,
-  // bandq: 1,  // superdough resonance is scaled differently
-  bandq: 0,
-  channels: [1, 2],
-  phaserdepth: 0.75,
-  shapevol: 1,
-  distortvol: 1,
-  delay: 0,
-  byteBeatExpression: '0',
-  delayfeedback: 0.5,
-  delayspeed: 1,
-  delaytime: 0.25,
-  orbit: 1,
-  i: 1,
-  fft: 8,
-  z: 'triangle',
-  pan: 0.5,
-  fmh: 1,
-  fmenv: 0, // differs from superdough
-  speed: 1,
-  pw: 0.5,
-};
-
-let getDefaultValue = (key) => defaultDefaultValues[key];
-
-const chromas = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
-const accs = { '#': 1, b: -1, s: 1, f: -1 };
-const note2midi = (note, defaultOctave = 3) => {
-  let [pc, acc = '', oct = ''] =
-    String(note)
-      .match(/^([a-gA-G])([#bsf]*)([0-9]*)$/)
-      ?.slice(1) || [];
-  if (!pc) {
-    throw new Error('not a note: "' + note + '"');
-  }
-  const chroma = chromas[pc.toLowerCase()];
-  const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
-  oct = Number(oct || defaultOctave);
-  return (oct + 1) * 12 + chroma + offset;
-};
-const midi2freq = (midi) => Math.pow(2, (midi - 69) / 12) * 440;
-const note2freq = (note) => {
-  note = note || getDefaultValue('note');
-  if (typeof note === 'string') {
-    note = note2midi(note, 3); // e.g. c3 => 48
-  }
-  return midi2freq(note);
-};
-
-export class DoughVoice {
-  out = [0, 0];
-  constructor(value) {
-    value.freq ??= note2freq(value.note);
-    let $ = this;
-    Object.assign($, value);
-    $.s = $.s ?? getDefaultValue('s');
-    $.gain = applyGainCurve($.gain ?? getDefaultValue('gain'));
-    $.velocity = applyGainCurve($.velocity ?? getDefaultValue('velocity'));
-    $.postgain = applyGainCurve($.postgain ?? getDefaultValue('postgain'));
-    $.density = $.density ?? getDefaultValue('density');
-    $.fanchor = $.fanchor ?? getDefaultValue('fanchor');
-    $.drive = $.drive ?? 0.69;
-    $.phaserdepth = $.phaserdepth ?? getDefaultValue('phaserdepth');
-    $.shapevol = applyGainCurve($.shapevol ?? getDefaultValue('shapevol'));
-    $.distortvol = applyGainCurve($.distortvol ?? getDefaultValue('distortvol'));
-    $.i = $.i ?? getDefaultValue('i');
-    $.chorus = $.chorus ?? getDefaultValue('chorus');
-    $.fft = $.fft ?? getDefaultValue('fft');
-    $.pan = $.pan ?? getDefaultValue('pan');
-    $.orbit = $.orbit ?? getDefaultValue('orbit');
-    $.fmenv = $.fmenv ?? getDefaultValue('fmenv');
-    $.resonance = $.resonance ?? getDefaultValue('resonance');
-    $.hresonance = $.hresonance ?? getDefaultValue('hresonance');
-    $.bandq = $.bandq ?? getDefaultValue('bandq');
-    $.speed = $.speed ?? getDefaultValue('speed');
-    $.pw = $.pw ?? getDefaultValue('pw');
-
-    [$.attack, $.decay, $.sustain, $.release] = getADSR([$.attack, $.decay, $.sustain, $.release]);
-
-    $._holdEnd = $._begin + $._duration; // needed for gate
-    $._end = $._holdEnd + $.release + 0.01; // needed for despawn
-
-    if ($.fmi && ($.s === 'saw' || $.s === 'sawtooth')) {
-      $.s = 'zaw'; // polyblepped saw when fm is applied
-    }
-
-    if (shapes[$.s]) {
-      const SourceClass = shapes[$.s];
-      $._sound = new SourceClass();
-      $._channels = 1;
-    } else if (BufferPlayer.samples.has($.s)) {
-      const sample = BufferPlayer.samples.get($.s);
-      $._buffers = [];
-      $._channels = sample.channels.length;
-      for (let i = 0; i < $._channels; i++) {
-        $._buffers.push(new BufferPlayer(sample.channels[i], sample.sampleRate, $.unit === 'c')); // tbd unit === 'c'
-      }
-    } else {
-      console.warn('sound not loaded', $.s);
-    }
-
-    if ($.penv) {
-      $._penv = new ADSR({ decayCurve: 4 });
-      [$.pattack, $.pdecay, $.psustain, $.prelease] = getADSR([$.pattack, $.pdecay, $.psustain, $.prelease]);
-    }
-
-    if ($.vib) {
-      $._vib = new SineOsc();
-      $.vibmod = $.vibmod ?? getDefaultValue('vibmod');
-    }
-
-    if ($.fmi) {
-      $._fm = new SineOsc();
-      $.fmh = $.fmh ?? getDefaultValue('fmh');
-      if ($.fmenv) {
-        $._fmenv = new ADSR({ decayCurve: 2 });
-        [$.fmattack, $.fmdecay, $.fmsustain, $.fmrelease] = getADSR([$.fmattack, $.fmdecay, $.fmsustain, $.fmrelease]);
-      }
-    }
-
-    // gain envelope
-    $._adsr = new ADSR({ decayCurve: 2 });
-    // delay
-    $.delay = applyGainCurve($.delay ?? getDefaultValue('delay'));
-    $.delayfeedback = $.delayfeedback ?? getDefaultValue('delayfeedback');
-    $.delayspeed = $.delayspeed ?? getDefaultValue('delayspeed');
-    $.delaytime = $.delaytime ?? getDefaultValue('delaytime');
-
-    // filter setup
-    if ($.lpenv) {
-      $._lpenv = new ADSR({ decayCurve: 4 });
-      [$.lpattack, $.lpdecay, $.lpsustain, $.lprelease] = getADSR([$.lpattack, $.lpdecay, $.lpsustain, $.lprelease]);
-    }
-    if ($.hpenv) {
-      $._hpenv = new ADSR({ decayCurve: 4 });
-      [$.hpattack, $.hpdecay, $.hpsustain, $.hprelease] = getADSR([$.hpattack, $.hpdecay, $.hpsustain, $.hprelease]);
-    }
-    if ($.bpenv) {
-      $._bpenv = new ADSR({ decayCurve: 4 });
-      [$.bpattack, $.bpdecay, $.bpsustain, $.bprelease] = getADSR([$.bpattack, $.bpdecay, $.bpsustain, $.bprelease]);
-    }
-
-    // channelwise effects setup
-    $._chorus = $.chorus ? [] : null;
-    $._lpf = $.cutoff ? [] : null;
-    $._hpf = $.hcutoff ? [] : null;
-    $._bpf = $.bandf ? [] : null;
-    $._coarse = $.coarse ? [] : null;
-    $._crush = $.crush ? [] : null;
-    $._distort = $.distort ? [] : null;
-    for (let i = 0; i < this._channels; i++) {
-      $._lpf?.push(new TwoPoleFilter());
-      $._hpf?.push(new TwoPoleFilter());
-      $._bpf?.push(new TwoPoleFilter());
-      $._chorus?.push(new Chorus());
-      $._coarse?.push(new Coarse());
-      $._crush?.push(new Crush());
-      $._distort?.push(new Distort());
-    }
-  }
-  update(t) {
-    if (!this._sound && !this._buffers) {
-      return 0;
-    }
-    let gate = Number(t >= this._begin && t <= this._holdEnd);
-
-    let freq = this.freq * this.speed;
-
-    // frequency modulation
-    if (this._fm) {
-      let fmi = this.fmi;
-      if (this._fmenv) {
-        const env = this._fmenv.update(t, gate, this.fmattack, this.fmdecay, this.fmsustain, this.fmrelease);
-        fmi = this.fmenv * env * fmi;
-      }
-      const modfreq = freq * this.fmh;
-      const modgain = modfreq * fmi;
-      freq = freq + this._fm.update(modfreq) * modgain;
-    }
-
-    // vibrato
-    if (this._vib) {
-      freq = freq * 2 ** ((this._vib.update(this.vib) * this.vibmod) / 12);
-    }
-
-    // pitch envelope
-    if (this._penv) {
-      const env = this._penv.update(t, gate, this.pattack, this.pdecay, this.psustain, this.prelease);
-      freq = freq + env * this.penv;
-    }
-
-    // filters
-    let lpf = this.cutoff;
-    if (this._lpf) {
-      if (this._lpenv) {
-        const env = this._lpenv.update(t, gate, this.lpattack, this.lpdecay, this.lpsustain, this.lprelease);
-        lpf = this.lpenv * env * lpf + lpf;
-      }
-    }
-    let hpf = this.hcutoff;
-    if (this._hpf) {
-      if (this._hpenv) {
-        const env = this._hpenv.update(t, gate, this.hpattack, this.hpdecay, this.hpsustain, this.hprelease);
-        hpf = 2 ** this.hpenv * env * hpf + hpf;
-      }
-    }
-    let bpf = this.bandf;
-    if (this._bpf) {
-      if (this._bpenv) {
-        const env = this._bpenv.update(t, gate, this.bpattack, this.bpdecay, this.bpsustain, this.bprelease);
-        bpf = 2 ** this.bpenv * env * bpf + bpf;
-      }
-    }
-    // gain envelope
-    const env = this._adsr.update(t, gate, this.attack, this.decay, this.sustain, this.release);
-
-    // channelwise dsp
-    for (let i = 0; i < this._channels; i++) {
-      // sound source
-      if (this._sound && this.s === 'pulse') {
-        this.out[i] = this._sound.update(freq, this.pw);
-      } else if (this._sound) {
-        this.out[i] = this._sound.update(freq);
-      } else if (this._buffers) {
-        this.out[i] = this._buffers[i].update(freq);
-      }
-      this.out[i] = this.out[i] * this.gain * this.velocity;
-      if (this._chorus) {
-        const c = this._chorus[i].update(this.out[i], this.chorus, 0.03 + 0.05 * i, 1, 0.11);
-        this.out[i] = c + this.out[i];
-      }
-
-      if (this._lpf) {
-        this._lpf[i].update(this.out[i], lpf, this.resonance);
-        this.out[i] = this._lpf[i].s1;
-      }
-      if (this._hpf) {
-        this._hpf[i].update(this.out[i], hpf, this.hresonance);
-        this.out[i] = this.out[i] - this._hpf[i].s1;
-      }
-      if (this._bpf) {
-        this._bpf[i].update(this.out[i], bpf, this.bandq);
-        this.out[i] = this._bpf[i].s0;
-      }
-      if (this._coarse) {
-        this.out[i] = this._coarse[i].update(this.out[i], this.coarse);
-      }
-      if (this._crush) {
-        this.out[i] = this._crush[i].update(this.out[i], this.crush);
-      }
-      if (this._distort) {
-        this.out[i] = this._distort[i].update(this.out[i], this.distort, this.distortvol);
-      }
-      this.out[i] = this.out[i] * env;
-      this.out[i] = this.out[i] * this.postgain;
-      if (!this._buffers) {
-        this.out[i] = this.out[i] * 0.2; // turn down waveform
-      }
-    }
-    if (this._channels === 1) {
-      this.out[1] = this.out[0];
-    }
-    if (this.pan !== 0.5) {
-      const panpos = (this.pan * Math.PI) / 2;
-      this.out[0] = this.out[0] * Math.cos(panpos);
-      this.out[1] = this.out[1] * Math.sin(panpos);
-    }
-  }
-}
-
-// this class is the interface to the "outer world"
-// it handles spawning and despawning of DoughVoice's
-export class Dough {
-  voices = []; // DoughVoice[]
-  vid = 0;
-  q = [];
-  out = [0, 0];
-  delaysend = [0, 0];
-  delaytime = getDefaultValue('delaytime');
-  delayfeedback = getDefaultValue('delayfeedback');
-  delayspeed = getDefaultValue('delayspeed');
-  t = 0;
-  // sampleRate: number, currentTime: number (seconds)
-  constructor(sampleRate = 48000, currentTime = 0) {
-    this.sampleRate = sampleRate;
-    this.t = Math.floor(currentTime * sampleRate); // samples
-    // console.log('init dough', this.sampleRate, this.t);
-    this._delayL = new PitchDelay();
-    this._delayR = new PitchDelay();
-  }
-  loadSample(name, channels, sampleRate) {
-    BufferPlayer.samples.set(name, { channels, sampleRate });
-  }
-  scheduleSpawn(value) {
-    if (value._begin === undefined) {
-      throw new Error('[dough]: scheduleSpawn expected _begin to be set');
-    }
-    if (value._duration === undefined) {
-      throw new Error('[dough]: scheduleSpawn expected _duration to be set');
-    }
-    value.sampleRate = this.sampleRate;
-    // convert seconds to samples
-    const time = Math.floor(value._begin * this.sampleRate); // set from supradough.mjs
-    this.schedule({ time, type: 'spawn', arg: value });
-  }
-  spawn(value) {
-    value.id = this.vid++;
-    const voice = new DoughVoice(value);
-    this.voices.push(voice);
-    // console.log('spawn', voice.id, 'voices:', this.voices.length);
-    // schedule removal
-    const endTime = Math.ceil(voice._end * this.sampleRate);
-    this.schedule({ time: endTime /* + 48000 */, type: 'despawn', arg: voice.id });
-  }
-  despawn(vid) {
-    this.voices = this.voices.filter((v) => v.id !== vid);
-    // console.log('despawn', vid, 'voices:', this.voices.length);
-  }
-  // schedules a function call with a single argument
-  // msg = {time:number,type:string, arg: any}
-  // the Dough method "type" will be called with "arg" at "time"
-  schedule(msg) {
-    if (!this.q.length) {
-      // if empty, just push
-      this.q.push(msg);
-      return;
-    }
-    // not empty
-    // find index where msg.time fits in
-    let i = 0;
-    while (i < this.q.length && this.q[i].time < msg.time) {
-      i++;
-    }
-    // this ensures q stays sorted by time, so we only need to check q[0]
-    this.q.splice(i, 0, msg);
-  }
-  // maybe update should be called once per block instead for perf reasons?
-  update() {
-    // go over q
-    while (this.q.length > 0 && this.q[0].time <= this.t) {
-      // console.log('schedule', this.q[0]);
-      // trigger due messages. q is sorted, so we only need to check q[0]
-      this[this.q[0].type](this.q[0].arg); // type is expected to be a Dough method
-      this.q.shift();
-    }
-    // add active voices
-    this.out[0] = 0;
-    this.out[1] = 0;
-    for (let v = 0; v < this.voices.length; v++) {
-      this.voices[v].update(this.t / this.sampleRate);
-      this.out[0] += this.voices[v].out[0];
-      this.out[1] += this.voices[v].out[1];
-      if (this.voices[v].delay) {
-        this.delaysend[0] += this.voices[v].out[0] * this.voices[v].delay;
-        this.delaysend[1] += this.voices[v].out[1] * this.voices[v].delay;
-        this.delaytime = this.voices[v].delaytime; // we trust that these are initialized in the voice
-        this.delayspeed = this.voices[v].delayspeed; // we trust that these are initialized in the voice
-        this.delayfeedback = this.voices[v].delayfeedback;
-      }
-    }
-    // todo: how to change delaytime / delayfeedback from a voice?
-    const delayL = this._delayL.update(this.delaysend[0], this.delaytime, this.delayspeed);
-    const delayR = this._delayR.update(this.delaysend[1], this.delaytime, this.delayspeed);
-    this.delaysend[0] = delayL * this.delayfeedback;
-    this.delaysend[1] = delayR * this.delayfeedback;
-    this.out[0] += delayL;
-    this.out[1] += delayR;
-    this.t++;
-  }
-}

packages/supradough/index.mjs

@@ -1,4 +0,0 @@
-import _workletUrl from './dough-worklet.mjs?url'; // todo: change ?url to ?audioworklet before build (?audioworklet doesn't hot reload)
-
-export * from './dough.mjs';
-export const workletUrl = _workletUrl;

packages/supradough/package.json

@@ -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": {}
-}

packages/tonal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/tonal",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Tonal functions for strudel",
   "main": "index.mjs",
   "publishConfig": {

packages/tonal/test/tonal.test.mjs

@@ -25,35 +25,28 @@ describe('tonal', () => {
   });
   it('scale with n values', () => {
     expect(
-      n(seq(0, 1, 2))
+      n(0, 1, 2)
         .scale('C major')
         .firstCycleValues.map((h) => h.note),
     ).toEqual(['C3', 'D3', 'E3']);
   });
   it('scale with colon', () => {
     expect(
-      n(seq(0, 1, 2))
+      n(0, 1, 2)
         .scale('C:major')
         .firstCycleValues.map((h) => h.note),
     ).toEqual(['C3', 'D3', 'E3']);
   });
-  it('scale without tonic', () => {
-    expect(
-      n(seq(0, 1, 2))
-        .scale('major')
-        .firstCycleValues.map((h) => h.note),
-    ).toEqual(['C3', 'D3', 'E3']);
-  });
   it('scale with mininotation colon', () => {
     expect(
-      n(seq(0, 1, 2))
+      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(seq(40, 40, 40))
+      note(40, 40, 40)
         .transpose(0, 1, 2)
         .firstCycleValues.map((h) => h.note),
     ).toEqual([40, 41, 42]);
@@ -61,7 +54,7 @@ describe('tonal', () => {
   });
   it('transposes note numbers with interval strings', () => {
     expect(
-      note(seq(40, 40, 40))
+      note(40, 40, 40)
         .transpose('1P', '2M', '3m')
         .firstCycleValues.map((h) => h.note),
     ).toEqual([40, 42, 43]);
@@ -69,7 +62,7 @@ describe('tonal', () => {
   });
   it('transposes note strings with interval numbers', () => {
     expect(
-      note(seq('c', 'c', 'c'))
+      note('c', 'c', 'c')
         .transpose(0, 1, 2)
         .firstCycleValues.map((h) => h.note),
     ).toEqual(['C', 'Db', 'D']);
@@ -77,7 +70,7 @@ describe('tonal', () => {
   });
   it('transposes note strings with interval strings', () => {
     expect(
-      note(seq('c', 'c', 'c'))
+      note('c', 'c', 'c')
         .transpose('1P', '2M', '3m')
         .firstCycleValues.map((h) => h.note),
     ).toEqual(['C', 'D', 'Eb']);

packages/tonal/tonal.mjs

@@ -14,7 +14,7 @@ function scaleStep(step, scale) {
   scale = scale.replaceAll(':', ' ');
   step = Math.ceil(step);
   let { intervals, tonic, empty } = Scale.get(scale);
-  if ((empty && isNote(scale)) || (empty && !tonic)) {
+  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}"`);
@@ -88,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') {
@@ -143,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')
@@ -151,25 +149,22 @@ 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));
-    });
-  },
-);
+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');
+    }
+    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). Also sets scale for other scale operations, like {@link Pattern#scaleTranspose}.

packages/transpiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/transpiler",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Transpiler for strudel user code. Converts syntactically correct but semantically meaningless JS into evaluatable strudel code.",
   "main": "index.mjs",
   "type": "module",

packages/transpiler/transpiler.mjs

@@ -8,16 +8,6 @@ export function registerWidgetType(type) {
   widgetMethods.push(type);
 }
 
-let languages = new Map();
-// config = { getLocations: (code: string, offset?: number) => number[][] }
-// see mondough.mjs for example use
-// the language will kick in when the code contains a template literal of type
-// example: mondo`...` will use language of type "mondo"
-// TODO: refactor tidal.mjs to use this
-export function registerLanguage(type, config) {
-  languages.set(type, config);
-}
-
 export function transpiler(input, options = {}) {
   const { wrapAsync = false, addReturn = true, emitMiniLocations = true, emitWidgets = true } = options;
 
@@ -29,33 +19,14 @@ export function transpiler(input, options = {}) {
 
   let miniLocations = [];
   const collectMiniLocations = (value, node) => {
-    const minilang = languages.get('minilang');
-    if (minilang) {
-      const code = `[${value}]`;
-      const locs = minilang.getLocations(code, node.start);
-      miniLocations = miniLocations.concat(locs);
-    } else {
-      const leafLocs = getLeafLocations(`"${value}"`, node.start, input);
-      miniLocations = miniLocations.concat(leafLocs);
-    }
+    const leafLocs = getLeafLocations(`"${value}"`, node.start, input);
+    miniLocations = miniLocations.concat(leafLocs);
   };
   let widgets = [];
 
   walk(ast, {
     enter(node, parent /* , prop, index */) {
-      if (isLanguageLiteral(node)) {
-        const { name } = node.tag;
-        const language = languages.get(name);
-        const code = node.quasi.quasis[0].value.raw;
-        const offset = node.quasi.start + 1;
-        if (emitMiniLocations) {
-          const locs = language.getLocations(code, offset);
-          miniLocations = miniLocations.concat(locs);
-        }
-        this.skip();
-        return this.replace(languageWithLocation(name, code, offset));
-      }
-      if (isTemplateLiteral(node, 'tidal')) {
+      if (isTidalTeplateLiteral(node)) {
         const raw = node.quasi.quasis[0].value.raw;
         const offset = node.quasi.start + 1;
         if (emitMiniLocations) {
@@ -113,18 +84,8 @@ export function transpiler(input, options = {}) {
     leave(node, parent, prop, index) {},
   });
 
-  let { body } = ast;
-
-  if (!body.length) {
-    console.warn('empty body -> fallback to silence');
-    body.push({
-      type: 'ExpressionStatement',
-      expression: {
-        type: 'Identifier',
-        name: 'silence',
-      },
-    });
-  } else if (!body?.[body.length - 1]?.expression) {
+  const { body } = ast;
+  if (!body?.[body.length - 1]?.expression) {
     throw new Error('unexpected ast format without body expression');
   }
 
@@ -159,18 +120,11 @@ function isBackTickString(node, parent) {
 
 function miniWithLocation(value, node) {
   const { start: fromOffset } = node;
-
-  const minilang = languages.get('minilang');
-  let name = 'm';
-  if (minilang && minilang.name) {
-    name = minilang.name; // name is expected to be exported from the package of the minilang
-  }
-
   return {
     type: 'CallExpression',
     callee: {
       type: 'Identifier',
-      name,
+      name: 'm',
     },
     arguments: [
       { type: 'Literal', value },
@@ -265,16 +219,12 @@ function labelToP(node) {
   };
 }
 
-function isLanguageLiteral(node) {
-  return node.type === 'TaggedTemplateExpression' && languages.has(node.tag.name);
-}
-
 // tidal highlighting
 // this feels kind of stupid, when we also know the location inside the string op (tidal.mjs)
 // but maybe it's the only way
 
-function isTemplateLiteral(node, value) {
-  return node.type === 'TaggedTemplateExpression' && node.tag.name === value;
+function isTidalTeplateLiteral(node) {
+  return node.type === 'TaggedTemplateExpression' && node.tag.name === 'tidal';
 }
 
 function collectHaskellMiniLocations(haskellCode, offset) {
@@ -312,18 +262,3 @@ function tidalWithLocation(value, offset) {
     optional: false,
   };
 }
-
-function languageWithLocation(name, value, offset) {
-  return {
-    type: 'CallExpression',
-    callee: {
-      type: 'Identifier',
-      name: name,
-    },
-    arguments: [
-      { type: 'Literal', value },
-      { type: 'Literal', value: offset },
-    ],
-    optional: false,
-  };
-}

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/web",
-  "version": "1.2.4",
+  "version": "1.2.3",
   "description": "Easy to setup, opiniated bundle of Strudel for the browser.",
   "module": "web.mjs",
   "publishConfig": {

packages/webaudio/index.mjs

@@ -7,5 +7,4 @@ This program is free software: you can redistribute it and/or modify it under th
 export * from './webaudio.mjs';
 export * from './scope.mjs';
 export * from './spectrum.mjs';
-export * from './supradough.mjs';
 export * from 'superdough';

packages/webaudio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/webaudio",
-  "version": "1.2.4",
+  "version": "1.2.3",
   "description": "Web Audio helpers for Strudel",
   "main": "index.mjs",
   "type": "module",
@@ -35,8 +35,7 @@
   "dependencies": {
     "@strudel/core": "workspace:*",
     "@strudel/draw": "workspace:*",
-    "superdough": "workspace:*",
-    "supradough": "workspace:*"
+    "superdough": "workspace:*"
   },
   "devDependencies": {
     "vite": "^6.0.11"

packages/webaudio/supradough.mjs

@@ -1,130 +0,0 @@
-import { Pattern } from '@strudel/core';
-import { connectToDestination, getAudioContext, getWorklet } from 'superdough';
-
-let doughWorklet;
-
-function initDoughWorklet() {
-  const ac = getAudioContext();
-  doughWorklet = getWorklet(
-    ac,
-    'dough-processor',
-    {},
-    {
-      outputChannelCount: [2],
-    },
-  );
-  connectToDestination(doughWorklet); // channels?
-}
-
-const soundMap = new Map();
-const loadedSounds = new Map();
-
-Pattern.prototype.supradough = function () {
-  return this.onTrigger((hap, __, cps, begin) => {
-    hap.value._begin = begin;
-    hap.value._duration = hap.duration / cps;
-    !doughWorklet && initDoughWorklet();
-    const s = (hap.value.bank ? hap.value.bank + '_' : '') + hap.value.s;
-    const n = hap.value.n ?? 0;
-    const soundKey = `${s}:${n}`;
-    if (soundMap.has(s)) {
-      hap.value.s = soundKey; // dough.mjs is unaware of bank and n (only maps keys to buffers)
-    }
-    if (soundMap.has(s) && !loadedSounds.has(soundKey)) {
-      const urls = soundMap.get(s);
-      const url = urls[n % urls.length];
-      console.log(`load ${soundKey} from ${url}`);
-      const loadSample = fetchSample(url);
-      loadedSounds.set(soundKey, loadSample);
-      loadSample.then(({ channels, sampleRate }) =>
-        doughWorklet.port.postMessage({
-          sample: soundKey,
-          channels,
-          sampleRate,
-        }),
-      );
-    }
-
-    doughWorklet.port.postMessage({ spawn: hap.value });
-  }, 1);
-};
-
-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}`;
-}
-export async function fetchSampleMap(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];
-}
-
-// for some reason, only piano and flute work.. is it because mp3??
-
-async function fetchSample(url) {
-  const buffer = await fetch(url)
-    .then((res) => res.arrayBuffer())
-    .then((buf) => getAudioContext().decodeAudioData(buf));
-  let channels = [];
-  for (let i = 0; i < buffer.numberOfChannels; i++) {
-    channels.push(buffer.getChannelData(i));
-  }
-  return { channels, sampleRate: buffer.sampleRate };
-}
-
-export async function doughsamples(sampleMap, baseUrl) {
-  if (typeof sampleMap === 'string') {
-    const [json, base] = await fetchSampleMap(sampleMap);
-    // console.log('json', json, 'base', base);
-    return doughsamples(json, base);
-  }
-  Object.entries(sampleMap).map(async ([key, urls]) => {
-    if (key !== '_base') {
-      urls = urls.map((url) => baseUrl + url);
-      // console.log('set', key, urls);
-      soundMap.set(key, urls);
-    }
-  });
-}

packages/webaudio/webaudio.mjs

@@ -5,12 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import * as strudel from '@strudel/core';
-import { superdough, getAudioContext, setLogger, doughTrigger, registerWorklet } from 'superdough';
-import './supradough.mjs';
-import { workletUrl } from 'supradough';
-
-registerWorklet(workletUrl);
-
+import { superdough, getAudioContext, setLogger, doughTrigger } from 'superdough';
 const { Pattern, logger, repl } = strudel;
 
 setLogger(logger);
@@ -20,10 +15,13 @@ const hap2value = (hap) => {
   return hap.value;
 };
 
-// uses more precise, absolute t if available, see https://github.com/tidalcycles/strudel/pull/1004
-// TODO: refactor output callbacks to eliminate deadline
-export const webaudioOutput = (hap, _deadline, hapDuration, cps, t) => {
-  return superdough(hap2value(hap), t, hapDuration, cps, hap.whole?.begin.valueOf());
+export const webaudioOutputTrigger = (t, hap, ct, cps) => superdough(hap2value(hap), t - ct, hap.duration / cps, cps);
+// uses more precise, absolute t if available, see https://codeberg.org/uzu/strudel/pulls/1004
+export const webaudioOutput = (hap, deadline, hapDuration, cps, t) =>
+  superdough(hap2value(hap), t ? `=${t}` : deadline, hapDuration);
+
+Pattern.prototype.webaudio = function () {
+  return this.onTrigger(webaudioOutputTrigger);
 };
 
 export function webaudioRepl(options = {}) {

packages/xen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/xen",
-  "version": "1.2.3",
+  "version": "1.2.2",
   "description": "Xenharmonic API for strudel",
   "main": "index.mjs",
   "type": "module",

pnpm-lock.yaml

@@ -347,37 +347,6 @@ importers:
         specifier: ^3.0.4
         version: 3.0.4(@types/debug@4.1.12)(@types/node@22.10.10)(@vitest/ui@3.0.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
 
-  packages/mondo:
-    devDependencies:
-      vite:
-        specifier: ^6.0.11
-        version: 6.0.11(@types/node@22.10.10)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
-      vitest:
-        specifier: ^3.0.4
-        version: 3.0.4(@types/debug@4.1.12)(@types/node@22.10.10)(@vitest/ui@3.0.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
-
-  packages/mondough:
-    dependencies:
-      '@strudel/core':
-        specifier: workspace:*
-        version: link:../core
-      '@strudel/transpiler':
-        specifier: workspace:*
-        version: link:../transpiler
-      mondolang:
-        specifier: workspace:*
-        version: link:../mondo
-    devDependencies:
-      mondo:
-        specifier: '*'
-        version: 0.4.4
-      vite:
-        specifier: ^6.0.11
-        version: 6.0.11(@types/node@22.10.10)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
-      vitest:
-        specifier: ^3.0.4
-        version: 3.0.4(@types/debug@4.1.12)(@types/node@22.10.10)(@vitest/ui@3.0.4)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
-
   packages/motion:
     dependencies:
       '@strudel/core':
@@ -517,18 +486,6 @@ importers:
         specifier: workspace:*
         version: link:../vite-plugin-bundle-audioworklet
 
-  packages/supradough:
-    devDependencies:
-      vite:
-        specifier: ^6.0.11
-        version: 6.0.11(@types/node@22.10.10)(jiti@2.4.2)(lightningcss@1.29.1)(terser@5.37.0)(yaml@2.7.0)
-      vite-plugin-bundle-audioworklet:
-        specifier: workspace:*
-        version: link:../vite-plugin-bundle-audioworklet
-      wav-encoder:
-        specifier: ^1.3.0
-        version: 1.3.0
-
   packages/tidal:
     dependencies:
       '@strudel/core':
@@ -637,9 +594,6 @@ importers:
       superdough:
         specifier: workspace:*
         version: link:../superdough
-      supradough:
-        specifier: workspace:*
-        version: link:../supradough
     devDependencies:
       vite:
         specifier: ^6.0.11
@@ -729,9 +683,6 @@ importers:
       '@strudel/mini':
         specifier: workspace:*
         version: link:../packages/mini
-      '@strudel/mondo':
-        specifier: workspace:*
-        version: link:../packages/mondough
       '@strudel/motion':
         specifier: workspace:*
         version: link:../packages/motion
@@ -3024,10 +2975,6 @@ packages:
     resolution: {integrity: sha512-groO71Fvi5SWpxjI9Ia+chy0QBwT61mg6yxJV27f5YFf+Mw+STT75K6SHySpP8Co5LsCrtsbCH5dJZSRtkSKaQ==}
     engines: {node: '>= 14.0.0'}
 
-  amdefine@1.0.1:
-    resolution: {integrity: sha512-S2Hw0TtNkMJhIabBwIojKL9YHO5T0n5eNqWJ7Lrlel/zDbftQpxpapi8tZs3X1HWa+u+QeydGmzzNU0m09+Rcg==}
-    engines: {node: '>=0.4.2'}
-
   ansi-align@3.0.1:
     resolution: {integrity: sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==}
 
@@ -3156,9 +3103,6 @@ packages:
     resolution: {integrity: sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==}
     engines: {node: '>= 0.4'}
 
-  async@0.2.10:
-    resolution: {integrity: sha512-eAkdoKxU6/LkKDBzLpT+t6Ff5EtfSF4wx1WfJiPEEV7WNLnDaRXk0oVysiEPm262roaachGexwUv94WhSgN5TQ==}
-
   async@3.2.6:
     resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
 
@@ -3393,9 +3337,6 @@ packages:
   claviature@0.1.0:
     resolution: {integrity: sha512-Ai12axNwQ7x/F9QAj64RYKsgvi5Y33+X3GUSKAC/9s/adEws8TSSc0efeiqhKNGKBo6rT/c+CSCwSXzXxwxZzQ==}
 
-  cldr-plurals@1.0.0:
-    resolution: {integrity: sha512-xGkehDsjj/ng1LtYiAzdiqDgqTQ/qmWafDlB6R8CfXbpXe4Ge2Tl4l7gxiA+yaD1WCTP3EVfwerdmVwfco7vxw==}
-
   clean-stack@2.2.0:
     resolution: {integrity: sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==}
     engines: {node: '>=6'}
@@ -4437,9 +4378,6 @@ packages:
     resolution: {integrity: sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==}
     engines: {node: '>=16 || 14 >=14.17'}
 
-  globalize@0.1.1:
-    resolution: {integrity: sha512-5e01v8eLGfuQSOvx2MsDMOWS0GFtCx1wPzQSmcHw4hkxFzrQDBO3Xwg/m8Hr/7qXMrHeOIE29qWVzyv06u1TZA==}
-
   globals@11.12.0:
     resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==}
     engines: {node: '>=4'}
@@ -4501,11 +4439,6 @@ packages:
   h3@1.14.0:
     resolution: {integrity: sha512-ao22eiONdgelqcnknw0iD645qW0s9NnrJHr5OBz4WOMdBdycfSas1EQf1wXRsm+PcB2Yoj43pjBPwqIpJQTeWg==}
 
-  handlebars@1.1.2:
-    resolution: {integrity: sha512-6lekK3aSHE7XnEqEs+JWQJRSRdCqJYHEVjEfWWZv9pjLUYZNeP26EtlgOrpDCSX+k5N1m74urTbztgBOCko1Kg==}
-    engines: {node: '>=0.4.7'}
-    hasBin: true
-
   handlebars@4.7.8:
     resolution: {integrity: sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==}
     engines: {node: '>=0.4.7'}
@@ -5653,10 +5586,6 @@ packages:
     engines: {node: '>=18'}
     hasBin: true
 
-  mondo@0.4.4:
-    resolution: {integrity: sha512-3ot6iKwC9KZvwmyZ9dgPCnlt0O1GuBnK8QZyhnoJdtkIiRL9X/cmQuu88CbFSznQx6bq19xQdwJHpv8hggH62Q==}
-    deprecated: Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.
-
   mrmime@2.0.0:
     resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
     engines: {node: '>=10'}
@@ -5898,9 +5827,6 @@ packages:
     resolution: {integrity: sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==}
     engines: {node: '>=12'}
 
-  optimist@0.3.7:
-    resolution: {integrity: sha512-TCx0dXQzVtSCg2OgY/bO9hjM9cV4XYx09TVK+s3+FhkjT6LovsLe+pPMzpWf+6yXK/hUizs2gUoTw3jHM0VaTQ==}
-
   optionator@0.9.4:
     resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
     engines: {node: '>= 0.8.0'}
@@ -6799,10 +6725,6 @@ packages:
   source-map-support@0.5.21:
     resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
 
-  source-map@0.1.43:
-    resolution: {integrity: sha512-VtCvB9SIQhk3aF6h+N85EaqIaBFIAfZ9Cu+NJHHVvc8BbEcnvDcFw6sqQ2dQrT6SlOrZq3tIvyD9+EGq/lJryQ==}
-    engines: {node: '>=0.8.0'}
-
   source-map@0.5.7:
     resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
     engines: {node: '>=0.10.0'}
@@ -7233,11 +7155,6 @@ packages:
   ufo@1.5.4:
     resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
 
-  uglify-js@2.3.6:
-    resolution: {integrity: sha512-T2LWWydxf5+Btpb0S/Gg/yKFmYjnX9jtQ4mdN9YRq73BhN21EhU0Dvw3wYDLqd3TooGUJlCKf3Gfyjjy/RTcWA==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-
   uglify-js@3.19.3:
     resolution: {integrity: sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==}
     engines: {node: '>=0.8.0'}
@@ -7256,9 +7173,6 @@ packages:
   underscore@1.13.7:
     resolution: {integrity: sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==}
 
-  underscore@1.5.2:
-    resolution: {integrity: sha512-yejOFsRnTJs0N9CK5Apzf6maDO2djxGoLLrlZlvGs2o9ZQuhIhDL18rtFyy4FBIbOkzA6+4hDgXbgz5EvDQCXQ==}
-
   undici-types@6.20.0:
     resolution: {integrity: sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==}
 
@@ -7550,9 +7464,6 @@ packages:
   walk-up-path@3.0.1:
     resolution: {integrity: sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==}
 
-  wav-encoder@1.3.0:
-    resolution: {integrity: sha512-FXJdEu2qDOI+wbVYZpu21CS1vPEg5NaxNskBr4SaULpOJMrLE6xkH8dECa7PiS+ZoeyvP7GllWUAxPN3AvFSEw==}
-
   wav@1.0.2:
     resolution: {integrity: sha512-viHtz3cDd/Tcr/HbNqzQCofKdF6kWUymH9LGDdskfWFoIy/HJ+RTihgjEcHfnsy1PO4e9B+y4HwgTwMrByquhg==}
 
@@ -7644,10 +7555,6 @@ packages:
     resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
     engines: {node: '>=0.10.0'}
 
-  wordwrap@0.0.3:
-    resolution: {integrity: sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==}
-    engines: {node: '>=0.4.0'}
-
   wordwrap@1.0.0:
     resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
 
@@ -10531,9 +10438,6 @@ snapshots:
       '@algolia/requester-fetch': 5.20.0
       '@algolia/requester-node-http': 5.20.0
 
-  amdefine@1.0.1:
-    optional: true
-
   ansi-align@3.0.1:
     dependencies:
       string-width: 4.2.3
@@ -10743,9 +10647,6 @@ snapshots:
 
   async-function@1.0.0: {}
 
-  async@0.2.10:
-    optional: true
-
   async@3.2.6: {}
 
   asynckit@0.4.0: {}
@@ -11003,8 +10904,6 @@ snapshots:
 
   claviature@0.1.0: {}
 
-  cldr-plurals@1.0.0: {}
-
   clean-stack@2.2.0: {}
 
   cli-boxes@3.0.0: {}
@@ -12147,8 +12046,6 @@ snapshots:
       minipass: 4.2.8
       path-scurry: 1.11.1
 
-  globalize@0.1.1: {}
-
   globals@11.12.0: {}
 
   globals@14.0.0: {}
@@ -12215,12 +12112,6 @@ snapshots:
       uncrypto: 0.1.3
       unenv: 1.10.0
 
-  handlebars@1.1.2:
-    dependencies:
-      optimist: 0.3.7
-    optionalDependencies:
-      uglify-js: 2.3.6
-
   handlebars@4.7.8:
     dependencies:
       minimist: 1.2.8
@@ -13804,13 +13695,6 @@ snapshots:
       requirejs: 2.3.7
       requirejs-config-file: 4.0.0
 
-  mondo@0.4.4:
-    dependencies:
-      cldr-plurals: 1.0.0
-      globalize: 0.1.1
-      handlebars: 1.1.2
-      underscore: 1.5.2
-
   mrmime@2.0.0: {}
 
   ms@2.0.0: {}
@@ -14103,10 +13987,6 @@ snapshots:
       is-docker: 2.2.1
       is-wsl: 2.2.0
 
-  optimist@0.3.7:
-    dependencies:
-      wordwrap: 0.0.3
-
   optionator@0.9.4:
     dependencies:
       deep-is: 0.1.4
@@ -15214,11 +15094,6 @@ snapshots:
       buffer-from: 1.1.2
       source-map: 0.6.1
 
-  source-map@0.1.43:
-    dependencies:
-      amdefine: 1.0.1
-    optional: true
-
   source-map@0.5.7: {}
 
   source-map@0.6.1: {}
@@ -15686,13 +15561,6 @@ snapshots:
 
   ufo@1.5.4: {}
 
-  uglify-js@2.3.6:
-    dependencies:
-      async: 0.2.10
-      optimist: 0.3.7
-      source-map: 0.1.43
-    optional: true
-
   uglify-js@3.19.3:
     optional: true
 
@@ -15709,8 +15577,6 @@ snapshots:
 
   underscore@1.13.7: {}
 
-  underscore@1.5.2: {}
-
   undici-types@6.20.0: {}
 
   unenv@1.10.0:
@@ -15973,8 +15839,6 @@ snapshots:
 
   walk-up-path@3.0.1: {}
 
-  wav-encoder@1.3.0: {}
-
   wav@1.0.2:
     dependencies:
       buffer-alloc: 1.2.0
@@ -16093,8 +15957,6 @@ snapshots:
 
   word-wrap@1.2.5: {}
 
-  wordwrap@0.0.3: {}
-
   wordwrap@1.0.0: {}
 
   workbox-background-sync@7.0.0:

test/runtime.mjs

@@ -97,7 +97,6 @@ const toneHelpersMocked = {
   '_pianoroll',
   '_spectrum',
   'markcss',
-  'p',
 ].forEach((mock) => {
   strudel.Pattern.prototype[mock] = function () {
     return this;
@@ -164,7 +163,6 @@ evalScope(
     loadCsound,
     loadcsound,
     setcps: id,
-    setcpm: id,
     Clock: {}, // whatever
   },
 );

test/testtunes.mjs

@@ -359,6 +359,28 @@ stack(
   "[~ [0 ~]] 0 [~ [4 ~]] 4".sub(7).restart(scales).scale(scales).early(.25)
 ).note().piano().slow(2)`;
 
+/* 
+export const customTrigger = `// licensed with CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
+// by Felix Roos
+stack(
+  freq("55 [110,165] 110 [220,275]".mul("<1 <3/4 2/3>>").struct("x(3,8)").layer(x=>x.mul("1.006,.995"))),
+  freq("440(5,8)".clip(.18).mul("<1 3/4 2 2/3>")).gain(perlin.range(.2,.8))
+).s("<sawtooth square>/2")
+  .onTrigger((t,hap,ct)=>{
+  const ac = Tone.getContext().rawContext;
+  t = ac.currentTime + t - ct;
+  const { freq, s, gain = 1 } = hap.value;
+  const master = ac.createGain();
+  master.gain.value = 0.1 * gain;
+  master.connect(ac.destination);
+  const o = ac.createOscillator();
+  o.type = s || 'triangle';
+  o.frequency.value = Number(freq);
+  o.connect(master);
+  o.start(t);
+  o.stop(t + hap.duration);
+}).stack(s("bd(3,8),hh*4,~ sd").webdirt())`; */
+
 export const swimmingWithSoundfonts = `// Koji Kondo - Swimming (Super Mario World)
 stack(
     n(

undocumented.json

@@ -647,6 +647,7 @@
     "evaluate"
   ],
   "/packages/webaudio/webaudio.mjs": [
+    "webaudioOutputTrigger",
     "webaudioOutput",
     "webaudioRepl"
   ],