test for #1155

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

@@ -454,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.
  *
@@ -465,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

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.
@@ -809,6 +796,15 @@ export class Pattern {
   //////////////////////////////////////////////////////////////////////
   // Multi-pattern functions
 
+  /**
+   * Stacks the given pattern(s) to the current pattern.
+   * @name stack
+   * @memberof Pattern
+   * @example
+   * s("hh*4").stack(
+   *   note("c4(5,8)")
+   * )
+   */
   stack(...pats) {
     return stack(this, ...pats);
   }
@@ -817,9 +813,30 @@ export class Pattern {
     return sequence(this, ...pats);
   }
 
+  /**
+   * Appends the given pattern(s) to the current pattern.
+   * @name seq
+   * @memberof Pattern
+   * @synonyms sequence, fastcat
+   * @example
+   * s("hh*4").seq(
+   *   note("c4(5,8)")
+   * )
+   */
   seq(...pats) {
     return sequence(this, ...pats);
   }
+
+  /**
+   * Appends the given pattern(s) to the next cycle.
+   * @name cat
+   * @memberof Pattern
+   * @synonyms slowcat
+   * @example
+   * s("hh*4").cat(
+   *   note("c4(5,8)")
+   * )
+   */
   cat(...pats) {
     return cat(this, ...pats);
   }
@@ -1045,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)) {
@@ -1250,12 +1267,6 @@ export function reify(thing) {
  * @example
  * stack("g3", "b3", ["e4", "d4"]).note()
  * // "g3,b3,[e4,d4]".note()
- *
- * @example
- * // As a chained function:
- * s("hh*4").stack(
- *   note("c4(5,8)")
- * )
  */
 export function stack(...pats) {
   // Array test here is to avoid infinite recursions..
@@ -1384,11 +1395,6 @@ export function slowcatPrime(...pats) {
  * cat("e5", "b4", ["d5", "c5"]).note()
  * // "<e5 b4 [d5 c5]>".note()
  *
- * @example
- * // As a chained function:
- * s("hh*4").cat(
- *    note("c4(5,8)")
- * )
  */
 export function cat(...pats) {
   return slowcat(...pats);
@@ -1411,36 +1417,6 @@ export function arrange(...sections) {
   return s_cat(...sections).slow(total);
 }
 
-/**
- * Similarly to `arrange`, allows you to arrange multiple patterns together over multiple cycles.
- * Unlike `arrange`, you specify a start and stop time for each pattern rather than duration, which
- * means that patterns can overlap.
- * @return {Pattern}
- * @example
-seqPLoop([0, 2, "bd(3,8)"],
-         [1, 3, "cp(3,8)"]
-        )
-  .sound()
- */
-export function seqPLoop(...parts) {
-  let total = Fraction(0);
-  const pats = [];
-  for (let part of parts) {
-    if (part.length == 2) {
-      part.unshift(total);
-    }
-    total = part[1];
-  }
-
-  return stack(
-    ...parts.map(([start, stop, pat]) =>
-      pure(reify(pat)).compress(Fraction(start).div(total), Fraction(stop).div(total)),
-    ),
-  )
-    .slow(total)
-    .innerJoin(); // or resetJoin or restartJoin ??
-}
-
 export function fastcat(...pats) {
   let result = slowcat(...pats);
   if (pats.length > 1) {
@@ -1459,18 +1435,12 @@ export function sequence(...pats) {
 }
 
 /** Like **cat**, but the items are crammed into one cycle.
- * @synonyms sequence, fastcat
+ * @synonyms fastcat, sequence
  * @example
  * seq("e5", "b4", ["d5", "c5"]).note()
  * // "e5 b4 [d5 c5]".note()
  *
- * @example
- * // As a chained function:
- * s("hh*4").seq(
- *   note("c4(5,8)")
- * )
  */
-
 export function seq(...pats) {
   return fastcat(...pats);
 }
@@ -2033,34 +2003,6 @@ export const { zoomArc, zoomarc } = register(['zoomArc', 'zoomarc'], function (a
   return pat.zoom(a.begin, a.end);
 });
 
-/**
- * Splits a pattern into the given number of slices, and plays them according to a pattern of slice numbers.
- * Similar to `slice`, but slices up patterns rather than sound samples.
- * @param {number} number of slices
- * @param {number} slices to play
- * @example
- * note("0 1 2 3 4 5 6 7".scale('c:mixolydian'))
- *.bite(4, "3 2 1 0")
- * @example
- * sound("bd - bd bd*2, - sd:6 - sd:5 sd:1 - [- sd:2] -, hh [- cp:7]")
-  .bank("RolandTR909").speed(1.2)
-  .bite(4, "0 0 [1 2] <3 2> 0 0 [2 1] 3")
- */
-export const bite = register(
-  'bite',
-  (npat, ipat, pat) => {
-    return ipat
-      .fmap((i) => (n) => {
-        const a = Fraction(i).div(n).mod(1);
-        const b = a.add(Fraction(1).div(n));
-        return pat.zoom(a, b);
-      })
-      .appLeft(npat)
-      .squeezeJoin();
-  },
-  false,
-);
-
 /**
  * Selects the given fraction of the pattern and repeats that part to fill the remainder of the cycle.
  * @param {number} fraction fraction to select
@@ -2492,37 +2434,6 @@ Pattern.prototype.tag = function (tag) {
   return this.withContext((ctx) => ({ ...ctx, tags: (ctx.tags || []).concat([tag]) }));
 };
 
-/**
- * Filters haps using the given function
- * @name filter
- * @param {Function} test function to test Hap
- * @example
- * s("hh!7 oh").filter(hap => hap.value.s==='hh')
- */
-export const filter = register('filter', (test, pat) => pat.withHaps((haps) => haps.filter(test)));
-
-/**
- * Filters haps by their begin time
- * @name filterWhen
- * @noAutocomplete
- * @param {Function} test function to test Hap.whole.begin
- */
-export const filterWhen = register('filterWhen', (test, pat) => pat.filter((h) => test(h.whole.begin)));
-
-/**
- * Use within to apply a function to only a part of a pattern.
- * @name within
- * @param {number} start start within cycle (0 - 1)
- * @param {number} end end within cycle (0 - 1). Must be > start
- * @param {Function} func function to be applied to the sub-pattern
- */
-export const within = register('within', (a, b, fn, pat) =>
-  stack(
-    fn(pat.filterWhen((t) => t.cyclePos() >= a && t.cyclePos() <= b)),
-    pat.filterWhen((t) => t.cyclePos() < a || t.cyclePos() > b),
-  ),
-);
-
 //////////////////////////////////////////////////////////////////////
 // Tactus-related functions, i.e. ones that do stepwise
 // transformations
@@ -3033,14 +2944,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.
  *

packages/core/util.mjs

@@ -363,76 +363,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/desktopbridge/oscbridge.mjs

@@ -1,36 +1,64 @@
-import { Pattern, ClockCollator } from '@strudel/core';
-import { parseControlsFromHap } from 'node_modules/@strudel/osc/osc.mjs';
+import { parseNumeral, Pattern, averageArray } from '@strudel/core';
 import { Invoke } from './utils.mjs';
 
-const collator = new ClockCollator({});
+let offsetTime;
+let timeAtPrevOffsetSample;
+let prevOffsetTimes = [];
 
-export async function oscTriggerTauri(t_deprecate, hap, currentTime, cps = 1, targetTime) {
-  const controls = parseControlsFromHap(hap, cps);
-  const params = [];
-  const timestamp = collator.calculateTimestamp(currentTime, targetTime);
+Pattern.prototype.osc = function () {
+  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));
 
-  Object.keys(controls).forEach((key) => {
-    const val = controls[key];
-    const value = typeof val === 'number' ? val.toString() : val;
+    const params = [];
 
-    if (value == null) {
+    const unixTimeSecs = Date.now() / 1000;
+    const newOffsetTime = unixTimeSecs - currentTime;
+    if (offsetTime == null) {
+      offsetTime = newOffsetTime;
+    }
+    prevOffsetTimes.push(newOffsetTime);
+    if (prevOffsetTimes.length > 8) {
+      prevOffsetTimes.shift();
+    }
+    // every two seconds, the average of the previous 8 offset times is calculated and used as a stable reference
+    // for calculating the timestamp that will be sent to the backend
+    if (timeAtPrevOffsetSample == null || unixTimeSecs - timeAtPrevOffsetSample > 2) {
+      timeAtPrevOffsetSample = unixTimeSecs;
+      const rollingOffsetTime = averageArray(prevOffsetTimes);
+      //account for the js clock freezing or resets set the new offset
+      if (Math.abs(rollingOffsetTime - offsetTime) > 0.01) {
+        offsetTime = rollingOffsetTime;
+      }
+    }
+
+    const timestamp = offsetTime + 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;
     }
-    params.push({
-      name: key,
-      value,
-      valueisnumber: typeof val === 'number',
+    const message = { target: '/dirt/play', timestamp, params };
+    setTimeout(() => {
+      Invoke('sendosc', { messagesfromjs: [message] });
     });
   });
-
-  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);
 };

packages/midi/midi.mjs

@@ -169,18 +169,13 @@ const refs = {};
 export async function midin(input) {
   if (isPattern(input)) {
     throw new Error(
-      `midin: does not accept Pattern as input. Make sure to pass device name with single quotes. Example: midin('${
+      `.midi does not accept Pattern input. Make sure to pass device name with single quotes. Example: .midi('${
         WebMidi.outputs?.[0]?.name || 'IAC Driver Bus 1'
       }')`,
     );
   }
   const initial = await enableWebMidi(); // only returns on first init
   const device = getDevice(input, WebMidi.inputs);
-  if (!device) {
-    throw new Error(
-      `midiin: device "${input}" not found.. connected devices: ${getMidiDeviceNamesString(WebMidi.inputs)}`,
-    );
-  }
   if (initial) {
     const otherInputs = WebMidi.inputs.filter((o) => o.name !== device.name);
     logger(

packages/mini/mini.mjs

@@ -1,203 +1,253 @@
 /*
 mini.mjs - <short description TODO>
-Copyright (C) 2024 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/mini.mjs>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/mini/mini.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import * as krill from './krill-parser.js';
 import * as strudel from '@strudel/core';
+import Fraction, { lcm } from '@strudel/core/fraction.mjs';
 
-// "parser"
-let token_types = {
-  open_polyrhythm: /^\[/,
-  close_polyrhythm: /^\]/,
-  open_polymeter: /^\{/,
-  close_polymeter: /^\}/,
-  open_slowpolymeter: /^\</,
-  close_slowpolymeter: /^\>/,
-  subpat_delimiter: /^,/,
-  fast: /^\*/,
-  slow: /^\//,
-  // is there a better way without back-tracking for whole numbers?
-  // float: /^(\d*\.)?\d+/,
-  plain: /^[a-zA-Z0-9\.\#]+/,
-};
+const randOffset = 0.0003;
 
-let token_offset;
-function next_token(code, global_offset) {
-  for (let type in token_types) {
-    const match = code.match(token_types[type]);
-    if (match) {
-      const leftpad = match[0].length - match[0].trimLeft().length;
-      const rightpad = match[0].length - match[0].trimRight().length;
-      const result = {
-        type,
-        value: match[0],
-        location: [token_offset + leftpad + global_offset, token_offset + match[0].length + global_offset - rightpad],
-      };
-      token_offset += match[0].length;
-      return result;
-    }
-  }
-  throw new Error('could not match "' + code + '"');
-}
-
-function tokenize(code, global_offset) {
-  let tokens = [];
-  token_offset = 0;
-  while (code.length > 0) {
-    const trimmed = code.trim();
-    token_offset += code.length - trimmed.length;
-    code = trimmed;
-    const token = next_token(code, global_offset);
-    code = code.slice(token.value.length);
-    tokens.push(token);
-  }
-  return tokens;
-}
-
-class Parser {
-  parse(code, global_offset) {
-    this.tokens = tokenize(code, global_offset);
-    const subpats = this.parse_subpats();
-    return { type: 'polymeter', subpats };
-  }
-  consume(type) {
-    const token = this.tokens.shift();
-    this.offset += token.length;
-    if (token.type !== type) {
-      throw new Error('expected token type ' + type + ' got ' + token.type);
-    }
-    return token;
-  }
-  parse_step() {
-    let next = this.tokens[0]?.type;
-    if (next === 'open_polyrhythm') {
-      return this.parse_polyrhythm();
-    }
-    if (next === 'open_polymeter') {
-      return this.parse_polymeter();
-    }
-    if (next === 'open_slowpolymeter') {
-      return this.parse_slowpolymeter();
-    }
-    if (next === 'plain') {
-      return this.consume('plain');
-    }
-    throw new Error('unexpected token ' + this.tokens[0]?.value + ' of type ' + this.tokens[0]?.type);
-  }
-  parse_expr() {
-    let result = this.parse_step();
-    let looking = true;
-    while (looking) {
-      let next = this.tokens[0]?.type;
-      if (!next) {
-        looking = false;
-      } else {
-        switch (next) {
-          case 'fast':
-          case 'slow':
-            this.consume(next);
-            const factor = this.parse_step();
-            result = { type: next, factor, step: result };
-            break;
-          default:
-            looking = false;
+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_) {
+        case 'stretch': {
+          const legalTypes = ['fast', 'slow'];
+          const { type, amount } = op.arguments_;
+          if (!legalTypes.includes(type)) {
+            throw new Error(`mini: stretch: type must be one of ${legalTypes.join('|')} but got ${type}`);
+          }
+          pat = strudel.reify(pat)[type](enter(amount));
+          break;
+        }
+        case 'replicate': {
+          const { amount } = op.arguments_;
+          pat = strudel.reify(pat);
+          pat = pat._repeatCycles(amount)._fast(amount);
+          break;
+        }
+        case 'bjorklund': {
+          if (op.arguments_.rotation) {
+            pat = pat.euclidRot(enter(op.arguments_.pulse), enter(op.arguments_.step), enter(op.arguments_.rotation));
+          } else {
+            pat = pat.euclid(enter(op.arguments_.pulse), enter(op.arguments_.step));
+          }
+          break;
+        }
+        case 'degradeBy': {
+          pat = strudel
+            .reify(pat)
+            ._degradeByWith(strudel.rand.early(randOffset * op.arguments_.seed), op.arguments_.amount ?? 0.5);
+          break;
+        }
+        case 'tail': {
+          const friend = enter(op.arguments_.element);
+          pat = pat.fmap((a) => (b) => (Array.isArray(a) ? [...a, b] : [a, b])).appLeft(friend);
+          break;
+        }
+        case 'range': {
+          const friend = enter(op.arguments_.element);
+          pat = strudel.reify(pat);
+          const arrayRange = (start, stop, step = 1) =>
+            Array.from({ length: Math.abs(stop - start) / step + 1 }, (value, index) =>
+              start < stop ? start + index * step : start - index * step,
+            );
+          let range = (apat, bpat) => apat.squeezeBind((a) => bpat.bind((b) => strudel.fastcat(...arrayRange(a, b))));
+          pat = range(pat, friend);
+          break;
+        }
+        default: {
+          console.warn(`operator "${op.type_}" not implemented`);
         }
       }
     }
-    return result;
   }
-  parse_seq(...close_types) {
-    const steps = [];
-    while (!close_types.includes(this.tokens[0]?.type)) {
-      steps.push(this.parse_expr());
-    }
-    return { type: 'seq', steps };
-  }
-  parse_subpats(close_type) {
-    const subpats = [];
-    while (true) {
-      subpats.push(this.parse_seq(close_type, 'subpat_delimiter'));
-      const next = this.tokens[0]?.type;
-      if (next) {
-        this.consume(next);
+  pat.__tactus_source = pat.__tactus_source || tactus_source;
+  return pat;
+};
+
+// expects ast from mini2ast + quoted mini string + optional callback when a node is entered
+export function patternifyAST(ast, code, onEnter, offset = 0) {
+  onEnter?.(ast);
+  const enter = (node) => patternifyAST(node, code, onEnter, offset);
+  switch (ast.type_) {
+    case 'pattern': {
+      // resolveReplications(ast);
+      const children = ast.source_.map((child) => enter(child)).map(applyOptions(ast, enter));
+      const alignment = ast.arguments_.alignment;
+      const with_tactus = children.filter((child) => child.__tactus_source);
+      let pat;
+      switch (alignment) {
+        case 'stack': {
+          pat = strudel.stack(...children);
+          if (with_tactus.length) {
+            pat.tactus = lcm(...with_tactus.map((x) => Fraction(x.tactus)));
+          }
+          break;
+        }
+        case 'polymeter_slowcat': {
+          pat = strudel.stack(...children.map((child) => child._slow(child.__weight)));
+          if (with_tactus.length) {
+            pat.tactus = lcm(...with_tactus.map((x) => Fraction(x.tactus)));
+          }
+          break;
+        }
+        case 'polymeter': {
+          // polymeter
+          const stepsPerCycle = ast.arguments_.stepsPerCycle
+            ? enter(ast.arguments_.stepsPerCycle).fmap((x) => strudel.Fraction(x))
+            : strudel.pure(strudel.Fraction(children.length > 0 ? children[0].__weight : 1));
+
+          const aligned = children.map((child) => child.fast(stepsPerCycle.fmap((x) => x.div(child.__weight))));
+          pat = strudel.stack(...aligned);
+          break;
+        }
+        case 'rand': {
+          pat = strudel.chooseInWith(strudel.rand.early(randOffset * ast.arguments_.seed).segment(1), children);
+          if (with_tactus.length) {
+            pat.tactus = lcm(...with_tactus.map((x) => Fraction(x.tactus)));
+          }
+          break;
+        }
+        case 'feet': {
+          pat = strudel.fastcat(...children);
+          break;
+        }
+        default: {
+          const weightedChildren = ast.source_.some((child) => !!child.options_?.weight);
+          if (weightedChildren) {
+            const weightSum = ast.source_.reduce(
+              (sum, child) => sum.add(child.options_?.weight || strudel.Fraction(1)),
+              strudel.Fraction(0),
+            );
+            pat = strudel.timeCat(
+              ...ast.source_.map((child, i) => [child.options_?.weight || strudel.Fraction(1), children[i]]),
+            );
+            pat.__weight = weightSum; // for polymeter
+            pat.tactus = weightSum;
+            if (with_tactus.length) {
+              pat.tactus = pat.tactus.mul(lcm(...with_tactus.map((x) => Fraction(x.tactus))));
+            }
+          } else {
+            pat = strudel.sequence(...children);
+            pat.tactus = children.length;
+          }
+          if (ast.arguments_.tactus) {
+            pat.__tactus_source = true;
+          }
+        }
       }
-      if (next === close_type) {
-        break;
+      if (with_tactus.length) {
+        pat.__tactus_source = true;
       }
+      return pat;
     }
-    return subpats;
-  }
-  parse_polymeter() {
-    this.consume('open_polymeter');
-    const subpats = this.parse_subpats('close_polymeter');
-    return { type: 'polymeter', subpats };
-  }
-  parse_polyrhythm() {
-    this.consume('open_polyrhythm');
-    const subpats = this.parse_subpats('close_polyrhythm');
-    return { type: 'polyrhythm', subpats };
-  }
-  parse_slowpolymeter() {
-    this.consume('open_slowpolymeter');
-    const subpats = this.parse_subpats('close_slowpolymeter');
-    return { type: 'slowpolymeter', subpats };
+    case 'element': {
+      1;
+      return enter(ast.source_);
+    }
+    case 'atom': {
+      if (ast.source_ === '~' || ast.source_ === '-') {
+        return strudel.silence;
+      }
+      if (!ast.location_) {
+        console.warn('no location for', ast);
+        return ast.source_;
+      }
+      const value = !isNaN(Number(ast.source_)) ? Number(ast.source_) : ast.source_;
+      if (offset === -1) {
+        // skip location handling (used when getting leaves to avoid confusion)
+        return strudel.pure(value);
+      }
+      const [from, to] = getLeafLocation(code, ast, offset);
+      return strudel.pure(value).withLoc(from, to);
+    }
+    case 'stretch':
+      return enter(ast.source_).slow(enter(ast.arguments_.amount));
+    default:
+      console.warn(`node type "${ast.type_}" not implemented -> returning silence`);
+      return strudel.silence;
   }
 }
 
-function patternifyTree(tree) {
-  if (tree.type === 'polyrhythm') {
-    const args = tree.subpats.map((arg) => patternifyTree(arg));
-    return strudel.polyrhythm(...args);
-  }
-  if (tree.type === 'slowpolymeter') {
-    const args = tree.subpats.map((arg) => patternifyTree(arg));
-    return strudel.s_polymeterSteps(1, ...args);
-  }
-  if (tree.type === 'polymeter') {
-    const args = tree.subpats.map((subpat) => patternifyTree(subpat));
-    return strudel.s_polymeter(...args);
-  }
-  if (tree.type === 'fast') {
-    const step = patternifyTree(tree.step);
-    const factor = patternifyTree(tree.factor);
-    return strudel.fast(factor, step);
-  }
-  if (tree.type === 'slow') {
-    const step = patternifyTree(tree.step);
-    const factor = patternifyTree(tree.factor);
-    return strudel.slow(factor, step);
-  }
-  if (tree.type === 'plain') {
-    return strudel.pure(tree.value).withLoc(tree.location[0], tree.location[1]);
-  }
-  if (tree.type === 'seq') {
-    const steps = tree.steps.map((step) => patternifyTree(step));
-    return strudel.fastcat(...steps);
-  }
-}
+// takes quoted mini string + leaf node within, returns source location of node (whitespace corrected)
+export const getLeafLocation = (code, leaf, globalOffset = 0) => {
+  // value is expected without quotes!
+  const { start, end } = leaf.location_;
+  const actual = code?.split('').slice(start.offset, end.offset).join('');
+  // make sure whitespaces are not part of the highlight
+  const [offsetStart = 0, offsetEnd = 0] = actual
+    ? actual.split(leaf.source_).map((p) => p.split('').filter((c) => c === ' ').length)
+    : [];
+  return [start.offset + offsetStart + globalOffset, end.offset - offsetEnd + globalOffset];
+};
 
-const parser = new Parser();
-export const m = (code, global_offset) => {
-  const tree = parser.parse(code, global_offset + 1);
-  const pat = patternifyTree(tree);
-  return strudel.reify(pat);
+// takes quoted mini string, returns ast
+export const mini2ast = (code, start = 0, userCode = code) => {
+  try {
+    return krill.parse(code);
+  } catch (error) {
+    const region = [error.location.start.offset + start, error.location.end.offset + start];
+    const line = userCode.slice(0, region[0]).split('\n').length;
+    throw new Error(`[mini] parse error at line ${line}: ${error.message}`);
+  }
 };
 
 // takes quoted mini string, returns all nodes that are leaves
-export const getLeafLocations = (code, start) => {
-  code = code.replace(/^"/, '');
-  code = code.replace(/"$/, '');
-  const leaves = tokenize(code, start).filter((x) => x.type == 'plain');
-  return leaves.map((x) => x.location.map((y) => y + 1));
+export const getLeaves = (code, start, userCode) => {
+  const ast = mini2ast(code, start, userCode);
+  let leaves = [];
+  patternifyAST(
+    ast,
+    code,
+    (node) => {
+      if (node.type_ === 'atom') {
+        leaves.push(node);
+      }
+    },
+    -1,
+  );
+  return leaves;
+};
+
+// takes quoted mini string, returns locations [fromCol,toCol] of all leaf nodes
+export const getLeafLocations = (code, start = 0, userCode) => {
+  return getLeaves(code, start, userCode).map((l) => getLeafLocation(code, l, start));
 };
 
 // mini notation only (wraps in "")
 export const mini = (...strings) => {
-  const pats = strings.map(m);
+  const pats = strings.map((str) => {
+    const code = `"${str}"`;
+    const ast = mini2ast(code);
+    return patternifyAST(ast, code);
+  });
   return strudel.sequence(...pats);
 };
 
+// turns str mini string (without quotes) into pattern
+// offset is the position of the mini string in the JS code
+// each leaf node will get .withLoc added
+// this function is used by the transpiler for double quoted strings
+export const m = (str, offset) => {
+  const code = `"${str}"`;
+  const ast = mini2ast(code);
+  return patternifyAST(ast, code, null, offset);
+};
+
+// includes haskell style (raw krill parsing)
+export const h = (string) => {
+  const ast = mini2ast(string);
+  return patternifyAST(ast, string);
+};
+
 export function minify(thing) {
   if (typeof thing === 'string') {
     return mini(thing);

packages/mini/test/mini.test.mjs

@@ -9,6 +9,10 @@ import '@strudel/core/euclid.mjs';
 import { Fraction } from '@strudel/core/index.mjs';
 import { describe, expect, it } from 'vitest';
 
+const sameFirst = (a, b) => {
+  return expect(a.sortHapsByPart().firstCycle()).toStrictEqual(b.sortHapsByPart().firstCycle());
+};
+
 describe('mini', () => {
   const minV = (v) => mini(v).sortHapsByPart().firstCycleValues;
   const minS = (v) => mini(v).sortHapsByPart().showFirstCycle;
@@ -219,6 +223,22 @@ describe('mini', () => {
     expect(mini('[^a b c] [d [^e f]]').tactus).toEqual(Fraction(24));
     expect(mini('[^a b c d e]').tactus).toEqual(Fraction(5));
   });
+  it('Can repeat expansions', () => {
+    sameFirst(mini('a@2!2 b'), mini('a@2 a@2 b'));
+  });
+});
+
+describe('getLeafLocation', () => {
+  it('gets location of leaf nodes', () => {
+    const code = '"bd sd"';
+    const ast = mini2ast(code);
+
+    const bd = ast.source_[0].source_;
+    expect(getLeafLocation(code, bd)).toEqual([1, 3]);
+
+    const sd = ast.source_[1].source_;
+    expect(getLeafLocation(code, sd)).toEqual([4, 6]);
+  });
 });
 
 describe('getLeafLocations', () => {
@@ -229,9 +249,9 @@ describe('getLeafLocations', () => {
     ]);
     expect(getLeafLocations('"bd*2 [sd cp]"')).toEqual([
       [1, 3], // bd columns
-      [4, 5], // "2" columns
       [7, 9], // sd columns
       [10, 12], // cp columns
+      [4, 5], // "2" columns
     ]);
     expect(getLeafLocations('"bd*<2 3>"')).toEqual([
       [1, 3], // bd columns

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/serial/serial.mjs

@@ -68,7 +68,7 @@ Pattern.prototype.serial = function (br = 115200, sendcrc = false, singlecharids
     if (!(name in writeMessagers)) {
       getWriter(name, br);
     }
-    const onTrigger = (t_deprecate, hap, currentTime, cps, targetTime) => {
+    const onTrigger = (time, hap, currentTime) => {
       var message = '';
       var chk = 0;
       if (typeof hap.value === 'object') {
@@ -105,7 +105,7 @@ Pattern.prototype.serial = function (br = 115200, sendcrc = false, singlecharids
       } else {
         message = hap.value;
       }
-      const offset = (targetTime - currentTime + latency) * 1000;
+      const offset = (time - currentTime + latency) * 1000;
 
       window.setTimeout(function () {
         writeMessagers[name](message, chk);

packages/superdough/sampler.mjs

@@ -22,13 +22,16 @@ function humanFileSize(bytes, si) {
   return bytes.toFixed(1) + ' ' + units[u];
 }
 
-// deduces relevant info for sample loading from hap.value and sample definition
-// it encapsulates the core sampler logic into a pure and synchronous function
-// hapValue: Hap.value, bank: sample bank definition for sound "s" (values in strudel.json format)
-export function getSampleInfo(hapValue, bank) {
-  const { s, n = 0, speed = 1.0 } = hapValue;
-  let midi = valueToMidi(hapValue, 36);
-  let transpose = midi - 36; // C3 is middle C;
+export const getSampleBufferSource = async (s, n, note, speed, freq, bank, resolveUrl) => {
+  let transpose = 0;
+  if (freq !== undefined && note !== undefined) {
+    logger('[sampler] hap has note and freq. ignoring note', 'warning');
+  }
+  let midi = valueToMidi({ freq, note }, 36);
+  transpose = midi - 36; // C3 is middle C
+
+  const ac = getAudioContext();
+
   let sampleUrl;
   let index = 0;
   if (Array.isArray(bank)) {
@@ -47,54 +50,19 @@ export function getSampleInfo(hapValue, bank) {
     index = getSoundIndex(n, bank[closest].length);
     sampleUrl = bank[closest][index];
   }
-  const label = `${s}:${index}`;
-  let playbackRate = Math.abs(speed) * Math.pow(2, transpose / 12);
-  return { transpose, sampleUrl, index, midi, label, playbackRate };
-}
-
-// takes hapValue and returns buffer + playbackRate.
-export const getSampleBuffer = async (hapValue, bank, resolveUrl) => {
-  let { sampleUrl, label, playbackRate } = getSampleInfo(hapValue, bank);
   if (resolveUrl) {
     sampleUrl = await resolveUrl(sampleUrl);
   }
-  const ac = getAudioContext();
-  const buffer = await loadBuffer(sampleUrl, ac, label);
-
-  if (hapValue.unit === 'c') {
-    playbackRate = playbackRate * buffer.duration;
-  }
-  return { buffer, playbackRate };
-};
-
-// creates playback ready AudioBufferSourceNode from hapValue
-export const getSampleBufferSource = async (hapValue, bank, resolveUrl) => {
-  let { buffer, playbackRate } = await getSampleBuffer(hapValue, bank, resolveUrl);
-  if (hapValue.speed < 0) {
+  let buffer = await loadBuffer(sampleUrl, ac, s, index);
+  if (speed < 0) {
     // should this be cached?
     buffer = reverseBuffer(buffer);
   }
-  const ac = getAudioContext();
   const bufferSource = ac.createBufferSource();
   bufferSource.buffer = buffer;
+  const playbackRate = 1.0 * Math.pow(2, transpose / 12);
   bufferSource.playbackRate.value = playbackRate;
-
-  const { s, loopBegin = 0, loopEnd = 1, begin = 0, end = 1 } = hapValue;
-
-  // "The computation of the offset into the sound is performed using the sound buffer's natural sample rate,
-  // rather than the current playback rate, so even if the sound is playing at twice its normal speed,
-  // the midway point through a 10-second audio buffer is still 5."
-  const offset = begin * bufferSource.buffer.duration;
-
-  const loop = s.startsWith('wt_') ? 1 : hapValue.loop;
-  if (loop) {
-    bufferSource.loop = true;
-    bufferSource.loopStart = loopBegin * bufferSource.buffer.duration - offset;
-    bufferSource.loopEnd = loopEnd * bufferSource.buffer.duration - offset;
-  }
-  const bufferDuration = bufferSource.buffer.duration / bufferSource.playbackRate.value;
-  const sliceDuration = (end - begin) * bufferDuration;
-  return { bufferSource, offset, bufferDuration, sliceDuration };
+  return bufferSource;
 };
 
 export const loadBuffer = (url, ac, s, n = 0) => {
@@ -264,10 +232,10 @@ export const samples = async (sampleMap, baseUrl = sampleMap._base || '', option
   const { prebake, tag } = options;
   processSampleMap(
     sampleMap,
-    (key, bank) =>
-      registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, bank), {
+    (key, value) =>
+      registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, value), {
         type: 'sample',
-        samples: bank,
+        samples: value,
         baseUrl,
         prebake,
         tag,
@@ -281,26 +249,38 @@ const cutGroups = [];
 export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
   let {
     s,
+    freq,
+    unit,
     nudge = 0, // TODO: is this in seconds?
     cut,
     loop,
     clip = undefined, // if set, samples will be cut off when the hap ends
     n = 0,
+    note,
     speed = 1, // sample playback speed
+    loopBegin = 0,
+    begin = 0,
+    loopEnd = 1,
+    end = 1,
     duration,
   } = value;
-
   // load sample
   if (speed === 0) {
     // no playback
     return;
   }
+  loop = s.startsWith('wt_') ? 1 : value.loop;
   const ac = getAudioContext();
-
   // destructure adsr here, because the default should be different for synths and samples
-  let [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
 
-  const { bufferSource, sliceDuration, offset } = await getSampleBufferSource(value, bank, resolveUrl);
+  let [attack, decay, sustain, release] = getADSRValues([value.attack, value.decay, value.sustain, value.release]);
+  //const soundfont = getSoundfontKey(s);
+  const time = t + nudge;
+
+  const bufferSource = await getSampleBufferSource(s, n, note, speed, freq, bank, resolveUrl);
+
+  // vibrato
+  let vibratoOscillator = getVibratoOscillator(bufferSource.detune, value, t);
 
   // asny stuff above took too long?
   if (ac.currentTime > t) {
@@ -312,19 +292,26 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
     logger(`[sampler] could not load "${s}:${n}"`, 'error');
     return;
   }
-
-  // vibrato
-  let vibratoOscillator = getVibratoOscillator(bufferSource.detune, value, t);
-
-  const time = t + nudge;
+  bufferSource.playbackRate.value = Math.abs(speed) * bufferSource.playbackRate.value;
+  if (unit === 'c') {
+    // are there other units?
+    bufferSource.playbackRate.value = bufferSource.playbackRate.value * bufferSource.buffer.duration * 1; //cps;
+  }
+  // "The computation of the offset into the sound is performed using the sound buffer's natural sample rate,
+  // rather than the current playback rate, so even if the sound is playing at twice its normal speed,
+  // the midway point through a 10-second audio buffer is still 5."
+  const offset = begin * bufferSource.buffer.duration;
+  if (loop) {
+    bufferSource.loop = true;
+    bufferSource.loopStart = loopBegin * bufferSource.buffer.duration - offset;
+    bufferSource.loopEnd = loopEnd * bufferSource.buffer.duration - offset;
+  }
   bufferSource.start(time, offset);
-
   const envGain = ac.createGain();
   const node = bufferSource.connect(envGain);
-
-  // if none of these controls is set, the duration of the sound will be set to the duration of the sample slice
   if (clip == null && loop == null && value.release == null) {
-    duration = sliceDuration;
+    const bufferDuration = bufferSource.buffer.duration / bufferSource.playbackRate.value;
+    duration = (end - begin) * bufferDuration;
   }
   let holdEnd = t + duration;
 

packages/superdough/superdough.mjs

@@ -87,10 +87,6 @@ export const getAudioContext = () => {
   return audioContext;
 };
 
-export function getAudioContextCurrentTime() {
-  return getAudioContext().currentTime;
-}
-
 let workletsLoading;
 function loadWorklets() {
   if (!workletsLoading) {
@@ -375,7 +371,7 @@ export const superdough = async (value, t, hapDuration) => {
     bandq = getDefaultValue('bandq'),
     channels = getDefaultValue('channels'),
     //phaser
-    phaserrate: phaser,
+    phaser,
     phaserdepth = getDefaultValue('phaserdepth'),
     phasersweep,
     phasercenter,
@@ -421,7 +417,6 @@ export const superdough = async (value, t, hapDuration) => {
   };
   if (bank && s) {
     s = `${bank}_${s}`;
-    value.s = s;
   }
 
   // get source AudioNode

test/__snapshots__/examples.test.mjs.snap

@@ -967,156 +967,6 @@ exports[`runs examples > example "begin" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "bite" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | note:Bb3 ]",
-  "[ 1/8 → 1/4 | note:C4 ]",
-  "[ 1/4 → 3/8 | note:G3 ]",
-  "[ 3/8 → 1/2 | note:A3 ]",
-  "[ 1/2 → 5/8 | note:E3 ]",
-  "[ 5/8 → 3/4 | note:F3 ]",
-  "[ 3/4 → 7/8 | note:C3 ]",
-  "[ 7/8 → 1/1 | note:D3 ]",
-  "[ 1/1 → 9/8 | note:Bb3 ]",
-  "[ 9/8 → 5/4 | note:C4 ]",
-  "[ 5/4 → 11/8 | note:G3 ]",
-  "[ 11/8 → 3/2 | note:A3 ]",
-  "[ 3/2 → 13/8 | note:E3 ]",
-  "[ 13/8 → 7/4 | note:F3 ]",
-  "[ 7/4 → 15/8 | note:C3 ]",
-  "[ 15/8 → 2/1 | note:D3 ]",
-  "[ 2/1 → 17/8 | note:Bb3 ]",
-  "[ 17/8 → 9/4 | note:C4 ]",
-  "[ 9/4 → 19/8 | note:G3 ]",
-  "[ 19/8 → 5/2 | note:A3 ]",
-  "[ 5/2 → 21/8 | note:E3 ]",
-  "[ 21/8 → 11/4 | note:F3 ]",
-  "[ 11/4 → 23/8 | note:C3 ]",
-  "[ 23/8 → 3/1 | note:D3 ]",
-  "[ 3/1 → 25/8 | note:Bb3 ]",
-  "[ 25/8 → 13/4 | note:C4 ]",
-  "[ 13/4 → 27/8 | note:G3 ]",
-  "[ 27/8 → 7/2 | note:A3 ]",
-  "[ 7/2 → 29/8 | note:E3 ]",
-  "[ 29/8 → 15/4 | note:F3 ]",
-  "[ 15/4 → 31/8 | note:C3 ]",
-  "[ 31/8 → 4/1 | note:D3 ]",
-]
-`;
-
-exports[`runs examples > example "bite" example index 1 1`] = `
-[
-  "[ 0/1 → 1/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 0/1 → 1/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 1/16 → 1/8 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 1/8 → 1/4 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 1/8 → 1/4 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 3/16 → 1/4 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 1/4 → 5/16 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 9/32 → 5/16 | s:sd n:5 bank:RolandTR909 speed:1.2 ]",
-  "[ 5/16 → 11/32 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 5/16 → 3/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 3/8 → 7/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 3/8 → 1/2 | s:cp n:7 bank:RolandTR909 speed:1.2 ]",
-  "[ 13/32 → 7/16 | s:sd n:2 bank:RolandTR909 speed:1.2 ]",
-  "[ 7/16 → 1/2 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 1/2 → 5/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 1/2 → 5/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 9/16 → 5/8 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 5/8 → 3/4 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 5/8 → 3/4 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 11/16 → 3/4 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 3/4 → 25/32 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 3/4 → 13/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 13/16 → 7/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 27/32 → 7/8 | s:sd n:5 bank:RolandTR909 speed:1.2 ]",
-  "[ 7/8 → 15/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 7/8 → 1/1 | s:cp n:7 bank:RolandTR909 speed:1.2 ]",
-  "[ 29/32 → 15/16 | s:sd n:2 bank:RolandTR909 speed:1.2 ]",
-  "[ 15/16 → 1/1 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 1/1 → 9/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 1/1 → 9/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 17/16 → 9/8 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 9/8 → 5/4 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 9/8 → 5/4 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 19/16 → 5/4 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 5/4 → 21/16 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 41/32 → 21/16 | s:sd n:5 bank:RolandTR909 speed:1.2 ]",
-  "[ 21/16 → 43/32 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 21/16 → 11/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 11/8 → 23/16 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 11/8 → 3/2 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 3/2 → 13/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 3/2 → 13/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 25/16 → 13/8 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 13/8 → 7/4 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 13/8 → 7/4 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 27/16 → 7/4 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 7/4 → 57/32 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 7/4 → 29/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 29/16 → 15/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 59/32 → 15/8 | s:sd n:5 bank:RolandTR909 speed:1.2 ]",
-  "[ 15/8 → 31/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 15/8 → 2/1 | s:cp n:7 bank:RolandTR909 speed:1.2 ]",
-  "[ 61/32 → 31/16 | s:sd n:2 bank:RolandTR909 speed:1.2 ]",
-  "[ 31/16 → 2/1 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 2/1 → 17/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 2/1 → 17/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 33/16 → 17/8 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 17/8 → 9/4 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 17/8 → 9/4 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 35/16 → 9/4 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 9/4 → 37/16 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 73/32 → 37/16 | s:sd n:5 bank:RolandTR909 speed:1.2 ]",
-  "[ 37/16 → 75/32 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 37/16 → 19/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 19/8 → 39/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 19/8 → 5/2 | s:cp n:7 bank:RolandTR909 speed:1.2 ]",
-  "[ 77/32 → 39/16 | s:sd n:2 bank:RolandTR909 speed:1.2 ]",
-  "[ 39/16 → 5/2 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 5/2 → 21/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 5/2 → 21/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 41/16 → 21/8 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 21/8 → 11/4 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 21/8 → 11/4 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 43/16 → 11/4 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 11/4 → 89/32 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 11/4 → 45/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 45/16 → 23/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 91/32 → 23/8 | s:sd n:5 bank:RolandTR909 speed:1.2 ]",
-  "[ 23/8 → 47/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 23/8 → 3/1 | s:cp n:7 bank:RolandTR909 speed:1.2 ]",
-  "[ 93/32 → 47/16 | s:sd n:2 bank:RolandTR909 speed:1.2 ]",
-  "[ 47/16 → 3/1 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 3/1 → 25/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 3/1 → 25/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 49/16 → 25/8 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 25/8 → 13/4 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 25/8 → 13/4 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 51/16 → 13/4 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 13/4 → 53/16 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 105/32 → 53/16 | s:sd n:5 bank:RolandTR909 speed:1.2 ]",
-  "[ 53/16 → 107/32 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 53/16 → 27/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 27/8 → 55/16 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 27/8 → 7/2 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 7/2 → 29/8 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 7/2 → 29/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 57/16 → 29/8 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 29/8 → 15/4 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 29/8 → 15/4 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 59/16 → 15/4 | s:sd n:6 bank:RolandTR909 speed:1.2 ]",
-  "[ 15/4 → 121/32 | s:sd n:1 bank:RolandTR909 speed:1.2 ]",
-  "[ 15/4 → 61/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 61/16 → 31/8 | s:hh bank:RolandTR909 speed:1.2 ]",
-  "[ 123/32 → 31/8 | s:sd n:5 bank:RolandTR909 speed:1.2 ]",
-  "[ 31/8 → 63/16 | s:bd bank:RolandTR909 speed:1.2 ]",
-  "[ 31/8 → 4/1 | s:cp n:7 bank:RolandTR909 speed:1.2 ]",
-  "[ 125/32 → 63/16 | s:sd n:2 bank:RolandTR909 speed:1.2 ]",
-  "[ 63/16 → 4/1 | s:bd bank:RolandTR909 speed:1.2 ]",
-]
-`;
-
 exports[`runs examples > example "bpattack" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:c2 s:sawtooth bandf:500 bpattack:0.5 bpenv:4 ]",
@@ -1379,16 +1229,6 @@ exports[`runs examples > example "brandBy" example index 0 1`] = `
 `;
 
 exports[`runs examples > example "cat" example index 0 1`] = `
-[
-  "[ 0/1 → 1/1 | note:e5 ]",
-  "[ 1/1 → 2/1 | note:b4 ]",
-  "[ 2/1 → 5/2 | note:d5 ]",
-  "[ 5/2 → 3/1 | note:c5 ]",
-  "[ 3/1 → 4/1 | note:e5 ]",
-]
-`;
-
-exports[`runs examples > example "cat" example index 1 1`] = `
 [
   "[ 0/1 → 1/4 | s:hh ]",
   "[ 1/4 → 1/2 | s:hh ]",
@@ -1411,6 +1251,16 @@ exports[`runs examples > example "cat" example index 1 1`] = `
 ]
 `;
 
+exports[`runs examples > example "cat" example index 0 2`] = `
+[
+  "[ 0/1 → 1/1 | note:e5 ]",
+  "[ 1/1 → 2/1 | note:b4 ]",
+  "[ 2/1 → 5/2 | note:d5 ]",
+  "[ 5/2 → 3/1 | note:c5 ]",
+  "[ 3/1 → 4/1 | note:e5 ]",
+]
+`;
+
 exports[`runs examples > example "ceil" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:42 ]",
@@ -2816,43 +2666,6 @@ exports[`runs examples > example "fastGap" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "filter" example index 0 1`] = `
-[
-  "[ 0/1 → 1/8 | s:hh ]",
-  "[ 1/8 → 1/4 | s:hh ]",
-  "[ 1/4 → 3/8 | s:hh ]",
-  "[ 3/8 → 1/2 | s:hh ]",
-  "[ 1/2 → 5/8 | s:hh ]",
-  "[ 5/8 → 3/4 | s:hh ]",
-  "[ 3/4 → 7/8 | s:hh ]",
-  "[ 7/8 → 1/1 | s:oh ]",
-  "[ 1/1 → 9/8 | s:hh ]",
-  "[ 9/8 → 5/4 | s:hh ]",
-  "[ 5/4 → 11/8 | s:hh ]",
-  "[ 11/8 → 3/2 | s:hh ]",
-  "[ 3/2 → 13/8 | s:hh ]",
-  "[ 13/8 → 7/4 | s:hh ]",
-  "[ 7/4 → 15/8 | s:hh ]",
-  "[ 15/8 → 2/1 | s:oh ]",
-  "[ 2/1 → 17/8 | s:hh ]",
-  "[ 17/8 → 9/4 | s:hh ]",
-  "[ 9/4 → 19/8 | s:hh ]",
-  "[ 19/8 → 5/2 | s:hh ]",
-  "[ 5/2 → 21/8 | s:hh ]",
-  "[ 21/8 → 11/4 | s:hh ]",
-  "[ 11/4 → 23/8 | s:hh ]",
-  "[ 23/8 → 3/1 | s:oh ]",
-  "[ 3/1 → 25/8 | s:hh ]",
-  "[ 25/8 → 13/4 | s:hh ]",
-  "[ 13/4 → 27/8 | s:hh ]",
-  "[ 27/8 → 7/2 | s:hh ]",
-  "[ 7/2 → 29/8 | s:hh ]",
-  "[ 29/8 → 15/4 | s:hh ]",
-  "[ 15/4 → 31/8 | s:hh ]",
-  "[ 31/8 → 4/1 | s:oh ]",
-]
-`;
-
 exports[`runs examples > example "firstOf" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:g3 ]",
@@ -5124,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 ]",
 ]
 `;
 
@@ -6824,56 +6637,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 ]",
@@ -6976,27 +6739,6 @@ exports[`runs examples > example "segment" example index 0 1`] = `
 `;
 
 exports[`runs examples > example "seq" example index 0 1`] = `
-[
-  "[ 0/1 → 1/3 | note:e5 ]",
-  "[ 1/3 → 2/3 | note:b4 ]",
-  "[ 2/3 → 5/6 | note:d5 ]",
-  "[ 5/6 → 1/1 | note:c5 ]",
-  "[ 1/1 → 4/3 | note:e5 ]",
-  "[ 4/3 → 5/3 | note:b4 ]",
-  "[ 5/3 → 11/6 | note:d5 ]",
-  "[ 11/6 → 2/1 | note:c5 ]",
-  "[ 2/1 → 7/3 | note:e5 ]",
-  "[ 7/3 → 8/3 | note:b4 ]",
-  "[ 8/3 → 17/6 | note:d5 ]",
-  "[ 17/6 → 3/1 | note:c5 ]",
-  "[ 3/1 → 10/3 | note:e5 ]",
-  "[ 10/3 → 11/3 | note:b4 ]",
-  "[ 11/3 → 23/6 | note:d5 ]",
-  "[ 23/6 → 4/1 | note:c5 ]",
-]
-`;
-
-exports[`runs examples > example "seq" example index 1 1`] = `
 [
   "[ 0/1 → 1/8 | s:hh ]",
   "[ 1/8 → 1/4 | s:hh ]",
@@ -7037,23 +6779,24 @@ exports[`runs examples > example "seq" example index 1 1`] = `
 ]
 `;
 
-exports[`runs examples > example "seqPLoop" example index 0 1`] = `
+exports[`runs examples > example "seq" example index 0 2`] = `
 [
-  "[ 0/1 → 1/8 | s:bd ]",
-  "[ 3/8 → 1/2 | s:bd ]",
-  "[ 3/4 → 7/8 | s:bd ]",
-  "[ 1/1 → 9/8 | s:bd ]",
-  "[ 1/1 → 9/8 | s:cp ]",
-  "[ 11/8 → 3/2 | s:bd ]",
-  "[ 11/8 → 3/2 | s:cp ]",
-  "[ 7/4 → 15/8 | s:bd ]",
-  "[ 7/4 → 15/8 | s:cp ]",
-  "[ 2/1 → 17/8 | s:cp ]",
-  "[ 19/8 → 5/2 | s:cp ]",
-  "[ 11/4 → 23/8 | s:cp ]",
-  "[ 3/1 → 25/8 | s:bd ]",
-  "[ 27/8 → 7/2 | s:bd ]",
-  "[ 15/4 → 31/8 | s:bd ]",
+  "[ 0/1 → 1/3 | note:e5 ]",
+  "[ 1/3 → 2/3 | note:b4 ]",
+  "[ 2/3 → 5/6 | note:d5 ]",
+  "[ 5/6 → 1/1 | note:c5 ]",
+  "[ 1/1 → 4/3 | note:e5 ]",
+  "[ 4/3 → 5/3 | note:b4 ]",
+  "[ 5/3 → 11/6 | note:d5 ]",
+  "[ 11/6 → 2/1 | note:c5 ]",
+  "[ 2/1 → 7/3 | note:e5 ]",
+  "[ 7/3 → 8/3 | note:b4 ]",
+  "[ 8/3 → 17/6 | note:d5 ]",
+  "[ 17/6 → 3/1 | note:c5 ]",
+  "[ 3/1 → 10/3 | note:e5 ]",
+  "[ 10/3 → 11/3 | note:b4 ]",
+  "[ 11/3 → 23/6 | note:d5 ]",
+  "[ 23/6 → 4/1 | note:c5 ]",
 ]
 `;
 
@@ -7110,56 +6853,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`] = `
@@ -7730,27 +7423,6 @@ exports[`runs examples > example "squiz" example index 0 1`] = `
 `;
 
 exports[`runs examples > example "stack" example index 0 1`] = `
-[
-  "[ 0/1 → 1/2 | note:e4 ]",
-  "[ 0/1 → 1/1 | note:g3 ]",
-  "[ 0/1 → 1/1 | note:b3 ]",
-  "[ 1/2 → 1/1 | note:d4 ]",
-  "[ 1/1 → 3/2 | note:e4 ]",
-  "[ 1/1 → 2/1 | note:g3 ]",
-  "[ 1/1 → 2/1 | note:b3 ]",
-  "[ 3/2 → 2/1 | note:d4 ]",
-  "[ 2/1 → 5/2 | note:e4 ]",
-  "[ 2/1 → 3/1 | note:g3 ]",
-  "[ 2/1 → 3/1 | note:b3 ]",
-  "[ 5/2 → 3/1 | note:d4 ]",
-  "[ 3/1 → 7/2 | note:e4 ]",
-  "[ 3/1 → 4/1 | note:g3 ]",
-  "[ 3/1 → 4/1 | note:b3 ]",
-  "[ 7/2 → 4/1 | note:d4 ]",
-]
-`;
-
-exports[`runs examples > example "stack" example index 1 1`] = `
 [
   "[ 0/1 → 1/8 | note:c4 ]",
   "[ 0/1 → 1/4 | s:hh ]",
@@ -7791,6 +7463,27 @@ exports[`runs examples > example "stack" example index 1 1`] = `
 ]
 `;
 
+exports[`runs examples > example "stack" example index 0 2`] = `
+[
+  "[ 0/1 → 1/2 | note:e4 ]",
+  "[ 0/1 → 1/1 | note:g3 ]",
+  "[ 0/1 → 1/1 | note:b3 ]",
+  "[ 1/2 → 1/1 | note:d4 ]",
+  "[ 1/1 → 3/2 | note:e4 ]",
+  "[ 1/1 → 2/1 | note:g3 ]",
+  "[ 1/1 → 2/1 | note:b3 ]",
+  "[ 3/2 → 2/1 | note:d4 ]",
+  "[ 2/1 → 5/2 | note:e4 ]",
+  "[ 2/1 → 3/1 | note:g3 ]",
+  "[ 2/1 → 3/1 | note:b3 ]",
+  "[ 5/2 → 3/1 | note:d4 ]",
+  "[ 3/1 → 7/2 | note:e4 ]",
+  "[ 3/1 → 4/1 | note:g3 ]",
+  "[ 3/1 → 4/1 | note:b3 ]",
+  "[ 7/2 → 4/1 | note:d4 ]",
+]
+`;
+
 exports[`runs examples > example "steps" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | s:bd ]",

website/src/components/Udels/UdelsEditor.jsx

@@ -1,3 +1,5 @@
+import { ReplContext } from '@src/repl/util.mjs';
+
 import Loader from '@src/repl/components/Loader';
 import { Panel } from '@src/repl/components/panel/Panel';
 import { Code } from '@src/repl/components/Code';
@@ -6,21 +8,27 @@ import UserFacingErrorMessage from '@src/repl/components/UserFacingErrorMessage'
 
 // type Props = {
 //  context: replcontext,
+//  containerRef:  React.MutableRefObject<HTMLElement | null>,
+//  editorRef:  React.MutableRefObject<HTMLElement | null>,
+//  error: Error
+//  init: () => void
 // }
 
 export default function UdelsEditor(Props) {
-  const { context } = Props;
-  const { containerRef, editorRef, error, init, pending, started, handleTogglePlay } = context;
-
+  const { context, containerRef, editorRef, error, init } = Props;
+  const { 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} />
+    <ReplContext.Provider value={context}>
+      <div className={'h-full flex w-full flex-col relative'}>
+        <Loader active={pending} />
+        {/* <Header context={context} /> */}
+        <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>
-      <UserFacingErrorMessage error={error} />
-      <Panel context={context} />
-    </div>
+    </ReplContext.Provider>
   );
 }

website/src/content/blog/release-0.0.2-schwindlig.mdx

@@ -26,7 +26,7 @@ author: froos
 - fix: 💄 Enhance visualisation of the Tutorial on mobile by @puria in https://github.com/tidalcycles/strudel/pull/19
 - Stateful queries and events (WIP) by @yaxu in https://github.com/tidalcycles/strudel/pull/14
 - Fix resolveState by @yaxu in https://github.com/tidalcycles/strudel/pull/22
-- added \_asNumber + interpret numbers as midi by @felixroos in https://github.com/tidalcycles/strudel/pull/21
+- added \_asNumber + interprete numbers as midi by @felixroos in https://github.com/tidalcycles/strudel/pull/21
 - Update package.json by @ChiakiUehira in https://github.com/tidalcycles/strudel/pull/23
 - packaging by @felixroos in https://github.com/tidalcycles/strudel/pull/24
 

website/src/content/blog/release-0.6.0-zimtschnecke.mdx

@@ -28,7 +28,7 @@ author: froos
 
 - support freq in pianoroll by @felixroos in https://github.com/tidalcycles/strudel/pull/308
 - ICLC2023 paper WIP by @yaxu in https://github.com/tidalcycles/strudel/pull/306
-- fix: copy share link to clipboard was broken for some browsers by @felixroos in https://github.com/tidalcycles/strudel/pull/311
+- fix: copy share link to clipboard was broken for some browers by @felixroos in https://github.com/tidalcycles/strudel/pull/311
 - Jsdoc component by @felixroos in https://github.com/tidalcycles/strudel/pull/312
 - object support for .scale by @felixroos in https://github.com/tidalcycles/strudel/pull/307
 - Astro build by @felixroos in https://github.com/tidalcycles/strudel/pull/315

website/src/content/blog/release-1.0.0-geburtstagskuchen.mdx

@@ -138,7 +138,7 @@ Plenty of things have been added to the docs, including a [showcase of what peop
 - Export patterns + ui tweaks by @felixroos in https://github.com/tidalcycles/strudel/pull/855
 - Pattern organization by @felixroos in https://github.com/tidalcycles/strudel/pull/858
 - Sound Import from local file system by @daslyfe in https://github.com/tidalcycles/strudel/pull/839
-- bugfix: suspend and close existing audio context when changing interface by @daslyfe in https://github.com/tidalcycles/strudel/pull/882
+- bugfix: suspend and close exisiting audio context when changing interface by @daslyfe in https://github.com/tidalcycles/strudel/pull/882
 - add root mode for voicings by @felixroos in https://github.com/tidalcycles/strudel/pull/887
 - scales can now be anchored by @felixroos in https://github.com/tidalcycles/strudel/pull/888
 - add dough function for raw dsp by @felixroos in https://github.com/tidalcycles/strudel/pull/707 (experimental)
@@ -195,7 +195,7 @@ Plenty of things have been added to the docs, including a [showcase of what peop
 - Update tauri.yml workflow file by @vasilymilovidov in https://github.com/tidalcycles/strudel/pull/705
 - vite-vanilla-repl readme fix by @felixroos in https://github.com/tidalcycles/strudel/pull/737
 - completely revert config mess by @felixroos in https://github.com/tidalcycles/strudel/pull/745
-- hopefully fix trailing slashes bug by @felixroos in https://github.com/tidalcycles/strudel/pull/753
+- hopefully fix trainling slashes bug by @felixroos in https://github.com/tidalcycles/strudel/pull/753
 - Update vite pwa by @felixroos in https://github.com/tidalcycles/strudel/pull/772
 - Update to Astro 3 by @felixroos in https://github.com/tidalcycles/strudel/pull/775
 - support multiple named serial connections, change default baudrate by @yaxu in https://github.com/tidalcycles/strudel/pull/551

website/src/docs/MiniRepl.jsx

@@ -120,7 +120,6 @@ export function MiniRepl({
                 'cursor-pointer w-16 flex items-center justify-center p-1 border-r border-lineHighlight text-foreground bg-lineHighlight hover:bg-background',
                 started ? 'animate-pulse' : '',
               )}
-              aria-label={started ? 'stop' : 'play'}
               onClick={() => editorRef.current?.toggle()}
             >
               <Icon type={started ? 'stop' : 'play'} />
@@ -130,7 +129,6 @@ export function MiniRepl({
                 'w-16 flex items-center justify-center p-1 text-foreground border-lineHighlight bg-lineHighlight',
                 isDirty ? 'text-foreground hover:bg-background cursor-pointer' : 'opacity-50 cursor-not-allowed',
               )}
-              aria-label="update"
               onClick={() => editorRef.current?.evaluate()}
             >
               <Icon type="refresh" />
@@ -142,7 +140,6 @@ export function MiniRepl({
                 className={
                   'cursor-pointer w-16 flex items-center justify-center p-1 border-r border-lineHighlight text-foreground bg-lineHighlight hover:bg-background'
                 }
-                aria-label="previous example"
                 onClick={() => changeTune(tuneIndex - 1)}
               >
                 <div className="rotate-180">
@@ -153,7 +150,6 @@ export function MiniRepl({
                 className={
                   'cursor-pointer w-16 flex items-center justify-center p-1 border-r border-lineHighlight text-foreground bg-lineHighlight hover:bg-background'
                 }
-                aria-label="next example"
                 onClick={() => changeTune(tuneIndex + 1)}
               >
                 <Icon type="skip" />

website/src/pages/learn/factories.mdx

@@ -25,14 +25,26 @@ These are the equivalents used by the Mini Notation:
 
 <JsDoc client:idle name="cat" h={0} />
 
+You can also use cat as a chained function like this:
+
+<JsDoc client:idle name="Pattern.cat" h={0} hideDescription />
+
 ## seq
 
 <JsDoc client:idle name="seq" h={0} />
 
+Or as a chained function:
+
+<JsDoc client:idle name="Pattern.seq" h={0} hideDescription />
+
 ## stack
 
 <JsDoc client:idle name="stack" h={0} />
 
+As a chained function:
+
+<JsDoc client:idle name="Pattern.stack" h={0} hideDescription />
+
 ## s_cat
 
 <JsDoc client:idle name="s_cat" h={0} />

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/repl/Repl.jsx

@@ -4,15 +4,252 @@ 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 { code2hash, logger, silence } from '@strudel/core';
+import { getDrawContext } from '@strudel/draw';
+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 { useStore } from '@nanostores/react';
+import { prebake } from './prebake.mjs';
+import { getRandomTune, initCode, loadModules, shareCode, ReplContext, isUdels } from './util.mjs';
+import './Repl.css';
+import { setInterval, clearInterval } from 'worker-timers';
+import { getMetadata } from '../metadata_parser';
 import UdelsEditor from '@components/Udels/UdelsEditor';
+
 import ReplEditor from './components/ReplEditor';
-import EmbeddedReplEditor from './components/EmbeddedReplEditor';
-import { useReplContext } from './useReplContext';
+
+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;
+        //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 (_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,
+  };
+
+  if (isUdels()) {
+    return (
+      <UdelsEditor context={context} error={error} init={init} editorRef={editorRef} containerRef={containerRef} />
+    );
+  }
+
+  return (
+    <ReplEditor
+      panelPosition={panelPosition}
+      isEmbedded={isEmbedded}
+      context={context}
+      error={error}
+      init={init}
+      editorRef={editorRef}
+      containerRef={containerRef}
+    />
+  );
 }

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/Header.jsx

@@ -6,14 +6,23 @@ 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 { 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();
 
@@ -43,7 +52,7 @@ export function Header({ context, embedded = false }) {
           )}
         >
           <div
-            className={cx('mt-[1px]', started && 'animate-spin', 'cursor-pointer', isZen && 'fixed top-2 right-4')}
+            className={cx('mt-[1px]', started && 'animate-spin', 'cursor-pointer')}
             onClick={() => {
               if (!isEmbedded) {
                 setIsZen(!isZen);

website/src/repl/components/ReplEditor.jsx

@@ -1,30 +1,38 @@
+import { ReplContext } from '@src/repl/util.mjs';
+
 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';
 import { Header } from './Header';
-import { useSettings } from '@src/settings.mjs';
 
 // type Props = {
 //  context: replcontext,
+//  containerRef:  React.MutableRefObject<HTMLElement | null>,
+//  editorRef:  React.MutableRefObject<HTMLElement | null>,
+//  error: Error
+//  init: () => void
+//  isEmbedded: boolean
 // }
 
 export default function ReplEditor(Props) {
-  const { context } = Props;
-  const { containerRef, editorRef, error, init, pending } = context;
-  const settings = useSettings();
-  const { panelPosition } = settings;
-
+  const { context, containerRef, editorRef, error, init, panelPosition } = Props;
+  const { pending, started, handleTogglePlay, isEmbedded } = context;
+  const showPanel = !isEmbedded;
   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} />}
+    <ReplContext.Provider value={context}>
+      <div className="h-full flex flex-col relative">
+        <Loader active={pending} />
+        <Header context={context} />
+        {isEmbedded && <BigPlayButton started={started} handleTogglePlay={handleTogglePlay} />}
+        <div className="grow flex relative overflow-hidden">
+          <Code containerRef={containerRef} editorRef={editorRef} init={init} />
+          {panelPosition === 'right' && showPanel && <Panel context={context} />}
+        </div>
+        <UserFacingErrorMessage error={error} />
+        {panelPosition === 'bottom' && showPanel && <Panel context={context} />}
       </div>
-      <UserFacingErrorMessage error={error} />
-      {panelPosition === 'bottom' && <Panel context={context} />}
-    </div>
+    </ReplContext.Provider>
   );
 }

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/components/panel/ConsoleTab.jsx

@@ -3,7 +3,7 @@ import cx from '@src/cx.mjs';
 export function ConsoleTab({ log }) {
   return (
     <div id="console-tab" className="break-all px-4 dark:text-white text-stone-900 text-sm">
-      <pre aria-hidden="true">{`███████╗████████╗██████╗ ██╗   ██╗██████╗ ███████╗██╗     
+      <pre>{`███████╗████████╗██████╗ ██╗   ██╗██████╗ ███████╗██╗     
 ██╔════╝╚══██╔══╝██╔══██╗██║   ██║██╔══██╗██╔════╝██║     
 ███████╗   ██║   ██████╔╝██║   ██║██║  ██║█████╗  ██║     
 ╚════██║   ██║   ██╔══██╗██║   ██║██║  ██║██╔══╝  ██║     

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

@@ -1,7 +1,5 @@
-import { useMemo, useState } from 'react';
-
 import jsdocJson from '../../../../../doc.json';
-const availableFunctions = jsdocJson.docs
+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));
 
@@ -12,29 +10,9 @@ const getInnerText = (html) => {
 };
 
 export function Reference() {
-  const [search, setSearch] = useState('');
-
-  const visibleFunctions = useMemo(() => {
-    return availableFunctions.filter((entry) => {
-      if (!search) {
-        return true;
-      }
-
-      return entry.name.includes(search) || (entry.synonyms?.some((s) => s.includes(search)) ?? false);
-    });
-  }, [search]);
-
   return (
     <div className="flex h-full w-full pt-2 text-foreground overflow-hidden">
       <div className="w-42 flex-none h-full overflow-y-auto overflow-x-hidden pr-4">
-        <div class="w-full ml-2 mb-2 top-0 sticky">
-          <input
-            className="w-full p-1 bg-background rounded-md"
-            placeholder="Search"
-            value={search}
-            onInput={(event) => setSearch(event.target.value)}
-          />
-        </div>
         {visibleFunctions.map((entry, i) => (
           <a
             key={i}

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

@@ -3,8 +3,6 @@ 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 }) {
   return (
@@ -80,8 +78,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 +96,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,13 +193,10 @@ 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}
@@ -236,11 +207,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/components/panel/SoundsTab.jsx

@@ -1,7 +1,7 @@
 import useEvent from '@src/useEvent.mjs';
 import { useStore } from '@nanostores/react';
 import { getAudioContext, soundMap, connectToDestination } from '@strudel/webaudio';
-import React, { useMemo, useRef, useState } from 'react';
+import React, { useMemo, useRef } from 'react';
 import { settingsMap, useSettings } from '../../../settings.mjs';
 import { ButtonGroup } from './Forms.jsx';
 import ImportSoundsButton from './ImportSoundsButton.jsx';
@@ -12,20 +12,15 @@ const getSamples = (samples) =>
 export function SoundsTab() {
   const sounds = useStore(soundMap);
   const { soundsFilter } = useSettings();
-  const [search, setSearch] = useState('');
-
   const soundEntries = useMemo(() => {
+    let filtered = Object.entries(sounds)
+      .filter(([key]) => !key.startsWith('_'))
+      .sort((a, b) => a[0].localeCompare(b[0]));
     if (!sounds) {
       return [];
     }
-
-    let filtered = Object.entries(sounds)
-      .filter(([key]) => !key.startsWith('_'))
-      .sort((a, b) => a[0].localeCompare(b[0]))
-      .filter(([name]) => name.toLowerCase().includes(search.toLowerCase()));
-
     if (soundsFilter === 'user') {
-      return filtered.filter(([_, { data }]) => !data.prebake);
+      return filtered.filter(([key, { data }]) => !data.prebake);
     }
     if (soundsFilter === 'drums') {
       return filtered.filter(([_, { data }]) => data.type === 'sample' && data.tag === 'drum-machines');
@@ -37,11 +32,9 @@ export function SoundsTab() {
       return filtered.filter(([_, { data }]) => ['synth', 'soundfont'].includes(data.type));
     }
     return filtered;
-  }, [sounds, soundsFilter, search]);
-
+  }, [sounds, soundsFilter]);
   // holds mutable ref to current triggered sound
   const trigRef = useRef();
-
   // stop current sound on mouseup
   useEvent('mouseup', () => {
     const t = trigRef.current;
@@ -50,17 +43,8 @@ export function SoundsTab() {
       ref?.stop(getAudioContext().currentTime + 0.01);
     });
   });
-
   return (
     <div id="sounds-tab" className="px-4 flex flex-col w-full h-full dark:text-white text-stone-900">
-      <div className="w-full ml-2 mb-2 top-0 sticky">
-        <input
-          className="w-full p-1 bg-background rounded-md"
-          placeholder="Search"
-          value={search}
-          onChange={(e) => setSearch(e.target.value)}
-        />
-      </div>
       <div className="pb-2 flex shrink-0 flex-wrap">
         <ButtonGroup
           value={soundsFilter}

website/src/repl/files.mjs

@@ -23,10 +23,10 @@ async function hasStrudelJson(subpath) {
 async function loadStrudelJson(subpath) {
   const contents = await readTextFile(subpath + '/strudel.json', { dir });
   const sampleMap = JSON.parse(contents);
-  processSampleMap(sampleMap, (key, bank) => {
-    registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, bank, fileResolver(subpath)), {
+  processSampleMap(sampleMap, (key, value) => {
+    registerSound(key, (t, hapValue, onended) => onTriggerSample(t, hapValue, onended, value, fileResolver(subpath)), {
       type: 'sample',
-      samples: bank,
+      samples: value,
       fileSystem: true,
       tag: 'local',
     });

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,48 +105,37 @@ 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 ReplContext = createContext(null);
+
 export const isUdels = () => {
-  if (isCrossOriginFrame()) {
-    return false;
-  }
-  return window.top?.location?.pathname.includes('udels');
+  return window.parent?.location.pathname.includes('udels');
 };
 
 export const getAudioDevices = async () => {

website/src/settings.mjs

@@ -5,11 +5,6 @@ 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,7 +28,6 @@ export const defaultSettings = {
   panelPosition: 'right',
   userPatterns: '{}',
   audioDeviceName: defaultAudioDeviceName,
-  audioEngineTarget: audioEngineTargets.webaudio,
 };
 
 let search = null;

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