codeformat

Reviewed-on: https://codeberg.org/uzu/strudel/pulls/1488

packages/core/controls.mjs

@@ -160,18 +160,6 @@ export const { velocity } = registerControl('velocity');
  *
  */
 export const { gain } = registerControl('gain');
-
-/**
- * Applies a linear gain adjustment
- *
- * @name gainlinear
- * @synonyms gainlin
- * @param {number | Pattern} amount gainlin
- * @example
- * s("hh*8").gainlin(".4!2 1 .4!2 1 .4 1").fast(2)
- *
- */
-export const { gainlinear, gainlin } = registerControl('gainlinear', 'gainlin');
 /**
  * Gain applied after all effects have been processed.
  *
@@ -332,6 +320,7 @@ export const { fft } = registerControl('fft');
  *
  * @name decay
  * @param {number | Pattern} time decay time in seconds
+ * @synonyms dec
  * @example
  * note("c3 e3 f3 g3").decay("<.1 .2 .3 .4>").sustain(0)
  *
@@ -552,39 +541,28 @@ export const { tremoloshape } = registerControl('tremoloshape', 'tremshape');
  *
  */
 
-/**
- * modulate the amplitude of an orbit to create a "sidechain" like effect
- *
- * @name duckorbit
- * @param {number | Pattern} orbit target orbit
- * @example
- * stack( n(run(8)).scale("c:minor").s("sawtooth").delay(.7).orbit(2), s("bd:4!4").beat("0,4,8,11,14",16).duckorbit(2).duckattack(0.2).duckdepth(1))
- *
- */
-export const { duck } = registerControl('duckorbit', 'duck');
+// TODO: SUPRADOUGH implement post orbit "pump" sidechain effect
+// /**
+//  * modulate the amplitude of an orbit to create a "sidechain" like effect
+//  *
+//  * @name pump
+//  * @param {number | Pattern} speed modulation speed in cycles
+//  * @example
+//  * note("{f g c d}%16").s("sawtooth").pump(".25:.75")
+//  *
+//  */
+// export const { pump } = registerControl(['pump', 'pumpdepth']);
 
-/**
- *  the amount of ducking applied to target orbit
- *
- * @name duckdepth
- * @param {number | Pattern} depth depth of modulation from 0 to 1
- * @example
- * stack( n(run(8)).scale("c:minor").s("sawtooth").delay(.7).orbit(2), s("bd:4!4").beat("0,4,8,11,14",16).duckorbit(2).duckattack(0.2).duckdepth("<1 .9 .6 0>"))
- *
- */
-
-export const { duckdepth } = registerControl('duckdepth');
-
-/**
- *  the attack time of the duck effect
- *
- * @name duckattack
- * @param {number | Pattern} time
- * @example
- * stack( n(run(8)).scale("c:minor").s("sawtooth").delay(.7).orbit(2), s("bd:4!4").beat("0,4,8,11,14",16).duckorbit(2).duckattack("<0.2 0 0.4>").duckdepth(1))
- *
- */
-export const { duckattack } = registerControl('duckattack', 'duckatt');
+// /**
+//  * modulate the amplitude of an orbit to create a "sidechain" like effect
+//  *
+//  * @name pumpdepth
+//  * @param {number | Pattern} depth depth of modulation from 0 to 1
+//  * @example
+//  * note("{f g c d}%16").s("sawtooth").pump(".25").depth("<.25 .5 .75 1>")
+//  *
+//  */
+// export const { pumpdepth } = registerControl('pumpdepth');
 
 export const { drive } = registerControl('drive');
 

packages/core/logger.mjs

@@ -6,7 +6,7 @@ let debounce = 1000,
 
 export function errorLogger(e, origin = 'cyclist') {
   //TODO: add some kind of debug flag that enables this  while in dev mode
-  // console.error(e);
+  // console.error(e)
   logger(`[${origin}] error: ${e.message}`);
 }
 

packages/core/pattern.mjs

@@ -1569,7 +1569,7 @@ export const func = curry((a, b) => reify(b).func(a));
 /**
  * Registers a new pattern method. The method is added to the Pattern class + the standalone function is returned from register.
  *
- * @param {string} name name of the function
+ * @param {string | string[]} name name of the function, or an array of names to be used as synonyms
  * @param {function} func function with 1 or more params, where last is the current pattern
  * @noAutocomplete
  *

packages/core/repl.mjs

@@ -138,9 +138,9 @@ export function repl({
         // allows muting a pattern x with x_ or _x
         return silence;
       }
-      if (id.includes('$')) {
+      if (id === '$') {
         // allows adding anonymous patterns with $:
-        id = `${id}${anonymousIndex}`;
+        id = `$${anonymousIndex}`;
         anonymousIndex++;
       }
       pPatterns[id] = this;
@@ -201,13 +201,6 @@ export function repl({
       let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
       if (Object.keys(pPatterns).length) {
         let patterns = Object.values(pPatterns);
-
-        // if there are solo patterns, only use those
-        const soloPatterns = Object.entries(pPatterns).filter(([key]) => key.length > 1 && key.startsWith('S'));
-        if (soloPatterns.length) {
-          patterns = Object.values(Object.fromEntries(soloPatterns));
-        }
-
         if (eachTransform) {
           // Explicit lambda so only element (not index and array) are passed
           patterns = patterns.map((x) => eachTransform(x));

packages/repl/prebake.mjs

@@ -36,7 +36,7 @@ export async function prebake() {
     samples(`${ds}/tidal-drum-machines.json`),
     samples(`${ds}/piano.json`),
     samples(`${ds}/Dirt-Samples.json`),
-    samples(`https://raw.githubusercontent.com/tidalcycles/uzu-drumkit/main/strudel.json`),
+    samples(`${ds}/uzu-drumkit.json`),
     samples(`${ds}/vcsl.json`),
     samples(`${ds}/mridangam.json`),
   ]);

packages/superdough/logger.mjs

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

packages/superdough/superdough.mjs

@@ -11,7 +11,7 @@ import { clamp, nanFallback, _mod, cycleToSeconds, secondsToCycle } from './util
 import workletsUrl from './worklets.mjs?audioworklet';
 import { createFilter, gainNode, getCompressor, getWorklet } from './helpers.mjs';
 import { map } from 'nanostores';
-import { logger, errorLogger } from './logger.mjs';
+import { logger } from './logger.mjs';
 import { loadBuffer } from './sampler.mjs';
 
 export const DEFAULT_MAX_POLYPHONY = 128;
@@ -42,7 +42,7 @@ export function registerSound(key, onTrigger, data = {}) {
   soundMap.setKey(key, { onTrigger, data });
 }
 
-let gainCurveFunc = (val) => Math.pow(val, 2);
+let gainCurveFunc = (val) => val;
 
 export function applyGainCurve(val) {
   return gainCurveFunc(val);
@@ -135,7 +135,7 @@ export const getAudioDevices = async () => {
 
 let defaultDefaultValues = {
   s: 'triangle',
-  gain: 1,
+  gain: 0.8,
   postgain: 1,
   density: '.03',
   ftype: '12db',
@@ -331,18 +331,16 @@ function getDelay(orbit, delaytime, delayfeedback, t, channels) {
     //logger(`delayfeedback was clamped to ${maxfeedback} to save your ears`);
   }
   delayfeedback = clamp(delayfeedback, 0, 0.98);
-  if (!orbits[orbit].delayNode) {
+  if (!delays[orbit]) {
     const ac = getAudioContext();
     const dly = ac.createFeedbackDelay(1, delaytime, delayfeedback);
     dly.start?.(t); // for some reason, this throws when audion extension is installed..
-    connectToOrbit(dly, orbit);
-    orbits[orbit].delayNode = dly;
+    connectToDestination(dly, channels);
+    delays[orbit] = dly;
   }
-  orbits[orbit].delayNode.delayTime.value !== delaytime &&
-    orbits[orbit].delayNode.delayTime.setValueAtTime(delaytime, t);
-  orbits[orbit].delayNode.feedback.value !== delayfeedback &&
-    orbits[orbit].delayNode.feedback.setValueAtTime(delayfeedback, t);
-  return orbits[orbit].delayNode;
+  delays[orbit].delayTime.value !== delaytime && delays[orbit].delayTime.setValueAtTime(delaytime, t);
+  delays[orbit].feedback.value !== delayfeedback && delays[orbit].feedback.setValueAtTime(delayfeedback, t);
+  return delays[orbit];
 }
 
 export function getLfo(audioContext, begin, end, properties = {}) {
@@ -367,6 +365,22 @@ export function getLfo(audioContext, begin, end, properties = {}) {
   return getWorklet(audioContext, 'lfo-processor', lfoprops);
 }
 
+export function getSyncedLfo(audioContext, time, end, cps, cycle, properties = {}) {
+  const frequency = cycle / cps;
+
+  return getWorklet(audioContext, 'lfo-processor', {
+    frequency,
+    depth: 1,
+    skew: 0,
+    phaseoffset: 0,
+    time,
+    end,
+    shape: 1,
+    dcoffset: -0.5,
+    ...properties,
+  });
+}
+
 function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
   const ac = getAudioContext();
   const lfoGain = getLfo(ac, time, end, { frequency, depth: sweep * 2 });
@@ -398,67 +412,31 @@ function getFilterType(ftype) {
   return typeof ftype === 'number' ? filterTypes[Math.floor(_mod(ftype, filterTypes.length))] : ftype;
 }
 
-//type orbit {
-// gain: number,
-// reverbNode: reverbNode
-// delayNode:
-//}
-let orbits = {};
-function connectToOrbit(node, orbit) {
-  if (orbits[orbit] == null) {
-    errorLogger(new Error('target orbit does not exist'), 'superdough');
-  }
-  node.connect(orbits[orbit].gain);
-}
-
-function setOrbit(audioContext, orbit, channels) {
-  if (orbits[orbit] == null) {
-    orbits[orbit] = {
-      gain: new GainNode(audioContext, { gain: 1 }),
-    };
-    connectToDestination(orbits[orbit].gain, channels);
-  }
-}
-function duckOrbit(targetOrbit, t, attacktime = 0.1, duckdepth = 1) {
-  const targetArr = [targetOrbit].flat();
-
-  targetArr.forEach((target) => {
-    if (orbits[target] == null) {
-      errorLogger(new Error(`duck target orbit ${target} does not exist`), 'superdough');
-      return;
-    }
-    orbits[target].gain.gain.cancelAndHoldAtTime(t);
-    const currVal = orbits[target].gain.gain.value;
-    orbits[target].gain.gain.setValueAtTime(currVal, t);
-    orbits[target].gain.gain.linearRampToValueAtTime(clamp(1 - Math.pow(duckdepth, 0.5), 0.01, currVal), t + 0.002);
-    orbits[target].gain.gain.exponentialRampToValueAtTime(1, t + Math.max(0.002, attacktime));
-  });
-}
-
+let reverbs = {};
 let hasChanged = (now, before) => now !== undefined && now !== before;
-function getReverb(orbit, duration, fade, lp, dim, ir) {
+function getReverb(orbit, duration, fade, lp, dim, ir, channels) {
   // If no reverb has been created for a given orbit, create one
-  if (!orbits[orbit].reverbNode) {
+  if (!reverbs[orbit]) {
     const ac = getAudioContext();
     const reverb = ac.createReverb(duration, fade, lp, dim, ir);
-    connectToOrbit(reverb, orbit);
-    orbits[orbit].reverbNode = reverb;
+    connectToDestination(reverb, channels);
+    reverbs[orbit] = reverb;
   }
   if (
-    hasChanged(duration, orbits[orbit].reverbNode.duration) ||
-    hasChanged(fade, orbits[orbit].reverbNode.fade) ||
-    hasChanged(lp, orbits[orbit].reverbNode.lp) ||
-    hasChanged(dim, orbits[orbit].reverbNode.dim) ||
-    orbits[orbit].reverbNode.ir !== ir
+    hasChanged(duration, reverbs[orbit].duration) ||
+    hasChanged(fade, reverbs[orbit].fade) ||
+    hasChanged(lp, reverbs[orbit].lp) ||
+    hasChanged(dim, reverbs[orbit].dim) ||
+    reverbs[orbit].ir !== ir
   ) {
     // only regenerate when something has changed
     // avoids endless regeneration on things like
     // stack(s("a"), s("b").rsize(8)).room(.5)
     // this only works when args may stay undefined until here
     // setting default values breaks this
-    orbits[orbit].reverbNode.generate(duration, fade, lp, dim, ir);
+    reverbs[orbit].generate(duration, fade, lp, dim, ir);
   }
-  return orbits[orbit].reverbNode;
+  return reverbs[orbit];
 }
 
 export let analysers = {},
@@ -501,7 +479,8 @@ function effectSend(input, effect, wet) {
 }
 
 export function resetGlobalEffects() {
-  orbits = {};
+  delays = {};
+  reverbs = {};
   analysers = {};
   analysersData = {};
 }
@@ -552,12 +531,8 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     bank,
     source,
     gain = getDefaultValue('gain'),
-    gainlinear,
     postgain = getDefaultValue('postgain'),
     density = getDefaultValue('density'),
-    duckorbit,
-    duckattack,
-    duckdepth,
     // filters
     fanchor = getDefaultValue('fanchor'),
     drive = 0.69,
@@ -596,7 +571,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     coarse,
 
     crush,
-    dry,
     shape,
     shapevol = getDefaultValue('shapevol'),
     distort,
@@ -630,14 +604,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   const orbitChannels = mapChannelNumbers(
     multiChannelOrbits && orbit > 0 ? [orbit * 2 - 1, orbit * 2] : getDefaultValue('channels'),
   );
-
   const channels = value.channels != null ? mapChannelNumbers(value.channels) : orbitChannels;
-  setOrbit(ac, orbit, channels, t, cycle, cps);
-
-
-  if (duckorbit != null) {
-    duckOrbit(duckorbit, t, duckattack, duckdepth);
-  }
 
   gain = applyGainCurve(nanFallback(gain, 1));
   postgain = applyGainCurve(postgain);
@@ -647,9 +614,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   velocity = applyGainCurve(velocity);
   tremolodepth = applyGainCurve(tremolodepth);
   gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
-  if (gainlinear != null) {
-    gain *= gainlinear;
-  }
 
   const end = t + hapDuration;
   const endWithRelease = end + release;
@@ -705,7 +669,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     logger('[webaudio] skip hap: still loading', ac.currentTime - t);
     return;
   }
-  let chain = []; // audio nodes that will be connected to each other sequentially
+  const chain = []; // audio nodes that will be connected to each other sequentially
   chain.push(sourceNode);
   stretch !== undefined && chain.push(getWorklet(ac, 'phase-vocoder-processor', { pitchFactor: stretch }));
 
@@ -827,6 +791,7 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
   // last gain
   const post = new GainNode(ac, { gain: postgain });
   chain.push(post);
+  connectToDestination(post, channels);
 
   // delay
   let delaySend;
@@ -861,14 +826,6 @@ export const superdough = async (value, t, hapDuration, cps = 0.5, cycle = 0.5)
     analyserSend = effectSend(post, analyserNode, 1);
     audioNodes.push(analyserSend);
   }
-  if (dry != null) {
-    dry = applyGainCurve(dry);
-    const dryGain = new GainNode(ac, { gain: dry });
-    chain.push(dryGain);
-    connectToOrbit(dryGain, orbit);
-  } else {
-    connectToOrbit(post, orbit);
-  }
 
   // connect chain elements together
   chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);

packages/tonal/tonal.mjs

@@ -88,13 +88,14 @@ function scaleOffset(scale, offset, note) {
  * @returns Pattern
  * @memberof Pattern
  * @name transpose
+ * @synonyms trans
  * @example
  * "c2 c3".fast(2).transpose("<0 -2 5 3>".slow(2)).note()
  * @example
  * "c2 c3".fast(2).transpose("<1P -2M 4P 3m>".slow(2)).note()
  */
 
-export const transpose = register('transpose', function (intervalOrSemitones, pat) {
+export const { transpose, trans } = register(['transpose', 'trans'], function transposeFn(intervalOrSemitones, pat) {
   return pat.withHap((hap) => {
     const note = hap.value.note ?? hap.value;
     if (typeof note === 'number') {
@@ -142,6 +143,7 @@ export const transpose = register('transpose', function (intervalOrSemitones, pa
  * @name scaleTranspose
  * @param {offset} offset number of steps inside the scale
  * @returns Pattern
+ * @synonyms scaleTrans, strans
  * @example
  * "-8 [2,4,6]"
  * .scale('C4 bebop major')
@@ -149,22 +151,25 @@ export const transpose = register('transpose', function (intervalOrSemitones, pa
  * .note()
  */
 
-export const scaleTranspose = register('scaleTranspose', function (offset /* : number | string */, pat) {
-  return pat.withHap((hap) => {
-    if (!hap.context.scale) {
-      throw new Error('can only use scaleTranspose after .scale');
-    }
-    if (typeof hap.value === 'object')
-      return hap.withValue(() => ({
-        ...hap.value,
-        note: scaleOffset(hap.context.scale, Number(offset), hap.value.note),
-      }));
-    if (typeof hap.value !== 'string') {
-      throw new Error('can only use scaleTranspose with notes');
-    }
-    return hap.withValue(() => scaleOffset(hap.context.scale, Number(offset), hap.value));
-  });
-});
+export const { scaleTranspose, scaleTrans, strans } = register(
+  ['scaleTranspose', 'scaleTrans', 'strans'],
+  function (offset /* : number | string */, pat) {
+    return pat.withHap((hap) => {
+      if (!hap.context.scale) {
+        throw new Error('can only use scaleTranspose after .scale');
+      }
+      if (typeof hap.value === 'object')
+        return hap.withValue(() => ({
+          ...hap.value,
+          note: scaleOffset(hap.context.scale, Number(offset), hap.value.note),
+        }));
+      if (typeof hap.value !== 'string') {
+        throw new Error('can only use scaleTranspose with notes');
+      }
+      return hap.withValue(() => scaleOffset(hap.context.scale, Number(offset), hap.value));
+    });
+  },
+);
 
 /**
  * Turns numbers into notes in the scale (zero indexed). Also sets scale for other scale operations, like {@link Pattern#scaleTranspose}.

test/__snapshots__/examples.test.mjs.snap

@@ -3036,177 +3036,6 @@ exports[`runs examples > example "dry" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "duckattack" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 0/1 → 1/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/8 → 1/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/4 → 5/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/4 → 3/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/8 → 1/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/2 → 9/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/2 → 5/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/8 → 3/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/16 → 3/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/4 → 7/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/8 → 15/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/8 → 1/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/1 → 17/16 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 1/1 → 9/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/8 → 5/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/4 → 21/16 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 5/4 → 11/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/8 → 3/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/2 → 25/16 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 3/2 → 13/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/8 → 7/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/16 → 7/4 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 7/4 → 15/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 15/8 → 31/16 | s:bd n:4 duckorbit:2 duckattack:0 duckdepth:1 ]",
-  "[ 15/8 → 2/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 2/1 → 33/16 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 2/1 → 17/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 17/8 → 9/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/4 → 37/16 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 9/4 → 19/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 19/8 → 5/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/2 → 41/16 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 5/2 → 21/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 21/8 → 11/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 43/16 → 11/4 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 11/4 → 23/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 23/8 → 47/16 | s:bd n:4 duckorbit:2 duckattack:0.4 duckdepth:1 ]",
-  "[ 23/8 → 3/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/1 → 49/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/1 → 25/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 25/8 → 13/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/4 → 53/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 13/4 → 27/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/8 → 7/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/2 → 57/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/2 → 29/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 29/8 → 15/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 59/16 → 15/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 15/4 → 31/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 31/8 → 63/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 31/8 → 4/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-]
-`;
-
-exports[`runs examples > example "duckdepth" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 0/1 → 1/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/8 → 1/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/4 → 5/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/4 → 3/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/8 → 1/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/2 → 9/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/2 → 5/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/8 → 3/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/16 → 3/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/4 → 7/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/8 → 15/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/8 → 1/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/1 → 17/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 1/1 → 9/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/8 → 5/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/4 → 21/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 5/4 → 11/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/8 → 3/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/2 → 25/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 3/2 → 13/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/8 → 7/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/16 → 7/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 7/4 → 15/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 15/8 → 31/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.9 ]",
-  "[ 15/8 → 2/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 2/1 → 33/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 2/1 → 17/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 17/8 → 9/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/4 → 37/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 9/4 → 19/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 19/8 → 5/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/2 → 41/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 5/2 → 21/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 21/8 → 11/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 43/16 → 11/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 11/4 → 23/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 23/8 → 47/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0.6 ]",
-  "[ 23/8 → 3/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/1 → 49/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 3/1 → 25/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 25/8 → 13/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/4 → 53/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 13/4 → 27/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/8 → 7/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/2 → 57/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 7/2 → 29/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 29/8 → 15/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 59/16 → 15/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 15/4 → 31/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 31/8 → 63/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:0 ]",
-  "[ 31/8 → 4/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-]
-`;
-
-exports[`runs examples > example "duckorbit" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 0/1 → 1/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/8 → 1/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/4 → 5/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/4 → 3/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/8 → 1/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/2 → 9/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/2 → 5/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/8 → 3/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/16 → 3/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/4 → 7/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/8 → 15/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/8 → 1/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 1/1 → 17/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 1/1 → 9/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/8 → 5/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/4 → 21/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 5/4 → 11/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 11/8 → 3/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/2 → 25/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/2 → 13/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/8 → 7/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/16 → 7/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/4 → 15/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 15/8 → 31/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 15/8 → 2/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 2/1 → 33/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 2/1 → 17/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 17/8 → 9/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 9/4 → 37/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 9/4 → 19/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 19/8 → 5/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 5/2 → 41/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 5/2 → 21/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 21/8 → 11/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 43/16 → 11/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 11/4 → 23/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 23/8 → 47/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 23/8 → 3/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 3/1 → 49/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 3/1 → 25/8 | note:C3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 25/8 → 13/4 | note:D3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 13/4 → 53/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 13/4 → 27/8 | note:Eb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 27/8 → 7/2 | note:F3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 7/2 → 57/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 7/2 → 29/8 | note:G3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 29/8 → 15/4 | note:Ab3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 59/16 → 15/4 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 15/4 → 31/8 | note:Bb3 s:sawtooth delay:0.7 orbit:2 ]",
-  "[ 31/8 → 63/16 | s:bd n:4 duckorbit:2 duckattack:0.2 duckdepth:1 ]",
-  "[ 31/8 → 4/1 | note:C4 s:sawtooth delay:0.7 orbit:2 ]",
-]
-`;
-
 exports[`runs examples > example "duration" example index 0 1`] = `
 [
   "[ 0/1 → 1/4 | note:c s:piano duration:0.5 ]",
@@ -4274,75 +4103,6 @@ exports[`runs examples > example "gain" example index 0 1`] = `
 ]
 `;
 
-exports[`runs examples > example "gainlinear" example index 0 1`] = `
-[
-  "[ 0/1 → 1/16 | s:hh gainlinear:0.4 ]",
-  "[ 1/16 → 1/8 | s:hh gainlinear:0.4 ]",
-  "[ 1/8 → 3/16 | s:hh gainlinear:1 ]",
-  "[ 3/16 → 1/4 | s:hh gainlinear:0.4 ]",
-  "[ 1/4 → 5/16 | s:hh gainlinear:0.4 ]",
-  "[ 5/16 → 3/8 | s:hh gainlinear:1 ]",
-  "[ 3/8 → 7/16 | s:hh gainlinear:0.4 ]",
-  "[ 7/16 → 1/2 | s:hh gainlinear:1 ]",
-  "[ 1/2 → 9/16 | s:hh gainlinear:0.4 ]",
-  "[ 9/16 → 5/8 | s:hh gainlinear:0.4 ]",
-  "[ 5/8 → 11/16 | s:hh gainlinear:1 ]",
-  "[ 11/16 → 3/4 | s:hh gainlinear:0.4 ]",
-  "[ 3/4 → 13/16 | s:hh gainlinear:0.4 ]",
-  "[ 13/16 → 7/8 | s:hh gainlinear:1 ]",
-  "[ 7/8 → 15/16 | s:hh gainlinear:0.4 ]",
-  "[ 15/16 → 1/1 | s:hh gainlinear:1 ]",
-  "[ 1/1 → 17/16 | s:hh gainlinear:0.4 ]",
-  "[ 17/16 → 9/8 | s:hh gainlinear:0.4 ]",
-  "[ 9/8 → 19/16 | s:hh gainlinear:1 ]",
-  "[ 19/16 → 5/4 | s:hh gainlinear:0.4 ]",
-  "[ 5/4 → 21/16 | s:hh gainlinear:0.4 ]",
-  "[ 21/16 → 11/8 | s:hh gainlinear:1 ]",
-  "[ 11/8 → 23/16 | s:hh gainlinear:0.4 ]",
-  "[ 23/16 → 3/2 | s:hh gainlinear:1 ]",
-  "[ 3/2 → 25/16 | s:hh gainlinear:0.4 ]",
-  "[ 25/16 → 13/8 | s:hh gainlinear:0.4 ]",
-  "[ 13/8 → 27/16 | s:hh gainlinear:1 ]",
-  "[ 27/16 → 7/4 | s:hh gainlinear:0.4 ]",
-  "[ 7/4 → 29/16 | s:hh gainlinear:0.4 ]",
-  "[ 29/16 → 15/8 | s:hh gainlinear:1 ]",
-  "[ 15/8 → 31/16 | s:hh gainlinear:0.4 ]",
-  "[ 31/16 → 2/1 | s:hh gainlinear:1 ]",
-  "[ 2/1 → 33/16 | s:hh gainlinear:0.4 ]",
-  "[ 33/16 → 17/8 | s:hh gainlinear:0.4 ]",
-  "[ 17/8 → 35/16 | s:hh gainlinear:1 ]",
-  "[ 35/16 → 9/4 | s:hh gainlinear:0.4 ]",
-  "[ 9/4 → 37/16 | s:hh gainlinear:0.4 ]",
-  "[ 37/16 → 19/8 | s:hh gainlinear:1 ]",
-  "[ 19/8 → 39/16 | s:hh gainlinear:0.4 ]",
-  "[ 39/16 → 5/2 | s:hh gainlinear:1 ]",
-  "[ 5/2 → 41/16 | s:hh gainlinear:0.4 ]",
-  "[ 41/16 → 21/8 | s:hh gainlinear:0.4 ]",
-  "[ 21/8 → 43/16 | s:hh gainlinear:1 ]",
-  "[ 43/16 → 11/4 | s:hh gainlinear:0.4 ]",
-  "[ 11/4 → 45/16 | s:hh gainlinear:0.4 ]",
-  "[ 45/16 → 23/8 | s:hh gainlinear:1 ]",
-  "[ 23/8 → 47/16 | s:hh gainlinear:0.4 ]",
-  "[ 47/16 → 3/1 | s:hh gainlinear:1 ]",
-  "[ 3/1 → 49/16 | s:hh gainlinear:0.4 ]",
-  "[ 49/16 → 25/8 | s:hh gainlinear:0.4 ]",
-  "[ 25/8 → 51/16 | s:hh gainlinear:1 ]",
-  "[ 51/16 → 13/4 | s:hh gainlinear:0.4 ]",
-  "[ 13/4 → 53/16 | s:hh gainlinear:0.4 ]",
-  "[ 53/16 → 27/8 | s:hh gainlinear:1 ]",
-  "[ 27/8 → 55/16 | s:hh gainlinear:0.4 ]",
-  "[ 55/16 → 7/2 | s:hh gainlinear:1 ]",
-  "[ 7/2 → 57/16 | s:hh gainlinear:0.4 ]",
-  "[ 57/16 → 29/8 | s:hh gainlinear:0.4 ]",
-  "[ 29/8 → 59/16 | s:hh gainlinear:1 ]",
-  "[ 59/16 → 15/4 | s:hh gainlinear:0.4 ]",
-  "[ 15/4 → 61/16 | s:hh gainlinear:0.4 ]",
-  "[ 61/16 → 31/8 | s:hh gainlinear:1 ]",
-  "[ 31/8 → 63/16 | s:hh gainlinear:0.4 ]",
-  "[ 63/16 → 4/1 | s:hh gainlinear:1 ]",
-]
-`;
-
 exports[`runs examples > example "gap" example index 0 1`] = `[]`;
 
 exports[`runs examples > example "grow" example index 0 1`] = `

website/public/uzu-drumkit.json

@@ -0,0 +1,76 @@
+{
+    "_base": "https://raw.githubusercontent.com/tidalcycles/uzu-drumkit/main/",
+    "bd": [
+      "bd/10_bd_switchangel.wav",
+      "bd/11_bd_mot4i.wav",
+      "bd/12_bd_mot4i.wav",
+      "bd/13_bd_mot4i.wav",
+      "bd/14_bd_switchangel.wav",
+      "bd/15_bd_switchangel.wav",
+      "bd/16_bd_switchangel.wav",
+      "bd/17_bd_switchangel.wav"
+    ],
+    "brk": [
+      "brk/10_break_amen_pprocessed.wav"
+    ],
+    "cb": [
+      "cb/10_perc_switchangel.wav"
+    ],
+    "cp": [
+      "cp/10_cp_switchangel.wav",
+      "cp/11_cp_mot4i.wav"
+    ],
+    "cr": [
+      "cr/10_cr_switchangel.wav",
+      "cr/11_cr_mot4i.wav"
+    ],
+    "hh": [
+      "hh/10_hh_switchangel.wav",
+      "hh/11_hh_mot4i.wav",
+      "hh/12_hh_switchangel.wav",
+      "hh/13_hh_switchangel.wav",
+      "hh/14_hh_mot4i.wav"
+    ],
+    "ht": [
+      "ht/10_ht_mot4i.wav"
+    ],
+    "lt": [
+      "lt/10_lt_mot4i.wav"
+    ],
+    "misc": [
+      "misc/10_misc_switchangel_ludens.wav",
+      "misc/11_misc_switchangel_ludens.wav",
+      "misc/12_misc_switchangel_ludens.wav",
+      "misc/13_misc_switchangel_ludens.wav",
+      "misc/14_misc_switchangel_ludens.wav"
+    ],
+    "mt": [
+      "mt/10_mt_mot4i.wav"
+    ],
+    "oh": [
+      "oh/10_oh_switchangel.wav",
+      "oh/11_oh_switchangel.wav",
+      "oh/12_oh_switchangel.wav",
+      "oh/13_oh_switchangel.wav"
+    ],
+    "rd": [
+      "rd/10_rd_switchangel.wav"
+    ],
+    "rim": [
+      "rim/10_rim_switchangel.wav",
+      "rim/11_rim_switch_angel.wav"
+    ],
+    "sd": [
+      "sd/10_sd_switchangel-bounce-2.wav",
+      "sd/11_sd_switchangel_3.wav",
+      "sd/12_sd_switchangel_2.wav",
+      "sd/13_sd_switchangel_2.wav",
+      "sd/14_sd.wav"
+    ],
+    "sh": [
+      "sh/10_sh_switchangel.wav"
+    ],
+    "tb": [
+      "tb/10_tb.wav"
+    ]
+  }

website/src/repl/prebake.mjs

@@ -28,7 +28,7 @@ export async function prebake() {
       prebake: true,
       tag: 'drum-machines',
     }),
-    samples(`https://raw.githubusercontent.com/tidalcycles/uzu-drumkit/main/strudel.json`, undefined, {
+    samples(`${baseNoTrailing}/uzu-drumkit.json`, undefined, {
       prebake: true,
       tag: 'drum-machines',
     }),

website/src/user_pattern_utils.mjs

@@ -197,7 +197,7 @@ export async function importPatterns(fileList) {
       if (file.type === 'application/json') {
         const userPatterns = userPattern.getAll();
         setUserPatterns({ ...userPatterns, ...parseJSON(content) });
-      } else if (["text/x-markdown", 'text/plain'].includes(file.type)) {
+      } else if (['text/x-markdown', 'text/plain'].includes(file.type)) {
         const id = file.name.replace(/\.[^/.]+$/, '');
         userPattern.update(id, { code: content });
       }