fix: add flag to reduce dom weight

+ use name instead of longname for linking

.eslintignore

@@ -17,6 +17,4 @@ vite.config.js
 **/*.ts
 **/*.json
 **/dev-dist
-**/dist
-/src-tauri/target/**/*
-reverbGen.mjs
+**/dist

.github/workflows/tauri.yml

@@ -42,7 +42,7 @@ jobs:
         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 libasound2-dev
+          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

index.mjs

@@ -2,7 +2,6 @@
 export * from './packages/core/index.mjs';
 export * from './packages/csound/index.mjs';
 export * from './packages/embed/index.mjs';
-export * from './packages/desktopbridge/index.mjs';
 export * from './packages/midi/index.mjs';
 export * from './packages/mini/index.mjs';
 export * from './packages/osc/index.mjs';

packages/codemirror/index.mjs

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

packages/codemirror/package.json

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

packages/codemirror/slider.mjs

@@ -1,135 +0,0 @@
-import { ref, pure } from '@strudel.cycles/core';
-import { WidgetType, ViewPlugin, Decoration } from '@codemirror/view';
-import { StateEffect, StateField } from '@codemirror/state';
-
-export let sliderValues = {};
-const getSliderID = (from) => `slider_${from}`;
-
-export class SliderWidget extends WidgetType {
-  constructor(value, min, max, from, to, step, view) {
-    super();
-    this.value = value;
-    this.min = min;
-    this.max = max;
-    this.from = from;
-    this.originalFrom = from;
-    this.to = to;
-    this.step = step;
-    this.view = view;
-  }
-
-  eq() {
-    return false;
-  }
-
-  toDOM() {
-    let wrap = document.createElement('span');
-    wrap.setAttribute('aria-hidden', 'true');
-    wrap.className = 'cm-slider'; // inline-flex items-center
-    let slider = wrap.appendChild(document.createElement('input'));
-    slider.type = 'range';
-    slider.min = this.min;
-    slider.max = this.max;
-    slider.step = this.step ?? (this.max - this.min) / 1000;
-    slider.originalValue = this.value;
-    // to make sure the code stays in sync, let's save the original value
-    // becuase .value automatically clamps values so it'll desync with the code
-    slider.value = slider.originalValue;
-    slider.from = this.from;
-    slider.originalFrom = this.originalFrom;
-    slider.to = this.to;
-    slider.style = 'width:64px;margin-right:4px;transform:translateY(4px)';
-    this.slider = slider;
-    slider.addEventListener('input', (e) => {
-      const next = e.target.value;
-      let insert = next;
-      //let insert = next.toFixed(2);
-      const to = slider.from + slider.originalValue.length;
-      let change = { from: slider.from, to, insert };
-      slider.originalValue = insert;
-      slider.value = insert;
-      this.view.dispatch({ changes: change });
-      const id = getSliderID(slider.originalFrom); // matches id generated in transpiler
-      window.postMessage({ type: 'cm-slider', value: Number(next), id });
-    });
-    return wrap;
-  }
-
-  ignoreEvent(e) {
-    return true;
-  }
-}
-
-export const setWidgets = StateEffect.define();
-
-export const updateWidgets = (view, widgets) => {
-  view.dispatch({ effects: setWidgets.of(widgets) });
-};
-
-function getWidgets(widgetConfigs, view) {
-  return widgetConfigs.map(({ from, to, value, min, max, step }) => {
-    return Decoration.widget({
-      widget: new SliderWidget(value, min, max, from, to, step, view),
-      side: 0,
-    }).range(from /* , to */);
-  });
-}
-
-export const sliderPlugin = ViewPlugin.fromClass(
-  class {
-    decorations; //: DecorationSet
-
-    constructor(view /* : EditorView */) {
-      this.decorations = Decoration.set([]);
-    }
-
-    update(update /* : ViewUpdate */) {
-      update.transactions.forEach((tr) => {
-        if (tr.docChanged) {
-          this.decorations = this.decorations.map(tr.changes);
-          const iterator = this.decorations.iter();
-          while (iterator.value) {
-            // when the widgets are moved, we need to tell the dom node the current position
-            // this is important because the updateSliderValue function has to work with the dom node
-            if (iterator.value?.widget?.slider) {
-              iterator.value.widget.slider.from = iterator.from;
-              iterator.value.widget.slider.to = iterator.to;
-            }
-            iterator.next();
-          }
-        }
-        for (let e of tr.effects) {
-          if (e.is(setWidgets)) {
-            this.decorations = Decoration.set(getWidgets(e.value, update.view));
-          }
-        }
-      });
-    }
-  },
-  {
-    decorations: (v) => v.decorations,
-  },
-);
-
-export let slider = (value) => {
-  console.warn('slider will only work when the transpiler is used... passing value as is');
-  return pure(value);
-};
-// function transpiled from slider = (value, min, max)
-export let sliderWithID = (id, value, min, max) => {
-  sliderValues[id] = value; // sync state at eval time (code -> state)
-  return ref(() => sliderValues[id]); // use state at query time
-};
-// update state when sliders are moved
-if (typeof window !== 'undefined') {
-  window.addEventListener('message', (e) => {
-    if (e.data.type === 'cm-slider') {
-      if (sliderValues[e.data.id] !== undefined) {
-        // update state when slider is moved
-        sliderValues[e.data.id] = e.data.value;
-      } else {
-        console.warn(`slider with id "${e.data.id}" is not registered. Only ${Object.keys(sliderValues)}`);
-      }
-    }
-  });
-}

packages/core/controls.mjs

@@ -109,97 +109,6 @@ const generic_params = [
    */
   ['attack', 'att'],
 
-  /**
-   * Sets the Frequency Modulation Harmonicity Ratio.
-   * Controls the timbre of the sound.
-   * Whole numbers and simple ratios sound more natural,
-   * while decimal numbers and complex ratios sound metallic.
-   *
-   * @name fmh
-   * @param {number | Pattern} harmonicity
-   * @example
-   * note("c e g b")
-   * .fm(4)
-   * .fmh("<1 2 1.5 1.61>")
-   * .scope()
-   *
-   */
-  [['fmh', 'fmi'], 'fmh'],
-  /**
-   * Sets the Frequency Modulation of the synth.
-   * Controls the modulation index, which defines the brightness of the sound.
-   *
-   * @name fm
-   * @param {number | Pattern} brightness modulation index
-   * @synonyms fmi
-   * @example
-   * note("c e g b")
-   * .fm("<0 1 2 8 32>")
-   * .scope()
-   *
-   */
-  [['fmi', 'fmh'], 'fm'],
-  // fm envelope
-  /**
-   * Ramp type of fm envelope. Exp might be a bit broken..
-   *
-   * @name fmenv
-   * @param {number | Pattern} type lin | exp
-   * @example
-   * note("c e g b")
-   * .fm(4)
-   * .fmdecay(.2)
-   * .fmsustain(0)
-   * .fmenv("<exp lin>")
-   * .scope()
-   *
-   */
-  ['fmenv'],
-  /**
-   * Attack time for the FM envelope: time it takes to reach maximum modulation
-   *
-   * @name fmattack
-   * @param {number | Pattern} time attack time
-   * @example
-   * note("c e g b")
-   * .fm(4)
-   * .fmattack("<0 .05 .1 .2>")
-   * .scope()
-   *
-   */
-  ['fmattack'],
-  /**
-   * Decay time for the FM envelope: seconds until the sustain level is reached after the attack phase.
-   *
-   * @name fmdecay
-   * @param {number | Pattern} time decay time
-   * @example
-   * note("c e g b")
-   * .fm(4)
-   * .fmdecay("<.01 .05 .1 .2>")
-   * .fmsustain(.4)
-   * .scope()
-   *
-   */
-  ['fmdecay'],
-  /**
-   * Sustain level for the FM envelope: how much modulation is applied after the decay phase
-   *
-   * @name fmsustain
-   * @param {number | Pattern} level sustain level
-   * @example
-   * note("c e g b")
-   * .fm(4)
-   * .fmdecay(.1)
-   * .fmsustain("<1 .75 .5 0>")
-   * .scope()
-   *
-   */
-  ['fmsustain'],
-  // these are not really useful... skipping for now
-  ['fmrelease'],
-  ['fmvelocity'],
-
   /**
    * Select the sound bank to use. To be used together with `s`. The bank name (+ "_") will be prepended to the value of `s`.
    *
@@ -211,9 +120,6 @@ const generic_params = [
    */
   ['bank'],
 
-  ['analyze'], // analyser node send amount 0 - 1 (used by scope)
-  ['fft'], // fftSize of analyser
-
   /**
    * Amplitude envelope decay time: the time it takes after the attack time to reach the sustain level.
    * Note that the decay is only audible if the sustain value is lower than 1.
@@ -299,52 +205,16 @@ const generic_params = [
    */
   ['end'],
   /**
-   * Loops the sample.
+   * Loops the sample (from `begin` to `end`) the specified number of times.
    * Note that the tempo of the loop is not synced with the cycle tempo.
-   * To change the loop region, use loopBegin / loopEnd.
    *
    * @name loop
-   * @param {number | Pattern} on If 1, the sample is looped
+   * @param {number | Pattern} times How often the sample is looped
    * @example
-   * s("casio").loop(1)
+   * s("bd").loop("<1 2 3 4>").osc()
    *
    */
   ['loop'],
-  /**
-   * Begin to loop at a specific point in the sample (inbetween `begin` and `end`).
-   * Note that the loop point must be inbetween `begin` and `end`, and before `loopEnd`!
-   * Note: Samples starting with wt_ will automatically loop! (wt = wavetable)
-   *
-   * @name loopBegin
-   * @param {number | Pattern} time between 0 and 1, where 1 is the length of the sample
-   * @synonyms loopb
-   * @example
-   * s("space").loop(1)
-   * .loopBegin("<0 .125 .25>").scope()
-   */
-  ['loopBegin', 'loopb'],
-  /**
-   *
-   * End the looping section at a specific point in the sample (inbetween `begin` and `end`).
-   * Note that the loop point must be inbetween `begin` and `end`, and after `loopBegin`!
-   *
-   * @name loopEnd
-   * @param {number | Pattern} time between 0 and 1, where 1 is the length of the sample
-   * @synonyms loope
-   * @example
-   * s("space").loop(1)
-   * .loopEnd("<1 .75 .5 .25>").scope()
-   */
-  ['loopEnd', 'loope'],
-  /**
-   * bit crusher effect.
-   *
-   * @name crush
-   * @param {number | Pattern} depth between 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).
-   * @example
-   * s("<bd sd>,hh*3").fast(2).crush("<16 8 7 6 5 4 3 2>")
-   *
-   */
   // TODO: currently duplicated with "native" legato
   // TODO: superdirt legato will do more: https://youtu.be/dQPmE1WaD1k?t=419
   /**
@@ -359,6 +229,15 @@ const generic_params = [
    */
   // ['legato'],
   // ['clhatdecay'],
+  /**
+   * bit crusher effect.
+   *
+   * @name crush
+   * @param {number | Pattern} depth between 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).
+   * @example
+   * s("<bd sd>,hh*3").fast(2).crush("<16 8 7 6 5 4 3 2>")
+   *
+   */
   ['crush'],
   /**
    * fake-resampling for lowering the sample rate. Caution: This effect seems to only work in chromium based browsers
@@ -370,6 +249,7 @@ const generic_params = [
    *
    */
   ['coarse'],
+
   /**
    * choose the channel the pattern is sent to in superdirt
    *
@@ -403,227 +283,6 @@ const generic_params = [
    *
    */
   [['cutoff', 'resonance'], 'ctf', 'lpf', 'lp'],
-
-  /**
-   * Sets the lowpass filter envelope modulation depth.
-   * @name lpenv
-   * @param {number | Pattern} modulation depth of the lowpass filter envelope between 0 and _n_
-   * @synonyms lpe
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .lpf(500)
-   * .lpa(.5)
-   * .lpenv("<4 2 1 0 -1 -2 -4>/4")
-   */
-  ['lpenv', 'lpe'],
-  /**
-   * Sets the highpass filter envelope modulation depth.
-   * @name hpenv
-   * @param {number | Pattern} modulation depth of the highpass filter envelope between 0 and _n_
-   * @synonyms hpe
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .hpf(500)
-   * .hpa(.5)
-   * .hpenv("<4 2 1 0 -1 -2 -4>/4")
-   */
-  ['hpenv', 'hpe'],
-  /**
-   * Sets the bandpass filter envelope modulation depth.
-   * @name bpenv
-   * @param {number | Pattern} modulation depth of the bandpass filter envelope between 0 and _n_
-   * @synonyms bpe
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .bpf(500)
-   * .bpa(.5)
-   * .bpenv("<4 2 1 0 -1 -2 -4>/4")
-   */
-  ['bpenv', 'bpe'],
-  /**
-   * Sets the attack duration for the lowpass filter envelope.
-   * @name lpattack
-   * @param {number | Pattern} attack time of the filter envelope
-   * @synonyms lpa
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .lpf(500)
-   * .lpa("<.5 .25 .1 .01>/4")
-   * .lpenv(4)
-   */
-  ['lpattack', 'lpa'],
-  /**
-   * Sets the attack duration for the highpass filter envelope.
-   * @name hpattack
-   * @param {number | Pattern} attack time of the highpass filter envelope
-   * @synonyms hpa
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .hpf(500)
-   * .hpa("<.5 .25 .1 .01>/4")
-   * .hpenv(4)
-   */
-  ['hpattack', 'hpa'],
-  /**
-   * Sets the attack duration for the bandpass filter envelope.
-   * @name bpattack
-   * @param {number | Pattern} attack time of the bandpass filter envelope
-   * @synonyms bpa
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .bpf(500)
-   * .bpa("<.5 .25 .1 .01>/4")
-   * .bpenv(4)
-   */
-  ['bpattack', 'bpa'],
-  /**
-   * Sets the decay duration for the lowpass filter envelope.
-   * @name lpdecay
-   * @param {number | Pattern} decay time of the filter envelope
-   * @synonyms lpd
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .lpf(500)
-   * .lpd("<.5 .25 .1 0>/4")
-   * .lps(0.2)
-   * .lpenv(4)
-   */
-  ['lpdecay', 'lpd'],
-  /**
-   * Sets the decay duration for the highpass filter envelope.
-   * @name hpdecay
-   * @param {number | Pattern} decay time of the highpass filter envelope
-   * @synonyms hpd
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .hpf(500)
-   * .hpd("<.5 .25 .1 0>/4")
-   * .hps(0.2)
-   * .hpenv(4)
-   */
-  ['hpdecay', 'hpd'],
-  /**
-   * Sets the decay duration for the bandpass filter envelope.
-   * @name bpdecay
-   * @param {number | Pattern} decay time of the bandpass filter envelope
-   * @synonyms bpd
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .bpf(500)
-   * .bpd("<.5 .25 .1 0>/4")
-   * .bps(0.2)
-   * .bpenv(4)
-   */
-  ['bpdecay', 'bpd'],
-  /**
-   * Sets the sustain amplitude for the lowpass filter envelope.
-   * @name lpsustain
-   * @param {number | Pattern} sustain amplitude of the lowpass filter envelope
-   * @synonyms lps
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .lpf(500)
-   * .lpd(.5)
-   * .lps("<0 .25 .5 1>/4")
-   * .lpenv(4)
-   */
-  ['lpsustain', 'lps'],
-  /**
-   * Sets the sustain amplitude for the highpass filter envelope.
-   * @name hpsustain
-   * @param {number | Pattern} sustain amplitude of the highpass filter envelope
-   * @synonyms hps
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .hpf(500)
-   * .hpd(.5)
-   * .hps("<0 .25 .5 1>/4")
-   * .hpenv(4)
-   */
-  ['hpsustain', 'hps'],
-  /**
-   * Sets the sustain amplitude for the bandpass filter envelope.
-   * @name bpsustain
-   * @param {number | Pattern} sustain amplitude of the bandpass filter envelope
-   * @synonyms bps
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .bpf(500)
-   * .bpd(.5)
-   * .bps("<0 .25 .5 1>/4")
-   * .bpenv(4)
-   */
-  ['bpsustain', 'bps'],
-  /**
-   * Sets the release time for the lowpass filter envelope.
-   * @name lprelease
-   * @param {number | Pattern} release time of the filter envelope
-   * @synonyms lpr
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .clip(.5)
-   * .lpf(500)
-   * .lpenv(4)
-   * .lpr("<.5 .25 .1 0>/4")
-   * .release(.5)
-   */
-  ['lprelease', 'lpr'],
-  /**
-   * Sets the release time for the highpass filter envelope.
-   * @name hprelease
-   * @param {number | Pattern} release time of the highpass filter envelope
-   * @synonyms hpr
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .clip(.5)
-   * .hpf(500)
-   * .hpenv(4)
-   * .hpr("<.5 .25 .1 0>/4")
-   * .release(.5)
-   */
-  ['hprelease', 'hpr'],
-  /**
-   * Sets the release time for the bandpass filter envelope.
-   * @name bprelease
-   * @param {number | Pattern} release time of the bandpass filter envelope
-   * @synonyms bpr
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .clip(.5)
-   * .bpf(500)
-   * .bpenv(4)
-   * .bpr("<.5 .25 .1 0>/4")
-   * .release(.5)
-   */
-  ['bprelease', 'bpr'],
-  /**
-   * Sets the filter type. The 24db filter is more aggressive. More types might be added in the future.
-   * @name ftype
-   * @param {number | Pattern} type 12db (default) or 24db
-   * @example
-   * note("<c2 e2 f2 g2>")
-   * .sound('sawtooth')
-   * .lpf(500)
-   * .bpenv(4)
-   * .ftype("<12db 24db>")
-   */
-  ['ftype'],
-  ['fanchor'],
   /**
    * Applies the cutoff frequency of the **h**igh-**p**ass **f**ilter.
    *
@@ -640,45 +299,6 @@ const generic_params = [
    */
   // currently an alias of 'hcutoff' https://github.com/tidalcycles/strudel/issues/496
   // ['hpf'],
-  /**
-   * Applies a vibrato to the frequency of the oscillator.
-   *
-   * @name vib
-   * @synonyms vibrato, v
-   * @param {number | Pattern} frequency of the vibrato in hertz
-   * @example
-   * note("a")
-   * .vib("<.5 1 2 4 8 16>")
-   * @example
-   * // change the modulation depth with ":"
-   * note("a")
-   * .vib("<.5 1 2 4 8 16>:12")
-   */
-  [['vib', 'vibmod'], 'vibrato', 'v'],
-  /**
-   * Adds pink noise to the mix
-   *
-   * @name noise
-   * @param {number | Pattern} wet wet amount
-   * @example
-   * sound("<white pink brown>/2")
-   */
-  ['noise'],
-  /**
-   * Sets the vibrato depth in semitones. Only has an effect if `vibrato` | `vib` | `v` is is also set
-   *
-   * @name vibmod
-   * @synonyms vmod
-   * @param {number | Pattern} depth of vibrato (in semitones)
-   * @example
-   * note("a").vib(4)
-   * .vibmod("<.25 .5 1 2 12>")
-   * @example
-   * // change the vibrato frequency with ":"
-   * note("a")
-   * .vibmod("<.25 .5 1 2 12>:8")
-   */
-  [['vibmod', 'vib'], 'vmod'],
   [['hcutoff', 'hresonance'], 'hpf', 'hp'],
   /**
    * Controls the **h**igh-**p**ass **q**-value.
@@ -857,9 +477,6 @@ const generic_params = [
    *
    */
   ['lsize'],
-  // label for pianoroll
-  ['activeLabel'],
-  [['label', 'activeLabel']],
   // ['lfo'],
   // ['lfocutoffint'],
   // ['lfodelay'],
@@ -979,64 +596,20 @@ const generic_params = [
    *
    */
   [['room', 'size']],
-  /**
-   * Reverb lowpass starting frequency (in hertz).
-   * When this property is changed, the reverb will be recaculated, so only change this sparsely..
-   *
-   * @name roomlp
-   * @synonyms rlp
-   * @param {number} frequency between 0 and 20000hz
-   * @example
-   * s("bd sd").room(0.5).rlp(10000)
-   * @example
-   * s("bd sd").room(0.5).rlp(5000)
-   */
-  ['roomlp', 'rlp'],
-  /**
-   * Reverb lowpass frequency at -60dB (in hertz).
-   * When this property is changed, the reverb will be recaculated, so only change this sparsely..
-   *
-   * @name roomdim
-   * @synonyms rdim
-   * @param {number} frequency between 0 and 20000hz
-   * @example
-   * s("bd sd").room(0.5).rlp(10000).rdim(8000)
-   * @example
-   * s("bd sd").room(0.5).rlp(5000).rdim(400)
-   *
-   */
-  ['roomdim', 'rdim'],
-  /**
-   * Reverb fade time (in seconds).
-   * When this property is changed, the reverb will be recaculated, so only change this sparsely..
-   *
-   * @name roomfade
-   * @synonyms rfade
-   * @param {number} seconds for the reverb to fade
-   * @example
-   * s("bd sd").room(0.5).rlp(10000).rfade(0.5)
-   * @example
-   * s("bd sd").room(0.5).rlp(5000).rfade(4)
-   *
-   */
-  ['roomfade', 'rfade'],
   /**
    * Sets the room size of the reverb, see {@link room}.
-   * When this property is changed, the reverb will be recaculated, so only change this sparsely..
    *
    * @name roomsize
    * @param {number | Pattern} size between 0 and 10
-   * @synonyms rsize, sz, size
+   * @synonyms size, sz
    * @example
-   * s("bd sd").room(.8).rsize(1)
-   * @example
-   * s("bd sd").room(.8).rsize(4)
+   * s("bd sd").room(.8).roomsize("<0 1 2 4 8>")
    *
    */
   // TODO: find out why :
   // s("bd sd").room(.8).roomsize("<0 .2 .4 .6 .8 [1,0]>").osc()
   // .. does not work. Is it because room is only one effect?
-  ['roomsize', 'size', 'sz', 'rsize'],
+  ['size', 'sz', 'roomsize'],
   // ['sagogo'],
   // ['sclap'],
   // ['sclaves'],
@@ -1197,22 +770,8 @@ const generic_params = [
    *
    */
   ['clip'],
-
-  // ZZFX
-  ['zrand'],
-  ['curve'],
-  ['slide'], // superdirt duplicate
-  ['deltaSlide'],
-  ['pitchJump'],
-  ['pitchJumpTime'],
-  ['lfo', 'repeatTime'],
-  ['znoise'], // noise on the frequency or as bubo calls it "frequency fog" :)
-  ['zmod'],
-  ['zcrush'], // like crush but scaled differently
-  ['zdelay'],
-  ['tremolo'],
-  ['zzfx'],
 ];
+
 // TODO: slice / splice https://www.youtube.com/watch?v=hKhPdO0RKDQ&list=PL2lW1zNIIwj3bDkh-Y3LUGDuRcoUigoDs&index=13
 
 controls.createParam = function (names) {

packages/core/draw.mjs

@@ -9,29 +9,25 @@ import { Pattern, getTime, State, TimeSpan } from './index.mjs';
 export const getDrawContext = (id = 'test-canvas') => {
   let canvas = document.querySelector('#' + id);
   if (!canvas) {
-    const scale = 2; // 2 = crisp on retina screens
     canvas = document.createElement('canvas');
     canvas.id = id;
-    canvas.width = window.innerWidth * scale;
-    canvas.height = window.innerHeight * scale;
+    canvas.width = window.innerWidth;
+    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 * scale;
-        canvas.height = window.innerHeight * scale;
+        canvas.width = window.innerWidth;
+        canvas.height = window.innerHeight;
       }, 200);
     });
   }
   return canvas.getContext('2d');
 };
 
-Pattern.prototype.draw = function (callback, { from, to, onQuery } = {}) {
-  if (typeof window === 'undefined') {
-    return this;
-  }
+Pattern.prototype.draw = function (callback, { from, to, onQuery }) {
   if (window.strudelAnimation) {
     cancelAnimationFrame(window.strudelAnimation);
   }
@@ -63,7 +59,7 @@ Pattern.prototype.draw = function (callback, { from, to, onQuery } = {}) {
 
 export const cleanupDraw = (clearScreen = true) => {
   const ctx = getDrawContext();
-  clearScreen && ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.width);
+  clearScreen && ctx.clearRect(0, 0, window.innerWidth, window.innerHeight);
   if (window.strudelAnimation) {
     cancelAnimationFrame(window.strudelAnimation);
   }

packages/core/package.json

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

packages/core/pattern.mjs

@@ -2273,14 +2273,14 @@ export const slice = register(
   false, // turns off auto-patternification
 );
 
-/**
+/*
  * Works the same as slice, but changes the playback speed of each slice to match the duration of its step.
  * @name splice
+ * @memberof Pattern
+ * @returns Pattern
  * @example
  * await samples('github:tidalcycles/Dirt-Samples/master')
- * s("breaks165")
- * .splice(8,  "0 1 [2 3 0]@2 3 0@2 7")
- * .hurry(0.65)
+ * s("breaks165").splice(8,  "0 1 [2 3 0]@2 3 0@2 7").hurry(0.65)
  */
 
 export const splice = register(
@@ -2307,16 +2307,9 @@ export const { loopAt, loopat } = register(['loopAt', 'loopat'], function (facto
   return _loopAt(factor, pat, 1);
 });
 
-// the fit function will be redefined in repl.mjs to use the correct cps value.
+// 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
-/**
- * Makes the sample fit its event duration. Good for rhythmical loops like drum breaks.
- * Similar to loopAt.
- * @name fit
- * @example
- * samples({ rhodes: 'https://cdn.freesound.org/previews/132/132051_316502-lq.mp3' })
- * s("rhodes/4").fit()
- */
+
 export const fit = register('fit', (pat) =>
   pat.withHap((hap) =>
     hap.withValue((v) => ({
@@ -2343,9 +2336,3 @@ export const fit = register('fit', (pat) =>
 export const { loopAtCps, loopatcps } = register(['loopAtCps', 'loopatcps'], function (factor, cps, pat) {
   return _loopAt(factor, pat, cps);
 });
-
-/** exposes a custom value at query time. basically allows mutating state without evaluation */
-export const ref = (accessor) =>
-  pure(1)
-    .withValue(() => reify(accessor()))
-    .innerJoin();

packages/core/pianoroll.mjs

@@ -29,26 +29,138 @@ const getValue = (e) => {
   return value;
 };
 
-Pattern.prototype.pianoroll = function (options = {}) {
-  let { cycles = 4, playhead = 0.5, overscan = 1, hideNegative = false } = options;
-
+Pattern.prototype.pianoroll = function ({
+  cycles = 4,
+  playhead = 0.5,
+  overscan = 1,
+  flipTime = 0,
+  flipValues = 0,
+  hideNegative = false,
+  // inactive = '#C9E597',
+  // inactive = '#FFCA28',
+  inactive = '#7491D2',
+  active = '#FFCA28',
+  // background = '#2A3236',
+  background = 'transparent',
+  smear = 0,
+  playheadColor = 'white',
+  minMidi = 10,
+  maxMidi = 90,
+  autorange = 0,
+  timeframe: timeframeProp,
+  fold = 0,
+  vertical = 0,
+  labels = 0,
+} = {}) {
+  const ctx = getDrawContext();
+  const w = ctx.canvas.width;
+  const h = ctx.canvas.height;
   let from = -cycles * playhead;
   let to = cycles * (1 - playhead);
 
+  if (timeframeProp) {
+    console.warn('timeframe is deprecated! use from/to instead');
+    from = 0;
+    to = timeframeProp;
+  }
+  const timeAxis = vertical ? h : w;
+  const valueAxis = vertical ? w : h;
+  let timeRange = vertical ? [timeAxis, 0] : [0, timeAxis]; // pixel range for time
+  const timeExtent = to - from; // number of seconds that fit inside the canvas frame
+  const valueRange = vertical ? [0, valueAxis] : [valueAxis, 0]; // pixel range for values
+  let valueExtent = maxMidi - minMidi + 1; // number of "slots" for values, overwritten if autorange true
+  let barThickness = valueAxis / valueExtent; // pixels per value, overwritten if autorange true
+  let foldValues = [];
+  flipTime && timeRange.reverse();
+  flipValues && valueRange.reverse();
+
   this.draw(
-    (ctx, haps, t) => {
+    (ctx, events, t) => {
+      ctx.fillStyle = background;
+      ctx.globalAlpha = 1; // reset!
+      if (!smear) {
+        ctx.clearRect(0, 0, w, h);
+        ctx.fillRect(0, 0, w, h);
+      }
       const inFrame = (event) =>
         (!hideNegative || event.whole.begin >= 0) && event.whole.begin <= t + to && event.endClipped >= t + from;
-      pianoroll({
-        ...options,
-        time: t,
-        ctx,
-        haps: haps.filter(inFrame),
+      events.filter(inFrame).forEach((event) => {
+        const isActive = event.whole.begin <= t && event.endClipped > t;
+        ctx.fillStyle = event.context?.color || inactive;
+        ctx.strokeStyle = event.context?.color || active;
+        ctx.globalAlpha = event.context.velocity ?? event.value?.gain ?? 1;
+        const timePx = scale((event.whole.begin - (flipTime ? to : from)) / timeExtent, ...timeRange);
+        let durationPx = scale(event.duration / timeExtent, 0, timeAxis);
+        const value = getValue(event);
+        const valuePx = scale(
+          fold ? foldValues.indexOf(value) / foldValues.length : (Number(value) - minMidi) / valueExtent,
+          ...valueRange,
+        );
+        let margin = 0;
+        const offset = scale(t / timeExtent, ...timeRange);
+        let coords;
+        if (vertical) {
+          coords = [
+            valuePx + 1 - (flipValues ? barThickness : 0), // x
+            timeAxis - offset + timePx + margin + 1 - (flipTime ? 0 : durationPx), // y
+            barThickness - 2, // width
+            durationPx - 2, // height
+          ];
+        } else {
+          coords = [
+            timePx - offset + margin + 1 - (flipTime ? durationPx : 0), // x
+            valuePx + 1 - (flipValues ? 0 : barThickness), // y
+            durationPx - 2, // widith
+            barThickness - 2, // height
+          ];
+        }
+        isActive ? ctx.strokeRect(...coords) : ctx.fillRect(...coords);
+        if (labels) {
+          const label = event.value.note ?? event.value.s + (event.value.n ? `:${event.value.n}` : '');
+          ctx.font = `${barThickness * 0.75}px monospace`;
+          ctx.strokeStyle = 'black';
+          ctx.fillStyle = isActive ? 'white' : 'black';
+          ctx.textBaseline = 'top';
+          ctx.fillText(label, ...coords);
+        }
       });
+      ctx.globalAlpha = 1; // reset!
+      const playheadPosition = scale(-from / timeExtent, ...timeRange);
+      // draw playhead
+      ctx.strokeStyle = playheadColor;
+      ctx.beginPath();
+      if (vertical) {
+        ctx.moveTo(0, playheadPosition);
+        ctx.lineTo(valueAxis, playheadPosition);
+      } else {
+        ctx.moveTo(playheadPosition, 0);
+        ctx.lineTo(playheadPosition, valueAxis);
+      }
+      ctx.stroke();
     },
     {
       from: from - overscan,
       to: to + overscan,
+      onQuery: (events) => {
+        const { min, max, values } = events.reduce(
+          ({ min, max, values }, e) => {
+            const v = getValue(e);
+            return {
+              min: v < min ? v : min,
+              max: v > max ? v : max,
+              values: values.includes(v) ? values : [...values, v],
+            };
+          },
+          { min: Infinity, max: -Infinity, values: [] },
+        );
+        if (autorange) {
+          minMidi = min;
+          maxMidi = max;
+          valueExtent = maxMidi - minMidi + 1;
+        }
+        foldValues = values.sort((a, b) => String(a).localeCompare(String(b)));
+        barThickness = fold ? valueAxis / foldValues.length : valueAxis / valueExtent;
+      },
     },
   );
   return this;
@@ -79,13 +191,6 @@ export function pianoroll({
   fold = 0,
   vertical = 0,
   labels = false,
-  fill = 1,
-  fillActive = false,
-  strokeActive = true,
-  stroke,
-  hideInactive = 0,
-  colorizeInactive = 1,
-  fontFamily,
   ctx,
 } = {}) {
   const w = ctx.canvas.width;
@@ -129,75 +234,58 @@ export function pianoroll({
   // foldValues = values.sort((a, b) => a - b);
   foldValues = values.sort((a, b) => String(a).localeCompare(String(b)));
   barThickness = fold ? valueAxis / foldValues.length : valueAxis / valueExtent;
+
   ctx.fillStyle = background;
   ctx.globalAlpha = 1; // reset!
   if (!smear) {
     ctx.clearRect(0, 0, w, h);
     ctx.fillRect(0, 0, w, h);
   }
-  haps.forEach((event) => {
-    const isActive = event.whole.begin <= time && event.endClipped > time;
-    let strokeCurrent = stroke ?? (strokeActive && isActive);
-    let fillCurrent = (!isActive && fill) || (isActive && fillActive);
-    if (hideInactive && !isActive) {
-      return;
-    }
-    let color = event.value?.color || event.context?.color;
-    active = color || active;
-    inactive = colorizeInactive ? color || inactive : inactive;
-    color = isActive ? active : inactive;
-    ctx.fillStyle = fillCurrent ? color : 'transparent';
-    ctx.strokeStyle = color;
-    ctx.globalAlpha = event.context.velocity ?? event.value?.gain ?? 1;
-    const timeProgress = (event.whole.begin - (flipTime ? to : from)) / timeExtent;
-    const timePx = scale(timeProgress, ...timeRange);
-    let durationPx = scale(event.duration / timeExtent, 0, timeAxis);
-    const value = getValue(event);
-    const valueProgress = fold
-      ? foldValues.indexOf(value) / foldValues.length
-      : (Number(value) - minMidi) / valueExtent;
-    const valuePx = scale(valueProgress, ...valueRange);
-    let margin = 0;
-    const offset = scale(time / timeExtent, ...timeRange);
-    let coords;
-    if (vertical) {
-      coords = [
-        valuePx + 1 - (flipValues ? barThickness : 0), // x
-        timeAxis - offset + timePx + margin + 1 - (flipTime ? 0 : durationPx), // y
-        barThickness - 2, // width
-        durationPx - 2, // height
-      ];
-    } else {
-      coords = [
-        timePx - offset + margin + 1 - (flipTime ? durationPx : 0), // x
-        valuePx + 1 - (flipValues ? 0 : barThickness), // y
-        durationPx - 2, // widith
-        barThickness - 2, // height
-      ];
-    }
-    /* const xFactor = Math.sin(performance.now() / 500) + 1;
-      coords[0] *= xFactor; */
-
-    if (strokeCurrent) {
-      ctx.strokeRect(...coords);
-    }
-    if (fillCurrent) {
-      ctx.fillRect(...coords);
-    }
-    //ctx.ellipse(...ellipseFromRect(...coords))
-    if (labels) {
-      const defaultLabel = event.value.note ?? event.value.s + (event.value.n ? `:${event.value.n}` : '');
-      const { label: inactiveLabel, activeLabel } = event.value;
-      const customLabel = isActive ? activeLabel || inactiveLabel : inactiveLabel;
-      const label = customLabel ?? defaultLabel;
-      let measure = vertical ? durationPx : barThickness * 0.75;
-      ctx.font = `${measure}px ${fontFamily || 'monospace'}`;
-      // font color
-      ctx.fillStyle = /* isActive &&  */ !fillCurrent ? color : 'black';
-      ctx.textBaseline = 'top';
-      ctx.fillText(label, ...coords);
-    }
-  });
+  /*   const inFrame = (event) =>
+    (!hideNegative || event.whole.begin >= 0) && event.whole.begin <= time + to && event.whole.end >= time + from; */
+  haps
+    // .filter(inFrame)
+    .forEach((event) => {
+      const isActive = event.whole.begin <= time && event.endClipped > time;
+      const color = event.value?.color || event.context?.color;
+      ctx.fillStyle = color || inactive;
+      ctx.strokeStyle = color || active;
+      ctx.globalAlpha = event.context.velocity ?? event.value?.gain ?? 1;
+      const timePx = scale((event.whole.begin - (flipTime ? to : from)) / timeExtent, ...timeRange);
+      let durationPx = scale(event.duration / timeExtent, 0, timeAxis);
+      const value = getValue(event);
+      const valuePx = scale(
+        fold ? foldValues.indexOf(value) / foldValues.length : (Number(value) - minMidi) / valueExtent,
+        ...valueRange,
+      );
+      let margin = 0;
+      const offset = scale(time / timeExtent, ...timeRange);
+      let coords;
+      if (vertical) {
+        coords = [
+          valuePx + 1 - (flipValues ? barThickness : 0), // x
+          timeAxis - offset + timePx + margin + 1 - (flipTime ? 0 : durationPx), // y
+          barThickness - 2, // width
+          durationPx - 2, // height
+        ];
+      } else {
+        coords = [
+          timePx - offset + margin + 1 - (flipTime ? durationPx : 0), // x
+          valuePx + 1 - (flipValues ? 0 : barThickness), // y
+          durationPx - 2, // widith
+          barThickness - 2, // height
+        ];
+      }
+      isActive ? ctx.strokeRect(...coords) : ctx.fillRect(...coords);
+      if (labels) {
+        const label = event.value.note ?? event.value.s + (event.value.n ? `:${event.value.n}` : '');
+        ctx.font = `${barThickness * 0.75}px monospace`;
+        ctx.strokeStyle = 'black';
+        ctx.fillStyle = isActive ? 'white' : 'black';
+        ctx.textBaseline = 'top';
+        ctx.fillText(label, ...coords);
+      }
+    });
   ctx.globalAlpha = 1; // reset!
   const playheadPosition = scale(-from / timeExtent, ...timeRange);
   // draw playhead
@@ -223,15 +311,11 @@ export function getDrawOptions(drawTime, options = {}) {
 }
 
 Pattern.prototype.punchcard = function (options) {
-  return this.onPaint((ctx, time, haps, drawTime, paintOptions = {}) =>
-    pianoroll({ ctx, time, haps, ...getDrawOptions(drawTime, { ...paintOptions, ...options }) }),
+  return this.onPaint((ctx, time, haps, drawTime) =>
+    pianoroll({ ctx, time, haps, ...getDrawOptions(drawTime, options) }),
   );
 };
 
-Pattern.prototype.wordfall = function (options) {
-  return this.punchcard({ vertical: 1, labels: 1, stroke: 0, fillActive: 1, active: 'white', ...options });
-};
-
 /* Pattern.prototype.pianoroll = function (options) {
   return this.onPaint((ctx, time, haps, drawTime) =>
     pianoroll({ ctx, time, haps, ...getDrawOptions(drawTime, { fold: 0, ...options }) }),

packages/core/repl.mjs

@@ -16,17 +16,14 @@ export function repl({
   transpiler,
   onToggle,
   editPattern,
-  createCyclist,
 }) {
-  const cyclistParams = {
+  const scheduler = new Cyclist({
     interval,
     onTrigger: getTrigger({ defaultOutput, getTime }),
     onError: onSchedulerError,
     getTime,
     onToggle,
-  };
-  const scheduler = createCyclist?.(cyclistParams) || new Cyclist(cyclistParams);
-
+  });
   const setPattern = (pattern, autostart = true) => {
     pattern = editPattern?.(pattern) || pattern;
     scheduler.setPattern(pattern, autostart);

packages/core/signal.mjs

@@ -191,13 +191,6 @@ 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/zyklus.mjs

@@ -43,8 +43,7 @@ function createClock(
     clear();
   };
   const getPhase = () => phase;
-  const setPhase = (_phase) => (phase = _phase);
   // setCallback
-  return { setDuration, start, stop, pause, duration, interval, getPhase, setPhase, minLatency };
+  return { setDuration, start, stop, pause, duration, interval, getPhase, minLatency };
 }
 export default createClock;

packages/csound/package.json

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

packages/desktopbridge/README.md

@@ -1,3 +0,0 @@
-# @strudel/desktopbridge
-
-This package contains utilities used to communicate with the Tauri backend

packages/desktopbridge/cyclistbridge.mjs

@@ -1,77 +0,0 @@
-import { Cyclist } from '@strudel.cycles/core';
-import { logger } from '../core/logger.mjs';
-import { Invoke } from '../../website/src/tauri.mjs';
-import { listen } from '@tauri-apps/api/event';
-
-export class CyclistBridge extends Cyclist {
-  constructor(params) {
-    super(params);
-    this.start_timer;
-    this.abeLinkListener = listen('abelink-event', async (e) => {
-      const payload = e?.payload;
-      if (payload == null) {
-        return;
-      }
-      const { started, cps, phase, timestamp } = payload;
-
-      if (cps !== this.cps) {
-        this.setCps(cps);
-      }
-
-      // TODO: I'm not sure how to hook this up this phase adjustment in Strudel
-      // a phase adjustment message is sent every 30 seconds from backend to keep clocks in sync
-      const phaseDiff = Math.abs(phase - this.clock.getPhase());
-      if (phaseDiff > 0.1) {
-        console.log('set phase from', this.clock.getPhase(), 'to', phase);
-        // hmmm this seems wrong...
-        //this.clock.setPhase(phase);
-      }
-
-      if (this.started !== started && started != null) {
-        if (started) {
-          // the time delay in ms that seems to occur when starting the clock. Unsure if this is standard across all clients
-          const evaluationTime = 140;
-
-          // when start message comes from abelink, delay starting cyclist clock until the start of the next abelink phase
-          this.start_timer = window.setTimeout(() => {
-            // TODO: evaluate the code so if another source triggers the play there will not be an error
-
-            logger('[cyclist] start');
-            this.clock.start();
-            this.setStarted(true);
-          }, timestamp - Date.now() - evaluationTime);
-        } else {
-          this.stop();
-        }
-      }
-    });
-  }
-
-  start() {
-    if (!this.pattern) {
-      throw new Error('Scheduler: no pattern set! call .setPattern first.');
-    }
-    const linkmsg = {
-      cps: this.cps,
-      started: true,
-      timestamp: Date.now(),
-      phase: this.clock.getPhase(),
-    };
-    Invoke('sendabelinkmsg', { linkmsg });
-  }
-
-  stop() {
-    logger('[cyclist] stop');
-    this.clock.stop();
-    this.lastEnd = 0;
-    this.setStarted(false);
-    const linkmsg = {
-      // TODO: change this to value of "main" clock cps
-      cps: 0,
-      started: false,
-      timestamp: Date.now(),
-      phase: this.clock.getPhase(),
-    };
-    Invoke('sendabelinkmsg', { linkmsg });
-  }
-}

packages/desktopbridge/index.mjs

@@ -1,10 +0,0 @@
-/*
-index.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/desktopbridge/index.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-export * from './midibridge.mjs';
-export * from './utils.mjs';
-export * from './oscbridge.mjs';
-export * from './cyclistbridge.mjs';

packages/desktopbridge/loggerbridge.mjs

@@ -1,11 +0,0 @@
-import { listen } from '@tauri-apps/api/event';
-import { logger } from '../core/logger.mjs';
-
-// listen for log events from the Tauri backend and log in the UI
-await listen('log-event', (e) => {
-  if (e.payload == null) {
-    return;
-  }
-  const { message, message_type } = e.payload;
-  logger(message, message_type);
-});

packages/desktopbridge/midibridge.mjs

@@ -1,52 +0,0 @@
-import { Invoke } from './utils.mjs';
-import { Pattern, noteToMidi } from '@strudel.cycles/core';
-
-const ON_MESSAGE = 0x90;
-const OFF_MESSAGE = 0x80;
-const CC_MESSAGE = 0xb0;
-
-Pattern.prototype.midi = function (output) {
-  return this.onTrigger((time, hap, currentTime) => {
-    const { note, nrpnn, nrpv, ccn, ccv } = hap.value;
-    const offset = (time - currentTime) * 1000;
-    const velocity = Math.floor((hap.context?.velocity ?? 0.9) * 100); // TODO: refactor velocity
-    const duration = Math.floor(hap.duration.valueOf() * 1000 - 10);
-    const roundedOffset = Math.round(offset);
-    const midichan = (hap.value.midichan ?? 1) - 1;
-    const requestedport = output ?? 'IAC';
-    const messagesfromjs = [];
-    if (note != null) {
-      const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
-      messagesfromjs.push({
-        requestedport,
-        message: [ON_MESSAGE + midichan, midiNumber, velocity],
-        offset: roundedOffset,
-      });
-      messagesfromjs.push({
-        requestedport,
-        message: [OFF_MESSAGE + midichan, midiNumber, velocity],
-        offset: roundedOffset + duration,
-      });
-    }
-    if (ccv && ccn) {
-      if (typeof ccv !== 'number' || ccv < 0 || ccv > 1) {
-        throw new Error('expected ccv to be a number between 0 and 1');
-      }
-      if (!['string', 'number'].includes(typeof ccn)) {
-        throw new Error('expected ccn to be a number or a string');
-      }
-      const scaled = Math.round(ccv * 127);
-      messagesfromjs.push({
-        requestedport,
-        message: [CC_MESSAGE + midichan, ccn, scaled],
-        offset: roundedOffset,
-      });
-    }
-    // invoke is temporarily blocking, run in an async process
-    if (messagesfromjs.length) {
-      setTimeout(() => {
-        Invoke('sendmidi', { messagesfromjs });
-      });
-    }
-  });
-};

packages/desktopbridge/oscbridge.mjs

@@ -1,43 +0,0 @@
-import { parseNumeral, Pattern } from '@strudel.cycles/core';
-import { Invoke } from './utils.mjs';
-
-Pattern.prototype.osc = function () {
-  return this.onTrigger(async (time, hap, currentTime, cps = 1) => {
-    hap.ensureObjectValue();
-    const cycle = hap.wholeOrPart().begin.valueOf();
-    const delta = hap.duration.valueOf();
-    const controls = Object.assign({}, { cps, cycle, delta }, hap.value);
-    // make sure n and note are numbers
-    controls.n && (controls.n = parseNumeral(controls.n));
-    controls.note && (controls.note = parseNumeral(controls.note));
-
-    const params = [];
-
-    const timestamp = Math.round(Date.now() + (time - currentTime) * 1000);
-
-    Object.keys(controls).forEach((key) => {
-      const val = controls[key];
-      const value = typeof val === 'number' ? val.toString() : val;
-
-      if (value == null) {
-        return;
-      }
-      params.push({
-        name: key,
-        value,
-        valueisnumber: typeof val === 'number',
-      });
-    });
-
-    const messagesfromjs = [];
-    if (params.length) {
-      messagesfromjs.push({ target: '/dirt/play', timestamp, params });
-    }
-
-    if (messagesfromjs.length) {
-      setTimeout(() => {
-        Invoke('sendosc', { messagesfromjs });
-      });
-    }
-  });
-};

packages/desktopbridge/package.json

@@ -1,29 +0,0 @@
-{
-    "name": "@strudel/desktopbridge",
-    "version": "0.1.0",
-    "private": true,
-    "description": "tools/shims for communicating between the JS and Tauri (Rust) sides of the Studel desktop app",
-    "main": "index.mjs",
-    "type": "module",
-    "repository": {
-      "type": "git",
-      "url": "git+https://github.com/tidalcycles/strudel.git"
-    },
-    "keywords": [
-      "tidalcycles",
-      "strudel",
-      "pattern",
-      "livecoding",
-      "algorave"
-    ],
-    "author": "Jade Rowland <jaderowlanddev@gmail.com>",
-    "license": "AGPL-3.0-or-later",
-    "bugs": {
-      "url": "https://github.com/tidalcycles/strudel/issues"
-    },
-    "dependencies": {
-        "@strudel.cycles/core": "workspace:*",
-        "@tauri-apps/api": "^1.4.0"
-      },
-    "homepage": "https://github.com/tidalcycles/strudel#readme"
-  }

packages/desktopbridge/utils.mjs

@@ -1,4 +0,0 @@
-import { invoke } from '@tauri-apps/api/tauri';
-
-export const Invoke = invoke;
-export const isTauri = () => window.__TAURI_IPC__ != null;

packages/midi/midi.mjs

@@ -5,9 +5,10 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import * as _WebMidi from 'webmidi';
-import { Pattern, isPattern, logger, ref } from '@strudel.cycles/core';
+import { Pattern, isPattern, logger } from '@strudel.cycles/core';
+import { getAudioContext } from '@strudel.cycles/webaudio';
 import { noteToMidi } from '@strudel.cycles/core';
-import { Note } from 'webmidi';
+
 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const { WebMidi } = _WebMidi;
 
@@ -15,28 +16,12 @@ function supportsMidi() {
   return typeof navigator.requestMIDIAccess === 'function';
 }
 
-function getMidiDeviceNamesString(devices) {
-  return devices.map((o) => `'${o.name}'`).join(' | ');
-}
-
 export function enableWebMidi(options = {}) {
-  const { onReady, onConnected, onDisconnected, onEnabled } = options;
-  if (WebMidi.enabled) {
-    return;
-  }
+  const { onReady, onConnected, onDisconnected } = options;
+
   if (!supportsMidi()) {
     throw new Error('Your Browser does not support WebMIDI.');
   }
-  WebMidi.addListener('connected', () => {
-    onConnected?.(WebMidi);
-  });
-  WebMidi.addListener('enabled', () => {
-    onEnabled?.(WebMidi);
-  });
-  // Reacting when a device becomes unavailable
-  WebMidi.addListener('disconnected', (e) => {
-    onDisconnected?.(WebMidi, e);
-  });
   return new Promise((resolve, reject) => {
     if (WebMidi.enabled) {
       // if already enabled, just resolve WebMidi
@@ -47,49 +32,57 @@ export function enableWebMidi(options = {}) {
       if (err) {
         reject(err);
       }
+      WebMidi.addListener('connected', (e) => {
+        onConnected?.(WebMidi);
+      });
+      // Reacting when a device becomes unavailable
+      WebMidi.addListener('disconnected', (e) => {
+        onDisconnected?.(WebMidi, e);
+      });
       onReady?.(WebMidi);
       resolve(WebMidi);
     });
   });
 }
+// const outputByName = (name: string) => WebMidi.getOutputByName(name);
+const outputByName = (name) => WebMidi.getOutputByName(name);
 
-function getDevice(indexOrName, devices) {
-  if (!devices.length) {
+let midiReady;
+
+// output?: string | number, outputs: typeof WebMidi.outputs
+function getDevice(output, outputs) {
+  if (!outputs.length) {
     throw new Error(`🔌 No MIDI devices found. Connect a device or enable IAC Driver.`);
   }
-  if (typeof indexOrName === 'number') {
-    return devices[indexOrName];
+  if (typeof output === 'number') {
+    return outputs[output];
   }
-  const byName = (name) => devices.find((output) => output.name.includes(name));
-  if (typeof indexOrName === 'string') {
-    return byName(indexOrName);
+  if (typeof output === 'string') {
+    return outputByName(output);
   }
-  // attempt to default to first IAC device if none is specified
-  const IACOutput = byName('IAC');
-  const device = IACOutput ?? devices[0];
-  if (!device) {
-    throw new Error(
-      `🔌 MIDI device '${device ? device : ''}' not found. Use one of ${getMidiDeviceNamesString(devices)}`,
-    );
-  }
-
-  return IACOutput ?? devices[0];
-}
-
-// send start/stop messages to outputs when repl starts/stops
-if (typeof window !== 'undefined') {
-  window.addEventListener('message', (e) => {
-    if (!WebMidi?.enabled) {
-      return;
-    }
-    if (e.data === 'strudel-stop') {
-      WebMidi.outputs.forEach((output) => output.sendStop());
-    }
-    // cannot start here, since we have no timing info, see sendStart below
-  });
+  return outputs[0];
 }
 
+// Pattern.prototype.midi = function (output: string | number, channel = 1) {
 Pattern.prototype.midi = function (output) {
+  if (!supportsMidi()) {
+    throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
+  }
+  /* await */ enableWebMidi({
+    onConnected: ({ outputs }) =>
+      logger(`Midi device connected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`),
+    onDisconnected: ({ outputs }) =>
+      logger(`Midi device disconnected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`),
+    onReady: ({ outputs }) => {
+      const device = getDevice(output, outputs);
+      const otherOutputs = outputs
+        .filter((o) => o.name !== device.name)
+        .map((o) => `'${o.name}'`)
+        .join(' | ');
+      midiReady = true;
+      logger(`Midi connected! Using "${device.name}". ${otherOutputs ? `Also available: ${otherOutputs}` : ''}`);
+    },
+  });
   if (isPattern(output)) {
     throw new Error(
       `.midi does not accept Pattern input. Make sure to pass device name with single quotes. Example: .midi('${
@@ -97,47 +90,38 @@ Pattern.prototype.midi = function (output) {
       }')`,
     );
   }
-
-  enableWebMidi({
-    onEnabled: ({ outputs }) => {
-      const device = getDevice(output, outputs);
-      const otherOutputs = outputs.filter((o) => o.name !== device.name);
-      logger(
-        `Midi enabled! Using "${device.name}". ${
-          otherOutputs?.length ? `Also available: ${getMidiDeviceNamesString(otherOutputs)}` : ''
-        }`,
-      );
-    },
-    onDisconnected: ({ outputs }) =>
-      logger(`Midi device disconnected! Available: ${getMidiDeviceNamesString(outputs)}`),
-  });
-
-  return this.onTrigger((time, hap, currentTime, cps) => {
-    if (!WebMidi.enabled) {
-      console.log('not enabled');
+  return this.onTrigger((time, hap) => {
+    if (!midiReady) {
       return;
     }
     const device = getDevice(output, WebMidi.outputs);
+    if (!device) {
+      throw new Error(
+        `🔌 MIDI device '${output ? output : ''}' not found. Use one of ${WebMidi.outputs
+          .map((o) => `'${o.name}'`)
+          .join(' | ')}`,
+      );
+    }
     hap.ensureObjectValue();
 
-    const offset = (time - currentTime) * 1000;
-    // passing a string with a +num into the webmidi api adds an offset to the current time https://webmidijs.org/api/classes/Output
-    const timeOffsetString = `+${offset}`;
+    // calculate time
+    const timingOffset = WebMidi.time - getAudioContext().getOutputTimestamp().contextTime * 1000;
+    time = time * 1000 + timingOffset;
 
     // destructure value
-    const { note, nrpnn, nrpv, ccn, ccv, midichan = 1, midicmd } = hap.value;
+    const { note, nrpnn, nrpv, ccn, ccv, midichan = 1 } = hap.value;
     const velocity = hap.context?.velocity ?? 0.9; // TODO: refactor velocity
+    const duration = hap.duration.valueOf() * 1000 - 5;
 
-    // note off messages will often a few ms arrive late, try to prevent glitching by subtracting from the duration length
-    const duration = Math.floor(hap.duration.valueOf() * 1000 - 10);
     if (note != null) {
       const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
-      const midiNote = new Note(midiNumber, { attack: velocity, duration });
-      device.playNote(midiNote, midichan, {
-        time: timeOffsetString,
+      device.playNote(midiNumber, midichan, {
+        time,
+        duration,
+        attack: velocity,
       });
     }
-    if (ccv !== undefined && ccn !== undefined) {
+    if (ccv && ccn) {
       if (typeof ccv !== 'number' || ccv < 0 || ccv > 1) {
         throw new Error('expected ccv to be a number between 0 and 1');
       }
@@ -145,48 +129,7 @@ Pattern.prototype.midi = function (output) {
         throw new Error('expected ccn to be a number or a string');
       }
       const scaled = Math.round(ccv * 127);
-      device.sendControlChange(ccn, scaled, midichan, { time: timeOffsetString });
-    }
-    if (hap.whole.begin + 0 === 0) {
-      // we need to start here because we have the timing info
-      device.sendStart({ time: timeOffsetString });
-    }
-    if (['clock', 'midiClock'].includes(midicmd)) {
-      device.sendClock({ time: timeOffsetString });
-    } else if (['start'].includes(midicmd)) {
-      device.sendStart({ time: timeOffsetString });
-    } else if (['stop'].includes(midicmd)) {
-      device.sendStop({ time: timeOffsetString });
-    } else if (['continue'].includes(midicmd)) {
-      device.sendContinue({ time: timeOffsetString });
+      device.sendControlChange(ccn, scaled, midichan, { time });
     }
   });
 };
-
-let listeners = {};
-const refs = {};
-
-export async function midin(input) {
-  const initial = await enableWebMidi(); // only returns on first init
-  const device = getDevice(input, WebMidi.inputs);
-
-  if (initial) {
-    const otherInputs = WebMidi.inputs.filter((o) => o.name !== device.name);
-    logger(
-      `Midi enabled! Using "${device.name}". ${
-        otherInputs?.length ? `Also available: ${getMidiDeviceNamesString(otherInputs)}` : ''
-      }`,
-    );
-    refs[input] = {};
-  }
-  const cc = (cc) => ref(() => refs[input][cc] || 0);
-
-  listeners[input] && device.removeListener('midimessage', listeners[input]);
-  listeners[input] = (e) => {
-    const cc = e.dataBytes[0];
-    const v = e.dataBytes[1];
-    refs[input] && (refs[input][cc] = v / 127);
-  };
-  device.addListener('midimessage', listeners[input]);
-  return cc;
-}

packages/midi/package.json

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

packages/mini/krill-parser.js

@@ -200,21 +200,20 @@ function peg$parse(input, options) {
   var peg$c23 = "*";
   var peg$c24 = "?";
   var peg$c25 = ":";
-  var peg$c26 = "..";
-  var peg$c27 = "struct";
-  var peg$c28 = "target";
-  var peg$c29 = "euclid";
-  var peg$c30 = "slow";
-  var peg$c31 = "rotL";
-  var peg$c32 = "rotR";
-  var peg$c33 = "fast";
-  var peg$c34 = "scale";
-  var peg$c35 = "//";
-  var peg$c36 = "cat";
-  var peg$c37 = "$";
-  var peg$c38 = "setcps";
-  var peg$c39 = "setbpm";
-  var peg$c40 = "hush";
+  var peg$c26 = "struct";
+  var peg$c27 = "target";
+  var peg$c28 = "euclid";
+  var peg$c29 = "slow";
+  var peg$c30 = "rotL";
+  var peg$c31 = "rotR";
+  var peg$c32 = "fast";
+  var peg$c33 = "scale";
+  var peg$c34 = "//";
+  var peg$c35 = "cat";
+  var peg$c36 = "$";
+  var peg$c37 = "setcps";
+  var peg$c38 = "setbpm";
+  var peg$c39 = "hush";
 
   var peg$r0 = /^[1-9]/;
   var peg$r1 = /^[eE]/;
@@ -256,67 +255,64 @@ function peg$parse(input, options) {
   var peg$e30 = peg$literalExpectation("*", false);
   var peg$e31 = peg$literalExpectation("?", false);
   var peg$e32 = peg$literalExpectation(":", false);
-  var peg$e33 = peg$literalExpectation("..", false);
-  var peg$e34 = peg$literalExpectation("struct", false);
-  var peg$e35 = peg$literalExpectation("target", false);
-  var peg$e36 = peg$literalExpectation("euclid", false);
-  var peg$e37 = peg$literalExpectation("slow", false);
-  var peg$e38 = peg$literalExpectation("rotL", false);
-  var peg$e39 = peg$literalExpectation("rotR", false);
-  var peg$e40 = peg$literalExpectation("fast", false);
-  var peg$e41 = peg$literalExpectation("scale", false);
-  var peg$e42 = peg$literalExpectation("//", false);
-  var peg$e43 = peg$classExpectation(["\n"], true, false);
-  var peg$e44 = peg$literalExpectation("cat", false);
-  var peg$e45 = peg$literalExpectation("$", false);
-  var peg$e46 = peg$literalExpectation("setcps", false);
-  var peg$e47 = peg$literalExpectation("setbpm", false);
-  var peg$e48 = peg$literalExpectation("hush", false);
+  var peg$e33 = peg$literalExpectation("struct", false);
+  var peg$e34 = peg$literalExpectation("target", false);
+  var peg$e35 = peg$literalExpectation("euclid", false);
+  var peg$e36 = peg$literalExpectation("slow", false);
+  var peg$e37 = peg$literalExpectation("rotL", false);
+  var peg$e38 = peg$literalExpectation("rotR", false);
+  var peg$e39 = peg$literalExpectation("fast", false);
+  var peg$e40 = peg$literalExpectation("scale", false);
+  var peg$e41 = peg$literalExpectation("//", false);
+  var peg$e42 = peg$classExpectation(["\n"], true, false);
+  var peg$e43 = peg$literalExpectation("cat", false);
+  var peg$e44 = peg$literalExpectation("$", false);
+  var peg$e45 = peg$literalExpectation("setcps", false);
+  var peg$e46 = peg$literalExpectation("setbpm", false);
+  var peg$e47 = peg$literalExpectation("hush", false);
 
   var peg$f0 = function() { return parseFloat(text()); };
-  var peg$f1 = function() { return parseInt(text()); };
-  var peg$f2 = function(chars) { return new AtomStub(chars.join("")) };
-  var peg$f3 = function(s) { return s };
-  var peg$f4 = function(s, stepsPerCycle) { s.arguments_.stepsPerCycle = stepsPerCycle ; return s; };
-  var peg$f5 = function(a) { return a };
-  var peg$f6 = function(s) { s.arguments_.alignment = 'slowcat'; return s; };
-  var peg$f7 = function(a) { return x => x.options_['weight'] = a };
-  var peg$f8 = function(a) { return x => x.options_['reps'] = a };
-  var peg$f9 = function(p, s, r) { return x => x.options_['ops'].push({ type_: "bjorklund", arguments_ :{ pulse: p, step:s, rotation:r }}) };
-  var peg$f10 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'slow' }}) };
-  var peg$f11 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'fast' }}) };
-  var peg$f12 = function(a) { return x => x.options_['ops'].push({ type_: "degradeBy", arguments_ :{ amount:a, seed: seed++ } }) };
-  var peg$f13 = function(s) { return x => x.options_['ops'].push({ type_: "tail", arguments_ :{ element:s } }) };
-  var peg$f14 = function(s) { return x => x.options_['ops'].push({ type_: "range", arguments_ :{ element:s } }) };
-  var peg$f15 = function(s, ops) { const result = new ElementStub(s, {ops: [], weight: 1, reps: 1});
+  var peg$f1 = function(chars) { return new AtomStub(chars.join("")) };
+  var peg$f2 = function(s) { return s };
+  var peg$f3 = function(s, stepsPerCycle) { s.arguments_.stepsPerCycle = stepsPerCycle ; return s; };
+  var peg$f4 = function(a) { return a };
+  var peg$f5 = function(s) { s.arguments_.alignment = 'slowcat'; return s; };
+  var peg$f6 = function(a) { return x => x.options_['weight'] = a };
+  var peg$f7 = function(a) { return x => x.options_['reps'] = a };
+  var peg$f8 = function(p, s, r) { return x => x.options_['ops'].push({ type_: "bjorklund", arguments_ :{ pulse: p, step:s, rotation:r }}) };
+  var peg$f9 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'slow' }}) };
+  var peg$f10 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'fast' }}) };
+  var peg$f11 = function(a) { return x => x.options_['ops'].push({ type_: "degradeBy", arguments_ :{ amount:a, seed: seed++ } }) };
+  var peg$f12 = function(s) { return x => x.options_['ops'].push({ type_: "tail", arguments_ :{ element:s } }) };
+  var peg$f13 = function(s, ops) { const result = new ElementStub(s, {ops: [], weight: 1, reps: 1});
     for (const op of ops) {
       op(result);
     }
     return result;
   };
-  var peg$f16 = function(s) { return new PatternStub(s, 'fastcat'); };
-  var peg$f17 = function(tail) { return { alignment: 'stack', list: tail }; };
-  var peg$f18 = function(tail) { return { alignment: 'rand', list: tail, seed: seed++ }; };
-  var peg$f19 = function(head, tail) { if (tail && tail.list.length > 0) { return new PatternStub([head, ...tail.list], tail.alignment, tail.seed); } else { return head; } };
-  var peg$f20 = function(head, tail) { return new PatternStub(tail ? [head, ...tail.list] : [head], 'polymeter'); };
-  var peg$f21 = function(sc) { return sc; };
-  var peg$f22 = function(s) { return { name: "struct", args: { mini:s }}};
-  var peg$f23 = function(s) { return { name: "target", args : { name:s}}};
-  var peg$f24 = function(p, s, r) { return { name: "bjorklund", args :{ pulse: p, step:parseInt(s) }}};
-  var peg$f25 = function(a) { return { name: "stretch", args :{ amount: a}}};
-  var peg$f26 = function(a) { return { name: "shift", args :{ amount: "-"+a}}};
-  var peg$f27 = function(a) { return { name: "shift", args :{ amount: a}}};
-  var peg$f28 = function(a) { return { name: "stretch", args :{ amount: "1/"+a}}};
-  var peg$f29 = function(s) { return { name: "scale", args :{ scale: s.join("")}}};
-  var peg$f30 = function(s, v) { return v};
-  var peg$f31 = function(s, ss) { ss.unshift(s); return new PatternStub(ss, 'slowcat'); };
-  var peg$f32 = function(sg) {return sg};
-  var peg$f33 = function(o, soc) { return new OperatorStub(o.name,o.args,soc)};
-  var peg$f34 = function(sc) { return sc };
-  var peg$f35 = function(c) { return c };
-  var peg$f36 = function(v) { return new CommandStub("setcps", { value: v})};
-  var peg$f37 = function(v) { return new CommandStub("setcps", { value: (v/120/2)})};
-  var peg$f38 = function() { return new CommandStub("hush")};
+  var peg$f14 = function(s) { return new PatternStub(s, 'fastcat'); };
+  var peg$f15 = function(tail) { return { alignment: 'stack', list: tail }; };
+  var peg$f16 = function(tail) { return { alignment: 'rand', list: tail, seed: seed++ }; };
+  var peg$f17 = function(head, tail) { if (tail && tail.list.length > 0) { return new PatternStub([head, ...tail.list], tail.alignment, tail.seed); } else { return head; } };
+  var peg$f18 = function(head, tail) { return new PatternStub(tail ? [head, ...tail.list] : [head], 'polymeter'); };
+  var peg$f19 = function(sc) { return sc; };
+  var peg$f20 = function(s) { return { name: "struct", args: { mini:s }}};
+  var peg$f21 = function(s) { return { name: "target", args : { name:s}}};
+  var peg$f22 = function(p, s, r) { return { name: "bjorklund", args :{ pulse: p, step:parseInt(s) }}};
+  var peg$f23 = function(a) { return { name: "stretch", args :{ amount: a}}};
+  var peg$f24 = function(a) { return { name: "shift", args :{ amount: "-"+a}}};
+  var peg$f25 = function(a) { return { name: "shift", args :{ amount: a}}};
+  var peg$f26 = function(a) { return { name: "stretch", args :{ amount: "1/"+a}}};
+  var peg$f27 = function(s) { return { name: "scale", args :{ scale: s.join("")}}};
+  var peg$f28 = function(s, v) { return v};
+  var peg$f29 = function(s, ss) { ss.unshift(s); return new PatternStub(ss, 'slowcat'); };
+  var peg$f30 = function(sg) {return sg};
+  var peg$f31 = function(o, soc) { return new OperatorStub(o.name,o.args,soc)};
+  var peg$f32 = function(sc) { return sc };
+  var peg$f33 = function(c) { return c };
+  var peg$f34 = function(v) { return new CommandStub("setcps", { value: v})};
+  var peg$f35 = function(v) { return new CommandStub("setcps", { value: (v/120/2)})};
+  var peg$f36 = function() { return new CommandStub("hush")};
   var peg$currPos = 0;
   var peg$savedPos = 0;
   var peg$posDetailsCache = [{ line: 1, column: 1 }];
@@ -655,26 +651,6 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parseintneg() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    s1 = peg$parseminus();
-    if (s1 === peg$FAILED) {
-      s1 = null;
-    }
-    s2 = peg$parseint();
-    if (s2 !== peg$FAILED) {
-      peg$savedPos = s0;
-      s0 = peg$f1();
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
   function peg$parseminus() {
     var s0;
 
@@ -908,7 +884,7 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = peg$parsews();
       peg$savedPos = s0;
-      s0 = peg$f2(s2);
+      s0 = peg$f1(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -944,7 +920,7 @@ function peg$parse(input, options) {
         if (s6 !== peg$FAILED) {
           s7 = peg$parsews();
           peg$savedPos = s0;
-          s0 = peg$f3(s4);
+          s0 = peg$f2(s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -992,7 +968,7 @@ function peg$parse(input, options) {
           }
           s8 = peg$parsews();
           peg$savedPos = s0;
-          s0 = peg$f4(s4, s7);
+          s0 = peg$f3(s4, s7);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1024,7 +1000,7 @@ function peg$parse(input, options) {
       s2 = peg$parseslice();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f5(s2);
+        s0 = peg$f4(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1064,7 +1040,7 @@ function peg$parse(input, options) {
         if (s6 !== peg$FAILED) {
           s7 = peg$parsews();
           peg$savedPos = s0;
-          s0 = peg$f6(s4);
+          s0 = peg$f5(s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1114,9 +1090,6 @@ function peg$parse(input, options) {
               s0 = peg$parseop_degrade();
               if (s0 === peg$FAILED) {
                 s0 = peg$parseop_tail();
-                if (s0 === peg$FAILED) {
-                  s0 = peg$parseop_range();
-                }
               }
             }
           }
@@ -1142,7 +1115,7 @@ function peg$parse(input, options) {
       s2 = peg$parsenumber();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f7(s2);
+        s0 = peg$f6(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1170,7 +1143,7 @@ function peg$parse(input, options) {
       s2 = peg$parsenumber();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f8(s2);
+        s0 = peg$f7(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1224,7 +1197,7 @@ function peg$parse(input, options) {
             }
             if (s13 !== peg$FAILED) {
               peg$savedPos = s0;
-              s0 = peg$f9(s3, s7, s11);
+              s0 = peg$f8(s3, s7, s11);
             } else {
               peg$currPos = s0;
               s0 = peg$FAILED;
@@ -1264,7 +1237,7 @@ function peg$parse(input, options) {
       s2 = peg$parseslice();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f10(s2);
+        s0 = peg$f9(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1292,7 +1265,7 @@ function peg$parse(input, options) {
       s2 = peg$parseslice();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f11(s2);
+        s0 = peg$f10(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1322,7 +1295,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f12(s2);
+      s0 = peg$f11(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1346,35 +1319,7 @@ function peg$parse(input, options) {
       s2 = peg$parseslice();
       if (s2 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f13(s2);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parseop_range() {
-    var s0, s1, s2;
-
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c26) {
-      s1 = peg$c26;
-      peg$currPos += 2;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e33); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parseslice();
-      if (s2 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f14(s2);
+        s0 = peg$f12(s2);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1400,7 +1345,7 @@ function peg$parse(input, options) {
         s3 = peg$parseslice_op();
       }
       peg$savedPos = s0;
-      s0 = peg$f15(s1, s2);
+      s0 = peg$f13(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1425,7 +1370,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f16(s1);
+      s1 = peg$f14(s1);
     }
     s0 = s1;
 
@@ -1474,7 +1419,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f17(s1);
+      s1 = peg$f15(s1);
     }
     s0 = s1;
 
@@ -1523,7 +1468,7 @@ function peg$parse(input, options) {
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f18(s1);
+      s1 = peg$f16(s1);
     }
     s0 = s1;
 
@@ -1544,7 +1489,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f19(s1, s2);
+      s0 = peg$f17(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1564,7 +1509,7 @@ function peg$parse(input, options) {
         s2 = null;
       }
       peg$savedPos = s0;
-      s0 = peg$f20(s1, s2);
+      s0 = peg$f18(s1, s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -1587,7 +1532,7 @@ function peg$parse(input, options) {
         s6 = peg$parsequote();
         if (s6 !== peg$FAILED) {
           peg$savedPos = s0;
-          s0 = peg$f21(s4);
+          s0 = peg$f19(s4);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1637,19 +1582,19 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c27) {
-      s1 = peg$c27;
+    if (input.substr(peg$currPos, 6) === peg$c26) {
+      s1 = peg$c26;
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e34); }
+      if (peg$silentFails === 0) { peg$fail(peg$e33); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsews();
       s3 = peg$parsemini_or_operator();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f22(s3);
+        s0 = peg$f20(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -1666,12 +1611,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c28) {
-      s1 = peg$c28;
+    if (input.substr(peg$currPos, 6) === peg$c27) {
+      s1 = peg$c27;
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e35); }
+      if (peg$silentFails === 0) { peg$fail(peg$e34); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsews();
@@ -1682,7 +1627,7 @@ function peg$parse(input, options) {
           s5 = peg$parsequote();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f23(s4);
+            s0 = peg$f21(s4);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1707,12 +1652,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6, s7;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c29) {
-      s1 = peg$c29;
+    if (input.substr(peg$currPos, 6) === peg$c28) {
+      s1 = peg$c28;
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+      if (peg$silentFails === 0) { peg$fail(peg$e35); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsews();
@@ -1727,7 +1672,7 @@ function peg$parse(input, options) {
             s7 = null;
           }
           peg$savedPos = s0;
-          s0 = peg$f24(s3, s5, s7);
+          s0 = peg$f22(s3, s5, s7);
         } else {
           peg$currPos = s0;
           s0 = peg$FAILED;
@@ -1747,6 +1692,35 @@ function peg$parse(input, options) {
   function peg$parseslow() {
     var s0, s1, s2, s3;
 
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 4) === peg$c29) {
+      s1 = peg$c29;
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e36); }
+    }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parsews();
+      s3 = peg$parsenumber();
+      if (s3 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f23(s3);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parserotL() {
+    var s0, s1, s2, s3;
+
     s0 = peg$currPos;
     if (input.substr(peg$currPos, 4) === peg$c30) {
       s1 = peg$c30;
@@ -1755,6 +1729,35 @@ function peg$parse(input, options) {
       s1 = peg$FAILED;
       if (peg$silentFails === 0) { peg$fail(peg$e37); }
     }
+    if (s1 !== peg$FAILED) {
+      s2 = peg$parsews();
+      s3 = peg$parsenumber();
+      if (s3 !== peg$FAILED) {
+        peg$savedPos = s0;
+        s0 = peg$f24(s3);
+      } else {
+        peg$currPos = s0;
+        s0 = peg$FAILED;
+      }
+    } else {
+      peg$currPos = s0;
+      s0 = peg$FAILED;
+    }
+
+    return s0;
+  }
+
+  function peg$parserotR() {
+    var s0, s1, s2, s3;
+
+    s0 = peg$currPos;
+    if (input.substr(peg$currPos, 4) === peg$c31) {
+      s1 = peg$c31;
+      peg$currPos += 4;
+    } else {
+      s1 = peg$FAILED;
+      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+    }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsews();
       s3 = peg$parsenumber();
@@ -1773,16 +1776,16 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parserotL() {
+  function peg$parsefast() {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c31) {
-      s1 = peg$c31;
+    if (input.substr(peg$currPos, 4) === peg$c32) {
+      s1 = peg$c32;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e38); }
+      if (peg$silentFails === 0) { peg$fail(peg$e39); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsews();
@@ -1802,74 +1805,16 @@ function peg$parse(input, options) {
     return s0;
   }
 
-  function peg$parserotR() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c32) {
-      s1 = peg$c32;
-      peg$currPos += 4;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e39); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsews();
-      s3 = peg$parsenumber();
-      if (s3 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f27(s3);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
-  function peg$parsefast() {
-    var s0, s1, s2, s3;
-
-    s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c33) {
-      s1 = peg$c33;
-      peg$currPos += 4;
-    } else {
-      s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e40); }
-    }
-    if (s1 !== peg$FAILED) {
-      s2 = peg$parsews();
-      s3 = peg$parsenumber();
-      if (s3 !== peg$FAILED) {
-        peg$savedPos = s0;
-        s0 = peg$f28(s3);
-      } else {
-        peg$currPos = s0;
-        s0 = peg$FAILED;
-      }
-    } else {
-      peg$currPos = s0;
-      s0 = peg$FAILED;
-    }
-
-    return s0;
-  }
-
   function peg$parsescale() {
     var s0, s1, s2, s3, s4, s5;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 5) === peg$c34) {
-      s1 = peg$c34;
+    if (input.substr(peg$currPos, 5) === peg$c33) {
+      s1 = peg$c33;
       peg$currPos += 5;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e41); }
+      if (peg$silentFails === 0) { peg$fail(peg$e40); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsews();
@@ -1889,7 +1834,7 @@ function peg$parse(input, options) {
           s5 = peg$parsequote();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f29(s4);
+            s0 = peg$f27(s4);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -1914,12 +1859,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 2) === peg$c35) {
-      s1 = peg$c35;
+    if (input.substr(peg$currPos, 2) === peg$c34) {
+      s1 = peg$c34;
       peg$currPos += 2;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e42); }
+      if (peg$silentFails === 0) { peg$fail(peg$e41); }
     }
     if (s1 !== peg$FAILED) {
       s2 = [];
@@ -1928,7 +1873,7 @@ function peg$parse(input, options) {
         peg$currPos++;
       } else {
         s3 = peg$FAILED;
-        if (peg$silentFails === 0) { peg$fail(peg$e43); }
+        if (peg$silentFails === 0) { peg$fail(peg$e42); }
       }
       while (s3 !== peg$FAILED) {
         s2.push(s3);
@@ -1937,7 +1882,7 @@ function peg$parse(input, options) {
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e43); }
+          if (peg$silentFails === 0) { peg$fail(peg$e42); }
         }
       }
       s1 = [s1, s2];
@@ -1954,12 +1899,12 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3, s4, s5, s6, s7, s8, s9;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 3) === peg$c36) {
-      s1 = peg$c36;
+    if (input.substr(peg$currPos, 3) === peg$c35) {
+      s1 = peg$c35;
       peg$currPos += 3;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e44); }
+      if (peg$silentFails === 0) { peg$fail(peg$e43); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsews();
@@ -1981,7 +1926,7 @@ function peg$parse(input, options) {
             s9 = peg$parsemini_or_operator();
             if (s9 !== peg$FAILED) {
               peg$savedPos = s7;
-              s7 = peg$f30(s5, s9);
+              s7 = peg$f28(s5, s9);
             } else {
               peg$currPos = s7;
               s7 = peg$FAILED;
@@ -1998,7 +1943,7 @@ function peg$parse(input, options) {
               s9 = peg$parsemini_or_operator();
               if (s9 !== peg$FAILED) {
                 peg$savedPos = s7;
-                s7 = peg$f30(s5, s9);
+                s7 = peg$f28(s5, s9);
               } else {
                 peg$currPos = s7;
                 s7 = peg$FAILED;
@@ -2018,7 +1963,7 @@ function peg$parse(input, options) {
           }
           if (s8 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f31(s5, s6);
+            s0 = peg$f29(s5, s6);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -2064,7 +2009,7 @@ function peg$parse(input, options) {
         s4 = peg$parsecomment();
       }
       peg$savedPos = s0;
-      s0 = peg$f32(s1);
+      s0 = peg$f30(s1);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2075,18 +2020,18 @@ function peg$parse(input, options) {
       if (s1 !== peg$FAILED) {
         s2 = peg$parsews();
         if (input.charCodeAt(peg$currPos) === 36) {
-          s3 = peg$c37;
+          s3 = peg$c36;
           peg$currPos++;
         } else {
           s3 = peg$FAILED;
-          if (peg$silentFails === 0) { peg$fail(peg$e45); }
+          if (peg$silentFails === 0) { peg$fail(peg$e44); }
         }
         if (s3 !== peg$FAILED) {
           s4 = peg$parsews();
           s5 = peg$parsemini_or_operator();
           if (s5 !== peg$FAILED) {
             peg$savedPos = s0;
-            s0 = peg$f33(s1, s5);
+            s0 = peg$f31(s1, s5);
           } else {
             peg$currPos = s0;
             s0 = peg$FAILED;
@@ -2111,7 +2056,7 @@ function peg$parse(input, options) {
     s1 = peg$parsemini_or_operator();
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f34(s1);
+      s1 = peg$f32(s1);
     }
     s0 = s1;
     if (s0 === peg$FAILED) {
@@ -2144,7 +2089,7 @@ function peg$parse(input, options) {
     if (s2 !== peg$FAILED) {
       s3 = peg$parsews();
       peg$savedPos = s0;
-      s0 = peg$f35(s2);
+      s0 = peg$f33(s2);
     } else {
       peg$currPos = s0;
       s0 = peg$FAILED;
@@ -2157,19 +2102,19 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c38) {
-      s1 = peg$c38;
+    if (input.substr(peg$currPos, 6) === peg$c37) {
+      s1 = peg$c37;
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e46); }
+      if (peg$silentFails === 0) { peg$fail(peg$e45); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsews();
       s3 = peg$parsenumber();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f36(s3);
+        s0 = peg$f34(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2186,19 +2131,19 @@ function peg$parse(input, options) {
     var s0, s1, s2, s3;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 6) === peg$c39) {
-      s1 = peg$c39;
+    if (input.substr(peg$currPos, 6) === peg$c38) {
+      s1 = peg$c38;
       peg$currPos += 6;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e47); }
+      if (peg$silentFails === 0) { peg$fail(peg$e46); }
     }
     if (s1 !== peg$FAILED) {
       s2 = peg$parsews();
       s3 = peg$parsenumber();
       if (s3 !== peg$FAILED) {
         peg$savedPos = s0;
-        s0 = peg$f37(s3);
+        s0 = peg$f35(s3);
       } else {
         peg$currPos = s0;
         s0 = peg$FAILED;
@@ -2215,16 +2160,16 @@ function peg$parse(input, options) {
     var s0, s1;
 
     s0 = peg$currPos;
-    if (input.substr(peg$currPos, 4) === peg$c40) {
-      s1 = peg$c40;
+    if (input.substr(peg$currPos, 4) === peg$c39) {
+      s1 = peg$c39;
       peg$currPos += 4;
     } else {
       s1 = peg$FAILED;
-      if (peg$silentFails === 0) { peg$fail(peg$e48); }
+      if (peg$silentFails === 0) { peg$fail(peg$e47); }
     }
     if (s1 !== peg$FAILED) {
       peg$savedPos = s0;
-      s1 = peg$f38();
+      s1 = peg$f36();
     }
     s0 = s1;
 

packages/mini/krill.pegjs

@@ -79,9 +79,6 @@ frac
 int
   = zero / (digit1_9 DIGIT*)
 
-intneg
-  = minus? int { return parseInt(text()); }
-
 minus
   = "-"
 
@@ -126,7 +123,7 @@ slice = step / sub_cycle / polymeter / slow_sequence
 
 // slice modifier affects the timing/size of a slice (e.g. [a b c]@3)
 // at this point, we assume we can represent them as regular sequence operators
-slice_op = op_weight / op_bjorklund / op_slow / op_fast / op_replicate / op_degrade / op_tail / op_range
+slice_op = op_weight / op_bjorklund / op_slow / op_fast / op_replicate / op_degrade / op_tail
 
 op_weight =  "@" a:number
   { return x => x.options_['weight'] = a }
@@ -149,9 +146,6 @@ op_degrade = "?"a:number?
 op_tail = ":" s:slice
   { return x => x.options_['ops'].push({ type_: "tail", arguments_ :{ element:s } }) }
 
-op_range = ".." s:slice
-  { return x => x.options_['ops'].push({ type_: "range", arguments_ :{ element:s } }) }
-
 // a slice with an modifier applied i.e [bd@4 sd@3]@2 hh]
 slice_with_ops = s:slice ops:slice_op*
   { const result = new ElementStub(s, {ops: [], weight: 1, reps: 1});

packages/mini/mini.mjs

@@ -45,17 +45,6 @@ const applyOptions = (parent, enter) => (pat, i) => {
           pat = pat.fmap((a) => (b) => Array.isArray(a) ? [...a, b] : [a, b]).appLeft(friend);
           break;
         }
-        case 'range': {
-          const friend = enter(op.arguments_.element);
-          pat = strudel.reify(pat);
-          const arrayRange = (start, stop, step = 1) =>
-            Array.from({ length: Math.abs(stop - start) / step + 1 }, (value, index) =>
-              start < stop ? start + index * step : start - index * step,
-            );
-          let range = (apat, bpat) => apat.squeezeBind((a) => bpat.bind((b) => strudel.fastcat(...arrayRange(a, b))));
-          pat = range(pat, friend);
-          break;
-        }
         default: {
           console.warn(`operator "${op.type_}" not implemented`);
         }

packages/mini/package.json

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

packages/mini/test/mini.test.mjs

@@ -184,12 +184,6 @@ describe('mini', () => {
   it('supports lists', () => {
     expect(minV('a:b c:d:[e:f] g')).toEqual([['a', 'b'], ['c', 'd', ['e', 'f']], 'g']);
   });
-  it('supports ranges', () => {
-    expect(minV('0 .. 4')).toEqual([0, 1, 2, 3, 4]);
-  });
-  it('supports patterned ranges', () => {
-    expect(minS('[<0 1> .. <2 4>]*2')).toEqual(minS('[0 1 2] [1 2 3 4]'));
-  });
 });
 
 describe('getLeafLocation', () => {

packages/osc/osc.mjs

@@ -5,7 +5,6 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import OSC from 'osc-js';
-
 import { logger, parseNumeral, Pattern } from '@strudel.cycles/core';
 
 let connection; // Promise<OSC>
@@ -34,6 +33,9 @@ function connect() {
   return connection;
 }
 
+const latency = 0.1;
+let startedAt = -1;
+
 /**
  *
  * Sends each hap as an OSC message, which can be picked up by SuperCollider or any other OSC-enabled software.
@@ -49,16 +51,17 @@ Pattern.prototype.osc = function () {
     const osc = await connect();
     const cycle = hap.wholeOrPart().begin.valueOf();
     const delta = hap.duration.valueOf();
+    // time should be audio time of onset
+    // currentTime should be current time of audio context (slightly before time)
+    if (startedAt < 0) {
+      startedAt = Date.now() - currentTime * 1000;
+    }
     const controls = Object.assign({}, { cps, cycle, delta }, hap.value);
     // make sure n and note are numbers
     controls.n && (controls.n = parseNumeral(controls.n));
     controls.note && (controls.note = parseNumeral(controls.note));
     const keyvals = Object.entries(controls).flat();
-    // time should be audio time of onset
-    // currentTime should be current time of audio context (slightly before time)
-    const offset = (time - currentTime) * 1000;
-    // timestamp in milliseconds used to trigger the osc bundle at a precise moment
-    const ts = Math.floor(Date.now() + offset);
+    const ts = Math.floor(startedAt + (time + latency) * 1000);
     const message = new OSC.Message('/dirt/play', ...keyvals);
     const bundle = new OSC.Bundle([message], ts);
     bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60

packages/osc/package.json

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

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/react",
-  "version": "0.9.0",
+  "version": "0.8.0",
   "description": "React components for strudel",
   "main": "src/index.js",
   "publishConfig": {

packages/react/src/components/CodeMirror6.jsx

@@ -15,11 +15,10 @@ import {
   updateMiniLocations,
 } from '@strudel/codemirror';
 import './style.css';
-import { sliderPlugin } from '@strudel/codemirror/slider.mjs';
 
 export { flash, highlightMiniLocations, updateMiniLocations };
 
-const staticExtensions = [javascript(), flashField, highlightExtension, sliderPlugin];
+const staticExtensions = [javascript(), flashField, highlightExtension];
 
 export default function CodeMirror({
   value,

packages/react/src/hooks/usePatternFrame.mjs

@@ -25,10 +25,10 @@ function usePatternFrame({ pattern, started, getTime, onDraw, drawTime = [-2, 2]
       const haps = pattern.queryArc(Math.max(lastFrame.current, phase - 1 / 10), phase);
       lastFrame.current = phase;
       visibleHaps.current = (visibleHaps.current || [])
-        .filter((h) => h.endClipped >= phase - lookbehind - lookahead) // in frame
+        .filter((h) => h.whole.end >= phase - lookbehind - lookahead) // in frame
         .concat(haps.filter((h) => h.hasOnset()));
       onDraw(pattern, phase - lookahead, visibleHaps.current, drawTime);
-    }, [pattern, onDraw]),
+    }, [pattern]),
   );
   useEffect(() => {
     if (started) {

packages/react/src/hooks/useStrudel.mjs

@@ -18,8 +18,6 @@ function useStrudel({
   canvasId,
   drawContext,
   drawTime = [-2, 2],
-  paintOptions = {},
-  createCyclist, // (params) => Cyclist
 }) {
   const id = useMemo(() => s4(), []);
   canvasId = canvasId || `canvas-${id}`;
@@ -46,7 +44,6 @@ function useStrudel({
           onEvalError?.(err);
         },
         getTime,
-        createCyclist,
         drawContext,
         transpiler,
         editPattern,
@@ -88,9 +85,9 @@ function useStrudel({
     (pattern, time, haps, drawTime) => {
       const { onPaint } = pattern.context || {};
       const ctx = typeof drawContext === 'function' ? drawContext(canvasId) : drawContext;
-      onPaint?.(ctx, time, haps, drawTime, paintOptions);
+      onPaint?.(ctx, time, haps, drawTime);
     },
-    [drawContext, canvasId, paintOptions],
+    [drawContext, canvasId],
   );
 
   const drawFirstFrame = useCallback(

packages/react/src/hooks/useWidgets.mjs

@@ -1,13 +0,0 @@
-import { useEffect, useState } from 'react';
-import { updateWidgets } from '@strudel/codemirror';
-
-// i know this is ugly.. in the future, repl needs to run without react
-export function useWidgets(view) {
-  const [widgets, setWidgets] = useState([]);
-  useEffect(() => {
-    if (view) {
-      updateWidgets(view, widgets);
-    }
-  }, [view, widgets]);
-  return { widgets, setWidgets };
-}

packages/react/src/index.js

@@ -8,5 +8,4 @@ export { default as usePostMessage } from './hooks/usePostMessage';
 export { default as useKeydown } from './hooks/useKeydown';
 export { default as useEvent } from './hooks/useEvent';
 export { default as strudelTheme } from './themes/strudel-theme';
-export { default as teletext } from './themes/teletext';
 export { default as cx } from './cx';

packages/react/src/themes/algoboy.js

@@ -12,7 +12,6 @@ export const settings = {
   gutterBackground: 'transparent',
   gutterForeground: '#0f380f',
   light: true,
-  customStyle: '.cm-line { line-height: 1 }',
 };
 export default createTheme({
   theme: 'light',
@@ -36,6 +35,5 @@ export default createTheme({
     { tag: t.propertyName, color: '#0f380f' },
     { tag: t.className, color: '#0f380f' },
     { tag: t.invalid, color: '#0f380f' },
-    { tag: [t.unit, t.punctuation], color: '#0f380f' },
   ],
 });

packages/react/src/themes/blackscreen.js

@@ -33,6 +33,5 @@ export default createTheme({
     { tag: t.propertyName, color: 'white' },
     { tag: t.className, color: 'white' },
     { tag: t.invalid, color: 'white' },
-    { tag: [t.unit, t.punctuation], color: 'white' },
   ],
 });

packages/react/src/themes/bluescreen.js

@@ -36,6 +36,5 @@ export default createTheme({
     { tag: t.propertyName, color: 'white' },
     { tag: t.className, color: 'white' },
     { tag: t.invalid, color: 'white' },
-    { tag: [t.unit, t.punctuation], color: 'white' },
   ],
 });

packages/react/src/themes/strudel-theme.js

@@ -40,6 +40,5 @@ export default createTheme({
 
     { tag: t.className, color: '#decb6b' },
     { tag: t.invalid, color: '#ffffff' },
-    { tag: [t.unit, t.punctuation], color: '#82aaff' },
   ],
 });

packages/react/src/themes/teletext.js

@@ -1,50 +0,0 @@
-import { tags as t } from '@lezer/highlight';
-import { createTheme } from '@uiw/codemirror-themes';
-
-let colorA = '#6edee4';
-//let colorB = 'magenta';
-let colorB = 'white';
-let colorC = 'red';
-let colorD = '#f8fc55';
-
-export const settings = {
-  background: '#000000',
-  foreground: colorA, // whats that?
-  caret: colorC,
-  selection: colorD,
-  selectionMatch: colorA,
-  lineHighlight: '#6edee440', // panel bg
-  lineBackground: '#00000040',
-  gutterBackground: 'transparent',
-  gutterForeground: '#8a919966',
-  customStyle: '.cm-line { line-height: 1 }',
-};
-
-let punctuation = colorD;
-let mini = colorB;
-
-export default createTheme({
-  theme: 'dark',
-  settings,
-  styles: [
-    { tag: t.keyword, color: colorA },
-    { tag: t.operator, color: mini },
-    { tag: t.special(t.variableName), color: colorA },
-    { tag: t.typeName, color: colorA },
-    { tag: t.atom, color: colorA },
-    { tag: t.number, color: mini },
-    { tag: t.definition(t.variableName), color: colorA },
-    { tag: t.string, color: mini },
-    { tag: t.special(t.string), color: mini },
-    { tag: t.comment, color: punctuation },
-    { tag: t.variableName, color: colorA },
-    { tag: t.tagName, color: colorA },
-    { tag: t.bracket, color: punctuation },
-    { tag: t.meta, color: colorA },
-    { tag: t.attributeName, color: colorA },
-    { tag: t.propertyName, color: colorA }, // methods
-    { tag: t.className, color: colorA },
-    { tag: t.invalid, color: colorC },
-    { tag: [t.unit, t.punctuation], color: punctuation },
-  ],
-});

packages/serial/package.json

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

packages/soundfonts/package.json

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

packages/superdough/README.md

@@ -1,166 +0,0 @@
-# superdough
-
-superdough is a simple web audio sampler and synth, intended for live coding.
-It is the default output of [strudel](https://strudel.tidalcycles.org/).
-This package has no ties to strudel and can be used to quickly bake your own music system on the web.
-
-## Install
-
-via npm:
-
-```js
-npm i superdough --save
-```
-
-## Use
-
-```js
-import { superdough, samples, initAudioOnFirstClick, registerSynthSounds } from 'superdough';
-
-const init = Promise.all([
-  initAudioOnFirstClick(),
-  samples('github:tidalcycles/Dirt-Samples/master'),
-  registerSynthSounds(),
-]);
-
-const loop = (t = 0) => {
-  // superdough(value, time, duration)
-  superdough({ s: 'bd', delay: 0.5 }, t);
-  superdough({ note: 'g1', s: 'sawtooth', cutoff: 600, resonance: 8 }, t, 0.125);
-  superdough({ note: 'g2', s: 'sawtooth', cutoff: 600, resonance: 8 }, t + 0.25, 0.125);
-  superdough({ s: 'hh' }, t + 0.25);
-  superdough({ s: 'sd', room: 0.5 }, t + 0.5);
-  superdough({ s: 'hh' }, t + 0.75);
-};
-
-document.getElementById('play').addEventListener('click', async () => {
-  await init;
-  let t = 0.1;
-  while (t < 16) {
-    loop(t++);
-  }
-});
-```
-
-[Open this in Codesandbox](https://codesandbox.io/s/superdough-demo-forked-sf8djh?file=/src/index.js)
-
-## API
-
-### superdough(value, deadline, duration)
-
-```js
-superdough({ s: 'bd', delay: 0.5 }, 0, 1);
-```
-
-- `value`: the sound properties:
-  - `s`: the name of the sound as loaded via `samples` or `registerSound`
-  - `n`: selects sample with given index
-  - `bank`: prefix_ that is attached to the sound, e.g. `{ s: 'bd', bank: 'RolandTR909' }` = `{ s: 'RolandTR909_bd' }`
-  - `gain`: gain from 0 to 1 (higher values also work but might clip)
-  - `velocity`: additional gain multiplier
-  - `cutoff`: low pass filter cutoff
-  - `resonance`: low pass filter resonance
-  - `hcutoff`: high pass filter cutoff
-  - `hresonance`: high pass filter resonance
-  - `bandf`: band pass filter cutoff
-  - `bandq`: band pass  filter resonance
-  - `crush`: amplitude bit crusher using given number of bits
-  - `shape`: distortion effect from 0 (none) to 1 (full). might get loud!
-  - `pan`: stereo panning from 0 (left) to 1 (right)
-  - `vowel`: vowel filter. possible values: "a", "e", "i", "o", "u"
-  - `delay`: delay mix
-  - `delayfeedback`: delay feedback
-  - `delaytime`: delay time
-  - `room`: reverb mix
-  - `size`: reverb room size
-  - `orbit`: bus name for global effects `delay` and `room`. same orbits will get the same effects
-  - `freq`: repitches sound to given frequency in Hz
-  - `note`: repitches sound to given note or midi number
-  - `cut`: sets cut group. Sounds of same group will cut each other off
-  - `clip`: multiplies duration with given number
-  - `speed`: repitches sound by given factor
-  - `begin`: moves beginning of sample to given factor (between 0 and 1)
-  - `end`: moves end of sample to given factor (between 0 and 1)
-  - `attack`: seconds of attack phase
-  - `decay`: seconds of decay phase
-  - `sustain`: gain of sustain phase
-  - `release`: seconds of release phase
-- `deadline`: seconds until the sound should play (0 = immediate)
-- `duration`: seconds the sound should last. optional for one shot samples, required for synth sounds
-
-### registerSynthSounds()
-
-Loads the default waveforms `sawtooth`, `square`, `triangle` and `sine`. Use them like this:
-
-```js
-superdough({ s:'sawtooth' }, 0, 1)
-```
-
-The duration needs to be set for these sounds!
-
-### samples(sampleMap)
-
-allows you to load samples from URLs. There are 3 ways to load samples
-
-1. sample map object
-2. url of sample map json file
-3. github repo
-
-#### sample map object
-
-You can pass a sample map like this:
-
-```js
-samples({
-  '_base': 'https://raw.githubusercontent.com/felixroos/samples/main/',
-  'bd': 'president/president_bd.mp3',
-  'sd': ['president/president_sd.mp3', 'president/president_sd2.mp3'],
-  'hh': ['president/president_hh.mp3'],
-})
-```
-
-The `_base` property defines the root url while the others declare one or more sample paths for each sound.
-
-For example the full URL for `bd` would then be `https://raw.githubusercontent.com/felixroos/samples/main/president/president_bd.mp3`
-
-A loaded sound can then be played with `superdough({ s: 'bd' }, 0)`.
-
-If you declare multiple sounds, you can select them with `n`: `superdough({ s: 'sd', n: 1 }, 0)`
-
-The duration property is not needed for samples.
-
-#### loading samples from a json file
-
-Instead of passing an object as a sample map, you can also pass a URL to a json that contains a sample map:
-
-```js
-samples('https://raw.githubusercontent.com/felixroos/samples/main/strudel.json')
-```
-
-The json file is expected to have the same format as described above.
-
-#### loading samples from a github repo
-
-Because it is common to use github for samples, there is a short way to load a sample map from github:
-
-```js
-samples('github:tidalcycles/Dirt-Samples/master')
-```
-
-The format is `github:<user>/<repo>/<branch>`.
-
-It expects a `strudel.json` file to be present at the root of the given repository, which declares the sample paths in the repo.
-
-The format is also expected to be the same as explained above.
-
-### initAudioOnFirstClick()
-
-Initializes audio and makes sure it is playable after the first click in the document. A click is needed because of the [Autoplay Policy](https://www.w3.org/TR/autoplay-detection/).
-You can call this function when the document loads.
-Then just make sure your first call of `superdough` happens after a click of something.
-
-## Credits
-
-- [ZZFX](https://github.com/KilledByAPixel/ZzFX) used for synths starting with z
-- [SuperDirt](https://github.com/musikinformatik/SuperDirt)
-- [WebDirt](https://github.com/dktr0/WebDirt)

packages/superdough/dspworklet.mjs

@@ -1,79 +0,0 @@
-import { getAudioContext } from './superdough.mjs';
-
-let worklet;
-export async function dspWorklet(ac, code) {
-  const name = `dsp-worklet-${Date.now()}`;
-  const workletCode = `${code}
-let __q = []; // trigger queue
-class MyProcessor extends AudioWorkletProcessor {
-  constructor() {
-    super();
-    this.t = 0;
-    this.stopped = false;
-    this.port.onmessage = (e) => {
-      if(e.data==='stop') {
-        this.stopped = true;
-      } else if(e.data?.dough) {
-        __q.push(e.data)
-      } else {
-        msg?.(e.data)
-      }
-    };
-  }
-  process(inputs, outputs, parameters) {
-    const output = outputs[0];
-    if(__q.length) {
-      for(let i=0;i<__q.length;++i) {
-        const deadline = __q[i].time-currentTime;
-        if(deadline<=0) {
-          trigger(__q[i].dough)
-          __q.splice(i,1)
-        }
-      }
-    }
-    for (let i = 0; i < output[0].length; i++) {
-      const out = dsp(this.t / sampleRate);
-      output.forEach((channel) => {
-        channel[i] = out;
-      });
-      this.t++;
-    }
-  return !this.stopped;
-  }
-}
-registerProcessor('${name}', MyProcessor);
-`;
-  const base64String = btoa(workletCode);
-  const dataURL = `data:text/javascript;base64,${base64String}`;
-  await ac.audioWorklet.addModule(dataURL);
-  const node = new AudioWorkletNode(ac, name);
-  const stop = () => node.port.postMessage('stop');
-  return { node, stop };
-}
-const stop = () => {
-  if (worklet) {
-    worklet?.stop();
-    worklet?.node?.disconnect();
-  }
-};
-
-if (typeof window !== 'undefined') {
-  window.addEventListener('message', (e) => {
-    if (e.data === 'strudel-stop') {
-      stop();
-    } else if (e.data?.dough) {
-      worklet?.node.port.postMessage(e.data);
-    }
-  });
-}
-
-export const dough = async (code) => {
-  const ac = getAudioContext();
-  stop();
-  worklet = await dspWorklet(ac, code);
-  worklet.node.connect(ac.destination);
-};
-
-export function doughTrigger(t, hap, currentTime, duration, cps) {
-  window.postMessage({ time: t, dough: hap.value, currentTime, duration, cps });
-}

packages/superdough/example/.gitignore

@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

packages/superdough/example/index.html

@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Superdough Example</title>
-    <meta charset="UTF-8" />
-  </head>
-
-  <body>
-    <button id="play">PLAAAAAAAY</button>
-    <script src="/main.js" type="module"></script>
-  </body>
-</html>

packages/superdough/example/main.js

@@ -1,25 +0,0 @@
-import { superdough, samples, initAudioOnFirstClick, registerSynthSounds } from 'superdough';
-
-const init = Promise.all([
-  initAudioOnFirstClick(),
-  samples('github:tidalcycles/Dirt-Samples/master'),
-  registerSynthSounds(),
-]);
-
-const loop = (t = 0) => {
-  // superdough(value, time, duration)
-  superdough({ s: 'bd', delay: 0.5 }, t);
-  superdough({ note: 'g1', s: 'sawtooth', cutoff: 600, resonance: 8 }, t, 0.125);
-  superdough({ note: 'g2', s: 'sawtooth', cutoff: 600, resonance: 8 }, t + 0.25, 0.125);
-  superdough({ s: 'hh' }, t + 0.25);
-  superdough({ s: 'sd', room: 0.5 }, t + 0.5);
-  superdough({ s: 'hh' }, t + 0.75);
-};
-
-document.getElementById('play').addEventListener('click', async () => {
-  await init;
-  let t = 0.1;
-  while (t < 16) {
-    loop(t++);
-  }
-});

packages/superdough/example/package.json

@@ -1,17 +0,0 @@
-{
-  "name": "superdough-example",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "superdough": "workspace:*"
-  },
-  "devDependencies": {
-    "vite": "^4.4.5"
-  }
-}

packages/superdough/helpers.mjs

@@ -1,136 +0,0 @@
-import { getAudioContext } from './superdough.mjs';
-import { clamp } from './util.mjs';
-
-export function gainNode(value) {
-  const node = getAudioContext().createGain();
-  node.gain.value = value;
-  return node;
-}
-
-// alternative to getADSR returning the gain node and a stop handle to trigger the release anytime in the future
-export const getEnvelope = (attack, decay, sustain, release, velocity, begin) => {
-  const gainNode = getAudioContext().createGain();
-  gainNode.gain.setValueAtTime(0, begin);
-  gainNode.gain.linearRampToValueAtTime(velocity, begin + attack); // attack
-  gainNode.gain.linearRampToValueAtTime(sustain * velocity, begin + attack + decay); // sustain start
-  // sustain end
-  return {
-    node: gainNode,
-    stop: (t) => {
-      //if (typeof gainNode.gain.cancelAndHoldAtTime === 'function') {
-      // gainNode.gain.cancelAndHoldAtTime(t); // this seems to release instantly....
-      // see https://discord.com/channels/779427371270275082/937365093082079272/1086053607360712735
-      //} else {
-      // firefox: this will glitch when the sustain has not been reached yet at the time of release
-      gainNode.gain.setValueAtTime(sustain * velocity, t);
-      //}
-      gainNode.gain.linearRampToValueAtTime(0, t + release);
-    },
-  };
-};
-
-export const getExpEnvelope = (attack, decay, sustain, release, velocity, begin) => {
-  sustain = Math.max(0.001, sustain);
-  velocity = Math.max(0.001, velocity);
-  const gainNode = getAudioContext().createGain();
-  gainNode.gain.setValueAtTime(0.0001, begin);
-  gainNode.gain.exponentialRampToValueAtTime(velocity, begin + attack);
-  gainNode.gain.exponentialRampToValueAtTime(sustain * velocity, begin + attack + decay);
-  return {
-    node: gainNode,
-    stop: (t) => {
-      // similar to getEnvelope, this will glitch if sustain level has not been reached
-      gainNode.gain.exponentialRampToValueAtTime(0.0001, t + release);
-    },
-  };
-};
-
-export const getADSR = (attack, decay, sustain, release, velocity, begin, end) => {
-  const gainNode = getAudioContext().createGain();
-  gainNode.gain.setValueAtTime(0, begin);
-  gainNode.gain.linearRampToValueAtTime(velocity, begin + attack); // attack
-  gainNode.gain.linearRampToValueAtTime(sustain * velocity, begin + attack + decay); // sustain start
-  gainNode.gain.setValueAtTime(sustain * velocity, end); // sustain end
-  gainNode.gain.linearRampToValueAtTime(0, end + release); // release
-  // for some reason, using exponential ramping creates little cracklings
-  /* let t = begin;
-  gainNode.gain.setValueAtTime(0, t);
-  gainNode.gain.exponentialRampToValueAtTime(velocity, (t += attack));
-  const sustainGain = Math.max(sustain * velocity, 0.001);
-  gainNode.gain.exponentialRampToValueAtTime(sustainGain, (t += decay));
-  if (end - begin < attack + decay) {
-    gainNode.gain.cancelAndHoldAtTime(end);
-  } else {
-    gainNode.gain.setValueAtTime(sustainGain, end);
-  }
-  gainNode.gain.exponentialRampToValueAtTime(0.001, end + release); // release */
-  return gainNode;
-};
-
-export const getParamADSR = (param, attack, decay, sustain, release, min, max, begin, end) => {
-  const range = max - min;
-  const peak = min + range;
-  const sustainLevel = min + sustain * range;
-  param.setValueAtTime(min, begin);
-  param.linearRampToValueAtTime(peak, begin + attack);
-  param.linearRampToValueAtTime(sustainLevel, begin + attack + decay);
-  param.setValueAtTime(sustainLevel, end);
-  param.linearRampToValueAtTime(min, end + Math.max(release, 0.1));
-};
-
-export function createFilter(
-  context,
-  type,
-  frequency,
-  Q,
-  attack,
-  decay,
-  sustain,
-  release,
-  fenv,
-  start,
-  end,
-  fanchor = 0.5,
-) {
-  const filter = context.createBiquadFilter();
-  filter.type = type;
-  filter.Q.value = Q;
-  filter.frequency.value = frequency;
-
-  // Apply ADSR to filter frequency
-  if (!isNaN(fenv) && fenv !== 0) {
-    const offset = fenv * fanchor;
-
-    const min = clamp(2 ** -offset * frequency, 0, 20000);
-    const max = clamp(2 ** (fenv - offset) * frequency, 0, 20000);
-
-    // console.log('min', min, 'max', max);
-
-    getParamADSR(filter.frequency, attack, decay, sustain, release, min, max, start, end);
-    return filter;
-  }
-
-  return filter;
-}
-
-// stays 1 until .5, then fades out
-let wetfade = (d) => (d < 0.5 ? 1 : 1 - (d - 0.5) / 0.5);
-
-// mix together dry and wet nodes. 0 = only dry 1 = only wet
-// still not too sure about how this could be used more generally...
-export function drywet(dry, wet, wetAmount = 0) {
-  const ac = getAudioContext();
-  if (!wetAmount) {
-    return dry;
-  }
-  let dry_gain = ac.createGain();
-  let wet_gain = ac.createGain();
-  dry.connect(dry_gain);
-  wet.connect(wet_gain);
-  dry_gain.gain.value = wetfade(wetAmount);
-  wet_gain.gain.value = wetfade(1 - wetAmount);
-  let mix = ac.createGain();
-  dry_gain.connect(mix);
-  wet_gain.connect(mix);
-  return mix;
-}

packages/superdough/index.mjs

@@ -1,13 +0,0 @@
-/*
-index.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/superdough/index.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-export * from './superdough.mjs';
-export * from './sampler.mjs';
-export * from './helpers.mjs';
-export * from './synth.mjs';
-export * from './zzfx.mjs';
-export * from './logger.mjs';
-export * from './dspworklet.mjs';

packages/superdough/logger.mjs

@@ -1,7 +0,0 @@
-let log = (msg) => console.log(msg);
-
-export const logger = (...args) => log(...args);
-
-export const setLogger = (fn) => {
-  log = fn;
-};

packages/superdough/noise.mjs

@@ -1,63 +0,0 @@
-import { drywet } from './helpers.mjs';
-import { getAudioContext } from './superdough.mjs';
-
-let noiseCache = {};
-
-// lazy generates noise buffers and keeps them forever
-function getNoiseBuffer(type) {
-  const ac = getAudioContext();
-  if (noiseCache[type]) {
-    return noiseCache[type];
-  }
-  const bufferSize = 2 * ac.sampleRate;
-  const noiseBuffer = ac.createBuffer(1, bufferSize, ac.sampleRate);
-  const output = noiseBuffer.getChannelData(0);
-  let lastOut = 0;
-  let b0, b1, b2, b3, b4, b5, b6;
-  b0 = b1 = b2 = b3 = b4 = b5 = b6 = 0.0;
-
-  for (let i = 0; i < bufferSize; i++) {
-    if (type === 'white') {
-      output[i] = Math.random() * 2 - 1;
-    } else if (type === 'brown') {
-      let white = Math.random() * 2 - 1;
-      output[i] = (lastOut + 0.02 * white) / 1.02;
-      lastOut = output[i];
-    } else if (type === 'pink') {
-      let white = Math.random() * 2 - 1;
-      b0 = 0.99886 * b0 + white * 0.0555179;
-      b1 = 0.99332 * b1 + white * 0.0750759;
-      b2 = 0.969 * b2 + white * 0.153852;
-      b3 = 0.8665 * b3 + white * 0.3104856;
-      b4 = 0.55 * b4 + white * 0.5329522;
-      b5 = -0.7616 * b5 - white * 0.016898;
-      output[i] = b0 + b1 + b2 + b3 + b4 + b5 + b6 + white * 0.5362;
-      output[i] *= 0.11;
-      b6 = white * 0.115926;
-    }
-  }
-  noiseCache[type] = noiseBuffer;
-  return noiseBuffer;
-}
-
-// expects one of noises as type
-export function getNoiseOscillator(type = 'white', t) {
-  const ac = getAudioContext();
-  const o = ac.createBufferSource();
-  o.buffer = getNoiseBuffer(type);
-  o.loop = true;
-  o.start(t);
-  return {
-    node: o,
-    stop: (time) => o.stop(time),
-  };
-}
-
-export function getNoiseMix(inputNode, wet, t) {
-  const noiseOscillator = getNoiseOscillator('pink', t);
-  const noiseMix = drywet(inputNode, noiseOscillator.node, wet);
-  return {
-    node: noiseMix,
-    stop: (time) => noiseOscillator?.stop(time),
-  };
-}

packages/superdough/package.json

@@ -1,41 +0,0 @@
-{
-  "name": "superdough",
-  "version": "0.9.9",
-  "description": "simple web audio synth and sampler intended for live coding. inspired by superdirt and webdirt.",
-  "main": "index.mjs",
-  "type": "module",
-  "publishConfig": {
-    "main": "dist/index.cjs",
-    "module": "dist/index.mjs"
-  },
-  "directories": {
-    "example": "examples"
-  },
-  "scripts": {
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tidalcycles/strudel.git"
-  },
-  "keywords": [
-    "tidalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://github.com/tidalcycles/strudel/issues"
-  },
-  "homepage": "https://github.com/tidalcycles/strudel#readme",
-  "devDependencies": {
-    "vite": "^4.3.3"
-  },
-  "dependencies": {
-    "nanostores": "^0.8.1"
-  }
-}

packages/superdough/reverb.mjs

@@ -1,30 +0,0 @@
-import reverbGen from './reverbGen.mjs';
-
-if (typeof AudioContext !== 'undefined') {
-  AudioContext.prototype.generateReverb = reverbGen.generateReverb;
-  AudioContext.prototype.createReverb = function (duration, fade, lp, dim) {
-    const convolver = this.createConvolver();
-    convolver.generate = (d, fade, lp, dim) => {
-      this.generateReverb(
-        {
-          audioContext: this,
-          sampleRate: 44100,
-          numChannels: 2,
-          decayTime: d,
-          fadeInTime: fade,
-          lpFreqStart: lp,
-          lpFreqEnd: dim,
-        },
-        (buffer) => {
-          convolver.buffer = buffer;
-        },
-      );
-      convolver.duration = d;
-      convolver.fade = fade;
-      convolver.lp = lp;
-      convolver.dim = dim;
-    };
-    convolver.generate(duration, fade, lp, dim);
-    return convolver;
-  };
-}

packages/superdough/reverbGen.mjs

@@ -1,129 +0,0 @@
-// Copyright 2014 Alan deLespinasse
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-var reverbGen = {};
-
-/** Generates a reverb impulse response.
-
-    @param {!Object} params TODO: Document the properties.
-    @param {!function(!AudioBuffer)} callback Function to call when
-      the impulse response has been generated. The impulse response
-      is passed to this function as its parameter. May be called
-      immediately within the current execution context, or later. */
-reverbGen.generateReverb = function (params, callback) {
-  var audioContext = params.audioContext || new AudioContext();
-  var sampleRate = params.sampleRate || 44100;
-  var numChannels = params.numChannels || 2;
-  // params.decayTime is the -60dB fade time. We let it go 50% longer to get to -90dB.
-  var totalTime = params.decayTime * 1.5;
-  var decaySampleFrames = Math.round(params.decayTime * sampleRate);
-  var numSampleFrames = Math.round(totalTime * sampleRate);
-  var fadeInSampleFrames = Math.round((params.fadeInTime || 0) * sampleRate);
-  // 60dB is a factor of 1 million in power, or 1000 in amplitude.
-  var decayBase = Math.pow(1 / 1000, 1 / decaySampleFrames);
-  var reverbIR = audioContext.createBuffer(numChannels, numSampleFrames, sampleRate);
-  for (var i = 0; i < numChannels; i++) {
-    var chan = reverbIR.getChannelData(i);
-    for (var j = 0; j < numSampleFrames; j++) {
-      chan[j] = randomSample() * Math.pow(decayBase, j);
-    }
-    for (var j = 0; j < fadeInSampleFrames; j++) {
-      chan[j] *= j / fadeInSampleFrames;
-    }
-  }
-
-  applyGradualLowpass(reverbIR, params.lpFreqStart || 0, params.lpFreqEnd || 0, params.decayTime, callback);
-};
-
-/** Creates a canvas element showing a graph of the given data.
-
-    @param {!Float32Array} data An array of numbers, or a Float32Array.
-    @param {number} width Width in pixels of the canvas.
-    @param {number} height Height in pixels of the canvas.
-    @param {number} min Minimum value of data for the graph (lower edge).
-    @param {number} max Maximum value of data in the graph (upper edge).
-    @return {!CanvasElement} The generated canvas element. */
-reverbGen.generateGraph = function (data, width, height, min, max) {
-  var canvas = document.createElement('canvas');
-  canvas.width = width;
-  canvas.height = height;
-  var gc = canvas.getContext('2d');
-  gc.fillStyle = '#000';
-  gc.fillRect(0, 0, canvas.width, canvas.height);
-  gc.fillStyle = '#fff';
-  var xscale = width / data.length;
-  var yscale = height / (max - min);
-  for (var i = 0; i < data.length; i++) {
-    gc.fillRect(i * xscale, height - (data[i] - min) * yscale, 1, 1);
-  }
-  return canvas;
-};
-
-/** Applies a constantly changing lowpass filter to the given sound.
-
-    @private
-    @param {!AudioBuffer} input
-    @param {number} lpFreqStart
-    @param {number} lpFreqEnd
-    @param {number} lpFreqEndAt
-    @param {!function(!AudioBuffer)} callback May be called
-    immediately within the current execution context, or later.*/
-var applyGradualLowpass = function (input, lpFreqStart, lpFreqEnd, lpFreqEndAt, callback) {
-  if (lpFreqStart == 0) {
-    callback(input);
-    return;
-  }
-  var channelData = getAllChannelData(input);
-  var context = new OfflineAudioContext(input.numberOfChannels, channelData[0].length, input.sampleRate);
-  var player = context.createBufferSource();
-  player.buffer = input;
-  var filter = context.createBiquadFilter();
-
-  lpFreqStart = Math.min(lpFreqStart, input.sampleRate / 2);
-  lpFreqEnd = Math.min(lpFreqEnd, input.sampleRate / 2);
-
-  filter.type = 'lowpass';
-  filter.Q.value = 0.0001;
-  filter.frequency.setValueAtTime(lpFreqStart, 0);
-  filter.frequency.linearRampToValueAtTime(lpFreqEnd, lpFreqEndAt);
-
-  player.connect(filter);
-  filter.connect(context.destination);
-  player.start();
-  context.oncomplete = function (event) {
-    callback(event.renderedBuffer);
-  };
-  context.startRendering();
-
-  window.filterNode = filter;
-};
-
-/** @private
-    @param {!AudioBuffer} buffer
-    @return {!Array.<!Float32Array>} An array containing the Float32Array of each channel's samples. */
-var getAllChannelData = function (buffer) {
-  var channels = [];
-  for (var i = 0; i < buffer.numberOfChannels; i++) {
-    channels[i] = buffer.getChannelData(i);
-  }
-  return channels;
-};
-
-/** @private
-    @return {number} A random number from -1 to 1. */
-var randomSample = function () {
-  return Math.random() * 2 - 1;
-};
-
-export default reverbGen;

packages/superdough/superdough.mjs

@@ -1,387 +0,0 @@
-/*
-superdough.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/superdough/superdough.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 './feedbackdelay.mjs';
-import './reverb.mjs';
-import './vowel.mjs';
-import { clamp } from './util.mjs';
-import workletsUrl from './worklets.mjs?url';
-import { createFilter, gainNode } from './helpers.mjs';
-import { map } from 'nanostores';
-import { logger } from './logger.mjs';
-
-export const soundMap = map();
-export function registerSound(key, onTrigger, data = {}) {
-  soundMap.setKey(key, { onTrigger, data });
-}
-export function getSound(s) {
-  return soundMap.get()[s];
-}
-export const resetLoadedSounds = () => soundMap.set({});
-
-let audioContext;
-export const getAudioContext = () => {
-  if (!audioContext) {
-    audioContext = new AudioContext();
-  }
-  return audioContext;
-};
-
-let destination;
-const getDestination = () => {
-  const ctx = getAudioContext();
-  if (!destination) {
-    destination = ctx.createGain();
-    destination.connect(ctx.destination);
-  }
-  return destination;
-};
-
-export const panic = () => {
-  getDestination().gain.linearRampToValueAtTime(0, getAudioContext().currentTime + 0.01);
-  destination = null;
-};
-
-let workletsLoading;
-function loadWorklets() {
-  if (workletsLoading) {
-    return workletsLoading;
-  }
-  workletsLoading = getAudioContext().audioWorklet.addModule(workletsUrl);
-  return workletsLoading;
-}
-
-function getWorklet(ac, processor, params) {
-  const node = new AudioWorkletNode(ac, processor);
-  Object.entries(params).forEach(([key, value]) => {
-    node.parameters.get(key).value = value;
-  });
-  return node;
-}
-
-// this function should be called on first user interaction (to avoid console warning)
-export async function initAudio(options = {}) {
-  const { disableWorklets = false } = options;
-  if (typeof window !== 'undefined') {
-    await getAudioContext().resume();
-    if (!disableWorklets) {
-      await loadWorklets().catch((err) => {
-        console.warn('could not load AudioWorklet effects coarse, crush and shape', err);
-      });
-    } else {
-      console.log('disableWorklets: AudioWorklet effects coarse, crush and shape are skipped!');
-    }
-  }
-}
-
-export async function initAudioOnFirstClick(options) {
-  return new Promise((resolve) => {
-    document.addEventListener('click', async function listener() {
-      await initAudio(options);
-      resolve();
-      document.removeEventListener('click', listener);
-    });
-  });
-}
-
-let delays = {};
-const maxfeedback = 0.98;
-function getDelay(orbit, delaytime, delayfeedback, t) {
-  if (delayfeedback > maxfeedback) {
-    //logger(`delayfeedback was clamped to ${maxfeedback} to save your ears`);
-  }
-  delayfeedback = clamp(delayfeedback, 0, 0.98);
-  if (!delays[orbit]) {
-    const ac = getAudioContext();
-    const dly = ac.createFeedbackDelay(1, delaytime, delayfeedback);
-    dly.start?.(t); // for some reason, this throws when audion extension is installed..
-    dly.connect(getDestination());
-    delays[orbit] = dly;
-  }
-  delays[orbit].delayTime.value !== delaytime && delays[orbit].delayTime.setValueAtTime(delaytime, t);
-  delays[orbit].feedback.value !== delayfeedback && delays[orbit].feedback.setValueAtTime(delayfeedback, t);
-  return delays[orbit];
-}
-
-let reverbs = {};
-
-function getReverb(orbit, duration = 2, fade, lp, dim) {
-  // If no reverb has been created for a given orbit, create one
-  if (!reverbs[orbit]) {
-    const ac = getAudioContext();
-    const reverb = ac.createReverb(duration, fade, lp, dim);
-    reverb.connect(getDestination());
-    reverbs[orbit] = reverb;
-  }
-
-  if (
-    reverbs[orbit].duration !== duration ||
-    reverbs[orbit].fade !== fade ||
-    reverbs[orbit].lp !== lp ||
-    reverbs[orbit].dim !== dim
-  ) {
-    reverbs[orbit].generate(duration, fade, lp, dim);
-  }
-
-  return reverbs[orbit];
-}
-
-export let analyser, analyserData /* s = {} */;
-export function getAnalyser(/* orbit,  */ fftSize = 2048) {
-  if (!analyser /*s [orbit] */) {
-    const analyserNode = getAudioContext().createAnalyser();
-    analyserNode.fftSize = fftSize;
-    // getDestination().connect(analyserNode);
-    analyser /* s[orbit] */ = analyserNode;
-    //analyserData = new Uint8Array(analyser.frequencyBinCount);
-    analyserData = new Float32Array(analyser.frequencyBinCount);
-  }
-  if (analyser /* s[orbit] */.fftSize !== fftSize) {
-    analyser /* s[orbit] */.fftSize = fftSize;
-    //analyserData = new Uint8Array(analyser.frequencyBinCount);
-    analyserData = new Float32Array(analyser.frequencyBinCount);
-  }
-  return analyser /* s[orbit] */;
-}
-
-export function getAnalyzerData(type = 'time') {
-  const getter = {
-    time: () => analyser?.getFloatTimeDomainData(analyserData),
-    frequency: () => analyser?.getFloatFrequencyData(analyserData),
-  }[type];
-  if (!getter) {
-    throw new Error(`getAnalyzerData: ${type} not supported. use one of ${Object.keys(getter).join(', ')}`);
-  }
-  getter();
-  return analyserData;
-}
-
-function effectSend(input, effect, wet) {
-  const send = gainNode(wet);
-  input.connect(send);
-  send.connect(effect);
-  return send;
-}
-
-export const superdough = async (value, deadline, hapDuration) => {
-  const ac = getAudioContext();
-  if (typeof value !== 'object') {
-    throw new Error(
-      `expected hap.value to be an object, but got "${value}". Hint: append .note() or .s() to the end`,
-      'error',
-    );
-  }
-
-  // duration is passed as value too..
-  value.duration = hapDuration;
-  // calculate absolute time
-  let t = ac.currentTime + deadline;
-  // destructure
-  let {
-    s = 'triangle',
-    bank,
-    source,
-    gain = 0.8,
-    // filters
-    ftype = '12db',
-    fanchor = 0.5,
-    // low pass
-    cutoff,
-    lpenv,
-    lpattack = 0.01,
-    lpdecay = 0.01,
-    lpsustain = 1,
-    lprelease = 0.01,
-    resonance = 1,
-    // high pass
-    hpenv,
-    hcutoff,
-    hpattack = 0.01,
-    hpdecay = 0.01,
-    hpsustain = 1,
-    hprelease = 0.01,
-    hresonance = 1,
-    // band pass
-    bpenv,
-    bandf,
-    bpattack = 0.01,
-    bpdecay = 0.01,
-    bpsustain = 1,
-    bprelease = 0.01,
-    bandq = 1,
-    //
-    coarse,
-    crush,
-    shape,
-    pan,
-    vowel,
-    delay = 0,
-    delayfeedback = 0.5,
-    delaytime = 0.25,
-    orbit = 1,
-    room,
-    roomfade = 0.1,
-    roomlp = 15000,
-    roomdim = 1000,
-    roomsize = 2,
-    velocity = 1,
-    analyze, // analyser wet
-    fft = 8, // fftSize 0 - 10
-  } = value;
-  gain *= velocity; // legacy fix for velocity
-  let toDisconnect = []; // audio nodes that will be disconnected when the source has ended
-  const onended = () => {
-    toDisconnect.forEach((n) => n?.disconnect());
-  };
-  if (bank && s) {
-    s = `${bank}_${s}`;
-  }
-  // get source AudioNode
-  let sourceNode;
-  if (source) {
-    sourceNode = source(t, value, hapDuration);
-  } else if (getSound(s)) {
-    const { onTrigger } = getSound(s);
-    const soundHandle = await onTrigger(t, value, onended);
-    if (soundHandle) {
-      sourceNode = soundHandle.node;
-      soundHandle.stop(t + hapDuration);
-    }
-  } else {
-    throw new Error(`sound ${s} not found! Is it loaded?`);
-  }
-  if (!sourceNode) {
-    // if onTrigger does not return anything, we will just silently skip
-    // this can be used for things like speed(0) in the sampler
-    return;
-  }
-  if (ac.currentTime > t) {
-    logger('[webaudio] skip hap: still loading', ac.currentTime - t);
-    return;
-  }
-  const chain = []; // audio nodes that will be connected to each other sequentially
-  chain.push(sourceNode);
-
-  // gain stage
-  chain.push(gainNode(gain));
-
-  if (cutoff !== undefined) {
-    let lp = () =>
-      createFilter(
-        ac,
-        'lowpass',
-        cutoff,
-        resonance,
-        lpattack,
-        lpdecay,
-        lpsustain,
-        lprelease,
-        lpenv,
-        t,
-        t + hapDuration,
-        fanchor,
-      );
-    chain.push(lp());
-    if (ftype === '24db') {
-      chain.push(lp());
-    }
-  }
-
-  if (hcutoff !== undefined) {
-    let hp = () =>
-      createFilter(
-        ac,
-        'highpass',
-        hcutoff,
-        hresonance,
-        hpattack,
-        hpdecay,
-        hpsustain,
-        hprelease,
-        hpenv,
-        t,
-        t + hapDuration,
-        fanchor,
-      );
-    chain.push(hp());
-    if (ftype === '24db') {
-      chain.push(hp());
-    }
-  }
-
-  if (bandf !== undefined) {
-    let bp = () =>
-      createFilter(
-        ac,
-        'bandpass',
-        bandf,
-        bandq,
-        bpattack,
-        bpdecay,
-        bpsustain,
-        bprelease,
-        bpenv,
-        t,
-        t + hapDuration,
-        fanchor,
-      );
-    chain.push(bp());
-    if (ftype === '24db') {
-      chain.push(bp());
-    }
-  }
-
-  if (vowel !== undefined) {
-    const vowelFilter = ac.createVowelFilter(vowel);
-    chain.push(vowelFilter);
-  }
-
-  // effects
-  coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse }));
-  crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
-  shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape }));
-
-  // panning
-  if (pan !== undefined) {
-    const panner = ac.createStereoPanner();
-    panner.pan.value = 2 * pan - 1;
-    chain.push(panner);
-  }
-
-  // last gain
-  const post = gainNode(1);
-  chain.push(post);
-  post.connect(getDestination());
-
-  // delay
-  let delaySend;
-  if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
-    const delyNode = getDelay(orbit, delaytime, delayfeedback, t);
-    delaySend = effectSend(post, delyNode, delay);
-  }
-  // reverb
-  let reverbSend;
-  if (room > 0 && roomsize > 0) {
-    const reverbNode = getReverb(orbit, roomsize, roomfade, roomlp, roomdim);
-    reverbSend = effectSend(post, reverbNode, room);
-  }
-
-  // analyser
-  let analyserSend;
-  if (analyze) {
-    const analyserNode = getAnalyser(/* orbit,  */ 2 ** (fft + 5));
-    analyserSend = effectSend(post, analyserNode, analyze);
-  }
-
-  // connect chain elements together
-  chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);
-
-  // toDisconnect = all the node that should be disconnected in onended callback
-  // this is crucial for performance
-  toDisconnect = chain.concat([delaySend, reverbSend, analyserSend]);
-};
-
-export const superdoughTrigger = (t, hap, ct, cps) => superdough(hap, t - ct, hap.duration / cps, cps);

packages/superdough/synth.mjs

@@ -1,204 +0,0 @@
-import { midiToFreq, noteToMidi } from './util.mjs';
-import { registerSound, getAudioContext } from './superdough.mjs';
-import { gainNode, getEnvelope, getExpEnvelope } from './helpers.mjs';
-import { getNoiseMix, getNoiseOscillator } from './noise.mjs';
-
-const mod = (freq, range = 1, type = 'sine') => {
-  const ctx = getAudioContext();
-  const osc = ctx.createOscillator();
-  osc.type = type;
-  osc.frequency.value = freq;
-  osc.start();
-  const g = new GainNode(ctx, { gain: range });
-  osc.connect(g); // -range, range
-  return { node: g, stop: (t) => osc.stop(t) };
-};
-
-const fm = (osc, harmonicityRatio, modulationIndex, wave = 'sine') => {
-  const carrfreq = osc.frequency.value;
-  const modfreq = carrfreq * harmonicityRatio;
-  const modgain = modfreq * modulationIndex;
-  return mod(modfreq, modgain, wave);
-};
-
-const waveforms = ['sine', 'square', 'triangle', 'sawtooth'];
-const noises = ['pink', 'white', 'brown'];
-
-export function registerSynthSounds() {
-  [...waveforms, ...noises].forEach((s) => {
-    registerSound(
-      s,
-      (t, value, onended) => {
-        // destructure adsr here, because the default should be different for synths and samples
-        let { attack = 0.001, decay = 0.05, sustain = 0.6, release = 0.01 } = value;
-
-        let sound;
-        if (waveforms.includes(s)) {
-          sound = getOscillator(s, t, value);
-        } else {
-          sound = getNoiseOscillator(s, t);
-        }
-
-        let { node: o, stop, triggerRelease } = sound;
-
-        // turn down
-        const g = gainNode(0.3);
-
-        // gain envelope
-        const { node: envelope, stop: releaseEnvelope } = getEnvelope(attack, decay, sustain, release, 1, t);
-
-        o.onended = () => {
-          o.disconnect();
-          g.disconnect();
-          onended();
-        };
-        return {
-          node: o.connect(g).connect(envelope),
-          stop: (releaseTime) => {
-            releaseEnvelope(releaseTime);
-            triggerRelease?.(releaseTime);
-            let end = releaseTime + release;
-            stop(end);
-          },
-        };
-      },
-      { type: 'synth', prebake: true },
-    );
-  });
-}
-
-export function waveformN(partials, type) {
-  const real = new Float32Array(partials + 1);
-  const imag = new Float32Array(partials + 1);
-  const ac = getAudioContext();
-  const osc = ac.createOscillator();
-
-  const amplitudes = {
-    sawtooth: (n) => 1 / n,
-    square: (n) => (n % 2 === 0 ? 0 : 1 / n),
-    triangle: (n) => (n % 2 === 0 ? 0 : 1 / (n * n)),
-  };
-
-  if (!amplitudes[type]) {
-    throw new Error(`unknown wave type ${type}`);
-  }
-
-  real[0] = 0; // dc offset
-  imag[0] = 0;
-  let n = 1;
-  while (n <= partials) {
-    real[n] = amplitudes[type](n);
-    imag[n] = 0;
-    n++;
-  }
-
-  const wave = ac.createPeriodicWave(real, imag);
-  osc.setPeriodicWave(wave);
-  return osc;
-}
-
-// expects one of waveforms as s
-export function getOscillator(
-  s,
-  t,
-  {
-    n: partials,
-    note,
-    freq,
-    vib = 0,
-    vibmod = 0.5,
-    noise = 0,
-    // fm
-    fmh: fmHarmonicity = 1,
-    fmi: fmModulationIndex,
-    fmenv: fmEnvelopeType = 'lin',
-    fmattack: fmAttack,
-    fmdecay: fmDecay,
-    fmsustain: fmSustain,
-    fmrelease: fmRelease,
-    fmvelocity: fmVelocity,
-    fmwave: fmWaveform = 'sine',
-  },
-) {
-  let ac = getAudioContext();
-  let o;
-  // If no partials are given, use stock waveforms
-  if (!partials || s === 'sine') {
-    o = getAudioContext().createOscillator();
-    o.type = s || 'triangle';
-  }
-  // generate custom waveform if partials are given
-  else {
-    o = waveformN(partials, s);
-  }
-
-  // get frequency from note...
-  note = note || 36;
-  if (typeof note === 'string') {
-    note = noteToMidi(note); // e.g. c3 => 48
-  }
-  // get frequency
-  if (!freq && typeof note === 'number') {
-    freq = midiToFreq(note); // + 48);
-  }
-
-  // set frequency
-  o.frequency.value = Number(freq);
-  o.start(t);
-
-  // FM
-  let stopFm, fmEnvelope;
-  if (fmModulationIndex) {
-    const { node: modulator, stop } = fm(o, fmHarmonicity, fmModulationIndex, fmWaveform);
-    if (![fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity].find((v) => v !== undefined)) {
-      // no envelope by default
-      modulator.connect(o.frequency);
-    } else {
-      fmAttack = fmAttack ?? 0.001;
-      fmDecay = fmDecay ?? 0.001;
-      fmSustain = fmSustain ?? 1;
-      fmRelease = fmRelease ?? 0.001;
-      fmVelocity = fmVelocity ?? 1;
-      fmEnvelope = getEnvelope(fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity, t);
-      if (fmEnvelopeType === 'exp') {
-        fmEnvelope = getExpEnvelope(fmAttack, fmDecay, fmSustain, fmRelease, fmVelocity, t);
-        fmEnvelope.node.maxValue = fmModulationIndex * 2;
-        fmEnvelope.node.minValue = 0.00001;
-      }
-      modulator.connect(fmEnvelope.node);
-      fmEnvelope.node.connect(o.frequency);
-    }
-    stopFm = stop;
-  }
-
-  // Additional oscillator for vibrato effect
-  let vibratoOscillator;
-  if (vib > 0) {
-    vibratoOscillator = getAudioContext().createOscillator();
-    vibratoOscillator.frequency.value = vib;
-    const gain = getAudioContext().createGain();
-    // Vibmod is the amount of vibrato, in semitones
-    gain.gain.value = vibmod * 100;
-    vibratoOscillator.connect(gain);
-    gain.connect(o.detune);
-    vibratoOscillator.start(t);
-  }
-
-  let noiseMix;
-  if (noise) {
-    noiseMix = getNoiseMix(o, noise, t);
-  }
-
-  return {
-    node: noiseMix?.node || o,
-    stop: (time) => {
-      vibratoOscillator?.stop(time);
-      noiseMix?.stop(time);
-      stopFm?.(time);
-      o.stop(time);
-    },
-    triggerRelease: (time) => {
-      fmEnvelope?.stop(time);
-    },
-  };
-}

packages/superdough/util.mjs

@@ -1,53 +0,0 @@
-// currently duplicate with core util.mjs to skip dependency
-// TODO: add separate util module?
-
-export const tokenizeNote = (note) => {
-  if (typeof note !== 'string') {
-    return [];
-  }
-  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bsf]*)([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 };
-
-export const noteToMidi = (note, defaultOctave = 3) => {
-  const [pc, acc, oct = defaultOctave] = tokenizeNote(note);
-  if (!pc) {
-    throw new Error('not a note: "' + note + '"');
-  }
-  const chroma = chromas[pc.toLowerCase()];
-  const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
-  return (Number(oct) + 1) * 12 + chroma + offset;
-};
-export const midiToFreq = (n) => {
-  return Math.pow(2, (n - 69) / 12) * 440;
-};
-export const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
-
-export const freqToMidi = (freq) => {
-  return (12 * Math.log(freq / 440)) / Math.LN2 + 69;
-};
-
-export const valueToMidi = (value, fallbackValue) => {
-  if (typeof value !== 'object') {
-    throw new Error('valueToMidi: expected object value');
-  }
-  let { freq, note } = value;
-  if (typeof freq === 'number') {
-    return freqToMidi(freq);
-  }
-  if (typeof note === 'string') {
-    return noteToMidi(note);
-  }
-  if (typeof note === 'number') {
-    return note;
-  }
-  if (!fallbackValue) {
-    throw new Error('valueToMidi: expected freq or note to be set');
-  }
-  return fallbackValue;
-};

packages/superdough/vite.config.js

@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.cjs' }[ext]),
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});

packages/superdough/zzfx.mjs

@@ -1,124 +0,0 @@
-//import { ZZFX } from 'zzfx';
-import { midiToFreq, noteToMidi } from './util.mjs';
-import { registerSound, getAudioContext } from './superdough.mjs';
-import { buildSamples } from './zzfx_fork.mjs';
-
-export const getZZFX = (value, t) => {
-  let {
-    s,
-    note = 36,
-    freq,
-    //
-    zrand = 0,
-    attack = 0,
-    decay = 0,
-    sustain = 0.8,
-    release = 0.1,
-    curve = 1,
-    slide = 0,
-    deltaSlide = 0,
-    pitchJump = 0,
-    pitchJumpTime = 0,
-    lfo = 0,
-    znoise = 0,
-    zmod = 0,
-    zcrush = 0,
-    zdelay = 0,
-    tremolo = 0,
-    duration = 0.2,
-    zzfx,
-  } = value;
-  const sustainTime = Math.max(duration - attack - decay, 0);
-  if (typeof note === 'string') {
-    note = noteToMidi(note); // e.g. c3 => 48
-  }
-  // get frequency
-  if (!freq && typeof note === 'number') {
-    freq = midiToFreq(note);
-  }
-  s = s.replace('z_', '');
-  const shape = ['sine', 'triangle', 'sawtooth', 'tan', 'noise'].indexOf(s) || 0;
-  curve = s === 'square' ? 0 : curve;
-
-  const params = zzfx || [
-    0.25, // volume
-    zrand,
-    freq,
-    attack,
-    sustainTime,
-    release,
-    shape,
-    curve,
-    slide,
-    deltaSlide,
-    pitchJump,
-    pitchJumpTime,
-    lfo,
-    znoise,
-    zmod,
-    zcrush,
-    zdelay,
-    sustain, // sustain volume!
-    decay,
-    tremolo,
-  ];
-  // console.log(redableZZFX(params));
-
-  const samples = /* ZZFX. */ buildSamples(...params);
-  const context = getAudioContext();
-  const buffer = context.createBuffer(1, samples.length, context.sampleRate);
-  buffer.getChannelData(0).set(samples);
-  const source = getAudioContext().createBufferSource();
-  source.buffer = buffer;
-  source.start(t);
-  return {
-    node: source,
-  };
-};
-
-export function registerZZFXSounds() {
-  ['zzfx', 'z_sine', 'z_sawtooth', 'z_triangle', 'z_square', 'z_tan', 'z_noise'].forEach((wave) => {
-    registerSound(
-      wave,
-      (t, value, onended) => {
-        const { node: o } = getZZFX({ s: wave, ...value }, t);
-        o.onended = () => {
-          o.disconnect();
-          onended();
-        };
-        return {
-          node: o,
-          stop: () => {},
-        };
-      },
-      { type: 'synth', prebake: true },
-    );
-  });
-}
-
-// just for debugging
-function redableZZFX(params) {
-  const paramOrder = [
-    'volume',
-    'zrand',
-    'frequency',
-    'attack',
-    'sustain',
-    'release',
-    'shape',
-    'curve',
-    'slide',
-    'deltaSlide',
-    'pitchJump',
-    'pitchJumpTime',
-    'lfo',
-    'noise',
-    'zmod',
-    'zcrush',
-    'zdelay',
-    'sustainVolume',
-    'decay',
-    'tremolo',
-  ];
-  return Object.fromEntries(paramOrder.map((param, i) => [param, params[i]]));
-}

packages/superdough/zzfx_fork.mjs

@@ -1,120 +0,0 @@
-import { getAudioContext } from './superdough.mjs';
-
-// https://github.com/KilledByAPixel/ZzFX/blob/master/ZzFX.js#L85C5-L180C6
-// changes: replaced this.volume with 1 + using sampleRate from getAudioContext()
-export function buildSamples(
-  volume = 1,
-  randomness = 0.05,
-  frequency = 220,
-  attack = 0,
-  sustain = 0,
-  release = 0.1,
-  shape = 0,
-  shapeCurve = 1,
-  slide = 0,
-  deltaSlide = 0,
-  pitchJump = 0,
-  pitchJumpTime = 0,
-  repeatTime = 0,
-  noise = 0,
-  modulation = 0,
-  bitCrush = 0,
-  delay = 0,
-  sustainVolume = 1,
-  decay = 0,
-  tremolo = 0,
-) {
-  // init parameters
-  let PI2 = Math.PI * 2,
-    sampleRate = getAudioContext().sampleRate,
-    sign = (v) => (v > 0 ? 1 : -1),
-    startSlide = (slide *= (500 * PI2) / sampleRate / sampleRate),
-    startFrequency = (frequency *= ((1 + randomness * 2 * Math.random() - randomness) * PI2) / sampleRate),
-    b = [],
-    t = 0,
-    tm = 0,
-    i = 0,
-    j = 1,
-    r = 0,
-    c = 0,
-    s = 0,
-    f,
-    length;
-
-  // scale by sample rate
-  attack = attack * sampleRate + 9; // minimum attack to prevent pop
-  decay *= sampleRate;
-  sustain *= sampleRate;
-  release *= sampleRate;
-  delay *= sampleRate;
-  deltaSlide *= (500 * PI2) / sampleRate ** 3;
-  modulation *= PI2 / sampleRate;
-  pitchJump *= PI2 / sampleRate;
-  pitchJumpTime *= sampleRate;
-  repeatTime = (repeatTime * sampleRate) | 0;
-
-  // generate waveform
-  for (length = (attack + decay + sustain + release + delay) | 0; i < length; b[i++] = s) {
-    if (!(++c % ((bitCrush * 100) | 0))) {
-      // bit crush
-      s = shape
-        ? shape > 1
-          ? shape > 2
-            ? shape > 3 // wave shape
-              ? Math.sin((t % PI2) ** 3) // 4 noise
-              : Math.max(Math.min(Math.tan(t), 1), -1) // 3 tan
-            : 1 - (((((2 * t) / PI2) % 2) + 2) % 2) // 2 saw
-          : 1 - 4 * Math.abs(Math.round(t / PI2) - t / PI2) // 1 triangle
-        : Math.sin(t); // 0 sin
-
-      s =
-        (repeatTime
-          ? 1 - tremolo + tremolo * Math.sin((PI2 * i) / repeatTime) // tremolo
-          : 1) *
-        sign(s) *
-        Math.abs(s) ** shapeCurve * // curve 0=square, 2=pointy
-        volume *
-        1 * // envelope
-        (i < attack
-          ? i / attack // attack
-          : i < attack + decay // decay
-          ? 1 - ((i - attack) / decay) * (1 - sustainVolume) // decay falloff
-          : i < attack + decay + sustain // sustain
-          ? sustainVolume // sustain volume
-          : i < length - delay // release
-          ? ((length - i - delay) / release) * // release falloff
-            sustainVolume // release volume
-          : 0); // post release
-
-      s = delay
-        ? s / 2 +
-          (delay > i
-            ? 0 // delay
-            : ((i < length - delay ? 1 : (length - i) / delay) * // release delay
-                b[(i - delay) | 0]) /
-              2)
-        : s; // sample delay
-    }
-
-    f =
-      (frequency += slide += deltaSlide) * // frequency
-      Math.cos(modulation * tm++); // modulation
-    t += f - f * noise * (1 - (((Math.sin(i) + 1) * 1e9) % 2)); // noise
-
-    if (j && ++j > pitchJumpTime) {
-      // pitch jump
-      frequency += pitchJump; // apply pitch jump
-      startFrequency += pitchJump; // also apply to start
-      j = 0; // stop pitch jump time
-    }
-
-    if (repeatTime && !(++r % repeatTime)) {
-      // repeat
-      frequency = startFrequency; // reset frequency
-      slide = startSlide; // reset slide
-      j ||= 1; // reset pitch jump time
-    }
-  }
-
-  return b;
-}

packages/tonal/package.json

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

packages/transpiler/package.json

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

packages/transpiler/transpiler.mjs

@@ -5,7 +5,7 @@ import { isNoteWithOctave } from '@strudel.cycles/core';
 import { getLeafLocations } from '@strudel.cycles/mini';
 
 export function transpiler(input, options = {}) {
-  const { wrapAsync = false, addReturn = true, emitMiniLocations = true, emitWidgets = true } = options;
+  const { wrapAsync = false, addReturn = true, emitMiniLocations = true } = options;
 
   let ast = parse(input, {
     ecmaVersion: 2022,
@@ -16,9 +16,9 @@ export function transpiler(input, options = {}) {
   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);
   };
-  let widgets = [];
 
   walk(ast, {
     enter(node, parent /* , prop, index */) {
@@ -35,18 +35,6 @@ export function transpiler(input, options = {}) {
         emitMiniLocations && collectMiniLocations(value, node);
         return this.replace(miniWithLocation(value, node));
       }
-      if (isWidgetFunction(node)) {
-        emitWidgets &&
-          widgets.push({
-            from: node.arguments[0].start,
-            to: node.arguments[0].end,
-            value: node.arguments[0].raw, // don't use value!
-            min: node.arguments[1]?.value ?? 0,
-            max: node.arguments[2]?.value ?? 1,
-            step: node.arguments[3]?.value,
-          });
-        return this.replace(widgetWithLocation(node));
-      }
       // TODO: remove pseudo note variables?
       if (node.type === 'Identifier' && isNoteWithOctave(node.name)) {
         this.skip();
@@ -76,14 +64,15 @@ export function transpiler(input, options = {}) {
   if (!emitMiniLocations) {
     return { output };
   }
-  return { output, miniLocations, widgets };
+  return { output, miniLocations };
 }
 
 function isStringWithDoubleQuotes(node, locations, code) {
-  if (node.type !== 'Literal') {
+  const { raw, type } = node;
+  if (type !== 'Literal') {
     return false;
   }
-  return node.raw[0] === '"';
+  return raw[0] === '"';
 }
 
 function isBackTickString(node, parent) {
@@ -105,22 +94,3 @@ function miniWithLocation(value, node) {
     optional: false,
   };
 }
-
-// these functions are connected to @strudel/codemirror -> slider.mjs
-// maybe someday there will be pluggable transpiler functions, then move this there
-function isWidgetFunction(node) {
-  return node.type === 'CallExpression' && node.callee.name === 'slider';
-}
-
-function widgetWithLocation(node) {
-  const id = 'slider_' + node.arguments[0].start; // use loc of first arg for id
-  // add loc as identifier to first argument
-  // the sliderWithID function is assumed to be sliderWithID(id, value, min?, max?)
-  node.arguments.unshift({
-    type: 'Literal',
-    value: id,
-    raw: id,
-  });
-  node.callee.name = 'sliderWithID';
-  return node;
-}

packages/web/package.json

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

packages/webaudio/README.md

@@ -1,7 +1,6 @@
 # @strudel.cycles/webaudio
 
 This package contains helpers to make music with strudel and the Web Audio API.
-It is a thin binding to [superdough](https://www.npmjs.com/package/superdough).
 
 ## Install
 

packages/webaudio/helpers.mjs

@@ -0,0 +1,70 @@
+import { getAudioContext } from './webaudio.mjs';
+
+export function gainNode(value) {
+  const node = getAudioContext().createGain();
+  node.gain.value = value;
+  return node;
+}
+
+export const getOscillator = ({ s, freq, t }) => {
+  // make oscillator
+  const o = getAudioContext().createOscillator();
+  o.type = s || 'triangle';
+  o.frequency.value = Number(freq);
+  o.start(t);
+  //o.stop(t + duration + release);
+  const stop = (time) => o.stop(time);
+  return { node: o, stop };
+};
+
+// alternative to getADSR returning the gain node and a stop handle to trigger the release anytime in the future
+export const getEnvelope = (attack, decay, sustain, release, velocity, begin) => {
+  const gainNode = getAudioContext().createGain();
+  gainNode.gain.setValueAtTime(0, begin);
+  gainNode.gain.linearRampToValueAtTime(velocity, begin + attack); // attack
+  gainNode.gain.linearRampToValueAtTime(sustain * velocity, begin + attack + decay); // sustain start
+  // sustain end
+  return {
+    node: gainNode,
+    stop: (t) => {
+      //if (typeof gainNode.gain.cancelAndHoldAtTime === 'function') {
+      // gainNode.gain.cancelAndHoldAtTime(t); // this seems to release instantly....
+      // see https://discord.com/channels/779427371270275082/937365093082079272/1086053607360712735
+      //} else {
+      // firefox: this will glitch when the sustain has not been reached yet at the time of release
+      gainNode.gain.setValueAtTime(sustain * velocity, t);
+      //}
+      gainNode.gain.linearRampToValueAtTime(0, t + release);
+    },
+  };
+};
+
+export const getADSR = (attack, decay, sustain, release, velocity, begin, end) => {
+  const gainNode = getAudioContext().createGain();
+  gainNode.gain.setValueAtTime(0, begin);
+  gainNode.gain.linearRampToValueAtTime(velocity, begin + attack); // attack
+  gainNode.gain.linearRampToValueAtTime(sustain * velocity, begin + attack + decay); // sustain start
+  gainNode.gain.setValueAtTime(sustain * velocity, end); // sustain end
+  gainNode.gain.linearRampToValueAtTime(0, end + release); // release
+  // for some reason, using exponential ramping creates little cracklings
+  /* let t = begin;
+  gainNode.gain.setValueAtTime(0, t);
+  gainNode.gain.exponentialRampToValueAtTime(velocity, (t += attack));
+  const sustainGain = Math.max(sustain * velocity, 0.001);
+  gainNode.gain.exponentialRampToValueAtTime(sustainGain, (t += decay));
+  if (end - begin < attack + decay) {
+    gainNode.gain.cancelAndHoldAtTime(end);
+  } else {
+    gainNode.gain.setValueAtTime(sustainGain, end);
+  }
+  gainNode.gain.exponentialRampToValueAtTime(0.001, end + release); // release */
+  return gainNode;
+};
+
+export const getFilter = (type, frequency, Q) => {
+  const filter = getAudioContext().createBiquadFilter();
+  filter.type = type;
+  filter.frequency.value = frequency;
+  filter.Q.value = Q;
+  return filter;
+};

packages/webaudio/index.mjs

@@ -5,5 +5,6 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 export * from './webaudio.mjs';
-export * from './scope.mjs';
-export * from 'superdough';
+export * from './sampler.mjs';
+export * from './helpers.mjs';
+export * from './synth.mjs';

packages/webaudio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/webaudio",
-  "version": "0.9.0",
+  "version": "0.8.2",
   "description": "Web Audio helpers for Strudel",
   "main": "index.mjs",
   "type": "module",
@@ -35,7 +35,7 @@
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
     "@strudel.cycles/core": "workspace:*",
-    "superdough": "workspace:*"
+    "nanostores": "^0.8.1"
   },
   "devDependencies": {
     "vite": "^4.3.3"

packages/webaudio/reverb.mjs

@@ -0,0 +1,23 @@
+if (typeof AudioContext !== 'undefined') {
+  AudioContext.prototype.impulseResponse = function (duration, channels = 1) {
+    const length = this.sampleRate * duration;
+    const impulse = this.createBuffer(channels, length, this.sampleRate);
+    const IR = impulse.getChannelData(0);
+    for (let i = 0; i < length; i++) IR[i] = (2 * Math.random() - 1) * Math.pow(1 - i / length, duration);
+    return impulse;
+  };
+
+  AudioContext.prototype.createReverb = function (duration) {
+    const convolver = this.createConvolver();
+    convolver.setDuration = (d) => {
+      convolver.buffer = this.impulseResponse(d);
+      convolver.duration = duration;
+      return convolver;
+    };
+    convolver.setDuration(duration);
+    return convolver;
+  };
+}
+
+// TODO: make the reverb more exciting
+// check out https://blog.gskinner.com/archives/2019/02/reverb-web-audio-api.html

packages/webaudio/sampler.mjs

@@ -1,7 +1,6 @@
-import { noteToMidi, valueToMidi } from './util.mjs';
+import { logger, noteToMidi, valueToMidi } from '@strudel.cycles/core';
 import { getAudioContext, registerSound } from './index.mjs';
 import { getEnvelope } from './helpers.mjs';
-import { logger } from './logger.mjs';
 
 const bufferCache = {}; // string: Promise<ArrayBuffer>
 const loadCache = {}; // string: Promise<ArrayBuffer>
@@ -196,7 +195,7 @@ export const samples = async (sampleMap, baseUrl = sampleMap._base || '', option
 const cutGroups = [];
 
 export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
-  let {
+  const {
     s,
     freq,
     unit,
@@ -207,9 +206,7 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
     n = 0,
     note,
     speed = 1, // sample playback speed
-    loopBegin = 0,
     begin = 0,
-    loopEnd = 1,
     end = 1,
   } = value;
   // load sample
@@ -217,7 +214,6 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
     // no playback
     return;
   }
-  loop = s.startsWith('wt_') ? 1 : value.loop;
   const ac = getAudioContext();
   // destructure adsr here, because the default should be different for synths and samples
   const { attack = 0.001, decay = 0.001, sustain = 1, release = 0.001 } = value;
@@ -245,12 +241,19 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
   // rather than the current playback rate, so even if the sound is playing at twice its normal speed,
   // the midway point through a 10-second audio buffer is still 5."
   const offset = begin * bufferSource.buffer.duration;
-  if (loop) {
-    bufferSource.loop = true;
-    bufferSource.loopStart = loopBegin * bufferSource.buffer.duration - offset;
-    bufferSource.loopEnd = loopEnd * bufferSource.buffer.duration - offset;
-  }
   bufferSource.start(time, offset);
+  const bufferDuration = bufferSource.buffer.duration / bufferSource.playbackRate.value;
+  /*if (loop) {
+    // TODO: idea for loopBegin / loopEnd
+    // if one of [loopBegin,loopEnd] is <= 1, interpret it as normlized
+    // if [loopBegin,loopEnd] is bigger >= 1, interpret it as sample number
+    // this will simplify perfectly looping things, while still keeping the normalized option
+    // the only drawback is that looping between samples 0 and 1 is not possible (which is not real use case)
+    bufferSource.loop = true;
+    bufferSource.loopStart = offset;
+    bufferSource.loopEnd = offset + duration;
+    duration = loop * duration;
+  }*/
   const { node: envelope, stop: releaseEnvelope } = getEnvelope(attack, decay, sustain, release, 1, t);
   bufferSource.connect(envelope);
   const out = ac.createGain(); // we need a separate gain for the cutgroups because firefox...
@@ -261,10 +264,9 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
     out.disconnect();
     onended();
   };
-  const stop = (endTime, playWholeBuffer = clip === undefined && loop === undefined) => {
+  const stop = (endTime, playWholeBuffer = clip === undefined) => {
     let releaseTime = endTime;
     if (playWholeBuffer) {
-      const bufferDuration = bufferSource.buffer.duration / bufferSource.playbackRate.value;
       releaseTime = t + (end - begin) * bufferDuration;
     }
     bufferSource.stop(releaseTime + release);

packages/webaudio/scope.mjs

@@ -1,88 +0,0 @@
-import { Pattern, getDrawContext, clamp } from '@strudel.cycles/core';
-import { analyser, getAnalyzerData } from 'superdough';
-
-export function drawTimeScope(
-  analyser,
-  { align = true, color = 'white', thickness = 3, scale = 0.25, pos = 0.75, next = 1, trigger = 0 } = {},
-) {
-  const ctx = getDrawContext();
-  const dataArray = getAnalyzerData('time');
-
-  ctx.lineWidth = thickness;
-  ctx.strokeStyle = color;
-
-  ctx.beginPath();
-  let canvas = ctx.canvas;
-
-  const bufferSize = analyser.frequencyBinCount;
-  let triggerIndex = align
-    ? Array.from(dataArray).findIndex((v, i, arr) => i && arr[i - 1] > -trigger && v <= -trigger)
-    : 0;
-  triggerIndex = Math.max(triggerIndex, 0); // fallback to 0 when no trigger is found
-
-  const sliceWidth = (canvas.width * 1.0) / bufferSize;
-  let x = 0;
-
-  for (let i = triggerIndex; i < bufferSize; i++) {
-    const v = dataArray[i] + 1;
-    const y = (scale * (v - 1) + pos) * canvas.height;
-
-    if (i === 0) {
-      ctx.moveTo(x, y);
-    } else {
-      ctx.lineTo(x, y);
-    }
-    x += sliceWidth;
-  }
-  ctx.stroke();
-}
-
-export function drawFrequencyScope(
-  analyser,
-  { color = 'white', scale = 0.25, pos = 0.75, lean = 0.5, min = -150, max = 0 } = {},
-) {
-  const dataArray = getAnalyzerData('frequency');
-  const ctx = getDrawContext();
-  const canvas = ctx.canvas;
-
-  ctx.fillStyle = color;
-  const bufferSize = analyser.frequencyBinCount;
-  const sliceWidth = (canvas.width * 1.0) / bufferSize;
-
-  let x = 0;
-  for (let i = 0; i < bufferSize; i++) {
-    const normalized = clamp((dataArray[i] - min) / (max - min), 0, 1);
-    const v = normalized * scale;
-    const h = v * canvas.height;
-    const y = (pos - v * lean) * canvas.height;
-
-    ctx.fillRect(x, y, Math.max(sliceWidth, 1), h);
-    x += sliceWidth;
-  }
-}
-
-function clearScreen(smear = 0, smearRGB = `0,0,0`) {
-  const ctx = getDrawContext();
-  if (!smear) {
-    ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-  } else {
-    ctx.fillStyle = `rgba(${smearRGB},${1 - smear})`;
-    ctx.fillRect(0, 0, ctx.canvas.width, ctx.canvas.height);
-  }
-}
-
-Pattern.prototype.fscope = function (config = {}) {
-  return this.analyze(1).draw(() => {
-    clearScreen(config.smear);
-    analyser && drawFrequencyScope(analyser, config);
-  });
-};
-
-Pattern.prototype.tscope = function (config = {}) {
-  return this.analyze(1).draw(() => {
-    clearScreen(config.smear);
-    analyser && drawTimeScope(analyser, config);
-  });
-};
-
-Pattern.prototype.scope = Pattern.prototype.tscope;

packages/webaudio/synth.mjs

@@ -0,0 +1,44 @@
+import { midiToFreq, noteToMidi } from '@strudel.cycles/core';
+import { registerSound } from './webaudio.mjs';
+import { getOscillator, gainNode, getEnvelope } from './helpers.mjs';
+
+export function registerSynthSounds() {
+  ['sine', 'square', 'triangle', 'sawtooth'].forEach((wave) => {
+    registerSound(
+      wave,
+      (t, value, onended) => {
+        // destructure adsr here, because the default should be different for synths and samples
+        const { attack = 0.001, decay = 0.05, sustain = 0.6, release = 0.01 } = value;
+        let { n, note, freq } = value;
+        // with synths, n and note are the same thing
+        n = note || n || 36;
+        if (typeof n === 'string') {
+          n = noteToMidi(n); // e.g. c3 => 48
+        }
+        // get frequency
+        if (!freq && typeof n === 'number') {
+          freq = midiToFreq(n); // + 48);
+        }
+        // maybe pull out the above frequency resolution?? (there is also getFrequency but it has no default)
+        // make oscillator
+        const { node: o, stop } = getOscillator({ t, s: wave, freq });
+        const g = gainNode(0.3);
+        // envelope
+        const { node: envelope, stop: releaseEnvelope } = getEnvelope(attack, decay, sustain, release, 1, t);
+        o.onended = () => {
+          o.disconnect();
+          g.disconnect();
+          onended();
+        };
+        return {
+          node: o.connect(g).connect(envelope),
+          stop: (releaseTime) => {
+            releaseEnvelope(releaseTime);
+            stop(releaseTime + release);
+          },
+        };
+      },
+      { type: 'synth', prebake: true },
+    );
+  });
+}

packages/webaudio/webaudio.mjs

@@ -5,21 +5,247 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import * as strudel from '@strudel.cycles/core';
-import { superdough, getAudioContext, setLogger, doughTrigger } from 'superdough';
+import './feedbackdelay.mjs';
+import './reverb.mjs';
 const { Pattern, logger } = strudel;
+import './vowel.mjs';
+import workletsUrl from './worklets.mjs?url';
+import { getFilter, gainNode } from './helpers.mjs';
+import { map } from 'nanostores';
 
-setLogger(logger);
+export const soundMap = map();
+export function registerSound(key, onTrigger, data = {}) {
+  soundMap.setKey(key, { onTrigger, data });
+}
+export function getSound(s) {
+  return soundMap.get()[s];
+}
+export const resetLoadedSounds = () => soundMap.set({});
 
-const hap2value = (hap) => {
-  hap.ensureObjectValue();
-  return { ...hap.value, velocity: hap.context.velocity };
+let audioContext;
+export const getAudioContext = () => {
+  if (!audioContext) {
+    audioContext = new AudioContext();
+  }
+  return audioContext;
 };
 
-// TODO: bind logger
-export const webaudioOutputTrigger = (t, hap, ct, cps) => superdough(hap2value(hap), t - ct, hap.duration / cps, cps);
-export const webaudioOutput = (hap, deadline, hapDuration) => superdough(hap2value(hap), deadline, hapDuration);
+let destination;
+const getDestination = () => {
+  const ctx = getAudioContext();
+  if (!destination) {
+    destination = ctx.createGain();
+    destination.connect(ctx.destination);
+  }
+  return destination;
+};
+
+export const panic = () => {
+  getDestination().gain.linearRampToValueAtTime(0, getAudioContext().currentTime + 0.01);
+  destination = null;
+};
+
+let workletsLoading;
+function loadWorklets() {
+  if (workletsLoading) {
+    return workletsLoading;
+  }
+  workletsLoading = getAudioContext().audioWorklet.addModule(workletsUrl);
+  return workletsLoading;
+}
+
+function getWorklet(ac, processor, params) {
+  const node = new AudioWorkletNode(ac, processor);
+  Object.entries(params).forEach(([key, value]) => {
+    node.parameters.get(key).value = value;
+  });
+  return node;
+}
+
+// this function should be called on first user interaction (to avoid console warning)
+export async function initAudio() {
+  if (typeof window !== 'undefined') {
+    try {
+      await getAudioContext().resume();
+      await loadWorklets();
+    } catch (err) {
+      console.warn('could not load AudioWorklet effects coarse, crush and shape', err);
+    }
+  }
+}
+
+export async function initAudioOnFirstClick() {
+  return new Promise((resolve) => {
+    document.addEventListener('click', async function listener() {
+      await initAudio();
+      resolve();
+      document.removeEventListener('click', listener);
+    });
+  });
+}
+
+let delays = {};
+const maxfeedback = 0.98;
+function getDelay(orbit, delaytime, delayfeedback, t) {
+  if (delayfeedback > maxfeedback) {
+    logger(`delayfeedback was clamped to ${maxfeedback} to save your ears`);
+  }
+  delayfeedback = strudel.clamp(delayfeedback, 0, 0.98);
+  if (!delays[orbit]) {
+    const ac = getAudioContext();
+    const dly = ac.createFeedbackDelay(1, delaytime, delayfeedback);
+    dly.start?.(t); // for some reason, this throws when audion extension is installed..
+    dly.connect(getDestination());
+    delays[orbit] = dly;
+  }
+  delays[orbit].delayTime.value !== delaytime && delays[orbit].delayTime.setValueAtTime(delaytime, t);
+  delays[orbit].feedback.value !== delayfeedback && delays[orbit].feedback.setValueAtTime(delayfeedback, t);
+  return delays[orbit];
+}
+
+let reverbs = {};
+function getReverb(orbit, duration = 2) {
+  if (!reverbs[orbit]) {
+    const ac = getAudioContext();
+    const reverb = ac.createReverb(duration);
+    reverb.connect(getDestination());
+    reverbs[orbit] = reverb;
+  }
+  if (reverbs[orbit].duration !== duration) {
+    reverbs[orbit] = reverbs[orbit].setDuration(duration);
+    reverbs[orbit].duration = duration;
+  }
+  return reverbs[orbit];
+}
+
+function effectSend(input, effect, wet) {
+  const send = gainNode(wet);
+  input.connect(send);
+  send.connect(effect);
+  return send;
+}
+
+// export const webaudioOutput = async (t, hap, ct, cps) => {
+export const webaudioOutput = async (hap, deadline, hapDuration, cps) => {
+  const ac = getAudioContext();
+  hap.ensureObjectValue();
+
+  // calculate absolute time
+  let t = ac.currentTime + deadline;
+  // destructure
+  let {
+    s = 'triangle',
+    bank,
+    source,
+    gain = 0.8,
+    // low pass
+    cutoff,
+    resonance = 1,
+    // high pass
+    hcutoff,
+    hresonance = 1,
+    // band pass
+    bandf,
+    bandq = 1,
+    //
+    coarse,
+    crush,
+    shape,
+    pan,
+    vowel,
+    delay = 0,
+    delayfeedback = 0.5,
+    delaytime = 0.25,
+    orbit = 1,
+    room,
+    size = 2,
+  } = hap.value;
+  const { velocity = 1 } = hap.context;
+  gain *= velocity; // legacy fix for velocity
+  let toDisconnect = []; // audio nodes that will be disconnected when the source has ended
+  const onended = () => {
+    toDisconnect.forEach((n) => n?.disconnect());
+  };
+  if (bank && s) {
+    s = `${bank}_${s}`;
+  }
+  // get source AudioNode
+  let sourceNode;
+  if (source) {
+    sourceNode = source(t, hap.value, hapDuration);
+  } else if (getSound(s)) {
+    const { onTrigger } = getSound(s);
+    const soundHandle = await onTrigger(t, hap.value, onended);
+    if (soundHandle) {
+      sourceNode = soundHandle.node;
+      soundHandle.stop(t + hapDuration);
+    }
+  } else {
+    throw new Error(`sound ${s} not found! Is it loaded?`);
+  }
+  if (!sourceNode) {
+    // if onTrigger does not return anything, we will just silently skip
+    // this can be used for things like speed(0) in the sampler
+    return;
+  }
+  if (ac.currentTime > t) {
+    logger('[webaudio] skip hap: still loading', ac.currentTime - t);
+    return;
+  }
+  const chain = []; // audio nodes that will be connected to each other sequentially
+  chain.push(sourceNode);
+
+  // gain stage
+  chain.push(gainNode(gain));
+
+  // filters
+  cutoff !== undefined && chain.push(getFilter('lowpass', cutoff, resonance));
+  hcutoff !== undefined && chain.push(getFilter('highpass', hcutoff, hresonance));
+  bandf !== undefined && chain.push(getFilter('bandpass', bandf, bandq));
+  vowel !== undefined && chain.push(ac.createVowelFilter(vowel));
+
+  // effects
+  coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse }));
+  crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
+  shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape }));
+
+  // panning
+  if (pan !== undefined) {
+    const panner = ac.createStereoPanner();
+    panner.pan.value = 2 * pan - 1;
+    chain.push(panner);
+  }
+
+  // last gain
+  const post = gainNode(1);
+  chain.push(post);
+  post.connect(getDestination());
+
+  // delay
+  let delaySend;
+  if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
+    const delyNode = getDelay(orbit, delaytime, delayfeedback, t);
+    delaySend = effectSend(post, delyNode, delay);
+  }
+  // reverb
+  let reverbSend;
+  if (room > 0 && size > 0) {
+    const reverbNode = getReverb(orbit, size);
+    reverbSend = effectSend(post, reverbNode, room);
+  }
+
+  // connect chain elements together
+  chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);
+
+  // toDisconnect = all the node that should be disconnected in onended callback
+  // this is crucial for performance
+  toDisconnect = chain.concat([delaySend, reverbSend]);
+};
+
+export const webaudioOutputTrigger = (t, hap, ct, cps) => webaudioOutput(hap, t - ct, hap.duration / cps, cps);
 
 Pattern.prototype.webaudio = function () {
+  // TODO: refactor (t, hap, ct, cps) to (hap, deadline, duration) ?
   return this.onTrigger(webaudioOutputTrigger);
 };
 
@@ -35,7 +261,3 @@ export function webaudioScheduler(options = {}) {
     onTrigger: strudel.getTrigger({ defaultOutput, getTime }),
   });
 }
-
-Pattern.prototype.dough = function () {
-  return this.onTrigger(doughTrigger, 1);
-};

packages/xen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/xen",
-  "version": "0.9.0",
+  "version": "0.8.0",
   "description": "Xenharmonic API for strudel",
   "main": "index.mjs",
   "publishConfig": {

pnpm-lock.yaml

@@ -176,15 +176,6 @@ importers:
         specifier: ^4.3.3
         version: 4.3.3(@types/node@18.16.3)
 
-  packages/desktopbridge:
-    dependencies:
-      '@strudel.cycles/core':
-        specifier: workspace:*
-        version: link:../core
-      '@tauri-apps/api':
-        specifier: ^1.4.0
-        version: 1.4.0
-
   packages/embed: {}
 
   packages/midi:
@@ -395,26 +386,6 @@ importers:
         specifier: ^4.3.3
         version: 4.3.3(@types/node@18.16.3)
 
-  packages/superdough:
-    dependencies:
-      nanostores:
-        specifier: ^0.8.1
-        version: 0.8.1
-    devDependencies:
-      vite:
-        specifier: ^4.3.3
-        version: 4.3.3(@types/node@18.16.3)
-
-  packages/superdough/example:
-    dependencies:
-      superdough:
-        specifier: workspace:*
-        version: link:..
-    devDependencies:
-      vite:
-        specifier: ^4.4.5
-        version: 4.4.5(@types/node@18.16.3)
-
   packages/tonal:
     dependencies:
       '@strudel.cycles/core':
@@ -499,9 +470,9 @@ importers:
       '@strudel.cycles/core':
         specifier: workspace:*
         version: link:../core
-      superdough:
-        specifier: workspace:*
-        version: link:../superdough
+      nanostores:
+        specifier: ^0.8.1
+        version: 0.8.1
     devDependencies:
       vite:
         specifier: ^4.3.3
@@ -527,7 +498,7 @@ importers:
         version: 4.17.0
       '@astrojs/mdx':
         specifier: ^0.19.0
-        version: 0.19.0(astro@2.3.2)(rollup@3.28.0)
+        version: 0.19.0(astro@2.3.2)(rollup@3.21.0)
       '@astrojs/react':
         specifier: ^2.1.1
         version: 2.1.1(@types/react-dom@18.2.1)(@types/react@18.2.0)(react-dom@18.2.0)(react@18.2.0)
@@ -588,12 +559,6 @@ importers:
       '@strudel.cycles/xen':
         specifier: workspace:*
         version: link:../packages/xen
-      '@strudel/codemirror':
-        specifier: workspace:*
-        version: link:../packages/codemirror
-      '@strudel/desktopbridge':
-        specifier: workspace:*
-        version: link:../packages/desktopbridge
       '@supabase/supabase-js':
         specifier: ^2.21.0
         version: 2.21.0
@@ -603,9 +568,6 @@ importers:
       '@tailwindcss/typography':
         specifier: ^0.5.8
         version: 0.5.9(tailwindcss@3.3.2)
-      '@tauri-apps/api':
-        specifier: ^1.4.0
-        version: 1.4.0
       '@types/node':
         specifier: ^18.16.3
         version: 18.16.3
@@ -666,7 +628,7 @@ importers:
         version: 3.0.3
       vite-plugin-pwa:
         specifier: ^0.14.7
-        version: 0.14.7(vite@4.4.5)(workbox-build@6.5.4)(workbox-window@6.5.4)
+        version: 0.14.7(vite@4.3.3)(workbox-build@6.5.4)(workbox-window@6.5.4)
       workbox-window:
         specifier: ^6.5.4
         version: 6.5.4
@@ -887,14 +849,14 @@ packages:
     transitivePeerDependencies:
       - supports-color
 
-  /@astrojs/mdx@0.19.0(astro@2.3.2)(rollup@3.28.0):
+  /@astrojs/mdx@0.19.0(astro@2.3.2)(rollup@3.21.0):
     resolution: {integrity: sha512-McFpMV+npinIEKnY5t9hsdzLd76g78GgIRUPxem2OeXPNB8xr2pNS28GeU0+6Pn5STnB+sgcyyeqXLgzauOlMQ==}
     engines: {node: '>=16.12.0'}
     dependencies:
       '@astrojs/markdown-remark': 2.1.4(astro@2.3.2)
       '@astrojs/prism': 2.1.1
       '@mdx-js/mdx': 2.3.0
-      '@mdx-js/rollup': 2.3.0(rollup@3.28.0)
+      '@mdx-js/rollup': 2.3.0(rollup@3.21.0)
       acorn: 8.8.2
       es-module-lexer: 1.2.1
       estree-util-visit: 1.2.1
@@ -1429,7 +1391,6 @@ packages:
   /@babel/plugin-proposal-async-generator-functions@7.20.7(@babel/core@7.21.5):
     resolution: {integrity: sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1445,7 +1406,6 @@ packages:
   /@babel/plugin-proposal-class-properties@7.18.6(@babel/core@7.21.5):
     resolution: {integrity: sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1459,7 +1419,6 @@ packages:
   /@babel/plugin-proposal-class-static-block@7.20.7(@babel/core@7.21.5):
     resolution: {integrity: sha512-AveGOoi9DAjUYYuUAG//Ig69GlazLnoyzMw68VCDux+c1tsnnH/OkYcpz/5xzMkEFC6UxjR5Gw1c+iY2wOGVeQ==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-static-block instead.
     peerDependencies:
       '@babel/core': ^7.12.0
     dependencies:
@@ -1474,7 +1433,6 @@ packages:
   /@babel/plugin-proposal-dynamic-import@7.18.6(@babel/core@7.21.5):
     resolution: {integrity: sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-dynamic-import instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1486,7 +1444,6 @@ packages:
   /@babel/plugin-proposal-export-namespace-from@7.18.9(@babel/core@7.21.5):
     resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-export-namespace-from instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1498,7 +1455,6 @@ packages:
   /@babel/plugin-proposal-json-strings@7.18.6(@babel/core@7.21.5):
     resolution: {integrity: sha512-lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-json-strings instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1510,7 +1466,6 @@ packages:
   /@babel/plugin-proposal-logical-assignment-operators@7.20.7(@babel/core@7.21.5):
     resolution: {integrity: sha512-y7C7cZgpMIjWlKE5T7eJwp+tnRYM89HmRvWM5EQuB5BoHEONjmQ8lSNmBUwOyy/GFRsohJED51YBF79hE1djug==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-logical-assignment-operators instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1522,7 +1477,6 @@ packages:
   /@babel/plugin-proposal-nullish-coalescing-operator@7.18.6(@babel/core@7.21.5):
     resolution: {integrity: sha512-wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-nullish-coalescing-operator instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1534,7 +1488,6 @@ packages:
   /@babel/plugin-proposal-numeric-separator@7.18.6(@babel/core@7.21.5):
     resolution: {integrity: sha512-ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-numeric-separator instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1546,7 +1499,6 @@ packages:
   /@babel/plugin-proposal-object-rest-spread@7.20.7(@babel/core@7.21.5):
     resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1561,7 +1513,6 @@ packages:
   /@babel/plugin-proposal-optional-catch-binding@7.18.6(@babel/core@7.21.5):
     resolution: {integrity: sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1573,7 +1524,6 @@ packages:
   /@babel/plugin-proposal-optional-chaining@7.20.7(@babel/core@7.21.5):
     resolution: {integrity: sha512-T+A7b1kfjtRM51ssoOfS1+wbyCVqorfyZhT99TvxxLMirPShD8CzKMRepMlCBGM5RpHMbn8s+5MMHnPstJH6mQ==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-chaining instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1586,7 +1536,6 @@ packages:
   /@babel/plugin-proposal-private-methods@7.18.6(@babel/core@7.21.5):
     resolution: {integrity: sha512-nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-methods instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1600,7 +1549,6 @@ packages:
   /@babel/plugin-proposal-private-property-in-object@7.20.5(@babel/core@7.21.5):
     resolution: {integrity: sha512-Vq7b9dUA12ByzB4EjQTPo25sFhY+08pQDBSZRtUAkj7lb7jahaHR5igera16QZ+3my1nYR4dKsNdYj5IjPHilQ==}
     engines: {node: '>=6.9.0'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -1616,7 +1564,6 @@ packages:
   /@babel/plugin-proposal-unicode-property-regex@7.18.6(@babel/core@7.21.5):
     resolution: {integrity: sha512-2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w==}
     engines: {node: '>=4'}
-    deprecated: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-unicode-property-regex instead.
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
@@ -2491,15 +2438,6 @@ packages:
     cpu: [arm64]
     os: [android]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-arm64@0.18.20:
-    resolution: {integrity: sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-    requiresBuild: true
     optional: true
 
   /@esbuild/android-arm@0.17.18:
@@ -2508,15 +2446,6 @@ packages:
     cpu: [arm]
     os: [android]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-arm@0.18.20:
-    resolution: {integrity: sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-    requiresBuild: true
     optional: true
 
   /@esbuild/android-x64@0.17.18:
@@ -2525,15 +2454,6 @@ packages:
     cpu: [x64]
     os: [android]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/android-x64@0.18.20:
-    resolution: {integrity: sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-    requiresBuild: true
     optional: true
 
   /@esbuild/darwin-arm64@0.17.18:
@@ -2542,15 +2462,6 @@ packages:
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/darwin-arm64@0.18.20:
-    resolution: {integrity: sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-    requiresBuild: true
     optional: true
 
   /@esbuild/darwin-x64@0.17.18:
@@ -2559,15 +2470,6 @@ packages:
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/darwin-x64@0.18.20:
-    resolution: {integrity: sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-    requiresBuild: true
     optional: true
 
   /@esbuild/freebsd-arm64@0.17.18:
@@ -2576,15 +2478,6 @@ packages:
     cpu: [arm64]
     os: [freebsd]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/freebsd-arm64@0.18.20:
-    resolution: {integrity: sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-    requiresBuild: true
     optional: true
 
   /@esbuild/freebsd-x64@0.17.18:
@@ -2593,15 +2486,6 @@ packages:
     cpu: [x64]
     os: [freebsd]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/freebsd-x64@0.18.20:
-    resolution: {integrity: sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-    requiresBuild: true
     optional: true
 
   /@esbuild/linux-arm64@0.17.18:
@@ -2610,15 +2494,6 @@ packages:
     cpu: [arm64]
     os: [linux]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm64@0.18.20:
-    resolution: {integrity: sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-    requiresBuild: true
     optional: true
 
   /@esbuild/linux-arm@0.17.18:
@@ -2627,15 +2502,6 @@ packages:
     cpu: [arm]
     os: [linux]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-arm@0.18.20:
-    resolution: {integrity: sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-    requiresBuild: true
     optional: true
 
   /@esbuild/linux-ia32@0.17.18:
@@ -2644,15 +2510,6 @@ packages:
     cpu: [ia32]
     os: [linux]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-ia32@0.18.20:
-    resolution: {integrity: sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-    requiresBuild: true
     optional: true
 
   /@esbuild/linux-loong64@0.17.18:
@@ -2661,15 +2518,6 @@ packages:
     cpu: [loong64]
     os: [linux]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-loong64@0.18.20:
-    resolution: {integrity: sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-    requiresBuild: true
     optional: true
 
   /@esbuild/linux-mips64el@0.17.18:
@@ -2678,15 +2526,6 @@ packages:
     cpu: [mips64el]
     os: [linux]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-mips64el@0.18.20:
-    resolution: {integrity: sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-    requiresBuild: true
     optional: true
 
   /@esbuild/linux-ppc64@0.17.18:
@@ -2695,15 +2534,6 @@ packages:
     cpu: [ppc64]
     os: [linux]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-ppc64@0.18.20:
-    resolution: {integrity: sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-    requiresBuild: true
     optional: true
 
   /@esbuild/linux-riscv64@0.17.18:
@@ -2712,15 +2542,6 @@ packages:
     cpu: [riscv64]
     os: [linux]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-riscv64@0.18.20:
-    resolution: {integrity: sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-    requiresBuild: true
     optional: true
 
   /@esbuild/linux-s390x@0.17.18:
@@ -2729,15 +2550,6 @@ packages:
     cpu: [s390x]
     os: [linux]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-s390x@0.18.20:
-    resolution: {integrity: sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-    requiresBuild: true
     optional: true
 
   /@esbuild/linux-x64@0.17.18:
@@ -2746,15 +2558,6 @@ packages:
     cpu: [x64]
     os: [linux]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/linux-x64@0.18.20:
-    resolution: {integrity: sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-    requiresBuild: true
     optional: true
 
   /@esbuild/netbsd-x64@0.17.18:
@@ -2763,15 +2566,6 @@ packages:
     cpu: [x64]
     os: [netbsd]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/netbsd-x64@0.18.20:
-    resolution: {integrity: sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-    requiresBuild: true
     optional: true
 
   /@esbuild/openbsd-x64@0.17.18:
@@ -2780,15 +2574,6 @@ packages:
     cpu: [x64]
     os: [openbsd]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/openbsd-x64@0.18.20:
-    resolution: {integrity: sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-    requiresBuild: true
     optional: true
 
   /@esbuild/sunos-x64@0.17.18:
@@ -2797,15 +2582,6 @@ packages:
     cpu: [x64]
     os: [sunos]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/sunos-x64@0.18.20:
-    resolution: {integrity: sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-    requiresBuild: true
     optional: true
 
   /@esbuild/win32-arm64@0.17.18:
@@ -2814,15 +2590,6 @@ packages:
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/win32-arm64@0.18.20:
-    resolution: {integrity: sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
     optional: true
 
   /@esbuild/win32-ia32@0.17.18:
@@ -2831,15 +2598,6 @@ packages:
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/win32-ia32@0.18.20:
-    resolution: {integrity: sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
     optional: true
 
   /@esbuild/win32-x64@0.17.18:
@@ -2848,15 +2606,6 @@ packages:
     cpu: [x64]
     os: [win32]
     requiresBuild: true
-    dev: true
-    optional: true
-
-  /@esbuild/win32-x64@0.18.20:
-    resolution: {integrity: sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
     optional: true
 
   /@eslint-community/eslint-utils@4.4.0(eslint@8.39.0):
@@ -3178,14 +2927,14 @@ packages:
       - supports-color
     dev: false
 
-  /@mdx-js/rollup@2.3.0(rollup@3.28.0):
+  /@mdx-js/rollup@2.3.0(rollup@3.21.0):
     resolution: {integrity: sha512-wLvRfJS/M4UmdqTd+WoaySEE7q4BIejYf1xAHXYvtT1du/1Tl/z2450Gg2+Hu7fh05KwRRiehiTP9Yc/Dtn0fA==}
     peerDependencies:
       rollup: '>=2'
     dependencies:
       '@mdx-js/mdx': 2.3.0
-      '@rollup/pluginutils': 5.0.2(rollup@3.28.0)
-      rollup: 3.28.0
+      '@rollup/pluginutils': 5.0.2(rollup@3.21.0)
+      rollup: 3.21.0
       source-map: 0.7.4
       vfile: 5.3.6
     transitivePeerDependencies:
@@ -3863,7 +3612,7 @@ packages:
       rollup: 3.12.0
     dev: true
 
-  /@rollup/pluginutils@5.0.2(rollup@3.28.0):
+  /@rollup/pluginutils@5.0.2(rollup@3.21.0):
     resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -3875,7 +3624,7 @@ packages:
       '@types/estree': 1.0.0
       estree-walker: 2.0.2
       picomatch: 2.3.1
-      rollup: 3.28.0
+      rollup: 3.21.0
     dev: false
 
   /@sigstore/protobuf-specs@0.1.0:
@@ -3977,11 +3726,6 @@ packages:
       tailwindcss: 3.3.2
     dev: false
 
-  /@tauri-apps/api@1.4.0:
-    resolution: {integrity: sha512-Jd6HPoTM1PZSFIzq7FB8VmMu3qSSyo/3lSwLpoapW+lQ41CL5Dow2KryLg+gyazA/58DRWI9vu/XpEeHK4uMdw==}
-    engines: {node: '>= 14.6.0', npm: '>= 6.6.0', yarn: '>= 1.19.1'}
-    dev: false
-
   /@tauri-apps/cli-darwin-arm64@1.4.0:
     resolution: {integrity: sha512-nA/ml0SfUt6/CYLVbHmT500Y+ijqsuv5+s9EBnVXYSLVg9kbPUZJJHluEYK+xKuOj6xzyuT/+rZFMRapmJD3jQ==}
     engines: {node: '>= 10'}
@@ -4810,7 +4554,7 @@ packages:
       vite-plugin-pwa: ^0.14.0
     dependencies:
       astro: 2.3.2(@types/node@18.16.3)
-      vite-plugin-pwa: 0.14.7(vite@4.4.5)(workbox-build@6.5.4)(workbox-window@6.5.4)
+      vite-plugin-pwa: 0.14.7(vite@4.3.3)(workbox-build@6.5.4)(workbox-window@6.5.4)
     dev: true
 
   /@vitejs/plugin-react@4.0.0(vite@4.3.3):
@@ -5292,14 +5036,13 @@ packages:
       typescript: 4.9.4
       unist-util-visit: 4.1.2
       vfile: 5.3.6
-      vite: 4.4.5(@types/node@18.16.3)
-      vitefu: 0.2.4(vite@4.4.5)
+      vite: 4.3.3(@types/node@18.16.3)
+      vitefu: 0.2.4(vite@4.3.3)
       yargs-parser: 21.1.1
       zod: 3.21.4
     transitivePeerDependencies:
       - '@types/node'
       - less
-      - lightningcss
       - sass
       - stylus
       - sugarss
@@ -6735,36 +6478,6 @@ packages:
       '@esbuild/win32-arm64': 0.17.18
       '@esbuild/win32-ia32': 0.17.18
       '@esbuild/win32-x64': 0.17.18
-    dev: true
-
-  /esbuild@0.18.20:
-    resolution: {integrity: sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    optionalDependencies:
-      '@esbuild/android-arm': 0.18.20
-      '@esbuild/android-arm64': 0.18.20
-      '@esbuild/android-x64': 0.18.20
-      '@esbuild/darwin-arm64': 0.18.20
-      '@esbuild/darwin-x64': 0.18.20
-      '@esbuild/freebsd-arm64': 0.18.20
-      '@esbuild/freebsd-x64': 0.18.20
-      '@esbuild/linux-arm': 0.18.20
-      '@esbuild/linux-arm64': 0.18.20
-      '@esbuild/linux-ia32': 0.18.20
-      '@esbuild/linux-loong64': 0.18.20
-      '@esbuild/linux-mips64el': 0.18.20
-      '@esbuild/linux-ppc64': 0.18.20
-      '@esbuild/linux-riscv64': 0.18.20
-      '@esbuild/linux-s390x': 0.18.20
-      '@esbuild/linux-x64': 0.18.20
-      '@esbuild/netbsd-x64': 0.18.20
-      '@esbuild/openbsd-x64': 0.18.20
-      '@esbuild/sunos-x64': 0.18.20
-      '@esbuild/win32-arm64': 0.18.20
-      '@esbuild/win32-ia32': 0.18.20
-      '@esbuild/win32-x64': 0.18.20
 
   /escalade@3.1.1:
     resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
@@ -8063,7 +7776,6 @@ packages:
   /iconv-lite@0.6.3:
     resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==}
     engines: {node: '>=0.10.0'}
-    requiresBuild: true
     dependencies:
       safer-buffer: 2.1.2
     dev: true
@@ -11142,14 +10854,6 @@ packages:
       picocolors: 1.0.0
       source-map-js: 1.0.2
 
-  /postcss@8.4.27:
-    resolution: {integrity: sha512-gY/ACJtJPSmUFPDCHtX78+01fHa64FaU4zaaWfuh1MhGJISufJAH4cun6k/8fwsHYeK4UQmENQK+tRLCFJE8JQ==}
-    engines: {node: ^10 || ^12 || >=14}
-    dependencies:
-      nanoid: 3.3.6
-      picocolors: 1.0.0
-      source-map-js: 1.0.2
-
   /prebuild-install@7.1.1:
     resolution: {integrity: sha512-jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==}
     engines: {node: '>=10'}
@@ -11954,14 +11658,6 @@ packages:
     hasBin: true
     optionalDependencies:
       fsevents: 2.3.2
-    dev: true
-
-  /rollup@3.28.0:
-    resolution: {integrity: sha512-d7zhvo1OUY2SXSM6pfNjgD5+d0Nz87CUp4mt8l/GgVP3oBsPwzNvSzyu1me6BSG9JIgWNTVcafIXBIyM8yQ3yw==}
-    engines: {node: '>=14.18.0', npm: '>=8.0.0'}
-    hasBin: true
-    optionalDependencies:
-      fsevents: 2.3.2
 
   /run-async@2.4.1:
     resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
@@ -13367,11 +13063,10 @@ packages:
       mlly: 1.4.0
       pathe: 1.1.1
       picocolors: 1.0.0
-      vite: 4.4.5(@types/node@18.16.3)
+      vite: 4.3.3(@types/node@18.16.3)
     transitivePeerDependencies:
       - '@types/node'
       - less
-      - lightningcss
       - sass
       - stylus
       - sugarss
@@ -13379,7 +13074,7 @@ packages:
       - terser
     dev: true
 
-  /vite-plugin-pwa@0.14.7(vite@4.4.5)(workbox-build@6.5.4)(workbox-window@6.5.4):
+  /vite-plugin-pwa@0.14.7(vite@4.3.3)(workbox-build@6.5.4)(workbox-window@6.5.4):
     resolution: {integrity: sha512-dNJaf0fYOWncmjxv9HiSa2xrSjipjff7IkYE5oIUJ2x5HKu3cXgA8LRgzOwTc5MhwyFYRSU0xyN0Phbx3NsQYw==}
     peerDependencies:
       vite: ^3.1.0 || ^4.0.0
@@ -13391,7 +13086,7 @@ packages:
       fast-glob: 3.2.12
       pretty-bytes: 6.1.0
       rollup: 3.12.0
-      vite: 4.4.5(@types/node@18.16.3)
+      vite: 4.3.3(@types/node@18.16.3)
       workbox-build: 6.5.4
       workbox-window: 6.5.4
     transitivePeerDependencies:
@@ -13429,44 +13124,8 @@ packages:
       rollup: 3.21.0
     optionalDependencies:
       fsevents: 2.3.2
-    dev: true
 
-  /vite@4.4.5(@types/node@18.16.3):
-    resolution: {integrity: sha512-4m5kEtAWHYr0O1Fu7rZp64CfO1PsRGZlD3TAB32UmQlpd7qg15VF7ROqGN5CyqN7HFuwr7ICNM2+fDWRqFEKaA==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    hasBin: true
-    peerDependencies:
-      '@types/node': '>= 14'
-      less: '*'
-      lightningcss: ^1.21.0
-      sass: '*'
-      stylus: '*'
-      sugarss: '*'
-      terser: ^5.4.0
-    peerDependenciesMeta:
-      '@types/node':
-        optional: true
-      less:
-        optional: true
-      lightningcss:
-        optional: true
-      sass:
-        optional: true
-      stylus:
-        optional: true
-      sugarss:
-        optional: true
-      terser:
-        optional: true
-    dependencies:
-      '@types/node': 18.16.3
-      esbuild: 0.18.20
-      postcss: 8.4.27
-      rollup: 3.28.0
-    optionalDependencies:
-      fsevents: 2.3.2
-
-  /vitefu@0.2.4(vite@4.4.5):
+  /vitefu@0.2.4(vite@4.3.3):
     resolution: {integrity: sha512-fanAXjSaf9xXtOOeno8wZXIhgia+CZury481LsDaV++lSvcU2R9Ch2bPh3PYFyoHW+w9LqAeYRISVQjUIew14g==}
     peerDependencies:
       vite: ^3.0.0 || ^4.0.0
@@ -13474,7 +13133,7 @@ packages:
       vite:
         optional: true
     dependencies:
-      vite: 4.4.5(@types/node@18.16.3)
+      vite: 4.3.3(@types/node@18.16.3)
 
   /vitest@0.33.0(@vitest/ui@0.28.0):
     resolution: {integrity: sha512-1CxaugJ50xskkQ0e969R/hW47za4YXDUfWJDxip1hwbnhUjYolpfUn2AMOulqG/Dtd9WYAtkHmM/m3yKVrEejQ==}
@@ -13534,7 +13193,6 @@ packages:
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
-      - lightningcss
       - sass
       - stylus
       - sugarss

pnpm-workspace.yaml

@@ -6,4 +6,3 @@ packages:
   - "packages/core/examples/vite-vanilla-repl-cm6"
   - "packages/react/examples/nano-repl"
   - "packages/web/examples/repl-example"
-  - "packages/superdough/example"

src-tauri/Cargo.lock

@@ -2,15 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -50,28 +41,6 @@ dependencies = [
  "alloc-no-stdlib",
 ]
 
-[[package]]
-name = "alsa"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47"
-dependencies = [
- "alsa-sys",
- "bitflags",
- "libc",
- "nix",
-]
-
-[[package]]
-name = "alsa-sys"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527"
-dependencies = [
- "libc",
- "pkg-config",
-]
-
 [[package]]
 name = "android-tzdata"
 version = "0.1.1"
@@ -97,14 +66,10 @@ checksum = "9c7d0618f0e0b7e8ff11427422b64564d5fb0be1940354bfe2e0529b18a9d9b8"
 name = "app"
 version = "0.1.0"
 dependencies = [
- "midir",
- "rosc",
- "rusty_link",
  "serde",
  "serde_json",
  "tauri",
  "tauri-build",
- "tokio",
 ]
 
 [[package]]
@@ -137,21 +102,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
-[[package]]
-name = "backtrace"
-version = "0.3.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
 [[package]]
 name = "base64"
 version = "0.13.1"
@@ -164,28 +114,6 @@ version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
 
-[[package]]
-name = "bindgen"
-version = "0.63.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885"
-dependencies = [
- "bitflags",
- "cexpr",
- "clang-sys",
- "lazy_static",
- "lazycell",
- "log",
- "peeking_take_while",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 1.0.109",
- "which",
-]
-
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -308,15 +236,6 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
 
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfb"
 version = "0.7.3"
@@ -366,26 +285,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "clang-sys"
-version = "1.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
-[[package]]
-name = "cmake"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "cocoa"
 version = "0.24.1"
@@ -479,26 +378,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "coremidi"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a7847ca018a67204508b77cb9e6de670125075f7464fff5f673023378fa34f5"
-dependencies = [
- "core-foundation",
- "core-foundation-sys",
- "coremidi-sys",
-]
-
-[[package]]
-name = "coremidi-sys"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79a6deed0c97b2d40abbab77e4c97f81d71e162600423382c277dd640019116c"
-dependencies = [
- "core-foundation-sys",
-]
-
 [[package]]
 name = "cpufeatures"
 version = "0.2.8"
@@ -689,12 +568,6 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
 
-[[package]]
-name = "either"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-
 [[package]]
 name = "embed-resource"
 version = "2.1.1"
@@ -1037,12 +910,6 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.28.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
-
 [[package]]
 name = "gio"
 version = "0.15.12"
@@ -1489,28 +1356,12 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
 [[package]]
 name = "libc"
 version = "0.2.146"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f92be4933c13fd498862a9e02a3055f8a8d9c039ce33db97306fd5a6caa7f29b"
 
-[[package]]
-name = "libloading"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f"
-dependencies = [
- "cfg-if",
- "winapi",
-]
-
 [[package]]
 name = "line-wrap"
 version = "0.1.1"
@@ -1616,28 +1467,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "midir"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a456444d83e7ead06ae6a5c0a215ed70282947ff3897fb45fcb052b757284731"
-dependencies = [
- "alsa",
- "bitflags",
- "coremidi",
- "js-sys",
- "libc",
- "wasm-bindgen",
- "web-sys",
- "windows 0.43.0",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -1648,17 +1477,6 @@ dependencies = [
  "simd-adler32",
 ]
 
-[[package]]
-name = "mio"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
-dependencies = [
- "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
-]
-
 [[package]]
 name = "ndk"
 version = "0.6.0"
@@ -1693,33 +1511,12 @@ version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
 
-[[package]]
-name = "nix"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069"
-dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nodrop"
 version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb"
 
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -1819,15 +1616,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "object"
-version = "0.32.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.18.0"
@@ -1888,12 +1676,6 @@ dependencies = [
  "windows-targets",
 ]
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.0"
@@ -2000,9 +1782,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.13"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116"
 
 [[package]]
 name = "pin-utils"
@@ -2270,28 +2052,6 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
-[[package]]
-name = "rosc"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e63d9e6b0d090be1485cf159b1e04c3973d2d3e1614963544ea2ff47a4a981"
-dependencies = [
- "byteorder",
- "nom",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
 [[package]]
 name = "rustc_version"
 version = "0.4.0"
@@ -2321,16 +2081,6 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
 
-[[package]]
-name = "rusty_link"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "212e275351a46badd88b67ab8a4a8e17580317c728c361299b245cb51debe81c"
-dependencies = [
- "bindgen",
- "cmake",
-]
-
 [[package]]
 name = "ryu"
 version = "1.0.13"
@@ -2524,21 +2274,6 @@ dependencies = [
  "lazy_static",
 ]
 
-[[package]]
-name = "shlex"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "simd-adler32"
 version = "0.3.5"
@@ -2566,16 +2301,6 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
 
-[[package]]
-name = "socket2"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877"
-dependencies = [
- "libc",
- "windows-sys",
-]
-
 [[package]]
 name = "soup2"
 version = "0.2.1"
@@ -3060,34 +2785,17 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.32.0"
+version = "1.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
 dependencies = [
- "backtrace",
+ "autocfg",
  "bytes",
- "libc",
- "mio",
  "num_cpus",
- "parking_lot",
  "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
  "windows-sys",
 ]
 
-[[package]]
-name = "tokio-macros"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.18",
-]
-
 [[package]]
 name = "toml"
 version = "0.5.11"
@@ -3382,16 +3090,6 @@ version = "0.2.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
 
-[[package]]
-name = "web-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
 [[package]]
 name = "webkit2gtk"
 version = "0.18.2"
@@ -3477,17 +3175,6 @@ dependencies = [
  "windows-metadata",
 ]
 
-[[package]]
-name = "which"
-version = "4.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2441c784c52b289a054b7201fc93253e288f094e2f4be9058343127c4226a269"
-dependencies = [
- "either",
- "libc",
- "once_cell",
-]
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -3533,21 +3220,6 @@ dependencies = [
  "windows_x86_64_msvc 0.39.0",
 ]
 
-[[package]]
-name = "windows"
-version = "0.43.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
-dependencies = [
- "windows_aarch64_gnullvm 0.42.2",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
- "windows_x86_64_gnullvm 0.42.2",
- "windows_x86_64_msvc 0.42.2",
-]
-
 [[package]]
 name = "windows"
 version = "0.48.0"
@@ -3598,12 +3270,12 @@ version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7b1eb6f0cd7c80c79759c929114ef071b87354ce476d9d94271031c0497adfd5"
 dependencies = [
- "windows_aarch64_gnullvm 0.48.0",
+ "windows_aarch64_gnullvm",
  "windows_aarch64_msvc 0.48.0",
  "windows_i686_gnu 0.48.0",
  "windows_i686_msvc 0.48.0",
  "windows_x86_64_gnu 0.48.0",
- "windows_x86_64_gnullvm 0.48.0",
+ "windows_x86_64_gnullvm",
  "windows_x86_64_msvc 0.48.0",
 ]
 
@@ -3613,12 +3285,6 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f838de2fe15fe6bac988e74b798f26499a8b21a9d97edec321e79b28d1d7f597"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.0"
@@ -3631,12 +3297,6 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec7711666096bd4096ffa835238905bb33fb87267910e154b18b44eaabb340f2"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.0"
@@ -3649,12 +3309,6 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "763fc57100a5f7042e3057e7e8d9bdd7860d330070251a73d003563a3bb49e1b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.0"
@@ -3667,12 +3321,6 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7bc7cbfe58828921e10a9f446fcaaf649204dcfe6c1ddd712c5eebae6bda1106"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.0"
@@ -3685,24 +3333,12 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6868c165637d653ae1e8dc4d82c25d4f97dd6605eaa8d784b5c6e0ab2a252b65"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.0"
@@ -3715,12 +3351,6 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e4d40883ae9cae962787ca76ba76390ffa29214667a111db9e0a1ad8377e809"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.42.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.0"

src-tauri/Cargo.toml

@@ -18,10 +18,6 @@ tauri-build = { version = "1.4.0", features = [] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "1.4.0", features = ["fs-all"] }
-midir = "0.9.1"
-tokio = { version = "1.29.0", features = ["full"] }
-rosc = "0.10.1"
-rusty_link = "0.3.6"
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

src-tauri/README.md

@@ -4,8 +4,7 @@ Rust source files for building native desktop apps using Tauri
 
 ## Usage
 
-- Install [Rust](https://rustup.rs/) on your system.
-- Install `cmake` on your system. OSX: `brew install cmake`, Linux: `sudo apt-get install cmake`
+Install [Rust](https://rustup.rs/) on your system.
 
 From the project root:
 

src-tauri/src/ablelinkbridge.rs

@@ -1,175 +0,0 @@
-use std::time::{ Duration, SystemTime, UNIX_EPOCH };
-use rusty_link::{ AblLink, SessionState };
-use std::sync::Arc;
-use tokio::sync::Mutex;
-use serde::Deserialize;
-use std::thread::sleep;
-
-use crate::loggerbridge::Logger;
-
-use tauri::Window;
-
-fn bpm_to_cps(bpm: f64) -> f64 {
-  let cpm = bpm / 4.0;
-  return cpm / 60.0;
-}
-
-fn cps_to_bpm(cps: f64) -> f64 {
-  let cpm = cps * 60.0;
-  return cpm * 4.0;
-}
-
-fn current_unix_time() -> Duration {
-  let current_unix_time = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
-  return current_unix_time;
-}
-
-#[derive(Deserialize, Clone, serde::Serialize)]
-pub struct LinkMsg {
-  pub started: bool,
-  pub cps: f64,
-  pub timestamp: u64,
-  pub phase: f64,
-}
-
-pub struct AbeLinkStateContainer {
-  pub abelink: Arc<Mutex<AbeLinkState>>,
-}
-pub struct AbeLinkState {
-  pub link: AblLink,
-  pub session_state: SessionState,
-  pub running: bool,
-  pub quantum: f64,
-  pub window: Arc<Window>,
-}
-
-impl AbeLinkState {
-  pub fn new(window: Arc<Window>) -> Self {
-    Self {
-      link: AblLink::new(120.0),
-      session_state: SessionState::new(),
-      running: true,
-      quantum: 4.0,
-      window,
-    }
-  }
-
-  pub fn unix_time_at_next_phase(&self) -> u64 {
-    let link_time_stamp = self.link.clock_micros();
-    let quantum = self.quantum;
-    let beat = self.session_state.beat_at_time(link_time_stamp, quantum);
-    let phase = self.session_state.phase_at_time(link_time_stamp, quantum);
-    let internal_time_at_next_phase = self.session_state.time_at_beat(beat + (quantum - phase), quantum);
-    let time_offset = Duration::from_micros((internal_time_at_next_phase - link_time_stamp) as u64);
-    let current_unix_time = current_unix_time();
-    let unix_time_at_next_phase = (current_unix_time + time_offset).as_millis();
-    return unix_time_at_next_phase as u64;
-  }
-
-  pub fn cps(&self) -> f64 {
-    let bpm = self.session_state.tempo();
-    let cps = bpm_to_cps(bpm);
-    return cps;
-  }
-
-  pub fn capture_app_state(&mut self) {
-    self.link.capture_app_session_state(&mut self.session_state);
-  }
-
-  pub fn commit_app_state(&mut self) {
-    self.link.commit_app_session_state(&self.session_state);
-  }
-
-  pub fn send(&self, payload: LinkMsg) {
-    let _ = self.window.emit("abelink-event", payload);
-  }
-
-  pub fn send_started(&self) {
-    let cps = self.cps();
-    let started = self.session_state.is_playing();
-    let payload = LinkMsg {
-      cps,
-      started,
-      timestamp: self.unix_time_at_next_phase(),
-      phase: 0.0,
-    };
-    self.send(payload);
-  }
-
-  pub fn send_cps(&self) {
-    let cps = self.cps();
-    let started = self.session_state.is_playing();
-    let phase = self.session_state.phase_at_time(self.link.clock_micros(), self.quantum);
-    let payload = LinkMsg {
-      cps,
-      started,
-      timestamp: current_unix_time().as_millis() as u64,
-      phase,
-    };
-    self.send(payload);
-  }
-
-  pub fn send_phase(&self) {
-    self.send_started();
-  }
-}
-
-pub fn init(_logger: Logger, abelink: Arc<Mutex<AbeLinkState>>) {
-  tauri::async_runtime::spawn(async move {
-    let mut prev_is_started = false;
-    let mut prev_cps = 0.0;
-
-    let mut time_since_last_phase_send = 0;
-    let sleep_time = 10;
-    /* .......................................................................
-        Evaluate Abelink State and send messages back to JS side when needed.
-    ........................................................................*/
-    loop {
-      let mut state = abelink.lock().await;
-      state.capture_app_state();
-      if state.link.is_enabled() == false {
-        state.link.enable(true);
-        state.link.enable_start_stop_sync(true);
-      }
-
-      let started = state.session_state.is_playing();
-
-      if started != prev_is_started {
-        state.send_started();
-        prev_is_started = started;
-      } else if state.cps() != prev_cps && state.cps() != 0.0 {
-        state.send_cps();
-        prev_cps = state.cps();
-        // a phase sync message needs to be sent to strudel every 30 seconds to keep clock drift at bay
-      } else if time_since_last_phase_send > 30000 {
-        state.send_phase();
-        time_since_last_phase_send = 0;
-      }
-
-      drop(state);
-      sleep(Duration::from_millis(sleep_time));
-      time_since_last_phase_send = time_since_last_phase_send + sleep_time;
-    }
-  });
-}
-
-// Called from JS
-#[tauri::command]
-pub async fn sendabelinkmsg(linkmsg: LinkMsg, state: tauri::State<'_, AbeLinkStateContainer>) -> Result<(), String> {
-  let mut abelink = state.abelink.lock().await;
-  abelink.capture_app_state();
-  let started = abelink.session_state.is_playing();
-  let time_stamp = abelink.link.clock_micros();
-  let quantum = abelink.quantum;
-  let linkmsg_bpm = cps_to_bpm(linkmsg.cps);
-
-  if linkmsg.started != started {
-    abelink.session_state.set_is_playing_and_request_beat_at_time(linkmsg.started, time_stamp as u64, 0.0, quantum);
-  }
-  if linkmsg_bpm != abelink.session_state.tempo() && linkmsg_bpm != 0.0 {
-    abelink.session_state.set_tempo(linkmsg_bpm, time_stamp);
-  }
-  abelink.commit_app_state();
-  drop(abelink);
-  Ok(())
-}

src-tauri/src/loggerbridge.rs

@@ -1,20 +0,0 @@
-use std::sync::Arc;
-use tauri::Window;
-
-#[derive(Clone, serde::Serialize)]
-pub struct LoggerPayload {
-  pub message: String,
-  pub message_type: String,
-}
-
-#[derive(Clone)]
-pub struct Logger {
-  pub window: Arc<Window>,
-}
-
-impl Logger {
-  pub fn log(&self, message: String, message_type: String) {
-    println!("{}", message);
-    let _ = self.window.emit("log-event", LoggerPayload { message, message_type });
-  }
-}

src-tauri/src/main.rs

@@ -1,64 +1,8 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-mod midibridge;
-mod oscbridge;
-mod loggerbridge;
-mod ablelinkbridge;
-use std::sync::Arc;
-
-use ablelinkbridge::AbeLinkState;
-use loggerbridge::Logger;
-use tauri::Manager;
-use tokio::sync::mpsc;
-use tokio::sync::Mutex;
-// the payload type must implement `Serialize` and `Clone`.
-#[derive(Clone, serde::Serialize)]
-struct Payload {
-  message: String,
-  message_type: String,
-}
 fn main() {
-  let (async_input_transmitter_midi, async_input_receiver_midi) = mpsc::channel(1);
-  let (async_output_transmitter_midi, async_output_receiver_midi) = mpsc::channel(1);
-  let (async_input_transmitter_osc, async_input_receiver_osc) = mpsc::channel(1);
-  let (async_output_transmitter_osc, async_output_receiver_osc) = mpsc::channel(1);
-
-  tauri::Builder
-    ::default()
-    .manage(midibridge::AsyncInputTransmit {
-      inner: Mutex::new(async_input_transmitter_midi),
-    })
-    .manage(oscbridge::AsyncInputTransmit {
-      inner: Mutex::new(async_input_transmitter_osc),
-    })
-    .invoke_handler(tauri::generate_handler![midibridge::sendmidi, oscbridge::sendosc, ablelinkbridge::sendabelinkmsg])
-    .setup(|app| {
-      let window = Arc::new(app.get_window("main").unwrap());
-      let logger = Logger { window: window.clone() };
-
-      midibridge::init(
-        logger.clone(),
-        async_input_receiver_midi,
-        async_output_receiver_midi,
-        async_output_transmitter_midi
-      );
-      oscbridge::init(
-        logger.clone(),
-        async_input_receiver_osc,
-        async_output_receiver_osc,
-        async_output_transmitter_osc
-      );
-
-      // This state must be declared in the setup so it can be shared between invoked commands and the initialized function
-      let abelink = Arc::new(Mutex::new(AbeLinkState::new(window)));
-      app.manage(ablelinkbridge::AbeLinkStateContainer {
-        abelink: abelink.clone(),
-      });
-      ablelinkbridge::init(logger.clone(), abelink);
-
-      Ok(())
-    })
+  tauri::Builder::default()
     .run(tauri::generate_context!())
     .expect("error while running tauri application");
 }

src-tauri/src/midibridge.rs

@@ -1,158 +0,0 @@
-use std::collections::HashMap;
-use std::sync::Arc;
-use std::time::Duration;
-use midir::MidiOutput;
-
-use tokio::sync::{ mpsc, Mutex };
-use tokio::time::Instant;
-use serde::Deserialize;
-use std::thread::sleep;
-
-use crate::loggerbridge::Logger;
-pub struct MidiMessage {
-  pub message: Vec<u8>,
-  pub instant: Instant,
-  pub offset: u64,
-  pub requestedport: String,
-}
-
-pub struct AsyncInputTransmit {
-  pub inner: Mutex<mpsc::Sender<Vec<MidiMessage>>>,
-}
-
-pub fn init(
-  logger: Logger,
-  async_input_receiver: mpsc::Receiver<Vec<MidiMessage>>,
-  mut async_output_receiver: mpsc::Receiver<Vec<MidiMessage>>,
-  async_output_transmitter: mpsc::Sender<Vec<MidiMessage>>
-) {
-  tauri::async_runtime::spawn(async move { async_process_model(async_input_receiver, async_output_transmitter).await });
-  let message_queue: Arc<Mutex<Vec<MidiMessage>>> = Arc::new(Mutex::new(Vec::new()));
-  /* ...........................................................
-         Listen For incoming messages and add to queue
-  ............................................................*/
-  let message_queue_clone = Arc::clone(&message_queue);
-  tauri::async_runtime::spawn(async move {
-    loop {
-      if let Some(package) = async_output_receiver.recv().await {
-        let mut message_queue = message_queue_clone.lock().await;
-        let messages = package;
-        for message in messages {
-          (*message_queue).push(message);
-        }
-      }
-    }
-  });
-
-  let message_queue_clone = Arc::clone(&message_queue);
-  tauri::async_runtime::spawn(async move {
-    /* ...........................................................
-                        Open Midi Ports
-    ............................................................*/
-    let midiout = MidiOutput::new("strudel").unwrap();
-    let out_ports = midiout.ports();
-    let mut port_names = Vec::new();
-    //TODO: Send these print messages to the UI logger instead of the rust console so the user can see them
-    if out_ports.len() == 0 {
-      logger.log(
-        " No MIDI devices found. Connect a device or enable IAC Driver to enable midi.".to_string(),
-        "".to_string()
-      );
-      // logger(window, " No MIDI devices found. Connect a device or enable IAC Driver.".to_string(), None);
-      return;
-    }
-    // give the frontend couple seconds to load on start, or the log messages will get lost
-    sleep(Duration::from_secs(3));
-    logger.log(format!("Found {} midi devices!", out_ports.len()), "".to_string());
-
-    // the user could reference any port at anytime during runtime,
-    // so let's go ahead and open them all (same behavior as web app)
-    let mut output_connections = HashMap::new();
-    for i in 0..=out_ports.len().saturating_sub(1) {
-      let midiout = MidiOutput::new("strudel").unwrap();
-      let ports = midiout.ports();
-      let port = ports.get(i).unwrap();
-      let port_name = midiout.port_name(port).unwrap();
-      logger.log(port_name.clone(), "".to_string());
-      let out_con = midiout.connect(port, &port_name).unwrap();
-      port_names.insert(i, port_name.clone());
-      output_connections.insert(port_name, out_con);
-    }
-    /* ...........................................................
-                        Process queued messages 
-    ............................................................*/
-
-    loop {
-      let mut message_queue = message_queue_clone.lock().await;
-
-      //iterate over each message, play and remove messages when they are ready
-      message_queue.retain(|message| {
-        if message.instant.elapsed().as_millis() < message.offset.into() {
-          return true;
-        }
-        let mut out_con = output_connections.get_mut(&message.requestedport);
-
-        // WebMidi supports getting a connection by part of its name
-        // ex: 'bus 1' instead of 'IAC Driver bus 1' so let's emulate that behavior
-        if out_con.is_none() {
-          let key = port_names.iter().find(|port_name| {
-            return port_name.contains(&message.requestedport);
-          });
-          if key.is_some() {
-            out_con = output_connections.get_mut(key.unwrap());
-          }
-        }
-
-        if out_con.is_some() {
-          // process the message
-          if let Err(err) = (&mut out_con.unwrap()).send(&message.message) {
-            logger.log(format!("Midi message send error: {}", err), "error".to_string());
-          }
-        } else {
-          logger.log(format!("failed to find midi device: {}", message.requestedport), "error".to_string());
-        }
-        return false;
-      });
-
-      sleep(Duration::from_millis(1));
-    }
-  });
-}
-
-pub async fn async_process_model(
-  mut input_reciever: mpsc::Receiver<Vec<MidiMessage>>,
-  output_transmitter: mpsc::Sender<Vec<MidiMessage>>
-) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-  while let Some(input) = input_reciever.recv().await {
-    let output = input;
-    output_transmitter.send(output).await?;
-  }
-  Ok(())
-}
-#[derive(Deserialize)]
-pub struct MessageFromJS {
-  message: Vec<u8>,
-  offset: u64,
-  requestedport: String,
-}
-// Called from JS
-#[tauri::command]
-pub async fn sendmidi(
-  messagesfromjs: Vec<MessageFromJS>,
-  state: tauri::State<'_, AsyncInputTransmit>
-) -> Result<(), String> {
-  let async_proc_input_tx = state.inner.lock().await;
-  let mut messages_to_process: Vec<MidiMessage> = Vec::new();
-
-  for m in messagesfromjs {
-    let message_to_process = MidiMessage {
-      instant: Instant::now(),
-      message: m.message,
-      offset: m.offset,
-      requestedport: m.requestedport,
-    };
-    messages_to_process.push(message_to_process);
-  }
-
-  async_proc_input_tx.send(messages_to_process).await.map_err(|e| e.to_string())
-}

src-tauri/src/oscbridge.rs

@@ -1,157 +0,0 @@
-use rosc::{ encoder, OscTime };
-use rosc::{ OscMessage, OscPacket, OscType, OscBundle };
-
-use std::net::UdpSocket;
-
-use std::time::Duration;
-use std::sync::Arc;
-use tokio::sync::{ mpsc, Mutex };
-use serde::Deserialize;
-use std::thread::sleep;
-
-use crate::loggerbridge::Logger;
-pub struct OscMsg {
-  pub msg_buf: Vec<u8>,
-  pub timestamp: u64,
-}
-
-pub struct AsyncInputTransmit {
-  pub inner: Mutex<mpsc::Sender<Vec<OscMsg>>>,
-}
-
-const UNIX_OFFSET: u64 = 2_208_988_800; // 70 years in seconds
-const TWO_POW_32: f64 = (u32::MAX as f64) + 1.0; // Number of bits in a `u32`
-const NANOS_PER_SECOND: f64 = 1.0e9;
-const SECONDS_PER_NANO: f64 = 1.0 / NANOS_PER_SECOND;
-
-pub fn init(
-  logger: Logger,
-  async_input_receiver: mpsc::Receiver<Vec<OscMsg>>,
-  mut async_output_receiver: mpsc::Receiver<Vec<OscMsg>>,
-  async_output_transmitter: mpsc::Sender<Vec<OscMsg>>
-) {
-  tauri::async_runtime::spawn(async move { async_process_model(async_input_receiver, async_output_transmitter).await });
-  let message_queue: Arc<Mutex<Vec<OscMsg>>> = Arc::new(Mutex::new(Vec::new()));
-  /* ...........................................................
-         Listen For incoming messages and add to queue
-  ............................................................*/
-  let message_queue_clone = Arc::clone(&message_queue);
-  tauri::async_runtime::spawn(async move {
-    loop {
-      if let Some(package) = async_output_receiver.recv().await {
-        let mut message_queue = message_queue_clone.lock().await;
-        let messages = package;
-        for message in messages {
-          (*message_queue).push(message);
-        }
-      }
-    }
-  });
-
-  let message_queue_clone = Arc::clone(&message_queue);
-  tauri::async_runtime::spawn(async move {
-    /* ...........................................................
-                        Open OSC Ports
-    ............................................................*/
-    let sock = UdpSocket::bind("127.0.0.1:57122").unwrap();
-    let to_addr = String::from("127.0.0.1:57120");
-    sock.set_nonblocking(true).unwrap();
-    sock.connect(to_addr).expect("could not connect to OSC address");
-
-    /* ...........................................................
-                        Process queued messages 
-    ............................................................*/
-
-    loop {
-      let mut message_queue = message_queue_clone.lock().await;
-
-      message_queue.retain(|message| {
-        let result = sock.send(&message.msg_buf);
-        if result.is_err() {
-          logger.log(
-            format!("OSC Message failed to send, the server might no longer be available"),
-            "error".to_string()
-          );
-        }
-        return false;
-      });
-
-      sleep(Duration::from_millis(1));
-    }
-  });
-}
-
-pub async fn async_process_model(
-  mut input_reciever: mpsc::Receiver<Vec<OscMsg>>,
-  output_transmitter: mpsc::Sender<Vec<OscMsg>>
-) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
-  while let Some(input) = input_reciever.recv().await {
-    let output = input;
-    output_transmitter.send(output).await?;
-  }
-  Ok(())
-}
-
-#[derive(Deserialize)]
-pub struct Param {
-  name: String,
-  value: String,
-  valueisnumber: bool,
-}
-#[derive(Deserialize)]
-pub struct MessageFromJS {
-  params: Vec<Param>,
-  timestamp: u64,
-  target: String,
-}
-// Called from JS
-#[tauri::command]
-pub async fn sendosc(
-  messagesfromjs: Vec<MessageFromJS>,
-  state: tauri::State<'_, AsyncInputTransmit>
-) -> Result<(), String> {
-  let async_proc_input_tx = state.inner.lock().await;
-  let mut messages_to_process: Vec<OscMsg> = Vec::new();
-  for m in messagesfromjs {
-    let mut args = Vec::new();
-    for p in m.params {
-      args.push(OscType::String(p.name));
-      if p.valueisnumber {
-        args.push(OscType::Float(p.value.parse().unwrap()));
-      } else {
-        args.push(OscType::String(p.value));
-      }
-    }
-
-    let duration_since_epoch = Duration::from_millis(m.timestamp) + Duration::new(UNIX_OFFSET, 0);
-
-    let seconds = u32
-      ::try_from(duration_since_epoch.as_secs())
-      .map_err(|_| "bit conversion failed for osc message timetag")?;
-
-    let nanos = duration_since_epoch.subsec_nanos() as f64;
-    let fractional = (nanos * SECONDS_PER_NANO * TWO_POW_32).round() as u32;
-
-    let timetag = OscTime::from((seconds, fractional));
-
-    let packet = OscPacket::Message(OscMessage {
-      addr: m.target,
-      args,
-    });
-
-    let bundle = OscBundle {
-      content: vec![packet],
-      timetag,
-    };
-
-    let msg_buf = encoder::encode(&OscPacket::Bundle(bundle)).unwrap();
-
-    let message_to_process = OscMsg {
-      msg_buf,
-      timestamp: m.timestamp,
-    };
-    messages_to_process.push(message_to_process);
-  }
-
-  async_proc_input_tx.send(messages_to_process).await.map_err(|e| e.to_string())
-}

test/__snapshots__/examples.test.mjs.snap

@@ -900,33 +900,6 @@ exports[`runs examples > example "begin" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "bpattack" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
-]
-`;
-
-exports[`runs examples > example "bpdecay" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth bandf:500 bpdecay:0.5 bpsustain:0.2 bpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth bandf:500 bpdecay:0.5 bpsustain:0.2 bpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth bandf:500 bpdecay:0.5 bpsustain:0.2 bpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth bandf:500 bpdecay:0.5 bpsustain:0.2 bpenv:4 ]",
-]
-`;
-
-exports[`runs examples > example "bpenv" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
-]
-`;
-
 exports[`runs examples > example "bpf" example index 0 1`] = `
 [
   "[ 0/1 → 1/3 | s:hh bandf:1000 ]",
@@ -965,24 +938,6 @@ exports[`runs examples > example "bpq" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "bprelease" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth clip:0.5 bandf:500 bpenv:4 bprelease:0.5 release:0.5 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth clip:0.5 bandf:500 bpenv:4 bprelease:0.5 release:0.5 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth clip:0.5 bandf:500 bpenv:4 bprelease:0.5 release:0.5 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth clip:0.5 bandf:500 bpenv:4 bprelease:0.5 release:0.5 ]",
-]
-`;
-
-exports[`runs examples > example "bpsustain" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth bandf:500 bpdecay:0.5 bpsustain:0 bpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth bandf:500 bpdecay:0.5 bpsustain:0 bpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth bandf:500 bpdecay:0.5 bpsustain:0 bpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth bandf:500 bpdecay:0.5 bpsustain:0 bpenv:4 ]",
-]
-`;
-
 exports[`runs examples > example "cat" example index 0 1`] = `
 [
   "[ 0/1 → 1/2 | s:hh ]",
@@ -1828,15 +1783,6 @@ exports[`runs examples > example "firstOf" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "fit" example index 0 1`] = `
-[
-  "[ (0/1 → 1/1) ⇝ 4/1 | s:rhodes speed:0.25 unit:c ]",
-  "[ 0/1 ⇜ (1/1 → 2/1) ⇝ 4/1 | s:rhodes speed:0.25 unit:c ]",
-  "[ 0/1 ⇜ (2/1 → 3/1) ⇝ 4/1 | s:rhodes speed:0.25 unit:c ]",
-  "[ 0/1 ⇜ (3/1 → 4/1) | s:rhodes speed:0.25 unit:c ]",
-]
-`;
-
 exports[`runs examples > example "floor" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:42 ]",
@@ -1858,132 +1804,6 @@ exports[`runs examples > example "floor" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "fm" example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | note:c fmi:0 analyze:1 ]",
-  "[ 1/4 → 1/2 | note:e fmi:0 analyze:1 ]",
-  "[ 1/2 → 3/4 | note:g fmi:0 analyze:1 ]",
-  "[ 3/4 → 1/1 | note:b fmi:0 analyze:1 ]",
-  "[ 1/1 → 5/4 | note:c fmi:1 analyze:1 ]",
-  "[ 5/4 → 3/2 | note:e fmi:1 analyze:1 ]",
-  "[ 3/2 → 7/4 | note:g fmi:1 analyze:1 ]",
-  "[ 7/4 → 2/1 | note:b fmi:1 analyze:1 ]",
-  "[ 2/1 → 9/4 | note:c fmi:2 analyze:1 ]",
-  "[ 9/4 → 5/2 | note:e fmi:2 analyze:1 ]",
-  "[ 5/2 → 11/4 | note:g fmi:2 analyze:1 ]",
-  "[ 11/4 → 3/1 | note:b fmi:2 analyze:1 ]",
-  "[ 3/1 → 13/4 | note:c fmi:8 analyze:1 ]",
-  "[ 13/4 → 7/2 | note:e fmi:8 analyze:1 ]",
-  "[ 7/2 → 15/4 | note:g fmi:8 analyze:1 ]",
-  "[ 15/4 → 4/1 | note:b fmi:8 analyze:1 ]",
-]
-`;
-
-exports[`runs examples > example "fmattack" example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | note:c fmi:4 fmattack:0 analyze:1 ]",
-  "[ 1/4 → 1/2 | note:e fmi:4 fmattack:0 analyze:1 ]",
-  "[ 1/2 → 3/4 | note:g fmi:4 fmattack:0 analyze:1 ]",
-  "[ 3/4 → 1/1 | note:b fmi:4 fmattack:0 analyze:1 ]",
-  "[ 1/1 → 5/4 | note:c fmi:4 fmattack:0.05 analyze:1 ]",
-  "[ 5/4 → 3/2 | note:e fmi:4 fmattack:0.05 analyze:1 ]",
-  "[ 3/2 → 7/4 | note:g fmi:4 fmattack:0.05 analyze:1 ]",
-  "[ 7/4 → 2/1 | note:b fmi:4 fmattack:0.05 analyze:1 ]",
-  "[ 2/1 → 9/4 | note:c fmi:4 fmattack:0.1 analyze:1 ]",
-  "[ 9/4 → 5/2 | note:e fmi:4 fmattack:0.1 analyze:1 ]",
-  "[ 5/2 → 11/4 | note:g fmi:4 fmattack:0.1 analyze:1 ]",
-  "[ 11/4 → 3/1 | note:b fmi:4 fmattack:0.1 analyze:1 ]",
-  "[ 3/1 → 13/4 | note:c fmi:4 fmattack:0.2 analyze:1 ]",
-  "[ 13/4 → 7/2 | note:e fmi:4 fmattack:0.2 analyze:1 ]",
-  "[ 7/2 → 15/4 | note:g fmi:4 fmattack:0.2 analyze:1 ]",
-  "[ 15/4 → 4/1 | note:b fmi:4 fmattack:0.2 analyze:1 ]",
-]
-`;
-
-exports[`runs examples > example "fmdecay" example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | note:c fmi:4 fmdecay:0.01 fmsustain:0.4 analyze:1 ]",
-  "[ 1/4 → 1/2 | note:e fmi:4 fmdecay:0.01 fmsustain:0.4 analyze:1 ]",
-  "[ 1/2 → 3/4 | note:g fmi:4 fmdecay:0.01 fmsustain:0.4 analyze:1 ]",
-  "[ 3/4 → 1/1 | note:b fmi:4 fmdecay:0.01 fmsustain:0.4 analyze:1 ]",
-  "[ 1/1 → 5/4 | note:c fmi:4 fmdecay:0.05 fmsustain:0.4 analyze:1 ]",
-  "[ 5/4 → 3/2 | note:e fmi:4 fmdecay:0.05 fmsustain:0.4 analyze:1 ]",
-  "[ 3/2 → 7/4 | note:g fmi:4 fmdecay:0.05 fmsustain:0.4 analyze:1 ]",
-  "[ 7/4 → 2/1 | note:b fmi:4 fmdecay:0.05 fmsustain:0.4 analyze:1 ]",
-  "[ 2/1 → 9/4 | note:c fmi:4 fmdecay:0.1 fmsustain:0.4 analyze:1 ]",
-  "[ 9/4 → 5/2 | note:e fmi:4 fmdecay:0.1 fmsustain:0.4 analyze:1 ]",
-  "[ 5/2 → 11/4 | note:g fmi:4 fmdecay:0.1 fmsustain:0.4 analyze:1 ]",
-  "[ 11/4 → 3/1 | note:b fmi:4 fmdecay:0.1 fmsustain:0.4 analyze:1 ]",
-  "[ 3/1 → 13/4 | note:c fmi:4 fmdecay:0.2 fmsustain:0.4 analyze:1 ]",
-  "[ 13/4 → 7/2 | note:e fmi:4 fmdecay:0.2 fmsustain:0.4 analyze:1 ]",
-  "[ 7/2 → 15/4 | note:g fmi:4 fmdecay:0.2 fmsustain:0.4 analyze:1 ]",
-  "[ 15/4 → 4/1 | note:b fmi:4 fmdecay:0.2 fmsustain:0.4 analyze:1 ]",
-]
-`;
-
-exports[`runs examples > example "fmenv" example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | note:c fmi:4 fmdecay:0.2 fmsustain:0 fmenv:exp analyze:1 ]",
-  "[ 1/4 → 1/2 | note:e fmi:4 fmdecay:0.2 fmsustain:0 fmenv:exp analyze:1 ]",
-  "[ 1/2 → 3/4 | note:g fmi:4 fmdecay:0.2 fmsustain:0 fmenv:exp analyze:1 ]",
-  "[ 3/4 → 1/1 | note:b fmi:4 fmdecay:0.2 fmsustain:0 fmenv:exp analyze:1 ]",
-  "[ 1/1 → 5/4 | note:c fmi:4 fmdecay:0.2 fmsustain:0 fmenv:lin analyze:1 ]",
-  "[ 5/4 → 3/2 | note:e fmi:4 fmdecay:0.2 fmsustain:0 fmenv:lin analyze:1 ]",
-  "[ 3/2 → 7/4 | note:g fmi:4 fmdecay:0.2 fmsustain:0 fmenv:lin analyze:1 ]",
-  "[ 7/4 → 2/1 | note:b fmi:4 fmdecay:0.2 fmsustain:0 fmenv:lin analyze:1 ]",
-  "[ 2/1 → 9/4 | note:c fmi:4 fmdecay:0.2 fmsustain:0 fmenv:exp analyze:1 ]",
-  "[ 9/4 → 5/2 | note:e fmi:4 fmdecay:0.2 fmsustain:0 fmenv:exp analyze:1 ]",
-  "[ 5/2 → 11/4 | note:g fmi:4 fmdecay:0.2 fmsustain:0 fmenv:exp analyze:1 ]",
-  "[ 11/4 → 3/1 | note:b fmi:4 fmdecay:0.2 fmsustain:0 fmenv:exp analyze:1 ]",
-  "[ 3/1 → 13/4 | note:c fmi:4 fmdecay:0.2 fmsustain:0 fmenv:lin analyze:1 ]",
-  "[ 13/4 → 7/2 | note:e fmi:4 fmdecay:0.2 fmsustain:0 fmenv:lin analyze:1 ]",
-  "[ 7/2 → 15/4 | note:g fmi:4 fmdecay:0.2 fmsustain:0 fmenv:lin analyze:1 ]",
-  "[ 15/4 → 4/1 | note:b fmi:4 fmdecay:0.2 fmsustain:0 fmenv:lin analyze:1 ]",
-]
-`;
-
-exports[`runs examples > example "fmh" example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | note:c fmi:4 fmh:1 analyze:1 ]",
-  "[ 1/4 → 1/2 | note:e fmi:4 fmh:1 analyze:1 ]",
-  "[ 1/2 → 3/4 | note:g fmi:4 fmh:1 analyze:1 ]",
-  "[ 3/4 → 1/1 | note:b fmi:4 fmh:1 analyze:1 ]",
-  "[ 1/1 → 5/4 | note:c fmi:4 fmh:2 analyze:1 ]",
-  "[ 5/4 → 3/2 | note:e fmi:4 fmh:2 analyze:1 ]",
-  "[ 3/2 → 7/4 | note:g fmi:4 fmh:2 analyze:1 ]",
-  "[ 7/4 → 2/1 | note:b fmi:4 fmh:2 analyze:1 ]",
-  "[ 2/1 → 9/4 | note:c fmi:4 fmh:1.5 analyze:1 ]",
-  "[ 9/4 → 5/2 | note:e fmi:4 fmh:1.5 analyze:1 ]",
-  "[ 5/2 → 11/4 | note:g fmi:4 fmh:1.5 analyze:1 ]",
-  "[ 11/4 → 3/1 | note:b fmi:4 fmh:1.5 analyze:1 ]",
-  "[ 3/1 → 13/4 | note:c fmi:4 fmh:1.61 analyze:1 ]",
-  "[ 13/4 → 7/2 | note:e fmi:4 fmh:1.61 analyze:1 ]",
-  "[ 7/2 → 15/4 | note:g fmi:4 fmh:1.61 analyze:1 ]",
-  "[ 15/4 → 4/1 | note:b fmi:4 fmh:1.61 analyze:1 ]",
-]
-`;
-
-exports[`runs examples > example "fmsustain" example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | note:c fmi:4 fmdecay:0.1 fmsustain:1 analyze:1 ]",
-  "[ 1/4 → 1/2 | note:e fmi:4 fmdecay:0.1 fmsustain:1 analyze:1 ]",
-  "[ 1/2 → 3/4 | note:g fmi:4 fmdecay:0.1 fmsustain:1 analyze:1 ]",
-  "[ 3/4 → 1/1 | note:b fmi:4 fmdecay:0.1 fmsustain:1 analyze:1 ]",
-  "[ 1/1 → 5/4 | note:c fmi:4 fmdecay:0.1 fmsustain:0.75 analyze:1 ]",
-  "[ 5/4 → 3/2 | note:e fmi:4 fmdecay:0.1 fmsustain:0.75 analyze:1 ]",
-  "[ 3/2 → 7/4 | note:g fmi:4 fmdecay:0.1 fmsustain:0.75 analyze:1 ]",
-  "[ 7/4 → 2/1 | note:b fmi:4 fmdecay:0.1 fmsustain:0.75 analyze:1 ]",
-  "[ 2/1 → 9/4 | note:c fmi:4 fmdecay:0.1 fmsustain:0.5 analyze:1 ]",
-  "[ 9/4 → 5/2 | note:e fmi:4 fmdecay:0.1 fmsustain:0.5 analyze:1 ]",
-  "[ 5/2 → 11/4 | note:g fmi:4 fmdecay:0.1 fmsustain:0.5 analyze:1 ]",
-  "[ 11/4 → 3/1 | note:b fmi:4 fmdecay:0.1 fmsustain:0.5 analyze:1 ]",
-  "[ 3/1 → 13/4 | note:c fmi:4 fmdecay:0.1 fmsustain:0 analyze:1 ]",
-  "[ 13/4 → 7/2 | note:e fmi:4 fmdecay:0.1 fmsustain:0 analyze:1 ]",
-  "[ 7/2 → 15/4 | note:g fmi:4 fmdecay:0.1 fmsustain:0 analyze:1 ]",
-  "[ 15/4 → 4/1 | note:b fmi:4 fmdecay:0.1 fmsustain:0 analyze:1 ]",
-]
-`;
-
 exports[`runs examples > example "focus" example index 0 1`] = `
 [
   "[ 0/1 → 1/8 | s:sd ]",
@@ -2067,15 +1887,6 @@ exports[`runs examples > example "freq" example index 1 1`] = `
 ]
 `;
 
-exports[`runs examples > example "ftype" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth cutoff:500 bpenv:4 ftype:12db ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth cutoff:500 bpenv:4 ftype:24db ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth cutoff:500 bpenv:4 ftype:12db ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth cutoff:500 bpenv:4 ftype:24db ]",
-]
-`;
-
 exports[`runs examples > example "gain" example index 0 1`] = `
 [
   "[ 0/1 → 1/8 | s:hh gain:0.4 ]",
@@ -2113,33 +1924,6 @@ exports[`runs examples > example "gain" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "hpattack" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth hcutoff:500 hpattack:0.5 hpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth hcutoff:500 hpattack:0.5 hpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth hcutoff:500 hpattack:0.5 hpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth hcutoff:500 hpattack:0.5 hpenv:4 ]",
-]
-`;
-
-exports[`runs examples > example "hpdecay" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth hcutoff:500 hpdecay:0.5 hpsustain:0.2 hpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth hcutoff:500 hpdecay:0.5 hpsustain:0.2 hpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth hcutoff:500 hpdecay:0.5 hpsustain:0.2 hpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth hcutoff:500 hpdecay:0.5 hpsustain:0.2 hpenv:4 ]",
-]
-`;
-
-exports[`runs examples > example "hpenv" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth hcutoff:500 hpattack:0.5 hpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth hcutoff:500 hpattack:0.5 hpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth hcutoff:500 hpattack:0.5 hpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth hcutoff:500 hpattack:0.5 hpenv:4 ]",
-]
-`;
-
 exports[`runs examples > example "hpf" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | s:hh hcutoff:4000 ]",
@@ -2227,24 +2011,6 @@ exports[`runs examples > example "hpq" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "hprelease" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth clip:0.5 hcutoff:500 hpenv:4 hprelease:0.5 release:0.5 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth clip:0.5 hcutoff:500 hpenv:4 hprelease:0.5 release:0.5 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth clip:0.5 hcutoff:500 hpenv:4 hprelease:0.5 release:0.5 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth clip:0.5 hcutoff:500 hpenv:4 hprelease:0.5 release:0.5 ]",
-]
-`;
-
-exports[`runs examples > example "hpsustain" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth hcutoff:500 hpdecay:0.5 hpsustain:0 hpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth hcutoff:500 hpdecay:0.5 hpsustain:0 hpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth hcutoff:500 hpdecay:0.5 hpsustain:0 hpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth hcutoff:500 hpdecay:0.5 hpsustain:0 hpenv:4 ]",
-]
-`;
-
 exports[`runs examples > example "hurry" example index 0 1`] = `
 [
   "[ 0/1 → 3/4 | s:bd speed:1 ]",
@@ -2649,10 +2415,10 @@ exports[`runs examples > example "linger" example index 0 1`] = `
 
 exports[`runs examples > example "loop" example index 0 1`] = `
 [
-  "[ 0/1 → 1/1 | s:casio loop:1 ]",
-  "[ 1/1 → 2/1 | s:casio loop:1 ]",
-  "[ 2/1 → 3/1 | s:casio loop:1 ]",
-  "[ 3/1 → 4/1 | s:casio loop:1 ]",
+  "[ 0/1 → 1/1 | s:bd loop:1 ]",
+  "[ 1/1 → 2/1 | s:bd loop:2 ]",
+  "[ 2/1 → 3/1 | s:bd loop:3 ]",
+  "[ 3/1 → 4/1 | s:bd loop:4 ]",
 ]
 `;
 
@@ -2674,51 +2440,6 @@ exports[`runs examples > example "loopAtCps" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "loopBegin" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | s:space loop:1 loopBegin:0 analyze:1 ]",
-  "[ 1/1 → 2/1 | s:space loop:1 loopBegin:0.125 analyze:1 ]",
-  "[ 2/1 → 3/1 | s:space loop:1 loopBegin:0.25 analyze:1 ]",
-  "[ 3/1 → 4/1 | s:space loop:1 loopBegin:0 analyze:1 ]",
-]
-`;
-
-exports[`runs examples > example "loopEnd" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | s:space loop:1 loopEnd:1 analyze:1 ]",
-  "[ 1/1 → 2/1 | s:space loop:1 loopEnd:0.75 analyze:1 ]",
-  "[ 2/1 → 3/1 | s:space loop:1 loopEnd:0.5 analyze:1 ]",
-  "[ 3/1 → 4/1 | s:space loop:1 loopEnd:0.25 analyze:1 ]",
-]
-`;
-
-exports[`runs examples > example "lpattack" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth cutoff:500 lpattack:0.5 lpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth cutoff:500 lpattack:0.5 lpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth cutoff:500 lpattack:0.5 lpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth cutoff:500 lpattack:0.5 lpenv:4 ]",
-]
-`;
-
-exports[`runs examples > example "lpdecay" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth cutoff:500 lpdecay:0.5 lpsustain:0.2 lpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth cutoff:500 lpdecay:0.5 lpsustain:0.2 lpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth cutoff:500 lpdecay:0.5 lpsustain:0.2 lpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth cutoff:500 lpdecay:0.5 lpsustain:0.2 lpenv:4 ]",
-]
-`;
-
-exports[`runs examples > example "lpenv" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth cutoff:500 lpattack:0.5 lpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth cutoff:500 lpattack:0.5 lpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth cutoff:500 lpattack:0.5 lpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth cutoff:500 lpattack:0.5 lpenv:4 ]",
-]
-`;
-
 exports[`runs examples > example "lpf" example index 0 1`] = `
 [
   "[ 0/1 → 1/3 | s:hh cutoff:4000 ]",
@@ -2810,24 +2531,6 @@ exports[`runs examples > example "lpq" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "lprelease" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth clip:0.5 cutoff:500 lpenv:4 lprelease:0.5 release:0.5 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth clip:0.5 cutoff:500 lpenv:4 lprelease:0.5 release:0.5 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth clip:0.5 cutoff:500 lpenv:4 lprelease:0.5 release:0.5 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth clip:0.5 cutoff:500 lpenv:4 lprelease:0.5 release:0.5 ]",
-]
-`;
-
-exports[`runs examples > example "lpsustain" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:c2 s:sawtooth cutoff:500 lpdecay:0.5 lpsustain:0 lpenv:4 ]",
-  "[ 1/1 → 2/1 | note:e2 s:sawtooth cutoff:500 lpdecay:0.5 lpsustain:0 lpenv:4 ]",
-  "[ 2/1 → 3/1 | note:f2 s:sawtooth cutoff:500 lpdecay:0.5 lpsustain:0 lpenv:4 ]",
-  "[ 3/1 → 4/1 | note:g2 s:sawtooth cutoff:500 lpdecay:0.5 lpsustain:0 lpenv:4 ]",
-]
-`;
-
 exports[`runs examples > example "lrate" example index 0 1`] = `
 [
   "[ 0/1 → 1/1 | n:0 s:supersquare leslie:1 lrate:1 ]",
@@ -2959,15 +2662,6 @@ exports[`runs examples > example "never" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "noise" example index 0 1`] = `
-[
-  "[ (0/1 → 1/1) ⇝ 2/1 | s:white ]",
-  "[ 0/1 ⇜ (1/1 → 2/1) | s:white ]",
-  "[ (2/1 → 3/1) ⇝ 4/1 | s:pink ]",
-  "[ 2/1 ⇜ (3/1 → 4/1) | s:pink ]",
-]
-`;
-
 exports[`runs examples > example "note" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:c ]",
@@ -3663,107 +3357,16 @@ exports[`runs examples > example "room" example index 1 1`] = `
 ]
 `;
 
-exports[`runs examples > example "roomdim" example index 0 1`] = `
-[
-  "[ 0/1 → 1/2 | s:bd room:0.5 roomlp:10000 roomdim:8000 ]",
-  "[ 1/2 → 1/1 | s:sd room:0.5 roomlp:10000 roomdim:8000 ]",
-  "[ 1/1 → 3/2 | s:bd room:0.5 roomlp:10000 roomdim:8000 ]",
-  "[ 3/2 → 2/1 | s:sd room:0.5 roomlp:10000 roomdim:8000 ]",
-  "[ 2/1 → 5/2 | s:bd room:0.5 roomlp:10000 roomdim:8000 ]",
-  "[ 5/2 → 3/1 | s:sd room:0.5 roomlp:10000 roomdim:8000 ]",
-  "[ 3/1 → 7/2 | s:bd room:0.5 roomlp:10000 roomdim:8000 ]",
-  "[ 7/2 → 4/1 | s:sd room:0.5 roomlp:10000 roomdim:8000 ]",
-]
-`;
-
-exports[`runs examples > example "roomdim" example index 1 1`] = `
-[
-  "[ 0/1 → 1/2 | s:bd room:0.5 roomlp:5000 roomdim:400 ]",
-  "[ 1/2 → 1/1 | s:sd room:0.5 roomlp:5000 roomdim:400 ]",
-  "[ 1/1 → 3/2 | s:bd room:0.5 roomlp:5000 roomdim:400 ]",
-  "[ 3/2 → 2/1 | s:sd room:0.5 roomlp:5000 roomdim:400 ]",
-  "[ 2/1 → 5/2 | s:bd room:0.5 roomlp:5000 roomdim:400 ]",
-  "[ 5/2 → 3/1 | s:sd room:0.5 roomlp:5000 roomdim:400 ]",
-  "[ 3/1 → 7/2 | s:bd room:0.5 roomlp:5000 roomdim:400 ]",
-  "[ 7/2 → 4/1 | s:sd room:0.5 roomlp:5000 roomdim:400 ]",
-]
-`;
-
-exports[`runs examples > example "roomfade" example index 0 1`] = `
-[
-  "[ 0/1 → 1/2 | s:bd room:0.5 roomlp:10000 roomfade:0.5 ]",
-  "[ 1/2 → 1/1 | s:sd room:0.5 roomlp:10000 roomfade:0.5 ]",
-  "[ 1/1 → 3/2 | s:bd room:0.5 roomlp:10000 roomfade:0.5 ]",
-  "[ 3/2 → 2/1 | s:sd room:0.5 roomlp:10000 roomfade:0.5 ]",
-  "[ 2/1 → 5/2 | s:bd room:0.5 roomlp:10000 roomfade:0.5 ]",
-  "[ 5/2 → 3/1 | s:sd room:0.5 roomlp:10000 roomfade:0.5 ]",
-  "[ 3/1 → 7/2 | s:bd room:0.5 roomlp:10000 roomfade:0.5 ]",
-  "[ 7/2 → 4/1 | s:sd room:0.5 roomlp:10000 roomfade:0.5 ]",
-]
-`;
-
-exports[`runs examples > example "roomfade" example index 1 1`] = `
-[
-  "[ 0/1 → 1/2 | s:bd room:0.5 roomlp:5000 roomfade:4 ]",
-  "[ 1/2 → 1/1 | s:sd room:0.5 roomlp:5000 roomfade:4 ]",
-  "[ 1/1 → 3/2 | s:bd room:0.5 roomlp:5000 roomfade:4 ]",
-  "[ 3/2 → 2/1 | s:sd room:0.5 roomlp:5000 roomfade:4 ]",
-  "[ 2/1 → 5/2 | s:bd room:0.5 roomlp:5000 roomfade:4 ]",
-  "[ 5/2 → 3/1 | s:sd room:0.5 roomlp:5000 roomfade:4 ]",
-  "[ 3/1 → 7/2 | s:bd room:0.5 roomlp:5000 roomfade:4 ]",
-  "[ 7/2 → 4/1 | s:sd room:0.5 roomlp:5000 roomfade:4 ]",
-]
-`;
-
-exports[`runs examples > example "roomlp" example index 0 1`] = `
-[
-  "[ 0/1 → 1/2 | s:bd room:0.5 roomlp:10000 ]",
-  "[ 1/2 → 1/1 | s:sd room:0.5 roomlp:10000 ]",
-  "[ 1/1 → 3/2 | s:bd room:0.5 roomlp:10000 ]",
-  "[ 3/2 → 2/1 | s:sd room:0.5 roomlp:10000 ]",
-  "[ 2/1 → 5/2 | s:bd room:0.5 roomlp:10000 ]",
-  "[ 5/2 → 3/1 | s:sd room:0.5 roomlp:10000 ]",
-  "[ 3/1 → 7/2 | s:bd room:0.5 roomlp:10000 ]",
-  "[ 7/2 → 4/1 | s:sd room:0.5 roomlp:10000 ]",
-]
-`;
-
-exports[`runs examples > example "roomlp" example index 1 1`] = `
-[
-  "[ 0/1 → 1/2 | s:bd room:0.5 roomlp:5000 ]",
-  "[ 1/2 → 1/1 | s:sd room:0.5 roomlp:5000 ]",
-  "[ 1/1 → 3/2 | s:bd room:0.5 roomlp:5000 ]",
-  "[ 3/2 → 2/1 | s:sd room:0.5 roomlp:5000 ]",
-  "[ 2/1 → 5/2 | s:bd room:0.5 roomlp:5000 ]",
-  "[ 5/2 → 3/1 | s:sd room:0.5 roomlp:5000 ]",
-  "[ 3/1 → 7/2 | s:bd room:0.5 roomlp:5000 ]",
-  "[ 7/2 → 4/1 | s:sd room:0.5 roomlp:5000 ]",
-]
-`;
-
 exports[`runs examples > example "roomsize" example index 0 1`] = `
 [
-  "[ 0/1 → 1/2 | s:bd room:0.8 roomsize:1 ]",
-  "[ 1/2 → 1/1 | s:sd room:0.8 roomsize:1 ]",
-  "[ 1/1 → 3/2 | s:bd room:0.8 roomsize:1 ]",
-  "[ 3/2 → 2/1 | s:sd room:0.8 roomsize:1 ]",
-  "[ 2/1 → 5/2 | s:bd room:0.8 roomsize:1 ]",
-  "[ 5/2 → 3/1 | s:sd room:0.8 roomsize:1 ]",
-  "[ 3/1 → 7/2 | s:bd room:0.8 roomsize:1 ]",
-  "[ 7/2 → 4/1 | s:sd room:0.8 roomsize:1 ]",
-]
-`;
-
-exports[`runs examples > example "roomsize" example index 1 1`] = `
-[
-  "[ 0/1 → 1/2 | s:bd room:0.8 roomsize:4 ]",
-  "[ 1/2 → 1/1 | s:sd room:0.8 roomsize:4 ]",
-  "[ 1/1 → 3/2 | s:bd room:0.8 roomsize:4 ]",
-  "[ 3/2 → 2/1 | s:sd room:0.8 roomsize:4 ]",
-  "[ 2/1 → 5/2 | s:bd room:0.8 roomsize:4 ]",
-  "[ 5/2 → 3/1 | s:sd room:0.8 roomsize:4 ]",
-  "[ 3/1 → 7/2 | s:bd room:0.8 roomsize:4 ]",
-  "[ 7/2 → 4/1 | s:sd room:0.8 roomsize:4 ]",
+  "[ 0/1 → 1/2 | s:bd room:0.8 size:0 ]",
+  "[ 1/2 → 1/1 | s:sd room:0.8 size:0 ]",
+  "[ 1/1 → 3/2 | s:bd room:0.8 size:1 ]",
+  "[ 3/2 → 2/1 | s:sd room:0.8 size:1 ]",
+  "[ 2/1 → 5/2 | s:bd room:0.8 size:2 ]",
+  "[ 5/2 → 3/1 | s:sd room:0.8 size:2 ]",
+  "[ 3/1 → 7/2 | s:bd room:0.8 size:4 ]",
+  "[ 7/2 → 4/1 | s:sd room:0.8 size:4 ]",
 ]
 `;
 
@@ -4450,36 +4053,6 @@ exports[`runs examples > example "speed" example index 1 1`] = `
 ]
 `;
 
-exports[`runs examples > example "splice" example index 0 1`] = `
-[
-  "[ 0/1 → 5/26 | speed:0.65 unit:c begin:0 end:0.125 _slices:8 s:breaks165 ]",
-  "[ 5/26 → 5/13 | speed:0.65 unit:c begin:0.125 end:0.25 _slices:8 s:breaks165 ]",
-  "[ 5/13 → 20/39 | speed:0.9750000000000001 unit:c begin:0.25 end:0.375 _slices:8 s:breaks165 ]",
-  "[ 20/39 → 25/39 | speed:0.9750000000000001 unit:c begin:0.375 end:0.5 _slices:8 s:breaks165 ]",
-  "[ 25/39 → 10/13 | speed:0.9750000000000001 unit:c begin:0 end:0.125 _slices:8 s:breaks165 ]",
-  "[ 10/13 → 25/26 | speed:0.65 unit:c begin:0.375 end:0.5 _slices:8 s:breaks165 ]",
-  "[ (25/26 → 1/1) ⇝ 35/26 | speed:0.325 unit:c begin:0 end:0.125 _slices:8 s:breaks165 ]",
-  "[ 25/26 ⇜ (1/1 → 35/26) | speed:0.325 unit:c begin:0 end:0.125 _slices:8 s:breaks165 ]",
-  "[ 35/26 → 20/13 | speed:0.65 unit:c begin:0.875 end:1 _slices:8 s:breaks165 ]",
-  "[ 20/13 → 45/26 | speed:0.65 unit:c begin:0 end:0.125 _slices:8 s:breaks165 ]",
-  "[ 45/26 → 25/13 | speed:0.65 unit:c begin:0.125 end:0.25 _slices:8 s:breaks165 ]",
-  "[ (25/13 → 2/1) ⇝ 80/39 | speed:0.9750000000000001 unit:c begin:0.25 end:0.375 _slices:8 s:breaks165 ]",
-  "[ 25/13 ⇜ (2/1 → 80/39) | speed:0.9750000000000001 unit:c begin:0.25 end:0.375 _slices:8 s:breaks165 ]",
-  "[ 80/39 → 85/39 | speed:0.9750000000000001 unit:c begin:0.375 end:0.5 _slices:8 s:breaks165 ]",
-  "[ 85/39 → 30/13 | speed:0.9750000000000001 unit:c begin:0 end:0.125 _slices:8 s:breaks165 ]",
-  "[ 30/13 → 5/2 | speed:0.65 unit:c begin:0.375 end:0.5 _slices:8 s:breaks165 ]",
-  "[ 5/2 → 75/26 | speed:0.325 unit:c begin:0 end:0.125 _slices:8 s:breaks165 ]",
-  "[ (75/26 → 3/1) ⇝ 40/13 | speed:0.65 unit:c begin:0.875 end:1 _slices:8 s:breaks165 ]",
-  "[ 75/26 ⇜ (3/1 → 40/13) | speed:0.65 unit:c begin:0.875 end:1 _slices:8 s:breaks165 ]",
-  "[ 40/13 → 85/26 | speed:0.65 unit:c begin:0 end:0.125 _slices:8 s:breaks165 ]",
-  "[ 85/26 → 45/13 | speed:0.65 unit:c begin:0.125 end:0.25 _slices:8 s:breaks165 ]",
-  "[ 45/13 → 140/39 | speed:0.9750000000000001 unit:c begin:0.25 end:0.375 _slices:8 s:breaks165 ]",
-  "[ 140/39 → 145/39 | speed:0.9750000000000001 unit:c begin:0.375 end:0.5 _slices:8 s:breaks165 ]",
-  "[ 145/39 → 50/13 | speed:0.9750000000000001 unit:c begin:0 end:0.125 _slices:8 s:breaks165 ]",
-  "[ (50/13 → 4/1) ⇝ 105/26 | speed:0.65 unit:c begin:0.375 end:0.5 _slices:8 s:breaks165 ]",
-]
-`;
-
 exports[`runs examples > example "square" example index 0 1`] = `
 [
   "[ 0/1 → 1/2 | note:C3 ]",
@@ -4858,42 +4431,6 @@ exports[`runs examples > example "velocity" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "vib" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:a vib:0.5 ]",
-  "[ 1/1 → 2/1 | note:a vib:1 ]",
-  "[ 2/1 → 3/1 | note:a vib:2 ]",
-  "[ 3/1 → 4/1 | note:a vib:4 ]",
-]
-`;
-
-exports[`runs examples > example "vib" example index 1 1`] = `
-[
-  "[ 0/1 → 1/1 | note:a vib:0.5 vibmod:12 ]",
-  "[ 1/1 → 2/1 | note:a vib:1 vibmod:12 ]",
-  "[ 2/1 → 3/1 | note:a vib:2 vibmod:12 ]",
-  "[ 3/1 → 4/1 | note:a vib:4 vibmod:12 ]",
-]
-`;
-
-exports[`runs examples > example "vibmod" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:a vib:4 vibmod:0.25 ]",
-  "[ 1/1 → 2/1 | note:a vib:4 vibmod:0.5 ]",
-  "[ 2/1 → 3/1 | note:a vib:4 vibmod:1 ]",
-  "[ 3/1 → 4/1 | note:a vib:4 vibmod:2 ]",
-]
-`;
-
-exports[`runs examples > example "vibmod" example index 1 1`] = `
-[
-  "[ 0/1 → 1/1 | note:a vibmod:0.25 vib:8 ]",
-  "[ 1/1 → 2/1 | note:a vibmod:0.5 vib:8 ]",
-  "[ 2/1 → 3/1 | note:a vibmod:1 vib:8 ]",
-  "[ 3/1 → 4/1 | note:a vibmod:2 vib:8 ]",
-]
-`;
-
 exports[`runs examples > example "voicing" example index 0 1`] = `
 [
   "[ 0/1 → 1/1 | note:E4 ]",

test/__snapshots__/tunes.test.mjs.snap

@@ -3,23 +3,23 @@
 exports[`renders tunes > tune: amensister 1`] = `
 [
   "[ 0/1 → 1/16 | s:breath room:1 shape:0.6 begin:0.9375 end:1 ]",
-  "[ 0/1 → 1/8 | note:Eb1 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:300.0066107586751 ]",
-  "[ 0/1 → 1/8 | note:F1 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:300.0066107586751 ]",
+  "[ 0/1 → 1/8 | note:Eb1 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:300.0066107586751 resonance:10 ]",
+  "[ 0/1 → 1/8 | note:F1 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:300.0066107586751 resonance:10 ]",
   "[ 0/1 → 1/4 | n:0 s:amencutup room:0.5 ]",
   "[ 1/16 → 1/8 | s:breath room:1 shape:0.6 begin:0.875 end:0.9375 ]",
   "[ 1/8 → 3/16 | s:breath room:1 shape:0.6 begin:0.8125 end:0.875 ]",
-  "[ 1/8 → 1/4 | note:45 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:300.174310575404 ]",
-  "[ 1/8 → 1/4 | note:45 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:300.174310575404 ]",
+  "[ 1/8 → 1/4 | note:45 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:300.174310575404 resonance:10 ]",
+  "[ 1/8 → 1/4 | note:45 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:300.174310575404 resonance:10 ]",
   "[ 3/16 → 1/4 | s:breath room:1 shape:0.6 begin:0.75 end:0.8125 ]",
   "[ 1/4 → 5/16 | s:breath room:1 shape:0.6 begin:0.6875 end:0.75 ]",
   "[ 1/4 → 3/8 | n:1 speed:2 delay:0.5 s:amencutup room:0.5 ]",
-  "[ 1/4 → 3/8 | note:A1 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:300.7878869297153 ]",
-  "[ 1/4 → 3/8 | note:A1 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:300.7878869297153 ]",
+  "[ 1/4 → 3/8 | note:A1 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:300.7878869297153 resonance:10 ]",
+  "[ 1/4 → 3/8 | note:A1 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:300.7878869297153 resonance:10 ]",
   "[ 5/16 → 3/8 | s:breath room:1 shape:0.6 begin:0.625 end:0.6875 ]",
   "[ 3/8 → 7/16 | s:breath room:1 shape:0.6 begin:0.5625 end:0.625 ]",
   "[ 3/8 → 1/2 | n:1 s:amencutup room:0.5 ]",
-  "[ 3/8 → 1/2 | note:F1 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:302.11020572391345 ]",
-  "[ 3/8 → 1/2 | note:F1 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:302.11020572391345 ]",
+  "[ 3/8 → 1/2 | note:F1 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:302.11020572391345 resonance:10 ]",
+  "[ 3/8 → 1/2 | note:F1 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:302.11020572391345 resonance:10 ]",
   "[ 7/16 → 1/2 | s:breath room:1 shape:0.6 begin:0.5 end:0.5625 ]",
   "[ 1/2 → 9/16 | s:breath room:1 shape:0.6 begin:0.4375 end:0.5 ]",
   "[ 1/2 → 3/4 | n:2 s:amencutup room:0.5 ]",
@@ -28,13 +28,13 @@ exports[`renders tunes > tune: amensister 1`] = `
   "[ 11/16 → 3/4 | s:breath room:1 shape:0.6 begin:0.25 end:0.3125 ]",
   "[ 3/4 → 13/16 | s:breath room:1 shape:0.6 begin:0.1875 end:0.25 ]",
   "[ 3/4 → 7/8 | n:3 s:amencutup room:0.5 ]",
-  "[ 3/4 → 7/8 | note:Bb0 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:312.54769231985796 ]",
-  "[ 3/4 → 7/8 | note:Bb0 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:312.54769231985796 ]",
+  "[ 3/4 → 7/8 | note:Bb0 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:312.54769231985796 resonance:10 ]",
+  "[ 3/4 → 7/8 | note:Bb0 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:312.54769231985796 resonance:10 ]",
   "[ 13/16 → 7/8 | s:breath room:1 shape:0.6 begin:0.125 end:0.1875 ]",
   "[ 7/8 → 15/16 | s:breath room:1 shape:0.6 begin:0.0625 end:0.125 ]",
   "[ 7/8 → 1/1 | n:3 s:amencutup room:0.5 ]",
-  "[ 7/8 → 1/1 | note:D1 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:318.7927796831686 ]",
-  "[ 7/8 → 1/1 | note:D1 s:sawtooth gain:0.4 decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 resonance:10 cutoff:318.7927796831686 ]",
+  "[ 7/8 → 1/1 | note:D1 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:318.7927796831686 resonance:10 ]",
+  "[ 7/8 → 1/1 | note:D1 s:sawtooth decay:0.1 sustain:0 gain:0.4 cutoff:318.7927796831686 resonance:10 ]",
   "[ 15/16 → 1/1 | s:breath room:1 shape:0.6 begin:0 end:0.0625 ]",
 ]
 `;
@@ -44,8 +44,8 @@ exports[`renders tunes > tune: arpoon 1`] = `
   "[ (0/1 → 1/4) ⇝ 1/3 | note:55.000070545713186 clip:2 cutoff:501.2345499807435 resonance:12 gain:0.5 decay:0.16 sustain:0.5 delay:0.2 room:0.5 pan:0.48882285676537807 s:piano ]",
   "[ (0/1 → 1/4) ⇝ 1/3 | note:64.00007054571319 clip:2 cutoff:501.2345499807435 resonance:12 gain:0.5 decay:0.16 sustain:0.5 delay:0.2 room:0.5 pan:0.48882285676537807 s:piano ]",
   "[ 0/1 → 1/2 | s:bd bank:RolandTR909 gain:0.5 ]",
-  "[ 0/1 → 1/1 | note:33 s:sawtooth cutoff:180 lpattack:0.1 lpenv:2 ]",
-  "[ 0/1 → 1/1 | note:33.12 s:sawtooth cutoff:180 lpattack:0.1 lpenv:2 ]",
+  "[ 0/1 → 1/1 | note:33 s:sawtooth clip:1 cutoff:300 ]",
+  "[ 0/1 → 1/1 | note:33.12 s:sawtooth clip:1 cutoff:300 ]",
   "[ 0/1 ⇜ (1/4 → 1/3) | note:55.000070545713186 clip:2 cutoff:501.2345499807435 resonance:12 gain:0.8 decay:0.16 sustain:0.5 delay:0.2 room:0.5 pan:0.48882285676537807 s:piano ]",
   "[ 0/1 ⇜ (1/4 → 1/3) | note:64.00007054571319 clip:2 cutoff:501.2345499807435 resonance:12 gain:0.8 decay:0.16 sustain:0.5 delay:0.2 room:0.5 pan:0.48882285676537807 s:piano ]",
   "[ (1/3 → 1/2) ⇝ 2/3 | note:60.00166796373806 clip:2 cutoff:529.1893654159594 resonance:12 gain:0.8 decay:0.16 sustain:0.5 delay:0.2 room:0.5 pan:0.5560660171779821 s:piano ]",
@@ -323,8 +323,8 @@ exports[`renders tunes > tune: blippyRhodes 1`] = `
 [
   "[ 0/1 → 1/6 | note:G4 clip:0.3 s:rhodes room:0.5 delay:0.3 delayfeedback:0.4 delaytime:0.08333333333333333 gain:0.5 ]",
   "[ 0/1 → 1/3 | s:bd ]",
-  "[ (0/1 → 2/3) ⇝ 4/3 | note:36 gain:0.3 clip:1 cutoff:600 lpattack:0.2 lpenv:-4 s:sawtooth ]",
-  "[ (0/1 → 2/3) ⇝ 4/3 | note:36.02 gain:0.3 clip:1 cutoff:600 lpattack:0.2 lpenv:-4 s:sawtooth ]",
+  "[ (0/1 → 2/3) ⇝ 4/3 | note:36 gain:0.3 clip:1 s:sawtooth cutoff:600 ]",
+  "[ (0/1 → 2/3) ⇝ 4/3 | note:36.02 gain:0.3 clip:1 s:sawtooth cutoff:600 ]",
   "[ 1/6 → 1/3 | note:G4 clip:0.3 s:rhodes room:0.5 delay:0.3 delayfeedback:0.4 delaytime:0.08333333333333333 gain:0.5 ]",
   "[ 1/3 → 1/2 | note:B3 clip:0.3 s:rhodes room:0.5 delay:0.3 delayfeedback:0.4 delaytime:0.08333333333333333 gain:0.5 ]",
   "[ 1/3 → 1/2 | note:E4 clip:0.3 s:rhodes room:0.5 delay:0.3 delayfeedback:0.4 delaytime:0.08333333333333333 gain:0.5 ]",
@@ -332,8 +332,8 @@ exports[`renders tunes > tune: blippyRhodes 1`] = `
   "[ 1/2 → 2/3 | note:B3 clip:0.3 s:rhodes room:0.5 delay:0.3 delayfeedback:0.4 delaytime:0.08333333333333333 gain:0.5 ]",
   "[ 1/2 → 2/3 | note:E4 clip:0.3 s:rhodes room:0.5 delay:0.3 delayfeedback:0.4 delaytime:0.08333333333333333 gain:0.5 ]",
   "[ 2/3 → 5/6 | note:G3 clip:0.3 s:rhodes room:0.5 delay:0.3 delayfeedback:0.4 delaytime:0.08333333333333333 gain:0.5 ]",
-  "[ 0/1 ⇜ (2/3 → 1/1) ⇝ 4/3 | note:36 gain:0.3 clip:1 cutoff:600 lpattack:0.2 lpenv:-4 s:sawtooth ]",
-  "[ 0/1 ⇜ (2/3 → 1/1) ⇝ 4/3 | note:36.02 gain:0.3 clip:1 cutoff:600 lpattack:0.2 lpenv:-4 s:sawtooth ]",
+  "[ 0/1 ⇜ (2/3 → 1/1) ⇝ 4/3 | note:36 gain:0.3 clip:1 s:sawtooth cutoff:600 ]",
+  "[ 0/1 ⇜ (2/3 → 1/1) ⇝ 4/3 | note:36.02 gain:0.3 clip:1 s:sawtooth cutoff:600 ]",
   "[ 2/3 → 1/1 | s:sn ]",
   "[ 5/6 → 1/1 | note:G3 clip:0.3 s:rhodes room:0.5 delay:0.3 delayfeedback:0.4 delaytime:0.08333333333333333 gain:0.5 ]",
 ]
@@ -7315,20 +7315,20 @@ exports[`renders tunes > tune: flatrave 1`] = `
   "[ 0/1 ⇜ (1/8 → 1/4) | s:hh n:1 end:0.02000058072071123 bank:RolandTR909 room:0.5 gain:0.4 ]",
   "[ 1/8 → 1/4 | s:hh n:1 speed:0.5 delay:0.5 end:0.020001936784171157 bank:RolandTR909 room:0.5 gain:0.4 ]",
   "[ 1/8 → 1/4 | s:hh n:1 speed:0.5 delay:0.5 end:0.020001936784171157 bank:RolandTR909 room:0.5 gain:0.4 ]",
-  "[ 1/8 → 1/4 | note:G1 s:sawtooth decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 cutoff:800 resonance:8 ]",
+  "[ 1/8 → 1/4 | note:G1 s:sawtooth decay:0.1 sustain:0 ]",
   "[ 1/4 → 3/8 | s:hh n:1 end:0.02000875429921906 bank:RolandTR909 room:0.5 gain:0.4 ]",
   "[ 1/4 → 3/8 | s:hh n:1 end:0.02000875429921906 bank:RolandTR909 room:0.5 gain:0.4 ]",
-  "[ 1/4 → 3/8 | note:G1 s:sawtooth decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 cutoff:800 resonance:8 ]",
+  "[ 1/4 → 3/8 | note:G1 s:sawtooth decay:0.1 sustain:0 ]",
   "[ 3/8 → 1/2 | s:hh n:1 end:0.020023446730265706 bank:RolandTR909 room:0.5 gain:0.4 ]",
-  "[ 1/2 → 5/8 | note:G1 s:sawtooth decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 cutoff:800 resonance:8 ]",
+  "[ 1/2 → 5/8 | note:G1 s:sawtooth decay:0.1 sustain:0 ]",
   "[ 1/2 → 1/1 | s:bd bank:RolandTR909 ]",
   "[ 1/2 → 1/1 | s:cp bank:RolandTR909 ]",
   "[ 1/2 → 1/1 | s:sd bank:RolandTR909 ]",
   "[ 5/8 → 3/4 | s:hh n:1 end:0.020086608138500644 bank:RolandTR909 room:0.5 gain:0.4 ]",
   "[ 5/8 → 3/4 | s:hh n:1 end:0.020086608138500644 bank:RolandTR909 room:0.5 gain:0.4 ]",
-  "[ 5/8 → 3/4 | note:G1 s:sawtooth decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 cutoff:800 resonance:8 ]",
+  "[ 5/8 → 3/4 | note:G1 s:sawtooth decay:0.1 sustain:0 ]",
   "[ 3/4 → 7/8 | s:hh n:1 end:0.02013941880355398 bank:RolandTR909 room:0.5 gain:0.4 ]",
-  "[ 7/8 → 1/1 | note:G1 s:sawtooth decay:0.1 sustain:0 lpattack:0.1 lpenv:-4 cutoff:800 resonance:8 ]",
+  "[ 7/8 → 1/1 | note:G1 s:sawtooth decay:0.1 sustain:0 ]",
 ]
 `;
 
@@ -7722,8 +7722,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ -1/8 ⇜ (0/1 → 3/8) | note:B3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:1699.6897509708342 ]",
   "[ -1/4 ⇜ (1/12 → 1/8) | note:A5 s:sawtooth gain:0.2536811842784369 attack:0.001 decay:0.2 sustain:0 hcutoff:5999.785818935017 cutoff:4000 ]",
   "[ -1/4 ⇜ (1/12 → 1/8) | note:C#5 s:sawtooth gain:0.2536811842784369 attack:0.001 decay:0.2 sustain:0 hcutoff:5999.785818935017 cutoff:4000 ]",
-  "[ 1/8 → 1/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1699.6897509708342 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 1/8 → 1/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1699.6897509708342 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 1/8 → 1/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1699.6897509708342 ]",
+  "[ 1/8 → 1/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1699.6897509708342 ]",
   "[ (1/8 → 5/12) ⇝ 1/2 | note:A5 s:sawtooth gain:0.26836160127988246 attack:0.001 decay:0.2 sustain:0 hcutoff:5994.647308096509 cutoff:4000 ]",
   "[ (1/8 → 5/12) ⇝ 1/2 | note:C#5 s:sawtooth gain:0.26836160127988246 attack:0.001 decay:0.2 sustain:0 hcutoff:5994.647308096509 cutoff:4000 ]",
   "[ -1/8 ⇜ (1/6 → 1/4) | note:F#5 s:sawtooth gain:0.2573601511491127 attack:0.001 decay:0.2 sustain:0 hcutoff:5999.143312438893 cutoff:4000 ]",
@@ -7735,14 +7735,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (1/4 → 7/12) ⇝ 5/8 | note:E5 s:sawtooth gain:0.2756442833140452 attack:0.001 decay:0.2 sustain:0 hcutoff:5989.512318936654 cutoff:4000 ]",
   "[ 0/1 ⇜ (1/3 → 3/8) | note:A5 s:sawtooth gain:0.26103468453995016 attack:0.001 decay:0.2 sustain:0 hcutoff:5998.072590601808 cutoff:4000 ]",
   "[ 0/1 ⇜ (1/3 → 3/8) | note:C#5 s:sawtooth gain:0.26103468453995016 attack:0.001 decay:0.2 sustain:0 hcutoff:5998.072590601808 cutoff:4000 ]",
-  "[ 3/8 → 1/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1765.826371664994 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 3/8 → 1/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1765.826371664994 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 3/8 → 1/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1765.826371664994 ]",
+  "[ 3/8 → 1/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1765.826371664994 ]",
   "[ (3/8 → 2/3) ⇝ 3/4 | note:A5 s:sawtooth gain:0.2828651860235305 attack:0.001 decay:0.2 sustain:0 hcutoff:5982.671142387316 cutoff:4000 ]",
   "[ (3/8 → 2/3) ⇝ 3/4 | note:C#5 s:sawtooth gain:0.2828651860235305 attack:0.001 decay:0.2 sustain:0 hcutoff:5982.671142387316 cutoff:4000 ]",
   "[ 1/8 ⇜ (5/12 → 1/2) | note:F#5 s:sawtooth gain:0.26836160127988246 attack:0.001 decay:0.2 sustain:0 hcutoff:5994.647308096509 cutoff:4000 ]",
   "[ 1/8 ⇜ (5/12 → 1/2) | note:A4 s:sawtooth gain:0.26836160127988246 attack:0.001 decay:0.2 sustain:0 hcutoff:5994.647308096509 cutoff:4000 ]",
-  "[ 1/2 → 5/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1798.799979846742 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 1/2 → 5/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1798.799979846742 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 1/2 → 5/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1798.799979846742 ]",
+  "[ 1/2 → 5/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1798.799979846742 ]",
   "[ 1/2 → 3/4 | note:F#5 s:sawtooth gain:0.28644702698548963 attack:0.001 decay:0.2 sustain:0 hcutoff:5978.612153434527 cutoff:4000 ]",
   "[ 1/2 → 3/4 | note:A4 s:sawtooth gain:0.28644702698548963 attack:0.001 decay:0.2 sustain:0 hcutoff:5978.612153434527 cutoff:4000 ]",
   "[ 1/2 → 3/4 | s:bd gain:0.7 ]",
@@ -7755,8 +7755,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (5/8 → 11/12) ⇝ 1/1 | note:C#5 s:sawtooth gain:0.29705226105983373 attack:0.001 decay:0.2 sustain:0 hcutoff:5963.890147645195 cutoff:4000 ]",
   "[ 3/8 ⇜ (2/3 → 3/4) | note:F#5 s:sawtooth gain:0.2828651860235305 attack:0.001 decay:0.2 sustain:0 hcutoff:5982.671142387316 cutoff:4000 ]",
   "[ 3/8 ⇜ (2/3 → 3/4) | note:A4 s:sawtooth gain:0.2828651860235305 attack:0.001 decay:0.2 sustain:0 hcutoff:5982.671142387316 cutoff:4000 ]",
-  "[ 3/4 → 7/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1864.4584935007128 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 3/4 → 7/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1864.4584935007128 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 3/4 → 7/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1864.4584935007128 ]",
+  "[ 3/4 → 7/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1864.4584935007128 ]",
   "[ 3/4 → 1/1 | note:F#5 s:sawtooth gain:0.300533478008833 attack:0.001 decay:0.2 sustain:0 hcutoff:5958.137268909887 cutoff:4000 ]",
   "[ 3/4 → 1/1 | note:A4 s:sawtooth gain:0.300533478008833 attack:0.001 decay:0.2 sustain:0 hcutoff:5958.137268909887 cutoff:4000 ]",
   "[ 3/4 → 1/1 | s:hh3 gain:0.7 ]",
@@ -7764,8 +7764,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (3/4 → 1/1) ⇝ 9/8 | note:E5 s:sawtooth gain:0.30398425548024827 attack:0.001 decay:0.2 sustain:0 hcutoff:5951.963201008076 cutoff:4000 ]",
   "[ 1/2 ⇜ (5/6 → 7/8) | note:A5 s:sawtooth gain:0.29000691362123476 attack:0.001 decay:0.2 sustain:0 hcutoff:5974.128467049176 cutoff:4000 ]",
   "[ 1/2 ⇜ (5/6 → 7/8) | note:C#5 s:sawtooth gain:0.29000691362123476 attack:0.001 decay:0.2 sustain:0 hcutoff:5974.128467049176 cutoff:4000 ]",
-  "[ 7/8 → 1/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1897.1038487394403 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 7/8 → 1/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1897.1038487394403 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 7/8 → 1/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1897.1038487394403 ]",
+  "[ 7/8 → 1/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1897.1038487394403 ]",
   "[ (7/8 → 1/1) ⇝ 5/4 | note:A5 s:sawtooth gain:0.3107861971007485 attack:0.001 decay:0.2 sustain:0 hcutoff:5938.355801271282 cutoff:4000 ]",
   "[ (7/8 → 1/1) ⇝ 5/4 | note:C#5 s:sawtooth gain:0.3107861971007485 attack:0.001 decay:0.2 sustain:0 hcutoff:5938.355801271282 cutoff:4000 ]",
   "[ 5/8 ⇜ (11/12 → 1/1) | note:F#5 s:sawtooth gain:0.29705226105983373 attack:0.001 decay:0.2 sustain:0 hcutoff:5963.890147645195 cutoff:4000 ]",
@@ -7781,8 +7781,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (1/1 → 4/3) ⇝ 11/8 | note:E5 s:sawtooth gain:0.317441699448191 attack:0.001 decay:0.2 sustain:0 hcutoff:5923.077274266886 cutoff:4000 ]",
   "[ 3/4 ⇜ (13/12 → 9/8) | note:A5 s:sawtooth gain:0.30398425548024827 attack:0.001 decay:0.2 sustain:0 hcutoff:5951.963201008076 cutoff:4000 ]",
   "[ 3/4 ⇜ (13/12 → 9/8) | note:C#5 s:sawtooth gain:0.30398425548024827 attack:0.001 decay:0.2 sustain:0 hcutoff:5951.963201008076 cutoff:4000 ]",
-  "[ 9/8 → 5/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1961.928446178906 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 9/8 → 5/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1961.928446178906 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 9/8 → 5/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1961.928446178906 ]",
+  "[ 9/8 → 5/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:1961.928446178906 ]",
   "[ (9/8 → 17/12) ⇝ 3/2 | note:A5 s:sawtooth gain:0.3239347288344676 attack:0.001 decay:0.2 sustain:0 hcutoff:5906.1380911341175 cutoff:4000 ]",
   "[ (9/8 → 17/12) ⇝ 3/2 | note:C#5 s:sawtooth gain:0.3239347288344676 attack:0.001 decay:0.2 sustain:0 hcutoff:5906.1380911341175 cutoff:4000 ]",
   "[ 7/8 ⇜ (7/6 → 5/4) | note:F#5 s:sawtooth gain:0.3107861971007485 attack:0.001 decay:0.2 sustain:0 hcutoff:5938.355801271282 cutoff:4000 ]",
@@ -7794,14 +7794,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (5/4 → 19/12) ⇝ 13/8 | note:E5 s:sawtooth gain:0.3302496429830646 attack:0.001 decay:0.2 sustain:0 hcutoff:5887.549861142967 cutoff:4000 ]",
   "[ 1/1 ⇜ (4/3 → 11/8) | note:A5 s:sawtooth gain:0.317441699448191 attack:0.001 decay:0.2 sustain:0 hcutoff:5923.077274266886 cutoff:4000 ]",
   "[ 1/1 ⇜ (4/3 → 11/8) | note:C#5 s:sawtooth gain:0.317441699448191 attack:0.001 decay:0.2 sustain:0 hcutoff:5923.077274266886 cutoff:4000 ]",
-  "[ 11/8 → 3/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2026.0015806698216 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 11/8 → 3/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2026.0015806698216 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 11/8 → 3/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2026.0015806698216 ]",
+  "[ 11/8 → 3/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2026.0015806698216 ]",
   "[ (11/8 → 5/3) ⇝ 7/4 | note:A5 s:sawtooth gain:0.3363712287126769 attack:0.001 decay:0.2 sustain:0 hcutoff:5867.325323737765 cutoff:4000 ]",
   "[ (11/8 → 5/3) ⇝ 7/4 | note:C#5 s:sawtooth gain:0.3363712287126769 attack:0.001 decay:0.2 sustain:0 hcutoff:5867.325323737765 cutoff:4000 ]",
   "[ 9/8 ⇜ (17/12 → 3/2) | note:F#5 s:sawtooth gain:0.3239347288344676 attack:0.001 decay:0.2 sustain:0 hcutoff:5906.1380911341175 cutoff:4000 ]",
   "[ 9/8 ⇜ (17/12 → 3/2) | note:A4 s:sawtooth gain:0.3239347288344676 attack:0.001 decay:0.2 sustain:0 hcutoff:5906.1380911341175 cutoff:4000 ]",
-  "[ 3/2 → 13/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2057.708031580958 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 3/2 → 13/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2057.708031580958 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 3/2 → 13/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2057.708031580958 ]",
+  "[ 3/2 → 13/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2057.708031580958 ]",
   "[ 3/2 → 7/4 | note:F#5 s:sawtooth gain:0.339354895673865 attack:0.001 decay:0.2 sustain:0 hcutoff:5856.603727730447 cutoff:4000 ]",
   "[ 3/2 → 7/4 | note:A4 s:sawtooth gain:0.339354895673865 attack:0.001 decay:0.2 sustain:0 hcutoff:5856.603727730447 cutoff:4000 ]",
   "[ 3/2 → 7/4 | s:bd gain:0.7 ]",
@@ -7818,8 +7818,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (13/8 → 2/1) ⇝ 17/8 | note:A3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2120.3652183367367 ]",
   "[ 11/8 ⇜ (5/3 → 7/4) | note:F#5 s:sawtooth gain:0.3363712287126769 attack:0.001 decay:0.2 sustain:0 hcutoff:5867.325323737765 cutoff:4000 ]",
   "[ 11/8 ⇜ (5/3 → 7/4) | note:A4 s:sawtooth gain:0.3363712287126769 attack:0.001 decay:0.2 sustain:0 hcutoff:5867.325323737765 cutoff:4000 ]",
-  "[ 7/4 → 15/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2120.3652183367367 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 7/4 → 15/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2120.3652183367367 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 7/4 → 15/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2120.3652183367367 ]",
+  "[ 7/4 → 15/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2120.3652183367367 ]",
   "[ 7/4 → 2/1 | note:F#5 s:sawtooth gain:0.3507338432270528 attack:0.001 decay:0.2 sustain:0 hcutoff:5809.698831278217 cutoff:4000 ]",
   "[ 7/4 → 2/1 | note:A4 s:sawtooth gain:0.3507338432270528 attack:0.001 decay:0.2 sustain:0 hcutoff:5809.698831278217 cutoff:4000 ]",
   "[ 7/4 → 2/1 | s:hh3 gain:0.7 ]",
@@ -7829,8 +7829,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (7/4 → 2/1) ⇝ 9/4 | note:A3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2135.8582993222344 ]",
   "[ 3/2 ⇜ (11/6 → 15/8) | note:A5 s:sawtooth gain:0.3422847385870941 attack:0.001 decay:0.2 sustain:0 hcutoff:5845.47833980621 cutoff:4000 ]",
   "[ 3/2 ⇜ (11/6 → 15/8) | note:C#5 s:sawtooth gain:0.3422847385870941 attack:0.001 decay:0.2 sustain:0 hcutoff:5845.47833980621 cutoff:4000 ]",
-  "[ 15/8 → 2/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2151.2782118349805 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 15/8 → 2/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2151.2782118349805 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 15/8 → 2/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2151.2782118349805 ]",
+  "[ 15/8 → 2/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2151.2782118349805 ]",
   "[ (15/8 → 2/1) ⇝ 9/4 | note:A5 s:sawtooth gain:0.35343108171056004 attack:0.001 decay:0.2 sustain:0 hcutoff:5796.978025372246 cutoff:4000 ]",
   "[ (15/8 → 2/1) ⇝ 9/4 | note:C#5 s:sawtooth gain:0.35343108171056004 attack:0.001 decay:0.2 sustain:0 hcutoff:5796.978025372246 cutoff:4000 ]",
   "[ (15/8 → 2/1) ⇝ 19/8 | note:F#3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2151.2782118349805 ]",
@@ -7854,8 +7854,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ 15/8 ⇜ (2/1 → 19/8) | note:A3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2212.17990613181 ]",
   "[ 7/4 ⇜ (25/12 → 17/8) | note:A5 s:sawtooth gain:0.3586370624427201 attack:0.001 decay:0.2 sustain:0 hcutoff:5770.357934562703 cutoff:4000 ]",
   "[ 7/4 ⇜ (25/12 → 17/8) | note:C#5 s:sawtooth gain:0.3586370624427201 attack:0.001 decay:0.2 sustain:0 hcutoff:5770.357934562703 cutoff:4000 ]",
-  "[ 17/8 → 9/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2212.17990613181 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 17/8 → 9/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2212.17990613181 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 17/8 → 9/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2212.17990613181 ]",
+  "[ 17/8 → 9/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2212.17990613181 ]",
   "[ (17/8 → 29/12) ⇝ 5/2 | note:A5 s:sawtooth gain:0.368251964143991 attack:0.001 decay:0.2 sustain:0 hcutoff:5712.469093657604 cutoff:4000 ]",
   "[ (17/8 → 29/12) ⇝ 5/2 | note:C#5 s:sawtooth gain:0.368251964143991 attack:0.001 decay:0.2 sustain:0 hcutoff:5712.469093657604 cutoff:4000 ]",
   "[ 15/8 ⇜ (13/6 → 9/4) | note:F#5 s:sawtooth gain:0.36114266880324397 attack:0.001 decay:0.2 sustain:0 hcutoff:5756.463210874651 cutoff:4000 ]",
@@ -7867,14 +7867,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (9/4 → 31/12) ⇝ 21/8 | note:E5 s:sawtooth gain:0.3726377219727376 attack:0.001 decay:0.2 sustain:0 hcutoff:5681.240017681994 cutoff:4000 ]",
   "[ 2/1 ⇜ (7/3 → 19/8) | note:A5 s:sawtooth gain:0.3635813269759728 attack:0.001 decay:0.2 sustain:0 hcutoff:5742.18185383172 cutoff:4000 ]",
   "[ 2/1 ⇜ (7/3 → 19/8) | note:C#5 s:sawtooth gain:0.3635813269759728 attack:0.001 decay:0.2 sustain:0 hcutoff:5742.18185383172 cutoff:4000 ]",
-  "[ 19/8 → 5/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2271.727259793624 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 19/8 → 5/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2271.727259793624 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 19/8 → 5/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2271.727259793624 ]",
+  "[ 19/8 → 5/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2271.727259793624 ]",
   "[ (19/8 → 8/3) ⇝ 11/4 | note:A5 s:sawtooth gain:0.3767280347874561 attack:0.001 decay:0.2 sustain:0 hcutoff:5648.516028753632 cutoff:4000 ]",
   "[ (19/8 → 8/3) ⇝ 11/4 | note:C#5 s:sawtooth gain:0.3767280347874561 attack:0.001 decay:0.2 sustain:0 hcutoff:5648.516028753632 cutoff:4000 ]",
   "[ 17/8 ⇜ (29/12 → 5/2) | note:F#5 s:sawtooth gain:0.368251964143991 attack:0.001 decay:0.2 sustain:0 hcutoff:5712.469093657604 cutoff:4000 ]",
   "[ 17/8 ⇜ (29/12 → 5/2) | note:A4 s:sawtooth gain:0.368251964143991 attack:0.001 decay:0.2 sustain:0 hcutoff:5712.469093657604 cutoff:4000 ]",
-  "[ 5/2 → 21/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2300.948092306816 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 5/2 → 21/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2300.948092306816 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 5/2 → 21/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2300.948092306816 ]",
+  "[ 5/2 → 21/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2300.948092306816 ]",
   "[ 5/2 → 11/4 | note:F#5 s:sawtooth gain:0.37865929150004085 attack:0.001 decay:0.2 sustain:0 hcutoff:5631.60041088523 cutoff:4000 ]",
   "[ 5/2 → 11/4 | note:A4 s:sawtooth gain:0.37865929150004085 attack:0.001 decay:0.2 sustain:0 hcutoff:5631.60041088523 cutoff:4000 ]",
   "[ 5/2 → 11/4 | s:bd gain:0.7 ]",
@@ -7887,8 +7887,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (21/8 → 35/12) ⇝ 3/1 | note:C#5 s:sawtooth gain:0.38398364517932737 attack:0.001 decay:0.2 sustain:0 hcutoff:5578.674030756363 cutoff:4000 ]",
   "[ 19/8 ⇜ (8/3 → 11/4) | note:F#5 s:sawtooth gain:0.3767280347874561 attack:0.001 decay:0.2 sustain:0 hcutoff:5648.516028753632 cutoff:4000 ]",
   "[ 19/8 ⇜ (8/3 → 11/4) | note:A4 s:sawtooth gain:0.3767280347874561 attack:0.001 decay:0.2 sustain:0 hcutoff:5648.516028753632 cutoff:4000 ]",
-  "[ 11/4 → 23/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2358.1960716159333 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 11/4 → 23/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2358.1960716159333 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 11/4 → 23/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2358.1960716159333 ]",
+  "[ 11/4 → 23/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2358.1960716159333 ]",
   "[ 11/4 → 3/1 | note:F#5 s:sawtooth gain:0.3855983939685166 attack:0.001 decay:0.2 sustain:0 hcutoff:5560.31547155504 cutoff:4000 ]",
   "[ 11/4 → 3/1 | note:A4 s:sawtooth gain:0.3855983939685166 attack:0.001 decay:0.2 sustain:0 hcutoff:5560.31547155504 cutoff:4000 ]",
   "[ 11/4 → 3/1 | s:hh3 gain:0.7 ]",
@@ -7896,8 +7896,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (11/4 → 3/1) ⇝ 25/8 | note:E5 s:sawtooth gain:0.3871314633555296 attack:0.001 decay:0.2 sustain:0 hcutoff:5541.603887904197 cutoff:4000 ]",
   "[ 5/2 ⇜ (17/6 → 23/8) | note:A5 s:sawtooth gain:0.38051304866630675 attack:0.001 decay:0.2 sustain:0 hcutoff:5614.319554259933 cutoff:4000 ]",
   "[ 5/2 ⇜ (17/6 → 23/8) | note:C#5 s:sawtooth gain:0.38051304866630675 attack:0.001 decay:0.2 sustain:0 hcutoff:5614.319554259933 cutoff:4000 ]",
-  "[ 23/8 → 3/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2386.1887343697626 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 23/8 → 3/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2386.1887343697626 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 23/8 → 3/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2386.1887343697626 ]",
+  "[ 23/8 → 3/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2386.1887343697626 ]",
   "[ (23/8 → 3/1) ⇝ 13/4 | note:A5 s:sawtooth gain:0.38994891982521085 attack:0.001 decay:0.2 sustain:0 hcutoff:5503.134531727652 cutoff:4000 ]",
   "[ (23/8 → 3/1) ⇝ 13/4 | note:C#5 s:sawtooth gain:0.38994891982521085 attack:0.001 decay:0.2 sustain:0 hcutoff:5503.134531727652 cutoff:4000 ]",
   "[ 21/8 ⇜ (35/12 → 3/1) | note:F#5 s:sawtooth gain:0.38398364517932737 attack:0.001 decay:0.2 sustain:0 hcutoff:5578.674030756363 cutoff:4000 ]",
@@ -7913,8 +7913,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (3/1 → 10/3) ⇝ 27/8 | note:E5 s:sawtooth gain:0.39242922708895556 attack:0.001 decay:0.2 sustain:0 hcutoff:5463.2923272018625 cutoff:4000 ]",
   "[ 11/4 ⇜ (37/12 → 25/8) | note:A5 s:sawtooth gain:0.3871314633555296 attack:0.001 decay:0.2 sustain:0 hcutoff:5541.603887904197 cutoff:4000 ]",
   "[ 11/4 ⇜ (37/12 → 25/8) | note:C#5 s:sawtooth gain:0.3871314633555296 attack:0.001 decay:0.2 sustain:0 hcutoff:5541.603887904197 cutoff:4000 ]",
-  "[ 25/8 → 13/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2440.8271075661924 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 25/8 → 13/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2440.8271075661924 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 25/8 → 13/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2440.8271075661924 ]",
+  "[ 25/8 → 13/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2440.8271075661924 ]",
   "[ (25/8 → 41/12) ⇝ 7/2 | note:A5 s:sawtooth gain:0.394566409869316 attack:0.001 decay:0.2 sustain:0 hcutoff:5422.104580183649 cutoff:4000 ]",
   "[ (25/8 → 41/12) ⇝ 7/2 | note:C#5 s:sawtooth gain:0.394566409869316 attack:0.001 decay:0.2 sustain:0 hcutoff:5422.104580183649 cutoff:4000 ]",
   "[ 23/8 ⇜ (19/6 → 13/4) | note:F#5 s:sawtooth gain:0.38994891982521085 attack:0.001 decay:0.2 sustain:0 hcutoff:5503.134531727652 cutoff:4000 ]",
@@ -7926,14 +7926,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (13/4 → 43/12) ⇝ 29/8 | note:E5 s:sawtooth gain:0.3963553195057793 attack:0.001 decay:0.2 sustain:0 hcutoff:5379.599518697443 cutoff:4000 ]",
   "[ 3/1 ⇜ (10/3 → 27/8) | note:A5 s:sawtooth gain:0.39242922708895556 attack:0.001 decay:0.2 sustain:0 hcutoff:5463.2923272018625 cutoff:4000 ]",
   "[ 3/1 ⇜ (10/3 → 27/8) | note:C#5 s:sawtooth gain:0.39242922708895556 attack:0.001 decay:0.2 sustain:0 hcutoff:5463.2923272018625 cutoff:4000 ]",
-  "[ 27/8 → 7/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2493.5603089922215 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 27/8 → 7/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2493.5603089922215 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 27/8 → 7/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2493.5603089922215 ]",
+  "[ 27/8 → 7/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2493.5603089922215 ]",
   "[ (27/8 → 11/3) ⇝ 15/4 | note:A5 s:sawtooth gain:0.3977916463583412 attack:0.001 decay:0.2 sustain:0 hcutoff:5335.806273589214 cutoff:4000 ]",
   "[ (27/8 → 11/3) ⇝ 15/4 | note:C#5 s:sawtooth gain:0.3977916463583412 attack:0.001 decay:0.2 sustain:0 hcutoff:5335.806273589214 cutoff:4000 ]",
   "[ 25/8 ⇜ (41/12 → 7/2) | note:F#5 s:sawtooth gain:0.394566409869316 attack:0.001 decay:0.2 sustain:0 hcutoff:5422.104580183649 cutoff:4000 ]",
   "[ 25/8 ⇜ (41/12 → 7/2) | note:A4 s:sawtooth gain:0.394566409869316 attack:0.001 decay:0.2 sustain:0 hcutoff:5422.104580183649 cutoff:4000 ]",
-  "[ 7/2 → 29/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2519.1725829012184 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 7/2 → 29/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2519.1725829012184 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 7/2 → 29/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2519.1725829012184 ]",
+  "[ 7/2 → 29/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2519.1725829012184 ]",
   "[ 7/2 → 15/4 | note:F#5 s:sawtooth gain:0.3983764764947172 attack:0.001 decay:0.2 sustain:0 hcutoff:5313.435927530719 cutoff:4000 ]",
   "[ 7/2 → 15/4 | note:A4 s:sawtooth gain:0.3983764764947172 attack:0.001 decay:0.2 sustain:0 hcutoff:5313.435927530719 cutoff:4000 ]",
   "[ 7/2 → 15/4 | s:bd gain:0.7 ]",
@@ -7950,8 +7950,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (29/8 → 4/1) ⇝ 33/8 | note:B3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2568.811347023862 ]",
   "[ 27/8 ⇜ (11/3 → 15/4) | note:F#5 s:sawtooth gain:0.3977916463583412 attack:0.001 decay:0.2 sustain:0 hcutoff:5335.806273589214 cutoff:4000 ]",
   "[ 27/8 ⇜ (11/3 → 15/4) | note:A4 s:sawtooth gain:0.3977916463583412 attack:0.001 decay:0.2 sustain:0 hcutoff:5335.806273589214 cutoff:4000 ]",
-  "[ 15/4 → 31/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2568.811347023862 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 15/4 → 31/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2568.811347023862 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 15/4 → 31/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2568.811347023862 ]",
+  "[ 15/4 → 31/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2568.811347023862 ]",
   "[ 15/4 → 4/1 | note:F#5 s:sawtooth gain:0.3998193184307759 attack:0.001 decay:0.2 sustain:0 hcutoff:5220.886439234386 cutoff:4000 ]",
   "[ 15/4 → 4/1 | note:A4 s:sawtooth gain:0.3998193184307759 attack:0.001 decay:0.2 sustain:0 hcutoff:5220.886439234386 cutoff:4000 ]",
   "[ 15/4 → 4/1 | s:hh3 gain:0.7 ]",
@@ -7961,8 +7961,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (15/4 → 4/1) ⇝ 17/4 | note:B3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2580.8797353950404 ]",
   "[ 7/2 ⇜ (23/6 → 31/8) | note:A5 s:sawtooth gain:0.3988719301898066 attack:0.001 decay:0.2 sustain:0 hcutoff:5290.754858561636 cutoff:4000 ]",
   "[ 7/2 ⇜ (23/6 → 31/8) | note:C#5 s:sawtooth gain:0.3988719301898066 attack:0.001 decay:0.2 sustain:0 hcutoff:5290.754858561636 cutoff:4000 ]",
-  "[ 31/8 → 4/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2592.8079367021132 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 31/8 → 4/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2592.8079367021132 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 31/8 → 4/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2592.8079367021132 ]",
+  "[ 31/8 → 4/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2592.8079367021132 ]",
   "[ 31/8 → 4/1 | s:bd gain:0.7 ]",
   "[ (31/8 → 4/1) ⇝ 17/4 | note:A5 s:sawtooth gain:0.3999548228044306 attack:0.001 decay:0.2 sustain:0 hcutoff:5197.0018638323545 cutoff:4000 ]",
   "[ (31/8 → 4/1) ⇝ 17/4 | note:C#5 s:sawtooth gain:0.3999548228044306 attack:0.001 decay:0.2 sustain:0 hcutoff:5197.0018638323545 cutoff:4000 ]",
@@ -7987,8 +7987,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ 31/8 ⇜ (4/1 → 35/8) | note:B3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2639.083266757757 ]",
   "[ 15/4 ⇜ (49/12 → 33/8) | note:A5 s:sawtooth gain:0.3999548228044306 attack:0.001 decay:0.2 sustain:0 hcutoff:5148.3645377501725 cutoff:4000 ]",
   "[ 15/4 ⇜ (49/12 → 33/8) | note:C#5 s:sawtooth gain:0.3999548228044306 attack:0.001 decay:0.2 sustain:0 hcutoff:5148.3645377501725 cutoff:4000 ]",
-  "[ 33/8 → 17/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2639.083266757757 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 33/8 → 17/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2639.083266757757 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 33/8 → 17/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2639.083266757757 ]",
+  "[ 33/8 → 17/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2639.083266757757 ]",
   "[ (33/8 → 53/12) ⇝ 9/2 | note:A5 s:sawtooth gain:0.3988719301898066 attack:0.001 decay:0.2 sustain:0 hcutoff:5047.734873274585 cutoff:4000 ]",
   "[ (33/8 → 53/12) ⇝ 9/2 | note:C#5 s:sawtooth gain:0.3988719301898066 attack:0.001 decay:0.2 sustain:0 hcutoff:5047.734873274585 cutoff:4000 ]",
   "[ 31/8 ⇜ (25/6 → 17/4) | note:F#5 s:sawtooth gain:0.3998193184307759 attack:0.001 decay:0.2 sustain:0 hcutoff:5123.62012082546 cutoff:4000 ]",
@@ -8000,14 +8000,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (17/4 → 55/12) ⇝ 37/8 | note:E5 s:sawtooth gain:0.3977916463583412 attack:0.001 decay:0.2 sustain:0 hcutoff:4995.811501426648 cutoff:4000 ]",
   "[ 4/1 ⇜ (13/3 → 35/8) | note:A5 s:sawtooth gain:0.3995935685018036 attack:0.001 decay:0.2 sustain:0 hcutoff:5098.597504951462 cutoff:4000 ]",
   "[ 4/1 ⇜ (13/3 → 35/8) | note:C#5 s:sawtooth gain:0.3995935685018036 attack:0.001 decay:0.2 sustain:0 hcutoff:5098.597504951462 cutoff:4000 ]",
-  "[ 35/8 → 9/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2682.97580859032 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 35/8 → 9/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2682.97580859032 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 35/8 → 9/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2682.97580859032 ]",
+  "[ 35/8 → 9/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2682.97580859032 ]",
   "[ (35/8 → 14/3) ⇝ 19/4 | note:A5 s:sawtooth gain:0.3963553195057793 attack:0.001 decay:0.2 sustain:0 hcutoff:4942.862975093085 cutoff:4000 ]",
   "[ (35/8 → 14/3) ⇝ 19/4 | note:C#5 s:sawtooth gain:0.3963553195057793 attack:0.001 decay:0.2 sustain:0 hcutoff:4942.862975093085 cutoff:4000 ]",
   "[ 33/8 ⇜ (53/12 → 9/2) | note:F#5 s:sawtooth gain:0.3988719301898066 attack:0.001 decay:0.2 sustain:0 hcutoff:5047.734873274585 cutoff:4000 ]",
   "[ 33/8 ⇜ (53/12 → 9/2) | note:A4 s:sawtooth gain:0.3988719301898066 attack:0.001 decay:0.2 sustain:0 hcutoff:5047.734873274585 cutoff:4000 ]",
-  "[ 9/2 → 37/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2703.995258572327 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 9/2 → 37/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2703.995258572327 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 9/2 → 37/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2703.995258572327 ]",
+  "[ 9/2 → 37/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2703.995258572327 ]",
   "[ 9/2 → 19/4 | note:F#5 s:sawtooth gain:0.3955046879791817 attack:0.001 decay:0.2 sustain:0 hcutoff:4916.015592312082 cutoff:4000 ]",
   "[ 9/2 → 19/4 | note:A4 s:sawtooth gain:0.3955046879791817 attack:0.001 decay:0.2 sustain:0 hcutoff:4916.015592312082 cutoff:4000 ]",
   "[ 9/2 → 19/4 | s:bd gain:0.7 ]",
@@ -8020,8 +8020,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (37/8 → 59/12) ⇝ 5/1 | note:C#5 s:sawtooth gain:0.39242922708895556 attack:0.001 decay:0.2 sustain:0 hcutoff:4834.036289789029 cutoff:4000 ]",
   "[ 35/8 ⇜ (14/3 → 19/4) | note:F#5 s:sawtooth gain:0.3963553195057793 attack:0.001 decay:0.2 sustain:0 hcutoff:4942.862975093085 cutoff:4000 ]",
   "[ 35/8 ⇜ (14/3 → 19/4) | note:A4 s:sawtooth gain:0.3963553195057793 attack:0.001 decay:0.2 sustain:0 hcutoff:4942.862975093085 cutoff:4000 ]",
-  "[ 19/4 → 39/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2744.1172176410028 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 19/4 → 39/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2744.1172176410028 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 19/4 → 39/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2744.1172176410028 ]",
+  "[ 19/4 → 39/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2744.1172176410028 ]",
   "[ 19/4 → 5/1 | note:F#5 s:sawtooth gain:0.3912316097774532 attack:0.001 decay:0.2 sustain:0 hcutoff:4806.246411789873 cutoff:4000 ]",
   "[ 19/4 → 5/1 | note:A4 s:sawtooth gain:0.3912316097774532 attack:0.001 decay:0.2 sustain:0 hcutoff:4806.246411789873 cutoff:4000 ]",
   "[ 19/4 → 5/1 | s:hh3 gain:0.7 ]",
@@ -8029,8 +8029,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (19/4 → 5/1) ⇝ 41/8 | note:E5 s:sawtooth gain:0.38994891982521085 attack:0.001 decay:0.2 sustain:0 hcutoff:4778.23271519263 cutoff:4000 ]",
   "[ 9/2 ⇜ (29/6 → 39/8) | note:A5 s:sawtooth gain:0.394566409869316 attack:0.001 decay:0.2 sustain:0 hcutoff:4888.925582549005 cutoff:4000 ]",
   "[ 9/2 ⇜ (29/6 → 39/8) | note:C#5 s:sawtooth gain:0.394566409869316 attack:0.001 decay:0.2 sustain:0 hcutoff:4888.925582549005 cutoff:4000 ]",
-  "[ 39/8 → 5/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2763.195558759784 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 39/8 → 5/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2763.195558759784 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 39/8 → 5/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2763.195558759784 ]",
+  "[ 39/8 → 5/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2763.195558759784 ]",
   "[ (39/8 → 5/1) ⇝ 21/4 | note:A5 s:sawtooth gain:0.3871314633555296 attack:0.001 decay:0.2 sustain:0 hcutoff:4721.553103742387 cutoff:4000 ]",
   "[ (39/8 → 5/1) ⇝ 21/4 | note:C#5 s:sawtooth gain:0.3871314633555296 attack:0.001 decay:0.2 sustain:0 hcutoff:4721.553103742387 cutoff:4000 ]",
   "[ 37/8 ⇜ (59/12 → 5/1) | note:F#5 s:sawtooth gain:0.39242922708895556 attack:0.001 decay:0.2 sustain:0 hcutoff:4834.036289789029 cutoff:4000 ]",
@@ -8046,8 +8046,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (5/1 → 16/3) ⇝ 43/8 | note:E5 s:sawtooth gain:0.38398364517932737 attack:0.001 decay:0.2 sustain:0 hcutoff:4664.036300812779 cutoff:4000 ]",
   "[ 19/4 ⇜ (61/12 → 41/8) | note:A5 s:sawtooth gain:0.38994891982521085 attack:0.001 decay:0.2 sustain:0 hcutoff:4778.23271519263 cutoff:4000 ]",
   "[ 19/4 ⇜ (61/12 → 41/8) | note:C#5 s:sawtooth gain:0.38994891982521085 attack:0.001 decay:0.2 sustain:0 hcutoff:4778.23271519263 cutoff:4000 ]",
-  "[ 41/8 → 21/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2799.329510692108 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 41/8 → 21/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2799.329510692108 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 41/8 → 21/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2799.329510692108 ]",
+  "[ 41/8 → 21/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2799.329510692108 ]",
   "[ (41/8 → 65/12) ⇝ 11/2 | note:A5 s:sawtooth gain:0.38051304866630675 attack:0.001 decay:0.2 sustain:0 hcutoff:4605.721725547503 cutoff:4000 ]",
   "[ (41/8 → 65/12) ⇝ 11/2 | note:C#5 s:sawtooth gain:0.38051304866630675 attack:0.001 decay:0.2 sustain:0 hcutoff:4605.721725547503 cutoff:4000 ]",
   "[ 39/8 ⇜ (31/6 → 21/4) | note:F#5 s:sawtooth gain:0.3871314633555296 attack:0.001 decay:0.2 sustain:0 hcutoff:4721.553103742387 cutoff:4000 ]",
@@ -8059,14 +8059,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (21/4 → 67/12) ⇝ 45/8 | note:E5 s:sawtooth gain:0.3767280347874561 attack:0.001 decay:0.2 sustain:0 hcutoff:4546.64934384357 cutoff:4000 ]",
   "[ 5/1 ⇜ (16/3 → 43/8) | note:A5 s:sawtooth gain:0.38398364517932737 attack:0.001 decay:0.2 sustain:0 hcutoff:4664.036300812779 cutoff:4000 ]",
   "[ 5/1 ⇜ (16/3 → 43/8) | note:C#5 s:sawtooth gain:0.38398364517932737 attack:0.001 decay:0.2 sustain:0 hcutoff:4664.036300812779 cutoff:4000 ]",
-  "[ 43/8 → 11/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2832.694627163799 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 43/8 → 11/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2832.694627163799 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 43/8 → 11/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2832.694627163799 ]",
+  "[ 43/8 → 11/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2832.694627163799 ]",
   "[ (43/8 → 17/3) ⇝ 23/4 | note:A5 s:sawtooth gain:0.3726377219727376 attack:0.001 decay:0.2 sustain:0 hcutoff:4486.859640960669 cutoff:4000 ]",
   "[ (43/8 → 17/3) ⇝ 23/4 | note:C#5 s:sawtooth gain:0.3726377219727376 attack:0.001 decay:0.2 sustain:0 hcutoff:4486.859640960669 cutoff:4000 ]",
   "[ 41/8 ⇜ (65/12 → 11/2) | note:F#5 s:sawtooth gain:0.38051304866630675 attack:0.001 decay:0.2 sustain:0 hcutoff:4605.721725547503 cutoff:4000 ]",
   "[ 41/8 ⇜ (65/12 → 11/2) | note:A4 s:sawtooth gain:0.38051304866630675 attack:0.001 decay:0.2 sustain:0 hcutoff:4605.721725547503 cutoff:4000 ]",
-  "[ 11/2 → 45/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2848.313487543853 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 11/2 → 45/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2848.313487543853 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 11/2 → 45/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2848.313487543853 ]",
+  "[ 11/2 → 45/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2848.313487543853 ]",
   "[ 11/2 → 23/4 | note:F#5 s:sawtooth gain:0.3704811297220968 attack:0.001 decay:0.2 sustain:0 hcutoff:4456.708580912725 cutoff:4000 ]",
   "[ 11/2 → 23/4 | note:A4 s:sawtooth gain:0.3704811297220968 attack:0.001 decay:0.2 sustain:0 hcutoff:4456.708580912725 cutoff:4000 ]",
   "[ 11/2 → 23/4 | s:bd gain:0.7 ]",
@@ -8083,8 +8083,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (45/8 → 6/1) ⇝ 49/8 | note:A3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2877.376777172205 ]",
   "[ 43/8 ⇜ (17/3 → 23/4) | note:F#5 s:sawtooth gain:0.3726377219727376 attack:0.001 decay:0.2 sustain:0 hcutoff:4486.859640960669 cutoff:4000 ]",
   "[ 43/8 ⇜ (17/3 → 23/4) | note:A4 s:sawtooth gain:0.3726377219727376 attack:0.001 decay:0.2 sustain:0 hcutoff:4486.859640960669 cutoff:4000 ]",
-  "[ 23/4 → 47/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2877.376777172205 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 23/4 → 47/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2877.376777172205 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 23/4 → 47/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2877.376777172205 ]",
+  "[ 23/4 → 47/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2877.376777172205 ]",
   "[ 23/4 → 6/1 | note:F#5 s:sawtooth gain:0.36114266880324386 attack:0.001 decay:0.2 sustain:0 hcutoff:4334.517148084427 cutoff:4000 ]",
   "[ 23/4 → 6/1 | note:A4 s:sawtooth gain:0.36114266880324386 attack:0.001 decay:0.2 sustain:0 hcutoff:4334.517148084427 cutoff:4000 ]",
   "[ 23/4 → 6/1 | s:hh3 gain:0.7 ]",
@@ -8094,8 +8094,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (23/4 → 6/1) ⇝ 25/4 | note:A3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2884.183170199766 ]",
   "[ 11/2 ⇜ (35/6 → 47/8) | note:A5 s:sawtooth gain:0.368251964143991 attack:0.001 decay:0.2 sustain:0 hcutoff:4426.39359377459 cutoff:4000 ]",
   "[ 11/2 ⇜ (35/6 → 47/8) | note:C#5 s:sawtooth gain:0.368251964143991 attack:0.001 decay:0.2 sustain:0 hcutoff:4426.39359377459 cutoff:4000 ]",
-  "[ 47/8 → 6/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2890.803699781578 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 47/8 → 6/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2890.803699781578 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 47/8 → 6/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2890.803699781578 ]",
+  "[ 47/8 → 6/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2890.803699781578 ]",
   "[ (47/8 → 6/1) ⇝ 25/4 | note:A5 s:sawtooth gain:0.3586370624427201 attack:0.001 decay:0.2 sustain:0 hcutoff:4303.598663257904 cutoff:4000 ]",
   "[ (47/8 → 6/1) ⇝ 25/4 | note:C#5 s:sawtooth gain:0.3586370624427201 attack:0.001 decay:0.2 sustain:0 hcutoff:4303.598663257904 cutoff:4000 ]",
   "[ (47/8 → 6/1) ⇝ 51/8 | note:F#3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2890.803699781578 ]",
@@ -8119,8 +8119,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ 47/8 ⇜ (6/1 → 51/8) | note:A3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2915.4076660819765 ]",
   "[ 23/4 ⇜ (73/12 → 49/8) | note:A5 s:sawtooth gain:0.35343108171056015 attack:0.001 decay:0.2 sustain:0 hcutoff:4241.3539374389275 cutoff:4000 ]",
   "[ 23/4 ⇜ (73/12 → 49/8) | note:C#5 s:sawtooth gain:0.35343108171056015 attack:0.001 decay:0.2 sustain:0 hcutoff:4241.3539374389275 cutoff:4000 ]",
-  "[ 49/8 → 25/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2915.4076660819765 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 49/8 → 25/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2915.4076660819765 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 49/8 → 25/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2915.4076660819765 ]",
+  "[ 49/8 → 25/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2915.4076660819765 ]",
   "[ (49/8 → 77/12) ⇝ 13/2 | note:A5 s:sawtooth gain:0.3422847385870941 attack:0.001 decay:0.2 sustain:0 hcutoff:4115.383232572483 cutoff:4000 ]",
   "[ (49/8 → 77/12) ⇝ 13/2 | note:C#5 s:sawtooth gain:0.3422847385870941 attack:0.001 decay:0.2 sustain:0 hcutoff:4115.383232572483 cutoff:4000 ]",
   "[ 47/8 ⇜ (37/6 → 25/4) | note:F#5 s:sawtooth gain:0.3507338432270528 attack:0.001 decay:0.2 sustain:0 hcutoff:4210.038361759807 cutoff:4000 ]",
@@ -8132,14 +8132,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (25/4 → 79/12) ⇝ 53/8 | note:E5 s:sawtooth gain:0.3363712287126769 attack:0.001 decay:0.2 sustain:0 hcutoff:4051.743587553753 cutoff:4000 ]",
   "[ 6/1 ⇜ (19/3 → 51/8) | note:A5 s:sawtooth gain:0.3479759264430665 attack:0.001 decay:0.2 sustain:0 hcutoff:4178.601124662687 cutoff:4000 ]",
   "[ 6/1 ⇜ (19/3 → 51/8) | note:C#5 s:sawtooth gain:0.3479759264430665 attack:0.001 decay:0.2 sustain:0 hcutoff:4178.601124662687 cutoff:4000 ]",
-  "[ 51/8 → 13/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2936.9631544781614 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 51/8 → 13/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2936.9631544781614 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 51/8 → 13/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2936.9631544781614 ]",
+  "[ 51/8 → 13/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2936.9631544781614 ]",
   "[ (51/8 → 20/3) ⇝ 27/4 | note:A5 s:sawtooth gain:0.3302496429830646 attack:0.001 decay:0.2 sustain:0 hcutoff:3987.7258050403216 cutoff:4000 ]",
   "[ (51/8 → 20/3) ⇝ 27/4 | note:C#5 s:sawtooth gain:0.3302496429830646 attack:0.001 decay:0.2 sustain:0 hcutoff:3987.7258050403216 cutoff:4000 ]",
   "[ 49/8 ⇜ (77/12 → 13/2) | note:F#5 s:sawtooth gain:0.3422847385870941 attack:0.001 decay:0.2 sustain:0 hcutoff:4115.383232572483 cutoff:4000 ]",
   "[ 49/8 ⇜ (77/12 → 13/2) | note:A4 s:sawtooth gain:0.3422847385870941 attack:0.001 decay:0.2 sustain:0 hcutoff:4115.383232572483 cutoff:4000 ]",
-  "[ 13/2 → 53/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2946.5812012110136 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 13/2 → 53/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2946.5812012110136 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 13/2 → 53/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2946.5812012110136 ]",
+  "[ 13/2 → 53/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2946.5812012110136 ]",
   "[ 13/2 → 27/4 | note:F#5 s:sawtooth gain:0.3271154116289833 attack:0.001 decay:0.2 sustain:0 hcutoff:3955.588813730369 cutoff:4000 ]",
   "[ 13/2 → 27/4 | note:A4 s:sawtooth gain:0.3271154116289833 attack:0.001 decay:0.2 sustain:0 hcutoff:3955.588813730369 cutoff:4000 ]",
   "[ 13/2 → 27/4 | s:bd gain:0.7 ]",
@@ -8152,8 +8152,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (53/8 → 83/12) ⇝ 7/1 | note:C#5 s:sawtooth gain:0.3174416994481911 attack:0.001 decay:0.2 sustain:0 hcutoff:3858.7315549779487 cutoff:4000 ]",
   "[ 51/8 ⇜ (20/3 → 27/4) | note:F#5 s:sawtooth gain:0.3302496429830646 attack:0.001 decay:0.2 sustain:0 hcutoff:3987.7258050403216 cutoff:4000 ]",
   "[ 51/8 ⇜ (20/3 → 27/4) | note:A4 s:sawtooth gain:0.3302496429830646 attack:0.001 decay:0.2 sustain:0 hcutoff:3987.7258050403216 cutoff:4000 ]",
-  "[ 27/4 → 55/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2963.468935477506 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 27/4 → 55/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2963.468935477506 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 27/4 → 55/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2963.468935477506 ]",
+  "[ 27/4 → 55/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2963.468935477506 ]",
   "[ 27/4 → 7/1 | note:F#5 s:sawtooth gain:0.31413326401454233 attack:0.001 decay:0.2 sustain:0 hcutoff:3826.315480550129 cutoff:4000 ]",
   "[ 27/4 → 7/1 | note:A4 s:sawtooth gain:0.31413326401454233 attack:0.001 decay:0.2 sustain:0 hcutoff:3826.315480550129 cutoff:4000 ]",
   "[ 27/4 → 7/1 | s:hh3 gain:0.7 ]",
@@ -8161,8 +8161,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (27/4 → 7/1) ⇝ 57/8 | note:E5 s:sawtooth gain:0.3107861971007485 attack:0.001 decay:0.2 sustain:0 hcutoff:3793.8434936445938 cutoff:4000 ]",
   "[ 13/2 ⇜ (41/6 → 55/8) | note:A5 s:sawtooth gain:0.32393472883446767 attack:0.001 decay:0.2 sustain:0 hcutoff:3923.373759622562 cutoff:4000 ]",
   "[ 13/2 ⇜ (41/6 → 55/8) | note:C#5 s:sawtooth gain:0.32393472883446767 attack:0.001 decay:0.2 sustain:0 hcutoff:3923.373759622562 cutoff:4000 ]",
-  "[ 55/8 → 7/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2970.728450471497 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 55/8 → 7/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2970.728450471497 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 55/8 → 7/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2970.728450471497 ]",
+  "[ 55/8 → 7/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2970.728450471497 ]",
   "[ (55/8 → 7/1) ⇝ 29/4 | note:A5 s:sawtooth gain:0.30398425548024827 attack:0.001 decay:0.2 sustain:0 hcutoff:3728.7540466585065 cutoff:4000 ]",
   "[ (55/8 → 7/1) ⇝ 29/4 | note:C#5 s:sawtooth gain:0.30398425548024827 attack:0.001 decay:0.2 sustain:0 hcutoff:3728.7540466585065 cutoff:4000 ]",
   "[ 53/8 ⇜ (83/12 → 7/1) | note:F#5 s:sawtooth gain:0.3174416994481911 attack:0.001 decay:0.2 sustain:0 hcutoff:3858.7315549779487 cutoff:4000 ]",
@@ -8178,8 +8178,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (7/1 → 22/3) ⇝ 59/8 | note:E5 s:sawtooth gain:0.29705226105983373 attack:0.001 decay:0.2 sustain:0 hcutoff:3663.507823075358 cutoff:4000 ]",
   "[ 27/4 ⇜ (85/12 → 57/8) | note:A5 s:sawtooth gain:0.3107861971007485 attack:0.001 decay:0.2 sustain:0 hcutoff:3793.8434936445938 cutoff:4000 ]",
   "[ 27/4 ⇜ (85/12 → 57/8) | note:C#5 s:sawtooth gain:0.3107861971007485 attack:0.001 decay:0.2 sustain:0 hcutoff:3793.8434936445938 cutoff:4000 ]",
-  "[ 57/8 → 29/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2982.856914513109 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 57/8 → 29/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2982.856914513109 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 57/8 → 29/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2982.856914513109 ]",
+  "[ 57/8 → 29/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2982.856914513109 ]",
   "[ (57/8 → 89/12) ⇝ 15/2 | note:A5 s:sawtooth gain:0.29000691362123476 attack:0.001 decay:0.2 sustain:0 hcutoff:3598.149539397671 cutoff:4000 ]",
   "[ (57/8 → 89/12) ⇝ 15/2 | note:C#5 s:sawtooth gain:0.29000691362123476 attack:0.001 decay:0.2 sustain:0 hcutoff:3598.149539397671 cutoff:4000 ]",
   "[ 55/8 ⇜ (43/6 → 29/4) | note:F#5 s:sawtooth gain:0.30398425548024827 attack:0.001 decay:0.2 sustain:0 hcutoff:3728.7540466585065 cutoff:4000 ]",
@@ -8191,14 +8191,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (29/4 → 91/12) ⇝ 61/8 | note:E5 s:sawtooth gain:0.28286518602353056 attack:0.001 decay:0.2 sustain:0 hcutoff:3532.7239889283615 cutoff:4000 ]",
   "[ 7/1 ⇜ (22/3 → 59/8) | note:A5 s:sawtooth gain:0.29705226105983373 attack:0.001 decay:0.2 sustain:0 hcutoff:3663.507823075358 cutoff:4000 ]",
   "[ 7/1 ⇜ (22/3 → 59/8) | note:C#5 s:sawtooth gain:0.29705226105983373 attack:0.001 decay:0.2 sustain:0 hcutoff:3663.507823075358 cutoff:4000 ]",
-  "[ 59/8 → 15/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2991.774409503181 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 59/8 → 15/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2991.774409503181 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 59/8 → 15/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2991.774409503181 ]",
+  "[ 59/8 → 15/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2991.774409503181 ]",
   "[ (59/8 → 23/3) ⇝ 31/4 | note:A5 s:sawtooth gain:0.2756442833140452 attack:0.001 decay:0.2 sustain:0 hcutoff:3467.276011071639 cutoff:4000 ]",
   "[ (59/8 → 23/3) ⇝ 31/4 | note:C#5 s:sawtooth gain:0.2756442833140452 attack:0.001 decay:0.2 sustain:0 hcutoff:3467.276011071639 cutoff:4000 ]",
   "[ 57/8 ⇜ (89/12 → 15/2) | note:F#5 s:sawtooth gain:0.29000691362123476 attack:0.001 decay:0.2 sustain:0 hcutoff:3598.149539397671 cutoff:4000 ]",
   "[ 57/8 ⇜ (89/12 → 15/2) | note:A4 s:sawtooth gain:0.29000691362123476 attack:0.001 decay:0.2 sustain:0 hcutoff:3598.149539397671 cutoff:4000 ]",
-  "[ 15/2 → 61/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2995.0220264467503 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 15/2 → 61/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2995.0220264467503 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 15/2 → 61/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2995.0220264467503 ]",
+  "[ 15/2 → 61/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2995.0220264467503 ]",
   "[ 15/2 → 31/4 | note:F#5 s:sawtooth gain:0.2720095711683043 attack:0.001 decay:0.2 sustain:0 hcutoff:3434.557629230318 cutoff:4000 ]",
   "[ 15/2 → 31/4 | note:A4 s:sawtooth gain:0.2720095711683043 attack:0.001 decay:0.2 sustain:0 hcutoff:3434.557629230318 cutoff:4000 ]",
   "[ 15/2 → 31/4 | s:bd gain:0.7 ]",
@@ -8215,8 +8215,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (61/8 → 8/1) ⇝ 65/8 | note:B3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2999.0852191942718 ]",
   "[ 59/8 ⇜ (23/3 → 31/4) | note:F#5 s:sawtooth gain:0.2756442833140452 attack:0.001 decay:0.2 sustain:0 hcutoff:3467.276011071639 cutoff:4000 ]",
   "[ 59/8 ⇜ (23/3 → 31/4) | note:A4 s:sawtooth gain:0.2756442833140452 attack:0.001 decay:0.2 sustain:0 hcutoff:3467.276011071639 cutoff:4000 ]",
-  "[ 31/4 → 63/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.0852191942718 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 31/4 → 63/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.0852191942718 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 31/4 → 63/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.0852191942718 ]",
+  "[ 31/4 → 63/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.0852191942718 ]",
   "[ 31/4 → 8/1 | note:F#5 s:sawtooth gain:0.2573601511491127 attack:0.001 decay:0.2 sustain:0 hcutoff:3303.852260680389 cutoff:4000 ]",
   "[ 31/4 → 8/1 | note:A4 s:sawtooth gain:0.2573601511491127 attack:0.001 decay:0.2 sustain:0 hcutoff:3303.852260680389 cutoff:4000 ]",
   "[ 31/4 → 8/1 | s:hh3 gain:0.7 ]",
@@ -8226,8 +8226,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (31/4 → 8/1) ⇝ 33/4 | note:B3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2999.5934052398757 ]",
   "[ 15/2 ⇜ (47/6 → 63/8) | note:A5 s:sawtooth gain:0.2683616012798825 attack:0.001 decay:0.2 sustain:0 hcutoff:3401.8504606023293 cutoff:4000 ]",
   "[ 15/2 ⇜ (47/6 → 63/8) | note:C#5 s:sawtooth gain:0.2683616012798825 attack:0.001 decay:0.2 sustain:0 hcutoff:3401.8504606023293 cutoff:4000 ]",
-  "[ 63/8 → 8/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.898347482845 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 63/8 → 8/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.898347482845 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 63/8 → 8/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.898347482845 ]",
+  "[ 63/8 → 8/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.898347482845 ]",
   "[ 63/8 → 8/1 | s:bd gain:0.7 ]",
   "[ (63/8 → 8/1) ⇝ 33/4 | note:A5 s:sawtooth gain:0.2536811842784369 attack:0.001 decay:0.2 sustain:0 hcutoff:3271.2459533414954 cutoff:4000 ]",
   "[ (63/8 → 8/1) ⇝ 33/4 | note:C#5 s:sawtooth gain:0.2536811842784369 attack:0.001 decay:0.2 sustain:0 hcutoff:3271.2459533414954 cutoff:4000 ]",
@@ -8252,8 +8252,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ 63/8 ⇜ (8/1 → 67/8) | note:B3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2999.0852191942718 ]",
   "[ 31/4 ⇜ (97/12 → 65/8) | note:A5 s:sawtooth gain:0.24631881572156322 attack:0.001 decay:0.2 sustain:0 hcutoff:3206.156506355406 cutoff:4000 ]",
   "[ 31/4 ⇜ (97/12 → 65/8) | note:C#5 s:sawtooth gain:0.24631881572156322 attack:0.001 decay:0.2 sustain:0 hcutoff:3206.156506355406 cutoff:4000 ]",
-  "[ 65/8 → 33/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.0852191942718 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 65/8 → 33/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.0852191942718 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 65/8 → 33/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.0852191942718 ]",
+  "[ 65/8 → 33/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2999.0852191942718 ]",
   "[ (65/8 → 101/12) ⇝ 17/2 | note:A5 s:sawtooth gain:0.2316383987201176 attack:0.001 decay:0.2 sustain:0 hcutoff:3076.6262403774385 cutoff:4000 ]",
   "[ (65/8 → 101/12) ⇝ 17/2 | note:C#5 s:sawtooth gain:0.2316383987201176 attack:0.001 decay:0.2 sustain:0 hcutoff:3076.6262403774385 cutoff:4000 ]",
   "[ 63/8 ⇜ (49/6 → 33/4) | note:F#5 s:sawtooth gain:0.24263984885088735 attack:0.001 decay:0.2 sustain:0 hcutoff:3173.6845194498705 cutoff:4000 ]",
@@ -8265,14 +8265,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (33/4 → 103/12) ⇝ 69/8 | note:E5 s:sawtooth gain:0.2243557166859549 attack:0.001 decay:0.2 sustain:0 hcutoff:3012.274194959679 cutoff:4000 ]",
   "[ 8/1 ⇜ (25/3 → 67/8) | note:A5 s:sawtooth gain:0.2389653154600499 attack:0.001 decay:0.2 sustain:0 hcutoff:3141.2684450220513 cutoff:4000 ]",
   "[ 8/1 ⇜ (25/3 → 67/8) | note:C#5 s:sawtooth gain:0.2389653154600499 attack:0.001 decay:0.2 sustain:0 hcutoff:3141.2684450220513 cutoff:4000 ]",
-  "[ 67/8 → 17/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2995.0220264467503 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 67/8 → 17/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2995.0220264467503 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 67/8 → 17/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2995.0220264467503 ]",
+  "[ 67/8 → 17/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2995.0220264467503 ]",
   "[ (67/8 → 26/3) ⇝ 35/4 | note:A5 s:sawtooth gain:0.21713481397646955 attack:0.001 decay:0.2 sustain:0 hcutoff:2948.256412446248 cutoff:4000 ]",
   "[ (67/8 → 26/3) ⇝ 35/4 | note:C#5 s:sawtooth gain:0.21713481397646955 attack:0.001 decay:0.2 sustain:0 hcutoff:2948.256412446248 cutoff:4000 ]",
   "[ 65/8 ⇜ (101/12 → 17/2) | note:F#5 s:sawtooth gain:0.2316383987201176 attack:0.001 decay:0.2 sustain:0 hcutoff:3076.6262403774385 cutoff:4000 ]",
   "[ 65/8 ⇜ (101/12 → 17/2) | note:A4 s:sawtooth gain:0.2316383987201176 attack:0.001 decay:0.2 sustain:0 hcutoff:3076.6262403774385 cutoff:4000 ]",
-  "[ 17/2 → 69/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2991.774409503181 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 17/2 → 69/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2991.774409503181 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 17/2 → 69/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2991.774409503181 ]",
+  "[ 17/2 → 69/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2991.774409503181 ]",
   "[ 17/2 → 35/4 | note:F#5 s:sawtooth gain:0.21355297301451046 attack:0.001 decay:0.2 sustain:0 hcutoff:2916.386590360237 cutoff:4000 ]",
   "[ 17/2 → 35/4 | note:A4 s:sawtooth gain:0.21355297301451046 attack:0.001 decay:0.2 sustain:0 hcutoff:2916.386590360237 cutoff:4000 ]",
   "[ 17/2 → 35/4 | s:bd gain:0.7 ]",
@@ -8285,8 +8285,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (69/8 → 107/12) ⇝ 9/1 | note:C#5 s:sawtooth gain:0.20294773894016632 attack:0.001 decay:0.2 sustain:0 hcutoff:2821.398875337315 cutoff:4000 ]",
   "[ 67/8 ⇜ (26/3 → 35/4) | note:F#5 s:sawtooth gain:0.21713481397646955 attack:0.001 decay:0.2 sustain:0 hcutoff:2948.256412446248 cutoff:4000 ]",
   "[ 67/8 ⇜ (26/3 → 35/4) | note:A4 s:sawtooth gain:0.21713481397646955 attack:0.001 decay:0.2 sustain:0 hcutoff:2948.256412446248 cutoff:4000 ]",
-  "[ 35/4 → 71/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2982.856914513109 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 35/4 → 71/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2982.856914513109 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 35/4 → 71/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2982.856914513109 ]",
+  "[ 35/4 → 71/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2982.856914513109 ]",
   "[ 35/4 → 9/1 | note:F#5 s:sawtooth gain:0.19946652199116702 attack:0.001 decay:0.2 sustain:0 hcutoff:2789.9616382401937 cutoff:4000 ]",
   "[ 35/4 → 9/1 | note:A4 s:sawtooth gain:0.19946652199116702 attack:0.001 decay:0.2 sustain:0 hcutoff:2789.9616382401937 cutoff:4000 ]",
   "[ 35/4 → 9/1 | s:hh3 gain:0.7 ]",
@@ -8294,8 +8294,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (35/4 → 9/1) ⇝ 73/8 | note:E5 s:sawtooth gain:0.1960157445197518 attack:0.001 decay:0.2 sustain:0 hcutoff:2758.6460625610725 cutoff:4000 ]",
   "[ 17/2 ⇜ (53/6 → 71/8) | note:A5 s:sawtooth gain:0.2099930863787653 attack:0.001 decay:0.2 sustain:0 hcutoff:2884.6167674275184 cutoff:4000 ]",
   "[ 17/2 ⇜ (53/6 → 71/8) | note:C#5 s:sawtooth gain:0.2099930863787653 attack:0.001 decay:0.2 sustain:0 hcutoff:2884.6167674275184 cutoff:4000 ]",
-  "[ 71/8 → 9/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2977.1924080321423 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 71/8 → 9/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2977.1924080321423 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 71/8 → 9/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2977.1924080321423 ]",
+  "[ 71/8 → 9/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2977.1924080321423 ]",
   "[ (71/8 → 9/1) ⇝ 37/4 | note:A5 s:sawtooth gain:0.18921380289925155 attack:0.001 decay:0.2 sustain:0 hcutoff:2696.4013367420957 cutoff:4000 ]",
   "[ (71/8 → 9/1) ⇝ 37/4 | note:C#5 s:sawtooth gain:0.18921380289925155 attack:0.001 decay:0.2 sustain:0 hcutoff:2696.4013367420957 cutoff:4000 ]",
   "[ 69/8 ⇜ (107/12 → 9/1) | note:F#5 s:sawtooth gain:0.20294773894016632 attack:0.001 decay:0.2 sustain:0 hcutoff:2821.398875337315 cutoff:4000 ]",
@@ -8311,8 +8311,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (9/1 → 28/3) ⇝ 75/8 | note:E5 s:sawtooth gain:0.182558300551809 attack:0.001 decay:0.2 sustain:0 hcutoff:2634.707357306267 cutoff:4000 ]",
   "[ 35/4 ⇜ (109/12 → 73/8) | note:A5 s:sawtooth gain:0.1960157445197518 attack:0.001 decay:0.2 sustain:0 hcutoff:2758.6460625610725 cutoff:4000 ]",
   "[ 35/4 ⇜ (109/12 → 73/8) | note:C#5 s:sawtooth gain:0.1960157445197518 attack:0.001 decay:0.2 sustain:0 hcutoff:2758.6460625610725 cutoff:4000 ]",
-  "[ 73/8 → 37/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2963.4689354775064 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 73/8 → 37/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2963.4689354775064 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 73/8 → 37/4 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2963.4689354775064 ]",
+  "[ 73/8 → 37/4 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2963.4689354775064 ]",
   "[ (73/8 → 113/12) ⇝ 19/2 | note:A5 s:sawtooth gain:0.17606527116553244 attack:0.001 decay:0.2 sustain:0 hcutoff:2573.60640622541 cutoff:4000 ]",
   "[ (73/8 → 113/12) ⇝ 19/2 | note:C#5 s:sawtooth gain:0.17606527116553244 attack:0.001 decay:0.2 sustain:0 hcutoff:2573.60640622541 cutoff:4000 ]",
   "[ 71/8 ⇜ (55/6 → 37/4) | note:F#5 s:sawtooth gain:0.18921380289925155 attack:0.001 decay:0.2 sustain:0 hcutoff:2696.4013367420957 cutoff:4000 ]",
@@ -8324,14 +8324,14 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (37/4 → 115/12) ⇝ 77/8 | note:E5 s:sawtooth gain:0.16975035701693547 attack:0.001 decay:0.2 sustain:0 hcutoff:2513.140359039332 cutoff:4000 ]",
   "[ 9/1 ⇜ (28/3 → 75/8) | note:A5 s:sawtooth gain:0.182558300551809 attack:0.001 decay:0.2 sustain:0 hcutoff:2634.707357306267 cutoff:4000 ]",
   "[ 9/1 ⇜ (28/3 → 75/8) | note:C#5 s:sawtooth gain:0.182558300551809 attack:0.001 decay:0.2 sustain:0 hcutoff:2634.707357306267 cutoff:4000 ]",
-  "[ 75/8 → 19/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2946.5812012110136 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 75/8 → 19/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2946.5812012110136 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 75/8 → 19/2 | note:D2 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2946.5812012110136 ]",
+  "[ 75/8 → 19/2 | note:D2 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2946.5812012110136 ]",
   "[ (75/8 → 29/3) ⇝ 39/4 | note:A5 s:sawtooth gain:0.16362877128732323 attack:0.001 decay:0.2 sustain:0 hcutoff:2453.350656156431 cutoff:4000 ]",
   "[ (75/8 → 29/3) ⇝ 39/4 | note:C#5 s:sawtooth gain:0.16362877128732323 attack:0.001 decay:0.2 sustain:0 hcutoff:2453.350656156431 cutoff:4000 ]",
   "[ 73/8 ⇜ (113/12 → 19/2) | note:F#5 s:sawtooth gain:0.17606527116553244 attack:0.001 decay:0.2 sustain:0 hcutoff:2573.60640622541 cutoff:4000 ]",
   "[ 73/8 ⇜ (113/12 → 19/2) | note:A4 s:sawtooth gain:0.17606527116553244 attack:0.001 decay:0.2 sustain:0 hcutoff:2573.60640622541 cutoff:4000 ]",
-  "[ 19/2 → 77/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2936.9631544781614 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 19/2 → 77/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2936.9631544781614 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 19/2 → 77/8 | note:D1 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2936.9631544781614 ]",
+  "[ 19/2 → 77/8 | note:D1 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2936.9631544781614 ]",
   "[ 19/2 → 39/4 | note:F#5 s:sawtooth gain:0.16064510432613502 attack:0.001 decay:0.2 sustain:0 hcutoff:2423.7222579792624 cutoff:4000 ]",
   "[ 19/2 → 39/4 | note:A4 s:sawtooth gain:0.16064510432613502 attack:0.001 decay:0.2 sustain:0 hcutoff:2423.7222579792624 cutoff:4000 ]",
   "[ 19/2 → 39/4 | s:bd gain:0.7 ]",
@@ -8348,8 +8348,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (77/8 → 10/1) ⇝ 81/8 | note:A3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2915.4076660819765 ]",
   "[ 75/8 ⇜ (29/3 → 39/4) | note:F#5 s:sawtooth gain:0.16362877128732323 attack:0.001 decay:0.2 sustain:0 hcutoff:2453.350656156431 cutoff:4000 ]",
   "[ 75/8 ⇜ (29/3 → 39/4) | note:A4 s:sawtooth gain:0.16362877128732323 attack:0.001 decay:0.2 sustain:0 hcutoff:2453.350656156431 cutoff:4000 ]",
-  "[ 39/4 → 79/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2915.4076660819765 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 39/4 → 79/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2915.4076660819765 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 39/4 → 79/8 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2915.4076660819765 ]",
+  "[ 39/4 → 79/8 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2915.4076660819765 ]",
   "[ 39/4 → 10/1 | note:F#5 s:sawtooth gain:0.14926615677294724 attack:0.001 decay:0.2 sustain:0 hcutoff:2307.1030993509794 cutoff:4000 ]",
   "[ 39/4 → 10/1 | note:A4 s:sawtooth gain:0.14926615677294724 attack:0.001 decay:0.2 sustain:0 hcutoff:2307.1030993509794 cutoff:4000 ]",
   "[ 39/4 → 10/1 | s:hh3 gain:0.7 ]",
@@ -8359,8 +8359,8 @@ exports[`renders tunes > tune: hyperpop 1`] = `
   "[ (39/4 → 10/1) ⇝ 41/4 | note:A3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2909.5402784268977 ]",
   "[ 19/2 ⇜ (59/6 → 79/8) | note:A5 s:sawtooth gain:0.157715261412906 attack:0.001 decay:0.2 sustain:0 hcutoff:2394.2782744524975 cutoff:4000 ]",
   "[ 19/2 ⇜ (59/6 → 79/8) | note:C#5 s:sawtooth gain:0.157715261412906 attack:0.001 decay:0.2 sustain:0 hcutoff:2394.2782744524975 cutoff:4000 ]",
-  "[ 79/8 → 10/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2903.483208638841 lpattack:0.1 lpenv:2 ftype:24db ]",
-  "[ 79/8 → 10/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2903.483208638841 lpattack:0.1 lpenv:2 ftype:24db ]",
+  "[ 79/8 → 10/1 | note:D3 s:sawtooth gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2903.483208638841 ]",
+  "[ 79/8 → 10/1 | note:D3 s:square gain:0.3 attack:0.01 decay:0.1 sustain:0.5 cutoff:2903.483208638841 ]",
   "[ (79/8 → 10/1) ⇝ 41/4 | note:A5 s:sawtooth gain:0.14656891828944 attack:0.001 decay:0.2 sustain:0 hcutoff:2278.446896257612 cutoff:4000 ]",
   "[ (79/8 → 10/1) ⇝ 41/4 | note:C#5 s:sawtooth gain:0.14656891828944 attack:0.001 decay:0.2 sustain:0 hcutoff:2278.446896257612 cutoff:4000 ]",
   "[ (79/8 → 10/1) ⇝ 83/8 | note:F#3 s:square gain:0.7 attack:0.01 decay:0.1 sustain:0 cutoff:2903.483208638841 ]",
@@ -8372,16 +8372,16 @@ exports[`renders tunes > tune: hyperpop 1`] = `
 
 exports[`renders tunes > tune: juxUndTollerei 1`] = `
 [
-  "[ 0/1 → 1/4 | note:bb3 s:sawtooth pan:0 cutoff:1188.2154262966046 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ 0/1 → 1/4 | note:c3 s:sawtooth pan:1 cutoff:1188.2154262966046 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ 1/4 → 1/2 | note:g3 s:sawtooth pan:0 cutoff:1361.2562095290161 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ 1/4 → 1/2 | note:eb3 s:sawtooth pan:1 cutoff:1361.2562095290161 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ 1/2 → 3/4 | note:eb3 s:sawtooth pan:0 cutoff:1524.257063143398 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ 1/2 → 3/4 | note:g3 s:sawtooth pan:1 cutoff:1524.257063143398 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ (101/200 → 1/1) ⇝ 201/200 | note:65 s:triangle pan:0 cutoff:1601.4815730092653 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ (101/200 → 1/1) ⇝ 201/200 | note:55 s:triangle pan:1 cutoff:1601.4815730092653 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ 3/4 → 1/1 | note:c3 s:sawtooth pan:0 cutoff:1670.953955747281 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
-  "[ 3/4 → 1/1 | note:bb3 s:sawtooth pan:1 cutoff:1670.953955747281 lpattack:0.2 lpenv:-2 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ 0/1 → 1/4 | note:bb3 s:sawtooth pan:0 cutoff:1188.2154262966046 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ 0/1 → 1/4 | note:c3 s:sawtooth pan:1 cutoff:1188.2154262966046 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ 1/4 → 1/2 | note:g3 s:sawtooth pan:0 cutoff:1361.2562095290161 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ 1/4 → 1/2 | note:eb3 s:sawtooth pan:1 cutoff:1361.2562095290161 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ 1/2 → 3/4 | note:eb3 s:sawtooth pan:0 cutoff:1524.257063143398 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ 1/2 → 3/4 | note:g3 s:sawtooth pan:1 cutoff:1524.257063143398 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ (101/200 → 1/1) ⇝ 201/200 | note:65 s:triangle pan:0 cutoff:1601.4815730092653 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ (101/200 → 1/1) ⇝ 201/200 | note:55 s:triangle pan:1 cutoff:1601.4815730092653 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ 3/4 → 1/1 | note:c3 s:sawtooth pan:0 cutoff:1670.953955747281 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
+  "[ 3/4 → 1/1 | note:bb3 s:sawtooth pan:1 cutoff:1670.953955747281 decay:0.05 sustain:0 room:0.6 delay:0.5 delaytime:0.1 delayfeedback:0.4 ]",
 ]
 `;
 
@@ -8422,8 +8422,8 @@ exports[`renders tunes > tune: meltingsubmarine 1`] = `
   "[ 0/1 → 3/16 | note:93.00057728554401 decay:0.1 sustain:0 s:triangle gain:0.075 ]",
   "[ 0/1 → 3/16 | note:93.04057728554402 decay:0.1 sustain:0 s:triangle gain:0.075 ]",
   "[ (0/1 → 1/1) ⇝ 3/2 | s:bd n:5 speed:0.7519542165100574 ]",
-  "[ (0/1 → 1/1) ⇝ 3/2 | note:33.129885541275144 decay:0.15 sustain:0 s:sawtooth gain:0.4 cutoff:3669.6267869262615 lpattack:0.1 lpenv:-2 ]",
-  "[ (0/1 → 1/1) ⇝ 3/2 | note:33.17988554127514 decay:0.15 sustain:0 s:sawtooth gain:0.4 cutoff:3669.6267869262615 lpattack:0.1 lpenv:-2 ]",
+  "[ (0/1 → 1/1) ⇝ 3/2 | note:33.129885541275144 decay:0.15 sustain:0 s:sawtooth gain:0.4 cutoff:3669.6267869262615 ]",
+  "[ (0/1 → 1/1) ⇝ 3/2 | note:33.17988554127514 decay:0.15 sustain:0 s:sawtooth gain:0.4 cutoff:3669.6267869262615 ]",
   "[ (0/1 → 1/1) ⇝ 3/2 | note:60.129885541275144 s:sawtooth gain:0.16 cutoff:500 attack:1 ]",
   "[ (0/1 → 1/1) ⇝ 3/2 | note:60.16988554127514 s:sawtooth gain:0.16 cutoff:500 attack:1 ]",
   "[ (0/1 → 1/1) ⇝ 3/2 | note:64.12988554127514 s:sawtooth gain:0.16 cutoff:500 attack:1 ]",
@@ -8481,6 +8481,21 @@ exports[`renders tunes > tune: orbit 1`] = `
 ]
 `;
 
+exports[`renders tunes > tune: outroMusic 1`] = `
+[
+  "[ 0/1 → 1/2 | s:hh speed:0.9036881079621337 n:3 ]",
+  "[ 0/1 → 3/4 | n:-7 note:C2 s:sawtooth attack:0.05 decay:0.1 sustain:0.7 cutoff:864.536878321087 gain:0.3 ]",
+  "[ 0/1 → 3/4 | s:bd speed:0.9107561463868479 n:3 ]",
+  "[ (0/1 → 1/1) ⇝ 3/1 | note:B3 s:gm_epiano1 n:1 attack:0.05 decay:0.1 sustain:0.7 cutoff:1111.7252990603447 gain:0.3 ]",
+  "[ (0/1 → 1/1) ⇝ 3/1 | note:D4 s:gm_epiano1 n:1 attack:0.05 decay:0.1 sustain:0.7 cutoff:1111.7252990603447 gain:0.3 ]",
+  "[ (0/1 → 1/1) ⇝ 3/1 | note:E4 s:gm_epiano1 n:1 attack:0.05 decay:0.1 sustain:0.7 cutoff:1111.7252990603447 gain:0.3 ]",
+  "[ (0/1 → 1/1) ⇝ 3/1 | note:G4 s:gm_epiano1 n:1 attack:0.05 decay:0.1 sustain:0.7 cutoff:1111.7252990603447 gain:0.3 ]",
+  "[ (0/1 → 1/1) ⇝ 9/2 | n:1 note:C5 s:gm_epiano1 attack:0.05 decay:0.1 sustain:0.7 cutoff:1111.7252990603447 gain:0.3 ]",
+  "[ 1/2 → 1/1 | s:hh speed:0.9519542165100575 n:3 ]",
+  "[ (3/4 → 1/1) ⇝ 3/2 | s:sd speed:0.9931522866332672 n:3 ]",
+]
+`;
+
 exports[`renders tunes > tune: randomBells 1`] = `
 [
   "[ -9/8 ⇜ (0/1 → 3/8) | note:G4 s:bell gain:0.6 delay:0.2 delaytime:0.3333333333333333 delayfeedback:0.8 ]",
@@ -10165,22 +10180,22 @@ exports[`renders tunes > tune: undergroundPlumber 1`] = `
 
 exports[`renders tunes > tune: waa2 1`] = `
 [
-  "[ -1/4 ⇜ (0/1 → 1/4) | note:48 clip:1.1738393178344886 s:sawtooth cutoff:3997.892048359052 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ -1/4 ⇜ (0/1 → 1/4) | note:64 clip:1.1738393178344886 s:sawtooth cutoff:3997.892048359052 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ (0/1 → 1/4) ⇝ 1/2 | note:62 clip:1.197659880151613 s:sawtooth cutoff:3991.5732716763446 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ (0/1 → 1/4) ⇝ 1/2 | note:43 clip:1.197659880151613 s:sawtooth cutoff:3991.5732716763446 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ 0/1 ⇜ (1/4 → 1/2) | note:62 clip:1.197659880151613 s:square cutoff:3991.5732716763446 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ 0/1 ⇜ (1/4 → 1/2) | note:43 clip:1.197659880151613 s:square cutoff:3991.5732716763446 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ (1/4 → 1/2) ⇝ 3/4 | note:74 clip:1.2451698046878117 s:square cutoff:3966.3742407056534 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ (1/4 → 1/2) ⇝ 3/4 | note:55 clip:1.2451698046878117 s:square cutoff:3966.3742407056534 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ 1/4 ⇜ (1/2 → 3/4) | note:74 clip:1.2451698046878117 s:sawtooth cutoff:3966.3742407056534 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ 1/4 ⇜ (1/2 → 3/4) | note:55 clip:1.2451698046878117 s:sawtooth cutoff:3966.3742407056534 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ 1/2 → 3/4 | note:50 clip:1.2688217886051745 s:sawtooth cutoff:3947.554693090452 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ (1/2 → 3/4) ⇝ 1/1 | note:69 clip:1.292380289809026 s:sawtooth cutoff:3924.645587531366 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ 1/2 ⇜ (3/4 → 1/1) | note:69 clip:1.292380289809026 s:square cutoff:3924.645587531366 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ 3/4 → 1/1 | note:41 clip:1.315826773713709 s:square cutoff:3897.7021140702864 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ 3/4 → 1/1 | note:62 clip:1.315826773713709 s:square cutoff:3897.7021140702864 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
-  "[ (3/4 → 1/1) ⇝ 5/4 | note:81 clip:1.315826773713709 s:square cutoff:3897.7021140702864 gain:0.5 room:0.5 lpattack:0.125 lpenv:-2 vib:8 vibmod:0.125 fanchor:0.25 ]",
+  "[ -1/4 ⇜ (0/1 → 1/4) | n:48 clip:1.1738393178344886 s:sawtooth cutoff:3997.892048359052 gain:0.5 room:0.5 ]",
+  "[ -1/4 ⇜ (0/1 → 1/4) | n:64 clip:1.1738393178344886 s:sawtooth cutoff:3997.892048359052 gain:0.5 room:0.5 ]",
+  "[ (0/1 → 1/4) ⇝ 1/2 | n:62 clip:1.197659880151613 s:sawtooth cutoff:3991.5732716763446 gain:0.5 room:0.5 ]",
+  "[ (0/1 → 1/4) ⇝ 1/2 | n:43 clip:1.197659880151613 s:sawtooth cutoff:3991.5732716763446 gain:0.5 room:0.5 ]",
+  "[ 0/1 ⇜ (1/4 → 1/2) | n:62 clip:1.197659880151613 s:square cutoff:3991.5732716763446 gain:0.5 room:0.5 ]",
+  "[ 0/1 ⇜ (1/4 → 1/2) | n:43 clip:1.197659880151613 s:square cutoff:3991.5732716763446 gain:0.5 room:0.5 ]",
+  "[ (1/4 → 1/2) ⇝ 3/4 | n:74 clip:1.2451698046878117 s:square cutoff:3966.3742407056534 gain:0.5 room:0.5 ]",
+  "[ (1/4 → 1/2) ⇝ 3/4 | n:55 clip:1.2451698046878117 s:square cutoff:3966.3742407056534 gain:0.5 room:0.5 ]",
+  "[ 1/4 ⇜ (1/2 → 3/4) | n:74 clip:1.2451698046878117 s:sawtooth cutoff:3966.3742407056534 gain:0.5 room:0.5 ]",
+  "[ 1/4 ⇜ (1/2 → 3/4) | n:55 clip:1.2451698046878117 s:sawtooth cutoff:3966.3742407056534 gain:0.5 room:0.5 ]",
+  "[ 1/2 → 3/4 | n:50 clip:1.2688217886051745 s:sawtooth cutoff:3947.554693090452 gain:0.5 room:0.5 ]",
+  "[ (1/2 → 3/4) ⇝ 1/1 | n:69 clip:1.292380289809026 s:sawtooth cutoff:3924.645587531366 gain:0.5 room:0.5 ]",
+  "[ 1/2 ⇜ (3/4 → 1/1) | n:69 clip:1.292380289809026 s:square cutoff:3924.645587531366 gain:0.5 room:0.5 ]",
+  "[ 3/4 → 1/1 | n:41 clip:1.315826773713709 s:square cutoff:3897.7021140702864 gain:0.5 room:0.5 ]",
+  "[ 3/4 → 1/1 | n:62 clip:1.315826773713709 s:square cutoff:3897.7021140702864 gain:0.5 room:0.5 ]",
+  "[ (3/4 → 1/1) ⇝ 5/4 | n:81 clip:1.315826773713709 s:square cutoff:3897.7021140702864 gain:0.5 room:0.5 ]",
 ]
 `;
 

website/package.json

@@ -28,18 +28,15 @@
     "@strudel.cycles/mini": "workspace:*",
     "@strudel.cycles/osc": "workspace:*",
     "@strudel.cycles/react": "workspace:*",
-    "@strudel/codemirror": "workspace:*",
     "@strudel.cycles/serial": "workspace:*",
     "@strudel.cycles/soundfonts": "workspace:*",
     "@strudel.cycles/tonal": "workspace:*",
     "@strudel.cycles/transpiler": "workspace:*",
     "@strudel.cycles/webaudio": "workspace:*",
     "@strudel.cycles/xen": "workspace:*",
-    "@strudel/desktopbridge": "workspace:*",
     "@supabase/supabase-js": "^2.21.0",
     "@tailwindcss/forms": "^0.5.3",
     "@tailwindcss/typography": "^0.5.8",
-    "@tauri-apps/api": "^1.4.0",
     "@types/node": "^18.16.3",
     "@types/react": "^18.2.0",
     "@types/react-dom": "^18.2.1",

website/public/fonts/mode7/credit.txt

@@ -1 +0,0 @@
-This super cool font is by 3d@galax.xyz https://galax.xyz/TELETEXT/

website/public/fonts/teletext/LICENSE.txt

@@ -1,121 +0,0 @@
-Creative Commons Legal Code
-
-CC0 1.0 Universal
-
-    CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
-    LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
-    ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
-    INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
-    REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
-    PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
-    THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
-    HEREUNDER.
-
-Statement of Purpose
-
-The laws of most jurisdictions throughout the world automatically confer
-exclusive Copyright and Related Rights (defined below) upon the creator
-and subsequent owner(s) (each and all, an "owner") of an original work of
-authorship and/or a database (each, a "Work").
-
-Certain owners wish to permanently relinquish those rights to a Work for
-the purpose of contributing to a commons of creative, cultural and
-scientific works ("Commons") that the public can reliably and without fear
-of later claims of infringement build upon, modify, incorporate in other
-works, reuse and redistribute as freely as possible in any form whatsoever
-and for any purposes, including without limitation commercial purposes.
-These owners may contribute to the Commons to promote the ideal of a free
-culture and the further production of creative, cultural and scientific
-works, or to gain reputation or greater distribution for their Work in
-part through the use and efforts of others.
-
-For these and/or other purposes and motivations, and without any
-expectation of additional consideration or compensation, the person
-associating CC0 with a Work (the "Affirmer"), to the extent that he or she
-is an owner of Copyright and Related Rights in the Work, voluntarily
-elects to apply CC0 to the Work and publicly distribute the Work under its
-terms, with knowledge of his or her Copyright and Related Rights in the
-Work and the meaning and intended legal effect of CC0 on those rights.
-
-1. Copyright and Related Rights. A Work made available under CC0 may be
-protected by copyright and related or neighboring rights ("Copyright and
-Related Rights"). Copyright and Related Rights include, but are not
-limited to, the following:
-
-  i. the right to reproduce, adapt, distribute, perform, display,
-     communicate, and translate a Work;
- ii. moral rights retained by the original author(s) and/or performer(s);
-iii. publicity and privacy rights pertaining to a person's image or
-     likeness depicted in a Work;
- iv. rights protecting against unfair competition in regards to a Work,
-     subject to the limitations in paragraph 4(a), below;
-  v. rights protecting the extraction, dissemination, use and reuse of data
-     in a Work;
- vi. database rights (such as those arising under Directive 96/9/EC of the
-     European Parliament and of the Council of 11 March 1996 on the legal
-     protection of databases, and under any national implementation
-     thereof, including any amended or successor version of such
-     directive); and
-vii. other similar, equivalent or corresponding rights throughout the
-     world based on applicable law or treaty, and any national
-     implementations thereof.
-
-2. Waiver. To the greatest extent permitted by, but not in contravention
-of, applicable law, Affirmer hereby overtly, fully, permanently,
-irrevocably and unconditionally waives, abandons, and surrenders all of
-Affirmer's Copyright and Related Rights and associated claims and causes
-of action, whether now known or unknown (including existing as well as
-future claims and causes of action), in the Work (i) in all territories
-worldwide, (ii) for the maximum duration provided by applicable law or
-treaty (including future time extensions), (iii) in any current or future
-medium and for any number of copies, and (iv) for any purpose whatsoever,
-including without limitation commercial, advertising or promotional
-purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
-member of the public at large and to the detriment of Affirmer's heirs and
-successors, fully intending that such Waiver shall not be subject to
-revocation, rescission, cancellation, termination, or any other legal or
-equitable action to disrupt the quiet enjoyment of the Work by the public
-as contemplated by Affirmer's express Statement of Purpose.
-
-3. Public License Fallback. Should any part of the Waiver for any reason
-be judged legally invalid or ineffective under applicable law, then the
-Waiver shall be preserved to the maximum extent permitted taking into
-account Affirmer's express Statement of Purpose. In addition, to the
-extent the Waiver is so judged Affirmer hereby grants to each affected
-person a royalty-free, non transferable, non sublicensable, non exclusive,
-irrevocable and unconditional license to exercise Affirmer's Copyright and
-Related Rights in the Work (i) in all territories worldwide, (ii) for the
-maximum duration provided by applicable law or treaty (including future
-time extensions), (iii) in any current or future medium and for any number
-of copies, and (iv) for any purpose whatsoever, including without
-limitation commercial, advertising or promotional purposes (the
-"License"). The License shall be deemed effective as of the date CC0 was
-applied by Affirmer to the Work. Should any part of the License for any
-reason be judged legally invalid or ineffective under applicable law, such
-partial invalidity or ineffectiveness shall not invalidate the remainder
-of the License, and in such case Affirmer hereby affirms that he or she
-will not (i) exercise any of his or her remaining Copyright and Related
-Rights in the Work or (ii) assert any associated claims and causes of
-action with respect to the Work, in either case contrary to Affirmer's
-express Statement of Purpose.
-
-4. Limitations and Disclaimers.
-
- a. No trademark or patent rights held by Affirmer are waived, abandoned,
-    surrendered, licensed or otherwise affected by this document.
- b. Affirmer offers the Work as-is and makes no representations or
-    warranties of any kind concerning the Work, express, implied,
-    statutory or otherwise, including without limitation warranties of
-    title, merchantability, fitness for a particular purpose, non
-    infringement, or the absence of latent or other defects, accuracy, or
-    the present or absence of errors, whether or not discoverable, all to
-    the greatest extent permissible under applicable law.
- c. Affirmer disclaims responsibility for clearing rights of other persons
-    that may apply to the Work or any use thereof, including without
-    limitation any person's Copyright and Related Rights in the Work.
-    Further, Affirmer disclaims responsibility for obtaining any necessary
-    consents, permissions or other rights required for any use of the
-    Work.
- d. Affirmer understands and acknowledges that Creative Commons is not a
-    party to this document and has no duty or obligation with respect to
-    this CC0 or use of the Work.

website/src/components/HeadCommon.astro

@@ -46,14 +46,12 @@ const base = BASE_URL;
 {pwaInfo && <Fragment set:html={pwaInfo.webManifest.linkTag} />}
 
 <script>
-  import { settings, injectStyle } from '../repl/themes.mjs';
+  import { settings } from '../repl/themes.mjs';
   import { settingsMap } from '../settings.mjs';
   import { listenKeys } from 'nanostores';
   const themeStyle = document.createElement('style');
   themeStyle.id = 'strudel-theme';
   document.head.append(themeStyle);
-
-  let resetThemeStyle;
   function activateTheme(name) {
     if (!settings[name]) {
       console.warn('theme', name, 'has no settings.. defaulting to strudelTheme settings');
@@ -72,11 +70,6 @@ const base = BASE_URL;
     } else {
       document.documentElement.classList.add('dark');
     }
-    resetThemeStyle?.();
-    resetThemeStyle = undefined;
-    if (themeSettings.customStyle) {
-      resetThemeStyle = injectStyle(themeSettings.customStyle);
-    }
   }
 
   activateTheme(settingsMap.get().theme);