Merge branch 'main' into claviature-take2

packages/codemirror/codemirror.mjs

@@ -1,5 +1,4 @@
 import { closeBrackets } from '@codemirror/autocomplete';
-export { toggleComment, toggleBlockComment, toggleLineComment, toggleBlockCommentByLine } from '@codemirror/commands';
 // import { search, highlightSelectionMatches } from '@codemirror/search';
 import { history } from '@codemirror/commands';
 import { javascript } from '@codemirror/lang-javascript';

packages/codemirror/widget.mjs

@@ -127,6 +127,12 @@ registerWidget('_scope', (id, options = {}, pat) => {
   return pat.tag(id).scope({ ...options, ctx, id });
 });
 
+registerWidget('_claviature', (id, options = {}, pat) => {
+  options = { height: 75, width: 640, ...options };
+  const ctx = getCanvasWidget(id, options).getContext('2d');
+  return pat.tag(id).claviature({ ...options, ctx, id });
+});
+
 registerWidget('_pitchwheel', (id, options = {}, pat) => {
   let _size = options.size || 200;
   options = { width: _size, height: _size, ...options, size: _size / 5 };

packages/core/clockworker.js

@@ -4,9 +4,9 @@
 // import createClock from './zyklus.mjs';
 
 function getTime() {
-  const seconds = performance.now() * 0.001;
-  return seconds;
-  // return Math.round(seconds * precision) / precision;
+  const precision = 10 ** 4;
+  const seconds = performance.now() / 1000;
+  return Math.round(seconds * precision) / precision;
 }
 
 let num_cycles_at_cps_change = 0;
@@ -24,20 +24,27 @@ const sendMessage = (type, payload) => {
 
 const sendTick = (phase, duration, tick, time) => {
   const num_seconds_since_cps_change = num_ticks_since_cps_change * duration;
+
   const tickdeadline = phase - time;
   const lastTick = time + tickdeadline;
   const num_cycles_since_cps_change = num_seconds_since_cps_change * cps;
+
   const begin = num_cycles_at_cps_change + num_cycles_since_cps_change;
   const secondsSinceLastTick = time - lastTick - duration;
+
   const eventLength = duration * cps;
   const end = begin + eventLength;
+
   const cycle = begin + secondsSinceLastTick * cps;
 
   sendMessage('tick', {
     begin,
     end,
     cps,
-    time,
+    tickdeadline,
+    num_cycles_at_cps_change,
+    num_seconds_at_cps_change,
+    num_seconds_since_cps_change,
     cycle,
   });
   num_ticks_since_cps_change++;

packages/core/controls.mjs

@@ -73,49 +73,6 @@ export function registerControl(names, ...aliases) {
  */
 export const { s, sound } = registerControl(['s', 'n', 'gain'], 'sound');
 
-/**
- * generic macro param for a sound synth
- *
- * @name z1
- * @synonyms z
- * @param {number | Pattern}
- * @example
- * n(run(8)).scale("D:pentatonic").s("supersaw").z(".01 .75").release(0.5)
- *
- */
-export const { z1, z } = registerControl(['z1', 'z2', 'z3', 'z4'], 'z');
-
-/**
- * generic macro param for a sound synth
- *
- * @name z2
- * @param {number | Pattern}
- * @example
- * n(run(8)).scale("D:pentatonic").s("supersaw").z2("2 .7").release(0.5)
- *
- */
-export const { z2 } = registerControl('z2');
-
-/**
- * generic macro param for a sound synth
- *
- * @name z3
- * @param {number | Pattern}
- * @example
- * n(run(8)).scale("D:pentatonic").s("supersaw").z3(".1 .75").release(0.5)
- *
- */
-export const { z3 } = registerControl('z3');
-
-/**
- * generic macro param for a sound synth
- *
- * @name z4
- * @param {number | Pattern}
- *
- */
-export const { z4 } = registerControl('z4');
-
 /**
  * Define a custom webaudio node to use as a sound source.
  *
@@ -497,6 +454,9 @@ export const { drive } = registerControl('drive');
  */
 export const { channels, ch } = registerControl('channels', 'ch');
 
+// superdirt only
+export const { phaserrate, phasr } = registerControl('phaserrate', 'phasr');
+
 /**
  * Phaser audio effect that approximates popular guitar pedals.
  *
@@ -508,11 +468,7 @@ export const { channels, ch } = registerControl('channels', 'ch');
  * .phaser("<1 2 4 8>")
  *
  */
-export const { phaserrate, ph, phaser } = registerControl(
-  ['phaserrate', 'phaserdepth', 'phasercenter', 'phasersweep'],
-  'ph',
-  'phaser',
-);
+export const { phaser, ph } = registerControl(['phaser', 'phaserdepth', 'phasercenter', 'phasersweep'], 'ph');
 
 /**
  * The frequency sweep range of the lfo for the phaser effect. Defaults to 2000
@@ -1427,17 +1383,6 @@ export const { compressorRelease } = registerControl('compressorRelease');
  *
  */
 export const { speed } = registerControl('speed');
-
-/**
- * Changes the speed of sample playback, i.e. a cheap way of changing pitch.
- *
- * @name stretch
- * @param {number | Pattern} factor -inf to inf, negative numbers play the sample backwards.
- * @example
- * s("gm_flute").stretch("1 2 .5")
- *
- */
-export const { stretch } = registerControl('stretch');
 /**
  * Used in conjunction with `speed`, accepts values of "r" (rate, default behavior), "c" (cycles), or "s" (seconds). Using `unit "c"` means `speed` will be interpreted in units of cycles, e.g. `speed "1"` means samples will be stretched to fill a cycle. Using `unit "s"` means the playback speed will be adjusted so that the duration is the number of seconds specified by `speed`.
  *
@@ -1448,7 +1393,6 @@ export const { stretch } = registerControl('stretch');
  * @superdirtOnly
  *
  */
-
 export const { unit } = registerControl('unit');
 /**
  * Made by Calum Gunn. Reminiscent of some weird mixture of filter, ring-modulator and pitch-shifter. The SuperCollider manual defines Squiz as:

packages/core/evaluate.mjs

@@ -4,6 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { isPattern } from './index.mjs';
+
 export const evalScope = async (...args) => {
   const results = await Promise.allSettled(args);
   const modules = results.filter((result) => result.status === 'fulfilled').map((r) => r.value);
@@ -37,7 +39,6 @@ function safeEval(str, options = {}) {
 
 export const evaluate = async (code, transpiler, transpilerOptions) => {
   let meta = {};
-
   if (transpiler) {
     // transform syntactically correct js code to semantically usable code
     const transpiled = transpiler(code, transpilerOptions);

packages/core/fraction.mjs

@@ -119,10 +119,10 @@ export const lcm = (...fractions) => {
   if (fractions.length === 0) {
     return undefined;
   }
-  const x = fractions.pop();
+
   return fractions.reduce(
     (lcm, fraction) => (lcm === undefined || fraction === undefined ? undefined : lcm.lcm(fraction)),
-    x,
+    fraction(1),
   );
 };
 

packages/core/neocyclist.mjs

@@ -5,7 +5,6 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { logger } from './logger.mjs';
-import { ClockCollator, cycleToSeconds } from './util.mjs';
 
 export class NeoCyclist {
   constructor({ onTrigger, onToggle, getTime }) {
@@ -14,38 +13,79 @@ export class NeoCyclist {
     this.lastTick = 0; // absolute time when last tick (clock callback) happened
     this.getTime = getTime; // get absolute time
     this.time_at_last_tick_message = 0;
-    // the clock of the worker and the audio context clock can drift apart over time
-    // aditionally, the message time of the worker pinging the callback to process haps can be inconsistent.
-    // we need to keep a rolling average of the time difference between the worker clock and audio context clock
-    // in order to schedule events consistently.
-    this.collator = new ClockCollator({ getTargetClockTime: getTime });
+
+    this.num_cycles_at_cps_change = 0;
     this.onToggle = onToggle;
     this.latency = 0.1; // fixed trigger time offset
     this.cycle = 0;
     this.id = Math.round(Date.now() * Math.random());
+    this.worker_time_dif;
     this.worker = new SharedWorker(new URL('./clockworker.js', import.meta.url));
     this.worker.port.start();
+
     this.channel = new BroadcastChannel('strudeltick');
-    const tickCallback = (payload) => {
-      const { cps, begin, end, cycle, time } = payload;
-      this.cps = cps;
-      this.cycle = cycle;
-      const currentTime = this.collator.calculateOffset(time) + time;
-      processHaps(begin, end, currentTime);
-      this.time_at_last_tick_message = currentTime;
+    let weight = 0; // the amount of weight that is applied to the current average when averaging a new time dif
+    const maxWeight = 20;
+    const precision = 10 ** 3; //round off time diff to prevent accumulating outliers
+
+    // the clock of the worker and the audio context clock can drift apart over time
+    // aditionally, the message time of the worker pinging the callback to process haps can be inconsistent.
+    // we need to keep a rolling weighted average of the time difference between the worker clock and audio context clock
+    // in order to schedule events consistently.
+    const setTimeReference = (num_seconds_at_cps_change, num_seconds_since_cps_change, tickdeadline) => {
+      const time_dif = getTime() - (num_seconds_at_cps_change + num_seconds_since_cps_change) + tickdeadline;
+      if (this.worker_time_dif == null) {
+        this.worker_time_dif = time_dif;
+      } else {
+        const w = 1; //weight of new time diff;
+        const new_dif =
+          Math.round(((this.worker_time_dif * weight + time_dif * w) / (weight + w)) * precision) / precision;
+
+        if (new_dif != this.worker_time_dif) {
+          // reset the weight so the clock recovers faster from an audio context freeze/dropout if it happens
+          weight = 4;
+        }
+        this.worker_time_dif = new_dif;
+      }
+      weight = Math.min(weight + 1, maxWeight);
     };
 
-    const processHaps = (begin, end, currentTime) => {
+    const tickCallback = (payload) => {
+      const {
+        num_cycles_at_cps_change,
+        cps,
+        num_seconds_at_cps_change,
+        num_seconds_since_cps_change,
+        begin,
+        end,
+        tickdeadline,
+        cycle,
+      } = payload;
+      this.cps = cps;
+      this.cycle = cycle;
+
+      setTimeReference(num_seconds_at_cps_change, num_seconds_since_cps_change, tickdeadline);
+
+      processHaps(begin, end, num_cycles_at_cps_change, num_seconds_at_cps_change);
+
+      this.time_at_last_tick_message = this.getTime();
+    };
+
+    const processHaps = (begin, end, num_cycles_at_cps_change, seconds_at_cps_change) => {
       if (this.started === false) {
         return;
       }
 
       const haps = this.pattern.queryArc(begin, end, { _cps: this.cps });
+
       haps.forEach((hap) => {
         if (hap.hasOnset()) {
-          const timeUntilTrigger = cycleToSeconds(hap.whole.begin - this.cycle, this.cps);
-          const targetTime = timeUntilTrigger + currentTime + this.latency;
-          const duration = cycleToSeconds(hap.duration, this.cps);
+          const targetTime =
+            (hap.whole.begin - num_cycles_at_cps_change) / this.cps +
+            seconds_at_cps_change +
+            this.latency +
+            this.worker_time_dif;
+          const duration = hap.duration / this.cps;
           onTrigger?.(hap, 0, duration, this.cps, targetTime);
         }
       });
@@ -89,8 +129,8 @@ export class NeoCyclist {
     this.setStarted(true);
   }
   stop() {
+    this.worker_time_dif = null;
     logger('[cyclist] stop');
-    this.collator.reset();
     this.setStarted(false);
   }
   setPattern(pat, autostart = false) {

packages/core/pattern.mjs

@@ -386,15 +386,6 @@ export class Pattern {
     return this.fmap(func).squeezeJoin();
   }
 
-  polyJoin = function () {
-    const pp = this;
-    return pp.fmap((p) => p.s_extend(pp.tactus.div(p.tactus))).outerJoin();
-  };
-
-  polyBind(func) {
-    return this.fmap(func).polyJoin();
-  }
-
   //////////////////////////////////////////////////////////////////////
   // Utility methods mainly for internal use
 
@@ -763,10 +754,6 @@ export class Pattern {
     const otherPat = reify(other);
     return otherPat.fmap((b) => this.fmap((a) => func(a)(b))).restartJoin();
   }
-  _opPoly(other, func) {
-    const otherPat = reify(other);
-    return this.fmap((b) => otherPat.fmap((a) => func(a)(b))).polyJoin();
-  }
 
   //////////////////////////////////////////////////////////////////////
   // End-user methods.
@@ -1075,7 +1062,7 @@ function _composeOp(a, b, func) {
     func: [(a, b) => b(a)],
   };
 
-  const hows = ['In', 'Out', 'Mix', 'Squeeze', 'SqueezeOut', 'Reset', 'Restart', 'Poly'];
+  const hows = ['In', 'Out', 'Mix', 'Squeeze', 'SqueezeOut', 'Reset', 'Restart'];
 
   // generate methods to do what and how
   for (const [what, [op, preprocess]] of Object.entries(composers)) {
@@ -1436,9 +1423,6 @@ export function fastcat(...pats) {
     result = result._fast(pats.length);
     result.tactus = pats.length;
   }
-  if (pats.length == 1 && pats[0].__tactus_source) {
-    pats.tactus = pats[0].tactus;
-  }
   return result;
 }
 
@@ -1582,11 +1566,7 @@ export function register(name, func, patternify = true, preserveTactus = false,
     // There are patternified args, so lets make an unpatternified
     // version, prefixed by '_'
     Pattern.prototype['_' + name] = function (...args) {
-      const result = func(...args, this);
-      if (preserveTactus) {
-        result.setTactus(this.tactus);
-      }
-      return result;
+      return func(...args, this);
     };
   }
 
@@ -2632,7 +2612,8 @@ export function s_cat(...timepats) {
   }
   if (timepats.length == 1) {
     const result = reify(timepats[0][1]);
-    return result.withTactus((_) => timepats[0][0]);
+    result.tactus = timepats[0][0];
+    return result;
   }
 
   const total = timepats.map((a) => a[0]).reduce((a, b) => a.add(b), Fraction(0));
@@ -2725,10 +2706,6 @@ export const s_sub = stepRegister('s_sub', function (i, pat) {
   return pat.s_add(pat.tactus.sub(i));
 });
 
-export const s_cycles = stepRegister('s_extend', function (factor, pat) {
-  return pat.fast(factor).s_expand(factor);
-});
-
 export const s_expand = stepRegister('s_expand', function (factor, pat) {
   return pat.withTactus((t) => t.mul(Fraction(factor)));
 });
@@ -2827,16 +2804,8 @@ export const s_tour = function (pat, ...many) {
 export const chop = register('chop', function (n, pat) {
   const slices = Array.from({ length: n }, (x, i) => i);
   const slice_objects = slices.map((i) => ({ begin: i / n, end: (i + 1) / n }));
-  const merge = function (a, b) {
-    if ('begin' in a && 'end' in a && a.begin !== undefined && a.end !== undefined) {
-      const d = a.end - a.begin;
-      b = { begin: a.begin + b.begin * d, end: a.begin + b.end * d };
-    }
-    // return a;
-    return Object.assign({}, a, b);
-  };
   const func = function (o) {
-    return sequence(slice_objects.map((slice_o) => merge(o, slice_o)));
+    return sequence(slice_objects.map((slice_o) => Object.assign({}, o, slice_o)));
   };
   return pat.squeezeBind(func).setTactus(__tactus ? Fraction(n).mulmaybe(pat.tactus) : undefined);
 });
@@ -2942,8 +2911,7 @@ export const splice = register(
 );
 
 export const { loopAt, loopat } = register(['loopAt', 'loopat'], function (factor, pat) {
-  const tactus = pat.tactus ? pat.tactus.div(factor) : undefined;
-  return new Pattern((state) => _loopAt(factor, pat, state.controls._cps).query(state), tactus);
+  return new Pattern((state) => _loopAt(factor, pat, state.controls._cps).query(state));
 });
 
 /**
@@ -2957,14 +2925,11 @@ export const { loopAt, loopat } = register(['loopAt', 'loopat'], function (facto
 export const fit = register('fit', (pat) =>
   pat.withHaps((haps, state) =>
     haps.map((hap) =>
-      hap.withValue((v) => {
-        const slicedur = ('end' in v ? v.end : 1) - ('begin' in v ? v.begin : 0);
-        return {
-          ...v,
-          speed: ((state.controls._cps || 1) / hap.whole.duration) * slicedur,
-          unit: 'c',
-        };
-      }),
+      hap.withValue((v) => ({
+        ...v,
+        speed: (state.controls._cps || 1) / hap.whole.duration,
+        unit: 'c',
+      })),
     ),
   ),
 );

packages/core/signal.mjs

@@ -138,7 +138,7 @@ const timeToRand = (x) => Math.abs(intSeedToRand(timeToIntSeed(x)));
 const timeToRandsPrime = (seed, n) => {
   const result = [];
   // eslint-disable-next-line
-  for (let i = 0; i < n; ++i) {
+  for (let i = 0; i < n; ++n) {
     result.push(intSeedToRand(seed));
     seed = xorwise(seed);
   }
@@ -159,50 +159,6 @@ const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);
  */
 export const run = (n) => saw.range(0, n).floor().segment(n);
 
-export const randrun = (n) => {
-  return signal((t) => {
-    // Without adding 0.5, the first cycle is always 0,1,2,3,...
-    const rands = timeToRands(t.floor().add(0.5), n);
-    const nums = rands
-      .map((n, i) => [n, i])
-      .sort((a, b) => a[0] > b[0] - a[0] < b[0])
-      .map((x) => x[1]);
-    const i = t.cyclePos().mul(n).floor() % n;
-    return nums[i];
-  })._segment(n);
-};
-
-const _rearrangeWith = (ipat, n, pat) => {
-  const pats = [...Array(n).keys()].map((i) => pat.zoom(Fraction(i).div(n), Fraction(i + 1).div(n)));
-  return ipat.fmap((i) => pats[i].repeatCycles(n)._fast(n)).innerJoin();
-};
-
-/**
- * @name shuffle
- * Slices a pattern into the given number of parts, then plays those parts in random order.
- * Each part will be played exactly once per cycle.
- * @example
- * note("c d e f").sound("piano").shuffle(4)
- * @example
- * note("c d e f".shuffle(4), "g").sound("piano")
- */
-export const shuffle = register('shuffle', (n, pat) => {
-  return _rearrangeWith(randrun(n), n, pat);
-});
-
-/**
- * @name scramble
- * Slices a pattern into the given number of parts, then plays those parts at random. Similar to `shuffle`,
- * but parts might be played more than once, or not at all, per cycle.
- * @example
- * note("c d e f").sound("piano").scramble(4)
- * @example
- * note("c d e f".scramble(4), "g").sound("piano")
- */
-export const scramble = register('scramble', (n, pat) => {
-  return _rearrangeWith(_irand(n)._segment(n), n, pat);
-});
-
 /**
  * A continuous pattern of random numbers, between 0 and 1.
  *
@@ -370,13 +326,6 @@ export const pickRestart = register('pickRestart', function (lookup, pat) {
  * @param {Pattern} pat
  * @param {*} xs
  * @returns {Pattern}
- * @example
- * "<a@2 b@2 c@2 d@2>".pickRestart({
-      a: n("0 1 2 0"),
-      b: n("2 3 4 ~"),
-      c: n("[4 5] [4 3] 2 0"),
-      d: n("0 -3 0 ~")
-    }).scale("C:major").s("piano")
  */
 export const pickmodRestart = register('pickmodRestart', function (lookup, pat) {
   return _pick(lookup, pat, true).restartJoin();

packages/core/test/pattern.test.mjs

@@ -937,9 +937,6 @@ describe('Pattern', () => {
           .firstCycle(),
       );
     });
-    it('Can chop chops', () => {
-      expect(pure({ s: 'bev' }).chop(2).chop(2).firstCycle()).toStrictEqual(pure({ s: 'bev' }).chop(4).firstCycle());
-    });
   });
   describe('range', () => {
     it('Can be patterned', () => {
@@ -1212,45 +1209,4 @@ describe('Pattern', () => {
       }
     });
   });
-  describe('s_expand', () => {
-    it('can expand four things in half', () => {
-      expect(
-        sameFirst(
-          sequence(0, 1, 2, 3).s_expand(1, 0.5),
-          s_cat(sequence(0, 1, 2, 3), sequence(0, 1, 2, 3).s_expand(0.5)),
-        ),
-      );
-    });
-    it('can expand five things in half', () => {
-      expect(
-        sameFirst(
-          sequence(0, 1, 2, 3, 4).s_expand(1, 0.5),
-          s_cat(sequence(0, 1, 2, 3, 4), sequence(0, 1, 2, 3, 4).s_expand(0.5)),
-        ),
-      );
-    });
-  });
-  describe('stepJoin', () => {
-    it('can join a pattern with a tactus of 2', () => {
-      expect(
-        sameFirst(
-          sequence(pure(pure('a')), pure(pure('b').setTactus(2))).stepJoin(),
-          s_cat(pure('a'), pure('b').setTactus(2)),
-        ),
-      );
-    });
-    it('can join a pattern with a tactus of 0.5', () => {
-      expect(
-        sameFirst(
-          sequence(pure(pure('a')), pure(pure('b').setTactus(0.5))).stepJoin(),
-          s_cat(pure('a'), pure('b').setTactus(0.5)),
-        ),
-      );
-    });
-  });
-  describe('loopAt', () => {
-    it('maintains tactus', () => {
-      expect(s('bev').chop(8).loopAt(2).tactus).toStrictEqual(Fraction(4));
-    });
-  });
 });

packages/core/util.mjs

@@ -91,9 +91,6 @@ export const midi2note = (n) => {
 // modulo that works with negative numbers e.g. _mod(-1, 3) = 2. Works on numbers (rather than patterns of numbers, as @mod@ from pattern.mjs does)
 export const _mod = (n, m) => ((n % m) + m) % m;
 
-// average numbers in an array
-export const averageArray = (arr) => arr.reduce((a, b) => a + b) / arr.length;
-
 export function nanFallback(value, fallback = 0) {
   if (isNaN(Number(value))) {
     logger(`"${value}" is not a number, falling back to ${fallback}`, 'warning');
@@ -363,76 +360,6 @@ export function objectMap(obj, fn) {
   }
   return Object.fromEntries(Object.entries(obj).map(([k, v], i) => [k, fn(v, k, i)]));
 }
-export function cycleToSeconds(cycle, cps) {
-  return cycle / cps;
-}
-
-// utility for averaging two clocks together to account for drift
-export class ClockCollator {
-  constructor({
-    getTargetClockTime = getUnixTimeSeconds,
-    weight = 16,
-    offsetDelta = 0.005,
-    checkAfterTime = 2,
-    resetAfterTime = 8,
-  }) {
-    this.offsetTime;
-    this.timeAtPrevOffsetSample;
-    this.prevOffsetTimes = [];
-    this.getTargetClockTime = getTargetClockTime;
-    this.weight = weight;
-    this.offsetDelta = offsetDelta;
-    this.checkAfterTime = checkAfterTime;
-    this.resetAfterTime = resetAfterTime;
-    this.reset = () => {
-      this.prevOffsetTimes = [];
-      this.offsetTime = null;
-      this.timeAtPrevOffsetSample = null;
-    };
-  }
-  calculateOffset(currentTime) {
-    const targetClockTime = this.getTargetClockTime();
-    const diffBetweenTimeSamples = targetClockTime - this.timeAtPrevOffsetSample;
-    const newOffsetTime = targetClockTime - currentTime;
-    // recalcuate the diff from scratch if the clock has been paused for some time.
-    if (diffBetweenTimeSamples > this.resetAfterTime) {
-      this.reset();
-    }
-
-    if (this.offsetTime == null) {
-      this.offsetTime = newOffsetTime;
-    }
-    this.prevOffsetTimes.push(newOffsetTime);
-    if (this.prevOffsetTimes.length > this.weight) {
-      this.prevOffsetTimes.shift();
-    }
-
-    // after X time has passed, the average of the previous weight offset times is calculated and used as a stable reference
-    // for calculating the timestamp
-    if (this.timeAtPrevOffsetSample == null || diffBetweenTimeSamples > this.checkAfterTime) {
-      this.timeAtPrevOffsetSample = targetClockTime;
-      const rollingOffsetTime = averageArray(this.prevOffsetTimes);
-      //when the clock offsets surpass the delta, set the new reference time
-      if (Math.abs(rollingOffsetTime - this.offsetTime) > this.offsetDelta) {
-        this.offsetTime = rollingOffsetTime;
-      }
-    }
-
-    return this.offsetTime;
-  }
-
-  calculateTimestamp(currentTime, targetTime) {
-    return this.calculateOffset(currentTime) + targetTime;
-  }
-}
-
-export function getPerformanceTimeSeconds() {
-  return performance.now() * 0.001;
-}
-
-function getUnixTimeSeconds() {
-  return Date.now() * 0.001;
-}
 
 // Floating point versions, see Fraction for rational versions
 // // greatest common divisor

packages/core/vite.config.js

@@ -4,7 +4,6 @@ import { resolve } from 'path';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: './',
   plugins: [],
   build: {
     lib: {

packages/desktopbridge/oscbridge.mjs

@@ -1,36 +1,43 @@
-import { Pattern, ClockCollator } from '@strudel/core';
-import { parseControlsFromHap } from 'node_modules/@strudel/osc/osc.mjs';
+import { parseNumeral, Pattern, getEventOffsetMs } from '@strudel/core';
 import { Invoke } from './utils.mjs';
 
-const collator = new ClockCollator({});
-
-export async function oscTriggerTauri(t_deprecate, hap, currentTime, cps = 1, targetTime) {
-  const controls = parseControlsFromHap(hap, cps);
-  const params = [];
-  const timestamp = collator.calculateTimestamp(currentTime, targetTime);
-
-  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',
-    });
-  });
-
-  if (params.length === 0) {
-    return;
-  }
-  const message = { target: '/dirt/play', timestamp, params };
-  setTimeout(() => {
-    Invoke('sendosc', { messagesfromjs: [message] });
-  });
-}
 Pattern.prototype.osc = function () {
-  return this.onTrigger(oscTriggerTauri);
+  return this.onTrigger(async (time, hap, currentTime, cps = 1, targetTime) => {
+    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() + getEventOffsetMs(targetTime, currentTime));
+
+    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/draw/claviature.mjs

@@ -0,0 +1,114 @@
+import { Pattern, noteToMidi } from '@strudel/core';
+
+const blackPattern = [0, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0];
+
+export const tokenizeNote = (note) => {
+  if (typeof note !== 'string') {
+    return [];
+  }
+  const [pc, acc = '', oct] = note.match(/^([a-gA-G])([#bs]*)([0-9])?$/)?.slice(1) || [];
+  if (!pc) {
+    return [];
+  }
+  return [pc, acc, oct ? Number(oct) : undefined];
+};
+const accs = { '#': 1, b: -1, s: 1 };
+const toMidi = (note) => {
+  if (typeof note === 'number') {
+    return note;
+  }
+  const [pc, acc, oct] = tokenizeNote(note);
+  if (!pc) {
+    throw new Error('not a note: "' + note + '"');
+  }
+  const chroma = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 }[pc.toLowerCase()];
+  const offset = acc?.split('').reduce((o, char) => o + accs[char], 0) || 0;
+  return (Number(oct) + 1) * 12 + chroma + offset;
+};
+
+const getMidiKeys = (range, offset) => {
+  const white /* : number[] */ = [];
+  const black /* : number[] */ = [];
+  const to = noteToMidi(range[1]);
+  for (let i = offset; i <= to; i++) {
+    //
+    (blackPattern[i % 12] ? black : white).push(i);
+  }
+  return [white, black];
+};
+
+const whiteWidth = (midi, topWidth) => (midi % 12 > 4 ? 7 / 4 : 5 / 3) * topWidth;
+
+const whiteX = (midi, offset, topWidth) =>
+  Array.from({ length: midi - offset }, (_, i) => i + offset).reduce(
+    (sum, m) => (!blackPattern[m % 12] ? sum + whiteWidth(m, topWidth) : sum),
+    0,
+  ); // TODO: calculate mathematically
+
+/* const blackX = (index, offset, topWidth) => {
+  const cDiff = 12 - (offset % 12);
+  console.log('cDiff', cDiff);
+  const cOffset = whiteX(cDiff + offset);
+  const blackOffset = cOffset + cDiff * topWidth;
+  return (index - offset) * topWidth + blackOffset;
+}; */
+
+const parseNote = (note) => (typeof note === 'number' ? note : toMidi(note));
+
+export function claviature(haps, options) {
+  const {
+    ctx = getDrawContext(),
+    range = ['C1', 'D3'],
+    scaleX = 1,
+    scaleY = 1,
+    palette = [getTheme().foreground, getTheme().background],
+    strokeWidth = 0,
+    stroke = getTheme().foreground,
+    upperWidth = 14,
+    upperHeight = 100,
+    lowerHeight = 45,
+  } = options || {};
+  const offset = parseNote(range[0]);
+  const colorizedMidi = haps.map((hap) => ({
+    keys: [parseNote(hap.value.note)],
+    color: hap.value.color || getTheme().selection,
+  }));
+  /* const to = parseNote(range[1]);
+  const totalKeys = to - offset + 1; */
+  /* const width = totalKeys * topWidth + topWidth + strokeWidth * 2;
+    const height = whiteHeight; */
+
+  const topWidth = upperWidth * scaleX;
+  const [white, black] = getMidiKeys(range, offset);
+
+  const whiteHeight = (upperHeight + lowerHeight) * scaleY;
+  const blackHeight = upperHeight * scaleY;
+
+  const cDiff = 12 - (offset % 12);
+  const cOffset = whiteX(cDiff + offset);
+  const blackOffset = cOffset;
+
+  const blackX = (midi) => (midi - offset) * topWidth + blackOffset;
+
+  const getColor = (midi) => colorizedMidi.find(({ keys }) => keys.includes(midi))?.color;
+  ctx.clearRect(0, 0, ctx.canvas.width * 2, ctx.canvas.height * 2);
+  ctx.strokeStyle = 'white';
+  ctx.strokeWidth = strokeWidth;
+  white.forEach((midi) => {
+    ctx.fillStyle = getColor(midi) ?? palette[1];
+    const x = whiteX(midi, offset, topWidth);
+    const width = whiteWidth(midi, topWidth);
+    ctx.fillRect(x, 0, width, whiteHeight);
+    ctx.strokeRect(x, 0, width, whiteHeight);
+  });
+  black.forEach((midi) => {
+    ctx.fillStyle = getColor(midi) ?? palette[0];
+    const x = blackX(midi, offset, topWidth);
+    //ctx.strokeRect(x, 0, topWidth, blackHeight);
+    ctx.fillRect(x, 0, topWidth, blackHeight);
+  });
+}
+
+Pattern.prototype.claviature = function (options) {
+  return this.draw((haps) => claviature(haps, options), { id: options.id });
+};

packages/draw/index.mjs

@@ -3,4 +3,5 @@ export * from './color.mjs';
 export * from './draw.mjs';
 export * from './pianoroll.mjs';
 export * from './spiral.mjs';
+export * from './claviature.mjs';
 export * from './pitchwheel.mjs';

packages/mini/mini.mjs

@@ -14,7 +14,7 @@ const applyOptions = (parent, enter) => (pat, i) => {
   const ast = parent.source_[i];
   const options = ast.options_;
   const ops = options?.ops;
-  const tactus_source = pat.__tactus_source;
+
   if (ops) {
     for (const op of ops) {
       switch (op.type_) {
@@ -69,7 +69,7 @@ const applyOptions = (parent, enter) => (pat, i) => {
       }
     }
   }
-  pat.__tactus_source = pat.__tactus_source || tactus_source;
+
   return pat;
 };
 

packages/mini/test/mini.test.mjs

@@ -210,14 +210,12 @@ describe('mini', () => {
   });
   it('supports ^ tactus marking', () => {
     expect(mini('a [^b c]').tactus).toEqual(Fraction(4));
-    expect(mini('[^b c]!3').tactus).toEqual(Fraction(6));
     expect(mini('[a b c] [d [e f]]').tactus).toEqual(Fraction(2));
     expect(mini('^[a b c] [d [e f]]').tactus).toEqual(Fraction(2));
     expect(mini('[a b c] [d [^e f]]').tactus).toEqual(Fraction(8));
     expect(mini('[a b c] [^d [e f]]').tactus).toEqual(Fraction(4));
     expect(mini('[^a b c] [^d [e f]]').tactus).toEqual(Fraction(12));
     expect(mini('[^a b c] [d [^e f]]').tactus).toEqual(Fraction(24));
-    expect(mini('[^a b c d e]').tactus).toEqual(Fraction(5));
   });
 });
 

packages/osc/osc.mjs

@@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import OSC from 'osc-js';
 
-import { logger, parseNumeral, Pattern, isNote, noteToMidi, ClockCollator } from '@strudel/core';
+import { logger, parseNumeral, Pattern, getEventOffsetMs, isNote, noteToMidi } from '@strudel/core';
 
 let connection; // Promise<OSC>
 function connect() {
@@ -34,44 +34,6 @@ function connect() {
   return connection;
 }
 
-export function parseControlsFromHap(hap, cps) {
-  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));
-  if (typeof controls.note !== 'undefined') {
-    if (isNote(controls.note)) {
-      controls.midinote = noteToMidi(controls.note, controls.octave || 3);
-    } else {
-      controls.note = parseNumeral(controls.note);
-    }
-  }
-  controls.bank && (controls.s = controls.bank + controls.s);
-  controls.roomsize && (controls.size = parseNumeral(controls.roomsize));
-  // speed adjustment for CPS is handled on the DSP side in superdirt and pattern side in Strudel,
-  // so we need to undo the adjustment before sending the message to superdirt.
-  controls.unit === 'c' && controls.speed != null && (controls.speed = controls.speed / cps);
-  const channels = controls.channels;
-  channels != undefined && (controls.channels = JSON.stringify(channels));
-  return controls;
-}
-
-const collator = new ClockCollator({});
-
-export async function oscTrigger(t_deprecate, hap, currentTime, cps = 1, targetTime) {
-  const osc = await connect();
-  const controls = parseControlsFromHap(hap, cps);
-  const keyvals = Object.entries(controls).flat();
-
-  const ts = Math.round(collator.calculateTimestamp(currentTime, targetTime) * 1000);
-  const message = new OSC.Message('/dirt/play', ...keyvals);
-  const bundle = new OSC.Bundle([message], ts);
-  bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60
-  osc.send(bundle);
-}
-
 /**
  *
  * Sends each hap as an OSC message, which can be picked up by SuperCollider or any other OSC-enabled software.
@@ -82,5 +44,33 @@ export async function oscTrigger(t_deprecate, hap, currentTime, cps = 1, targetT
  * @returns Pattern
  */
 Pattern.prototype.osc = function () {
-  return this.onTrigger(oscTrigger);
+  return this.onTrigger(async (time, hap, currentTime, cps = 1, targetTime) => {
+    hap.ensureObjectValue();
+    const osc = await connect();
+    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));
+    if (typeof controls.note !== 'undefined') {
+      if (isNote(controls.note)) {
+        controls.midinote = noteToMidi(controls.note, controls.octave || 3);
+      } else {
+        controls.note = parseNumeral(controls.note);
+      }
+    }
+    controls.bank && (controls.s = controls.bank + controls.s);
+    controls.roomsize && (controls.size = parseNumeral(controls.roomsize));
+    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 = getEventOffsetMs(targetTime, currentTime);
+
+    // timestamp in milliseconds used to trigger the osc bundle at a precise moment
+    const ts = Math.floor(Date.now() + offset);
+    const message = new OSC.Message('/dirt/play', ...keyvals);
+    const bundle = new OSC.Bundle([message], ts);
+    bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60
+    osc.send(bundle);
+  });
 };

packages/osc/superdirtoutput.js

@@ -1,10 +0,0 @@
-import { oscTriggerTauri } from '../desktopbridge/oscbridge.mjs';
-import { isTauri } from '../desktopbridge/utils.mjs';
-import { oscTrigger } from './osc.mjs';
-
-const trigger = isTauri() ? oscTriggerTauri : oscTrigger;
-
-export const superdirtOutput = (hap, deadline, hapDuration, cps, targetTime) => {
-  const currentTime = performance.now() / 1000;
-  return trigger(null, hap, currentTime, cps, targetTime);
-};

packages/repl/vite.config.js

@@ -6,7 +6,6 @@ import replace from '@rollup/plugin-replace';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: './',
   plugins: [],
   build: {
     lib: {

packages/superdough/fft.js

@@ -1,488 +0,0 @@
-'use strict';
-// sourced from https://github.com/indutny/fft.js/
-// LICENSE
-// This software is licensed under the MIT License.
-// Copyright Fedor Indutny, 2017.
-// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-export default class FFT {
-  constructor(size) {
-    this.size = size | 0;
-    if (this.size <= 1 || (this.size & (this.size - 1)) !== 0)
-      throw new Error('FFT size must be a power of two and bigger than 1');
-
-    this._csize = size << 1;
-
-    // NOTE: Use of `var` is intentional for old V8 versions
-    var table = new Array(this.size * 2);
-    for (var i = 0; i < table.length; i += 2) {
-      const angle = (Math.PI * i) / this.size;
-      table[i] = Math.cos(angle);
-      table[i + 1] = -Math.sin(angle);
-    }
-    this.table = table;
-
-    // Find size's power of two
-    var power = 0;
-    for (var t = 1; this.size > t; t <<= 1) power++;
-
-    // Calculate initial step's width:
-    //   * If we are full radix-4 - it is 2x smaller to give inital len=8
-    //   * Otherwise it is the same as `power` to give len=4
-    this._width = power % 2 === 0 ? power - 1 : power;
-
-    // Pre-compute bit-reversal patterns
-    this._bitrev = new Array(1 << this._width);
-    for (var j = 0; j < this._bitrev.length; j++) {
-      this._bitrev[j] = 0;
-      for (var shift = 0; shift < this._width; shift += 2) {
-        var revShift = this._width - shift - 2;
-        this._bitrev[j] |= ((j >>> shift) & 3) << revShift;
-      }
-    }
-
-    this._out = null;
-    this._data = null;
-    this._inv = 0;
-  }
-  fromComplexArray(complex, storage) {
-    var res = storage || new Array(complex.length >>> 1);
-    for (var i = 0; i < complex.length; i += 2) res[i >>> 1] = complex[i];
-    return res;
-  }
-  createComplexArray() {
-    const res = new Array(this._csize);
-    for (var i = 0; i < res.length; i++) res[i] = 0;
-    return res;
-  }
-  toComplexArray(input, storage) {
-    var res = storage || this.createComplexArray();
-    for (var i = 0; i < res.length; i += 2) {
-      res[i] = input[i >>> 1];
-      res[i + 1] = 0;
-    }
-    return res;
-  }
-  completeSpectrum(spectrum) {
-    var size = this._csize;
-    var half = size >>> 1;
-    for (var i = 2; i < half; i += 2) {
-      spectrum[size - i] = spectrum[i];
-      spectrum[size - i + 1] = -spectrum[i + 1];
-    }
-  }
-  transform(out, data) {
-    if (out === data) throw new Error('Input and output buffers must be different');
-
-    this._out = out;
-    this._data = data;
-    this._inv = 0;
-    this._transform4();
-    this._out = null;
-    this._data = null;
-  }
-  realTransform(out, data) {
-    if (out === data) throw new Error('Input and output buffers must be different');
-
-    this._out = out;
-    this._data = data;
-    this._inv = 0;
-    this._realTransform4();
-    this._out = null;
-    this._data = null;
-  }
-  inverseTransform(out, data) {
-    if (out === data) throw new Error('Input and output buffers must be different');
-
-    this._out = out;
-    this._data = data;
-    this._inv = 1;
-    this._transform4();
-    for (var i = 0; i < out.length; i++) out[i] /= this.size;
-    this._out = null;
-    this._data = null;
-  }
-  // radix-4 implementation
-  //
-  // NOTE: Uses of `var` are intentional for older V8 version that do not
-  // support both `let compound assignments` and `const phi`
-  _transform4() {
-    var out = this._out;
-    var size = this._csize;
-
-    // Initial step (permute and transform)
-    var width = this._width;
-    var step = 1 << width;
-    var len = (size / step) << 1;
-
-    var outOff;
-    var t;
-    var bitrev = this._bitrev;
-    if (len === 4) {
-      for (outOff = 0, t = 0; outOff < size; outOff += len, t++) {
-        const off = bitrev[t];
-        this._singleTransform2(outOff, off, step);
-      }
-    } else {
-      // len === 8
-      for (outOff = 0, t = 0; outOff < size; outOff += len, t++) {
-        const off = bitrev[t];
-        this._singleTransform4(outOff, off, step);
-      }
-    }
-
-    // Loop through steps in decreasing order
-    var inv = this._inv ? -1 : 1;
-    var table = this.table;
-    for (step >>= 2; step >= 2; step >>= 2) {
-      len = (size / step) << 1;
-      var quarterLen = len >>> 2;
-
-      // Loop through offsets in the data
-      for (outOff = 0; outOff < size; outOff += len) {
-        // Full case
-        var limit = outOff + quarterLen;
-        for (var i = outOff, k = 0; i < limit; i += 2, k += step) {
-          const A = i;
-          const B = A + quarterLen;
-          const C = B + quarterLen;
-          const D = C + quarterLen;
-
-          // Original values
-          const Ar = out[A];
-          const Ai = out[A + 1];
-          const Br = out[B];
-          const Bi = out[B + 1];
-          const Cr = out[C];
-          const Ci = out[C + 1];
-          const Dr = out[D];
-          const Di = out[D + 1];
-
-          // Middle values
-          const MAr = Ar;
-          const MAi = Ai;
-
-          const tableBr = table[k];
-          const tableBi = inv * table[k + 1];
-          const MBr = Br * tableBr - Bi * tableBi;
-          const MBi = Br * tableBi + Bi * tableBr;
-
-          const tableCr = table[2 * k];
-          const tableCi = inv * table[2 * k + 1];
-          const MCr = Cr * tableCr - Ci * tableCi;
-          const MCi = Cr * tableCi + Ci * tableCr;
-
-          const tableDr = table[3 * k];
-          const tableDi = inv * table[3 * k + 1];
-          const MDr = Dr * tableDr - Di * tableDi;
-          const MDi = Dr * tableDi + Di * tableDr;
-
-          // Pre-Final values
-          const T0r = MAr + MCr;
-          const T0i = MAi + MCi;
-          const T1r = MAr - MCr;
-          const T1i = MAi - MCi;
-          const T2r = MBr + MDr;
-          const T2i = MBi + MDi;
-          const T3r = inv * (MBr - MDr);
-          const T3i = inv * (MBi - MDi);
-
-          // Final values
-          const FAr = T0r + T2r;
-          const FAi = T0i + T2i;
-
-          const FCr = T0r - T2r;
-          const FCi = T0i - T2i;
-
-          const FBr = T1r + T3i;
-          const FBi = T1i - T3r;
-
-          const FDr = T1r - T3i;
-          const FDi = T1i + T3r;
-
-          out[A] = FAr;
-          out[A + 1] = FAi;
-          out[B] = FBr;
-          out[B + 1] = FBi;
-          out[C] = FCr;
-          out[C + 1] = FCi;
-          out[D] = FDr;
-          out[D + 1] = FDi;
-        }
-      }
-    }
-  }
-  // radix-2 implementation
-  //
-  // NOTE: Only called for len=4
-  _singleTransform2(outOff, off, step) {
-    const out = this._out;
-    const data = this._data;
-
-    const evenR = data[off];
-    const evenI = data[off + 1];
-    const oddR = data[off + step];
-    const oddI = data[off + step + 1];
-
-    const leftR = evenR + oddR;
-    const leftI = evenI + oddI;
-    const rightR = evenR - oddR;
-    const rightI = evenI - oddI;
-
-    out[outOff] = leftR;
-    out[outOff + 1] = leftI;
-    out[outOff + 2] = rightR;
-    out[outOff + 3] = rightI;
-  }
-  // radix-4
-  //
-  // NOTE: Only called for len=8
-  _singleTransform4(outOff, off, step) {
-    const out = this._out;
-    const data = this._data;
-    const inv = this._inv ? -1 : 1;
-    const step2 = step * 2;
-    const step3 = step * 3;
-
-    // Original values
-    const Ar = data[off];
-    const Ai = data[off + 1];
-    const Br = data[off + step];
-    const Bi = data[off + step + 1];
-    const Cr = data[off + step2];
-    const Ci = data[off + step2 + 1];
-    const Dr = data[off + step3];
-    const Di = data[off + step3 + 1];
-
-    // Pre-Final values
-    const T0r = Ar + Cr;
-    const T0i = Ai + Ci;
-    const T1r = Ar - Cr;
-    const T1i = Ai - Ci;
-    const T2r = Br + Dr;
-    const T2i = Bi + Di;
-    const T3r = inv * (Br - Dr);
-    const T3i = inv * (Bi - Di);
-
-    // Final values
-    const FAr = T0r + T2r;
-    const FAi = T0i + T2i;
-
-    const FBr = T1r + T3i;
-    const FBi = T1i - T3r;
-
-    const FCr = T0r - T2r;
-    const FCi = T0i - T2i;
-
-    const FDr = T1r - T3i;
-    const FDi = T1i + T3r;
-
-    out[outOff] = FAr;
-    out[outOff + 1] = FAi;
-    out[outOff + 2] = FBr;
-    out[outOff + 3] = FBi;
-    out[outOff + 4] = FCr;
-    out[outOff + 5] = FCi;
-    out[outOff + 6] = FDr;
-    out[outOff + 7] = FDi;
-  }
-  // Real input radix-4 implementation
-  _realTransform4() {
-    var out = this._out;
-    var size = this._csize;
-
-    // Initial step (permute and transform)
-    var width = this._width;
-    var step = 1 << width;
-    var len = (size / step) << 1;
-
-    var outOff;
-    var t;
-    var bitrev = this._bitrev;
-    if (len === 4) {
-      for (outOff = 0, t = 0; outOff < size; outOff += len, t++) {
-        const off = bitrev[t];
-        this._singleRealTransform2(outOff, off >>> 1, step >>> 1);
-      }
-    } else {
-      // len === 8
-      for (outOff = 0, t = 0; outOff < size; outOff += len, t++) {
-        const off = bitrev[t];
-        this._singleRealTransform4(outOff, off >>> 1, step >>> 1);
-      }
-    }
-
-    // Loop through steps in decreasing order
-    var inv = this._inv ? -1 : 1;
-    var table = this.table;
-    for (step >>= 2; step >= 2; step >>= 2) {
-      len = (size / step) << 1;
-      var halfLen = len >>> 1;
-      var quarterLen = halfLen >>> 1;
-      var hquarterLen = quarterLen >>> 1;
-
-      // Loop through offsets in the data
-      for (outOff = 0; outOff < size; outOff += len) {
-        for (var i = 0, k = 0; i <= hquarterLen; i += 2, k += step) {
-          var A = outOff + i;
-          var B = A + quarterLen;
-          var C = B + quarterLen;
-          var D = C + quarterLen;
-
-          // Original values
-          var Ar = out[A];
-          var Ai = out[A + 1];
-          var Br = out[B];
-          var Bi = out[B + 1];
-          var Cr = out[C];
-          var Ci = out[C + 1];
-          var Dr = out[D];
-          var Di = out[D + 1];
-
-          // Middle values
-          var MAr = Ar;
-          var MAi = Ai;
-
-          var tableBr = table[k];
-          var tableBi = inv * table[k + 1];
-          var MBr = Br * tableBr - Bi * tableBi;
-          var MBi = Br * tableBi + Bi * tableBr;
-
-          var tableCr = table[2 * k];
-          var tableCi = inv * table[2 * k + 1];
-          var MCr = Cr * tableCr - Ci * tableCi;
-          var MCi = Cr * tableCi + Ci * tableCr;
-
-          var tableDr = table[3 * k];
-          var tableDi = inv * table[3 * k + 1];
-          var MDr = Dr * tableDr - Di * tableDi;
-          var MDi = Dr * tableDi + Di * tableDr;
-
-          // Pre-Final values
-          var T0r = MAr + MCr;
-          var T0i = MAi + MCi;
-          var T1r = MAr - MCr;
-          var T1i = MAi - MCi;
-          var T2r = MBr + MDr;
-          var T2i = MBi + MDi;
-          var T3r = inv * (MBr - MDr);
-          var T3i = inv * (MBi - MDi);
-
-          // Final values
-          var FAr = T0r + T2r;
-          var FAi = T0i + T2i;
-
-          var FBr = T1r + T3i;
-          var FBi = T1i - T3r;
-
-          out[A] = FAr;
-          out[A + 1] = FAi;
-          out[B] = FBr;
-          out[B + 1] = FBi;
-
-          // Output final middle point
-          if (i === 0) {
-            var FCr = T0r - T2r;
-            var FCi = T0i - T2i;
-            out[C] = FCr;
-            out[C + 1] = FCi;
-            continue;
-          }
-
-          // Do not overwrite ourselves
-          if (i === hquarterLen) continue;
-
-          // In the flipped case:
-          // MAi = -MAi
-          // MBr=-MBi, MBi=-MBr
-          // MCr=-MCr
-          // MDr=MDi, MDi=MDr
-          var ST0r = T1r;
-          var ST0i = -T1i;
-          var ST1r = T0r;
-          var ST1i = -T0i;
-          var ST2r = -inv * T3i;
-          var ST2i = -inv * T3r;
-          var ST3r = -inv * T2i;
-          var ST3i = -inv * T2r;
-
-          var SFAr = ST0r + ST2r;
-          var SFAi = ST0i + ST2i;
-
-          var SFBr = ST1r + ST3i;
-          var SFBi = ST1i - ST3r;
-
-          var SA = outOff + quarterLen - i;
-          var SB = outOff + halfLen - i;
-
-          out[SA] = SFAr;
-          out[SA + 1] = SFAi;
-          out[SB] = SFBr;
-          out[SB + 1] = SFBi;
-        }
-      }
-    }
-  }
-  // radix-2 implementation
-  //
-  // NOTE: Only called for len=4
-  _singleRealTransform2(outOff, off, step) {
-    const out = this._out;
-    const data = this._data;
-
-    const evenR = data[off];
-    const oddR = data[off + step];
-
-    const leftR = evenR + oddR;
-    const rightR = evenR - oddR;
-
-    out[outOff] = leftR;
-    out[outOff + 1] = 0;
-    out[outOff + 2] = rightR;
-    out[outOff + 3] = 0;
-  }
-  // radix-4
-  //
-  // NOTE: Only called for len=8
-  _singleRealTransform4(outOff, off, step) {
-    const out = this._out;
-    const data = this._data;
-    const inv = this._inv ? -1 : 1;
-    const step2 = step * 2;
-    const step3 = step * 3;
-
-    // Original values
-    const Ar = data[off];
-    const Br = data[off + step];
-    const Cr = data[off + step2];
-    const Dr = data[off + step3];
-
-    // Pre-Final values
-    const T0r = Ar + Cr;
-    const T1r = Ar - Cr;
-    const T2r = Br + Dr;
-    const T3r = inv * (Br - Dr);
-
-    // Final values
-    const FAr = T0r + T2r;
-
-    const FBr = T1r;
-    const FBi = -T3r;
-
-    const FCr = T0r - T2r;
-
-    const FDr = T1r;
-    const FDi = T3r;
-
-    out[outOff] = FAr;
-    out[outOff + 1] = 0;
-    out[outOff + 2] = FBr;
-    out[outOff + 3] = FBi;
-    out[outOff + 4] = FCr;
-    out[outOff + 5] = 0;
-    out[outOff + 6] = FDr;
-    out[outOff + 7] = FDi;
-  }
-}

packages/superdough/ola-processor.js

@@ -1,185 +0,0 @@
-'use strict';
-
-// sourced from https://github.com/olvb/phaze/tree/master?tab=readme-ov-file
-const WEBAUDIO_BLOCK_SIZE = 128;
-
-/** Overlap-Add Node */
-class OLAProcessor extends AudioWorkletProcessor {
-  constructor(options) {
-    super(options);
-    this.started = false;
-    this.nbInputs = options.numberOfInputs;
-    this.nbOutputs = options.numberOfOutputs;
-
-    this.blockSize = options.processorOptions.blockSize;
-    // TODO for now, the only support hop size is the size of a web audio block
-    this.hopSize = WEBAUDIO_BLOCK_SIZE;
-
-    this.nbOverlaps = this.blockSize / this.hopSize;
-
-    // pre-allocate input buffers (will be reallocated if needed)
-    this.inputBuffers = new Array(this.nbInputs);
-    this.inputBuffersHead = new Array(this.nbInputs);
-    this.inputBuffersToSend = new Array(this.nbInputs);
-    // default to 1 channel per input until we know more
-    for (let i = 0; i < this.nbInputs; i++) {
-      this.allocateInputChannels(i, 1);
-    }
-    // pre-allocate input buffers (will be reallocated if needed)
-    this.outputBuffers = new Array(this.nbOutputs);
-    this.outputBuffersToRetrieve = new Array(this.nbOutputs);
-    // default to 1 channel per output until we know more
-    for (let i = 0; i < this.nbOutputs; i++) {
-      this.allocateOutputChannels(i, 1);
-    }
-  }
-
-  /** Handles dynamic reallocation of input/output channels buffer
-     (channel numbers may lety during lifecycle) **/
-  reallocateChannelsIfNeeded(inputs, outputs) {
-    for (let i = 0; i < this.nbInputs; i++) {
-      let nbChannels = inputs[i].length;
-      if (nbChannels != this.inputBuffers[i].length) {
-        this.allocateInputChannels(i, nbChannels);
-      }
-    }
-
-    for (let i = 0; i < this.nbOutputs; i++) {
-      let nbChannels = outputs[i].length;
-      if (nbChannels != this.outputBuffers[i].length) {
-        this.allocateOutputChannels(i, nbChannels);
-      }
-    }
-  }
-
-  allocateInputChannels(inputIndex, nbChannels) {
-    // allocate input buffers
-
-    this.inputBuffers[inputIndex] = new Array(nbChannels);
-    for (let i = 0; i < nbChannels; i++) {
-      this.inputBuffers[inputIndex][i] = new Float32Array(this.blockSize + WEBAUDIO_BLOCK_SIZE);
-      this.inputBuffers[inputIndex][i].fill(0);
-    }
-
-    // allocate input buffers to send and head pointers to copy from
-    // (cannot directly send a pointer/subarray because input may be modified)
-    this.inputBuffersHead[inputIndex] = new Array(nbChannels);
-    this.inputBuffersToSend[inputIndex] = new Array(nbChannels);
-    for (let i = 0; i < nbChannels; i++) {
-      this.inputBuffersHead[inputIndex][i] = this.inputBuffers[inputIndex][i].subarray(0, this.blockSize);
-      this.inputBuffersToSend[inputIndex][i] = new Float32Array(this.blockSize);
-    }
-  }
-
-  allocateOutputChannels(outputIndex, nbChannels) {
-    // allocate output buffers
-    this.outputBuffers[outputIndex] = new Array(nbChannels);
-    for (let i = 0; i < nbChannels; i++) {
-      this.outputBuffers[outputIndex][i] = new Float32Array(this.blockSize);
-      this.outputBuffers[outputIndex][i].fill(0);
-    }
-
-    // allocate output buffers to retrieve
-    // (cannot send a pointer/subarray because new output has to be add to exising output)
-    this.outputBuffersToRetrieve[outputIndex] = new Array(nbChannels);
-    for (let i = 0; i < nbChannels; i++) {
-      this.outputBuffersToRetrieve[outputIndex][i] = new Float32Array(this.blockSize);
-      this.outputBuffersToRetrieve[outputIndex][i].fill(0);
-    }
-  }
-
-  /** Read next web audio block to input buffers **/
-  readInputs(inputs) {
-    // when playback is paused, we may stop receiving new samples
-    if (inputs[0].length && inputs[0][0].length == 0) {
-      for (let i = 0; i < this.nbInputs; i++) {
-        for (let j = 0; j < this.inputBuffers[i].length; j++) {
-          this.inputBuffers[i][j].fill(0, this.blockSize);
-        }
-      }
-      return;
-    }
-
-    for (let i = 0; i < this.nbInputs; i++) {
-      for (let j = 0; j < this.inputBuffers[i].length; j++) {
-        let webAudioBlock = inputs[i][j];
-        this.inputBuffers[i][j].set(webAudioBlock, this.blockSize);
-      }
-    }
-  }
-
-  /** Write next web audio block from output buffers **/
-  writeOutputs(outputs) {
-    for (let i = 0; i < this.nbInputs; i++) {
-      for (let j = 0; j < this.inputBuffers[i].length; j++) {
-        let webAudioBlock = this.outputBuffers[i][j].subarray(0, WEBAUDIO_BLOCK_SIZE);
-        outputs[i][j].set(webAudioBlock);
-      }
-    }
-  }
-
-  /** Shift left content of input buffers to receive new web audio block **/
-  shiftInputBuffers() {
-    for (let i = 0; i < this.nbInputs; i++) {
-      for (let j = 0; j < this.inputBuffers[i].length; j++) {
-        this.inputBuffers[i][j].copyWithin(0, WEBAUDIO_BLOCK_SIZE);
-      }
-    }
-  }
-
-  /** Shift left content of output buffers to receive new web audio block **/
-  shiftOutputBuffers() {
-    for (let i = 0; i < this.nbOutputs; i++) {
-      for (let j = 0; j < this.outputBuffers[i].length; j++) {
-        this.outputBuffers[i][j].copyWithin(0, WEBAUDIO_BLOCK_SIZE);
-        this.outputBuffers[i][j].subarray(this.blockSize - WEBAUDIO_BLOCK_SIZE).fill(0);
-      }
-    }
-  }
-
-  /** Copy contents of input buffers to buffer actually sent to process **/
-  prepareInputBuffersToSend() {
-    for (let i = 0; i < this.nbInputs; i++) {
-      for (let j = 0; j < this.inputBuffers[i].length; j++) {
-        this.inputBuffersToSend[i][j].set(this.inputBuffersHead[i][j]);
-      }
-    }
-  }
-
-  /** Add contents of output buffers just processed to output buffers **/
-  handleOutputBuffersToRetrieve() {
-    for (let i = 0; i < this.nbOutputs; i++) {
-      for (let j = 0; j < this.outputBuffers[i].length; j++) {
-        for (let k = 0; k < this.blockSize; k++) {
-          this.outputBuffers[i][j][k] += this.outputBuffersToRetrieve[i][j][k] / this.nbOverlaps;
-        }
-      }
-    }
-  }
-
-  process(inputs, outputs, params) {
-    const input = inputs[0];
-    const hasInput = !(input[0] === undefined);
-    if (this.started && !hasInput) {
-      return false;
-    }
-    this.started = hasInput;
-    this.reallocateChannelsIfNeeded(inputs, outputs);
-
-    this.readInputs(inputs);
-    this.shiftInputBuffers();
-    this.prepareInputBuffersToSend();
-    this.processOLA(this.inputBuffersToSend, this.outputBuffersToRetrieve, params);
-    this.handleOutputBuffersToRetrieve();
-    this.writeOutputs(outputs);
-    this.shiftOutputBuffers();
-
-    return true;
-  }
-
-  processOLA(inputs, outputs, params) {
-    console.assert(false, 'Not overriden');
-  }
-}
-
-export default OLAProcessor;

packages/superdough/superdough.mjs

@@ -8,7 +8,7 @@ import './feedbackdelay.mjs';
 import './reverb.mjs';
 import './vowel.mjs';
 import { clamp, nanFallback, _mod } from './util.mjs';
-import workletsUrl from './worklets.mjs?worker&url';
+import workletsUrl from './worklets.mjs?url';
 import { createFilter, gainNode, getCompressor, getWorklet } from './helpers.mjs';
 import { map } from 'nanostores';
 import { logger } from './logger.mjs';
@@ -87,10 +87,6 @@ export const getAudioContext = () => {
   return audioContext;
 };
 
-export function getAudioContextCurrentTime() {
-  return getAudioContext().currentTime;
-}
-
 let workletsLoading;
 function loadWorklets() {
   if (!workletsLoading) {
@@ -313,13 +309,6 @@ export function resetGlobalEffects() {
 }
 
 export const superdough = async (value, t, hapDuration) => {
-  t = typeof t === 'string' && t.startsWith('=') ? Number(t.slice(1)) : ac.currentTime + t;
-  let { stretch } = value;
-  if (stretch != null) {
-    //account for phase vocoder latency
-    const latency = 0.04;
-    t = t - latency;
-  }
   const ac = getAudioContext();
   if (typeof value !== 'object') {
     throw new Error(
@@ -331,7 +320,7 @@ export const superdough = async (value, t, hapDuration) => {
   // duration is passed as value too..
   value.duration = hapDuration;
   // calculate absolute time
-
+  t = typeof t === 'string' && t.startsWith('=') ? Number(t.slice(1)) : ac.currentTime + t;
   if (t < ac.currentTime) {
     console.warn(
       `[superdough]: cannot schedule sounds in the past (target: ${t.toFixed(2)}, now: ${ac.currentTime.toFixed(2)})`,
@@ -375,7 +364,7 @@ export const superdough = async (value, t, hapDuration) => {
     bandq = getDefaultValue('bandq'),
     channels = getDefaultValue('channels'),
     //phaser
-    phaserrate: phaser,
+    phaser,
     phaserdepth = getDefaultValue('phaserdepth'),
     phasersweep,
     phasercenter,
@@ -449,7 +438,6 @@ export const superdough = async (value, t, hapDuration) => {
   }
   const chain = []; // audio nodes that will be connected to each other sequentially
   chain.push(sourceNode);
-  stretch !== undefined && chain.push(getWorklet(ac, 'phase-vocoder-processor', { pitchFactor: stretch }));
 
   // gain stage
   chain.push(gainNode(gain));
@@ -596,6 +584,4 @@ export const superdough = async (value, t, hapDuration) => {
   toDisconnect = chain.concat([delaySend, reverbSend, analyserSend]);
 };
 
-export const superdoughTrigger = (t, hap, ct, cps) => {
-  superdough(hap, t - ct, hap.duration / cps, cps);
-};
+export const superdoughTrigger = (t, hap, ct, cps) => superdough(hap, t - ct, hap.duration / cps, cps);

packages/superdough/synth.mjs

@@ -73,9 +73,8 @@ export function registerSynthSounds() {
     'supersaw',
     (begin, value, onended) => {
       const ac = getAudioContext();
-      const { z1, z2, z3 } = value;
-      let { duration, n, unison = z2 == null ? 5 : Math.round(z2 * 10), spread = z3 ?? 0.6, detune } = value;
-      detune = detune ?? n ?? z1 ?? 0.18;
+      let { duration, n, unison = 5, spread = 0.6, detune } = value;
+      detune = detune ?? n ?? 0.18;
       const frequency = getFrequencyFromValue(value);
 
       const [attack, decay, sustain, release] = getADSRValues(

packages/superdough/worklets.mjs

@@ -1,10 +1,6 @@
 // coarse, crush, and shape processors adapted from dktr0's webdirt: https://github.com/dktr0/WebDirt/blob/5ce3d698362c54d6e1b68acc47eb2955ac62c793/dist/AudioWorklets.js
 // LICENSE GNU General Public License v3.0 see https://github.com/dktr0/WebDirt/blob/main/LICENSE
 // TOFIX: THIS FILE DOES NOT SUPPORT IMPORTS ON DEPOLYMENT
-
-import OLAProcessor from './ola-processor';
-import FFT from './fft.js';
-
 const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
 const _mod = (n, m) => ((n % m) + m) % m;
 
@@ -468,183 +464,3 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
 }
 
 registerProcessor('supersaw-oscillator', SuperSawOscillatorProcessor);
-
-// Phase Vocoder sourced from // sourced from https://github.com/olvb/phaze/tree/master?tab=readme-ov-file
-const BUFFERED_BLOCK_SIZE = 2048;
-
-function genHannWindow(length) {
-  let win = new Float32Array(length);
-  for (var i = 0; i < length; i++) {
-    win[i] = 0.5 * (1 - Math.cos((2 * Math.PI * i) / length));
-  }
-  return win;
-}
-
-class PhaseVocoderProcessor extends OLAProcessor {
-  static get parameterDescriptors() {
-    return [
-      {
-        name: 'pitchFactor',
-        defaultValue: 1.0,
-      },
-    ];
-  }
-
-  constructor(options) {
-    options.processorOptions = {
-      blockSize: BUFFERED_BLOCK_SIZE,
-    };
-    super(options);
-
-    this.fftSize = this.blockSize;
-    this.timeCursor = 0;
-
-    this.hannWindow = genHannWindow(this.blockSize);
-    // prepare FFT and pre-allocate buffers
-    this.fft = new FFT(this.fftSize);
-    this.freqComplexBuffer = this.fft.createComplexArray();
-    this.freqComplexBufferShifted = this.fft.createComplexArray();
-    this.timeComplexBuffer = this.fft.createComplexArray();
-    this.magnitudes = new Float32Array(this.fftSize / 2 + 1);
-    this.peakIndexes = new Int32Array(this.magnitudes.length);
-    this.nbPeaks = 0;
-  }
-
-  processOLA(inputs, outputs, parameters) {
-    // no automation, take last value
-
-    let pitchFactor = parameters.pitchFactor[parameters.pitchFactor.length - 1];
-
-    if (pitchFactor < 0) {
-      pitchFactor = pitchFactor * 0.25;
-    }
-    pitchFactor = Math.max(0, pitchFactor + 1);
-
-    for (var i = 0; i < this.nbInputs; i++) {
-      for (var j = 0; j < inputs[i].length; j++) {
-        // big assumption here: output is symetric to input
-        var input = inputs[i][j];
-        var output = outputs[i][j];
-
-        this.applyHannWindow(input);
-
-        this.fft.realTransform(this.freqComplexBuffer, input);
-
-        this.computeMagnitudes();
-        this.findPeaks();
-        this.shiftPeaks(pitchFactor);
-
-        this.fft.completeSpectrum(this.freqComplexBufferShifted);
-        this.fft.inverseTransform(this.timeComplexBuffer, this.freqComplexBufferShifted);
-        this.fft.fromComplexArray(this.timeComplexBuffer, output);
-        this.applyHannWindow(output);
-      }
-    }
-
-    this.timeCursor += this.hopSize;
-  }
-
-  /** Apply Hann window in-place */
-  applyHannWindow(input) {
-    for (var i = 0; i < this.blockSize; i++) {
-      input[i] = input[i] * this.hannWindow[i] * 1.62;
-    }
-  }
-
-  /** Compute squared magnitudes for peak finding **/
-  computeMagnitudes() {
-    var i = 0,
-      j = 0;
-    while (i < this.magnitudes.length) {
-      let real = this.freqComplexBuffer[j];
-      let imag = this.freqComplexBuffer[j + 1];
-      // no need to sqrt for peak finding
-      this.magnitudes[i] = real ** 2 + imag ** 2;
-      i += 1;
-      j += 2;
-    }
-  }
-
-  /** Find peaks in spectrum magnitudes **/
-  findPeaks() {
-    this.nbPeaks = 0;
-    var i = 2;
-    let end = this.magnitudes.length - 2;
-
-    while (i < end) {
-      let mag = this.magnitudes[i];
-
-      if (this.magnitudes[i - 1] >= mag || this.magnitudes[i - 2] >= mag) {
-        i++;
-        continue;
-      }
-      if (this.magnitudes[i + 1] >= mag || this.magnitudes[i + 2] >= mag) {
-        i++;
-        continue;
-      }
-
-      this.peakIndexes[this.nbPeaks] = i;
-      this.nbPeaks++;
-      i += 2;
-    }
-  }
-
-  /** Shift peaks and regions of influence by pitchFactor into new specturm */
-  shiftPeaks(pitchFactor) {
-    // zero-fill new spectrum
-    this.freqComplexBufferShifted.fill(0);
-
-    for (var i = 0; i < this.nbPeaks; i++) {
-      let peakIndex = this.peakIndexes[i];
-      let peakIndexShifted = Math.round(peakIndex * pitchFactor);
-
-      if (peakIndexShifted > this.magnitudes.length) {
-        break;
-      }
-
-      // find region of influence
-      var startIndex = 0;
-      var endIndex = this.fftSize;
-      if (i > 0) {
-        let peakIndexBefore = this.peakIndexes[i - 1];
-        startIndex = peakIndex - Math.floor((peakIndex - peakIndexBefore) / 2);
-      }
-      if (i < this.nbPeaks - 1) {
-        let peakIndexAfter = this.peakIndexes[i + 1];
-        endIndex = peakIndex + Math.ceil((peakIndexAfter - peakIndex) / 2);
-      }
-
-      // shift whole region of influence around peak to shifted peak
-      let startOffset = startIndex - peakIndex;
-      let endOffset = endIndex - peakIndex;
-      for (var j = startOffset; j < endOffset; j++) {
-        let binIndex = peakIndex + j;
-        let binIndexShifted = peakIndexShifted + j;
-
-        if (binIndexShifted >= this.magnitudes.length) {
-          break;
-        }
-
-        // apply phase correction
-        let omegaDelta = (2 * Math.PI * (binIndexShifted - binIndex)) / this.fftSize;
-        let phaseShiftReal = Math.cos(omegaDelta * this.timeCursor);
-        let phaseShiftImag = Math.sin(omegaDelta * this.timeCursor);
-
-        let indexReal = binIndex * 2;
-        let indexImag = indexReal + 1;
-        let valueReal = this.freqComplexBuffer[indexReal];
-        let valueImag = this.freqComplexBuffer[indexImag];
-
-        let valueShiftedReal = valueReal * phaseShiftReal - valueImag * phaseShiftImag;
-        let valueShiftedImag = valueReal * phaseShiftImag + valueImag * phaseShiftReal;
-
-        let indexShiftedReal = binIndexShifted * 2;
-        let indexShiftedImag = indexShiftedReal + 1;
-        this.freqComplexBufferShifted[indexShiftedReal] += valueShiftedReal;
-        this.freqComplexBufferShifted[indexShiftedImag] += valueShiftedImag;
-      }
-    }
-  }
-}
-
-registerProcessor('phase-vocoder-processor', PhaseVocoderProcessor);

packages/web/vite.config.js

@@ -5,7 +5,6 @@ import replace from '@rollup/plugin-replace';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  base: './',
   plugins: [],
   build: {
     lib: {

src-tauri/src/oscbridge.rs

@@ -6,13 +6,13 @@ use std::net::UdpSocket;
 use serde::Deserialize;
 use std::sync::Arc;
 use std::thread::sleep;
-use std::time::{Duration};
+use std::time::Duration;
 use tokio::sync::{mpsc, Mutex};
 
 use crate::loggerbridge::Logger;
 pub struct OscMsg {
     pub msg_buf: Vec<u8>,
-    pub timestamp: f64,
+    pub timestamp: u64,
 }
 
 pub struct AsyncInputTransmit {
@@ -106,7 +106,7 @@ pub struct Param {
 #[derive(Deserialize)]
 pub struct MessageFromJS {
     params: Vec<Param>,
-    timestamp: f64,
+    timestamp: u64,
     target: String,
 }
 // Called from JS
@@ -127,11 +127,9 @@ pub async fn sendosc(
                 args.push(OscType::String(p.value));
             }
         }
-        // let start = SystemTime::now().duration_since(UNIX_EPOCH).unwrap();
 
-        let time_delay = Duration::from_secs_f64(m.timestamp);
         let duration_since_epoch =
-        time_delay + Duration::new(UNIX_OFFSET, 0);
+            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")?;

test/__snapshots__/examples.test.mjs.snap

@@ -4937,149 +4937,149 @@ exports[`runs examples > example "perlin" example index 0 1`] = `
 
 exports[`runs examples > example "phaser" example index 0 1`] = `
 [
-  "[ 0/1 → 1/8 | note:D3 s:sawtooth release:0.5 phaserrate:1 ]",
-  "[ 1/8 → 1/4 | note:E3 s:sawtooth release:0.5 phaserrate:1 ]",
-  "[ 1/4 → 3/8 | note:F#3 s:sawtooth release:0.5 phaserrate:1 ]",
-  "[ 3/8 → 1/2 | note:A3 s:sawtooth release:0.5 phaserrate:1 ]",
-  "[ 1/2 → 5/8 | note:B3 s:sawtooth release:0.5 phaserrate:1 ]",
-  "[ 5/8 → 3/4 | note:D4 s:sawtooth release:0.5 phaserrate:1 ]",
-  "[ 3/4 → 7/8 | note:E4 s:sawtooth release:0.5 phaserrate:1 ]",
-  "[ 7/8 → 1/1 | note:F#4 s:sawtooth release:0.5 phaserrate:1 ]",
-  "[ 1/1 → 9/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 ]",
-  "[ 9/8 → 5/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 ]",
-  "[ 5/4 → 11/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 ]",
-  "[ 11/8 → 3/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 ]",
-  "[ 3/2 → 13/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 ]",
-  "[ 13/8 → 7/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 ]",
-  "[ 7/4 → 15/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 ]",
-  "[ 15/8 → 2/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 ]",
-  "[ 2/1 → 17/8 | note:D3 s:sawtooth release:0.5 phaserrate:4 ]",
-  "[ 17/8 → 9/4 | note:E3 s:sawtooth release:0.5 phaserrate:4 ]",
-  "[ 9/4 → 19/8 | note:F#3 s:sawtooth release:0.5 phaserrate:4 ]",
-  "[ 19/8 → 5/2 | note:A3 s:sawtooth release:0.5 phaserrate:4 ]",
-  "[ 5/2 → 21/8 | note:B3 s:sawtooth release:0.5 phaserrate:4 ]",
-  "[ 21/8 → 11/4 | note:D4 s:sawtooth release:0.5 phaserrate:4 ]",
-  "[ 11/4 → 23/8 | note:E4 s:sawtooth release:0.5 phaserrate:4 ]",
-  "[ 23/8 → 3/1 | note:F#4 s:sawtooth release:0.5 phaserrate:4 ]",
-  "[ 3/1 → 25/8 | note:D3 s:sawtooth release:0.5 phaserrate:8 ]",
-  "[ 25/8 → 13/4 | note:E3 s:sawtooth release:0.5 phaserrate:8 ]",
-  "[ 13/4 → 27/8 | note:F#3 s:sawtooth release:0.5 phaserrate:8 ]",
-  "[ 27/8 → 7/2 | note:A3 s:sawtooth release:0.5 phaserrate:8 ]",
-  "[ 7/2 → 29/8 | note:B3 s:sawtooth release:0.5 phaserrate:8 ]",
-  "[ 29/8 → 15/4 | note:D4 s:sawtooth release:0.5 phaserrate:8 ]",
-  "[ 15/4 → 31/8 | note:E4 s:sawtooth release:0.5 phaserrate:8 ]",
-  "[ 31/8 → 4/1 | note:F#4 s:sawtooth release:0.5 phaserrate:8 ]",
+  "[ 0/1 → 1/8 | note:D3 s:sawtooth release:0.5 phaser:1 ]",
+  "[ 1/8 → 1/4 | note:E3 s:sawtooth release:0.5 phaser:1 ]",
+  "[ 1/4 → 3/8 | note:F#3 s:sawtooth release:0.5 phaser:1 ]",
+  "[ 3/8 → 1/2 | note:A3 s:sawtooth release:0.5 phaser:1 ]",
+  "[ 1/2 → 5/8 | note:B3 s:sawtooth release:0.5 phaser:1 ]",
+  "[ 5/8 → 3/4 | note:D4 s:sawtooth release:0.5 phaser:1 ]",
+  "[ 3/4 → 7/8 | note:E4 s:sawtooth release:0.5 phaser:1 ]",
+  "[ 7/8 → 1/1 | note:F#4 s:sawtooth release:0.5 phaser:1 ]",
+  "[ 1/1 → 9/8 | note:D3 s:sawtooth release:0.5 phaser:2 ]",
+  "[ 9/8 → 5/4 | note:E3 s:sawtooth release:0.5 phaser:2 ]",
+  "[ 5/4 → 11/8 | note:F#3 s:sawtooth release:0.5 phaser:2 ]",
+  "[ 11/8 → 3/2 | note:A3 s:sawtooth release:0.5 phaser:2 ]",
+  "[ 3/2 → 13/8 | note:B3 s:sawtooth release:0.5 phaser:2 ]",
+  "[ 13/8 → 7/4 | note:D4 s:sawtooth release:0.5 phaser:2 ]",
+  "[ 7/4 → 15/8 | note:E4 s:sawtooth release:0.5 phaser:2 ]",
+  "[ 15/8 → 2/1 | note:F#4 s:sawtooth release:0.5 phaser:2 ]",
+  "[ 2/1 → 17/8 | note:D3 s:sawtooth release:0.5 phaser:4 ]",
+  "[ 17/8 → 9/4 | note:E3 s:sawtooth release:0.5 phaser:4 ]",
+  "[ 9/4 → 19/8 | note:F#3 s:sawtooth release:0.5 phaser:4 ]",
+  "[ 19/8 → 5/2 | note:A3 s:sawtooth release:0.5 phaser:4 ]",
+  "[ 5/2 → 21/8 | note:B3 s:sawtooth release:0.5 phaser:4 ]",
+  "[ 21/8 → 11/4 | note:D4 s:sawtooth release:0.5 phaser:4 ]",
+  "[ 11/4 → 23/8 | note:E4 s:sawtooth release:0.5 phaser:4 ]",
+  "[ 23/8 → 3/1 | note:F#4 s:sawtooth release:0.5 phaser:4 ]",
+  "[ 3/1 → 25/8 | note:D3 s:sawtooth release:0.5 phaser:8 ]",
+  "[ 25/8 → 13/4 | note:E3 s:sawtooth release:0.5 phaser:8 ]",
+  "[ 13/4 → 27/8 | note:F#3 s:sawtooth release:0.5 phaser:8 ]",
+  "[ 27/8 → 7/2 | note:A3 s:sawtooth release:0.5 phaser:8 ]",
+  "[ 7/2 → 29/8 | note:B3 s:sawtooth release:0.5 phaser:8 ]",
+  "[ 29/8 → 15/4 | note:D4 s:sawtooth release:0.5 phaser:8 ]",
+  "[ 15/4 → 31/8 | note:E4 s:sawtooth release:0.5 phaser:8 ]",
+  "[ 31/8 → 4/1 | note:F#4 s:sawtooth release:0.5 phaser:8 ]",
 ]
 `;
 
 exports[`runs examples > example "phasercenter" example index 0 1`] = `
 [
-  "[ 0/1 → 1/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 1/8 → 1/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 1/4 → 3/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 3/8 → 1/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 1/2 → 5/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 5/8 → 3/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 3/4 → 7/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 7/8 → 1/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 1/1 → 9/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phasercenter:2000 ]",
-  "[ 9/8 → 5/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phasercenter:2000 ]",
-  "[ 5/4 → 11/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phasercenter:2000 ]",
-  "[ 11/8 → 3/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phasercenter:2000 ]",
-  "[ 3/2 → 13/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phasercenter:2000 ]",
-  "[ 13/8 → 7/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phasercenter:2000 ]",
-  "[ 7/4 → 15/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phasercenter:2000 ]",
-  "[ 15/8 → 2/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phasercenter:2000 ]",
-  "[ 2/1 → 17/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phasercenter:4000 ]",
-  "[ 17/8 → 9/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phasercenter:4000 ]",
-  "[ 9/4 → 19/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phasercenter:4000 ]",
-  "[ 19/8 → 5/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phasercenter:4000 ]",
-  "[ 5/2 → 21/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phasercenter:4000 ]",
-  "[ 21/8 → 11/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phasercenter:4000 ]",
-  "[ 11/4 → 23/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phasercenter:4000 ]",
-  "[ 23/8 → 3/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phasercenter:4000 ]",
-  "[ 3/1 → 25/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 25/8 → 13/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 13/4 → 27/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 27/8 → 7/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 7/2 → 29/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 29/8 → 15/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 15/4 → 31/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
-  "[ 31/8 → 4/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phasercenter:800 ]",
+  "[ 0/1 → 1/8 | note:D3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 1/8 → 1/4 | note:E3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 1/4 → 3/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 3/8 → 1/2 | note:A3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 1/2 → 5/8 | note:B3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 5/8 → 3/4 | note:D4 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 3/4 → 7/8 | note:E4 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 7/8 → 1/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 1/1 → 9/8 | note:D3 s:sawtooth release:0.5 phaser:2 phasercenter:2000 ]",
+  "[ 9/8 → 5/4 | note:E3 s:sawtooth release:0.5 phaser:2 phasercenter:2000 ]",
+  "[ 5/4 → 11/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phasercenter:2000 ]",
+  "[ 11/8 → 3/2 | note:A3 s:sawtooth release:0.5 phaser:2 phasercenter:2000 ]",
+  "[ 3/2 → 13/8 | note:B3 s:sawtooth release:0.5 phaser:2 phasercenter:2000 ]",
+  "[ 13/8 → 7/4 | note:D4 s:sawtooth release:0.5 phaser:2 phasercenter:2000 ]",
+  "[ 7/4 → 15/8 | note:E4 s:sawtooth release:0.5 phaser:2 phasercenter:2000 ]",
+  "[ 15/8 → 2/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phasercenter:2000 ]",
+  "[ 2/1 → 17/8 | note:D3 s:sawtooth release:0.5 phaser:2 phasercenter:4000 ]",
+  "[ 17/8 → 9/4 | note:E3 s:sawtooth release:0.5 phaser:2 phasercenter:4000 ]",
+  "[ 9/4 → 19/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phasercenter:4000 ]",
+  "[ 19/8 → 5/2 | note:A3 s:sawtooth release:0.5 phaser:2 phasercenter:4000 ]",
+  "[ 5/2 → 21/8 | note:B3 s:sawtooth release:0.5 phaser:2 phasercenter:4000 ]",
+  "[ 21/8 → 11/4 | note:D4 s:sawtooth release:0.5 phaser:2 phasercenter:4000 ]",
+  "[ 11/4 → 23/8 | note:E4 s:sawtooth release:0.5 phaser:2 phasercenter:4000 ]",
+  "[ 23/8 → 3/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phasercenter:4000 ]",
+  "[ 3/1 → 25/8 | note:D3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 25/8 → 13/4 | note:E3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 13/4 → 27/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 27/8 → 7/2 | note:A3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 7/2 → 29/8 | note:B3 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 29/8 → 15/4 | note:D4 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 15/4 → 31/8 | note:E4 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
+  "[ 31/8 → 4/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phasercenter:800 ]",
 ]
 `;
 
 exports[`runs examples > example "phaserdepth" example index 0 1`] = `
 [
-  "[ 0/1 → 1/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0 ]",
-  "[ 1/8 → 1/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0 ]",
-  "[ 1/4 → 3/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0 ]",
-  "[ 3/8 → 1/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0 ]",
-  "[ 1/2 → 5/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0 ]",
-  "[ 5/8 → 3/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0 ]",
-  "[ 3/4 → 7/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0 ]",
-  "[ 7/8 → 1/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0 ]",
-  "[ 1/1 → 9/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.5 ]",
-  "[ 9/8 → 5/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.5 ]",
-  "[ 5/4 → 11/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.5 ]",
-  "[ 11/8 → 3/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.5 ]",
-  "[ 3/2 → 13/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.5 ]",
-  "[ 13/8 → 7/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.5 ]",
-  "[ 7/4 → 15/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.5 ]",
-  "[ 15/8 → 2/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.5 ]",
-  "[ 2/1 → 17/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.75 ]",
-  "[ 17/8 → 9/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.75 ]",
-  "[ 9/4 → 19/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.75 ]",
-  "[ 19/8 → 5/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.75 ]",
-  "[ 5/2 → 21/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.75 ]",
-  "[ 21/8 → 11/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.75 ]",
-  "[ 11/4 → 23/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.75 ]",
-  "[ 23/8 → 3/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:0.75 ]",
-  "[ 3/1 → 25/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:1 ]",
-  "[ 25/8 → 13/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:1 ]",
-  "[ 13/4 → 27/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:1 ]",
-  "[ 27/8 → 7/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:1 ]",
-  "[ 7/2 → 29/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phaserdepth:1 ]",
-  "[ 29/8 → 15/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:1 ]",
-  "[ 15/4 → 31/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:1 ]",
-  "[ 31/8 → 4/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phaserdepth:1 ]",
+  "[ 0/1 → 1/8 | note:D3 s:sawtooth release:0.5 phaser:2 phaserdepth:0 ]",
+  "[ 1/8 → 1/4 | note:E3 s:sawtooth release:0.5 phaser:2 phaserdepth:0 ]",
+  "[ 1/4 → 3/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phaserdepth:0 ]",
+  "[ 3/8 → 1/2 | note:A3 s:sawtooth release:0.5 phaser:2 phaserdepth:0 ]",
+  "[ 1/2 → 5/8 | note:B3 s:sawtooth release:0.5 phaser:2 phaserdepth:0 ]",
+  "[ 5/8 → 3/4 | note:D4 s:sawtooth release:0.5 phaser:2 phaserdepth:0 ]",
+  "[ 3/4 → 7/8 | note:E4 s:sawtooth release:0.5 phaser:2 phaserdepth:0 ]",
+  "[ 7/8 → 1/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phaserdepth:0 ]",
+  "[ 1/1 → 9/8 | note:D3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.5 ]",
+  "[ 9/8 → 5/4 | note:E3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.5 ]",
+  "[ 5/4 → 11/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.5 ]",
+  "[ 11/8 → 3/2 | note:A3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.5 ]",
+  "[ 3/2 → 13/8 | note:B3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.5 ]",
+  "[ 13/8 → 7/4 | note:D4 s:sawtooth release:0.5 phaser:2 phaserdepth:0.5 ]",
+  "[ 7/4 → 15/8 | note:E4 s:sawtooth release:0.5 phaser:2 phaserdepth:0.5 ]",
+  "[ 15/8 → 2/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phaserdepth:0.5 ]",
+  "[ 2/1 → 17/8 | note:D3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.75 ]",
+  "[ 17/8 → 9/4 | note:E3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.75 ]",
+  "[ 9/4 → 19/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.75 ]",
+  "[ 19/8 → 5/2 | note:A3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.75 ]",
+  "[ 5/2 → 21/8 | note:B3 s:sawtooth release:0.5 phaser:2 phaserdepth:0.75 ]",
+  "[ 21/8 → 11/4 | note:D4 s:sawtooth release:0.5 phaser:2 phaserdepth:0.75 ]",
+  "[ 11/4 → 23/8 | note:E4 s:sawtooth release:0.5 phaser:2 phaserdepth:0.75 ]",
+  "[ 23/8 → 3/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phaserdepth:0.75 ]",
+  "[ 3/1 → 25/8 | note:D3 s:sawtooth release:0.5 phaser:2 phaserdepth:1 ]",
+  "[ 25/8 → 13/4 | note:E3 s:sawtooth release:0.5 phaser:2 phaserdepth:1 ]",
+  "[ 13/4 → 27/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phaserdepth:1 ]",
+  "[ 27/8 → 7/2 | note:A3 s:sawtooth release:0.5 phaser:2 phaserdepth:1 ]",
+  "[ 7/2 → 29/8 | note:B3 s:sawtooth release:0.5 phaser:2 phaserdepth:1 ]",
+  "[ 29/8 → 15/4 | note:D4 s:sawtooth release:0.5 phaser:2 phaserdepth:1 ]",
+  "[ 15/4 → 31/8 | note:E4 s:sawtooth release:0.5 phaser:2 phaserdepth:1 ]",
+  "[ 31/8 → 4/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phaserdepth:1 ]",
 ]
 `;
 
 exports[`runs examples > example "phasersweep" example index 0 1`] = `
 [
-  "[ 0/1 → 1/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 1/8 → 1/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 1/4 → 3/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 3/8 → 1/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 1/2 → 5/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 5/8 → 3/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 3/4 → 7/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 7/8 → 1/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 1/1 → 9/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phasersweep:2000 ]",
-  "[ 9/8 → 5/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phasersweep:2000 ]",
-  "[ 5/4 → 11/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phasersweep:2000 ]",
-  "[ 11/8 → 3/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phasersweep:2000 ]",
-  "[ 3/2 → 13/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phasersweep:2000 ]",
-  "[ 13/8 → 7/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phasersweep:2000 ]",
-  "[ 7/4 → 15/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phasersweep:2000 ]",
-  "[ 15/8 → 2/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phasersweep:2000 ]",
-  "[ 2/1 → 17/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phasersweep:4000 ]",
-  "[ 17/8 → 9/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phasersweep:4000 ]",
-  "[ 9/4 → 19/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phasersweep:4000 ]",
-  "[ 19/8 → 5/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phasersweep:4000 ]",
-  "[ 5/2 → 21/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phasersweep:4000 ]",
-  "[ 21/8 → 11/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phasersweep:4000 ]",
-  "[ 11/4 → 23/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phasersweep:4000 ]",
-  "[ 23/8 → 3/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phasersweep:4000 ]",
-  "[ 3/1 → 25/8 | note:D3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 25/8 → 13/4 | note:E3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 13/4 → 27/8 | note:F#3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 27/8 → 7/2 | note:A3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 7/2 → 29/8 | note:B3 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 29/8 → 15/4 | note:D4 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 15/4 → 31/8 | note:E4 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
-  "[ 31/8 → 4/1 | note:F#4 s:sawtooth release:0.5 phaserrate:2 phasersweep:800 ]",
+  "[ 0/1 → 1/8 | note:D3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 1/8 → 1/4 | note:E3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 1/4 → 3/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 3/8 → 1/2 | note:A3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 1/2 → 5/8 | note:B3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 5/8 → 3/4 | note:D4 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 3/4 → 7/8 | note:E4 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 7/8 → 1/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 1/1 → 9/8 | note:D3 s:sawtooth release:0.5 phaser:2 phasersweep:2000 ]",
+  "[ 9/8 → 5/4 | note:E3 s:sawtooth release:0.5 phaser:2 phasersweep:2000 ]",
+  "[ 5/4 → 11/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phasersweep:2000 ]",
+  "[ 11/8 → 3/2 | note:A3 s:sawtooth release:0.5 phaser:2 phasersweep:2000 ]",
+  "[ 3/2 → 13/8 | note:B3 s:sawtooth release:0.5 phaser:2 phasersweep:2000 ]",
+  "[ 13/8 → 7/4 | note:D4 s:sawtooth release:0.5 phaser:2 phasersweep:2000 ]",
+  "[ 7/4 → 15/8 | note:E4 s:sawtooth release:0.5 phaser:2 phasersweep:2000 ]",
+  "[ 15/8 → 2/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phasersweep:2000 ]",
+  "[ 2/1 → 17/8 | note:D3 s:sawtooth release:0.5 phaser:2 phasersweep:4000 ]",
+  "[ 17/8 → 9/4 | note:E3 s:sawtooth release:0.5 phaser:2 phasersweep:4000 ]",
+  "[ 9/4 → 19/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phasersweep:4000 ]",
+  "[ 19/8 → 5/2 | note:A3 s:sawtooth release:0.5 phaser:2 phasersweep:4000 ]",
+  "[ 5/2 → 21/8 | note:B3 s:sawtooth release:0.5 phaser:2 phasersweep:4000 ]",
+  "[ 21/8 → 11/4 | note:D4 s:sawtooth release:0.5 phaser:2 phasersweep:4000 ]",
+  "[ 11/4 → 23/8 | note:E4 s:sawtooth release:0.5 phaser:2 phasersweep:4000 ]",
+  "[ 23/8 → 3/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phasersweep:4000 ]",
+  "[ 3/1 → 25/8 | note:D3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 25/8 → 13/4 | note:E3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 13/4 → 27/8 | note:F#3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 27/8 → 7/2 | note:A3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 7/2 → 29/8 | note:B3 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 29/8 → 15/4 | note:D4 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 15/4 → 31/8 | note:E4 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
+  "[ 31/8 → 4/1 | note:F#4 s:sawtooth release:0.5 phaser:2 phasersweep:800 ]",
 ]
 `;
 
@@ -5234,25 +5234,6 @@ exports[`runs examples > example "pickF" example index 1 1`] = `
 ]
 `;
 
-exports[`runs examples > example "pickmodRestart" example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | note:C3 s:piano ]",
-  "[ 1/4 → 1/2 | note:D3 s:piano ]",
-  "[ 1/2 → 3/4 | note:E3 s:piano ]",
-  "[ 3/4 → 1/1 | note:C3 s:piano ]",
-  "[ 1/1 → 5/4 | note:C3 s:piano ]",
-  "[ 5/4 → 3/2 | note:D3 s:piano ]",
-  "[ 3/2 → 7/4 | note:E3 s:piano ]",
-  "[ 7/4 → 2/1 | note:C3 s:piano ]",
-  "[ 2/1 → 9/4 | note:E3 s:piano ]",
-  "[ 9/4 → 5/2 | note:F3 s:piano ]",
-  "[ 5/2 → 11/4 | note:G3 s:piano ]",
-  "[ 3/1 → 13/4 | note:E3 s:piano ]",
-  "[ 13/4 → 7/2 | note:F3 s:piano ]",
-  "[ 7/2 → 15/4 | note:G3 s:piano ]",
-]
-`;
-
 exports[`runs examples > example "pitchwheel" example index 0 1`] = `
 [
   "[ 0/1 → 1/13 | note:C3 s:sawtooth cutoff:500 ]",
@@ -6637,56 +6618,6 @@ exports[`runs examples > example "scope" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "scramble
-Slices a pattern into the given number of parts, then plays those parts at random. Similar to \`shuffle\`,
-but parts might be played more than once, or not at all, per cycle." example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | note:e s:piano ]",
-  "[ 1/4 → 1/2 | note:d s:piano ]",
-  "[ 1/2 → 3/4 | note:c s:piano ]",
-  "[ 3/4 → 1/1 | note:d s:piano ]",
-  "[ 1/1 → 5/4 | note:e s:piano ]",
-  "[ 5/4 → 3/2 | note:c s:piano ]",
-  "[ 3/2 → 7/4 | note:d s:piano ]",
-  "[ 7/4 → 2/1 | note:e s:piano ]",
-  "[ 2/1 → 9/4 | note:f s:piano ]",
-  "[ 9/4 → 5/2 | note:f s:piano ]",
-  "[ 5/2 → 11/4 | note:c s:piano ]",
-  "[ 11/4 → 3/1 | note:c s:piano ]",
-  "[ 3/1 → 13/4 | note:d s:piano ]",
-  "[ 13/4 → 7/2 | note:d s:piano ]",
-  "[ 7/2 → 15/4 | note:f s:piano ]",
-  "[ 15/4 → 4/1 | note:e s:piano ]",
-]
-`;
-
-exports[`runs examples > example "scramble
-Slices a pattern into the given number of parts, then plays those parts at random. Similar to \`shuffle\`,
-but parts might be played more than once, or not at all, per cycle." example index 1 1`] = `
-[
-  "[ 0/1 → 1/8 | note:e s:piano ]",
-  "[ 1/8 → 1/4 | note:d s:piano ]",
-  "[ 1/4 → 3/8 | note:c s:piano ]",
-  "[ 3/8 → 1/2 | note:d s:piano ]",
-  "[ 1/2 → 1/1 | note:g s:piano ]",
-  "[ 1/1 → 9/8 | note:e s:piano ]",
-  "[ 9/8 → 5/4 | note:c s:piano ]",
-  "[ 5/4 → 11/8 | note:d s:piano ]",
-  "[ 11/8 → 3/2 | note:e s:piano ]",
-  "[ 3/2 → 2/1 | note:g s:piano ]",
-  "[ 2/1 → 17/8 | note:f s:piano ]",
-  "[ 17/8 → 9/4 | note:f s:piano ]",
-  "[ 9/4 → 19/8 | note:c s:piano ]",
-  "[ 19/8 → 5/2 | note:c s:piano ]",
-  "[ 5/2 → 3/1 | note:g s:piano ]",
-  "[ 3/1 → 25/8 | note:d s:piano ]",
-  "[ 25/8 → 13/4 | note:d s:piano ]",
-  "[ 13/4 → 27/8 | note:f s:piano ]",
-  "[ 27/8 → 7/2 | note:e s:piano ]",
-  "[ 7/2 → 4/1 | note:g s:piano ]",
-]
-`;
-
 exports[`runs examples > example "segment" example index 0 1`] = `
 [
   "[ 0/1 → 1/24 | note:40.25 ]",
@@ -6903,56 +6834,6 @@ exports[`runs examples > example "shape" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "shuffle
-Slices a pattern into the given number of parts, then plays those parts in random order.
-Each part will be played exactly once per cycle." example index 0 1`] = `
-[
-  "[ 0/1 → 1/4 | note:c s:piano ]",
-  "[ 1/4 → 1/2 | note:d s:piano ]",
-  "[ 1/2 → 3/4 | note:e s:piano ]",
-  "[ 3/4 → 1/1 | note:f s:piano ]",
-  "[ 1/1 → 5/4 | note:c s:piano ]",
-  "[ 5/4 → 3/2 | note:d s:piano ]",
-  "[ 3/2 → 7/4 | note:e s:piano ]",
-  "[ 7/4 → 2/1 | note:f s:piano ]",
-  "[ 2/1 → 9/4 | note:c s:piano ]",
-  "[ 9/4 → 5/2 | note:d s:piano ]",
-  "[ 5/2 → 11/4 | note:e s:piano ]",
-  "[ 11/4 → 3/1 | note:f s:piano ]",
-  "[ 3/1 → 13/4 | note:c s:piano ]",
-  "[ 13/4 → 7/2 | note:d s:piano ]",
-  "[ 7/2 → 15/4 | note:e s:piano ]",
-  "[ 15/4 → 4/1 | note:f s:piano ]",
-]
-`;
-
-exports[`runs examples > example "shuffle
-Slices a pattern into the given number of parts, then plays those parts in random order.
-Each part will be played exactly once per cycle." example index 1 1`] = `
-[
-  "[ 0/1 → 1/8 | note:c s:piano ]",
-  "[ 1/8 → 1/4 | note:d s:piano ]",
-  "[ 1/4 → 3/8 | note:e s:piano ]",
-  "[ 3/8 → 1/2 | note:f s:piano ]",
-  "[ 1/2 → 1/1 | note:g s:piano ]",
-  "[ 1/1 → 9/8 | note:c s:piano ]",
-  "[ 9/8 → 5/4 | note:d s:piano ]",
-  "[ 5/4 → 11/8 | note:e s:piano ]",
-  "[ 11/8 → 3/2 | note:f s:piano ]",
-  "[ 3/2 → 2/1 | note:g s:piano ]",
-  "[ 2/1 → 17/8 | note:c s:piano ]",
-  "[ 17/8 → 9/4 | note:d s:piano ]",
-  "[ 9/4 → 19/8 | note:e s:piano ]",
-  "[ 19/8 → 5/2 | note:f s:piano ]",
-  "[ 5/2 → 3/1 | note:g s:piano ]",
-  "[ 3/1 → 25/8 | note:c s:piano ]",
-  "[ 25/8 → 13/4 | note:d s:piano ]",
-  "[ 13/4 → 27/8 | note:e s:piano ]",
-  "[ 27/8 → 7/2 | note:f s:piano ]",
-  "[ 7/2 → 4/1 | note:g s:piano ]",
-]
-`;
-
 exports[`runs examples > example "silence" example index 0 1`] = `[]`;
 
 exports[`runs examples > example "sine" example index 0 1`] = `
@@ -7605,23 +7486,6 @@ exports[`runs examples > example "steps" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "stretch" example index 0 1`] = `
-[
-  "[ (0/1 → 1/3) ⇝ 1/1 | s:gm_flute stretch:1 ]",
-  "[ 0/1 ⇜ (1/3 → 2/3) ⇝ 1/1 | s:gm_flute stretch:2 ]",
-  "[ 0/1 ⇜ (2/3 → 1/1) | s:gm_flute stretch:0.5 ]",
-  "[ (1/1 → 4/3) ⇝ 2/1 | s:gm_flute stretch:1 ]",
-  "[ 1/1 ⇜ (4/3 → 5/3) ⇝ 2/1 | s:gm_flute stretch:2 ]",
-  "[ 1/1 ⇜ (5/3 → 2/1) | s:gm_flute stretch:0.5 ]",
-  "[ (2/1 → 7/3) ⇝ 3/1 | s:gm_flute stretch:1 ]",
-  "[ 2/1 ⇜ (7/3 → 8/3) ⇝ 3/1 | s:gm_flute stretch:2 ]",
-  "[ 2/1 ⇜ (8/3 → 3/1) | s:gm_flute stretch:0.5 ]",
-  "[ (3/1 → 10/3) ⇝ 4/1 | s:gm_flute stretch:1 ]",
-  "[ 3/1 ⇜ (10/3 → 11/3) ⇝ 4/1 | s:gm_flute stretch:2 ]",
-  "[ 3/1 ⇜ (11/3 → 4/1) | s:gm_flute stretch:0.5 ]",
-]
-`;
-
 exports[`runs examples > example "striate" example index 0 1`] = `
 [
   "[ 0/1 → 1/6 | s:numbers n:0 begin:0 end:0.16666666666666666 ]",
@@ -8597,117 +8461,6 @@ exports[`runs examples > example "xfade" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "z1" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | note:D3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 1/8 → 1/4 | note:E3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 1/4 → 3/8 | note:F#3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 3/8 → 1/2 | note:A3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 1/2 → 5/8 | note:B3 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 5/8 → 3/4 | note:D4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 3/4 → 7/8 | note:E4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 7/8 → 1/1 | note:F#4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 1/1 → 9/8 | note:D3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 9/8 → 5/4 | note:E3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 5/4 → 11/8 | note:F#3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 11/8 → 3/2 | note:A3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 3/2 → 13/8 | note:B3 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 13/8 → 7/4 | note:D4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 7/4 → 15/8 | note:E4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 15/8 → 2/1 | note:F#4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 2/1 → 17/8 | note:D3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 17/8 → 9/4 | note:E3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 9/4 → 19/8 | note:F#3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 19/8 → 5/2 | note:A3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 5/2 → 21/8 | note:B3 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 21/8 → 11/4 | note:D4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 11/4 → 23/8 | note:E4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 23/8 → 3/1 | note:F#4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 3/1 → 25/8 | note:D3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 25/8 → 13/4 | note:E3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 13/4 → 27/8 | note:F#3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 27/8 → 7/2 | note:A3 s:supersaw z1:0.01 release:0.5 ]",
-  "[ 7/2 → 29/8 | note:B3 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 29/8 → 15/4 | note:D4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 15/4 → 31/8 | note:E4 s:supersaw z1:0.75 release:0.5 ]",
-  "[ 31/8 → 4/1 | note:F#4 s:supersaw z1:0.75 release:0.5 ]",
-]
-`;
-
-exports[`runs examples > example "z2" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | note:D3 s:supersaw z2:2 release:0.5 ]",
-  "[ 1/8 → 1/4 | note:E3 s:supersaw z2:2 release:0.5 ]",
-  "[ 1/4 → 3/8 | note:F#3 s:supersaw z2:2 release:0.5 ]",
-  "[ 3/8 → 1/2 | note:A3 s:supersaw z2:2 release:0.5 ]",
-  "[ 1/2 → 5/8 | note:B3 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 5/8 → 3/4 | note:D4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 3/4 → 7/8 | note:E4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 7/8 → 1/1 | note:F#4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 1/1 → 9/8 | note:D3 s:supersaw z2:2 release:0.5 ]",
-  "[ 9/8 → 5/4 | note:E3 s:supersaw z2:2 release:0.5 ]",
-  "[ 5/4 → 11/8 | note:F#3 s:supersaw z2:2 release:0.5 ]",
-  "[ 11/8 → 3/2 | note:A3 s:supersaw z2:2 release:0.5 ]",
-  "[ 3/2 → 13/8 | note:B3 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 13/8 → 7/4 | note:D4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 7/4 → 15/8 | note:E4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 15/8 → 2/1 | note:F#4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 2/1 → 17/8 | note:D3 s:supersaw z2:2 release:0.5 ]",
-  "[ 17/8 → 9/4 | note:E3 s:supersaw z2:2 release:0.5 ]",
-  "[ 9/4 → 19/8 | note:F#3 s:supersaw z2:2 release:0.5 ]",
-  "[ 19/8 → 5/2 | note:A3 s:supersaw z2:2 release:0.5 ]",
-  "[ 5/2 → 21/8 | note:B3 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 21/8 → 11/4 | note:D4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 11/4 → 23/8 | note:E4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 23/8 → 3/1 | note:F#4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 3/1 → 25/8 | note:D3 s:supersaw z2:2 release:0.5 ]",
-  "[ 25/8 → 13/4 | note:E3 s:supersaw z2:2 release:0.5 ]",
-  "[ 13/4 → 27/8 | note:F#3 s:supersaw z2:2 release:0.5 ]",
-  "[ 27/8 → 7/2 | note:A3 s:supersaw z2:2 release:0.5 ]",
-  "[ 7/2 → 29/8 | note:B3 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 29/8 → 15/4 | note:D4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 15/4 → 31/8 | note:E4 s:supersaw z2:0.7 release:0.5 ]",
-  "[ 31/8 → 4/1 | note:F#4 s:supersaw z2:0.7 release:0.5 ]",
-]
-`;
-
-exports[`runs examples > example "z3" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | note:D3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 1/8 → 1/4 | note:E3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 1/4 → 3/8 | note:F#3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 3/8 → 1/2 | note:A3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 1/2 → 5/8 | note:B3 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 5/8 → 3/4 | note:D4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 3/4 → 7/8 | note:E4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 7/8 → 1/1 | note:F#4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 1/1 → 9/8 | note:D3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 9/8 → 5/4 | note:E3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 5/4 → 11/8 | note:F#3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 11/8 → 3/2 | note:A3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 3/2 → 13/8 | note:B3 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 13/8 → 7/4 | note:D4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 7/4 → 15/8 | note:E4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 15/8 → 2/1 | note:F#4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 2/1 → 17/8 | note:D3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 17/8 → 9/4 | note:E3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 9/4 → 19/8 | note:F#3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 19/8 → 5/2 | note:A3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 5/2 → 21/8 | note:B3 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 21/8 → 11/4 | note:D4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 11/4 → 23/8 | note:E4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 23/8 → 3/1 | note:F#4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 3/1 → 25/8 | note:D3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 25/8 → 13/4 | note:E3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 13/4 → 27/8 | note:F#3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 27/8 → 7/2 | note:A3 s:supersaw z3:0.1 release:0.5 ]",
-  "[ 7/2 → 29/8 | note:B3 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 29/8 → 15/4 | note:D4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 15/4 → 31/8 | note:E4 s:supersaw z3:0.75 release:0.5 ]",
-  "[ 31/8 → 4/1 | note:F#4 s:supersaw z3:0.75 release:0.5 ]",
-]
-`;
-
 exports[`runs examples > example "zoom" example index 0 1`] = `
 [
   "[ 0/1 → 1/6 | s:hh ]",

website/src/components/Oven/Oven.jsx

@@ -1,7 +1,7 @@
 import { useState, useEffect } from 'react';
 import { loadFeaturedPatterns, loadPublicPatterns } from '@src/user_pattern_utils.mjs';
 import { MiniRepl } from '@src/docs/MiniRepl';
-import { PatternLabel } from '@src/repl/components/panel/PatternsTab';
+import { PatternLabel } from '@src/repl/panel/PatternsTab';
 
 function PatternList({ patterns }) {
   return (

website/src/components/Udels/UdelFrame.jsx

@@ -1,32 +0,0 @@
-import { useRef } from 'react';
-
-export function UdelFrame({ onEvaluate, hash, instance }) {
-  const ref = useRef();
-  window.addEventListener('message', (message) => {
-    const childWindow = ref?.current?.contentWindow;
-    if (message == null || message.source !== childWindow) {
-      return; // Skip message in this event listener
-    }
-    onEvaluate(message.data);
-  });
-
-  const url = new URL(window.location.origin);
-  url.hash = hash;
-  url.searchParams.append('instance', instance);
-  const source = url.toString();
-
-  return (
-    <iframe
-      ref={ref}
-      style={{
-        display: 'flex',
-        flexGrow: 1,
-        minWidth: '50%',
-        boxSizing: 'border-box',
-        border: '0px',
-      }}
-      title="strudel embed"
-      src={source}
-    ></iframe>
-  );
-}

website/src/components/Udels/Udels.jsx

@@ -1,72 +0,0 @@
-import { code2hash } from '@strudel/core';
-
-import { UdelFrame } from './UdelFrame';
-import { useState } from 'react';
-import UdelsHeader from './UdelsHeader';
-
-const defaultHash = 'c3RhY2soCiAgCik%3D';
-
-const getHashesFromUrl = () => {
-  return window.location.hash?.slice(1).split(',');
-};
-const updateURLHashes = (hashes) => {
-  const newHash = '#' + hashes.join(',');
-  window.location.hash = newHash;
-};
-export function Udels() {
-  const hashes = getHashesFromUrl();
-
-  const [numWindows, setNumWindows] = useState(hashes?.length ?? 1);
-  const numWindowsOnChange = (num) => {
-    setNumWindows(num);
-    const hashes = getHashesFromUrl();
-    const newHashes = [];
-    for (let i = 0; i < num; i++) {
-      newHashes[i] = hashes[i] ?? defaultHash;
-    }
-    updateURLHashes(newHashes);
-  };
-
-  const onEvaluate = (key, code) => {
-    const hashes = getHashesFromUrl();
-    hashes[key] = code2hash(code);
-
-    updateURLHashes(hashes);
-  };
-
-  return (
-    <div
-      style={{
-        margin: 0,
-        display: 'flex',
-        flex: 1,
-        height: '100vh',
-        width: '100%',
-        flexDirection: 'column',
-      }}
-    >
-      <UdelsHeader numWindows={numWindows} setNumWindows={numWindowsOnChange} />
-      <div
-        style={{
-          display: 'flex',
-          flex: 1,
-          flexDirection: 'row',
-          flexWrap: 'wrap',
-        }}
-      >
-        {hashes.map((hash, key) => {
-          return (
-            <UdelFrame
-              instance={key}
-              onEvaluate={(code) => {
-                onEvaluate(key, code);
-              }}
-              hash={hash}
-              key={key}
-            />
-          );
-        })}
-      </div>
-    </div>
-  );
-}

website/src/components/Udels/UdelsEditor.jsx

@@ -1,26 +0,0 @@
-import Loader from '@src/repl/components/Loader';
-import { Panel } from '@src/repl/components/panel/Panel';
-import { Code } from '@src/repl/components/Code';
-import BigPlayButton from '@src/repl/components/BigPlayButton';
-import UserFacingErrorMessage from '@src/repl/components/UserFacingErrorMessage';
-
-// type Props = {
-//  context: replcontext,
-// }
-
-export default function UdelsEditor(Props) {
-  const { context } = Props;
-  const { containerRef, editorRef, error, init, pending, started, handleTogglePlay } = context;
-
-  return (
-    <div className={'h-full flex w-full flex-col relative'}>
-      <Loader active={pending} />
-      <BigPlayButton started={started} handleTogglePlay={handleTogglePlay} />
-      <div className="grow flex relative overflow-hidden">
-        <Code containerRef={containerRef} editorRef={editorRef} init={init} />
-      </div>
-      <UserFacingErrorMessage error={error} />
-      <Panel context={context} />
-    </div>
-  );
-}

website/src/components/Udels/UdelsHeader.jsx

@@ -1,20 +0,0 @@
-import NumberInput from '@src/repl/components/NumberInput';
-
-export default function UdelsHeader(Props) {
-  const { numWindows, setNumWindows } = Props;
-
-  return (
-    <header id="header" className="flex text-white  z-[100] text-lg select-none bg-neutral-900">
-      <div className="px-4 items-center gap-2  flex space-x-2 md:pt-0 select-none">
-        <h1 onClick={() => {}} className={'text-l cursor-pointer flex gap-4'}>
-          <div className={'mt-[1px] cursor-pointer'}>🌀</div>
-
-          <div className={'animate-pulse'}>
-            <span className="">strudel</span> <span className="text-sm">-UDELS</span>
-          </div>
-        </h1>
-        <NumberInput value={numWindows} setValue={setNumWindows} />
-      </div>
-    </header>
-  );
-}

website/src/layouts/MainLayout.astro

@@ -30,7 +30,7 @@ const githubEditUrl = `${CONFIG.GITHUB_EDIT_URL}/${currentFile}`;
     </title>
   </head>
 
-  <body class="h-app-height m-0 text-gray-50 bg-background">
+  <body class="h-app-height text-gray-50 bg-background">
     <div class="w-full h-full space-y-4 flex flex-col">
       <header class="max-w-full fixed top-0 w-full z-[100]">
         <Header currentPage={currentPage} />

website/src/pages/index.astro

@@ -3,12 +3,12 @@ import HeadCommon from '../components/HeadCommon.astro';
 import { Repl } from '../repl/Repl';
 ---
 
-<html lang="en" class="m-0 dark">
+<html lang="en" class="dark">
   <head>
     <HeadCommon />
     <title>Strudel REPL</title>
   </head>
-  <body class="h-app-height bg-background m-0">
+  <body class="h-app-height bg-background">
     <Repl client:only="react" />
     <a rel="me" href="https://social.toplap.org/@strudel" target="_blank" class="hidden">mastodon</a>
   </body>

website/src/pages/learn/input-output.mdx

@@ -45,7 +45,7 @@ But you can also control cc messages separately like this:
 $: ccv(sine.segment(16).slow(4)).ccn(74).midi()`}
 />
 
-# OSC/SuperDirt API
+# SuperDirt API
 
 In mainline tidal, the actual sound is generated via [SuperDirt](https://github.com/musikinformatik/SuperDirt/), which runs inside SuperCollider.
 Strudel also supports using [SuperDirt](https://github.com/musikinformatik/SuperDirt/) as a backend, although it requires some developer tooling to run.
@@ -73,14 +73,16 @@ Now you're all set!
 
 If you now hear sound, congratulations! If not, you can get help on the [#strudel channel in the TidalCycles discord](https://discord.com/invite/HGEdXmRkzT).
 
-Note: if you have the 'Audio Engine Target' in settings set to 'OSC', you do not need to add .osc() to the end of your pattern.
-
 ### Pattern.osc
 
 <JsDoc client:idle name="Pattern.osc" h={0} />
 
 ## SuperDirt Params
 
+The following functions can be used with [SuperDirt](https://github.com/musikinformatik/SuperDirt/):
+
+`s n note freq channel orbit cutoff resonance hcutoff hresonance bandf bandq djf vowel cut begin end loop fadeTime speed unitA gain amp accelerate crush coarse delay lock leslie lrate lsize pan panspan pansplay room size dry shape squiz waveloss attack decay octave detune tremolodepth`
+
 Please refer to [Tidal Docs](https://tidalcycles.org/) for more info.
 
 <br />

website/src/pages/udels/index.astro

@@ -1,12 +0,0 @@
----
-import { Udels } from '../../components/Udels/Udels.jsx';
-
-
-const { BASE_URL } = import.meta.env;
-const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL;
----
-
-
-<body class="m-0">
-  <Udels client:only="react" />
-</body>

website/src/repl/Header.jsx

@@ -5,15 +5,24 @@ import PlayCircleIcon from '@heroicons/react/20/solid/PlayCircleIcon';
 import SparklesIcon from '@heroicons/react/20/solid/SparklesIcon';
 import StopCircleIcon from '@heroicons/react/20/solid/StopCircleIcon';
 import cx from '@src/cx.mjs';
-import { useSettings, setIsZen } from '../../settings.mjs';
-import '../Repl.css';
-
+import { useSettings, setIsZen } from '../settings.mjs';
+// import { ReplContext } from './Repl';
+import './Repl.css';
 const { BASE_URL } = import.meta.env;
 const baseNoTrailing = BASE_URL.endsWith('/') ? BASE_URL.slice(0, -1) : BASE_URL;
 
-export function Header({ context, embedded = false }) {
-  const { started, pending, isDirty, activeCode, handleTogglePlay, handleEvaluate, handleShuffle, handleShare } =
-    context;
+export function Header({ context }) {
+  const {
+    embedded,
+    started,
+    pending,
+    isDirty,
+    activeCode,
+    handleTogglePlay,
+    handleEvaluate,
+    handleShuffle,
+    handleShare,
+  } = context;
   const isEmbedded = typeof window !== 'undefined' && (embedded || window.location !== window.parent.location);
   const { isZen } = useSettings();
 

website/src/repl/Repl.jsx

@@ -4,15 +4,268 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { isIframe, isUdels } from './util.mjs';
-import UdelsEditor from '@components/Udels/UdelsEditor';
-import ReplEditor from './components/ReplEditor';
-import EmbeddedReplEditor from './components/EmbeddedReplEditor';
-import { useReplContext } from './useReplContext';
+import { code2hash, logger, silence } from '@strudel/core';
+import { getDrawContext } from '@strudel/draw';
+import cx from '@src/cx.mjs';
+import { transpiler } from '@strudel/transpiler';
+import {
+  getAudioContext,
+  webaudioOutput,
+  resetGlobalEffects,
+  resetLoadedSounds,
+  initAudioOnFirstClick,
+} from '@strudel/webaudio';
+import { defaultAudioDeviceName } from '../settings.mjs';
+import { getAudioDevices, setAudioDevice, setVersionDefaultsFrom } from './util.mjs';
+import { StrudelMirror, defaultSettings } from '@strudel/codemirror';
+import { clearHydra } from '@strudel/hydra';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { settingsMap, useSettings } from '../settings.mjs';
+import {
+  setActivePattern,
+  setLatestCode,
+  createPatternID,
+  userPattern,
+  getViewingPatternData,
+  setViewingPatternData,
+} from '../user_pattern_utils.mjs';
+import { Header } from './Header';
+import Loader from './Loader';
+import { Panel } from './panel/Panel';
+import { useStore } from '@nanostores/react';
+import { prebake } from './prebake.mjs';
+import { getRandomTune, initCode, loadModules, shareCode, ReplContext } from './util.mjs';
+import PlayCircleIcon from '@heroicons/react/20/solid/PlayCircleIcon';
+import './Repl.css';
+import { setInterval, clearInterval } from 'worker-timers';
+import { getMetadata } from '../metadata_parser';
+
+const { latestCode } = settingsMap.get();
+
+let modulesLoading, presets, drawContext, clearCanvas, isIframe, audioReady;
+
+if (typeof window !== 'undefined') {
+  audioReady = initAudioOnFirstClick();
+  modulesLoading = loadModules();
+  presets = prebake();
+  drawContext = getDrawContext();
+  clearCanvas = () => drawContext.clearRect(0, 0, drawContext.canvas.height, drawContext.canvas.width);
+  isIframe = window.location !== window.parent.location;
+}
+
+async function getModule(name) {
+  if (!modulesLoading) {
+    return;
+  }
+  const modules = await modulesLoading;
+  return modules.find((m) => m.packageName === name);
+}
 
 export function Repl({ embedded = false }) {
-  const isEmbedded = embedded || isIframe();
-  const Editor = isUdels() ? UdelsEditor : isEmbedded ? EmbeddedReplEditor : ReplEditor;
-  const context = useReplContext();
-  return <Editor context={context} />;
+  const isEmbedded = embedded || isIframe;
+  const { panelPosition, isZen, isSyncEnabled } = useSettings();
+  const init = useCallback(() => {
+    const drawTime = [-2, 2];
+    const drawContext = getDrawContext();
+    const editor = new StrudelMirror({
+      sync: isSyncEnabled,
+      defaultOutput: webaudioOutput,
+      getTime: () => getAudioContext().currentTime,
+      setInterval,
+      clearInterval,
+      transpiler,
+      autodraw: false,
+      root: containerRef.current,
+      initialCode: '// LOADING',
+      pattern: silence,
+      drawTime,
+      drawContext,
+      prebake: async () => Promise.all([modulesLoading, presets]),
+      onUpdateState: (state) => {
+        setReplState({ ...state });
+      },
+      onToggle: (playing) => {
+        if (!playing) {
+          clearHydra();
+        }
+      },
+      beforeEval: () => audioReady,
+      afterEval: (all) => {
+        const { code } = all;
+        setLatestCode(code);
+        window.location.hash = '#' + code2hash(code);
+        setDocumentTitle(code);
+        const viewingPatternData = getViewingPatternData();
+        setVersionDefaultsFrom(code);
+        const data = { ...viewingPatternData, code };
+        let id = data.id;
+        const isExamplePattern = viewingPatternData.collection !== userPattern.collection;
+
+        if (isExamplePattern) {
+          const codeHasChanged = code !== viewingPatternData.code;
+          if (codeHasChanged) {
+            // fork example
+            const newPattern = userPattern.duplicate(data);
+            id = newPattern.id;
+            setViewingPatternData(newPattern.data);
+          }
+        } else {
+          id = userPattern.isValidID(id) ? id : createPatternID();
+          setViewingPatternData(userPattern.update(id, data).data);
+        }
+        setActivePattern(id);
+      },
+      bgFill: false,
+    });
+    window.strudelMirror = editor;
+
+    // init settings
+
+    initCode().then(async (decoded) => {
+      let code, msg;
+      if (decoded) {
+        code = decoded;
+        msg = `I have loaded the code from the URL.`;
+      } else if (latestCode) {
+        code = latestCode;
+        msg = `Your last session has been loaded!`;
+      } else {
+        const { code: randomTune, name } = await getRandomTune();
+        code = randomTune;
+        msg = `A random code snippet named "${name}" has been loaded!`;
+      }
+      editor.setCode(code);
+      setDocumentTitle(code);
+      logger(`Welcome to Strudel! ${msg} Press play or hit ctrl+enter to run it!`, 'highlight');
+    });
+
+    editorRef.current = editor;
+  }, []);
+
+  const [replState, setReplState] = useState({});
+  const { started, isDirty, error, activeCode, pending } = replState;
+  const editorRef = useRef();
+  const containerRef = useRef();
+
+  // this can be simplified once SettingsTab has been refactored to change codemirrorSettings directly!
+  // this will be the case when the main repl is being replaced
+  const _settings = useStore(settingsMap, { keys: Object.keys(defaultSettings) });
+  useEffect(() => {
+    let editorSettings = {};
+    Object.keys(defaultSettings).forEach((key) => {
+      if (_settings.hasOwnProperty(key)) {
+        editorSettings[key] = _settings[key];
+      }
+    });
+    editorRef.current?.updateSettings(editorSettings);
+  }, [_settings]);
+
+  // on first load, set stored audio device if possible
+  useEffect(() => {
+    const { audioDeviceName } = _settings;
+    if (audioDeviceName !== defaultAudioDeviceName) {
+      getAudioDevices().then((devices) => {
+        const deviceID = devices.get(audioDeviceName);
+        if (deviceID == null) {
+          return;
+        }
+        setAudioDevice(deviceID);
+      });
+    }
+  }, []);
+
+  //
+  // UI Actions
+  //
+
+  const setDocumentTitle = (code) => {
+    const meta = getMetadata(code);
+    document.title = (meta.title ? `${meta.title} - ` : '') + 'Strudel REPL';
+  };
+
+  const handleTogglePlay = async () => {
+    editorRef.current?.toggle();
+  };
+
+  const resetEditor = async () => {
+    (await getModule('@strudel/tonal'))?.resetVoicings();
+    resetGlobalEffects();
+    clearCanvas();
+    clearHydra();
+    resetLoadedSounds();
+    editorRef.current.repl.setCps(0.5);
+    await prebake(); // declare default samples
+  };
+
+  const handleUpdate = async (patternData, reset = false) => {
+    setViewingPatternData(patternData);
+    editorRef.current.setCode(patternData.code);
+    if (reset) {
+      await resetEditor();
+      handleEvaluate();
+    }
+  };
+
+  const handleEvaluate = () => {
+    editorRef.current.evaluate();
+  };
+  const handleShuffle = async () => {
+    const patternData = await getRandomTune();
+    const code = patternData.code;
+    logger(`[repl] ✨ loading random tune "${patternData.id}"`);
+    setActivePattern(patternData.id);
+    setViewingPatternData(patternData);
+    await resetEditor();
+    editorRef.current.setCode(code);
+    editorRef.current.repl.evaluate(code);
+  };
+
+  const handleShare = async () => shareCode(replState.code);
+  const context = {
+    embedded,
+    started,
+    pending,
+    isDirty,
+    activeCode,
+    handleTogglePlay,
+    handleUpdate,
+    handleShuffle,
+    handleShare,
+    handleEvaluate,
+  };
+
+  return (
+    <ReplContext.Provider value={context}>
+      <div className={cx('h-full flex flex-col relative')}>
+        <Loader active={pending} />
+        <Header context={context} />
+        {isEmbedded && !started && (
+          <button
+            onClick={() => handleTogglePlay()}
+            className="text-white text-2xl fixed left-[50%] top-[50%] translate-x-[-50%] translate-y-[-50%] z-[1000] m-auto p-4 bg-black rounded-md flex items-center space-x-2"
+          >
+            <PlayCircleIcon className="w-6 h-6" />
+            <span>play</span>
+          </button>
+        )}
+        <div className="grow flex relative overflow-hidden">
+          <section
+            className={'text-gray-100 cursor-text pb-0 overflow-auto grow' + (isZen ? ' px-10' : '')}
+            id="code"
+            ref={(el) => {
+              containerRef.current = el;
+              if (!editorRef.current) {
+                init();
+              }
+            }}
+          ></section>
+          {panelPosition === 'right' && !isEmbedded && <Panel context={context} />}
+        </div>
+        {error && (
+          <div className="text-red-500 p-4 bg-lineHighlight animate-pulse">{error.message || 'Unknown Error :-/'}</div>
+        )}
+        {panelPosition === 'bottom' && !isEmbedded && <Panel context={context} />}
+      </div>
+    </ReplContext.Provider>
+  );
 }

website/src/repl/components/BigPlayButton.jsx

@@ -1,22 +0,0 @@
-import PlayCircleIcon from '@heroicons/react/20/solid/PlayCircleIcon';
-
-// type Props = {
-//   started: boolean;
-//   handleTogglePlay: () => void;
-// };
-export default function BigPlayButton(Props) {
-  const { started, handleTogglePlay } = Props;
-  if (started) {
-    return;
-  }
-
-  return (
-    <button
-      onClick={() => handleTogglePlay()}
-      className="text-white text-2xl fixed left-[50%] top-[50%] translate-x-[-50%] translate-y-[-50%] z-[1000] m-auto p-4 bg-black rounded-md flex items-center space-x-2"
-    >
-      <PlayCircleIcon className="w-6 h-6" />
-      <span>play</span>
-    </button>
-  );
-}

website/src/repl/components/Code.jsx

@@ -1,21 +0,0 @@
-// type Props = {
-//   containerRef:  React.MutableRefObject<HTMLElement | null>,
-//   editorRef:  React.MutableRefObject<HTMLElement | null>,
-//   init: () => void
-// }
-export function Code(Props) {
-  const { editorRef, containerRef, init } = Props;
-
-  return (
-    <section
-      className={'text-gray-100 cursor-text pb-0 overflow-auto grow'}
-      id="code"
-      ref={(el) => {
-        containerRef.current = el;
-        if (!editorRef.current) {
-          init();
-        }
-      }}
-    ></section>
-  );
-}

website/src/repl/components/EmbeddedReplEditor.jsx

@@ -1,25 +0,0 @@
-import Loader from '@src/repl/components/Loader';
-import { Code } from '@src/repl/components/Code';
-import BigPlayButton from '@src/repl/components/BigPlayButton';
-import UserFacingErrorMessage from '@src/repl/components/UserFacingErrorMessage';
-import { Header } from './Header';
-
-// type Props = {
-//  context: replcontext,
-// }
-
-export default function EmbeddedReplEditor(Props) {
-  const { context } = Props;
-  const { pending, started, handleTogglePlay, containerRef, editorRef, error, init } = context;
-  return (
-    <div className="h-full flex flex-col relative">
-      <Loader active={pending} />
-      <Header context={context} embedded={true} />
-      <BigPlayButton started={started} handleTogglePlay={handleTogglePlay} />
-      <div className="grow flex relative overflow-hidden">
-        <Code containerRef={containerRef} editorRef={editorRef} init={init} />
-      </div>
-      <UserFacingErrorMessage error={error} />
-    </div>
-  );
-}

website/src/repl/components/NumberInput.jsx

@@ -1,54 +0,0 @@
-function Button(Props) {
-  const { children, onClick } = Props;
-
-  return (
-    <button
-      onClick={onClick}
-      type="button"
-      data-input-counter-increment="counter-input"
-      className="flex-shrink-0  bg-gray-700 hover:bg-gray-600 border-gray-600 inline-flex items-center justify-center border rounded-md h-5 w-5  focus:ring-gray-700 focus:ring-2 focus:outline-none"
-    >
-      {children}
-    </button>
-  );
-}
-export default function NumberInput(Props) {
-  const { value = 0, setValue, max, min } = Props;
-
-  return (
-    <div className="relative flex items-center">
-      <Button onClick={() => setValue(value - 1)}>
-        <svg
-          className="w-2.5 h-2.5 text-white"
-          aria-hidden="true"
-          xmlns="http://www.w3.org/2000/svg"
-          fill="none"
-          viewBox="0 0 18 2"
-        >
-          <path stroke="currentColor" strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M1 1h16" />
-        </svg>
-      </Button>
-      <input
-        min={min}
-        max={max}
-        type="text"
-        data-input-counter
-        className="flex-shrink-0 text-white border-0 bg-transparent text-sm font-normal focus:outline-none focus:ring-0 max-w-[2.5rem] text-center"
-        placeholder=""
-        value={value}
-        onChange={(e) => setValue(e.target.value)}
-      />
-      <Button onClick={() => setValue(value + 1)}>
-        <svg
-          className="w-2.5 h-2.5 text-white"
-          aria-hidden="true"
-          xmlns="http://www.w3.org/2000/svg"
-          fill="none"
-          viewBox="0 0 18 18"
-        >
-          <path strokeLinecap="round" stroke="currentColor" strokeLinejoin="round" strokeWidth="2" d="M9 1v16M1 9h16" />
-        </svg>
-      </Button>
-    </div>
-  );
-}

website/src/repl/components/ReplEditor.jsx

@@ -1,30 +0,0 @@
-import Loader from '@src/repl/components/Loader';
-import { Panel } from '@src/repl/components/panel/Panel';
-import { Code } from '@src/repl/components/Code';
-import UserFacingErrorMessage from '@src/repl/components/UserFacingErrorMessage';
-import { Header } from './Header';
-import { useSettings } from '@src/settings.mjs';
-
-// type Props = {
-//  context: replcontext,
-// }
-
-export default function ReplEditor(Props) {
-  const { context } = Props;
-  const { containerRef, editorRef, error, init, pending } = context;
-  const settings = useSettings();
-  const { panelPosition } = settings;
-
-  return (
-    <div className="h-full flex flex-col relative">
-      <Loader active={pending} />
-      <Header context={context} />
-      <div className="grow flex relative overflow-hidden">
-        <Code containerRef={containerRef} editorRef={editorRef} init={init} />
-        {panelPosition === 'right' && <Panel context={context} />}
-      </div>
-      <UserFacingErrorMessage error={error} />
-      {panelPosition === 'bottom' && <Panel context={context} />}
-    </div>
-  );
-}

website/src/repl/components/UserFacingErrorMessage.jsx

@@ -1,8 +0,0 @@
-// type Props = { error: Error | null };
-export default function UserFacingErrorMessage(Props) {
-  const { error } = Props;
-  if (error == null) {
-    return;
-  }
-  return <div className="text-red-500 p-4 bg-lineHighlight animate-pulse">{error.message || 'Unknown Error :-/'}</div>;
-}

website/src/repl/components/panel/AudioEngineTargetSelector.jsx

@@ -1,29 +0,0 @@
-import React from 'react';
-import { audioEngineTargets } from '../../../settings.mjs';
-import { SelectInput } from './SelectInput';
-
-// Allows the user to select an audio interface for Strudel to play through
-export function AudioEngineTargetSelector({ target, onChange, isDisabled }) {
-  const onTargetChange = (target) => {
-    onChange(target);
-  };
-  const options = new Map([
-    [audioEngineTargets.webaudio, audioEngineTargets.webaudio],
-    [audioEngineTargets.osc, audioEngineTargets.osc],
-  ]);
-  return (
-    <div className=" flex flex-col gap-1">
-      <SelectInput isDisabled={isDisabled} options={options} value={target} onChange={onTargetChange} />
-      {target === audioEngineTargets.osc && (
-        <div>
-          <p className="text-sm italic">
-            ⚠ All events routed to OSC, audio is silenced! See{' '}
-            <a className="text-blue-500" href="https://strudel.cc/learn/input-output/">
-              Docs
-            </a>
-          </p>
-        </div>
-      )}
-    </div>
-  );
-}

website/src/repl/panel/AudioDeviceSelector.jsx

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { getAudioDevices, setAudioDevice } from '../../util.mjs';
+import { getAudioDevices, setAudioDevice } from '../util.mjs';
 import { SelectInput } from './SelectInput';
 
 const initdevices = new Map();

website/src/repl/panel/FilesTab.jsx

@@ -1,6 +1,6 @@
 import { Fragment, useEffect } from 'react';
 import React, { useMemo, useState } from 'react';
-import { isAudioFile, readDir, dir, playFile } from '../../files.mjs';
+import { isAudioFile, readDir, dir, playFile } from '../files.mjs';
 
 export function FilesTab() {
   const [path, setPath] = useState([]);

website/src/repl/panel/ImportSoundsButton.jsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useState } from 'react';
-import { registerSamplesFromDB, uploadSamplesToDB, userSamplesDBConfig } from '../../idbutils.mjs';
+import { registerSamplesFromDB, uploadSamplesToDB, userSamplesDBConfig } from '../idbutils.mjs';
 
 //choose a directory to locally import samples
 export default function ImportSoundsButton({ onComplete }) {

website/src/repl/panel/Panel.jsx

@@ -4,7 +4,7 @@ import useEvent from '@src/useEvent.mjs';
 import cx from '@src/cx.mjs';
 import { nanoid } from 'nanoid';
 import { useCallback, useLayoutEffect, useEffect, useRef, useState } from 'react';
-import { setActiveFooter, useSettings } from '../../../settings.mjs';
+import { setActiveFooter, useSettings } from '../../settings.mjs';
 import { ConsoleTab } from './ConsoleTab';
 import { FilesTab } from './FilesTab';
 import { Reference } from './Reference';

website/src/repl/panel/PatternsTab.jsx

@@ -5,13 +5,13 @@ import {
   useActivePattern,
   useViewingPatternData,
   userPattern,
-} from '../../../user_pattern_utils.mjs';
+} from '../../user_pattern_utils.mjs';
 import { useMemo } from 'react';
-import { getMetadata } from '../../../metadata_parser.js';
-import { useExamplePatterns } from '../../useExamplePatterns.jsx';
-import { parseJSON, isUdels } from '../../util.mjs';
+import { getMetadata } from '../../metadata_parser';
+import { useExamplePatterns } from '../useExamplePatterns';
+import { parseJSON } from '../util.mjs';
 import { ButtonGroup } from './Forms.jsx';
-import { settingsMap, useSettings } from '../../../settings.mjs';
+import { settingsMap, useSettings } from '../../settings.mjs';
 
 function classNames(...classes) {
   return classes.filter(Boolean).join(' ');
@@ -99,7 +99,7 @@ export function PatternsTab({ context }) {
   };
   const viewingPatternID = viewingPatternData?.id;
 
-  const autoResetPatternOnChange = !isUdels();
+  const autoResetPatternOnChange = !window.parent?.location.pathname.includes('oodles');
 
   return (
     <div className="px-4 w-full dark:text-white text-stone-900 space-y-2 pb-4 flex flex-col overflow-hidden max-h-full">

website/src/repl/panel/Reference.jsx

@@ -1,4 +1,4 @@
-import jsdocJson from '../../../../../doc.json';
+import jsdocJson from '../../../../doc.json';
 const visibleFunctions = jsdocJson.docs
   .filter(({ name, description }) => name && !name.startsWith('_') && !!description)
   .sort((a, b) => /* a.meta.filename.localeCompare(b.meta.filename) +  */ a.name.localeCompare(b.name));

website/src/repl/panel/SettingsTab.jsx

@@ -1,15 +1,12 @@
-import { defaultSettings, settingsMap, useSettings } from '../../../settings.mjs';
+import { defaultSettings, settingsMap, useSettings } from '../../settings.mjs';
 import { themes } from '@strudel/codemirror';
-import { isUdels } from '../../util.mjs';
 import { ButtonGroup } from './Forms.jsx';
 import { AudioDeviceSelector } from './AudioDeviceSelector.jsx';
-import { AudioEngineTargetSelector } from './AudioEngineTargetSelector.jsx';
-import { confirmDialog } from '../../util.mjs';
 
-function Checkbox({ label, value, onChange, disabled = false }) {
+function Checkbox({ label, value, onChange }) {
   return (
     <label>
-      <input disabled={disabled} type="checkbox" checked={value} onChange={onChange} />
+      <input type="checkbox" checked={value} onChange={onChange} />
       {' ' + label}
     </label>
   );
@@ -80,8 +77,6 @@ const fontFamilyOptions = {
   galactico: 'galactico',
 };
 
-const RELOAD_MSG = 'Changing this setting requires the window to reload itself. OK?';
-
 export function SettingsTab({ started }) {
   const {
     theme,
@@ -100,41 +95,19 @@ export function SettingsTab({ started }) {
     fontFamily,
     panelPosition,
     audioDeviceName,
-    audioEngineTarget,
   } = useSettings();
-  const shouldAlwaysSync = isUdels();
-  const canChangeAudioDevice = AudioContext.prototype.setSinkId != null;
+
   return (
     <div className="text-foreground p-4 space-y-4">
-      {canChangeAudioDevice && (
+      {AudioContext.prototype.setSinkId != null && (
         <FormItem label="Audio Output Device">
           <AudioDeviceSelector
             isDisabled={started}
             audioDeviceName={audioDeviceName}
-            onChange={(audioDeviceName) => {
-              confirmDialog(RELOAD_MSG).then((r) => {
-                if (r == true) {
-                  settingsMap.setKey('audioDeviceName', audioDeviceName);
-                  return window.location.reload();
-                }
-              });
-            }}
+            onChange={(audioDeviceName) => settingsMap.setKey('audioDeviceName', audioDeviceName)}
           />
         </FormItem>
       )}
-      <FormItem label="Audio Engine Target">
-        <AudioEngineTargetSelector
-          target={audioEngineTarget}
-          onChange={(target) => {
-            confirmDialog(RELOAD_MSG).then((r) => {
-              if (r == true) {
-                settingsMap.setKey('audioEngineTarget', target);
-                return window.location.reload();
-              }
-            });
-          }}
-        />
-      </FormItem>
       <FormItem label="Theme">
         <SelectInput options={themeOptions} value={theme} onChange={(theme) => settingsMap.setKey('theme', theme)} />
       </FormItem>
@@ -219,15 +192,11 @@ export function SettingsTab({ started }) {
         <Checkbox
           label="Sync across Browser Tabs / Windows"
           onChange={(cbEvent) => {
-            const newVal = cbEvent.target.checked;
-            confirmDialog(RELOAD_MSG).then((r) => {
-              if (r) {
-                settingsMap.setKey('isSyncEnabled', newVal);
-                window.location.reload();
-              }
-            });
+            if (confirm('Changing this setting requires the window to reload itself. OK?')) {
+              settingsMap.setKey('isSyncEnabled', cbEvent.target.checked);
+              window.location.reload();
+            }
           }}
-          disabled={shouldAlwaysSync}
           value={isSyncEnabled}
         />
       </FormItem>
@@ -236,11 +205,9 @@ export function SettingsTab({ started }) {
         <button
           className="bg-background p-2 max-w-[300px] rounded-md hover:opacity-50"
           onClick={() => {
-            confirmDialog('Sure?').then((r) => {
-              if (r) {
-                settingsMap.set(defaultSettings);
-              }
-            });
+            if (confirm('Sure?')) {
+              settingsMap.set(defaultSettings);
+            }
           }}
         >
           restore default settings

website/src/repl/panel/SoundsTab.jsx

@@ -2,7 +2,7 @@ import useEvent from '@src/useEvent.mjs';
 import { useStore } from '@nanostores/react';
 import { getAudioContext, soundMap, connectToDestination } from '@strudel/webaudio';
 import React, { useMemo, useRef } from 'react';
-import { settingsMap, useSettings } from '../../../settings.mjs';
+import { settingsMap, useSettings } from '../../settings.mjs';
 import { ButtonGroup } from './Forms.jsx';
 import ImportSoundsButton from './ImportSoundsButton.jsx';
 

website/src/repl/useReplContext.jsx

@@ -1,239 +0,0 @@
-/*
-Repl.jsx - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/App.js>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import { code2hash, getPerformanceTimeSeconds, logger, silence } from '@strudel/core';
-import { getDrawContext } from '@strudel/draw';
-import { transpiler } from '@strudel/transpiler';
-import {
-  getAudioContextCurrentTime,
-  webaudioOutput,
-  resetGlobalEffects,
-  resetLoadedSounds,
-  initAudioOnFirstClick,
-} from '@strudel/webaudio';
-import { getAudioDevices, setAudioDevice, setVersionDefaultsFrom } from './util.mjs';
-import { StrudelMirror, defaultSettings } from '@strudel/codemirror';
-import { clearHydra } from '@strudel/hydra';
-import { useCallback, useEffect, useRef, useState } from 'react';
-import { settingsMap, useSettings } from '../settings.mjs';
-import {
-  setActivePattern,
-  setLatestCode,
-  createPatternID,
-  userPattern,
-  getViewingPatternData,
-  setViewingPatternData,
-} from '../user_pattern_utils.mjs';
-import { superdirtOutput } from '@strudel/osc/superdirtoutput';
-import { audioEngineTargets, defaultAudioDeviceName } from '../settings.mjs';
-import { useStore } from '@nanostores/react';
-import { prebake } from './prebake.mjs';
-import { getRandomTune, initCode, loadModules, shareCode } from './util.mjs';
-import './Repl.css';
-import { setInterval, clearInterval } from 'worker-timers';
-import { getMetadata } from '../metadata_parser';
-
-const { latestCode } = settingsMap.get();
-let modulesLoading, presets, drawContext, clearCanvas, audioReady;
-
-if (typeof window !== 'undefined') {
-  audioReady = initAudioOnFirstClick();
-  modulesLoading = loadModules();
-  presets = prebake();
-  drawContext = getDrawContext();
-  clearCanvas = () => drawContext.clearRect(0, 0, drawContext.canvas.height, drawContext.canvas.width);
-}
-
-async function getModule(name) {
-  if (!modulesLoading) {
-    return;
-  }
-  const modules = await modulesLoading;
-  return modules.find((m) => m.packageName === name);
-}
-
-export function useReplContext() {
-  const { isSyncEnabled, audioEngineTarget } = useSettings();
-  const shouldUseWebaudio = audioEngineTarget !== audioEngineTargets.osc;
-  const defaultOutput = shouldUseWebaudio ? webaudioOutput : superdirtOutput;
-  const getTime = shouldUseWebaudio ? getAudioContextCurrentTime : getPerformanceTimeSeconds;
-
-  const init = useCallback(() => {
-    const drawTime = [-2, 2];
-    const drawContext = getDrawContext();
-    const editor = new StrudelMirror({
-      sync: isSyncEnabled,
-      defaultOutput,
-      getTime,
-      setInterval,
-      clearInterval,
-      transpiler,
-      autodraw: false,
-      root: containerRef.current,
-      initialCode: '// LOADING',
-      pattern: silence,
-      drawTime,
-      drawContext,
-      prebake: async () => Promise.all([modulesLoading, presets]),
-      onUpdateState: (state) => {
-        setReplState({ ...state });
-      },
-      onToggle: (playing) => {
-        if (!playing) {
-          clearHydra();
-        }
-      },
-      beforeEval: () => audioReady,
-      afterEval: (all) => {
-        const { code } = all;
-        //post to iframe parent (like Udels) if it exists...
-        window.parent?.postMessage(code);
-
-        setLatestCode(code);
-        window.location.hash = '#' + code2hash(code);
-        setDocumentTitle(code);
-        const viewingPatternData = getViewingPatternData();
-        setVersionDefaultsFrom(code);
-        const data = { ...viewingPatternData, code };
-        let id = data.id;
-        const isExamplePattern = viewingPatternData.collection !== userPattern.collection;
-
-        if (isExamplePattern) {
-          const codeHasChanged = code !== viewingPatternData.code;
-          if (codeHasChanged) {
-            // fork example
-            const newPattern = userPattern.duplicate(data);
-            id = newPattern.id;
-            setViewingPatternData(newPattern.data);
-          }
-        } else {
-          id = userPattern.isValidID(id) ? id : createPatternID();
-          setViewingPatternData(userPattern.update(id, data).data);
-        }
-        setActivePattern(id);
-      },
-      bgFill: false,
-    });
-    window.strudelMirror = editor;
-
-    // init settings
-    initCode().then(async (decoded) => {
-      let code, msg;
-      if (decoded) {
-        code = decoded;
-        msg = `I have loaded the code from the URL.`;
-      } else if (latestCode) {
-        code = latestCode;
-        msg = `Your last session has been loaded!`;
-      } else {
-        const { code: randomTune, name } = await getRandomTune();
-        code = randomTune;
-        msg = `A random code snippet named "${name}" has been loaded!`;
-      }
-      editor.setCode(code);
-      setDocumentTitle(code);
-      logger(`Welcome to Strudel! ${msg} Press play or hit ctrl+enter to run it!`, 'highlight');
-    });
-
-    editorRef.current = editor;
-  }, []);
-
-  const [replState, setReplState] = useState({});
-  const { started, isDirty, error, activeCode, pending } = replState;
-  const editorRef = useRef();
-  const containerRef = useRef();
-
-  // this can be simplified once SettingsTab has been refactored to change codemirrorSettings directly!
-  // this will be the case when the main repl is being replaced
-  const _settings = useStore(settingsMap, { keys: Object.keys(defaultSettings) });
-  useEffect(() => {
-    let editorSettings = {};
-    Object.keys(defaultSettings).forEach((key) => {
-      if (Object.prototype.hasOwnProperty.call(_settings, key)) {
-        editorSettings[key] = _settings[key];
-      }
-    });
-    editorRef.current?.updateSettings(editorSettings);
-  }, [_settings]);
-
-  // on first load, set stored audio device if possible
-  useEffect(() => {
-    const { audioDeviceName } = _settings;
-    if (audioDeviceName !== defaultAudioDeviceName) {
-      getAudioDevices().then((devices) => {
-        const deviceID = devices.get(audioDeviceName);
-        if (deviceID == null) {
-          return;
-        }
-        setAudioDevice(deviceID);
-      });
-    }
-  }, []);
-
-  //
-  // UI Actions
-  //
-
-  const setDocumentTitle = (code) => {
-    const meta = getMetadata(code);
-    document.title = (meta.title ? `${meta.title} - ` : '') + 'Strudel REPL';
-  };
-
-  const handleTogglePlay = async () => {
-    editorRef.current?.toggle();
-  };
-
-  const resetEditor = async () => {
-    (await getModule('@strudel/tonal'))?.resetVoicings();
-    resetGlobalEffects();
-    clearCanvas();
-    clearHydra();
-    resetLoadedSounds();
-    editorRef.current.repl.setCps(0.5);
-    await prebake(); // declare default samples
-  };
-
-  const handleUpdate = async (patternData, reset = false) => {
-    setViewingPatternData(patternData);
-    editorRef.current.setCode(patternData.code);
-    if (reset) {
-      await resetEditor();
-      handleEvaluate();
-    }
-  };
-
-  const handleEvaluate = () => {
-    editorRef.current.evaluate();
-  };
-  const handleShuffle = async () => {
-    const patternData = await getRandomTune();
-    const code = patternData.code;
-    logger(`[repl] ✨ loading random tune "${patternData.id}"`);
-    setActivePattern(patternData.id);
-    setViewingPatternData(patternData);
-    await resetEditor();
-    editorRef.current.setCode(code);
-    editorRef.current.repl.evaluate(code);
-  };
-
-  const handleShare = async () => shareCode(replState.code);
-  const context = {
-    started,
-    pending,
-    isDirty,
-    activeCode,
-    handleTogglePlay,
-    handleUpdate,
-    handleShuffle,
-    handleShare,
-    handleEvaluate,
-    init,
-    error,
-    editorRef,
-    containerRef,
-  };
-  return context;
-}

website/src/repl/util.mjs

@@ -2,11 +2,14 @@ import { evalScope, hash2code, logger } from '@strudel/core';
 import { settingPatterns, defaultAudioDeviceName } from '../settings.mjs';
 import { getAudioContext, initializeAudioOutput, setDefaultAudioContext, setVersionDefaults } from '@strudel/webaudio';
 import { getMetadata } from '../metadata_parser';
+
 import { isTauri } from '../tauri.mjs';
 import './Repl.css';
+
 import { createClient } from '@supabase/supabase-js';
 import { nanoid } from 'nanoid';
 import { writeText } from '@tauri-apps/api/clipboard';
+import { createContext } from 'react';
 import { $featuredPatterns, loadDBPatterns } from '@src/user_pattern_utils.mjs';
 
 // Create a single supabase client for interacting with your database
@@ -94,16 +97,6 @@ export function loadModules() {
 
   return evalScope(settingPatterns, ...modules);
 }
-// confirm dialog is a promise in webkit and a boolean in other browsers... normalize it to be a promise everywhere
-export function confirmDialog(msg) {
-  const confirmed = confirm(msg);
-  if (confirmed instanceof Promise) {
-    return confirmed;
-  }
-  return new Promise((resolve) => {
-    resolve(confirmed);
-  });
-}
 
 let lastShared;
 export async function shareCode(codeToShare) {
@@ -112,49 +105,34 @@ export async function shareCode(codeToShare) {
     logger(`Link already generated!`, 'error');
     return;
   }
-
-  confirmDialog(
+  const isPublic = confirm(
     'Do you want your pattern to be public? If no, press cancel and you will get just a private link.',
-  ).then(async (isPublic) => {
-    const hash = nanoid(12);
-    const shareUrl = window.location.origin + window.location.pathname + '?' + hash;
-    const { error } = await supabase.from('code_v1').insert([{ code: codeToShare, hash, ['public']: isPublic }]);
-    if (!error) {
-      lastShared = codeToShare;
-      // copy shareUrl to clipboard
-      if (isTauri()) {
-        await writeText(shareUrl);
-      } else {
-        await navigator.clipboard.writeText(shareUrl);
-      }
-      const message = `Link copied to clipboard: ${shareUrl}`;
-      alert(message);
-      // alert(message);
-      logger(message, 'highlight');
+  );
+  // generate uuid in the browser
+  const hash = nanoid(12);
+  const shareUrl = window.location.origin + window.location.pathname + '?' + hash;
+  const { error } = await supabase.from('code_v1').insert([{ code: codeToShare, hash, ['public']: isPublic }]);
+  if (!error) {
+    lastShared = codeToShare;
+    // copy shareUrl to clipboard
+    if (isTauri()) {
+      await writeText(shareUrl);
     } else {
-      console.log('error', error);
-      const message = `Error: ${error.message}`;
-      // alert(message);
-      logger(message);
+      await navigator.clipboard.writeText(shareUrl);
     }
-  });
-}
-
-export const isIframe = () => window.location !== window.parent.location;
-function isCrossOriginFrame() {
-  try {
-    return !window.top.location.hostname;
-  } catch (e) {
-    return true;
+    const message = `Link copied to clipboard: ${shareUrl}`;
+    alert(message);
+    // alert(message);
+    logger(message, 'highlight');
+  } else {
+    console.log('error', error);
+    const message = `Error: ${error.message}`;
+    // alert(message);
+    logger(message);
   }
 }
 
-export const isUdels = () => {
-  if (isCrossOriginFrame()) {
-    return false;
-  }
-  return window.top?.location?.pathname.includes('udels');
-};
+export const ReplContext = createContext(null);
 
 export const getAudioDevices = async () => {
   await navigator.mediaDevices.getUserMedia({ audio: true });

website/src/settings.mjs

@@ -1,15 +1,9 @@
 import { persistentMap } from '@nanostores/persistent';
 import { useStore } from '@nanostores/react';
 import { register } from '@strudel/core';
-import { isUdels } from './repl/util.mjs';
 
 export const defaultAudioDeviceName = 'System Standard';
 
-export const audioEngineTargets = {
-  webaudio: 'webaudio',
-  osc: 'osc',
-};
-
 export const defaultSettings = {
   activeFooter: 'intro',
   keybindings: 'codemirror',
@@ -33,18 +27,9 @@ export const defaultSettings = {
   panelPosition: 'right',
   userPatterns: '{}',
   audioDeviceName: defaultAudioDeviceName,
-  audioEngineTarget: audioEngineTargets.webaudio,
 };
 
-let search = null;
-if (typeof window !== 'undefined') {
-  search = new URLSearchParams(window.location.search);
-}
-// if running multiple instance in one window, it will use the settings for that instance. else default to normal
-const instance = parseInt(search?.get('instance') ?? '0');
-const settings_key = `strudel-settings${instance > 0 ? instance : ''}`;
-
-export const settingsMap = persistentMap(settings_key, defaultSettings);
+export const settingsMap = persistentMap('strudel-settings', defaultSettings);
 
 const parseBoolean = (booleanlike) => ([true, 'true'].includes(booleanlike) ? true : false);
 
@@ -69,9 +54,9 @@ export function useSettings() {
     isTooltipEnabled: parseBoolean(state.isTooltipEnabled),
     isLineWrappingEnabled: parseBoolean(state.isLineWrappingEnabled),
     isFlashEnabled: parseBoolean(state.isFlashEnabled),
-    isSyncEnabled: isUdels() ? true : parseBoolean(state.isSyncEnabled),
+    isSyncEnabled: parseBoolean(state.isSyncEnabled),
     fontSize: Number(state.fontSize),
-    panelPosition: state.activeFooter !== '' && !isUdels() ? state.panelPosition : 'bottom', // <-- keep this 'bottom' where it is!
+    panelPosition: state.activeFooter !== '' ? state.panelPosition : 'bottom', // <-- keep this 'bottom' where it is!
     userPatterns: userPatterns,
   };
 }

website/src/user_pattern_utils.mjs

@@ -1,9 +1,10 @@
 import { atom } from 'nanostores';
+import { persistentAtom } from '@nanostores/persistent';
 import { useStore } from '@nanostores/react';
 import { logger } from '@strudel/core';
 import { nanoid } from 'nanoid';
 import { settingsMap } from './settings.mjs';
-import { confirmDialog, parseJSON, supabase } from './repl/util.mjs';
+import { parseJSON, supabase } from './repl/util.mjs';
 
 export let $publicPatterns = atom([]);
 export let $featuredPatterns = atom([]);
@@ -130,19 +131,17 @@ export const userPattern = {
     return this.update(newPattern.id, { ...newPattern.data, code: data.code });
   },
   clearAll() {
-    confirmDialog(`This will delete all your patterns. Are you really sure?`).then((r) => {
-      if (r == false) {
-        return;
-      }
-      const viewingPatternData = getViewingPatternData();
-      setUserPatterns({});
+    if (!confirm(`This will delete all your patterns. Are you really sure?`)) {
+      return;
+    }
+    const viewingPatternData = getViewingPatternData();
+    setUserPatterns({});
 
-      if (viewingPatternData.collection !== this.collection) {
-        return { id: viewingPatternData.id, data: viewingPatternData };
-      }
-      setActivePattern(null);
-      return this.create();
-    });
+    if (viewingPatternData.collection !== this.collection) {
+      return { id: viewingPatternData.id, data: viewingPatternData };
+    }
+    setActivePattern(null);
+    return this.create();
   },
   delete(id) {
     const userPatterns = this.getAll();