remove notes

.github/workflows/tauri.yml

@@ -1,62 +0,0 @@
-name: Tauri Builder
-on:
-  push:
-    tags:
-      - "v*"
-  workflow_dispatch:
-
-jobs:
-  release:
-    strategy:
-      fail-fast: false
-      matrix:
-        platform: [macos-latest, ubuntu-latest, windows-latest]
-        include:
-          - os: ubuntu-latest
-            rust_target: x86_64-unknown-linux-gnu
-          - os: macos-latest
-            rust_target: x86_64-apple-darwin
-          - os: macos-latest
-            rust_target: aarch64-apple-darwin
-          - os: windows-latest
-            rust_target: x86_64-pc-windows-msvc
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 8.6.2
-
-      - name: Node.js setup
-        uses: actions/setup-node@v3
-        with:
-          node-version: latest
-          # node-version-file: '.nvmrc'
-
-      - name: Install Rust (Stable)
-        run:
-          curl https://sh.rustup.rs -sSf | sh -s -- -y
-
-      - name: Install dependencies (ubuntu only)
-        if: matrix.platform == 'ubuntu-latest'
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libappindicator3-dev librsvg2-dev patchelf
-
-      - name: Install app dependencies from lockfile and build web
-        run: pnpm install
-
-      - name: Build the app
-        uses: tauri-apps/tauri-action@v0
-
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          # tauri-action replaces \_\_VERSION\_\_ with the app version
-          tagName: ${{ github.ref_name }}
-          releaseName: "Strudel v__VERSION__"
-          releaseBody: |
-            See the assets to download this version and install.
-          releaseDraft: true
-          prerelease: false

.gitignore

@@ -43,4 +43,3 @@ dev-dist
 Dirt-Samples
 tidal-drum-machines
 webaudiofontdata
-src-tauri/target

CONTRIBUTING.md

@@ -31,7 +31,7 @@ Use one of the Communication Channels listed above.
 
 ## Improve the Docs
 
-If you find some weak spots in the [docs](https://strudel.tidalcycles.org/workshop/getting-started/),
+If you find some weak spots in the [docs](https://strudel.tidalcycles.org/learn/getting-started),
 you can edit each file directly on github via the "Edit this page" link located in the right sidebar.
 
 ## Propose a Feature

README.md

@@ -24,8 +24,8 @@ There are multiple npm packages you can use to use strudel, or only parts of it,
 
 - [`core`](./packages/core/): tidal pattern engine
 - [`mini`](./packages/mini): mini notation parser + core binding
-- [`transpiler`](./packages/transpiler): user code transpiler
-- [`webaudio`](./packages/webaudio): webaudio output
+- [`eval`](./packages/eval): user code evaluator. syntax sugar + highlighting
+- [`tone`](./packages/tone): bindings for Tone.js instruments and effects
 - [`osc`](./packages/osc): bindings to communicate via OSC
 - [`midi`](./packages/midi): webmidi bindings
 - [`serial`](./packages/serial): webserial bindings

index.mjs

@@ -2,6 +2,7 @@
 export * from './packages/core/index.mjs';
 export * from './packages/csound/index.mjs';
 export * from './packages/embed/index.mjs';
+export * from './packages/eval/index.mjs';
 export * from './packages/midi/index.mjs';
 export * from './packages/mini/index.mjs';
 export * from './packages/osc/index.mjs';
@@ -9,6 +10,8 @@ export * from './packages/react/index.mjs';
 export * from './packages/serial/index.mjs';
 export * from './packages/soundfonts/index.mjs';
 export * from './packages/tonal/index.mjs';
+export * from './packages/tone/index.mjs';
 export * from './packages/transpiler/index.mjs';
 export * from './packages/webaudio/index.mjs';
+export * from './packages/webdirt/index.mjs';
 export * from './packages/xen/index.mjs';

package.json

@@ -52,10 +52,10 @@
     "@strudel.cycles/webaudio": "workspace:*",
     "@strudel.cycles/xen": "workspace:*",
     "acorn": "^8.8.1",
-    "dependency-tree": "^9.0.0"
+    "dependency-tree": "^9.0.0",
+    "vitest": "^0.28.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^1.4.0",
     "@vitest/ui": "^0.28.0",
     "canvas": "^2.11.2",
     "eslint": "^8.39.0",
@@ -66,7 +66,6 @@
     "jsdoc-to-markdown": "^8.0.0",
     "lerna": "^6.6.1",
     "prettier": "^2.8.8",
-    "rollup-plugin-visualizer": "^5.8.1",
-    "vitest": "^0.33.0"
+    "rollup-plugin-visualizer": "^5.8.1"
   }
 }

packages/codemirror/codemirror.mjs

@@ -1,12 +1,11 @@
-import { defaultKeymap } from '@codemirror/commands';
-import { javascript } from '@codemirror/lang-javascript';
-import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language';
 import { EditorState } from '@codemirror/state';
-import { EditorView, highlightActiveLineGutter, keymap, lineNumbers } from '@codemirror/view';
-import { Drawer, repl } from '@strudel.cycles/core';
-import { flashField, flash } from './flash.mjs';
-import { highlightExtension, highlightMiniLocations } from './highlight.mjs';
+import { EditorView, keymap, Decoration, lineNumbers, highlightActiveLineGutter } from '@codemirror/view';
+import { defaultKeymap } from '@codemirror/commands';
+import { syntaxHighlighting, defaultHighlightStyle } from '@codemirror/language';
+import { javascript } from '@codemirror/lang-javascript';
+import { StateField, StateEffect } from '@codemirror/state';
 import { oneDark } from './themes/one-dark';
+import { repl, Drawer } from '@strudel.cycles/core';
 
 // https://codemirror.net/docs/guide/
 export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, theme = oneDark, root }) {
@@ -16,7 +15,7 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, the
       theme,
       javascript(),
       lineNumbers(),
-      highlightExtension,
+      highlightField,
       highlightActiveLineGutter(),
       syntaxHighlighting(defaultHighlightStyle),
       keymap.of(defaultKeymap),
@@ -41,14 +40,101 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, the
   });
 }
 
+//
+//  highlighting
+//
+
+export const setHighlights = StateEffect.define();
+export const highlightField = StateField.define({
+  create() {
+    return Decoration.none;
+  },
+  update(highlights, tr) {
+    try {
+      for (let e of tr.effects) {
+        if (e.is(setHighlights)) {
+          const { haps } = e.value;
+          const marks =
+            haps
+              .map((hap) =>
+                (hap.context.locations || []).map(({ start, end }) => {
+                  // const color = hap.context.color || e.value.color || '#FFCA28';
+                  let from = tr.newDoc.line(start.line).from + start.column;
+                  let to = tr.newDoc.line(end.line).from + end.column;
+                  const l = tr.newDoc.length;
+                  if (from > l || to > l) {
+                    return; // dont mark outside of range, as it will throw an error
+                  }
+                  const mark = Decoration.mark({
+                    attributes: { style: `outline: 2px solid #FFCA28;` },
+                  });
+                  return mark.range(from, to);
+                }),
+              )
+              .flat()
+              .filter(Boolean) || [];
+          highlights = Decoration.set(marks, true);
+        }
+      }
+      return highlights;
+    } catch (err) {
+      // console.warn('highlighting error', err);
+      return Decoration.set([]);
+    }
+  },
+  provide: (f) => EditorView.decorations.from(f),
+});
+
+// helper to simply trigger highlighting for given haps
+export function highlightHaps(view, haps) {
+  view.dispatch({ effects: setHighlights.of({ haps }) });
+}
+
+//
+// flash
+//
+
+export const setFlash = StateEffect.define();
+const flashField = StateField.define({
+  create() {
+    return Decoration.none;
+  },
+  update(flash, tr) {
+    try {
+      for (let e of tr.effects) {
+        if (e.is(setFlash)) {
+          if (e.value) {
+            const mark = Decoration.mark({ attributes: { style: `background-color: #FFCA2880` } });
+            flash = Decoration.set([mark.range(0, tr.newDoc.length)]);
+          } else {
+            flash = Decoration.set([]);
+          }
+        }
+      }
+      return flash;
+    } catch (err) {
+      console.warn('flash error', err);
+      return flash;
+    }
+  },
+  provide: (f) => EditorView.decorations.from(f),
+});
+
+export const flash = (view, ms = 200) => {
+  view.dispatch({ effects: setFlash.of(true) });
+  setTimeout(() => {
+    view.dispatch({ effects: setFlash.of(false) });
+  }, ms);
+};
+
 export class StrudelMirror {
   constructor(options) {
     const { root, initialCode = '', onDraw, drawTime = [-2, 2], prebake, ...replOptions } = options;
     this.code = initialCode;
 
     this.drawer = new Drawer((haps, time) => {
-      const currentFrame = haps.filter((hap) => time >= hap.whole.begin && time <= hap.endClipped);
-      this.highlight(currentFrame, time);
+      const currentFrame = haps.filter((hap) => time >= hap.whole.begin && time <= hap.whole.end);
+      this.highlight(currentFrame);
       onDraw?.(haps, time, currentFrame);
     }, drawTime);
 
@@ -107,7 +193,7 @@ export class StrudelMirror {
   flash(ms) {
     flash(this.editor, ms);
   }
-  highlight(haps, time) {
-    highlightMiniLocations(this.editor.view, time, haps);
+  highlight(haps) {
+    highlightHaps(this.editor, haps);
   }
 }

packages/codemirror/flash.mjs

@@ -1,35 +0,0 @@
-import { StateEffect, StateField } from '@codemirror/state';
-import { Decoration, EditorView } from '@codemirror/view';
-
-export const setFlash = StateEffect.define();
-export const flashField = StateField.define({
-  create() {
-    return Decoration.none;
-  },
-  update(flash, tr) {
-    try {
-      for (let e of tr.effects) {
-        if (e.is(setFlash)) {
-          if (e.value && tr.newDoc.length > 0) {
-            const mark = Decoration.mark({ attributes: { style: `background-color: #FFCA2880` } });
-            flash = Decoration.set([mark.range(0, tr.newDoc.length)]);
-          } else {
-            flash = Decoration.set([]);
-          }
-        }
-      }
-      return flash;
-    } catch (err) {
-      console.warn('flash error', err);
-      return flash;
-    }
-  },
-  provide: (f) => EditorView.decorations.from(f),
-});
-
-export const flash = (view, ms = 200) => {
-  view.dispatch({ effects: setFlash.of(true) });
-  setTimeout(() => {
-    view.dispatch({ effects: setFlash.of(false) });
-  }, ms);
-};

packages/codemirror/highlight.mjs

@@ -1,126 +0,0 @@
-import { RangeSetBuilder, StateEffect, StateField } from '@codemirror/state';
-import { Decoration, EditorView } from '@codemirror/view';
-
-export const setMiniLocations = StateEffect.define();
-export const showMiniLocations = StateEffect.define();
-export const updateMiniLocations = (view, locations) => {
-  view.dispatch({ effects: setMiniLocations.of(locations) });
-};
-export const highlightMiniLocations = (view, atTime, haps) => {
-  view.dispatch({ effects: showMiniLocations.of({ atTime, haps }) });
-};
-
-const miniLocations = StateField.define({
-  create() {
-    return Decoration.none;
-  },
-  update(locations, tr) {
-    if (tr.docChanged) {
-      locations = locations.map(tr.changes);
-    }
-
-    for (let e of tr.effects) {
-      if (e.is(setMiniLocations)) {
-        // this is called on eval, with the mini locations obtained from the transpiler
-        // codemirror will automatically remap the marks when the document is edited
-        // create a mark for each mini location, adding the range to the spec to find it later
-        const marks = e.value
-          .filter(([from]) => from < tr.newDoc.length)
-          .map(([from, to]) => [from, Math.min(to, tr.newDoc.length)])
-          .map(
-            (range) =>
-              Decoration.mark({
-                id: range.join(':'),
-                // this green is only to verify that the decoration moves when the document is edited
-                // it will be removed later, so the mark is not visible by default
-                attributes: { style: `background-color: #00CA2880` },
-              }).range(...range), // -> Decoration
-          );
-
-        locations = Decoration.set(marks, true); // -> DecorationSet === RangeSet<Decoration>
-      }
-    }
-
-    return locations;
-  },
-});
-
-const visibleMiniLocations = StateField.define({
-  create() {
-    return { atTime: 0, haps: new Map() };
-  },
-  update(visible, tr) {
-    for (let e of tr.effects) {
-      if (e.is(showMiniLocations)) {
-        // this is called every frame to show the locations that are currently active
-        // we can NOT create new marks because the context.locations haven't changed since eval time
-        // this is why we need to find a way to update the existing decorations, showing the ones that have an active range
-        const haps = new Map();
-        for (let hap of e.value.haps) {
-          for (let { start, end } of hap.context.locations) {
-            let id = `${start}:${end}`;
-            if (!haps.has(id) || haps.get(id).whole.begin.lt(hap.whole.begin)) {
-              haps.set(id, hap);
-            }
-          }
-        }
-
-        visible = { atTime: e.value.atTime, haps };
-      }
-    }
-
-    return visible;
-  },
-});
-
-// // Derive the set of decorations from the miniLocations and visibleLocations
-const miniLocationHighlights = EditorView.decorations.compute([miniLocations, visibleMiniLocations], (state) => {
-  const iterator = state.field(miniLocations).iter();
-  const { haps } = state.field(visibleMiniLocations);
-  const builder = new RangeSetBuilder();
-
-  while (iterator.value) {
-    const {
-      from,
-      to,
-      value: {
-        spec: { id },
-      },
-    } = iterator;
-
-    if (haps.has(id)) {
-      const hap = haps.get(id);
-      const color = hap.context.color ?? 'var(--foreground)';
-      // Get explicit channels for color values
-      /* 
-      const swatch = document.createElement('div');
-      swatch.style.color = color;
-      document.body.appendChild(swatch);
-      let channels = getComputedStyle(swatch)
-        .color.match(/^rgba?\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})(?:,\s*(\d*(?:\.\d+)?))?\)$/)
-        .slice(1)
-        .map((c) => parseFloat(c || 1));
-      document.body.removeChild(swatch);
-
-      // Get percentage of event
-      const percent = 1 - (atTime - hap.whole.begin) / hap.whole.duration;
-      channels[3] *= percent;
-      */
-
-      builder.add(
-        from,
-        to,
-        Decoration.mark({
-          // attributes: { style: `outline: solid 2px rgba(${channels.join(', ')})` },
-          attributes: { style: `outline: solid 2px ${color}` },
-        }),
-      );
-    }
-
-    iterator.next();
-  }
-
-  return builder.finish();
-});
-
-export const highlightExtension = [miniLocations, visibleMiniLocations, miniLocationHighlights];

packages/codemirror/index.mjs

@@ -1,3 +0,0 @@
-export * from './codemirror.mjs';
-export * from './highlight.mjs';
-export * from './flash.mjs';

packages/codemirror/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@strudel/codemirror",
-  "version": "0.8.4",
+  "version": "0.8.3",
   "description": "Codemirror Extensions for Strudel",
-  "main": "index.mjs",
+  "main": "codemirror.mjs",
   "publishConfig": {
     "main": "dist/index.js",
     "module": "dist/index.mjs"

packages/codemirror/vite.config.js

@@ -7,7 +7,7 @@ export default defineConfig({
   plugins: [],
   build: {
     lib: {
-      entry: resolve(__dirname, 'index.mjs'),
+      entry: resolve(__dirname, 'codemirror.mjs'),
       formats: ['es', 'cjs'],
       fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
     },

packages/core/controls.mjs

@@ -222,7 +222,6 @@ const generic_params = [
    *
    * @name legato
    * @param {number | Pattern} duration between 0 and 1, where 1 is the length of the whole hap time
-   * @noAutocomplete
    * @example
    * "c4 eb4 g4 bb4".legato("<0.125 .25 .5 .75 1 2 4>")
    *
@@ -509,7 +508,7 @@ const generic_params = [
    * @superDirtOnly
    */
   ['octave'],
-
+  ['offset'], // TODO: what is this? not found in tidal doc
   // ['ophatdecay'],
   // TODO: example
   /**
@@ -573,15 +572,6 @@ const generic_params = [
   // TODO: dedup with synth param, see https://tidalcycles.org/docs/reference/synthesizers/#superpiano
   // ['velocity'],
   ['voice'], // TODO: synth param
-
-  // voicings // https://github.com/tidalcycles/strudel/issues/506
-  ['chord'], // chord to voice, like C Eb Fm7 G7. the symbols can be defined via addVoicings
-  ['dictionary', 'dict'], // which dictionary to use for the voicings
-  ['anchor'], // the top note to align the voicing to, defaults to c5
-  ['offset'], // how the voicing is offset from the anchored position
-  ['octaves'], // how many octaves are voicing steps spread apart, defaults to 1
-  [['mode', 'anchor']], // below = anchor note will be removed from the voicing, useful for melody harmonization
-
   /**
    * Sets the level of reverb.
    *
@@ -759,14 +749,13 @@ const generic_params = [
   ['val'],
   ['cps'],
   /**
-   * Multiplies the duration with the given number. Also cuts samples off at the end if they exceed the duration.
-   * In tidal, this would be done with legato, [which has a complicated history in strudel](https://github.com/tidalcycles/strudel/issues/111).
-   * For now, if you're coming from tidal, just think clip = legato.
+   * If set to 1, samples will be cut to the duration of their event.
+   * In tidal, this would be done with legato, which [is about to land in strudel too](https://github.com/tidalcycles/strudel/issues/111)
    *
    * @name clip
-   * @param {number | Pattern} factor >= 0
+   * @param {number | Pattern} active 1 or 0
    * @example
-   * note("c a f e").s("piano").clip("<.5 1 2>")
+   * note("c a f e ~").s("piano").clip(1)
    *
    */
   ['clip'],

packages/core/draw.mjs

@@ -15,14 +15,6 @@ export const getDrawContext = (id = 'test-canvas') => {
     canvas.height = window.innerHeight;
     canvas.style = 'pointer-events:none;width:100%;height:100%;position:fixed;top:0;left:0';
     document.body.prepend(canvas);
-    let timeout;
-    window.addEventListener('resize', () => {
-      timeout && clearTimeout(timeout);
-      timeout = setTimeout(() => {
-        canvas.width = window.innerWidth;
-        canvas.height = window.innerHeight;
-      }, 200);
-    });
   }
   return canvas.getContext('2d');
 };

packages/core/evaluate.mjs

@@ -1,6 +1,6 @@
 /*
 evaluate.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/evaluate.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/evaluate.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/>.
 */
 
@@ -37,12 +37,8 @@ function safeEval(str, options = {}) {
 }
 
 export const evaluate = async (code, transpiler) => {
-  let meta = {};
   if (transpiler) {
-    // transform syntactically correct js code to semantically usable code
-    const transpiled = transpiler(code);
-    code = transpiled.output;
-    meta = transpiled;
+    code = transpiler(code); // transform syntactically correct js code to semantically usable code
   }
   // if no transpiler is given, we expect a single instruction (!wrapExpression)
   const options = { wrapExpression: !!transpiler };
@@ -52,5 +48,5 @@ export const evaluate = async (code, transpiler) => {
     const message = `got "${typeof evaluated}" instead of pattern`;
     throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
   }
-  return { mode: 'javascript', pattern: evaluated, meta };
+  return { mode: 'javascript', pattern: evaluated };
 };

packages/core/hap.mjs

@@ -32,11 +32,7 @@ export class Hap {
   }
 
   get duration() {
-    return this.whole.end.sub(this.whole.begin).mul(typeof this.value?.clip === 'number' ? this.value?.clip : 1);
-  }
-
-  get endClipped() {
-    return this.whole.begin.add(this.duration);
+    return this.whole.end.sub(this.whole.begin);
   }
 
   wholeOrPart() {

packages/core/index.mjs

@@ -24,7 +24,6 @@ export * from './time.mjs';
 export * from './draw.mjs';
 export * from './animate.mjs';
 export * from './pianoroll.mjs';
-export * from './spiral.mjs';
 export * from './ui.mjs';
 export { default as drawLine } from './drawLine.mjs';
 export { default as gist } from './gist.js';

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/core",
-  "version": "0.8.2",
+  "version": "0.8.1",
   "description": "Port of Tidal Cycles to JavaScript",
   "main": "index.mjs",
   "type": "module",
@@ -36,6 +36,6 @@
   "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2",
   "devDependencies": {
     "vite": "^4.3.3",
-    "vitest": "^0.33.0"
+    "vitest": "^0.28.0"
   }
 }

packages/core/pattern.mjs

@@ -472,15 +472,15 @@ export class Pattern {
   /**
    * Returns a new pattern with the given location information added to the
    * context of every hap.
-   * @param {Number} start start offset
-   * @param {Number} end end offset
+   * @param {Number} start
+   * @param {Number} end
    * @returns Pattern
    * @noAutocomplete
    */
-  withLoc(start, end) {
+  withLocation(start, end) {
     const location = {
-      start,
-      end,
+      start: { line: start[0], column: start[1], offset: start[2] },
+      end: { line: end[0], column: end[1], offset: end[2] },
     };
     return this.withContext((context) => {
       const locations = (context.locations || []).concat([location]);
@@ -488,6 +488,32 @@ export class Pattern {
     });
   }
 
+  withMiniLocation(start, end) {
+    const offset = {
+      start: { line: start[0], column: start[1], offset: start[2] },
+      end: { line: end[0], column: end[1], offset: end[2] },
+    };
+    return this.withContext((context) => {
+      let locations = context.locations || [];
+      locations = locations.map(({ start, end }) => {
+        const colOffset = start.line === 1 ? offset.start.column : 0;
+        return {
+          start: {
+            ...start,
+            line: start.line - 1 + (offset.start.line - 1) + 1,
+            column: start.column - 1 + colOffset,
+          },
+          end: {
+            ...end,
+            line: end.line - 1 + (offset.start.line - 1) + 1,
+            column: end.column - 1 + colOffset,
+          },
+        };
+      });
+      return { ...context, locations };
+    });
+  }
+
   /**
    * Returns a new Pattern, which only returns haps that meet the given test.
    * @param {Function} hap_test - a function which returns false for haps to be removed from the pattern
@@ -783,14 +809,13 @@ export class Pattern {
       hap.setContext({
         ...hap.context,
         onTrigger: (...args) => {
-          // run previously set trigger, if it exists
-          hap.context.onTrigger?.(...args);
+          if (!dominant && hap.context.onTrigger) {
+            hap.context.onTrigger(...args);
+          }
           onTrigger(...args);
         },
-        // if dominantTrigger is set to true, the default output (webaudio) will be disabled
-        // when using multiple triggers, you cannot flip this flag to false again!
-        // example: x.csound('CooLSynth').log() as well as x.log().csound('CooLSynth') should work the same
-        dominantTrigger: hap.context.dominantTrigger || dominant,
+        // we need this to know later if the default trigger should still fire
+        dominantTrigger: dominant,
       }),
     );
   }
@@ -1557,24 +1582,6 @@ export const range2 = register('range2', function (min, max, pat) {
   return pat.fromBipolar()._range(min, max);
 });
 
-/**
- * Allows dividing numbers via list notation using ":".
- * Returns a new pattern with just numbers.
- * @name ratio
- * @memberof Pattern
- * @returns Pattern
- * @example
- * ratio("1, 5:4, 3:2").mul(110).freq().s("piano").slow(2)
- */
-export const ratio = register('ratio', (pat) =>
-  pat.fmap((v) => {
-    if (!Array.isArray(v)) {
-      return v;
-    }
-    return v.slice(1).reduce((acc, n) => acc / n, v[0]);
-  }),
-);
-
 //////////////////////////////////////////////////////////////////////
 // Structural and temporal transformations
 
@@ -1670,9 +1677,6 @@ export const ply = register('ply', function (factor, pat) {
  * s("<bd sd> hh").fast(2) // s("[<bd sd> hh]*2")
  */
 export const { fast, density } = register(['fast', 'density'], function (factor, pat) {
-  if (factor === 0) {
-    return silence;
-  }
   factor = Fraction(factor);
   const fastQuery = pat.withQueryTime((t) => t.mul(factor));
   return fastQuery.withHapTime((t) => t.div(factor));
@@ -1699,9 +1703,6 @@ export const hurry = register('hurry', function (r, pat) {
  * s("<bd sd> hh").slow(2) // s("[<bd sd> hh]/2")
  */
 export const { slow, sparsity } = register(['slow', 'sparsity'], function (factor, pat) {
-  if (factor === 0) {
-    return silence;
-  }
   return pat._fast(Fraction(1).div(factor));
 });
 
@@ -2028,7 +2029,7 @@ export const jux = register('jux', function (func, pat) {
  * @example
  * "<0 [2 4]>"
  * .echoWith(4, 1/8, (p,n) => p.add(n*2))
- * .scale('C minor').note().clip(.2)
+ * .scale('C minor').note().legato(.2)
  */
 export const { echoWith, echowith, stutWith, stutwith } = register(
   ['echoWith', 'echowith', 'stutWith', 'stutwith'],
@@ -2178,7 +2179,6 @@ export const velocity = register('velocity', function (velocity, pat) {
 /**
  *
  * Multiplies the hap duration with the given factor.
- * With samples, `clip` might be a better function to use ([more info](https://github.com/tidalcycles/strudel/pull/598))
  * @name legato
  * @memberof Pattern
  * @example
@@ -2241,21 +2241,17 @@ const _loopAt = function (factor, pat, cps = 1) {
     .slow(factor);
 };
 
-/**
+/*
  * Chops samples into the given number of slices, triggering those slices with a given pattern of slice numbers.
- * Instead of a number, it also accepts a list of numbers from 0 to 1 to slice at specific points.
  * @name slice
  * @memberof Pattern
  * @returns Pattern
  * @example
  * await samples('github:tidalcycles/Dirt-Samples/master')
  * s("breaks165").slice(8, "0 1 <2 2*2> 3 [4 0] 5 6 7".every(3, rev)).slow(1.5)
- * @example
- * await samples('github:tidalcycles/Dirt-Samples/master')
- * s("breaks125/2").fit().slice([0,.25,.5,.75], "0 1 1 <2 3>")
  */
 
-export const slice = register(
+const slice = register(
   'slice',
   function (npat, ipat, opat) {
     return npat.innerBind((n) =>
@@ -2263,9 +2259,9 @@ export const slice = register(
         opat.outerBind((o) => {
           // If it's not an object, assume it's a string and make it a 's' control parameter
           o = o instanceof Object ? o : { s: o };
-          const begin = Array.isArray(n) ? n[i] : i / n;
-          const end = Array.isArray(n) ? n[i + 1] : (i + 1) / n;
-          return pure({ begin, end, _slices: n, ...o });
+          // Remember we must stay pure and avoid editing the object directly
+          const toAdd = { begin: i / n, end: (i + 1) / n, _slices: n };
+          return pure({ ...toAdd, ...o });
         }),
       ),
     );
@@ -2283,7 +2279,7 @@ export const slice = register(
  * s("breaks165").splice(8,  "0 1 [2 3 0]@2 3 0@2 7").hurry(0.65)
  */
 
-export const splice = register(
+const splice = register(
   'splice',
   function (npat, ipat, opat) {
     const sliced = slice(npat, ipat, opat);
@@ -2300,26 +2296,10 @@ export const splice = register(
   false, // turns off auto-patternification
 );
 
-// this function will be redefined in repl.mjs to use the correct cps value.
-// It is still here to work in cases where repl.mjs is not used
-
-export const { loopAt, loopat } = register(['loopAt', 'loopat'], function (factor, pat) {
+const { loopAt, loopat } = register(['loopAt', 'loopat'], function (factor, pat) {
   return _loopAt(factor, pat, 1);
 });
 
-// this function will be redefined in repl.mjs to use the correct cps value.
-// It is still here to work in cases where repl.mjs is not used
-
-export const fit = register('fit', (pat) =>
-  pat.withHap((hap) =>
-    hap.withValue((v) => ({
-      ...v,
-      speed: 1 / hap.whole.duration,
-      unit: 'c',
-    })),
-  ),
-);
-
 /**
  * Makes the sample fit the given number of cycles and cps value, by
  * changing the speed. Please note that at some point cps will be
@@ -2333,6 +2313,6 @@ export const fit = register('fit', (pat) =>
  * s("rhodes").loopAtCps(4,1.5).cps(1.5)
  */
 // TODO - global cps clock
-export const { loopAtCps, loopatcps } = register(['loopAtCps', 'loopatcps'], function (factor, cps, pat) {
+const { loopAtCps, loopatcps } = register(['loopAtCps', 'loopatcps'], function (factor, cps, pat) {
   return _loopAt(factor, pat, cps);
 });

packages/core/pianoroll.mjs

@@ -1,6 +1,6 @@
 /*
 pianoroll.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/pianoroll.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/tone/pianoroll.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/>.
 */
 
@@ -83,9 +83,9 @@ Pattern.prototype.pianoroll = function ({
         ctx.fillRect(0, 0, w, h);
       }
       const inFrame = (event) =>
-        (!hideNegative || event.whole.begin >= 0) && event.whole.begin <= t + to && event.endClipped >= t + from;
+        (!hideNegative || event.whole.begin >= 0) && event.whole.begin <= t + to && event.whole.end >= t + from;
       events.filter(inFrame).forEach((event) => {
-        const isActive = event.whole.begin <= t && event.endClipped > t;
+        const isActive = event.whole.begin <= t && event.whole.end > t;
         ctx.fillStyle = event.context?.color || inactive;
         ctx.strokeStyle = event.context?.color || active;
         ctx.globalAlpha = event.context.velocity ?? event.value?.gain ?? 1;
@@ -246,7 +246,7 @@ export function pianoroll({
   haps
     // .filter(inFrame)
     .forEach((event) => {
-      const isActive = event.whole.begin <= time && event.endClipped > time;
+      const isActive = event.whole.begin <= time && event.whole.end > time;
       const color = event.value?.color || event.context?.color;
       ctx.fillStyle = color || inactive;
       ctx.strokeStyle = color || active;

packages/core/repl.mjs

@@ -3,7 +3,6 @@ import { evaluate as _evaluate } from './evaluate.mjs';
 import { logger } from './logger.mjs';
 import { setTime } from './time.mjs';
 import { evalScope } from './evaluate.mjs';
-import { register } from './pattern.mjs';
 
 export function repl({
   interval,
@@ -35,10 +34,11 @@ export function repl({
     }
     try {
       await beforeEval?.({ code });
-      let { pattern, meta } = await _evaluate(code, transpiler);
+      let { pattern } = await _evaluate(code, transpiler);
+
       logger(`[eval] code updated`);
       setPattern(pattern, autostart);
-      afterEval?.({ code, pattern, meta });
+      afterEval?.({ code, pattern });
       return pattern;
     } catch (err) {
       // console.warn(`[repl] eval error: ${err.message}`);
@@ -50,32 +50,10 @@ export function repl({
   const start = () => scheduler.start();
   const pause = () => scheduler.pause();
   const setCps = (cps) => scheduler.setCps(cps);
-  const setCpm = (cpm) => scheduler.setCps(cpm / 60);
-
-  // the following functions use the cps value, which is why they are defined here..
-  const loopAt = register('loopAt', (cycles, pat) => {
-    return pat.loopAtCps(cycles, scheduler.cps);
-  });
-
-  const fit = register('fit', (pat) =>
-    pat.withHap((hap) =>
-      hap.withValue((v) => ({
-        ...v,
-        speed: scheduler.cps / hap.whole.duration, // overwrite speed completely?
-        unit: 'c',
-      })),
-    ),
-  );
-
   evalScope({
-    loopAt,
-    fit,
     setCps,
     setcps: setCps,
-    setCpm,
-    setcpm: setCpm,
   });
-
   return { scheduler, evaluate, start, stop, pause, setCps, setPattern };
 }
 

packages/core/signal.mjs

@@ -27,7 +27,7 @@ export const isaw2 = isaw.toBipolar();
  *
  * @return {Pattern}
  * @example
- * "c3 [eb3,g3] g2 [g3,bb3]".note().clip(saw.slow(4))
+ * "c3 [eb3,g3] g2 [g3,bb3]".legato(saw.slow(4)).note()
  * @example
  * saw.range(0,8).segment(8).scale('C major').slow(4).note()
  *
@@ -191,6 +191,13 @@ export const chooseInWith = (pat, xs) => {
  */
 export const choose = (...xs) => chooseWith(rand, xs);
 
+/**
+ * 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
+ * the range 0 .. 1.
+ * @param  {...any} xs
+ * @returns {Pattern}
+ */
 Pattern.prototype.choose = function (...xs) {
   return chooseWith(this, xs);
 };

packages/core/spiral.mjs

@@ -1,118 +0,0 @@
-import { Pattern } from './index.mjs';
-
-// polar coords -> xy
-function fromPolar(angle, radius, cx, cy) {
-  const radians = ((angle - 90) * Math.PI) / 180;
-  return [cx + Math.cos(radians) * radius, cy + Math.sin(radians) * radius];
-}
-
-const xyOnSpiral = (angle, margin, cx, cy, rotate = 0) => fromPolar((angle + rotate) * 360, margin * angle, cx, cy); // TODO: logSpiral
-
-// draw spiral / segment of spiral
-function spiralSegment(options) {
-  let {
-    ctx,
-    from = 0,
-    to = 3,
-    margin = 50,
-    cx = 100,
-    cy = 100,
-    rotate = 0,
-    thickness = margin / 2,
-    color = '#0000ff30',
-    cap = 'round',
-    stretch = 1,
-    fromOpacity = 1,
-    toOpacity = 1,
-  } = options;
-  from *= stretch;
-  to *= stretch;
-  rotate *= stretch;
-  ctx.lineWidth = thickness;
-  ctx.lineCap = cap;
-  ctx.strokeStyle = color;
-  ctx.globalAlpha = fromOpacity;
-
-  ctx.beginPath();
-  let [sx, sy] = xyOnSpiral(from, margin, cx, cy, rotate);
-  ctx.moveTo(sx, sy);
-
-  const increment = 1 / 60;
-  let angle = from;
-  while (angle <= to) {
-    const [x, y] = xyOnSpiral(angle, margin, cx, cy, rotate);
-    //ctx.lineWidth = angle*thickness;
-    ctx.globalAlpha = ((angle - from) / (to - from)) * toOpacity;
-    ctx.lineTo(x, y);
-    angle += increment;
-  }
-  ctx.stroke();
-}
-
-Pattern.prototype.spiral = function (options = {}) {
-  const {
-    stretch = 1,
-    size = 80,
-    thickness = size / 2,
-    cap = 'butt', // round butt squar,
-    inset = 3, // start angl,
-    playheadColor = '#ffffff90',
-    playheadLength = 0.02,
-    playheadThickness = thickness,
-    padding = 0,
-    steady = 1,
-    inactiveColor = '#ffffff20',
-    colorizeInactive = 0,
-    fade = true,
-    // logSpiral = true,
-  } = options;
-
-  function spiral({ ctx, time, haps, drawTime }) {
-    const [w, h] = [ctx.canvas.width, ctx.canvas.height];
-    ctx.clearRect(0, 0, w * 2, h * 2);
-    const [cx, cy] = [w / 2, h / 2];
-    const settings = {
-      margin: size / stretch,
-      cx,
-      cy,
-      stretch,
-      cap,
-      thickness,
-    };
-
-    const playhead = {
-      ...settings,
-      thickness: playheadThickness,
-      from: inset - playheadLength,
-      to: inset,
-      color: playheadColor,
-    };
-
-    const [min] = drawTime;
-    const rotate = steady * time;
-    haps.forEach((hap) => {
-      const isActive = hap.whole.begin <= time && hap.endClipped > time;
-      const from = hap.whole.begin - time + inset;
-      const to = hap.endClipped - time + inset - padding;
-      const { color } = hap.context;
-      const opacity = fade ? 1 - Math.abs((hap.whole.begin - time) / min) : 1;
-      spiralSegment({
-        ctx,
-        ...settings,
-        from,
-        to,
-        rotate,
-        color: colorizeInactive || isActive ? color : inactiveColor,
-        fromOpacity: opacity,
-        toOpacity: opacity,
-      });
-    });
-    spiralSegment({
-      ctx,
-      ...playhead,
-      rotate,
-    });
-  }
-
-  return this.onPaint((ctx, time, haps, drawTime) => spiral({ ctx, time, haps, drawTime }));
-};

packages/core/test/solmization.test.js

@@ -1,40 +0,0 @@
-/*test for issue 302 support alternative solmization types */
-import { sol2note } from '../util.mjs';
-import { test } from 'vitest';
-import assert from 'assert';
-
-test('solmization - letters', () => {
-  const result = sol2note(60, 'letters');
-  const expected = 'C4';
-  assert.equal(result, expected);
-});
-
-test('solmization - solfeggio', () => {
-  const result = sol2note(60, 'solfeggio');
-  const expected = 'Do4';
-  assert.equal(result, expected);
-});
-
-test('solmization - indian', () => {
-  const result = sol2note(60, 'indian');
-  const expected = 'Sa4';
-  assert.equal(result, expected);
-});
-
-test('solmization - german', () => {
-  const result = sol2note(60, 'german');
-  const expected = 'C4';
-  assert.equal(result, expected);
-});
-
-test('solmization - byzantine', () => {
-  const result = sol2note(60, 'byzantine');
-  const expected = 'Ni4';
-  assert.equal(result, expected);
-});
-
-test('solmization - japanese', () => {
-  const result = sol2note(60, 'japanese');
-  const expected = 'I4';
-  assert.equal(result, expected);
-});

packages/core/ui.mjs

@@ -1,6 +1,6 @@
 /*
 ui.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/ui.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/tone/ui.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/>.
 */
 

packages/core/util.mjs

@@ -6,29 +6,26 @@ This program is free software: you can redistribute it and/or modify it under th
 
 // returns true if the given string is a note
 export const isNoteWithOctave = (name) => /^[a-gA-G][#bs]*[0-9]$/.test(name);
-export const isNote = (name) => /^[a-gA-G][#bsf]*[0-9]?$/.test(name);
+export const isNote = (name) => /^[a-gA-G][#bs]*[0-9]?$/.test(name);
 export const tokenizeNote = (note) => {
   if (typeof note !== 'string') {
     return [];
   }
-  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bsf]*)([0-9]*)$/)?.slice(1) || [];
+  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bs]*)([0-9])?$/)?.slice(1) || [];
   if (!pc) {
     return [];
   }
   return [pc, acc, oct ? Number(oct) : undefined];
 };
 
-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 };
-
 // turns the given note into its midi number representation
-export const noteToMidi = (note, defaultOctave = 3) => {
-  const [pc, acc, oct = defaultOctave] = tokenizeNote(note);
+export const noteToMidi = (note) => {
+  const [pc, acc, oct = 3] = tokenizeNote(note);
   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;
+  const chroma = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 }[pc.toLowerCase()];
+  const offset = acc?.split('').reduce((o, char) => o + { '#': 1, b: -1, s: 1 }[char], 0) || 0;
   return (Number(oct) + 1) * 12 + chroma + offset;
 };
 export const midiToFreq = (n) => {
@@ -72,7 +69,7 @@ export const getFreq = (noteOrMidi) => {
 
 const pcs = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'];
 /**
- * @deprecated only used in workshop (first-notes)
+ * @deprecated does not appear to be referenced or invoked anywhere in the codebase
  * @noAutocomplete
  */
 export const midi2note = (n) => {
@@ -218,59 +215,3 @@ export const splitAt = function (index, value) {
 export const zipWith = (f, xs, ys) => xs.map((n, i) => f(n, ys[i]));
 
 export const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
-
-/* solmization, not used yet */
-const solfeggio = ['Do', 'Reb', 'Re', 'Mib', 'Mi', 'Fa', 'Solb', 'Sol', 'Lab', 'La', 'Sib', 'Si']; /*solffegio notes*/
-const indian = [
-  'Sa',
-  'Re',
-  'Ga',
-  'Ma',
-  'Pa',
-  'Dha',
-  'Ni',
-]; /*indian musical notes,  seems like they do not use flats or sharps*/
-const german = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Hb', 'H']; /*german & dutch musical notes*/
-const byzantine = [
-  'Ni',
-  'Pab',
-  'Pa',
-  'Voub',
-  'Vou',
-  'Ga',
-  'Dib',
-  'Di',
-  'Keb',
-  'Ke',
-  'Zob',
-  'Zo',
-]; /*byzantine musical notes*/
-const japanese = [
-  'I',
-  'Ro',
-  'Ha',
-  'Ni',
-  'Ho',
-  'He',
-  'To',
-]; /*traditional japanese musical notes, seems like they do not use falts or sharps*/
-
-const english = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'];
-
-export const sol2note = (n, notation = 'letters') => {
-  const pc =
-    notation === 'solfeggio'
-      ? solfeggio /*check if its is any of the following*/
-      : notation === 'indian'
-      ? indian
-      : notation === 'german'
-      ? german
-      : notation === 'byzantine'
-      ? byzantine
-      : notation === 'japanese'
-      ? japanese
-      : english; /*if not use standard version*/
-  const note = pc[n % 12]; /*calculating the midi value to the note*/
-  const oct = Math.floor(n / 12) - 1;
-  return note + oct;
-};

packages/csound/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/csound",
-  "version": "0.8.0",
+  "version": "0.7.1",
   "description": "csound bindings for strudel",
   "main": "index.mjs",
   "publishConfig": {

packages/eval/.gitignore

@@ -0,0 +1,3 @@
+shift-parser
+shift-reducer
+!shift-traverser

packages/eval/README.md

@@ -0,0 +1,50 @@
+# @strudel.cycles/eval
+
+This package contains the strudel code transformer and evaluator.
+It allows creating strudel patterns from input code that is optimized for minimal keystrokes and human readability.
+
+## Deprecation Note
+
+This package will not be developed further. Consider using `@strudel.cycles/transpiler` as a replacement.
+
+## Install
+
+```sh
+npm i @strudel.cycles/eval --save
+```
+
+## Example
+
+```js
+import { evalScope } from '@strudel.cycles/core';
+import { evaluate } from '@strudel.cycles/eval';
+
+evalScope(
+  import('@strudel.cycles/core'),
+  // import other strudel packages here
+); // add strudel to eval scope
+
+async function run(code) {
+  const { pattern } = await evaluate(code);
+  const events = pattern.firstCycle();
+  console.log(events.map((e) => e.show()).join('\n'));
+}
+
+run('sequence([a3, [b3, c4]])');
+```
+
+yields:
+
+```js
+(0/1 -> 1/2, 0/1 -> 1/2, a3)
+(1/2 -> 3/4, 1/2 -> 3/4, b3)
+(3/4 -> 1/1, 3/4 -> 1/1, c4)
+```
+
+[play with @strudel.cycles/eval on codesandbox](https://codesandbox.io/s/strudel-eval-example-ndz1d8?file=/src/index.js)
+
+## Dev Notes
+
+shift-traverser is currently monkey patched because its package.json uses estraverse@^4.2.0,
+which does not support the spread operator (Error: Unknown node type SpreadProperty.).
+By monkey patched, I mean I copied the source of shift-traverser to a subfolder and installed the dependencies (shift-spec + estraverse@^5.3.0)

packages/eval/evaluate.mjs

@@ -0,0 +1,12 @@
+/*
+evaluate.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/evaluate.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 { evaluate as _evaluate } from '@strudel.cycles/core';
+import shapeshifter from './shapeshifter.mjs';
+
+export const evaluate = async (code) => {
+  return _evaluate(code, shapeshifter);
+};

packages/eval/index.mjs

@@ -0,0 +1 @@
+export * from './evaluate.mjs';

packages/eval/package.json

@@ -0,0 +1,50 @@
+{
+  "name": "@strudel.cycles/eval",
+  "version": "0.7.1",
+  "description": "Code evaluator for strudel",
+  "main": "index.mjs",
+  "publishConfig": {
+    "main": "dist/index.js",
+    "module": "dist/index.mjs"
+  },
+  "scripts": {
+    "build": "vite build",
+    "test": "vitest run",
+    "prepublishOnly": "npm run build"
+  },
+  "type": "module",
+  "directories": {
+    "test": "test"
+  },
+  "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.cycles/core": "workspace:*",
+    "estraverse": "^5.3.0",
+    "shift-ast": "^7.0.0",
+    "shift-codegen": "^8.1.0",
+    "shift-parser": "^8.0.0",
+    "shift-spec": "^2019.0.0",
+    "shift-traverser": "^1.0.0"
+  },
+  "devDependencies": {
+    "@strudel.cycles/mini": "workspace:*",
+    "vite": "^4.3.3",
+    "vitest": "^0.28.0"
+  }
+}

packages/eval/shapeshifter.mjs

@@ -0,0 +1,296 @@
+/*
+shapeshifter.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/shapeshifter.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 { parseScriptWithLocation } from './shift-parser/index.js'; // npm module does not work in the browser
+import traverser from './shift-traverser/index.js'; // npm module does not work in the browser */
+import { parseScriptWithLocation } from 'shift-parser';
+import traverser from './shift-traverser/index.js';
+const { replace } = traverser;
+import {
+  LiteralStringExpression,
+  IdentifierExpression,
+  CallExpression,
+  StaticMemberExpression,
+  ReturnStatement,
+  ArrayExpression,
+  LiteralNumericExpression,
+} from 'shift-ast';
+import shiftCodegen from 'shift-codegen';
+const codegen = shiftCodegen.default || shiftCodegen; // parcel module resolution fuckup
+
+import * as strudel from '@strudel.cycles/core';
+
+const { Pattern } = strudel;
+
+const isNote = (name) => /^[a-gC-G][bs]?[0-9]$/.test(name);
+
+const addLocations = true;
+export const addMiniLocations = true;
+export const minifyStrings = true;
+export const wrappedAsync = false; // this is now handled by core evaluate by default
+export const shouldAddReturn = true;
+
+export default (_code) => {
+  const { code, addReturn } = wrapAsync(_code);
+  const ast = parseScriptWithLocation(disguiseImports(code));
+  const artificialNodes = [];
+  const parents = [];
+  const shifted = replace(ast.tree, {
+    enter(node, parent) {
+      parents.push(parent);
+      const isSynthetic = parents.some((p) => artificialNodes.includes(p));
+      if (isSynthetic) {
+        return node;
+      }
+
+      // replace template string `xxx` with mini(`xxx`)
+      if (minifyStrings && isBackTickString(node)) {
+        return minifyWithLocation(node, node, ast.locations, artificialNodes);
+      }
+      // allows to use top level strings, which are normally directives... but we don't need directives
+      if (minifyStrings && node.directives?.length === 1 && !node.statements?.length) {
+        const str = new LiteralStringExpression({ value: node.directives[0].rawValue });
+        const wrapped = minifyWithLocation(str, node.directives[0], ast.locations, artificialNodes);
+        return { ...node, directives: [], statements: [wrapped] };
+      }
+
+      // replace double quote string "xxx" with mini('xxx')
+      if (minifyStrings && isStringWithDoubleQuotes(node, ast.locations, code)) {
+        return minifyWithLocation(node, node, ast.locations, artificialNodes);
+      }
+
+      // operator overloading => still not done
+      const operators = {
+        '*': 'fast',
+        '/': 'slow',
+        '&': 'stack',
+        '&&': 'append',
+      };
+      if (
+        node.type === 'BinaryExpression' &&
+        operators[node.operator] &&
+        ['LiteralNumericExpression', 'LiteralStringExpression', 'IdentifierExpression'].includes(node.right?.type) &&
+        canBeOverloaded(node.left)
+      ) {
+        let arg = node.left;
+        if (node.left.type === 'IdentifierExpression') {
+          arg = wrapFunction('reify', node.left);
+        }
+        return new CallExpression({
+          callee: new StaticMemberExpression({
+            property: operators[node.operator],
+            object: wrapFunction('reify', arg),
+          }),
+          arguments: [node.right],
+        });
+      }
+
+      const isMarkable = isPatternArg(parents) || hasModifierCall(parent);
+      // add to location to pure(x) calls
+      if (node.type === 'CallExpression' && node.callee.name === 'pure') {
+        const literal = node.arguments[0];
+        // const value = literal[{ LiteralNumericExpression: 'value', LiteralStringExpression: 'name' }[literal.type]];
+        return reifyWithLocation(literal, node.arguments[0], ast.locations, artificialNodes);
+      }
+      // replace pseudo note variables
+      if (node.type === 'IdentifierExpression') {
+        if (isNote(node.name)) {
+          const value = node.name[1] === 's' ? node.name.replace('s', '#') : node.name;
+          if (addLocations && isMarkable) {
+            return reifyWithLocation(new LiteralStringExpression({ value }), node, ast.locations, artificialNodes);
+          }
+          return new LiteralStringExpression({ value });
+        }
+        if (node.name === 'r') {
+          return new IdentifierExpression({ name: 'silence' });
+        }
+      }
+      if (
+        addLocations &&
+        ['LiteralStringExpression' /* , 'LiteralNumericExpression' */].includes(node.type) &&
+        isMarkable
+      ) {
+        // TODO: to make LiteralNumericExpression work, we need to make sure we're not inside timeCat...
+        return reifyWithLocation(node, node, ast.locations, artificialNodes);
+      }
+      if (addMiniLocations) {
+        return addMiniNotationLocations(node, ast.locations, artificialNodes);
+      }
+      return node;
+    },
+    leave() {
+      parents.pop();
+    },
+  });
+  // add return to last statement (because it's wrapped in an async function artificially)
+  if (shouldAddReturn) {
+    addReturn(shifted);
+  }
+  const generated = undisguiseImports(codegen(shifted));
+  return generated;
+};
+
+// renames all import statements to "_mport" as Shift doesn't support dynamic import.
+// there shouldn't be any side-effects from this as this change does not affect
+// the syntax & will be undone by the equivalent replace in "undisguiseImports".
+function disguiseImports(code) {
+  return code.replaceAll('import', '_mport'); // Must be the same length!
+}
+
+// Rename the renamed import statements back to "import"
+function undisguiseImports(code) {
+  return code.replaceAll('_mport', 'import');
+}
+
+function wrapAsync(code) {
+  // wrap code in async to make await work on top level => this will create 1 line offset to locations
+  // this is why line offset is -1 in getLocationObject calls below
+  if (wrappedAsync) {
+    code = `(async () => {
+${code}
+})()`;
+  }
+  const addReturn = (ast) => {
+    const body = wrappedAsync ? ast.statements[0].expression.callee.body : ast;
+    body.statements = body.statements
+      .slice(0, -1)
+      .concat([new ReturnStatement({ expression: body.statements.slice(-1)[0] })]);
+  };
+  return {
+    code,
+    addReturn,
+  };
+}
+
+function addMiniNotationLocations(node, locations, artificialNodes) {
+  const miniFunctions = ['mini', 'm'];
+  // const isAlreadyWrapped = parent?.type === 'CallExpression' && parent.callee.name === 'withLocationOffset';
+  if (node.type === 'CallExpression' && miniFunctions.includes(node.callee.name)) {
+    // mini('c3')
+    if (node.arguments.length > 1) {
+      // TODO: transform mini(...args) to cat(...args.map(mini)) ?
+      console.warn('multi arg mini locations not supported yet...');
+      return node;
+    }
+    const str = node.arguments[0];
+    return minifyWithLocation(str, str, locations, artificialNodes);
+  }
+  if (node.type === 'StaticMemberExpression' && miniFunctions.includes(node.property)) {
+    // 'c3'.mini or 'c3'.m
+    return minifyWithLocation(node.object, node, locations, artificialNodes);
+  }
+  return node;
+}
+
+function wrapFunction(name, ...args) {
+  return new CallExpression({
+    callee: new IdentifierExpression({ name }),
+    arguments: args,
+  });
+}
+
+function isBackTickString(node) {
+  return node.type === 'TemplateExpression' && node.elements.length === 1;
+}
+
+function isStringWithDoubleQuotes(node, locations, code) {
+  if (node.type !== 'LiteralStringExpression') {
+    return false;
+  }
+  const loc = locations.get(node);
+  const snippet = code.slice(loc.start.offset, loc.end.offset);
+  return snippet[0] === '"'; // we can trust the end is also ", as the parsing did not fail
+}
+
+// returns true if the given parents belong to a pattern argument node
+// this is used to check if a node should receive a location for highlighting
+function isPatternArg(parents) {
+  if (!parents.length) {
+    return false;
+  }
+  const ancestors = parents.slice(0, -1);
+  const parent = parents[parents.length - 1];
+  if (isPatternFactory(parent)) {
+    return true;
+  }
+  if (parent?.type === 'ArrayExpression') {
+    return isPatternArg(ancestors);
+  }
+  return false;
+}
+
+function hasModifierCall(parent) {
+  // TODO: modifiers are more than composables, for example every is not composable but should be seen as modifier..
+  // need all prototypes of Pattern
+  return parent?.type === 'StaticMemberExpression';
+  // && Object.keys(Pattern.prototype.composable).includes(parent.property)
+}
+const factories = Object.keys(Pattern.prototype.factories).concat(['mini']);
+
+function isPatternFactory(node) {
+  return node?.type === 'CallExpression' && factories.includes(node.callee.name);
+}
+
+function canBeOverloaded(node) {
+  return (node.type === 'IdentifierExpression' && isNote(node.name)) || isPatternFactory(node);
+  // TODO: support sequence(c3).transpose(3).x.y.z
+}
+
+// turns node in reify(value).withLocation(location), where location is the node's location in the source code
+// with this, the reified pattern can pass its location to the event, to know where to highlight when it's active
+function reifyWithLocation(literalNode, node, locations, artificialNodes) {
+  const args = getLocationArguments(node, locations);
+  const withLocation = new CallExpression({
+    callee: new StaticMemberExpression({
+      object: wrapFunction('reify', literalNode),
+      property: 'withLocation',
+    }),
+    arguments: args,
+  });
+  artificialNodes.push(withLocation);
+  return withLocation;
+}
+
+// turns node in reify(value).withLocation(location), where location is the node's location in the source code
+// with this, the reified pattern can pass its location to the event, to know where to highlight when it's active
+function minifyWithLocation(literalNode, node, locations, artificialNodes) {
+  const args = getLocationArguments(node, locations);
+  const wrapped = wrapFunction('mini', literalNode);
+  if (!addMiniLocations) {
+    artificialNodes.push(wrapped);
+    return wrapped;
+  }
+  const withLocation = new CallExpression({
+    callee: new StaticMemberExpression({
+      object: wrapped,
+      property: 'withMiniLocation',
+    }),
+    arguments: args,
+  });
+  artificialNodes.push(withLocation);
+  return withLocation;
+}
+
+function getLocationArguments(node, locations) {
+  const loc = locations.get(node);
+  const lineOffset = wrappedAsync ? -1 : 0;
+  return [
+    new ArrayExpression({
+      elements: [
+        new LiteralNumericExpression({ value: loc.start.line + lineOffset }), // the minus 1 assumes the code has been wrapped in async iife
+        new LiteralNumericExpression({ value: loc.start.column }),
+        new LiteralNumericExpression({ value: loc.start.offset }),
+      ],
+    }),
+    new ArrayExpression({
+      elements: [
+        new LiteralNumericExpression({ value: loc.end.line + lineOffset }), // the minus 1 assumes the code has been wrapped in async iife
+        new LiteralNumericExpression({ value: loc.end.column }),
+        new LiteralNumericExpression({ value: loc.end.offset }),
+      ],
+    }),
+  ];
+}

packages/eval/shift-traverser/index.js

@@ -0,0 +1,68 @@
+/*
+index.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/shift-traverser/index.js>
+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/>.
+*/
+
+/*
+  Copyright (C) 2014 Yusuke Suzuki <utatane.tea@gmail.com>
+
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+  ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+  DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+  (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+  LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+  THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+import _Spec from 'shift-spec';
+const Spec = _Spec.default || _Spec; // parcel module resolution fuckup
+// import { version } from '../package.json'
+
+// Loading uncached estraverse for changing estraverse.Syntax.
+import _estraverse from 'estraverse';
+
+const estraverse = _estraverse.cloneEnvironment();
+
+// Adjust estraverse members.
+
+Object.keys(estraverse.Syntax)
+  .filter((key) => key !== 'Property')
+  .forEach((key) => {
+    delete estraverse.Syntax[key];
+    delete estraverse.VisitorKeys[key];
+  });
+
+Object.assign(
+  estraverse.Syntax,
+  Object.keys(Spec).reduce((result, key) => {
+    result[key] = key;
+    return result;
+  }, {}),
+);
+
+Object.assign(
+  estraverse.VisitorKeys,
+  Object.keys(Spec).reduce((result, key) => {
+    result[key] = Spec[key].fields.map((field) => field.name);
+    return result;
+  }, {}),
+);
+
+// estraverse.version = version;
+export default estraverse;
+
+/* vim: set sw=4 ts=4 et tw=80 : */

packages/eval/test/evaluate.test.mjs

@@ -0,0 +1,32 @@
+/*
+evaluate.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/test/evaluate.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 { expect, describe, it } from 'vitest';
+
+import { evaluate } from '../evaluate.mjs';
+import { mini } from '@strudel.cycles/mini';
+import * as strudel from '@strudel.cycles/core';
+const { fastcat, evalScope } = strudel;
+
+describe('evaluate', async () => {
+  await evalScope({ mini }, strudel);
+  const ev = async (code) => (await evaluate(code)).pattern.firstCycleValues;
+  it('Should evaluate strudel functions', async () => {
+    expect(await ev('pure("c3")')).toEqual(['c3']);
+    expect(await ev('cat("c3")')).toEqual(['c3']);
+    expect(await ev('fastcat("c3", "d3")')).toEqual(['c3', 'd3']);
+    expect(await ev('slowcat("c3", "d3")')).toEqual(['c3']);
+  });
+  it('Scope should be extendable', async () => {
+    await evalScope({ myFunction: (...x) => fastcat(...x) });
+    expect(await ev('myFunction("c3", "d3")')).toEqual(['c3', 'd3']);
+  });
+  it('Should evaluate simple double quoted mini notation', async () => {
+    expect(await ev('"c3"')).toEqual(['c3']);
+    expect(await ev('"c3 d3"')).toEqual(['c3', 'd3']);
+    expect(await ev('"<c3 d3>"')).toEqual(['c3']);
+  });
+});

packages/eval/test/shapeshifter.test.mjs

@@ -0,0 +1,25 @@
+/*
+shapeshifter.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/test/shapeshifter.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, it, expect } from 'vitest';
+import shapeshifter, { wrappedAsync } from '../shapeshifter.mjs';
+
+describe('shapeshifter', () => {
+  it('Should shift simple double quote string', () => {
+    if (wrappedAsync) {
+      expect(shapeshifter('"c3"')).toEqual('(async()=>{return mini("c3").withMiniLocation([1,0,15],[1,4,19])})()');
+    } else {
+      expect(shapeshifter('"c3"')).toEqual('return mini("c3").withMiniLocation([1,0,0],[1,4,4])');
+    }
+  });
+  if (wrappedAsync) {
+    it('Should handle dynamic imports', () => {
+      expect(shapeshifter('const { default: foo } = await import(\'https://bar.com/foo.js\');"c3"')).toEqual(
+        'const{default:foo}=await import("https://bar.com/foo.js");return mini("c3").withMiniLocation([1,64,79],[1,68,83])',
+      );
+    });
+  }
+});

packages/eval/vite.config.js

@@ -0,0 +1,19 @@
+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, 'index.mjs'),
+      formats: ['es', 'cjs'],
+      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
+    },
+    rollupOptions: {
+      external: [...Object.keys(dependencies)],
+    },
+    target: 'esnext',
+  },
+});

packages/midi/midi.mjs

@@ -105,7 +105,7 @@ Pattern.prototype.midi = function (output) {
     hap.ensureObjectValue();
 
     // calculate time
-    const timingOffset = WebMidi.time - getAudioContext().getOutputTimestamp().contextTime * 1000;
+    const timingOffset = WebMidi.time - getAudioContext().currentTime * 1000;
     time = time * 1000 + timingOffset;
 
     // destructure value
@@ -113,8 +113,8 @@ Pattern.prototype.midi = function (output) {
     const velocity = hap.context?.velocity ?? 0.9; // TODO: refactor velocity
     const duration = hap.duration.valueOf() * 1000 - 5;
 
-    if (note != null) {
-      const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
+    if (note) {
+      const midiNumber = noteToMidi(note);
       device.playNote(midiNumber, midichan, {
         time,
         duration,

packages/midi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/midi",
-  "version": "0.8.0",
+  "version": "0.7.1",
   "description": "Midi API for strudel",
   "main": "index.mjs",
   "publishConfig": {

packages/mini/mini.mjs

@@ -9,7 +9,7 @@ import * as strudel from '@strudel.cycles/core';
 
 const randOffset = 0.0003;
 
-const applyOptions = (parent, enter) => (pat, i) => {
+const applyOptions = (parent, code) => (pat, i) => {
   const ast = parent.source_[i];
   const options = ast.options_;
   const ops = options?.ops;
@@ -23,14 +23,18 @@ const applyOptions = (parent, enter) => (pat, i) => {
           if (!legalTypes.includes(type)) {
             throw new Error(`mini: stretch: type must be one of ${legalTypes.join('|')} but got ${type}`);
           }
-          pat = strudel.reify(pat)[type](enter(amount));
+          pat = strudel.reify(pat)[type](patternifyAST(amount, code));
           break;
         }
         case 'bjorklund': {
           if (op.arguments_.rotation) {
-            pat = pat.euclidRot(enter(op.arguments_.pulse), enter(op.arguments_.step), enter(op.arguments_.rotation));
+            pat = pat.euclidRot(
+              patternifyAST(op.arguments_.pulse, code),
+              patternifyAST(op.arguments_.step, code),
+              patternifyAST(op.arguments_.rotation, code),
+            );
           } else {
-            pat = pat.euclid(enter(op.arguments_.pulse), enter(op.arguments_.step));
+            pat = pat.euclid(patternifyAST(op.arguments_.pulse, code), patternifyAST(op.arguments_.step, code));
           }
           break;
         }
@@ -41,7 +45,7 @@ const applyOptions = (parent, enter) => (pat, i) => {
           break;
         }
         case 'tail': {
-          const friend = enter(op.arguments_.element);
+          const friend = patternifyAST(op.arguments_.element, code);
           pat = pat.fmap((a) => (b) => Array.isArray(a) ? [...a, b] : [a, b]).appLeft(friend);
           break;
         }
@@ -68,14 +72,11 @@ function resolveReplications(ast) {
   );
 }
 
-// expects ast from mini2ast + quoted mini string + optional callback when a node is entered
-export function patternifyAST(ast, code, onEnter, offset = 0) {
-  onEnter?.(ast);
-  const enter = (node) => patternifyAST(node, code, onEnter, offset);
+export function patternifyAST(ast, code) {
   switch (ast.type_) {
     case 'pattern': {
       resolveReplications(ast);
-      const children = ast.source_.map((child) => enter(child)).map(applyOptions(ast, enter));
+      const children = ast.source_.map((child) => patternifyAST(child, code)).map(applyOptions(ast, code));
       const alignment = ast.arguments_.alignment;
       if (alignment === 'stack') {
         return strudel.stack(...children);
@@ -83,7 +84,7 @@ export function patternifyAST(ast, code, onEnter, offset = 0) {
       if (alignment === 'polymeter') {
         // polymeter
         const stepsPerCycle = ast.arguments_.stepsPerCycle
-          ? enter(ast.arguments_.stepsPerCycle).fmap((x) => strudel.Fraction(x))
+          ? patternifyAST(ast.arguments_.stepsPerCycle, code).fmap((x) => strudel.Fraction(x))
           : strudel.pure(strudel.Fraction(children.length > 0 ? children[0].__weight : 1));
 
         const aligned = children.map((child) => child.fast(stepsPerCycle.fmap((x) => x.div(child.__weight || 1))));
@@ -110,7 +111,7 @@ export function patternifyAST(ast, code, onEnter, offset = 0) {
       return pat;
     }
     case 'element': {
-      return enter(ast.source_);
+      return patternifyAST(ast.source_, code);
     }
     case 'atom': {
       if (ast.source_ === '~') {
@@ -120,82 +121,66 @@ export function patternifyAST(ast, code, onEnter, offset = 0) {
         console.warn('no location for', ast);
         return ast.source_;
       }
+      const { start, end } = ast.location_;
       const value = !isNaN(Number(ast.source_)) ? Number(ast.source_) : ast.source_;
-      if (offset === -1) {
-        // skip location handling (used when getting leaves to avoid confusion)
-        return strudel.pure(value);
-      }
-      const [from, to] = getLeafLocation(code, ast, offset);
-      return strudel.pure(value).withLoc(from, to);
+      // the following line expects the shapeshifter append .withMiniLocation
+      // because location_ is only relative to the mini string, but we need it relative to whole code
+      // make sure whitespaces are not part of the highlight:
+      const actual = code?.split('').slice(start.offset, end.offset).join('');
+      const [offsetStart = 0, offsetEnd = 0] = actual
+        ? actual.split(ast.source_).map((p) => p.split('').filter((c) => c === ' ').length)
+        : [];
+      return strudel
+        .pure(value)
+        .withLocation(
+          [start.line, start.column + offsetStart, start.offset + offsetStart],
+          [start.line, end.column - offsetEnd, end.offset - offsetEnd],
+        );
     }
     case 'stretch':
-      return enter(ast.source_).slow(enter(ast.arguments_.amount));
+      return patternifyAST(ast.source_, code).slow(patternifyAST(ast.arguments_.amount, code));
+    /* case 'scale':
+      let [tonic, scale] = Scale.tokenize(ast.arguments_.scale);
+      const intervals = Scale.get(scale).intervals;
+      const pattern = patternifyAST(ast.source_);
+      tonic = tonic || 'C4';
+      // console.log('scale', ast, pattern, tonic, scale);
+      console.log('tonic', tonic);
+      return pattern.fmap((step: any) => {
+        step = Number(step);
+        if (isNaN(step)) {
+          console.warn(`scale step "${step}" not a number`);
+          return step;
+        }
+        const octaves = Math.floor(step / intervals.length);
+        const mod = (n: number, m: number): number => (n < 0 ? mod(n + m, m) : n % m);
+        const index = mod(step, intervals.length); // % with negative numbers. e.g. -1 % 3 = 2
+        const interval = Interval.add(intervals[index], Interval.fromSemitones(octaves * 12));
+        return Note.transpose(tonic, interval || '1P');
+      }); */
+    /* case 'struct':
+      // TODO:
+      return strudel.silence; */
     default:
       console.warn(`node type "${ast.type_}" not implemented -> returning silence`);
       return strudel.silence;
   }
 }
 
-// takes quoted mini string + leaf node within, returns source location of node (whitespace corrected)
-export const getLeafLocation = (code, leaf, globalOffset = 0) => {
-  // value is expected without quotes!
-  const { start, end } = leaf.location_;
-  const actual = code?.split('').slice(start.offset, end.offset).join('');
-  // make sure whitespaces are not part of the highlight
-  const [offsetStart = 0, offsetEnd = 0] = actual
-    ? actual.split(leaf.source_).map((p) => p.split('').filter((c) => c === ' ').length)
-    : [];
-  return [start.offset + offsetStart + globalOffset, end.offset - offsetEnd + globalOffset];
-};
-
-// takes quoted mini string, returns ast
-export const mini2ast = (code) => krill.parse(code);
-
-// takes quoted mini string, returns all nodes that are leaves
-export const getLeaves = (code) => {
-  const ast = mini2ast(code);
-  let leaves = [];
-  patternifyAST(
-    ast,
-    code,
-    (node) => {
-      if (node.type_ === 'atom') {
-        leaves.push(node);
-      }
-    },
-    -1,
-  );
-  return leaves;
-};
-
-// takes quoted mini string, returns locations [fromCol,toCol] of all leaf nodes
-export const getLeafLocations = (code, offset = 0) => {
-  return getLeaves(code).map((l) => getLeafLocation(code, l, offset));
-};
-
 // mini notation only (wraps in "")
 export const mini = (...strings) => {
   const pats = strings.map((str) => {
     const code = `"${str}"`;
-    const ast = mini2ast(code);
+    const ast = krill.parse(code);
     return patternifyAST(ast, code);
   });
   return strudel.sequence(...pats);
 };
 
-// turns str mini string (without quotes) into pattern
-// offset is the position of the mini string in the JS code
-// each leaf node will get .withLoc added
-// this function is used by the transpiler for double quoted strings
-export const m = (str, offset) => {
-  const code = `"${str}"`;
-  const ast = mini2ast(code);
-  return patternifyAST(ast, code, null, offset);
-};
-
 // includes haskell style (raw krill parsing)
 export const h = (string) => {
-  const ast = mini2ast(string);
+  const ast = krill.parse(string);
+  // console.log('ast', ast);
   return patternifyAST(ast, string);
 };
 

packages/mini/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/mini",
-  "version": "0.8.2",
+  "version": "0.8.1",
   "description": "Mini notation for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -37,6 +37,6 @@
   "devDependencies": {
     "peggy": "^3.0.2",
     "vite": "^4.3.3",
-    "vitest": "^0.33.0"
+    "vitest": "^0.28.0"
   }
 }

packages/mini/test/mini.test.mjs

@@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 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 { getLeafLocation, getLeafLocations, mini, mini2ast } from '../mini.mjs';
+import { mini } from '../mini.mjs';
 import '@strudel.cycles/core/euclid.mjs';
 import { describe, expect, it } from 'vitest';
 
@@ -185,36 +185,3 @@ describe('mini', () => {
     expect(minV('a:b c:d:[e:f] g')).toEqual([['a', 'b'], ['c', 'd', ['e', 'f']], 'g']);
   });
 });
-
-describe('getLeafLocation', () => {
-  it('gets location of leaf nodes', () => {
-    const code = '"bd sd"';
-    const ast = mini2ast(code);
-
-    const bd = ast.source_[0].source_;
-    expect(getLeafLocation(code, bd)).toEqual([1, 3]);
-
-    const sd = ast.source_[1].source_;
-    expect(getLeafLocation(code, sd)).toEqual([4, 6]);
-  });
-});
-
-describe('getLeafLocations', () => {
-  it('gets locations of leaf nodes', () => {
-    expect(getLeafLocations('"bd sd"')).toEqual([
-      [1, 3], // bd columns
-      [4, 6], // sd columns
-    ]);
-    expect(getLeafLocations('"bd*2 [sd cp]"')).toEqual([
-      [1, 3], // bd columns
-      [7, 9], // sd columns
-      [10, 12], // cp columns
-      [4, 5], // "2" columns
-    ]);
-    expect(getLeafLocations('"bd*<2 3>"')).toEqual([
-      [1, 3], // bd columns
-      [5, 6], // "2" columns
-      [7, 8], // "3" columns
-    ]);
-  });
-});

packages/osc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/osc",
-  "version": "0.8.0",
+  "version": "0.7.1",
   "description": "OSC messaging for strudel",
   "main": "osc.mjs",
   "publishConfig": {

packages/react/examples/nano-repl/src/App.jsx

@@ -82,10 +82,9 @@ function App() {
     code,
     defaultOutput: webaudioOutput,
     getTime,
-    afterEval: ({ meta }) => setMiniLocations(meta.miniLocations),
   });
 
-  const { setMiniLocations } = useHighlighting({
+  useHighlighting({
     view,
     pattern,
     active: started && !activeCode?.includes('strudel disable-highlighting'),

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/react",
-  "version": "0.8.0",
+  "version": "0.7.1",
   "description": "React components for strudel",
   "main": "src/index.js",
   "publishConfig": {
@@ -42,7 +42,6 @@
     "@strudel.cycles/core": "workspace:*",
     "@strudel.cycles/transpiler": "workspace:*",
     "@strudel.cycles/webaudio": "workspace:*",
-    "@strudel/codemirror": "workspace:*",
     "@uiw/codemirror-themes": "^4.19.16",
     "@uiw/react-codemirror": "^4.19.16",
     "react-hook-inview": "^4.5.0"

packages/react/src/components/CodeMirror6.jsx

@@ -1,38 +1,114 @@
-import { autocompletion } from '@codemirror/autocomplete';
-import { javascript, javascriptLanguage } from '@codemirror/lang-javascript';
-import { EditorView } from '@codemirror/view';
-import { emacs } from '@replit/codemirror-emacs';
-import { vim } from '@replit/codemirror-vim';
+import React, { useMemo } from 'react';
 import _CodeMirror from '@uiw/react-codemirror';
-import React, { useCallback, useMemo } from 'react';
+import { EditorView, Decoration } from '@codemirror/view';
+import { StateField, StateEffect } from '@codemirror/state';
+import { javascript } from '@codemirror/lang-javascript';
 import strudelTheme from '../themes/strudel-theme';
-import { strudelAutocomplete } from './Autocomplete';
-import {
-  highlightExtension,
-  flashField,
-  flash,
-  highlightMiniLocations,
-  updateMiniLocations,
-} from '@strudel/codemirror';
 import './style.css';
+import { useCallback } from 'react';
+import { autocompletion } from '@codemirror/autocomplete';
+//import { strudelAutocomplete } from './Autocomplete';
+import { vim } from '@replit/codemirror-vim';
+import { emacs } from '@replit/codemirror-emacs';
 
-export { flash, highlightMiniLocations, updateMiniLocations };
+export const setFlash = StateEffect.define();
+const flashField = StateField.define({
+  create() {
+    return Decoration.none;
+  },
+  update(flash, tr) {
+    try {
+      for (let e of tr.effects) {
+        if (e.is(setFlash)) {
+          if (e.value) {
+            const mark = Decoration.mark({ attributes: { style: `background-color: #FFCA2880` } });
+            flash = Decoration.set([mark.range(0, tr.newDoc.length)]);
+          } else {
+            flash = Decoration.set([]);
+          }
+        }
+      }
+      return flash;
+    } catch (err) {
+      console.warn('flash error', err);
+      return flash;
+    }
+  },
+  provide: (f) => EditorView.decorations.from(f),
+});
 
-const staticExtensions = [javascript(), flashField, highlightExtension];
+export const flash = (view) => {
+  view.dispatch({ effects: setFlash.of(true) });
+  setTimeout(() => {
+    view.dispatch({ effects: setFlash.of(false) });
+  }, 200);
+};
+
+export const setHighlights = StateEffect.define();
+const highlightField = StateField.define({
+  create() {
+    return Decoration.none;
+  },
+  update(highlights, tr) {
+    try {
+      for (let e of tr.effects) {
+        if (e.is(setHighlights)) {
+          const { haps } = e.value;
+          const marks =
+            haps
+              .map((hap) =>
+                (hap.context.locations || []).map(({ start, end }) => {
+                  const color = hap.context.color || e.value.color;
+                  let from = tr.newDoc.line(start.line).from + start.column;
+                  let to = tr.newDoc.line(end.line).from + end.column;
+                  const l = tr.newDoc.length;
+                  if (from > l || to > l) {
+                    return; // dont mark outside of range, as it will throw an error
+                  }
+                  let mark;
+                  if (color) {
+                    mark = Decoration.mark({ attributes: { style: `outline: 2px solid ${color};` } });
+                  } else {
+                    mark = Decoration.mark({ attributes: { class: `outline outline-2 outline-foreground` } });
+                  }
+                  return mark.range(from, to);
+                }),
+              )
+              .flat()
+              .filter(Boolean) || [];
+          highlights = Decoration.set(marks, true);
+        }
+      }
+      return highlights;
+    } catch (err) {
+      // console.warn('highlighting error', err);
+      return Decoration.set([]);
+    }
+  },
+  provide: (f) => EditorView.decorations.from(f),
+});
+
+const staticExtensions = [
+  javascript(),
+  highlightField,
+  flashField,
+  // javascriptLanguage.data.of({ autocomplete: strudelAutocomplete }),
+  // autocompletion({ override: [strudelAutocomplete] }),
+  autocompletion({ override: [] }), // wait for https://github.com/uiwjs/react-codemirror/pull/458
+];
 
 export default function CodeMirror({
   value,
   onChange,
   onViewChanged,
   onSelectionChange,
-  onDocChange,
   theme,
   keybindings,
   isLineNumbersDisplayed,
-  isAutoCompletionEnabled,
-  isLineWrappingEnabled,
   fontSize = 18,
   fontFamily = 'monospace',
+  options,
+  editorDidMount,
 }) {
   const handleOnChange = useCallback(
     (value) => {
@@ -40,52 +116,30 @@ export default function CodeMirror({
     },
     [onChange],
   );
-
   const handleOnCreateEditor = useCallback(
     (view) => {
       onViewChanged?.(view);
     },
     [onViewChanged],
   );
-
   const handleOnUpdate = useCallback(
     (viewUpdate) => {
-      if (viewUpdate.docChanged && onDocChange) {
-        onDocChange?.(viewUpdate);
-      }
       if (viewUpdate.selectionSet && onSelectionChange) {
         onSelectionChange?.(viewUpdate.state.selection);
       }
     },
     [onSelectionChange],
   );
-
   const extensions = useMemo(() => {
-    let _extensions = [...staticExtensions];
     let bindings = {
       vim,
       emacs,
     };
-
     if (bindings[keybindings]) {
-      _extensions.push(bindings[keybindings]());
+      return [...staticExtensions, bindings[keybindings]()];
     }
-
-    if (isAutoCompletionEnabled) {
-      _extensions.push(javascriptLanguage.data.of({ autocomplete: strudelAutocomplete }));
-    } else {
-      _extensions.push(autocompletion({ override: [] }));
-    }
-
-    if (isLineWrappingEnabled) {
-      _extensions.push(EditorView.lineWrapping);
-    }
-
-    return _extensions;
-  }, [keybindings, isAutoCompletionEnabled, isLineWrappingEnabled]);
-
-  const basicSetup = useMemo(() => ({ lineNumbers: isLineNumbersDisplayed }), [isLineNumbersDisplayed]);
-
+    return staticExtensions;
+  }, [keybindings]);
   return (
     <div style={{ fontSize, fontFamily }} className="w-full">
       <_CodeMirror
@@ -95,8 +149,108 @@ export default function CodeMirror({
         onCreateEditor={handleOnCreateEditor}
         onUpdate={handleOnUpdate}
         extensions={extensions}
-        basicSetup={basicSetup}
+        basicSetup={{ lineNumbers: isLineNumbersDisplayed }}
       />
     </div>
   );
 }
+
+let parenMark;
+export const markParens = (editor, data) => {
+  const v = editor.getDoc().getValue();
+  const marked = getCurrentParenArea(v, data);
+  parenMark?.clear();
+  parenMark = editor.getDoc().markText(...marked, { css: 'background-color: #00007720' }); //
+};
+
+// returns { line, ch } from absolute character offset
+export function offsetToPosition(offset, code) {
+  const lines = code.split('\n');
+  let line = 0;
+  let ch = 0;
+  for (let i = 0; i < offset; i++) {
+    if (ch === lines[line].length) {
+      line++;
+      ch = 0;
+    } else {
+      ch++;
+    }
+  }
+  return { line, ch };
+}
+
+// returns absolute character offset from { line, ch }
+export function positionToOffset(position, code) {
+  const lines = code.split('\n');
+  if (position.line > lines.length) {
+    // throw new Error('positionToOffset: position.line > lines.length');
+    return 0;
+  }
+  let offset = 0;
+  for (let i = 0; i < position.line; i++) {
+    offset += lines[i].length + 1;
+  }
+  offset += position.ch;
+  return offset;
+}
+
+// given code and caret position, the functions returns the indices of the parens we are in
+export function getCurrentParenArea(code, caretPosition) {
+  const caret = positionToOffset(caretPosition, code);
+  let open, i, begin, end;
+  // walk left
+  i = caret;
+  open = 0;
+  while (i > 0) {
+    if (code[i - 1] === '(') {
+      open--;
+    } else if (code[i - 1] === ')') {
+      open++;
+    }
+    if (open === -1) {
+      break;
+    }
+    i--;
+  }
+  begin = i;
+  // walk right
+  i = caret;
+  open = 0;
+  while (i < code.length) {
+    if (code[i] === '(') {
+      open--;
+    } else if (code[i] === ')') {
+      open++;
+    }
+    if (open === 1) {
+      break;
+    }
+    i++;
+  }
+  end = i;
+  return [begin, end].map((o) => offsetToPosition(o, code));
+}
+
+/* 
+export const markEvent = (editor) => (time, event) => {
+  const locs = event.context.locations;
+  if (!locs || !editor) {
+    return;
+  }
+  const col = event.context?.color || '#FFCA28';
+  // mark active event
+  const marks = locs.map(({ start, end }) =>
+    editor.getDoc().markText(
+      { line: start.line - 1, ch: start.column },
+      { line: end.line - 1, ch: end.column },
+      //{ css: 'background-color: #FFCA28; color: black' } // background-color is now used by parent marking
+      { css: 'outline: 1px solid ' + col + '; box-sizing:border-box' },
+      //{ css: `background-color: ${col};border-radius:5px` },
+    ),
+  );
+  //Tone.Transport.schedule(() => { // problem: this can be cleared by scheduler...
+  setTimeout(() => {
+    marks.forEach((mark) => mark.clear());
+    // }, '+' + event.duration * 0.5);
+  }, event.duration * 1000);
+}; */

packages/react/src/components/MiniRepl.jsx

@@ -71,7 +71,6 @@ export function MiniRepl({
     evalOnMount,
     drawContext,
     drawTime,
-    afterEval: ({ meta }) => setMiniLocations(meta.miniLocations),
   });
 
   const [view, setView] = useState();
@@ -85,7 +84,7 @@ export function MiniRepl({
     }
     return isVisible || wasVisible.current;
   }, [isVisible, hideOutsideView]);
-  const { setMiniLocations } = useHighlighting({
+  useHighlighting({
     view,
     pattern,
     active: started && !activeCode?.includes('strudel disable-highlighting'),

packages/react/src/components/style.css

@@ -24,7 +24,3 @@
 .cm-theme-light {
   width: 100%;
 }
-
-footer {
-  z-index: 0 !important;
-}

packages/react/src/hooks/useHighlighting.mjs

@@ -1,18 +1,10 @@
-import { useEffect, useRef, useState } from 'react';
-import { highlightMiniLocations, updateMiniLocations } from '../components/CodeMirror6';
+import { useEffect, useRef } from 'react';
+import { setHighlights } from '../components/CodeMirror6';
 const round = (x) => Math.round(x * 1000) / 1000;
 
 function useHighlighting({ view, pattern, active, getTime }) {
   const highlights = useRef([]);
   const lastEnd = useRef(0);
-
-  const [miniLocations, setMiniLocations] = useState([]);
-  useEffect(() => {
-    if (view) {
-      updateMiniLocations(view, miniLocations);
-    }
-  }, [view, miniLocations]);
-
   useEffect(() => {
     if (view) {
       if (pattern && active) {
@@ -25,12 +17,12 @@ function useHighlighting({ view, pattern, active, getTime }) {
             const begin = Math.max(lastEnd.current ?? audioTime, audioTime - 1 / 10, -0.01); // negative time seems buggy
             const span = [round(begin), round(audioTime + 1 / 60)];
             lastEnd.current = span[1];
-            highlights.current = highlights.current.filter((hap) => hap.endClipped > audioTime); // keep only highlights that are still active
+            highlights.current = highlights.current.filter((hap) => hap.whole.end > audioTime); // keep only highlights that are still active
             const haps = pattern.queryArc(...span).filter((hap) => hap.hasOnset());
             highlights.current = highlights.current.concat(haps); // add potential new onsets
-            highlightMiniLocations(view, begin, highlights.current);
+            view.dispatch({ effects: setHighlights.of({ haps: highlights.current }) }); // highlight all still active + new active haps
           } catch (err) {
-            highlightMiniLocations(view, 0, []);
+            view.dispatch({ effects: setHighlights.of({ haps: [] }) });
           }
           frame = requestAnimationFrame(updateHighlights);
         });
@@ -39,12 +31,10 @@ function useHighlighting({ view, pattern, active, getTime }) {
         };
       } else {
         highlights.current = [];
-        highlightMiniLocations(view, 0, highlights.current);
+        view.dispatch({ effects: setHighlights.of({ haps: [] }) });
       }
     }
   }, [pattern, active, view]);
-
-  return { setMiniLocations };
 }
 
 export default useHighlighting;

packages/react/src/index.js

@@ -1,6 +1,6 @@
 // import 'tailwindcss/tailwind.css';
 
-export { default as CodeMirror, flash, updateMiniLocations, highlightMiniLocations } from './components/CodeMirror6'; // !SSR
+export { default as CodeMirror, flash } from './components/CodeMirror6'; // !SSR
 export * from './components/MiniRepl'; // !SSR
 export { default as useHighlighting } from './hooks/useHighlighting'; // !SSR
 export { default as useStrudel } from './hooks/useStrudel'; // !SSR

packages/react/vite.config.js

@@ -22,6 +22,8 @@ export default defineConfig({
         ...Object.keys(peerDependencies),
         ...Object.keys(dependencies),
         // TODO: find out which of below names are obsolete now
+        '@strudel.cycles/tone',
+        '@strudel.cycles/eval',
         '@strudel.cycles/transpiler',
         'acorn',
         '@strudel.cycles/core',

packages/serial/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/serial",
-  "version": "0.8.0",
+  "version": "0.7.1",
   "description": "Webserial API for strudel",
   "main": "serial.mjs",
   "publishConfig": {

packages/soundfonts/package.json

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

packages/tonal/index.mjs

@@ -3,5 +3,3 @@ import './voicings.mjs';
 
 export * from './tonal.mjs';
 export * from './voicings.mjs';
-
-import './ireal.mjs';

packages/tonal/ireal.mjs

@@ -1,523 +0,0 @@
-// explore them here: https://codesandbox.io/s/voicing-explorer-ireal-47tkx5?file=/src/ireal.js:0-16036
-// scraped via: https://codesandbox.io/s/ireal-midi-scraper-2-gjz2mr?file=/src/index.js
-
-export const simple = {
-  2: ['1P 5P 8P 9M', '1P 5P 8P 9M 12P', '5P 8P 9M 12P'],
-  5: ['1P 5P 8P 12P', '5P 8P 12P 15P'],
-  6: ['1P 5P 6M 8P 10M', '1P 5P 8P 10M 13M', '3M 5P 8P 10M 13M', '5P 8P 10M 12P 13M'],
-  7: [
-    '1P 5P 7m 8P 10M',
-    '1P 7m 8P 10M 12P',
-    '3M 7m 8P 10M 12P',
-    '3M 7m 8P 10M 14m',
-    '3M 7m 10M 12P 15P',
-    '7m 10M 12P 14m 15P',
-    '7m 10M 12P 15P 17M',
-  ],
-  9: [
-    '1P 5P 7m 9M 10M',
-    '1P 7m 9M 10M 12P',
-    '3M 7m 8P 9M 12P',
-    '7m 9M 10M 14m 15P',
-    '3M 7m 8P 12P 16M',
-    '7m 10M 12P 15P 16M',
-  ],
-  11: ['1P 5P 7m 9M 11P', '5P 7m 8P 9M 11P', '7m 8P 9M 11P 12P', '7m 8P 11P 12P 16M'],
-  13: ['1P 6M 7m 9M 10M', '1P 7m 9M 10M 13M', '3M 7m 8P 9M 13M', '7m 8P 9M 10M 13M', '7m 9M 10M 13M 15P'],
-  69: ['1P 5P 6M 9M 10M', '1P 5P 9M 10M 13M', '3M 5P 8P 9M 13M', '5P 8P 9M 10M 13M'],
-  add9: ['1P 5P 8P 9M 10M', '1P 5P 9M 10M 12P', '3M 8P 9M 10M 12P', '3M 8P 9M 12P 15P', '5P 8P 9M 12P 17M'],
-  '+': [
-    '1P 3M 6m 8P 10M',
-    '1P 6m 8P 10M 13m',
-    '3M 6m 8P 10M 13m',
-    '3M 8P 10M 13m 15P',
-    '6m 8P 10M 13m 15P',
-    '6m 10M 13m 15P 17M',
-  ],
-  o: ['1P 5d 8P 10m 12d', '3m 8P 10m 12d 15P', '5d 8P 10m 12d 15P'],
-  h: [
-    '3m 5d 7m 8P 10m',
-    '1P 5d 7m 10m 12d',
-    '3m 7m 8P 10m 12d',
-    '3m 7m 8P 12d 14m',
-    '5d 7m 8P 10m 14m',
-    '5d 8P 10m 12d 14m',
-    '7m 10m 12d 14m 15P',
-    '5d 8P 10m 14m 17m',
-  ],
-  sus: ['1P 4P 5P 8P', '1P 4P 5P 8P 11P', '5P 8P 11P 12P', '5P 8P 11P 12P 15P'],
-  '^': ['1P 5P 8P 10M', '1P 5P 8P 10M 12P', '3M 5P 8P 10M 12P', '3M 8P 10M 12P 15P', '5P 8P 10M 12P 15P'],
-  '-': ['1P 3m 5P 8P 10m', '1P 5P 8P 10m 12P', '3m 5P 8P 10m 12P', '5P 8P 10m 12P 15P'],
-  '^7': ['1P 5P 7M 10M 12P', '1P 10M 12P 14M', '3M 8P 10M 12P 14M', '5P 8P 10M 12P 14M', '5P 8P 10M 14M 17M'],
-  '-7': [
-    '1P 3m 5P 7m 10m',
-    '1P 5P 7m 10m 12P',
-    '3m 7m 8P 10m 12P',
-    '3m 7m 8P 10m 14m',
-    '5P 7m 8P 10m 14m',
-    '7m 10m 12P 14m 15P',
-    '5P 8P 10m 14m 17m',
-    '7m 10m 12P 15P 17m',
-  ],
-  '7sus': ['1P 5P 7m 8P 11P', '5P 8P 11P 12P 14m', '7m 8P 11P 12P 14m', '7m 11P 12P 14m 18P'],
-  h7: [
-    '3m 5d 7m 8P 10m',
-    '1P 5d 7m 10m 12d',
-    '1P 7m 10m 12d',
-    '3m 7m 8P 10m 12d',
-    '3m 7m 8P 12d 14m',
-    '5d 7m 8P 10m 14m',
-    '5d 8P 10m 12d 14m',
-    '7m 10m 12d 14m 15P',
-    '5d 8P 10m 14m 17m',
-  ],
-  o7: [
-    '1P 6M 8P 10m 12d',
-    '1P 6M 10m 12d 13M',
-    '3m 8P 10m 12d 13M',
-    '3m 8P 12d 13M 15P',
-    '5d 10m 12d 13M 15P',
-    '5d 10m 13M 15P 17m',
-    '6M 12d 13M 15P 17m',
-    '6M 12d 15P 17m 19d',
-  ],
-  '^9': [
-    '1P 5P 7M 9M 10M',
-    '1P 7M 9M 10M 12P',
-    '3M 7M 8P 9M 12P',
-    '3M 7M 8P 12P 16M',
-    '5P 8P 10M 14M 16M',
-    '7M 8P 10M 12P 16M',
-  ],
-  '^13': ['1P 6M 7M 9M 10M', '1P 7M 9M 10M 13M', '3M 7M 8P 9M 13M', '3M 7M 8P 13M 16M', '7M 8P 10M 13M 16M'],
-  '^7#11': ['1P 5P 7M 10M 12d', '3M 7M 8P 10M 12d', '1P 7M 10M 12d 14M', '3M 7M 8P 12d 14M', '5P 8P 10M 12d 14M'],
-  '^9#11': ['1P 3M 5d 7M 9M', '1P 7M 9M 10M 12d', '3M 7M 8P 9M 12d', '3M 8P 9M 12d 14M'],
-  '^7#5': ['1P 6m 7M 10M 13m', '3M 7M 8P 10M 13m', '6m 7M 8P 10M 13m'],
-  '-6': [
-    '1P 3m 5P 6M 8P',
-    '1P 5P 6M 8P 10m',
-    '3m 5P 6M 8P 10m',
-    '1P 5P 8P 10m 13M',
-    '3m 5P 8P 10m 13M',
-    '5P 8P 10m 12P 13M',
-    '5P 8P 10m 13M 15P',
-  ],
-  '-69': [
-    '1P 3m 5P 6M 9M',
-    '3m 5P 6M 8P 9M',
-    '3m 6M 9M 10m 12P',
-    '1P 5P 9M 10m 13M',
-    '3m 5P 8P 9M 13M',
-    '5P 8P 9M 10m 13M',
-    '5P 8P 10m 13M 16M',
-  ],
-  '-^7': ['1P 3m 5P 7M 10m', '1P 5P 7M 10m 12P', '3m 7M 8P 10m 12P', '5P 7M 8P 10m 14M', '5P 8P 10m 14M 17m'],
-  '-^9': ['1P 3m 5P 7M 9M', '1P 7M 9M 10m 12P', '3m 7M 8P 9M 12P', '5P 8P 9M 10m 14M'],
-  '-9': [
-    '1P 3m 5P 7m 9M',
-    '3m 5P 7m 8P 9M',
-    '3m 7m 8P 9M 12P',
-    '5P 8P 9M 10m 14m',
-    '3m 7m 9M 12P 15P',
-    '7m 10m 12P 15P 16M',
-  ],
-  '-add9': ['1P 2M 3m 5P 8P', '1P 3m 5P 9M', '3m 5P 8P 9M 12P', '5P 8P 9M 10m 12P'],
-  '-11': [
-    '1P 3m 7m 9M 11P',
-    '3m 7m 8P 9M 11P',
-    '1P 4P 7m 10m 12P',
-    '5P 8P 11P 14m',
-    '3m 7m 9M 11P 15P',
-    '5P 8P 11P 14m 16M',
-    '7m 10m 12P 15P 18P',
-  ],
-  '-7b5': [
-    '3m 5d 7m 8P 10m',
-    '1P 7m 10m 12d',
-    '1P 5d 7m 10m 12d',
-    '3m 7m 8P 10m 12d',
-    '3m 7m 8P 12d 14m',
-    '5d 7m 8P 10m 14m',
-    '5d 8P 10m 12d 14m',
-    '7m 10m 12d 14m 15P',
-    '5d 8P 10m 14m 17m',
-  ],
-  h9: ['1P 7m 9M 10m 12d', '3m 7m 8P 9M 12d', '5d 8P 9M 10m 14m', '7m 10m 12d 15P 16M'],
-  '-b6': ['1P 5P 6m 8P 10m', '1P 5P 8P 10m 13m', '3m 5P 8P 10m 13m', '5P 8P 10m 13m', '5P 8P 10m 13m 15P'],
-  '-#5': ['1P 6m 8P 10m 13m', '3m 6m 8P 10m 13m', '6m 8P 10m 13m 15P'],
-  '7b9': ['1P 3M 7m 9m 10M', '3M 7m 8P 9m 10M', '3M 7m 8P 9m 14m', '7m 9m 10M 14m 15P'],
-  '7#9': ['1P 3M 7m 10m', '3M 7m 8P 10m 14m', '7m 10m 10M 14m 15P'],
-  '7#11': ['1P 3M 7m 10M 12d', '3M 7m 8P 10M 12d', '7m 10M 12d 14m 15P'],
-  '7b5': ['1P 3M 7m 10M 12d', '3M 7m 8P 10M 12d', '7m 10M 12d 14m 15P'],
-  '7#5': ['1P 3M 7m 10M 13m', '3M 7m 8P 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P'],
-  '9#11': ['1P 7m 9M 10M 12d', '3M 7m 8P 9M 12d', '7m 10M 12d 15P 16M'],
-  '9b5': ['1P 7m 9M 10M 12d', '3M 7m 8P 9M 12d', '7m 10M 12d 15P 16M'],
-  '9#5': ['1P 7m 9M 10M 13m', '3M 7m 9M 10M 13m', '3M 7m 9M 13m 14m', '7m 10M 13m 14m 16M', '7m 10M 13m 16M 17M'],
-  '7b13': ['1P 3M 7m 10M 13m', '3M 7m 8P 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P'],
-  '7#9#5': ['1P 3M 7m 10m 13m', '3M 7m 10m 13m 15P', '7m 10M 13m 15P 17m'],
-  '7#9b5': ['1P 3M 7m 10m 12d', '3M 7m 10m 12d 15P', '7m 10M 12d 15P 17m'],
-  '7#9#11': ['1P 3M 7m 10m 12d', '3M 7m 10m 12d 15P', '7m 10M 12d 15P 17m'],
-  '7b9#11': ['1P 7m 9m 10M 12d', '3M 7m 8P 9m 12d', '7m 8P 10M 12d 16m'],
-  '7b9b5': ['1P 7m 9m 10M 12d', '3M 7m 8P 9m 12d', '7m 8P 10M 12d 16m'],
-  '7b9#5': ['1P 7m 9m 10M 13m', '3M 7m 8P 9m 13m', '7m 9m 10M 13m 15P'],
-  '7b9#9': ['1P 3M 7m 9m 10m', '3M 7m 8P 9m 10m', '7m 8P 10M 16m 17m'],
-  '7b9b13': ['1P 7m 9m 10M 13m', '3M 7m 8P 9m 13m', '7m 9m 10M 13m 15P'],
-  '7alt': [
-    '3M 7m 8P 9m 12d',
-    '1P 7m 10m 10M 13m',
-    '3M 7m 8P 10m 13m',
-    '3M 7m 9m 12d 15P',
-    '3M 7m 10m 13m 15P',
-    '7m 10M 12d 15P 17m',
-    '7m 10M 13m 15P 17m',
-  ],
-  '13#11': ['1P 6M 7m 10M 12d', '3M 7m 9M 12d 13M', '7m 10M 12d 13M 16M'],
-  '13b9': ['1P 3M 6M 7m 9m', '1P 6M 7m 9m 10M', '3M 7m 9m 10M 13M', '3M 7m 10M 13M 16m', '7m 10M 13M 16m 17M'],
-  '13#9': ['1P 3M 6M 7m 10m', '3M 7m 8P 10m 13M', '7m 10M 13M 14m 17m'],
-  '7b9sus': ['1P 5P 7m 9m 11P', '5P 7m 8P 9m 11P', '7m 8P 11P 14m 16m'],
-  '7susadd3': ['1P 4P 5P 7m 10M', '5P 8P 10M 11P 14m', '7m 11P 12P 15P 17M'],
-  '9sus': ['1P 5P 7m 9M 11P', '5P 7m 8P 9M 11P', '7m 8P 9M 11P 12P', '7m 8P 11P 12P 16M'],
-  '13sus': ['1P 4P 6M 7m 9M', '1P 7m 9M 11P 13M', '5P 7m 9M 11P 13M', '7m 9M 11P 13M 15P'],
-  '7b13sus': ['1P 5P 7m 11P 13m', '5P 7m 8P 11P 13m', '7m 11P 13m 14m 15P'],
-};
-
-export const complex = {
-  2: ['1P 5P 6M 8P 9M', '1P 5P 8P 9M 12P', '5P 8P 9M 12P 13M', '5P 8P 9M 12P 15P'],
-  5: ['1P 5P 8P 12P', '1P 5P 8P 9M 12P', '5P 8P 12P 15P', '5P 8P 12P 15P 16M'],
-  6: ['1P 5P 6M 9M 10M', '1P 5P 9M 10M 13M', '3M 5P 9M 10M 13M', '5P 8P 9M 10M 13M', '3M 6M 9M 12P 15P'],
-  7: [
-    '1P 5P 7m 8P 10M',
-    '1P 7m 8P 10M 12P',
-    '3M 7m 8P 10M 12P',
-    '3M 7m 8P 10M 14m',
-    '3M 7m 10M 12P 15P',
-    '7m 10M 12P 14m 15P',
-    '7m 10M 12P 15P 17M',
-    '7m 10M 14m 17M 19P',
-  ],
-  9: [
-    '1P 6M 7m 9M 10M',
-    '3M 7m 9M 10M 12P',
-    '1P 7m 9M 10M 13M',
-    '3M 7m 9M 10M 13M',
-    '3M 7m 9M 12P 15P',
-    '7m 10M 12P 13M 16M',
-    '7m 10M 13M 16M 17M',
-    '7m 10M 13M 16M 19P',
-  ],
-  11: [
-    '1P 4P 6M 7m 9M',
-    '1P 5P 7m 9M 11P',
-    '4P 6M 7m 9M 11P',
-    '5P 8P 9M 11P 14m',
-    '7m 9M 11P 13M 15P',
-    '7m 11P 12P 14m 18P',
-  ],
-  13: [
-    '3M 7m 9M 10M 13M',
-    '3M 7m 9M 13M 15P',
-    '3M 7m 10M 13M 16M',
-    '7m 10M 12P 13M 16M',
-    '7m 10M 13M 16M 17M',
-    '7m 10M 13M 16M 19P',
-  ],
-  69: ['1P 5P 6M 9M 10M', '1P 5P 9M 10M 13M', '3M 5P 9M 10M 13M', '5P 8P 9M 10M 13M', '3M 6M 9M 12P 15P'],
-  add9: [
-    '1P 5P 8P 9M 10M',
-    '1P 5P 9M 10M 12P',
-    '3M 8P 9M 10M 12P',
-    '3M 8P 9M 12P 15P',
-    '5P 8P 9M 10M 15P',
-    '5P 8P 9M 12P 17M',
-  ],
-  '+': [
-    '1P 6m 8P 9M 10M',
-    '1P 6m 8P 10M 13m',
-    '3M 8P 9M 10M 13m',
-    '3M 8P 10M 13m 15P',
-    '6m 10M 13m 15P 16M',
-    '6m 10M 13m 15P 17M',
-  ],
-  o: [
-    '1P 6M 8P 10m 12d',
-    '1P 6M 10m 12d 13M',
-    '3m 8P 10m 12d 13M',
-    '3m 8P 12d 13M 15P',
-    '5d 10m 12d 13M 15P',
-    '5d 10m 13M 15P 17m',
-    '6M 12d 13M 15P 17m',
-    '6M 12d 15P 17m 19d',
-  ],
-  h: [
-    '1P 5d 7m 10m 11P',
-    '3m 5d 7m 8P 11P',
-    '5d 7m 8P 10m 11P',
-    '1P 7m 10m 12d',
-    '3m 7m 8P 12d 14m',
-    '5d 8P 10m 11P 14m',
-    '7m 10m 11P 12d 14m',
-    '7m 10m 12d 14m 15P',
-    '5d 8P 10m 14m 17m',
-  ],
-  sus: [
-    '1P 4P 5P 8P 9M',
-    '1P 4P 5P 8P 11P',
-    '1P 5P 8P 9M 11P',
-    '5P 8P 9M 11P 12P',
-    '5P 8P 11P 12P 13M',
-    '5P 8P 11P 13M 15P',
-  ],
-  '^': [
-    '1P 3M 5P 6M 9M',
-    '1P 5P 8P 10M 12P',
-    '3M 5P 9M 10M 12P',
-    '1P 5P 8P 10M 13M',
-    '3M 8P 10M 13M 15P',
-    '5P 9M 10M 12P 15P',
-  ],
-  '-': [
-    '1P 3m 5P 8P 10m',
-    '1P 3m 5P 9M 11P',
-    '3m 5P 8P 9M 11P',
-    '5P 8P 9M 10m 11P',
-    '1P 5P 9M 10m 12P',
-    '3m 5P 8P 10m 12P',
-    '5P 8P 10m 12P 15P',
-  ],
-  '^7': [
-    '1P 6M 7M 9M 10M',
-    '3M 7M 9M 10M 12P',
-    '1P 7M 9M 10M 13M',
-    '3M 7M 9M 10M 13M',
-    '3M 7M 9M 12P 13M',
-    '3M 7M 9M 13M 14M',
-    '3M 7M 10M 13M 16M',
-    '7M 10M 13M 14M 16M',
-    '7M 10M 13M 16M 17M',
-    '7M 10M 13M 16M 19P',
-  ],
-  '-7': [
-    '1P 3m 5P 7m 9M',
-    '1P 3m 5P 7m 10m',
-    '1P 5P 7m 10m 11P',
-    '3m 7m 8P 10m 11P',
-    '1P 5P 7m 10m 12P',
-    '3m 7m 9M 10m 12P',
-    '3m 7m 8P 10m 14m',
-    '5P 7m 9M 10m 14m',
-    '7m 10m 11P 14m 15P',
-    '7m 10m 12P 15P 16M',
-    '5P 8P 11P 14m 17m',
-    '7m 10m 12P 15P 17m',
-  ],
-  '7sus': [
-    '1P 4P 6M 7m 9M',
-    '1P 5P 7m 9M 11P',
-    '4P 6M 7m 9M 11P',
-    '5P 8P 9M 11P 14m',
-    '7m 9M 11P 13M 15P',
-    '7m 11P 12P 14m 18P',
-  ],
-  h7: [
-    '1P 5d 7m 10m 11P',
-    '3m 5d 7m 8P 11P',
-    '5d 7m 8P 10m 11P',
-    '1P 7m 10m 12d',
-    '3m 7m 8P 10m 12d',
-    '3m 7m 8P 12d 14m',
-    '5d 8P 10m 11P 14m',
-    '7m 10m 11P 12d 14m',
-    '7m 10m 12d 14m 15P',
-    '5d 8P 10m 14m 17m',
-  ],
-  o7: [
-    '1P 6M 8P 10m 12d',
-    '1P 6M 10m 12d 13M',
-    '3m 8P 10m 12d 13M',
-    '3m 8P 12d 13M 15P',
-    '5d 10m 12d 13M 15P',
-    '5d 10m 13M 15P 17m',
-    '6M 12d 13M 15P 17m',
-    '6M 12d 15P 17m 19d',
-  ],
-  '^9': [
-    '1P 6M 7M 9M 10M',
-    '1P 7M 9M 10M 13M',
-    '3M 7M 9M 10M 13M',
-    '3M 7M 9M 12P 13M',
-    '3M 7M 8P 9M 13M',
-    '3M 7M 9M 13M 14M',
-    '3M 7M 10M 13M 16M',
-    '7M 10M 13M 14M 16M',
-    '7M 10M 13M 16M 17M',
-    '7M 10M 13M 16M 19P',
-  ],
-  '^13': [
-    '1P 6M 7M 9M 10M',
-    '1P 7M 9M 10M 13M',
-    '3M 7M 9M 12P 13M',
-    '3M 7M 9M 10M 13M',
-    '3M 7M 8P 9M 13M',
-    '3M 7M 9M 13M 14M',
-    '3M 7M 10M 13M 16M',
-    '7M 10M 13M 14M 16M',
-    '7M 10M 13M 16M 17M',
-    '7M 10M 13M 16M 19P',
-  ],
-  '^7#11': [
-    '1P 3M 5d 7M 9M',
-    '1P 7M 9M 10M 12d',
-    '3M 7M 9M 10M 12d',
-    '3M 7M 9M 12d 13M',
-    '3M 7M 10M 12d 14M',
-    '7M 10M 12d 13M 14M',
-    '7M 10M 12d 13M 16M',
-    '7M 10M 12d 14M 17M',
-  ],
-  '^9#11': [
-    '1P 3M 5d 7M 9M',
-    '1P 7M 9M 10M 12d',
-    '3M 7M 9M 10M 12d',
-    '3M 7M 9M 12d 13M',
-    '3M 7M 9M 12d 14M',
-    '7M 10M 12d 14M 16M',
-    '7M 10M 12d 13M 16M',
-  ],
-  '^7#5': ['1P 6m 7M 10M 13m', '3M 7M 9M 10M 13m', '3M 7M 10M 13m 14M', '7M 10M 13m 14M 16M', '7M 10M 13m 14M 17M'],
-  '-6': [
-    '1P 3m 5P 6M 9M',
-    '3m 5P 6M 8P 9M',
-    '1P 5P 6M 10m 11P',
-    '3m 5P 6M 8P 11P',
-    '1P 5P 9M 10m 13M',
-    '3m 5P 8P 9M 13M',
-    '5P 8P 10m 11P 13M',
-    '5P 8P 10m 13M 16M',
-  ],
-  '-69': [
-    '1P 3m 5P 6M 9M',
-    '3m 5P 6M 8P 9M',
-    '3m 6M 9M 10m 12P',
-    '1P 5P 9M 10m 13M',
-    '3m 5P 8P 9M 13M',
-    '5P 8P 9M 10m 13M',
-    '5P 8P 10m 13M 16M',
-  ],
-  '-^7': [
-    '1P 3m 5P 7M 9M',
-    '1P 5P 7M 10m 11P',
-    '3m 7M 9M 10m 11P',
-    '3m 7M 9M 10m 12P',
-    '3m 7M 9M 12P 14M',
-    '7M 10m 11P 12P 14M',
-    '7M 10m 12P 14M 16M',
-  ],
-  '-^9': [
-    '1P 3m 5P 7M 9M',
-    '1P 5P 7M 10m 11P',
-    '3m 7M 9M 10m 11P',
-    '3m 7M 9M 10m 12P',
-    '3m 7M 9M 12P 14M',
-    '7M 10m 11P 12P 14M',
-    '7M 10m 12P 14M 16M',
-  ],
-  '-9': [
-    '1P 3m 5P 7m 9M',
-    '1P 3m 7m 9M 11P',
-    '3m 7m 9M 10m 11P',
-    '3m 7m 9M 10m 12P',
-    '3m 7m 9M 10m 14m',
-    '3m 7m 9M 12P 15P',
-    '7m 10m 11P 14m 16M',
-    '7m 10m 12P 16M 18P',
-  ],
-  '-add9': ['1P 2M 3m 5P 8P', '1P 3m 5P 9M', '3m 5P 8P 9M 12P', '5P 8P 9M 10m 12P'],
-  '-11': [
-    '3m 5P 7m 9M 11P',
-    '7m 9M 10m 11P',
-    '1P 4P 7m 10m 12P',
-    '3m 7m 9M 11P 12P',
-    '7m 9M 10m 11P 12P',
-    '3m 7m 9M 11P 14m',
-    '4P 10m 12P 14m',
-    '5P 8P 11P 14m',
-    '5P 8P 11P 14m 16M',
-    '7m 10m 12P 16M 18P',
-    '7m 10m 11P 16M 21m',
-  ],
-  '-7b5': [
-    '1P 5d 7m 10m 11P',
-    '3m 5d 7m 8P 11P',
-    '5d 7m 8P 10m 11P',
-    '1P 7m 10m 12d',
-    '3m 7m 8P 10m 12d',
-    '3m 7m 8P 12d 14m',
-    '5d 8P 10m 11P 14m',
-    '7m 10m 11P 12d 14m',
-    '7m 10m 12d 14m 15P',
-    '5d 8P 10m 14m 17m',
-  ],
-  h9: [
-    '3m 5d 7m 9M 11P',
-    '1P 7m 9M 10m 12d',
-    '3m 7m 9M 12d 14m',
-    '5d 8P 9M 10m 14m',
-    '7m 10m 11P 12d 14m',
-    '7m 10m 12d 14m 16M',
-  ],
-  '-b6': ['1P 3m 5P 6m 8P', '3m 5P 8P 11P 13m', '5P 8P 10m 11P 13m'],
-  '-#5': ['1P 6m 8P 10m 13m', '3m 6m 8P 11P 13m', '6m 8P 10m 13m 15P'],
-  '7b9': ['1P 3M 7m 9m 10M', '3M 7m 8P 9m 10M', '3M 7m 8P 9m 14m', '7m 9m 10M 14m 15P'],
-  '7#9': ['1P 3M 7m 10m', '3M 7m 10m 10M 12P', '3M 7m 10m 12P 14m', '7m 10M 12P 14m 17m'],
-  '7#11': ['1P 3M 7m 9M 12d', '3M 7m 9M 12d 13M', '7m 10M 12d 13M 16M'],
-  '7b5': ['1P 3M 7m 9M 12d', '3M 7m 9M 12d 13M', '7m 10M 12d 13M 16M'],
-  '7#5': ['1P 3M 7m 10M 13m', '3M 7m 8P 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P', '7m 10M 13m 14m 17M'],
-  '9#11': ['1P 7m 9M 10M 12d', '3M 7m 8P 9M 12d', '7m 10M 12d 15P 16M'],
-  '9b5': ['1P 7m 9M 10M 12d', '3M 7m 8P 9M 12d', '7m 10M 12d 15P 16M'],
-  '9#5': ['1P 7m 9M 10M 13m', '3M 7m 9M 10M 13m', '3M 7m 9M 13m 14m', '7m 10M 13m 14m 16M', '7m 10M 13m 16M 17M'],
-  '7b13': ['1P 3M 7m 10M 13m', '3M 7m 8P 10M 13m', '3M 7m 8P 13m 14m', '7m 10M 13m 14m 15P', '7m 10M 13m 14m 17M'],
-  '7#9#5': ['3M 7m 10m 10M 13m', '3M 7m 10m 13m 14m', '7m 10M 13m 14m 17m'],
-  '7#9b5': ['3M 7m 10m 10M 12d', '3M 7m 10m 12d 14m', '7m 10M 12d 14m 17m'],
-  '7#9#11': ['3M 7m 10m 10M 12d', '3M 7m 10m 12d 14m', '7m 10M 12d 14m 17m'],
-  '7b9#11': ['3M 7m 9m 10M 12d', '3M 7m 9m 12d 14m', '7m 8P 10M 12d 16m', '7m 10M 12d 14m 16m'],
-  '7b9b5': ['3M 7m 9m 10M 12d', '3M 7m 9m 12d 14m', '7m 8P 10M 12d 16m', '7m 10M 12d 14m 16m'],
-  '7b9#5': ['1P 7m 9m 10M 13m', '3M 7m 9m 10M 13m', '3M 7m 10M 13m 16m', '7m 10M 13m 14m 16m', '7m 10M 13m 16m 17M'],
-  '7b9#9': ['1P 3M 7m 9m 10m', '3M 7m 10m 13m 16m', '7m 10M 13m 16m 17m'],
-  '7b9b13': ['1P 7m 9m 10M 13m', '3M 7m 9m 10M 13m', '3M 7m 10M 13m 16m', '7m 10M 13m 14m 16m', '7m 10M 13m 16m 17M'],
-  '7alt': [
-    '3M 7m 8P 10m 13m',
-    '3M 7m 9m 12d 13m',
-    '3M 7m 9m 10m 13m',
-    '3M 7m 10m 13m 14m',
-    '3M 7m 9m 12d 14m',
-    '3M 7m 10m 13m 15P',
-    '3M 7m 10m 13m 16m',
-    '7m 10M 12d 14m 16m',
-    '7m 10M 12d 13m 16m',
-    '7m 10M 13m 15P 17m',
-    '7m 10M 13m 16m 17m',
-    '7m 10M 13m 16m 19d',
-  ],
-  '13#11': ['3M 7m 9M 12d 13M', '7m 10M 12d 13M 16M'],
-  '13b9': ['3M 7m 9m 10M 13M', '3M 7m 10M 13M 16m', '7m 10M 13M 16m 17M'],
-  '13#9': ['3M 7m 10m 10M 13M', '7m 10M 13M 14m 17m'],
-  '7b9sus': ['1P 5P 7m 9m 11P', '5P 7m 8P 9m 11P', '7m 8P 11P 14m 16m'],
-  '7susadd3': ['1P 4P 5P 7m 10M', '5P 8P 10M 11P 14m', '7m 11P 12P 15P 17M'],
-  '9sus': [
-    '1P 4P 6M 7m 9M',
-    '1P 5P 7m 9M 11P',
-    '4P 6M 7m 9M 11P',
-    '5P 8P 9M 11P 14m',
-    '7m 9M 11P 13M 15P',
-    '7m 11P 12P 14m 18P',
-  ],
-  '13sus': [
-    '1P 4P 6M 7m 9M',
-    '1P 7m 9M 11P 13M',
-    '4P 7m 9M 11P 13M',
-    '7m 9M 11P 13M 15P',
-    '7m 11P 13M 14m 16M',
-    '7m 11P 13M 16M 18P',
-  ],
-  '7b13sus': ['1P 5P 7m 11P 13m', '5P 7m 8P 11P 13m', '7m 11P 13m 14m 15P'],
-};

packages/tonal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/tonal",
-  "version": "0.8.2",
+  "version": "0.8.1",
   "description": "Tonal functions for strudel",
   "main": "index.mjs",
   "publishConfig": {
@@ -38,6 +38,6 @@
   },
   "devDependencies": {
     "vite": "^4.3.3",
-    "vitest": "^0.33.0"
+    "vitest": "^0.28.0"
   }
 }

packages/tonal/test/tonleiter.test.mjs

@@ -1,152 +0,0 @@
-/*
-tonleiter.test.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/tonal/test/tonleiter.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, test, expect } from 'vitest';
-import {
-  Step,
-  Note,
-  transpose,
-  pc2chroma,
-  rotateChroma,
-  chroma2pc,
-  tokenizeChord,
-  note2pc,
-  note2oct,
-  midi2note,
-  renderVoicing,
-  scaleStep,
-} from '../tonleiter.mjs';
-
-describe('tonleiter', () => {
-  test('Step ', () => {
-    expect(Step.tokenize('#11')).toEqual(['#', 11]);
-    expect(Step.tokenize('b13')).toEqual(['b', 13]);
-    expect(Step.tokenize('bb6')).toEqual(['bb', 6]);
-    expect(Step.tokenize('b3')).toEqual(['b', 3]);
-    expect(Step.tokenize('3')).toEqual(['', 3]);
-    expect(Step.tokenize('10')).toEqual(['', 10]);
-    // expect(Step.tokenize('asdasd')).toThrow();
-    expect(Step.accidentals('b3')).toEqual(-1);
-    expect(Step.accidentals('#11')).toEqual(1);
-  });
-  test('Note', () => {
-    expect(Note.tokenize('C##')).toEqual(['C', '##']);
-    expect(Note.tokenize('Bb')).toEqual(['B', 'b']);
-    expect(Note.accidentals('C#')).toEqual(1);
-    expect(Note.accidentals('C##')).toEqual(2);
-    expect(Note.accidentals('Eb')).toEqual(-1);
-    expect(Note.accidentals('Bbb')).toEqual(-2);
-  });
-  test('transpose', () => {
-    expect(transpose('F#', '3')).toEqual('A#');
-    expect(transpose('C', '3')).toEqual('E');
-    expect(transpose('D', '3')).toEqual('F#');
-    expect(transpose('E', '3')).toEqual('G#');
-    expect(transpose('Eb', '3')).toEqual('G');
-    expect(transpose('Ebb', '3')).toEqual('Gb');
-  });
-  test('pc2chroma', () => {
-    expect(pc2chroma('C')).toBe(0);
-    expect(pc2chroma('C#')).toBe(1);
-    expect(pc2chroma('C##')).toBe(2);
-    expect(pc2chroma('D')).toBe(2);
-    expect(pc2chroma('Db')).toBe(1);
-    expect(pc2chroma('Dbb')).toBe(0);
-    expect(pc2chroma('bb')).toBe(10);
-    expect(pc2chroma('f')).toBe(5);
-    expect(pc2chroma('c')).toBe(0);
-  });
-  test('rotateChroma', () => {
-    expect(rotateChroma(0, 1)).toBe(1);
-    expect(rotateChroma(0, -1)).toBe(11);
-    expect(rotateChroma(11, 1)).toBe(0);
-    expect(rotateChroma(11, 13)).toBe(0);
-  });
-  test('chroma2pc', () => {
-    expect(chroma2pc(0)).toBe('C');
-    expect(chroma2pc(1)).toBe('Db');
-    expect(chroma2pc(1, true)).toBe('C#');
-    expect(chroma2pc(2)).toBe('D');
-    expect(chroma2pc(3)).toBe('Eb');
-  });
-  test('tokenizeChord', () => {
-    expect(tokenizeChord('Cm7')).toEqual(['C', 'm7', undefined]);
-    expect(tokenizeChord('C#m7')).toEqual(['C#', 'm7', undefined]);
-    expect(tokenizeChord('Bb^7')).toEqual(['Bb', '^7', undefined]);
-    expect(tokenizeChord('Bb^7/F')).toEqual(['Bb', '^7', 'F']);
-  });
-  test('note2pc', () => {
-    expect(note2pc('C5')).toBe('C');
-    expect(note2pc('C52')).toBe('C');
-    expect(note2pc('Bb3')).toBe('Bb');
-    expect(note2pc('F')).toBe('F');
-  });
-  test('note2oct', () => {
-    expect(note2oct('C5')).toBe(5);
-    expect(note2oct('Bb3')).toBe(3);
-    expect(note2oct('C7')).toBe(7);
-    expect(note2oct('C10')).toBe(10);
-  });
-  test('midi2note', () => {
-    expect(midi2note(60)).toBe('C4');
-    expect(midi2note(61)).toBe('Db4');
-    expect(midi2note(61, true)).toBe('C#4');
-  });
-  test('scaleStep', () => {
-    expect(scaleStep([60, 63, 67], 0)).toBe(60);
-    expect(scaleStep([60, 63, 67], 1)).toBe(63);
-    expect(scaleStep([60, 63, 67], 2)).toBe(67);
-    expect(scaleStep([60, 63, 67], 3)).toBe(72);
-    expect(scaleStep([60, 63, 67], 4)).toBe(75);
-    expect(scaleStep([60, 63, 67], -1)).toBe(55);
-    expect(scaleStep([60, 63, 67], -2)).toBe(51);
-    expect(scaleStep([60, 63, 67], -3)).toBe(48);
-    expect(scaleStep([60, 63, 67], -4)).toBe(43);
-  });
-  test('renderVoicing', () => {
-    const dictionary = {
-      m7: [
-        '3 7 10 14', // b3 5 b7 9
-        '10 14 15 19', // b7 9 b3 5
-      ],
-    };
-    expect(renderVoicing({ chord: 'Em7', anchor: 'Bb4', dictionary, mode: 'below' })).toEqual([
-      'G3',
-      'B3',
-      'D4',
-      'Gb4',
-    ]);
-    expect(renderVoicing({ chord: 'Cm7', anchor: 'D5', dictionary, mode: 'below' })).toEqual([
-      'Eb4',
-      'G4',
-      'Bb4',
-      'D5',
-    ]);
-    expect(renderVoicing({ chord: 'Cm7', anchor: 'G5', dictionary, mode: 'below' })).toEqual([
-      'Bb4',
-      'D5',
-      'Eb5',
-      'G5',
-    ]);
-    expect(renderVoicing({ chord: 'Cm7', anchor: 'g5', dictionary, mode: 'below' })).toEqual([
-      'Bb4',
-      'D5',
-      'Eb5',
-      'G5',
-    ]);
-    expect(renderVoicing({ chord: 'Cm7', anchor: 'g5', dictionary, mode: 'below', n: 0 })).toEqual([70]); // Bb4
-    expect(renderVoicing({ chord: 'Cm7', anchor: 'g5', dictionary, mode: 'below', n: 1 })).toEqual([74]); // D5
-    expect(renderVoicing({ chord: 'Cm7', anchor: 'g5', dictionary, mode: 'below', n: 4 })).toEqual([82]); // Bb5
-    expect(renderVoicing({ chord: 'Cm7', anchor: 'g5', dictionary, mode: 'below', offset: 1 })).toEqual([
-      'Eb5',
-      'G5',
-      'Bb5',
-      'D6',
-    ]);
-    // expect(voiceBelow('G4', 'Cm7', voicingDictionary)).toEqual(['Bb3', 'D4', 'Eb4', 'G4']);
-    // TODO: test with offset
-  });
-});

packages/tonal/tonal.mjs

@@ -127,25 +127,25 @@ export const scaleTranspose = register('scaleTranspose', function (offset /* : n
  *
  * The root note defaults to octave 3, if no octave number is given.
  *
+ * @memberof Pattern
  * @name scale
  * @param {string} scale Name of scale
  * @returns Pattern
  * @example
- * n("0 2 4 6 4 2").scale("C:major")
+ * "0 2 4 6 4 2".scale("C2:major").note()
  * @example
- * n("[0,7] 4 [2,7] 4")
- * .scale("C:<major minor>/2")
- * .s("piano")
+ * "0 2 4 6 4 2"
+ * .scale("C2:<major minor>")
+ * .note()
  * @example
- * n(rand.range(0,12).segment(8).round())
- * .scale("C:ritusen")
+ * "0 1 2 3 4 5 6 7".rev().scale("C2:<major minor>").note()
  * .s("folkharp")
  */
 
 export const scale = register('scale', function (scale, pat) {
   // Supports ':' list syntax in mininotation
   if (Array.isArray(scale)) {
-    scale = scale.flat().join(' ');
+    scale = scale.join(' ');
   }
   return pat.withHap((hap) => {
     const isObject = typeof hap.value === 'object';

packages/tonal/tonleiter.mjs

@@ -1,190 +0,0 @@
-import { isNote, isNoteWithOctave, _mod, noteToMidi, tokenizeNote } from '@strudel.cycles/core';
-import { Interval } from '@tonaljs/tonal';
-
-// https://codesandbox.io/s/stateless-voicings-g2tmz0?file=/src/lib.js:0-2515
-
-const flats = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'];
-const pcs = ['c', 'db', 'd', 'eb', 'e', 'f', 'gb', 'g', 'ab', 'a', 'bb', 'b'];
-const sharps = ['C', 'C#', 'D', 'D#', 'E', 'F', 'F#', 'G', 'G#', 'A', 'A#', 'B'];
-const accs = { b: -1, '#': 1 };
-
-export const pc2chroma = (pc) => {
-  const [letter, ...rest] = pc.split('');
-  return pcs.indexOf(letter.toLowerCase()) + rest.reduce((sum, sign) => sum + accs[sign], 0);
-};
-
-export const rotateChroma = (chroma, steps) => (chroma + (steps % 12) + 12) % 12;
-
-export const chroma2pc = (chroma, sharp = false) => {
-  return (sharp ? sharps : flats)[chroma];
-};
-
-export function tokenizeChord(chord) {
-  const match = (chord || '').match(/^([A-G][b#]*)([^/]*)[/]?([A-G][b#]*)?$/);
-  if (!match) {
-    // console.warn('could not tokenize chord', chord);
-    return [];
-  }
-  return match.slice(1);
-}
-export const note2pc = (note) => note.match(/^[A-G][#b]?/i)[0];
-export const note2oct = (note) => tokenizeNote(note)[2];
-
-export const note2chroma = (note) => {
-  return pc2chroma(note2pc(note));
-};
-
-// TODO: test
-export const midi2chroma = (midi) => midi % 12;
-
-// TODO: test and use in voicing function
-export const pitch2chroma = (x, defaultOctave) => {
-  if (isNoteWithOctave(x)) {
-    return note2chroma(x);
-  }
-  if (isNote(x)) {
-    //pc
-    return pc2chroma(x, defaultOctave);
-  }
-  if (typeof x === 'number') {
-    // expect midi
-    return midi2chroma(x);
-  }
-};
-
-export const step2semitones = (x) => {
-  let num = Number(x);
-  if (!isNaN(num)) {
-    return num;
-  }
-  return Interval.semitones(x);
-};
-
-export const x2midi = (x) => {
-  if (typeof x === 'number') {
-    return x;
-  }
-  if (typeof x === 'string') {
-    return noteToMidi(x);
-  }
-};
-
-// duplicate: util.mjs (does not support sharp flag)
-export const midi2note = (midi, sharp = false) => {
-  const oct = Math.floor(midi / 12) - 1;
-  const pc = (sharp ? sharps : flats)[midi % 12];
-  return pc + oct;
-};
-
-export function scaleStep(notes, offset, octaves = 1) {
-  notes = notes.map((note) => (typeof note === 'string' ? noteToMidi(note) : note));
-  const octOffset = Math.floor(offset / notes.length) * octaves * 12;
-  offset = _mod(offset, notes.length);
-  return notes[offset] + octOffset;
-}
-
-// different ways to resolve the note to compare the anchor to (see renderVoicing)
-let modeTarget = {
-  below: (v) => v.slice(-1)[0],
-  duck: (v) => v.slice(-1)[0],
-  above: (v) => v[0],
-};
-
-export function renderVoicing({ chord, dictionary, offset = 0, n, mode = 'below', anchor = 'c5', octaves = 1 }) {
-  const [root, symbol] = tokenizeChord(chord);
-  const rootChroma = pc2chroma(root);
-  anchor = anchor?.note || anchor;
-  const anchorChroma = pitch2chroma(anchor);
-  const voicings = dictionary[symbol].map((voicing) =>
-    (typeof voicing === 'string' ? voicing.split(' ') : voicing).map(step2semitones),
-  );
-
-  let minDistance, bestIndex;
-  // calculate distances up from voicing top notes
-  let chromaDiffs = voicings.map((v, i) => {
-    const targetStep = modeTarget[mode](v);
-    const diff = _mod(anchorChroma - targetStep - rootChroma, 12);
-    if (minDistance === undefined || diff < minDistance) {
-      minDistance = diff;
-      bestIndex = i;
-    }
-    return diff;
-  });
-
-  const octDiff = Math.ceil(offset / voicings.length) * 12;
-  const indexWithOffset = _mod(bestIndex + offset, voicings.length);
-  const voicing = voicings[indexWithOffset];
-  const targetStep = modeTarget[mode](voicing);
-  const anchorMidi = noteToMidi(anchor, 4) - chromaDiffs[indexWithOffset] + octDiff;
-
-  const voicingMidi = voicing.map((v) => anchorMidi - targetStep + v);
-  let notes = voicingMidi.map((n) => midi2note(n));
-
-  if (mode === 'duck') {
-    notes = notes.filter((_, i) => voicingMidi[i] !== noteToMidi(anchor));
-  }
-  if (n !== undefined) {
-    return [scaleStep(notes, n, octaves)];
-  }
-  return notes;
-}
-
-// https://github.com/tidalcycles/strudel/blob/14184993d0ee7d69c47df57ac864a1a0f99a893f/packages/tonal/tonleiter.mjs
-const steps = [1, 0, 2, 0, 3, 4, 0, 5, 0, 6, 0, 7];
-const notes = ['C', '', 'D', '', 'E', 'F', '', 'G', '', 'A', '', 'B'];
-const noteLetters = ['C', 'D', 'E', 'F', 'G', 'A', 'B'];
-
-export const accidentalOffset = (accidentals) => {
-  return accidentals.split('#').length - accidentals.split('b').length;
-};
-
-const accidentalString = (offset) => {
-  if (offset < 0) {
-    return 'b'.repeat(-offset);
-  }
-  if (offset > 0) {
-    return '#'.repeat(offset);
-  }
-  return '';
-};
-
-export const Step = {
-  tokenize(step) {
-    const matches = step.match(/^([#b]*)([1-9][0-9]*)$/);
-    if (!matches) {
-      throw new Error(`Step.tokenize: not a valid step: ${step}`);
-    }
-    const [accidentals, stepNumber] = matches.slice(1);
-    return [accidentals, parseInt(stepNumber)];
-  },
-  accidentals(step) {
-    return accidentalOffset(Step.tokenize(step)[0]);
-  },
-};
-
-export const Note = {
-  // TODO: support octave numbers
-  tokenize(note) {
-    return [note[0], note.slice(1)];
-  },
-  accidentals(note) {
-    return accidentalOffset(this.tokenize(note)[1]);
-  },
-};
-
-// TODO: support octave numbers
-export function transpose(note, step) {
-  // example: E, 3
-  const stepNumber = Step.tokenize(step)[1]; // 3
-  const noteLetter = Note.tokenize(note)[0]; // E
-  const noteIndex = noteLetters.indexOf(noteLetter); // 2 "E is C+2"
-  const targetNote = noteLetters[(noteIndex + stepNumber - 1) % 8]; // G "G is a third above E"
-  const rootIndex = notes.indexOf(noteLetter); // 4 "E is 4 semitones above C"
-  const targetIndex = notes.indexOf(targetNote); // 7 "G is 7 semitones above C"
-  const indexOffset = targetIndex - rootIndex; // 3 (E to G is normally a 3 semitones)
-  const stepIndex = steps.indexOf(stepNumber); // 4 ("3" is normally 4 semitones)
-  const offsetAccidentals = accidentalString(Step.accidentals(step) + Note.accidentals(note) + stepIndex - indexOffset); // "we need to add a # to to the G to make it a major third from E"
-  return [targetNote, offsetAccidentals].join('');
-}
-
-//Note("Bb3").transpose("c3")

packages/tonal/voicings.mjs

@@ -5,9 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { stack, register } from '@strudel.cycles/core';
-import { renderVoicing } from './tonleiter.mjs';
 import _voicings from 'chord-voicings';
-import { complex, simple } from './ireal.mjs';
 const { dictionaryVoicing, minTopNoteDiff } = _voicings.default || _voicings; // parcel module resolution fuckup
 
 const lefthand = {
@@ -51,33 +49,10 @@ const triads = {
   aug: ['1P 3m 5A', '3m 5A 8P', '5A 8P 10m'],
 };
 
-const defaultDictionary = {
-  // triads
-  '': ['1P 3M 5P', '3M 5P 8P', '5P 8P 10M'],
-  M: ['1P 3M 5P', '3M 5P 8P', '5P 8P 10M'],
-  m: ['1P 3m 5P', '3m 5P 8P', '5P 8P 10m'],
-  o: ['1P 3m 5d', '3m 5d 8P', '5d 8P 10m'],
-  aug: ['1P 3m 5A', '3m 5A 8P', '5A 8P 10m'],
-  // sevenths chords
-  m7: ['3m 5P 7m 9M', '7m 9M 10m 12P'],
-  7: ['3M 6M 7m 9M', '7m 9M 10M 13M'],
-  '^7': ['3M 5P 7M 9M', '7M 9M 10M 12P'],
-  69: ['3M 5P 6A 9M'],
-  m7b5: ['3m 5d 7m 8P', '7m 8P 10m 12d'],
-  '7b9': ['3M 6m 7m 9m', '7m 9m 10M 13m'],
-  '7b13': ['3M 6m 7m 9m', '7m 9m 10M 13m'],
-  o7: ['1P 3m 5d 6M', '5d 6M 8P 10m'],
-  '7#11': ['7m 9M 11A 13A'],
-  '7#9': ['3M 7m 9A'],
-  mM7: ['3m 5P 7M 9M', '7M 9M 10m 12P'],
-  m6: ['3m 5P 6M 9M', '6M 9M 10m 12P'],
-};
-
 export const voicingRegistry = {
-  lefthand: { dictionary: lefthand, range: ['F3', 'A4'], mode: 'below', anchor: 'a4' },
-  triads: { dictionary: triads, mode: 'below', anchor: 'a4' },
-  guidetones: { dictionary: guidetones, mode: 'above', anchor: 'a4' },
-  default: { dictionary: defaultDictionary, mode: 'below', anchor: 'a4' },
+  lefthand: { dictionary: lefthand, range: ['F3', 'A4'] },
+  triads: { dictionary: triads },
+  guidetones: { dictionary: guidetones },
 };
 export const setVoicingRange = (name, range) => addVoicings(name, voicingRegistry[name].dictionary, range);
 
@@ -106,11 +81,6 @@ export const addVoicings = (name, dictionary, range = ['F3', 'A4']) => {
   Object.assign(voicingRegistry, { [name]: { dictionary, range } });
 };
 
-// new call signature
-export const registerVoicings = (name, dictionary, options = {}) => {
-  Object.assign(voicingRegistry, { [name]: { dictionary, ...options } });
-};
-
 const getVoicing = (chord, dictionaryName, lastVoicing) => {
   const { dictionary, range } = voicingRegistry[dictionaryName];
   return dictionaryVoicing({
@@ -123,7 +93,6 @@ const getVoicing = (chord, dictionaryName, lastVoicing) => {
 };
 
 /**
- * DEPRECATED: still works, but it is recommended you use .voicing instead (without s).
  * Turns chord symbols into voicings, using the smoothest voice leading possible.
  * Uses [chord-voicings package](https://github.com/felixroos/chord-voicings#chord-voicings).
  *
@@ -160,76 +129,7 @@ export const voicings = register('voicings', function (dictionary, pat) {
  */
 export const rootNotes = register('rootNotes', function (octave, pat) {
   return pat.fmap((value) => {
-    const chord = value.chord || value;
-    const root = chord.match(/^([a-gA-G][b#]?).*$/)[1];
-    const note = root + octave;
-    return value.chord ? { note } : note;
+    const root = value.match(/^([a-gA-G][b#]?).*$/)[1];
+    return root + octave;
   });
 });
-
-/**
- * Turns chord symbols into voicings. You can use the following control params:
- *
- * - `chord`: Note, followed by chord symbol, e.g. C Am G7 Bb^7
- * - `dict`: voicing dictionary to use, falls back to default dictionary
- * - `anchor`: the note that is used to align the chord
- * - `mode`: how the voicing is aligned to the anchor
- *   - `below`: top note <= anchor
- *   - `duck`: top note <= anchor, anchor excluded
- *   - `above`: bottom note >= anchor
- * - `offset`: whole number that shifts the voicing up or down to the next voicing
- * - `n`: if set, the voicing is played like a scale. Overshooting numbers will be octaved
- *
- * All of the above controls are optional, except `chord`.
- * If you pass a pattern of strings to voicing, they will be interpreted as chords.
- *
- * @name voicing
- * @param {string} dictionary which voicing dictionary to use.
- * @returns Pattern
- * @example
- * voicing("<C Am F G>")
- * @example
- * n("0 1 2 3 4 5 6 7").chord("<C Am F G>").voicing()
- */
-export const voicing = register('voicing', function (pat) {
-  return pat
-    .fmap((value) => {
-      // destructure voicing controls out
-      value = typeof value === 'string' ? { chord: value } : value;
-      let { dictionary = 'default', chord, anchor, offset, mode, n, octaves, ...rest } = value;
-      dictionary =
-        typeof dictionary === 'string' ? voicingRegistry[dictionary] : { dictionary, mode: 'below', anchor: 'c5' };
-      let notes = renderVoicing({ ...dictionary, chord, anchor, offset, mode, n, octaves });
-
-      return stack(...notes)
-        .note()
-        .set(rest); // rest does not include voicing controls anymore!
-    })
-    .outerJoin();
-});
-
-export function voicingAlias(symbol, alias, setOrSets) {
-  setOrSets = !Array.isArray(setOrSets) ? [setOrSets] : setOrSets;
-  setOrSets.forEach((set) => {
-    set[alias] = set[symbol];
-  });
-}
-
-// no symbol = major chord
-voicingAlias('^', '', [simple, complex]);
-
-Object.keys(simple).forEach((symbol) => {
-  // add aliases for "-" === "m"
-  if (symbol.includes('-')) {
-    let alias = symbol.replace('-', 'm');
-    voicingAlias(symbol, alias, [complex, simple]);
-  }
-  // add aliases for "^" === "M"
-  if (symbol.includes('^')) {
-    let alias = symbol.replace('^', 'M');
-    voicingAlias(symbol, alias, [complex, simple]);
-  }
-});
-
-registerVoicings('ireal', simple);
-registerVoicings('ireal-ext', complex);

packages/tone/README.md

@@ -0,0 +1,34 @@
+# @strudel.cycles/tone
+
+This package adds Tone.js functions to strudel Patterns.
+
+## Deprecation Note
+
+This package will not be developed further. Consider using `@strudel.cycles/webaudio` as a replacement.
+
+## Install
+
+```sh
+npm i @strudel.cycles/tone --save
+```
+
+## Example
+
+The following example will create a pattern and play it back with tone.js:
+
+```js
+import { sequence, stack, State, TimeSpan } from '@strudel.cycles/core';
+import { Tone, polysynth, osc, out } from '@strudel.cycles/tone';
+
+const pattern = sequence('c3', ['eb3', stack('g3', 'bb3')]).tone(polysynth().set(osc('sawtooth4')).chain(out()));
+
+document.getElementById('play').addEventListener('click', async () => {
+  await Tone.start();
+  Tone.getTransport().stop();
+  const events = pattern.query(new State(new TimeSpan(0, 4))).filter((e) => e.whole.begin.equals(e.part.begin));
+  events.forEach((event) =>
+    Tone.getTransport().schedule((time) => event.context.onTrigger(time, event), event.whole.begin.valueOf()),
+  );
+  Tone.getTransport().start('+0.1');
+});
+```

packages/tone/index.mjs

@@ -0,0 +1 @@
+export * from './tone.mjs';

packages/tone/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "@strudel.cycles/tone",
+  "version": "0.7.1",
+  "description": "Tone.js API for strudel",
+  "main": "index.mjs",
+  "type": "module",
+  "publishConfig": {
+    "main": "dist/index.js",
+    "module": "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",
+  "dependencies": {
+    "@strudel.cycles/core": "workspace:*",
+    "tone": "^14.7.77"
+  },
+  "devDependencies": {
+    "vite": "^4.3.3",
+    "vitest": "^0.28.0"
+  }
+}

packages/tone/test/tone.test.mjs

@@ -0,0 +1,18 @@
+/*
+tone.test.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/tone/test/tone.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 '../tone.mjs';
+import { pure } from '@strudel.cycles/core';
+import { describe, it, expect } from 'vitest';
+
+describe('tone', () => {
+  it('Should have working tone function', () => {
+    // const s = synth().chain(out()); // TODO: mock audio context?
+    // assert.deepStrictEqual(s, new Tone.Synth().chain(out()));
+    const s = {};
+    expect(pure('c3').tone(s).firstCycleValues).toEqual(['c3']);
+  });
+});

packages/tone/tone.mjs

@@ -0,0 +1,106 @@
+/*
+tone.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/tone/tone.mjs>
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { register } from '@strudel.cycles/core';
+import * as _Tone from 'tone';
+
+// import Tone from here, to make sure to get the same AudioContext
+export const Tone = _Tone;
+
+const {
+  Filter,
+  Gain,
+  Synth,
+  PolySynth,
+  MembraneSynth,
+  MetalSynth,
+  MonoSynth,
+  AMSynth,
+  DuoSynth,
+  FMSynth,
+  NoiseSynth,
+  PluckSynth,
+  Sampler,
+  getDestination,
+  Players,
+} = Tone;
+import { getPlayableNoteValue } from '@strudel.cycles/core/util.mjs';
+
+// "balanced" | "interactive" | "playback";
+// Tone.setContext(new Tone.Context({ latencyHint: 'playback', lookAhead: 1 }));
+export const getDefaultSynth = () => {
+  const s = new PolySynth().chain(new Gain(0.5), getDestination());
+  s.set({
+    oscillator: { type: 'triangle' },
+    envelope: {
+      release: 0.01,
+    },
+  });
+  return s;
+};
+
+// what about
+// https://www.charlie-roberts.com/gibberish/playground/
+
+// with this function, you can play the pattern with any tone synth
+export const tone = register('tone', function (instrument, pat) {
+  return pat.onTrigger((time, hap) => {
+    let note;
+    let velocity = hap.context?.velocity ?? 0.75;
+    if (instrument instanceof PluckSynth) {
+      note = getPlayableNoteValue(hap);
+      instrument.triggerAttack(note, time);
+    } else if (instrument instanceof NoiseSynth) {
+      instrument.triggerAttackRelease(hap.duration.valueOf(), time); // noise has no value
+    } else if (instrument instanceof Sampler) {
+      note = getPlayableNoteValue(hap);
+      instrument.triggerAttackRelease(note, hap.duration.valueOf(), time, velocity);
+    } else if (instrument instanceof Players) {
+      if (!instrument.has(hap.value)) {
+        throw new Error(`name "${hap.value}" not defined for players`);
+      }
+      const player = instrument.player(hap.value);
+      // velocity ?
+      player.start(time);
+      player.stop(time + hap.duration.valueOf());
+    } else {
+      note = getPlayableNoteValue(hap);
+      instrument.triggerAttackRelease(note, hap.duration.valueOf(), time, velocity);
+    }
+  });
+});
+
+// synth helpers
+export const amsynth = (options) => new AMSynth(options);
+export const duosynth = (options) => new DuoSynth(options);
+export const fmsynth = (options) => new FMSynth(options);
+export const membrane = (options) => new MembraneSynth(options);
+export const metal = (options) => new MetalSynth(options);
+export const monosynth = (options) => new MonoSynth(options);
+export const noise = (options) => new NoiseSynth(options);
+export const pluck = (options) => new PluckSynth(options);
+export const polysynth = (options) => new PolySynth(options);
+export const sampler = (options, baseUrl) =>
+  new Promise((resolve) => {
+    const s = new Sampler(options, () => resolve(s), baseUrl);
+  });
+export const players = (options, baseUrl = '') => {
+  options = !baseUrl
+    ? options
+    : Object.fromEntries(Object.entries(options).map(([key, value]) => [key, baseUrl + value]));
+  return new Promise((resolve) => {
+    const s = new Players(options, () => resolve(s));
+  });
+};
+export const synth = (options) => new Synth(options);
+
+// effect helpers
+export const vol = (v) => new Gain(v);
+export const lowpass = (v) => new Filter(v, 'lowpass');
+export const highpass = (v) => new Filter(v, 'highpass');
+export const adsr = (a, d = 0.1, s = 0.4, r = 0.01) => ({ envelope: { attack: a, decay: d, sustain: s, release: r } });
+export const osc = (type) => ({ oscillator: { type } });
+export const out = () => getDestination();

packages/tone/vite.config.js

@@ -0,0 +1,19 @@
+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, 'index.mjs'),
+      formats: ['es', 'cjs'],
+      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
+    },
+    rollupOptions: {
+      external: [...Object.keys(dependencies)],
+    },
+    target: 'esnext',
+  },
+});

packages/transpiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/transpiler",
-  "version": "0.8.2",
+  "version": "0.8.1",
   "description": "Transpiler for strudel user code. Converts syntactically correct but semantically meaningless JS into evaluatable strudel code.",
   "main": "index.mjs",
   "publishConfig": {
@@ -31,13 +31,12 @@
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
     "@strudel.cycles/core": "workspace:*",
-    "@strudel.cycles/mini": "workspace:*",
     "acorn": "^8.8.1",
     "escodegen": "^2.0.0",
     "estree-walker": "^3.0.1"
   },
   "devDependencies": {
     "vite": "^4.3.3",
-    "vitest": "^0.33.0"
+    "vitest": "^0.28.0"
   }
 }

packages/transpiler/test/transpiler.test.mjs

@@ -11,20 +11,22 @@ const simple = { wrapAsync: false, addReturn: false, simpleLocs: true };
 
 describe('transpiler', () => {
   it('wraps double quote string with mini and adds location', () => {
-    expect(transpiler('"c3"', simple).output).toEqual("m('c3', 0);");
-    expect(transpiler('stack("c3","bd sd")', simple).output).toEqual("stack(m('c3', 6), m('bd sd', 11));");
+    expect(transpiler('"c3"', simple)).toEqual("mini('c3').withMiniLocation(0, 4);");
+    expect(transpiler('stack("c3","bd sd")', simple)).toEqual(
+      "stack(mini('c3').withMiniLocation(6, 10), mini('bd sd').withMiniLocation(11, 18));",
+    );
   });
   it('wraps backtick string with mini and adds location', () => {
-    expect(transpiler('`c3`', simple).output).toEqual("m('c3', 0);");
+    expect(transpiler('`c3`', simple)).toEqual("mini('c3').withMiniLocation(0, 4);");
   });
   it('replaces note variables with note strings', () => {
-    expect(transpiler('seq(c3, d3)', simple).output).toEqual("seq('c3', 'd3');");
+    expect(transpiler('seq(c3, d3)', simple)).toEqual("seq('c3', 'd3');");
   });
   it('keeps tagged template literal as is', () => {
-    expect(transpiler('xxx`c3`', simple).output).toEqual('xxx`c3`;');
+    expect(transpiler('xxx`c3`', simple)).toEqual('xxx`c3`;');
   });
   it('supports top level await', () => {
-    expect(transpiler("await samples('xxx');", simple).output).toEqual("await samples('xxx');");
+    expect(transpiler("await samples('xxx');", simple)).toEqual("await samples('xxx');");
   });
   /*   it('parses dynamic imports', () => {
     expect(
@@ -34,12 +36,4 @@ describe('transpiler', () => {
       }),
     ).toEqual("const {default: foo} = await import('https://bar.com/foo.js');");
   }); */
-  it('collections locations', () => {
-    const { miniLocations } = transpiler(`s("bd", "hh oh")`, { ...simple, emitMiniLocations: true });
-    expect(miniLocations).toEqual([
-      [3, 5],
-      [9, 11],
-      [12, 14],
-    ]);
-  });
 });

packages/transpiler/transpiler.mjs

@@ -2,10 +2,9 @@ import escodegen from 'escodegen';
 import { parse } from 'acorn';
 import { walk } from 'estree-walker';
 import { isNoteWithOctave } from '@strudel.cycles/core';
-import { getLeafLocations } from '@strudel.cycles/mini';
 
 export function transpiler(input, options = {}) {
-  const { wrapAsync = false, addReturn = true, emitMiniLocations = true } = options;
+  const { wrapAsync = false, addReturn = true, simpleLocs = false } = options;
 
   let ast = parse(input, {
     ecmaVersion: 2022,
@@ -13,27 +12,18 @@ export function transpiler(input, options = {}) {
     locations: true,
   });
 
-  let miniLocations = [];
-  const collectMiniLocations = (value, node) => {
-    const leafLocs = getLeafLocations(`"${value}"`, node.start); // stimmt!
-    //const withOffset = leafLocs.map((offsets) => offsets.map((o) => o + node.start));
-    miniLocations = miniLocations.concat(leafLocs);
-  };
-
   walk(ast, {
-    enter(node, parent /* , prop, index */) {
+    enter(node, parent, prop, index) {
       if (isBackTickString(node, parent)) {
-        const { quasis } = node;
+        const { quasis, start, end } = node;
         const { raw } = quasis[0].value;
         this.skip();
-        emitMiniLocations && collectMiniLocations(raw, node);
-        return this.replace(miniWithLocation(raw, node));
+        return this.replace(miniWithLocation(raw, node, simpleLocs));
       }
       if (isStringWithDoubleQuotes(node)) {
-        const { value } = node;
+        const { value, start, end } = node;
         this.skip();
-        emitMiniLocations && collectMiniLocations(value, node);
-        return this.replace(miniWithLocation(value, node));
+        return this.replace(miniWithLocation(value, node, simpleLocs));
       }
       // TODO: remove pseudo note variables?
       if (node.type === 'Identifier' && isNoteWithOctave(node.name)) {
@@ -57,14 +47,11 @@ export function transpiler(input, options = {}) {
       argument: expression,
     };
   }
-  let output = escodegen.generate(ast);
+  const output = escodegen.generate(ast);
   if (wrapAsync) {
-    output = `(async ()=>{${output}})()`;
+    return `(async ()=>{${output}})()`;
   }
-  if (!emitMiniLocations) {
-    return { output };
-  }
-  return { output, miniLocations };
+  return output;
 }
 
 function isStringWithDoubleQuotes(node, locations, code) {
@@ -79,18 +66,64 @@ function isBackTickString(node, parent) {
   return node.type === 'TemplateLiteral' && parent.type !== 'TaggedTemplateExpression';
 }
 
-function miniWithLocation(value, node) {
-  const { start: fromOffset } = node;
+function miniWithLocation(value, node, simpleLocs) {
+  let locs;
+  const { start: fromOffset, end: toOffset } = node;
+  if (simpleLocs) {
+    locs = [
+      {
+        type: 'Literal',
+        value: fromOffset,
+      },
+      {
+        type: 'Literal',
+        value: toOffset,
+      },
+    ];
+  } else {
+    const {
+      loc: {
+        start: { line: fromLine, column: fromColumn },
+        end: { line: toLine, column: toColumn },
+      },
+    } = node;
+    locs = [
+      {
+        type: 'ArrayExpression',
+        elements: [fromLine, fromColumn, fromOffset].map((value) => ({
+          type: 'Literal',
+          value,
+        })),
+      },
+      {
+        type: 'ArrayExpression',
+        elements: [toLine, toColumn, toOffset].map((value) => ({
+          type: 'Literal',
+          value,
+        })),
+      },
+    ];
+  }
+  // with location
   return {
     type: 'CallExpression',
     callee: {
-      type: 'Identifier',
-      name: 'm',
+      type: 'MemberExpression',
+      object: {
+        type: 'CallExpression',
+        callee: {
+          type: 'Identifier',
+          name: 'mini',
+        },
+        arguments: [{ type: 'Literal', value }],
+        optional: false,
+      },
+      property: {
+        type: 'Identifier',
+        name: 'withMiniLocation',
+      },
     },
-    arguments: [
-      { type: 'Literal', value },
-      { type: 'Literal', value: fromOffset },
-    ],
+    arguments: locs,
     optional: false,
   };
 }

packages/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/web",
-  "version": "0.8.3",
+  "version": "0.8.2",
   "description": "Easy to setup, opiniated bundle of Strudel for the browser.",
   "main": "web.mjs",
   "publishConfig": {
@@ -34,10 +34,10 @@
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
     "@strudel.cycles/core": "workspace:*",
+    "@strudel.cycles/webaudio": "workspace:*",
     "@strudel.cycles/mini": "workspace:*",
     "@strudel.cycles/tonal": "workspace:*",
-    "@strudel.cycles/transpiler": "workspace:*",
-    "@strudel.cycles/webaudio": "workspace:*"
+    "@strudel.cycles/transpiler": "workspace:*"
   },
   "devDependencies": {
     "vite": "^4.3.3"

packages/webaudio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/webaudio",
-  "version": "0.8.2",
+  "version": "0.8.1",
   "description": "Web Audio helpers for Strudel",
   "main": "index.mjs",
   "type": "module",

packages/webaudio/sampler.mjs

@@ -21,7 +21,7 @@ function humanFileSize(bytes, si) {
   return bytes.toFixed(1) + ' ' + units[u];
 }
 
-export const getSampleBufferSource = async (s, n, note, speed, freq, bank, resolveUrl) => {
+export const getSampleBufferSource = async (s, n, note, speed, freq, bank) => {
   let transpose = 0;
   if (freq !== undefined && note !== undefined) {
     logger('[sampler] hap has note and freq. ignoring note', 'warning');
@@ -45,9 +45,6 @@ export const getSampleBufferSource = async (s, n, note, speed, freq, bank, resol
     transpose = -midiDiff(closest); // semitones to repitch
     sampleUrl = bank[closest][n % bank[closest].length];
   }
-  if (resolveUrl) {
-    sampleUrl = await resolveUrl(sampleUrl);
-  }
   let buffer = await loadBuffer(sampleUrl, ac, s, n);
   if (speed < 0) {
     // should this be cached?
@@ -94,46 +91,6 @@ export const getLoadedBuffer = (url) => {
   return bufferCache[url];
 };
 
-export const processSampleMap = (sampleMap, fn, baseUrl = sampleMap._base || '') => {
-  return Object.entries(sampleMap).forEach(([key, value]) => {
-    if (typeof value === 'string') {
-      value = [value];
-    }
-    if (typeof value !== 'object') {
-      throw new Error('wrong sample map format for ' + key);
-    }
-    baseUrl = value._base || baseUrl;
-    const replaceUrl = (v) => (baseUrl + v).replace('github:', 'https://raw.githubusercontent.com/');
-    if (Array.isArray(value)) {
-      //return [key, value.map(replaceUrl)];
-      value = value.map(replaceUrl);
-    } else {
-      // must be object
-      value = Object.fromEntries(
-        Object.entries(value).map(([note, samples]) => {
-          return [note, (typeof samples === 'string' ? [samples] : samples).map(replaceUrl)];
-        }),
-      );
-    }
-    fn(key, value);
-  });
-};
-
-// allows adding a custom url prefix handler
-// for example, it is used by the desktop app to load samples starting with '~/music'
-let resourcePrefixHandlers = {};
-export function registerSamplesPrefix(prefix, resolve) {
-  resourcePrefixHandlers[prefix] = resolve;
-}
-// finds a prefix handler for the given url (if any)
-function getSamplesPrefixHandler(url) {
-  const handler = Object.entries(resourcePrefixHandlers).find(([key]) => url.startsWith(key));
-  if (handler) {
-    return handler[1];
-  }
-  return;
-}
-
 /**
  * Loads a collection of samples to use with `s`
  * @example
@@ -150,11 +107,6 @@ function getSamplesPrefixHandler(url) {
 
 export const samples = async (sampleMap, baseUrl = sampleMap._base || '', options = {}) => {
   if (typeof sampleMap === 'string') {
-    // check if custom prefix handler
-    const handler = getSamplesPrefixHandler(sampleMap);
-    if (handler) {
-      return handler(sampleMap);
-    }
     if (sampleMap.startsWith('github:')) {
       let [_, path] = sampleMap.split('github:');
       path = path.endsWith('/') ? path.slice(0, -1) : path;
@@ -178,23 +130,39 @@ export const samples = async (sampleMap, baseUrl = sampleMap._base || '', option
       });
   }
   const { prebake, tag } = options;
-  processSampleMap(
-    sampleMap,
-    (key, value) =>
-      registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, value), {
-        type: 'sample',
-        samples: value,
-        baseUrl,
-        prebake,
-        tag,
-      }),
-    baseUrl,
-  );
+  Object.entries(sampleMap).forEach(([key, value]) => {
+    if (typeof value === 'string') {
+      value = [value];
+    }
+    if (typeof value !== 'object') {
+      throw new Error('wrong sample map format for ' + key);
+    }
+    baseUrl = value._base || baseUrl;
+    const replaceUrl = (v) => (baseUrl + v).replace('github:', 'https://raw.githubusercontent.com/');
+    if (Array.isArray(value)) {
+      //return [key, value.map(replaceUrl)];
+      value = value.map(replaceUrl);
+    } else {
+      // must be object
+      value = Object.fromEntries(
+        Object.entries(value).map(([note, samples]) => {
+          return [note, (typeof samples === 'string' ? [samples] : samples).map(replaceUrl)];
+        }),
+      );
+    }
+    registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, value), {
+      type: 'sample',
+      samples: value,
+      baseUrl,
+      prebake,
+      tag,
+    });
+  });
 };
 
 const cutGroups = [];
 
-export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
+export async function onTriggerSample(t, value, onended, bank) {
   const {
     s,
     freq,
@@ -202,7 +170,7 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
     nudge = 0, // TODO: is this in seconds?
     cut,
     loop,
-    clip = undefined, // if 1, samples will be cut off when the hap ends
+    clip = 0, // if 1, samples will be cut off when the hap ends
     n = 0,
     note,
     speed = 1, // sample playback speed
@@ -220,7 +188,7 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
   //const soundfont = getSoundfontKey(s);
   const time = t + nudge;
 
-  const bufferSource = await getSampleBufferSource(s, n, note, speed, freq, bank, resolveUrl);
+  const bufferSource = await getSampleBufferSource(s, n, note, speed, freq, bank);
 
   // asny stuff above took too long?
   if (ac.currentTime > t) {
@@ -264,7 +232,7 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
     out.disconnect();
     onended();
   };
-  const stop = (endTime, playWholeBuffer = clip === undefined) => {
+  const stop = (endTime, playWholeBuffer = !clip) => {
     let releaseTime = endTime;
     if (playWholeBuffer) {
       releaseTime = t + (end - begin) * bufferDuration;

packages/webdirt/README.md

@@ -0,0 +1,7 @@
+# @strudel.cycles/webdirt
+
+This package adds [webdirt](https://github.com/dktr0/WebDirt) support to strudel!
+
+## Deprecation Note
+
+This package will not be developed further. Consider using `@strudel.cycles/webaudio` as a replacement.

packages/webdirt/index.mjs

@@ -0,0 +1 @@
+export * from './webdirt.mjs';

packages/webdirt/makeSampleMap.sh

@@ -0,0 +1,32 @@
+#/bin/sh
+printf "{\n"
+dircount=0
+# for d in $searchRoot/*; do
+find $1 -mindepth 1 -maxdepth 1 -iname "*" | sort | while read d; do
+  if [ -d "$d" ]
+  then
+    if [ $dircount -ne 0 ]
+    then
+      printf ",\n"
+    fi
+    (( dircount++ ))
+    dirname=`basename $d`
+    printf "\"%s\": [" "$dirname"
+    search2=$searchRoot/$dirname/*.WAV
+    filecount=0
+    find "$d" -iname "*.wav" | sort | while read f; do
+    # for f in $search2; do
+      filename=$(printf %q "$f")
+      basename=${f##*/}
+      if [[ ${basename:0:1} != "." ]]; then
+        if [ $filecount -ne 0 ]; then
+          printf ","
+        fi
+        (( filecount++ ))
+        printf "\"%s/%s\"" "$dirname" "$basename"
+      fi
+    done
+    printf "]"
+  fi
+done
+printf "\n}\n"

packages/webdirt/package.json

@@ -0,0 +1,41 @@
+{
+  "name": "@strudel.cycles/webdirt",
+  "version": "0.7.1",
+  "description": "WebDirt integration for Strudel",
+  "main": "index.mjs",
+  "type": "module",
+  "publishConfig": {
+    "main": "dist/index.js",
+    "module": "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",
+  "dependencies": {
+    "@strudel.cycles/core": "workspace:*",
+    "@strudel.cycles/webaudio": "workspace:*",
+    "WebDirt": "github:dktr0/WebDirt"
+  },
+  "devDependencies": {
+    "vite": "^4.3.3",
+    "vitest": "^0.28.0"
+  }
+}

packages/webdirt/vite.config.js

@@ -0,0 +1,19 @@
+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, 'index.mjs'),
+      formats: ['es', 'cjs'],
+      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
+    },
+    rollupOptions: {
+      external: [...Object.keys(dependencies)],
+    },
+    target: 'esnext',
+  },
+});

packages/webdirt/webdirt.mjs

@@ -0,0 +1,97 @@
+import * as strudel from '@strudel.cycles/core';
+const { Pattern } = strudel;
+import * as WebDirt from 'WebDirt';
+//import { loadBuffer, getLoadedBuffer } from '@strudel.cycles/webaudio';
+
+let webDirt;
+
+/*
+example config:
+{
+    sampleMapUrl: 'EmuSP12.json',
+    sampleFolder: 'EmuSP12',
+}
+*/
+export function loadWebDirt(config) {
+  webDirt = new WebDirt.WebDirt(config);
+  webDirt.initializeWebAudio();
+}
+
+/**
+ *
+ * Uses [webdirt](https://github.com/dktr0/WebDirt) as output.
+ *
+ * <details>
+ * <summary>show supported Webdirt controls</summary>
+ *
+ * - s :: String, -- name of sample bank
+ * - n :: Int, -- number of sample within a bank
+ * - {@link gain} :: Number, -- clamped from 0 to 2; 1 is default and full-scale
+ * - overgain :: Number, -- additional gain added to gain to go past clamp at 2
+ * - {@link pan} :: Number, -- range: 0 to 1
+ * - nudge :: Number, -- nudge the time of the sample forwards/backwards in seconds
+ * - {@link speed} :: Number, -- speed / pitch of the sample
+ * - {@link unit} :: String
+ * - note :: Number, -- pitch offset in semitones
+ * - {@link begin} :: Number, -- cut from sample start, normalized
+ * - {@link end} :: Number, -- cut from sample end, normalized
+ * - {@link cut} :: Int, -- samples with same cut number will interupt each other
+ * - {@link cutoff} :: Number, -- lowpass filter frequency
+ * - {@link resonance} :: Number, -- lowpass filter resonance
+ * - {@link hcutoff} :: Number, -- highpass filter frequency
+ * - {@link hresonance} :: Number, -- highpass filter resonance
+ * - {@link bandf} :: Number, -- bandpass filter frequency
+ * - {@link bandq} :: Number, -- bandpass filter resonance
+ * - {@link vowel} :: String, -- name of vowel ('a' | 'e' | 'i' | 'o' | 'u')
+ * - delay :: Number, -- delay wet/dry mix
+ * - delaytime :: Number, -- delay time in seconds
+ * - delayfeedback :: Number, -- delay feedback
+ * - {@link loop} :: Number, -- loop sample n times (relative to sample length)
+ * - {@link crush} :: Number, -- bitcrusher (currently not working)
+ * - {@link coarse} :: Number, -- coarse effect (currently not working)
+ * - {@link shape} :: Number, -- (currently not working)
+
+ *
+ * </details>
+ *
+ * @name webdirt
+ * @memberof Pattern
+ * @returns Pattern
+ * @example
+ * s("bd*2 hh sd hh").n("<0 1>").webdirt()
+ * @noAutocomplete
+ */
+Pattern.prototype.webdirt = function () {
+  throw new Error('webdirt support has been dropped..');
+  // create a WebDirt object and initialize Web Audio context
+  /* return this.onTrigger(async (time, e, currentTime) => {
+    if (!webDirt) {
+      throw new Error('WebDirt not initialized!');
+    }
+    const deadline = time - currentTime;
+    const { s, n = 0, ...rest } = e.value || {};
+    if (!s) {
+      console.warn('Pattern.webdirt: no "s" was set!');
+    }
+    const samples = getLoadedSamples();
+    if (!samples?.[s]) {
+      // try default samples
+      webDirt.playSample({ s, n, ...rest }, deadline);
+      return;
+    }
+    if (!samples?.[s]) {
+      console.warn(`Pattern.webdirt: sample "${s}" not found in loaded samples`, samples);
+    } else {
+      const bank = samples[s];
+      const sampleUrl = bank[n % bank.length];
+      const buffer = getLoadedBuffer(sampleUrl);
+      if (!buffer) {
+        console.log(`Pattern.webdirt: load ${s}:${n} from ${sampleUrl}`);
+        loadBuffer(sampleUrl, webDirt.ac);
+      } else {
+        const msg = { buffer: { buffer }, ...rest };
+        webDirt.playSample(msg, deadline);
+      }
+    }
+  }); */
+};

packages/xen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/xen",
-  "version": "0.8.0",
+  "version": "0.7.1",
   "description": "Xenharmonic API for strudel",
   "main": "index.mjs",
   "publishConfig": {
@@ -34,6 +34,6 @@
   },
   "devDependencies": {
     "vite": "^4.3.3",
-    "vitest": "^0.33.0"
+    "vitest": "^0.28.0"
   }
 }

src-tauri/.gitignore

@@ -1,3 +0,0 @@
-# Generated by Cargo
-# will have compiled files and executables
-/target/

src-tauri/Cargo.toml

@@ -1,32 +0,0 @@
-[package]
-name = "app"
-version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
-license = ""
-repository = ""
-default-run = "app"
-edition = "2021"
-rust-version = "1.60"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[build-dependencies]
-tauri-build = { version = "1.4.0", features = [] }
-
-[dependencies]
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.4.0", features = ["fs-all"] }
-
-[features]
-# this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.
-# If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes.
-# DO NOT REMOVE!!
-custom-protocol = ["tauri/custom-protocol"]
-
-[profile.release]
-panic = "abort"
-codegen-units = 1
-lto = true
-opt-level = "s"

src-tauri/README.md

@@ -1,29 +0,0 @@
-# @strudel.cycles/tauri
-
-Rust source files for building native desktop apps using Tauri
-
-## Usage
-
-Install [Rust](https://rustup.rs/) on your system.
-
-From the project root:
-
-- install Strudel dependencies
-
-```js
-pnpm i
-```
-
-- to run Strudel for development
-
-```js
-pnpm tauri dev
-```
-
-- to build the binary and installer/bundle
-
-```js
-pnpm tauri build
-```
-
-The binary and installer can be found in the 'src-tauri/target/release/bundle' directory

src-tauri/build.rs

@@ -1,3 +0,0 @@
-fn main() {
-  tauri_build::build()
-}