Publish

- @strudel.cycles/csound@0.5.1
 - @strudel.cycles/eval@0.5.0
 - @strudel.cycles/midi@0.5.0
 - @strudel.cycles/mini@0.5.0
 - @strudel.cycles/react@0.5.0
 - @strudel.cycles/soundfonts@0.5.0
 - @strudel.cycles/tonal@0.5.0
 - @strudel.cycles/tone@0.5.0
 - @strudel.cycles/transpiler@0.5.0
 - @strudel.cycles/webaudio@0.5.0
 - @strudel.cycles/webdirt@0.5.0
 - @strudel.cycles/xen@0.5.0

.eslintignore

@@ -0,0 +1,14 @@
+krill-parser.js
+krill.pegjs
+.eslintrc.json
+server.js
+tidal-sniffer.js
+*.jsx
+tunejs.js
+out/**
+postcss.config.js
+postcss.config.cjs
+tailwind.config.js
+vite.config.js
+/**/dist/**/*
+!**/*.mjs

.eslintrc.json

@@ -0,0 +1,16 @@
+{
+  "env": {
+    "browser": true,
+    "es2021": true
+  },
+  "extends": ["eslint:recommended"],
+  "overrides": [],
+  "parserOptions": {
+    "ecmaVersion": "latest",
+    "sourceType": "module"
+  },
+  "plugins": [],
+  "rules": {
+    "no-unused-vars": ["warn", { "destructuredArrayIgnorePattern": ".", "ignoreRestSiblings": false }]
+  }
+}

.github/workflows/test.yml

@@ -7,13 +7,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node-version: [16, 17]
+        node-version: [18]
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-    - run: npm install
-    - run: npm test
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "npm"
+      - run: npm install
+      - run: npm run format-check
+      - run: npm run lint
+      - run: npm test

.prettierignore

@@ -0,0 +1,8 @@
+*.md
+*.json
+*.yml
+*.
+**/out
+**/dist
+packages/mini/krill-parser.js
+packages/xen/tunejs.js

.prettierrc

@@ -1,16 +1,15 @@
 {
-    "printWidth": 120,
-    "useTabs": false,
-    "tabWidth": 2,
-    "semi": true,
-    "singleQuote": true,
-    "jsxSingleQuote": false,
-    "trailingComma": "all",
-    "bracketSpacing": true,
-    "jsxBracketSameLine": false,
-    "arrowParens": "always",
-    "proseWrap": "preserve",
-    "htmlWhitespaceSensitivity": "css",
-    "endOfLine": "lf"
-  }
-  
+  "printWidth": 120,
+  "useTabs": false,
+  "tabWidth": 2,
+  "semi": true,
+  "singleQuote": true,
+  "jsxSingleQuote": false,
+  "trailingComma": "all",
+  "bracketSpacing": true,
+  "jsxBracketSameLine": false,
+  "arrowParens": "always",
+  "proseWrap": "preserve",
+  "htmlWhitespaceSensitivity": "css",
+  "endOfLine": "lf"
+}

jsdoc.config.json

@@ -1,7 +1,7 @@
 {
   "source": {
     "includePattern": ".+\\.(js(doc|x)?|mjs)$",
-    "excludePattern": "node_modules|shift-parser|shift-reducer|shift-traverser"
+    "excludePattern": "node_modules|shift-parser|shift-reducer|shift-traverser|dist"
   },
   "plugins": ["plugins/markdown"],
   "opts": {

package.json

@@ -4,19 +4,24 @@
   "private": true,
   "description": "Port of tidalcycles to javascript",
   "scripts": {
+    "pretest": "cd tutorial && npm run jsdoc-json",
     "test": "vitest run --version",
     "test-ui": "vitest --ui",
     "test-coverage": "vitest --coverage",
     "bootstrap": "lerna bootstrap",
     "setup": "npm i && npm run bootstrap && cd repl && npm i && cd ../tutorial && npm i",
-    "snapshot": "cd repl && npm run snapshot",
+    "snapshot": "vitest run -u --silent",
     "repl": "cd repl && npm run dev",
     "osc": "cd packages/osc && npm run server",
     "build": "rm -rf out && cd repl && npm run build && cd ../tutorial && npm run build",
     "preview": "npx serve ./out",
     "deploy": "NODE_DEBUG=gh-pages gh-pages -d out",
     "jsdoc": "jsdoc packages/ -c jsdoc.config.json",
-    "jsdoc-json": "jsdoc packages/ --template ./node_modules/jsdoc-json --destination doc.json -c jsdoc.config.json"
+    "jsdoc-json": "jsdoc packages/ --template ./node_modules/jsdoc-json --destination doc.json -c jsdoc.config.json",
+    "lint": "eslint . --ext mjs,js --quiet",
+    "codeformat": "prettier --write .",
+    "format-check": "prettier --check .",
+    "check": "npm run format-check && npm run lint && npm run test"
   },
   "workspaces": [
     "packages/*"
@@ -39,16 +44,17 @@
   },
   "homepage": "https://strudel.tidalcycles.org",
   "devDependencies": {
-    "@vitest/ui": "^0.21.1",
+    "@vitest/ui": "^0.25.7",
     "c8": "^7.12.0",
+    "eslint": "^8.28.0",
     "events": "^3.3.0",
     "gh-pages": "^4.0.0",
-    "happy-dom": "^6.0.4",
     "jsdoc": "^3.6.10",
     "jsdoc-json": "^2.0.2",
     "jsdoc-to-markdown": "^7.1.1",
     "lerna": "^4.0.0",
+    "prettier": "^2.8.1",
     "rollup-plugin-visualizer": "^5.8.1",
-    "vitest": "^0.21.1"
+    "vitest": "^0.25.7"
   }
 }

packages/core/.npmignore

@@ -0,0 +1 @@
+examples

packages/core/controls.mjs

@@ -40,11 +40,6 @@ const generic_params = [
    * @example
    * n("0 1 2 3").s('east').osc()
    */
-  // TODO: nOut does not work
-  // TODO: notes don't work as expected
-  // current "workaround" for notes:
-  // s('superpiano').n("<c0 d0 e0 g0>"._asNumber()).osc()
-  // -> .n or .osc (or .superdirt) would need to convert note strings to numbers
   // also see https://github.com/tidalcycles/strudel/pull/63
   ['f', 'n', 'The note or sample number to choose for a synth or sampleset'],
   ['f', 'note', 'The note or pitch to play a sound or synth with'],
@@ -100,6 +95,18 @@ const generic_params = [
     'attack',
     'a pattern of numbers to specify the attack time (in seconds) of an envelope applied to each sample.',
   ],
+
+  /**
+   * Select the sound bank to use. To be used together with `s`. The bank name (+ "_") will be prepended to the value of `s`.
+   *
+   * @name bank
+   * @param {string | Pattern} bank the name of the bank
+   * @example
+   * s("bd sd").bank('RolandTR909') // = s("RolandTR909_bd RolandTR909_sd")
+   *
+   */
+  ['f', 'bank', 'selects sound bank to use'],
+
   // TODO: find out how this works?
   /*
    * Envelope decay time = the time it takes after the attack time to reach the sustain level.
@@ -197,7 +204,7 @@ const generic_params = [
    * "c4 eb4 g4 bb4".legato("<0.125 .25 .5 .75 1 2 4>")
    *
    */
-  ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
+  // ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
   // ['f', 'clhatdecay', ''],
   /**
    * bit crusher effect.
@@ -393,7 +400,7 @@ const generic_params = [
    * @example
    * freq("220 110 440 110").s("superzow").osc()
    * @example
-   * freq("110".mulOut(".5 1.5 .6 [2 3]")).s("superzow").osc()
+   * freq("110".mul.out(".5 1.5 .6 [2 3]")).s("superzow").osc()
    *
    */
   ['f', 'freq', ''],
@@ -555,7 +562,7 @@ const generic_params = [
   // TODO: detune? https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
   ['f', 'semitone', ''],
   // TODO: dedup with synth param, see https://tidalcycles.org/docs/reference/synthesizers/#superpiano
-  ['f', 'velocity', ''],
+  // ['f', 'velocity', ''],
   ['f', 'voice', ''], // TODO: synth param
   /**
    * Sets the level of reverb.
@@ -780,6 +787,6 @@ controls.createParam = (name) => {
 };
 
 controls.createParams = (...names) =>
-  names.reduce((acc, name) => Object.assign(acc, { [name]: createParam(name) }), {});
+  names.reduce((acc, name) => Object.assign(acc, { [name]: controls.createParam(name) }), {});
 
 export default controls;

packages/core/cyclist.mjs

@@ -0,0 +1,87 @@
+/*
+cyclist.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/cyclist.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 createClock from './zyklus.mjs';
+import { logger } from './logger.mjs';
+
+export class Cyclist {
+  worker;
+  pattern;
+  started = false;
+  cps = 1; // TODO
+  getTime;
+  phase = 0;
+  constructor({ interval, onTrigger, onToggle, onError, getTime, latency = 0.1 }) {
+    this.getTime = getTime;
+    this.onToggle = onToggle;
+    this.latency = latency;
+    const round = (x) => Math.round(x * 1000) / 1000;
+    this.clock = createClock(
+      getTime,
+      (phase, duration, tick) => {
+        if (tick === 0) {
+          this.origin = phase;
+        }
+        const begin = round(phase - this.origin);
+        this.phase = begin - latency;
+        const end = round(begin + duration);
+        const time = getTime();
+        try {
+          const haps = this.pattern.queryArc(begin, end); // get Haps
+          haps.forEach((hap) => {
+            if (hap.part.begin.equals(hap.whole.begin)) {
+              const deadline = hap.whole.begin + this.origin - time + latency;
+              const duration = hap.duration * 1;
+              onTrigger?.(hap, deadline, duration);
+            }
+          });
+        } catch (e) {
+          logger(`[cyclist] error: ${e.message}`);
+          onError?.(e);
+        }
+      }, // called slightly before each cycle
+      interval, // duration of each cycle
+    );
+  }
+  getPhase() {
+    return this.getTime() - this.origin - this.latency;
+  }
+  setStarted(v) {
+    this.started = v;
+    this.onToggle?.(v);
+  }
+  start() {
+    if (!this.pattern) {
+      throw new Error('Scheduler: no pattern set! call .setPattern first.');
+    }
+    logger('[cyclist] start');
+    this.clock.start();
+    this.setStarted(true);
+  }
+  pause() {
+    logger('[cyclist] pause');
+    this.clock.pause();
+    this.setStarted(false);
+  }
+  stop() {
+    logger('[cyclist] stop');
+    this.clock.stop();
+    this.setStarted(false);
+  }
+  setPattern(pat, autostart = false) {
+    this.pattern = pat;
+    if (autostart && !this.started) {
+      this.start();
+    }
+  }
+  setCps(cps = 1) {
+    this.cps = cps;
+  }
+  log(begin, end, haps) {
+    const onsets = haps.filter((h) => h.hasOnset());
+    console.log(`${begin.toFixed(4)} - ${end.toFixed(4)} ${Array(onsets.length).fill('I').join('')}`);
+  }
+}

packages/core/draw.mjs

@@ -4,8 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Tone } from './tone.mjs';
-import { Pattern } from '@strudel.cycles/core';
+import { Pattern, getTime, State, TimeSpan } from './index.mjs';
 
 export const getDrawContext = (id = 'test-canvas') => {
   let canvas = document.querySelector('#' + id);
@@ -28,7 +27,7 @@ Pattern.prototype.draw = function (callback, { from, to, onQuery }) {
   let cycle,
     events = [];
   const animate = (time) => {
-    const t = Tone.getTransport().seconds;
+    const t = getTime();
     if (from !== undefined && to !== undefined) {
       const currentCycle = Math.floor(t);
       if (cycle !== currentCycle) {
@@ -50,9 +49,9 @@ Pattern.prototype.draw = function (callback, { from, to, onQuery }) {
   return this;
 };
 
-export const cleanupDraw = () => {
+export const cleanupDraw = (clearScreen = true) => {
   const ctx = getDrawContext();
-  ctx.clearRect(0, 0, window.innerWidth, window.innerHeight);
+  clearScreen && ctx.clearRect(0, 0, window.innerWidth, window.innerHeight);
   if (window.strudelAnimation) {
     cancelAnimationFrame(window.strudelAnimation);
   }

packages/core/drawLine.mjs

@@ -21,6 +21,7 @@ import Fraction, { gcd } from './fraction.mjs';
  * @example
  * const line = drawLine("0 [1 2 3]", 10); // |0--123|0--123
  * console.log(line);
+ * silence;
  */
 function drawLine(pat, chars = 60) {
   let cycle = 0;

packages/core/evaluate.mjs

@@ -0,0 +1,53 @@
+/*
+evaluate.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/eval/evaluate.mjs>
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+import { isPattern } from './index.mjs';
+
+let scoped = false;
+export const evalScope = async (...args) => {
+  if (scoped) {
+    console.warn('evalScope was called more than once.');
+  }
+  scoped = true;
+  const results = await Promise.allSettled(args);
+  const modules = results.filter((result) => result.status === 'fulfilled').map((r) => r.value);
+  results.forEach((result, i) => {
+    if (result.status === 'rejected') {
+      console.warn(`evalScope: module with index ${i} could not be loaded:`, result.reason);
+    }
+  });
+  Object.assign(globalThis, ...modules);
+};
+
+function safeEval(str, options = {}) {
+  const { wrapExpression = true, wrapAsync = true } = options;
+  if (wrapExpression) {
+    str = `{${str}}`;
+  }
+  if (wrapAsync) {
+    str = `(async ()=>${str})()`;
+  }
+  const body = `"use strict";return (${str})`;
+  return Function(body)();
+}
+
+export const evaluate = async (code, transpiler) => {
+  if (!scoped) {
+    await evalScope(); // at least scope Pattern.prototype.boostrap
+  }
+  if (transpiler) {
+    code = transpiler(code); // transform syntactically correct js code to semantically usable code
+  }
+  // if no transpiler is given, we expect a single instruction (!wrapExpression)
+  const options = { wrapExpression: !!transpiler };
+  let evaluated = await safeEval(code, options);
+  if (!isPattern(evaluated)) {
+    console.log('evaluated', evaluated);
+    const message = `got "${typeof evaluated}" instead of pattern`;
+    throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
+  }
+  return { mode: 'javascript', pattern: evaluated };
+};

packages/core/examples/repl.html

@@ -0,0 +1,90 @@
+<div style="position: absolute; bottom: 0; right: 0; padding: 4px; width: 100vw; display: flex">
+  <button id="start" style="font-size: 2em">start</button>
+  <button id="stop" style="font-size: 2em">stop</button>
+  <button id="slower" style="font-size: 2em">slower</button>
+  <button id="faster" style="font-size: 2em">faster</button>
+</div>
+<textarea
+  style="font-size: 2em; background: #052b49; color: #fff; height: 100%; width: 100%; outline: none; border: 0"
+  id="text"
+  spellcheck="false"
+>
+Loading...</textarea
+>
+<script type="module">
+  document.body.style = 'margin: 0';
+  import * as strudel from '@strudel.cycles/core';
+
+  const { cat, State, TimeSpan, Scheduler, getPlayableNoteValue, getFreq } = strudel;
+  Object.assign(window, strudel); // add strudel to eval scope
+
+  const ctx = new AudioContext();
+  const scheduler = new Scheduler({
+    // audioContext: getAudioContext(),
+    interval: 0.1,
+    onTrigger: (hap, time, duration) => {
+      const freq = getFrequency(hap);
+      const osc = ctx.createOscillator();
+      const gain = 0.2;
+      osc.frequency.value = freq;
+      osc.type = 'triangle';
+      const onset = ctx.currentTime + time;
+      const offset = onset + duration;
+      const attack = 0.05;
+      const release = 0.05;
+      osc.start(onset);
+      osc.stop(offset + release);
+
+      const g = ctx.createGain();
+      g.gain.setValueAtTime(gain, onset);
+      g.gain.linearRampToValueAtTime(gain, onset + attack);
+      g.gain.setValueAtTime(gain, offset - release);
+      g.gain.linearRampToValueAtTime(0, offset);
+      osc.connect(g);
+      g.connect(ctx.destination);
+    },
+  });
+
+  let initialCode = `stack('c4','e4',cat('g4','a4','b4','a4'))
+.add(cat(0,1,2,3,4,3,2,1).slow(8))
+.fast(2)
+.cps(tri.range(1,8).slow(32))`;
+
+  try {
+    const base64 = decodeURIComponent(window.location.href.split('#')[1]);
+    initialCode = atob(base64);
+  } catch (err) {
+    console.warn('failed to decode', err);
+  }
+  const input = document.getElementById('text');
+  input.value = initialCode;
+  const evaluate = () => {
+    try {
+      const pattern = eval(input.value);
+      scheduler.setPattern(pattern);
+      window.location.hash = '#' + encodeURIComponent(btoa(input.value)); // update url hash
+    } catch (err) {
+      console.warn(err);
+    }
+  };
+  evaluate();
+  input.addEventListener('input', () => evaluate());
+  document.getElementById('start').addEventListener('click', async () => {
+    await ctx.resume();
+    scheduler.start();
+  });
+  document.getElementById('stop').addEventListener('click', () => scheduler.stop());
+  document.getElementById('slower').addEventListener('click', () => scheduler.setCps(scheduler.cps - 0.1));
+  document.getElementById('faster').addEventListener('click', () => scheduler.setCps(scheduler.cps + 0.1));
+</script>
+<!--
+  sequence(1,2).mul(55/2) // frequencies
+  .mul(slowcat(1,2))
+  .mul(slowcat(1,3/2,4/3,5/3).slow(8))
+  .fast(3)
+  .freq()
+  .velocity(.5)
+  .s('sawtooth')
+  .cutoff(800)
+  .out()
+-->

packages/core/examples/scheduled.html

@@ -0,0 +1,44 @@
+<input
+  type="text"
+  id="text"
+  value="seq('c3','eb3','g3').note().s('sawtooth').out()"
+  style="width: 100%; font-size: 2em; outline: none; margin-bottom: 10px"
+  spellcheck="false"
+/>
+<button id="start">play</button>
+<div id="output"></div>
+<script type="module">
+  const strudel = await import('https://cdn.skypack.dev/@strudel.cycles/core@latest');
+
+  const controls = await import('https://cdn.skypack.dev/@strudel.cycles/core@latest/controls.mjs');
+  const { getAudioContext, Scheduler } = await import('https://cdn.skypack.dev/@strudel.cycles/webaudio@latest');
+  let scheduler;
+
+  const audioContext = getAudioContext();
+  const latency = 0.2;
+
+  Object.assign(window, strudel);
+  Object.assign(window, controls.default);
+  scheduler = new Scheduler({
+    audioContext,
+    interval: 0.1,
+    latency,
+    onEvent: (hap) => {
+      if (!hap.context.onTrigger) {
+        console.warn('no output chosen. use one of .out() .webdirt() .osc()');
+      }
+    },
+  });
+  let started;
+  document.getElementById('start').addEventListener('click', async () => {
+    const code = document.getElementById('text').value;
+    const pattern = eval(code);
+    const events = pattern._firstCycleValues;
+    console.log(code, '->', events);
+    scheduler.setPattern(pattern);
+    if (!started) {
+      scheduler.start();
+      started = true;
+    }
+  });
+</script>

packages/core/examples/vanilla.html

@@ -0,0 +1,96 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Buildless Vanilla Strudel REPL</title>
+  </head>
+  <body style="margin: 0; background: #222">
+    <div style="display: grid; height: 100vh">
+      <textarea
+        id="text"
+        style="font-size: 2em; border: 0; color: white; background: transparent; outline: none; padding: 20px"
+        spellcheck="false"
+      ></textarea>
+    </div>
+    <button
+      id="start"
+      style="
+        position: absolute;
+        border-radius: 10px;
+        top: 20px;
+        right: 20px;
+        padding: 20px;
+        border: 2px solid white;
+        background: transparent;
+        color: white;
+        cursor: pointer;
+      "
+    >
+      evaluate
+    </button>
+    <div id="output"></div>
+    <script type="module">
+      import { controls, repl, evalScope } from 'https://cdn.skypack.dev/@strudel.cycles/core@0.3.2';
+      import { mini } from 'https://cdn.skypack.dev/@strudel.cycles/mini@0.3.2';
+      import { transpiler } from 'https://cdn.skypack.dev/@strudel.cycles/transpiler@0.3.2';
+      import { getAudioContext, webaudioOutput } from 'https://cdn.skypack.dev/@strudel.cycles/webaudio@0.3.3';
+
+      const ctx = getAudioContext();
+      const input = document.getElementById('text');
+      input.innerHTML = getTune();
+
+      evalScope(
+        controls,
+        import('https://cdn.skypack.dev/@strudel.cycles/core@0.3.2'),
+        import('https://cdn.skypack.dev/@strudel.cycles/mini@0.3.2'),
+        import('https://cdn.skypack.dev/@strudel.cycles/tonal@0.3.3'),
+        import('https://cdn.skypack.dev/@strudel.cycles/webaudio@0.3.3'),
+      );
+
+      const { evaluate } = repl({
+        defaultOutput: webaudioOutput,
+        getTime: () => ctx.currentTime,
+        transpiler,
+      });
+      document.getElementById('start').addEventListener('click', () => {
+        ctx.resume();
+        evaluate(input.value);
+      });
+
+      function getTune() {
+        return `await samples('github:tidalcycles/Dirt-Samples/master')
+
+stack(
+  // amen
+  n("0 1 2 3 4 5 6 7")
+  .sometimes(x=>x.ply(2))
+  .rarely(x=>x.speed("2 | -2"))
+  .sometimesBy(.4, x=>x.delay(".5"))
+  .s("amencutup")
+  .slow(2)
+  .room(.5)
+  ,
+  // bass
+  sine.add(saw.slow(4)).range(0,7).segment(8)
+  .superimpose(x=>x.add(.1))
+  .scale('G0 minor').note()
+  .s("sawtooth").decay(.1).sustain(0)
+  .gain(.4).cutoff(perlin.range(300,3000).slow(8)).resonance(10)
+  .degradeBy("0 0.1 .5 .1")
+  .rarely(add(note("12")))
+  ,
+  // chord
+  note("Bb3,D4".superimpose(x=>x.add(.2)))
+  .s('sawtooth').cutoff(1000).struct("<~@3 [~ x]>")
+  .decay(.05).sustain(.0).delay(.8).delaytime(.125).room(.8)
+  ,
+  // alien
+  s("breath").room(1).shape(.6).chop(16).rev().mask("<x ~@7>")
+  ,
+  n("0 1").s("east").delay(.5).degradeBy(.8).speed(rand.range(.5,1.5))
+).reset("<x@7 x(5,8)>")`;
+      }
+    </script>
+  </body>
+</html>

packages/core/examples/vite-vanilla-repl/.gitignore

@@ -0,0 +1 @@
+!dist

packages/core/examples/vite-vanilla-repl/README.md

@@ -0,0 +1,10 @@
+# vite-vanilla-repl
+
+This folder demonstrates how to set up a strudel repl using vite and vanilla JS. Run it using:
+
+```sh
+npm i
+npm run dev
+```
+
+or view it [live on githack](https://rawcdn.githack.com/tidalcycles/strudel/5fb36acb046ead7cd6ad3cd10f532e7f585f536a/packages/core/examples/vite-vanilla-repl/dist/index.html)

packages/core/examples/vite-vanilla-repl/dist/assets/index.211bbc68.js

@@ -0,0 +1 @@
+import{b as s,h as i,m,a as n,c as p,p as t}from"./index.4cbc0a10.js";export{s as SyntaxError,i as h,m as mini,n as minify,p as parse,t as patternifyAST};

packages/core/examples/vite-vanilla-repl/dist/assets/index.ecddf978.js

@@ -0,0 +1 @@
+import{g as s,f as d,i as t,n as r,l as u,j as o,d as f,k as p,r as g,s as i,w as l,e as m}from"./index.4cbc0a10.js";export{s as getAudioContext,d as getCachedBuffer,t as getLoadedBuffer,r as getLoadedSamples,u as loadBuffer,o as loadGithubSamples,f as panic,p as resetLoadedSamples,g as reverseBuffer,i as samples,l as webaudioOutput,m as webaudioOutputTrigger};

packages/core/examples/vite-vanilla-repl/dist/index.html

@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite Vanilla Strudel REPL</title>
+    <script type="module" crossorigin src="/tidalcycles/strudel/use-acorn/packages/core/examples/vite-vanilla-repl/dist/assets/index.4cbc0a10.js"></script>
+  </head>
+  <body style="margin: 0; background: #222">
+    <div style="display: grid; height: 100vh">
+      <textarea
+        id="text"
+        style="font-size: 2em; border: 0; color: white; background: transparent; outline: none; padding: 20px"
+        spellcheck="false"
+      ></textarea>
+    </div>
+    <button
+      id="start"
+      style="
+        position: absolute;
+        border-radius: 10px;
+        top: 20px;
+        right: 20px;
+        padding: 20px;
+        border: 2px solid white;
+        background: transparent;
+        color: white;
+        cursor: pointer;
+      "
+    >
+      evaluate
+    </button>
+    <div id="output"></div>
+    
+  </body>
+</html>

packages/core/examples/vite-vanilla-repl/index.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite Vanilla Strudel REPL</title>
+  </head>
+  <body style="margin: 0; background: #222">
+    <div style="display: grid; height: 100vh">
+      <textarea
+        id="text"
+        style="font-size: 2em; border: 0; color: white; background: transparent; outline: none; padding: 20px"
+        spellcheck="false"
+      ></textarea>
+    </div>
+    <button
+      id="start"
+      style="
+        position: absolute;
+        border-radius: 10px;
+        top: 20px;
+        right: 20px;
+        padding: 20px;
+        border: 2px solid white;
+        background: transparent;
+        color: white;
+        cursor: pointer;
+      "
+    >
+      evaluate
+    </button>
+    <div id="output"></div>
+    <script type="module" src="./main.js"></script>
+  </body>
+</html>

packages/core/examples/vite-vanilla-repl/main.js

@@ -0,0 +1,29 @@
+import { controls, repl, evalScope, setStringParser } from '@strudel.cycles/core';
+import { mini } from '@strudel.cycles/mini';
+import { getAudioContext, webaudioOutput } from '@strudel.cycles/webaudio';
+// import { transpiler } from '@strudel.cycles/transpiler';
+import tune from './tune.mjs';
+
+const ctx = getAudioContext();
+const input = document.getElementById('text');
+input.innerHTML = tune;
+
+evalScope(
+  controls,
+  import('@strudel.cycles/core'),
+  import('@strudel.cycles/mini'),
+  import('@strudel.cycles/webaudio'),
+  import('@strudel.cycles/tonal'),
+);
+
+setStringParser(mini);
+
+const { evaluate } = repl({
+  defaultOutput: webaudioOutput,
+  getTime: () => ctx.currentTime,
+  // transpiler,
+});
+document.getElementById('start').addEventListener('click', () => {
+  ctx.resume();
+  evaluate(input.value);
+});

packages/core/examples/vite-vanilla-repl/package-lock.json

@@ -0,0 +1,885 @@
+{
+  "name": "vite-vanilla-repl",
+  "version": "0.0.0",
+  "lockfileVersion": 2,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "vite-vanilla-repl",
+      "version": "0.0.0",
+      "devDependencies": {
+        "vite": "^3.2.0"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.13.tgz",
+      "integrity": "sha512-RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.13.tgz",
+      "integrity": "sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.13.tgz",
+      "integrity": "sha512-Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ==",
+      "dev": true,
+      "hasInstallScript": true,
+      "bin": {
+        "esbuild": "bin/esbuild"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "optionalDependencies": {
+        "@esbuild/android-arm": "0.15.13",
+        "@esbuild/linux-loong64": "0.15.13",
+        "esbuild-android-64": "0.15.13",
+        "esbuild-android-arm64": "0.15.13",
+        "esbuild-darwin-64": "0.15.13",
+        "esbuild-darwin-arm64": "0.15.13",
+        "esbuild-freebsd-64": "0.15.13",
+        "esbuild-freebsd-arm64": "0.15.13",
+        "esbuild-linux-32": "0.15.13",
+        "esbuild-linux-64": "0.15.13",
+        "esbuild-linux-arm": "0.15.13",
+        "esbuild-linux-arm64": "0.15.13",
+        "esbuild-linux-mips64le": "0.15.13",
+        "esbuild-linux-ppc64le": "0.15.13",
+        "esbuild-linux-riscv64": "0.15.13",
+        "esbuild-linux-s390x": "0.15.13",
+        "esbuild-netbsd-64": "0.15.13",
+        "esbuild-openbsd-64": "0.15.13",
+        "esbuild-sunos-64": "0.15.13",
+        "esbuild-windows-32": "0.15.13",
+        "esbuild-windows-64": "0.15.13",
+        "esbuild-windows-arm64": "0.15.13"
+      }
+    },
+    "node_modules/esbuild-android-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.13.tgz",
+      "integrity": "sha512-yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-android-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.13.tgz",
+      "integrity": "sha512-TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.13.tgz",
+      "integrity": "sha512-WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-darwin-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.13.tgz",
+      "integrity": "sha512-U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.13.tgz",
+      "integrity": "sha512-whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-freebsd-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.13.tgz",
+      "integrity": "sha512-6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-32": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.13.tgz",
+      "integrity": "sha512-VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.13.tgz",
+      "integrity": "sha512-rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.13.tgz",
+      "integrity": "sha512-Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.13.tgz",
+      "integrity": "sha512-alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-mips64le": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.13.tgz",
+      "integrity": "sha512-47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-ppc64le": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.13.tgz",
+      "integrity": "sha512-z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-riscv64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.13.tgz",
+      "integrity": "sha512-+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-linux-s390x": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.13.tgz",
+      "integrity": "sha512-BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-netbsd-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.13.tgz",
+      "integrity": "sha512-EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-openbsd-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.13.tgz",
+      "integrity": "sha512-nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-sunos-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.13.tgz",
+      "integrity": "sha512-jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-32": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.13.tgz",
+      "integrity": "sha512-XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.13.tgz",
+      "integrity": "sha512-Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/esbuild-windows-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.13.tgz",
+      "integrity": "sha512-3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "node_modules/has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "dependencies": {
+        "function-bind": "^1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "dependencies": {
+        "has": "^1.0.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "dev": true,
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "node_modules/picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "node_modules/postcss": {
+      "version": "8.4.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
+      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "dependencies": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/rollup": {
+      "version": "2.79.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+      "dev": true,
+      "bin": {
+        "rollup": "dist/bin/rollup"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "node_modules/source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/vite": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.2.tgz",
+      "integrity": "sha512-pLrhatFFOWO9kS19bQ658CnRYzv0WLbsPih6R+iFeEEhDOuYgYCX2rztUViMz/uy/V8cLCJvLFeiOK7RJEzHcw==",
+      "dev": true,
+      "dependencies": {
+        "esbuild": "^0.15.9",
+        "postcss": "^8.4.18",
+        "resolve": "^1.22.1",
+        "rollup": "^2.79.1"
+      },
+      "bin": {
+        "vite": "bin/vite.js"
+      },
+      "engines": {
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.2"
+      },
+      "peerDependencies": {
+        "less": "*",
+        "sass": "*",
+        "stylus": "*",
+        "sugarss": "*",
+        "terser": "^5.4.0"
+      },
+      "peerDependenciesMeta": {
+        "less": {
+          "optional": true
+        },
+        "sass": {
+          "optional": true
+        },
+        "stylus": {
+          "optional": true
+        },
+        "sugarss": {
+          "optional": true
+        },
+        "terser": {
+          "optional": true
+        }
+      }
+    }
+  },
+  "dependencies": {
+    "@esbuild/android-arm": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.13.tgz",
+      "integrity": "sha512-RY2fVI8O0iFUNvZirXaQ1vMvK0xhCcl0gqRj74Z6yEiO1zAUa7hbsdwZM1kzqbxHK7LFyMizipfXT3JME+12Hw==",
+      "dev": true,
+      "optional": true
+    },
+    "@esbuild/linux-loong64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.13.tgz",
+      "integrity": "sha512-+BoyIm4I8uJmH/QDIH0fu7MG0AEx9OXEDXnqptXCwKOlOqZiS4iraH1Nr7/ObLMokW3sOCeBNyD68ATcV9b9Ag==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.13.tgz",
+      "integrity": "sha512-Cu3SC84oyzzhrK/YyN4iEVy2jZu5t2fz66HEOShHURcjSkOSAVL8C/gfUT+lDJxkVHpg8GZ10DD0rMHRPqMFaQ==",
+      "dev": true,
+      "requires": {
+        "@esbuild/android-arm": "0.15.13",
+        "@esbuild/linux-loong64": "0.15.13",
+        "esbuild-android-64": "0.15.13",
+        "esbuild-android-arm64": "0.15.13",
+        "esbuild-darwin-64": "0.15.13",
+        "esbuild-darwin-arm64": "0.15.13",
+        "esbuild-freebsd-64": "0.15.13",
+        "esbuild-freebsd-arm64": "0.15.13",
+        "esbuild-linux-32": "0.15.13",
+        "esbuild-linux-64": "0.15.13",
+        "esbuild-linux-arm": "0.15.13",
+        "esbuild-linux-arm64": "0.15.13",
+        "esbuild-linux-mips64le": "0.15.13",
+        "esbuild-linux-ppc64le": "0.15.13",
+        "esbuild-linux-riscv64": "0.15.13",
+        "esbuild-linux-s390x": "0.15.13",
+        "esbuild-netbsd-64": "0.15.13",
+        "esbuild-openbsd-64": "0.15.13",
+        "esbuild-sunos-64": "0.15.13",
+        "esbuild-windows-32": "0.15.13",
+        "esbuild-windows-64": "0.15.13",
+        "esbuild-windows-arm64": "0.15.13"
+      }
+    },
+    "esbuild-android-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.13.tgz",
+      "integrity": "sha512-yRorukXBlokwTip+Sy4MYskLhJsO0Kn0/Fj43s1krVblfwP+hMD37a4Wmg139GEsMLl+vh8WXp2mq/cTA9J97g==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-android-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.13.tgz",
+      "integrity": "sha512-TKzyymLD6PiVeyYa4c5wdPw87BeAiTXNtK6amWUcXZxkV51gOk5u5qzmDaYSwiWeecSNHamFsaFjLoi32QR5/w==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-darwin-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.13.tgz",
+      "integrity": "sha512-WAx7c2DaOS6CrRcoYCgXgkXDliLnFv3pQLV6GeW1YcGEZq2Gnl8s9Pg7ahValZkpOa0iE/ojRVQ87sbUhF1Cbg==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-darwin-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.13.tgz",
+      "integrity": "sha512-U6jFsPfSSxC3V1CLiQqwvDuj3GGrtQNB3P3nNC3+q99EKf94UGpsG9l4CQ83zBs1NHrk1rtCSYT0+KfK5LsD8A==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.13.tgz",
+      "integrity": "sha512-whItJgDiOXaDG/idy75qqevIpZjnReZkMGCgQaBWZuKHoElDJC1rh7MpoUgupMcdfOd+PgdEwNQW9DAE6i8wyA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-freebsd-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.13.tgz",
+      "integrity": "sha512-6pCSWt8mLUbPtygv7cufV0sZLeylaMwS5Fznj6Rsx9G2AJJsAjQ9ifA+0rQEIg7DwJmi9it+WjzNTEAzzdoM3Q==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-32": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.13.tgz",
+      "integrity": "sha512-VbZdWOEdrJiYApm2kkxoTOgsoCO1krBZ3quHdYk3g3ivWaMwNIVPIfEE0f0XQQ0u5pJtBsnk2/7OPiCFIPOe/w==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.13.tgz",
+      "integrity": "sha512-rXmnArVNio6yANSqDQlIO4WiP+Cv7+9EuAHNnag7rByAqFVuRusLbGi2697A5dFPNXoO//IiogVwi3AdcfPC6A==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.13.tgz",
+      "integrity": "sha512-Ac6LpfmJO8WhCMQmO253xX2IU2B3wPDbl4IvR0hnqcPrdfCaUa2j/lLMGTjmQ4W5JsJIdHEdW12dG8lFS0MbxQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.13.tgz",
+      "integrity": "sha512-alEMGU4Z+d17U7KQQw2IV8tQycO6T+rOrgW8OS22Ua25x6kHxoG6Ngry6Aq6uranC+pNWNMB6aHFPh7aTQdORQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-mips64le": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.13.tgz",
+      "integrity": "sha512-47PgmyYEu+yN5rD/MbwS6DxP2FSGPo4Uxg5LwIdxTiyGC2XKwHhHyW7YYEDlSuXLQXEdTO7mYe8zQ74czP7W8A==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-ppc64le": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.13.tgz",
+      "integrity": "sha512-z6n28h2+PC1Ayle9DjKoBRcx/4cxHoOa2e689e2aDJSaKug3jXcQw7mM+GLg+9ydYoNzj8QxNL8ihOv/OnezhA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-riscv64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.13.tgz",
+      "integrity": "sha512-+Lu4zuuXuQhgLUGyZloWCqTslcCAjMZH1k3Xc9MSEJEpEFdpsSU0sRDXAnk18FKOfEjhu4YMGaykx9xjtpA6ow==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-linux-s390x": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.13.tgz",
+      "integrity": "sha512-BMeXRljruf7J0TMxD5CIXS65y7puiZkAh+s4XFV9qy16SxOuMhxhVIXYLnbdfLrsYGFzx7U9mcdpFWkkvy/Uag==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-netbsd-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.13.tgz",
+      "integrity": "sha512-EHj9QZOTel581JPj7UO3xYbltFTYnHy+SIqJVq6yd3KkCrsHRbapiPb0Lx3EOOtybBEE9EyqbmfW1NlSDsSzvQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-openbsd-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.13.tgz",
+      "integrity": "sha512-nkuDlIjF/sfUhfx8SKq0+U+Fgx5K9JcPq1mUodnxI0x4kBdCv46rOGWbuJ6eof2n3wdoCLccOoJAbg9ba/bT2w==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-sunos-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.13.tgz",
+      "integrity": "sha512-jVeu2GfxZQ++6lRdY43CS0Tm/r4WuQQ0Pdsrxbw+aOrHQPHV0+LNOLnvbN28M7BSUGnJnHkHm2HozGgNGyeIRw==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-32": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.13.tgz",
+      "integrity": "sha512-XoF2iBf0wnqo16SDq+aDGi/+QbaLFpkiRarPVssMh9KYbFNCqPLlGAWwDvxEVz+ywX6Si37J2AKm+AXq1kC0JA==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.13.tgz",
+      "integrity": "sha512-Et6htEfGycjDrtqb2ng6nT+baesZPYQIW+HUEHK4D1ncggNrDNk3yoboYQ5KtiVrw/JaDMNttz8rrPubV/fvPQ==",
+      "dev": true,
+      "optional": true
+    },
+    "esbuild-windows-arm64": {
+      "version": "0.15.13",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.13.tgz",
+      "integrity": "sha512-3bv7tqntThQC9SWLRouMDmZnlOukBhOCTlkzNqzGCmrkCJI7io5LLjwJBOVY6kOUlIvdxbooNZwjtBvj+7uuVg==",
+      "dev": true,
+      "optional": true
+    },
+    "fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "optional": true
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "dev": true
+    },
+    "has": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+      "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+      "dev": true,
+      "requires": {
+        "function-bind": "^1.1.1"
+      }
+    },
+    "is-core-module": {
+      "version": "2.11.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.11.0.tgz",
+      "integrity": "sha512-RRjxlvLDkD1YJwDbroBHMb+cukurkDWNyHx7D3oNB5x9rb5ogcksMC5wHCadcXoo67gVr/+3GFySh3134zi6rw==",
+      "dev": true,
+      "requires": {
+        "has": "^1.0.3"
+      }
+    },
+    "nanoid": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "dev": true
+    },
+    "path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true
+    },
+    "picocolors": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
+      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
+      "dev": true
+    },
+    "postcss": {
+      "version": "8.4.18",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.18.tgz",
+      "integrity": "sha512-Wi8mWhncLJm11GATDaQKobXSNEYGUHeQLiQqDFG1qQ5UTDPTEvKw0Xt5NsTpktGTwLps3ByrWsBrG0rB8YQ9oA==",
+      "dev": true,
+      "requires": {
+        "nanoid": "^3.3.4",
+        "picocolors": "^1.0.0",
+        "source-map-js": "^1.0.2"
+      }
+    },
+    "resolve": {
+      "version": "1.22.1",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz",
+      "integrity": "sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
+      "dev": true,
+      "requires": {
+        "is-core-module": "^2.9.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      }
+    },
+    "rollup": {
+      "version": "2.79.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
+      "dev": true,
+      "requires": {
+        "fsevents": "~2.3.2"
+      }
+    },
+    "source-map-js": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
+      "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==",
+      "dev": true
+    },
+    "supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true
+    },
+    "vite": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.2.tgz",
+      "integrity": "sha512-pLrhatFFOWO9kS19bQ658CnRYzv0WLbsPih6R+iFeEEhDOuYgYCX2rztUViMz/uy/V8cLCJvLFeiOK7RJEzHcw==",
+      "dev": true,
+      "requires": {
+        "esbuild": "^0.15.9",
+        "fsevents": "~2.3.2",
+        "postcss": "^8.4.18",
+        "resolve": "^1.22.1",
+        "rollup": "^2.79.1"
+      }
+    }
+  }
+}

packages/core/examples/vite-vanilla-repl/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "vite-vanilla-repl",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build-githack": "vite build --base /tidalcycles/strudel/use-acorn/packages/core/examples/vite-vanilla-repl/dist/",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "vite": "^3.2.0"
+  }
+}

packages/core/examples/vite-vanilla-repl/tune.mjs

@@ -0,0 +1,39 @@
+/* export default `await samples('github:tidalcycles/Dirt-Samples/master')
+
+stack(
+  // amen
+  n("0 1 2 3 4 5 6 7")
+  .sometimes(x=>x.ply(2))
+  .rarely(x=>x.speed("2 | -2"))
+  .sometimesBy(.4, x=>x.delay(".5"))
+  .s("amencutup")
+  .slow(2)
+  .room(.5)
+  ,
+  // bass
+  sine.add(saw.slow(4)).range(0,7).segment(8)
+  .superimpose(x=>x.add(.1))
+  .scale('G0 minor').note()
+  .s("sawtooth").decay(.1).sustain(0)
+  .gain(.4).cutoff(perlin.range(300,3000).slow(8)).resonance(10)
+  .degradeBy("0 0.1 .5 .1")
+  .rarely(add(note("12")))
+  ,
+  // chord
+  note("Bb3,D4".superimpose(x=>x.add(.2)))
+  .s('sawtooth').cutoff(1000).struct("<~@3 [~ x]>")
+  .decay(.05).sustain(.0).delay(.8).delaytime(.125).room(.8)
+  ,
+  // alien
+  s("breath").room(1).shape(.6).chop(16).rev().mask("<x ~@7>")
+  ,
+  n("0 1").s("east").delay(.5).degradeBy(.8).speed(rand.range(.5,1.5))
+).reset("<x@7 x(5,8)>")`;
+ */
+
+export default `stack(
+  n("c3 [eb3,g3]")
+  .delay("<0 .5>")
+  .delaytime(".16 | .33")
+  .delayfeedback(".6 | .8")
+).sometimes(x=>x.speed("-1"))`;

packages/core/examples/without-audio.html

@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Buildless Vanilla Strudel REPL</title>
+  </head>
+  <body style="margin: 0; background: #222">
+    <div style="display: grid; height: 100vh">
+      <textarea
+        id="text"
+        style="font-size: 2em; border: 0; color: white; background: transparent; outline: none; padding: 20px"
+        spellcheck="false"
+      >
+// LOADING</textarea
+      >
+    </div>
+    <button
+      id="start"
+      style="
+        position: absolute;
+        border-radius: 10px;
+        top: 20px;
+        right: 20px;
+        padding: 20px;
+        border: 2px solid white;
+        background: transparent;
+        color: white;
+        cursor: pointer;
+      "
+    >
+      evaluate
+    </button>
+    <div id="output"></div>
+    <script type="module">
+      import { controls, repl, evalScope } from 'https://cdn.skypack.dev/@strudel.cycles/core@0.4.1';
+      import { transpiler } from 'https://cdn.skypack.dev/@strudel.cycles/transpiler@0.4.1';
+
+      const modules = [
+        import('https://cdn.skypack.dev/@strudel.cycles/core@0.4.1'),
+        import('https://cdn.skypack.dev/@strudel.cycles/mini@0.4.1'),
+      ];
+
+      const input = document.getElementById('text');
+
+      Promise.all(modules).then(() => {
+        input.innerHTML = `note("<c3 [d3 e3]>").cutoff(1000)`;
+        document.getElementById('start').addEventListener('click', () => {
+          evaluate(input.value);
+        });
+      });
+      evalScope(controls, ...modules);
+
+      const { evaluate } = repl({
+        defaultOutput: (hap, deadline, duration) => {
+          console.log(deadline, duration, hap.value);
+        },
+        getTime: () => Date.now() / 1000,
+        transpiler,
+        beforeEval: (code) => console.log('evaluate', code),
+        afterEval: (code) => {},
+      });
+    </script>
+  </body>
+</html>

packages/core/fraction.mjs

@@ -55,7 +55,8 @@ Fraction.prototype.min = function (other) {
   return this.lt(other) ? this : other;
 };
 
-Fraction.prototype.show = function () {
+Fraction.prototype.show = function (/* excludeWhole = false */) {
+  // return this.toFraction(excludeWhole);
   return this.s * this.n + '/' + this.d;
 };
 
@@ -73,7 +74,7 @@ const fraction = (n) => {
     -> those farey sequences turn out to make pattern querying ~20 times slower! always use strings!
     -> still, some optimizations could be done: .mul .div .add .sub calls still use numbers
     */
-    n = String(n);
+    // n = String(n); // this is actually faster but imprecise...
   }
   return Fraction(n);
 };

packages/core/hap.mjs

@@ -79,15 +79,42 @@ export class Hap {
     );
   }
 
-  show() {
-    return (
-      '(' + (this.whole == undefined ? '~' : this.whole.show()) + ', ' + this.part.show() + ', ' + this.value + ')'
-    );
+  show(compact = false) {
+    const value =
+      typeof this.value === 'object'
+        ? compact
+          ? JSON.stringify(this.value).slice(1, -1).replaceAll('"', '').replaceAll(',', ' ')
+          : JSON.stringify(this.value)
+        : this.value;
+    var spans = '';
+    if (this.whole == undefined) {
+      spans = '~' + this.part.show;
+    } else {
+      var is_whole = this.whole.begin.equals(this.part.begin) && this.whole.end.equals(this.part.end);
+      if (!this.whole.begin.equals(this.part.begin)) {
+        spans = this.whole.begin.show() + ' ⇜ ';
+      }
+      if (!is_whole) {
+        spans += '(';
+      }
+      spans += this.part.show();
+      if (!is_whole) {
+        spans += ')';
+      }
+      if (!this.whole.end.equals(this.part.end)) {
+        spans += ' ⇝ ' + this.whole.end.show();
+      }
+    }
+    return '[ ' + spans + ' | ' + value + ' ]';
   }
 
-  showWhole() {
+  showWhole(compact = false) {
     return `${this.whole == undefined ? '~' : this.whole.show()}: ${
-      typeof this.value === 'object' ? JSON.stringify(this.value) : this.value
+      typeof this.value === 'object'
+        ? compact
+          ? JSON.stringify(this.value).slice(1, -1).replaceAll('"', '').replaceAll(',', ' ')
+          : JSON.stringify(this.value)
+        : this.value
     }`;
   }
 

packages/core/index.mjs

@@ -4,10 +4,11 @@ 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/>.
 */
 
-export * from './controls.mjs';
+import controls from './controls.mjs';
 export * from './euclid.mjs';
 import Fraction from './fraction.mjs';
-export { Fraction };
+import { logger } from './logger.mjs';
+export { Fraction, controls };
 export * from './hap.mjs';
 export * from './pattern.mjs';
 export * from './signal.mjs';
@@ -15,14 +16,19 @@ export * from './state.mjs';
 export * from './timespan.mjs';
 export * from './util.mjs';
 export * from './speak.mjs';
+export * from './evaluate.mjs';
+export * from './repl.mjs';
+export * from './logger.mjs';
+export * from './time.mjs';
+export * from './draw.mjs';
+export * from './pianoroll.mjs';
+export * from './ui.mjs';
+export { default as drawLine } from './drawLine.mjs';
 export { default as gist } from './gist.js';
 // below won't work with runtime.mjs (json import fails)
 /* import * as p from './package.json';
 export const version = p.version; */
-console.log(
-  '%c // 🌀 @strudel.cycles/core loaded 🌀', // keep "//" for runnable snapshot source..
-  'background-color: black;color:white;padding:4px;border-radius:15px',
-);
+logger('🌀 @strudel.cycles/core loaded 🌀');
 if (globalThis._strudelLoaded) {
   console.warn(
     `@strudel.cycles/core was loaded more than once...

packages/core/logger.mjs

@@ -0,0 +1,18 @@
+export const logKey = 'strudel.log';
+
+export function logger(message, type, data = {}) {
+  console.log(`%c${message}`, 'background-color: black;color:white;border-radius:15px');
+  if (typeof CustomEvent !== 'undefined') {
+    document.dispatchEvent(
+      new CustomEvent(logKey, {
+        detail: {
+          message,
+          type,
+          data,
+        },
+      }),
+    );
+  }
+}
+
+logger.key = logKey;

packages/core/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/core",
-	"version": "0.2.0",
+	"version": "0.5.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {

packages/core/package.json

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

packages/core/pianoroll.mjs

@@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern } from '@strudel.cycles/core';
+import { Pattern, toMidi, getDrawContext } from './index.mjs';
 
 const scale = (normalized, min, max) => normalized * (max - min) + min;
 const getValue = (e) => {

packages/core/repl.mjs

@@ -0,0 +1,59 @@
+import { Cyclist } from './cyclist.mjs';
+import { evaluate as _evaluate } from './evaluate.mjs';
+import { logger } from './logger.mjs';
+import { setTime } from './time.mjs';
+
+export function repl({
+  interval,
+  defaultOutput,
+  onSchedulerError,
+  onEvalError,
+  beforeEval,
+  afterEval,
+  getTime,
+  transpiler,
+  onToggle,
+}) {
+  const scheduler = new Cyclist({
+    interval,
+    onTrigger: async (hap, deadline, duration) => {
+      try {
+        if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
+          await defaultOutput(hap, deadline, duration);
+        }
+        if (hap.context.onTrigger) {
+          const cps = 1;
+          // call signature of output / onTrigger is different...
+          await hap.context.onTrigger(getTime() + deadline, hap, getTime(), cps);
+        }
+      } catch (err) {
+        logger(`[cyclist] error: ${err.message}`, 'error');
+      }
+    },
+    onError: onSchedulerError,
+    getTime,
+    onToggle,
+  });
+  setTime(() => scheduler.getPhase()); // TODO: refactor?
+  const evaluate = async (code, autostart = true) => {
+    if (!code) {
+      throw new Error('no code to evaluate');
+    }
+    try {
+      beforeEval?.({ code });
+      const { pattern } = await _evaluate(code, transpiler);
+      logger(`[eval] code updated`);
+      scheduler.setPattern(pattern, autostart);
+      afterEval?.({ code, pattern });
+      return pattern;
+    } catch (err) {
+      // console.warn(`[repl] eval error: ${err.message}`);
+      logger(`[eval] error: ${err.message}`, 'error');
+      onEvalError?.(err);
+    }
+  };
+  const stop = () => scheduler.stop();
+  const start = () => scheduler.start();
+  const pause = () => scheduler.pause();
+  return { scheduler, evaluate, start, stop, pause };
+}

packages/core/signal.mjs

@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { Hap } from './hap.mjs';
-import { Pattern, fastcat, reify, silence, stack, isPattern } from './pattern.mjs';
+import { Pattern, fastcat, reify, silence, stack, register } from './pattern.mjs';
 import Fraction from './fraction.mjs';
 import { id } from './util.mjs';
 
@@ -20,7 +20,7 @@ export const signal = (func) => {
 };
 
 export const isaw = signal((t) => 1 - (t % 1));
-export const isaw2 = isaw._toBipolar();
+export const isaw2 = isaw.toBipolar();
 
 /**
  *  A sawtooth signal between 0 and 1.
@@ -33,7 +33,7 @@ export const isaw2 = isaw._toBipolar();
  *
  */
 export const saw = signal((t) => t % 1);
-export const saw2 = saw._toBipolar();
+export const saw2 = saw.toBipolar();
 
 export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));
 
@@ -45,7 +45,7 @@ export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));
  * sine.segment(16).range(0,15).slow(2).scale('C minor').note()
  *
  */
-export const sine = sine2._fromBipolar();
+export const sine = sine2.fromBipolar();
 
 /**
  *  A cosine signal between 0 and 1.
@@ -67,7 +67,7 @@ export const cosine2 = sine2._early(Fraction(1).div(4));
  *
  */
 export const square = signal((t) => Math.floor((t * 2) % 2));
-export const square2 = square._toBipolar();
+export const square2 = square.toBipolar();
 
 /**
  *  A triangle signal between 0 and 1.
@@ -127,7 +127,7 @@ export const rand = signal(timeToRand);
 /**
  * A continuous pattern of random numbers, between -1 and 1
  */
-export const rand2 = rand._toBipolar();
+export const rand2 = rand.toBipolar();
 
 export const _brandBy = (p) => rand.fmap((x) => x < p);
 export const brandBy = (pPat) => reify(pPat).fmap(_brandBy).innerJoin();
@@ -201,7 +201,7 @@ Pattern.prototype.choose = function (...xs) {
  * @returns {Pattern}
  */
 Pattern.prototype.choose2 = function (...xs) {
-  return chooseWith(this._fromBipolar(), xs);
+  return chooseWith(this.fromBipolar(), xs);
 };
 
 /**
@@ -238,6 +238,7 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
 
 export const wchooseCycles = (...pairs) => _wchooseWith(rand, ...pairs).innerJoin();
 
+// this function expects pat to be a pattern of floats...
 export const perlinWith = (pat) => {
   const pata = pat.fmap(Math.floor);
   const patb = pat.fmap((t) => Math.floor(t) + 1);
@@ -255,11 +256,11 @@ export const perlinWith = (pat) => {
  * s("bd sd,hh*4").cutoff(perlin.range(500,2000))
  *
  */
-export const perlin = perlinWith(time);
+export const perlin = perlinWith(time.fmap((v) => Number(v)));
 
-Pattern.prototype._degradeByWith = function (withPat, x) {
-  return this.fmap((a) => (_) => a).appLeft(withPat._filterValues((v) => v > x));
-};
+export const degradeByWith = register('degradeByWith', (withPat, x, pat) =>
+  pat.fmap((a) => (_) => a).appLeft(withPat.filterValues((v) => v > x)),
+);
 
 /**
  * Randomly removes events from the pattern by a given amount.
@@ -275,9 +276,9 @@ Pattern.prototype._degradeByWith = function (withPat, x) {
  * @example
  * s("[hh?0.2]*8")
  */
-Pattern.prototype._degradeBy = function (x) {
-  return this._degradeByWith(rand, x);
-};
+export const degradeBy = register('degradeBy', function (x, pat) {
+  return pat._degradeByWith(rand, x);
+});
 
 /**
  *
@@ -291,9 +292,7 @@ Pattern.prototype._degradeBy = function (x) {
  * @example
  * s("[hh?]*8")
  */
-Pattern.prototype.degrade = function () {
-  return this._degradeBy(0.5);
-};
+export const degrade = register('degrade', (pat) => pat._degradeBy(0.5));
 
 /**
  * Inverse of {@link Pattern#degradeBy}: Randomly removes events from the pattern by a given amount.
@@ -308,26 +307,14 @@ Pattern.prototype.degrade = function () {
  * @example
  * s("hh*8").undegradeBy(0.2)
  */
-Pattern.prototype._undegradeBy = function (x) {
-  return this._degradeByWith(
+export const undegradeBy = register('undegradeBy', function (x, pat) {
+  return pat._degradeByWith(
     rand.fmap((r) => 1 - r),
     x,
   );
-};
+});
 
-Pattern.prototype.undegrade = function () {
-  return this._undegradeBy(0.5);
-};
-
-Pattern.prototype._sometimesBy = function (x, func) {
-  return stack(this._degradeBy(x), func(this._undegradeBy(1 - x)));
-};
-
-// https://github.com/tidalcycles/strudel/discussions/198
-/* Pattern.prototype._sometimesBy = function (x, other) {
-  other = typeof other === 'function' ? other(this._undegradeBy(1 - x)) : reify(other)._undegradeBy(1 - x);
-  return stack(this._degradeBy(x), other);
-}; */
+export const undegrade = register('undegrade', (pat) => pat._undegradeBy(0.5));
 
 /**
  *
@@ -342,24 +329,12 @@ Pattern.prototype._sometimesBy = function (x, func) {
  * @example
  * s("hh(3,8)").sometimesBy(.4, x=>x.speed("0.5"))
  */
-Pattern.prototype.sometimesBy = function (patx, func) {
-  const pat = this;
-  return reify(patx)
-    .fmap((x) => pat._sometimesBy(x, func))
-    .innerJoin();
-};
 
-// why does this exist? it is identical to sometimesBy
-Pattern.prototype._sometimesByPre = function (x, func) {
-  return stack(this._degradeBy(x), func(this).undegradeBy(1 - x));
-};
-
-Pattern.prototype.sometimesByPre = function (patx, func) {
-  const pat = this;
+export const sometimesBy = register('sometimesBy', function (patx, func, pat) {
   return reify(patx)
-    .fmap((x) => pat._sometimesByPre(x, func))
+    .fmap((x) => stack(pat._degradeBy(x), func(pat._undegradeBy(1 - x))))
     .innerJoin();
-};
+});
 
 /**
  *
@@ -372,20 +347,9 @@ Pattern.prototype.sometimesByPre = function (patx, func) {
  * @example
  * s("hh*4").sometimes(x=>x.speed("0.5"))
  */
-Pattern.prototype.sometimes = function (func) {
-  return this._sometimesBy(0.5, func);
-};
-
-Pattern.prototype.sometimesPre = function (func) {
-  return this._sometimesByPre(0.5, func);
-};
-
-Pattern.prototype._someCyclesBy = function (x, func) {
-  return stack(
-    this._degradeByWith(rand._segment(1), x),
-    func(this._degradeByWith(rand.fmap((r) => 1 - r)._segment(1), 1 - x)),
-  );
-};
+export const sometimes = register('sometimes', function (func, pat) {
+  return pat._sometimesBy(0.5, func);
+});
 
 /**
  *
@@ -400,12 +364,17 @@ Pattern.prototype._someCyclesBy = function (x, func) {
  * @example
  * s("hh(3,8)").someCyclesBy(.3, x=>x.speed("0.5"))
  */
-Pattern.prototype.someCyclesBy = function (patx, func) {
-  const pat = this;
+
+export const someCyclesBy = register('someCyclesBy', function (patx, func, pat) {
   return reify(patx)
-    .fmap((x) => pat._someCyclesBy(x, func))
+    .fmap((x) =>
+      stack(
+        pat._degradeByWith(rand._segment(1), x),
+        func(pat._degradeByWith(rand.fmap((r) => 1 - r)._segment(1), 1 - x)),
+      ),
+    )
     .innerJoin();
-};
+});
 
 /**
  *
@@ -417,9 +386,9 @@ Pattern.prototype.someCyclesBy = function (patx, func) {
  * @example
  * s("hh(3,8)").someCycles(x=>x.speed("0.5"))
  */
-Pattern.prototype.someCycles = function (func) {
-  return this._someCyclesBy(0.5, func);
-};
+export const someCycles = register('someCycles', function (func, pat) {
+  return pat._someCyclesBy(0.5, func);
+});
 
 /**
  *
@@ -431,9 +400,9 @@ Pattern.prototype.someCycles = function (func) {
  * @example
  * s("hh*8").often(x=>x.speed("0.5"))
  */
-Pattern.prototype.often = function (func) {
-  return this.sometimesBy(0.75, func);
-};
+export const often = register('often', function (func, pat) {
+  return pat.sometimesBy(0.75, func);
+});
 
 /**
  *
@@ -445,9 +414,9 @@ Pattern.prototype.often = function (func) {
  * @example
  * s("hh*8").rarely(x=>x.speed("0.5"))
  */
-Pattern.prototype.rarely = function (func) {
-  return this.sometimesBy(0.25, func);
-};
+export const rarely = register('rarely', function (func, pat) {
+  return pat.sometimesBy(0.25, func);
+});
 
 /**
  *
@@ -459,9 +428,9 @@ Pattern.prototype.rarely = function (func) {
  * @example
  * s("hh*8").almostNever(x=>x.speed("0.5"))
  */
-Pattern.prototype.almostNever = function (func) {
-  return this.sometimesBy(0.1, func);
-};
+export const almostNever = register('almostNever', function (func, pat) {
+  return pat.sometimesBy(0.1, func);
+});
 
 /**
  *
@@ -473,9 +442,9 @@ Pattern.prototype.almostNever = function (func) {
  * @example
  * s("hh*8").almostAlways(x=>x.speed("0.5"))
  */
-Pattern.prototype.almostAlways = function (func) {
-  return this.sometimesBy(0.9, func);
-};
+export const almostAlways = register('almostAlways', function (func, pat) {
+  return pat.sometimesBy(0.9, func);
+});
 
 /**
  *
@@ -487,9 +456,9 @@ Pattern.prototype.almostAlways = function (func) {
  * @example
  * s("hh*8").never(x=>x.speed("0.5"))
  */
-Pattern.prototype.never = function (func) {
-  return this;
-};
+export const never = register('never', function (_, pat) {
+  return pat;
+});
 
 /**
  *
@@ -501,8 +470,6 @@ Pattern.prototype.never = function (func) {
  * @example
  * s("hh*8").always(x=>x.speed("0.5"))
  */
-Pattern.prototype.always = function (func) {
-  return func(this);
-};
-
-Pattern.prototype.patternified.push('degradeBy', 'undegradeBy');
+export const always = register('always', function (func, pat) {
+  return func(pat);
+});

packages/core/speak.mjs

@@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern, patternify2 } from './index.mjs';
+import { register } from './index.mjs';
 
 let synth;
 try {
@@ -16,7 +16,7 @@ try {
 let allVoices = synth?.getVoices();
 // console.log('voices', allVoices);
 
-function speak(words, lang, voice) {
+function triggerSpeech(words, lang, voice) {
   synth.cancel();
   const utterance = new SpeechSynthesisUtterance(words);
   utterance.lang = lang;
@@ -31,15 +31,8 @@ function speak(words, lang, voice) {
   speechSynthesis.speak(utterance);
 }
 
-Pattern.prototype._speak = function (lang, voice) {
-  return this._withHap((hap) => {
-    const onTrigger = (time, hap) => {
-      speak(hap.value, lang, voice);
-    };
-    return hap.setContext({ ...hap.context, onTrigger });
+export const speak = register('speak', function (lang, voice, pat) {
+  return pat.onTrigger((_, hap) => {
+    triggerSpeech(hap.value, lang, voice);
   });
-};
-
-Pattern.prototype.speak = function (lang, voice) {
-  return patternify2(Pattern.prototype._speak)(reify(lang), reify(voice), this);
-};
+});

packages/core/test/pattern.test.mjs

@@ -16,6 +16,7 @@ import {
   pure,
   stack,
   fastcat,
+  firstOf,
   slowcat,
   cat,
   sequence,
@@ -47,6 +48,9 @@ import {
 
 import { steady } from '../signal.mjs';
 
+import controls from '../controls.mjs';
+
+const { n, s } = controls;
 const st = (begin, end) => new State(ts(begin, end));
 const ts = (begin, end) => new TimeSpan(Fraction(begin), Fraction(end));
 const hap = (whole, part, value, context = {}) => new Hap(whole, part, value, context);
@@ -55,7 +59,7 @@ const third = Fraction(1, 3);
 const twothirds = Fraction(2, 3);
 
 const sameFirst = (a, b) => {
-  return expect(a._sortHapsByPart().firstCycle()).toStrictEqual(b._sortHapsByPart().firstCycle());
+  return expect(a.sortHapsByPart().firstCycle()).toStrictEqual(b.sortHapsByPart().firstCycle());
 };
 
 describe('TimeSpan', () => {
@@ -137,6 +141,9 @@ describe('Pattern', () => {
     it('Can make a pattern', () => {
       expect(pure('hello').query(st(0.5, 2.5)).length).toBe(3);
     });
+    it('Supports zero-width queries', () => {
+      expect(pure('hello').queryArc(0, 0).length).toBe(1);
+    });
   });
   describe('fmap()', () => {
     it('Can add things', () => {
@@ -148,34 +155,40 @@ describe('Pattern', () => {
     });
   });
   describe('add()', () => {
+    it('works as toplevel function', () => {
+      expect(add(pure(4), pure(5)).query(st(0, 1))[0].value).toBe(9);
+    });
+    it('works as toplevel function, with bare values for arguments', () => {
+      expect(add(4, 5).query(st(0, 1))[0].value).toBe(9);
+    });
     it('can structure In()', () => {
       expect(pure(3).add(pure(4)).query(st(0, 1))[0].value).toBe(7);
-      expect(pure(3).addIn(pure(4)).query(st(0, 1))[0].value).toBe(7);
+      expect(pure(3).add.in(pure(4)).query(st(0, 1))[0].value).toBe(7);
     });
     it('can structure Out()', () => {
-      sameFirst(sequence(1, 2).addOut(4), sequence(5, 6).struct(true));
+      sameFirst(sequence(1, 2).add.out(4), sequence(5, 6).struct(true));
     });
     it('can Mix() structure', () => {
-      expect(sequence(1, 2).addMix(silence, 5, silence).firstCycle()).toStrictEqual([
+      expect(sequence(1, 2).add.mix(silence, 5, silence).firstCycle()).toStrictEqual([
         new Hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 6),
         new Hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 7),
       ]);
     });
     it('can Trig() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).addTrig(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trig(20, 30).early(2),
         sequence(26, 27, 36, 37),
       );
     });
     it('can Trigzero() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).addTrigzero(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trigzero(20, 30).early(2),
         sequence(21, 22, 31, 32),
       );
     });
     it('can Squeeze() structure', () => {
       sameFirst(
-        sequence(1, [2, 3]).addSqueeze(sequence(10, 20, 30)),
+        sequence(1, [2, 3]).add.squeeze(sequence(10, 20, 30)),
         sequence(
           [11, 21, 31],
           [
@@ -187,40 +200,43 @@ describe('Pattern', () => {
     });
     it('can SqueezeOut() structure', () => {
       sameFirst(
-        sequence(1, [2, 3]).addSqueezeOut(10, 20, 30),
+        sequence(1, [2, 3]).add.squeezeout(10, 20, 30),
         sequence([11, [12, 13]], [21, [22, 23]], [31, [32, 33]]),
       );
     });
+    it('can add object patterns', () => {
+      sameFirst(n(sequence(1, [2, 3])).add(n(10)), n(sequence(11, [12, 13])));
+    });
   });
   describe('keep()', () => {
     it('can structure In()', () => {
       expect(pure(3).keep(pure(4)).query(st(0, 1))[0].value).toBe(3);
-      expect(pure(3).keepIn(pure(4)).query(st(0, 1))[0].value).toBe(3);
+      expect(pure(3).keep.in(pure(4)).query(st(0, 1))[0].value).toBe(3);
     });
     it('can structure Out()', () => {
-      sameFirst(sequence(1, 2).keepOut(4), sequence(1, 2).struct(true));
+      sameFirst(sequence(1, 2).keep.out(4), sequence(1, 2).struct(true));
     });
     it('can Mix() structure', () => {
-      expect(sequence(1, 2).keepMix(silence, 5, silence).firstCycle()).toStrictEqual([
+      expect(sequence(1, 2).keep.mix(silence, 5, silence).firstCycle()).toStrictEqual([
         new Hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
         new Hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
       ]);
     });
     it('can Trig() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepTrig(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trig(20, 30).early(2),
         sequence(6, 7, 6, 7),
       );
     });
     it('can Trigzero() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepTrigzero(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trigzero(20, 30).early(2),
         sequence(1, 2, 1, 2),
       );
     });
     it('can Squeeze() structure', () => {
       sameFirst(
-        sequence(1, [2, 3]).keepSqueeze(sequence(10, 20, 30)),
+        sequence(1, [2, 3]).keep.squeeze(sequence(10, 20, 30)),
         sequence(
           [1, 1, 1],
           [
@@ -231,38 +247,38 @@ describe('Pattern', () => {
       );
     });
     it('can SqueezeOut() structure', () => {
-      sameFirst(sequence(1, [2, 3]).keepSqueezeOut(10, 20, 30), sequence([1, [2, 3]], [1, [2, 3]], [1, [2, 3]]));
+      sameFirst(sequence(1, [2, 3]).keep.squeezeout(10, 20, 30), sequence([1, [2, 3]], [1, [2, 3]], [1, [2, 3]]));
     });
   });
   describe('keepif()', () => {
     it('can structure In()', () => {
       sameFirst(sequence(3, 4).keepif(true, false), sequence(3, silence));
-      sameFirst(sequence(3, 4).keepifIn(true, false), sequence(3, silence));
+      sameFirst(sequence(3, 4).keepif.in(true, false), sequence(3, silence));
     });
     it('can structure Out()', () => {
-      sameFirst(pure(1).keepifOut(true, false), sequence(1, silence));
+      sameFirst(pure(1).keepif.out(true, false), sequence(1, silence));
     });
     it('can Mix() structure', () => {
-      expect(sequence(1, 2).keepifMix(false, true, false).firstCycle()).toStrictEqual([
+      expect(sequence(1, 2).keepif.mix(false, true, false).firstCycle()).toStrictEqual([
         new Hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
         new Hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
       ]);
     });
     it('can Trig() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepifTrig(false, true).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trig(false, true).early(2),
         sequence(silence, silence, 6, 7),
       );
     });
     it('can Trigzero() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepifTrigzero(false, true).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trigzero(false, true).early(2),
         sequence(silence, silence, 1, 2),
       );
     });
     it('can Squeeze() structure', () => {
       sameFirst(
-        sequence(1, [2, 3]).keepifSqueeze(sequence(true, true, false)),
+        sequence(1, [2, 3]).keepif.squeeze(sequence(true, true, false)),
         sequence(
           [1, 1, silence],
           [
@@ -273,7 +289,7 @@ describe('Pattern', () => {
       );
     });
     it('can SqueezeOut() structure', () => {
-      sameFirst(sequence(1, [2, 3]).keepifSqueezeOut(true, true, false), sequence([1, [2, 3]], [1, [2, 3]], silence));
+      sameFirst(sequence(1, [2, 3]).keepif.squeezeout(true, true, false), sequence([1, [2, 3]], [1, [2, 3]], silence));
     });
   });
   describe('sub()', () => {
@@ -313,13 +329,13 @@ describe('Pattern', () => {
     });
     describe('setOut()', () => {
       it('Can set things with structure from second pattern', () => {
-        sameFirst(sequence(1, 2).setOut(4), pure(4).mask(true, true));
+        sameFirst(sequence(1, 2).set.out(4), pure(4).mask(true, true));
       });
     });
     describe('setSqueeze()', () => {
       it('Can squeeze one pattern inside the haps of another', () => {
         sameFirst(
-          sequence(1, [2, 3]).setSqueeze(sequence('a', 'b', 'c')),
+          sequence(1, [2, 3]).set.squeeze(sequence('a', 'b', 'c')),
           sequence(
             ['a', 'b', 'c'],
             [
@@ -329,7 +345,7 @@ describe('Pattern', () => {
           ),
         );
         sameFirst(
-          sequence(1, [2, 3]).setSqueeze('a', 'b', 'c'),
+          sequence(1, [2, 3]).set.squeeze('a', 'b', 'c'),
           sequence(
             ['a', 'b', 'c'],
             [
@@ -373,9 +389,10 @@ describe('Pattern', () => {
       );
     });
     it('copes with breaking up events across cycles', () => {
-      expect(pure('a').slow(2)._fastGap(2)._setContext({}).query(st(0, 2))).toStrictEqual(
-        [hap(ts(0, 1), ts(0, 0.5), 'a'), hap(ts(0.5, 1.5), ts(1, 1.5), 'a')]
-      );
+      expect(pure('a').slow(2)._fastGap(2).setContext({}).query(st(0, 2))).toStrictEqual([
+        hap(ts(0, 1), ts(0, 0.5), 'a'),
+        hap(ts(0.5, 1.5), ts(1, 1.5), 'a'),
+      ]);
     });
   });
   describe('_compressSpan()', () => {
@@ -396,8 +413,8 @@ describe('Pattern', () => {
       );
     });
     it('defaults to accepting sequences', () => {
-      expect(sequence(1, 2, 3).fast(sequence(1.5, 2)).firstCycle()).toStrictEqual(
-        sequence(1, 2, 3).fast(1.5, 2).firstCycle(),
+      expect(sequence('a', 'b', 'c').fast(sequence(1.5, 2)).sortHapsByPart().firstCycle()).toStrictEqual(
+        sequence('a', 'b', 'c').fast(1.5, 2).sortHapsByPart().firstCycle(),
       );
     });
     it('works as a static function', () => {
@@ -430,6 +447,16 @@ describe('Pattern', () => {
       // mini('[c3 g3]/2 eb3') always plays [c3 eb3]
       // mini('eb3 [c3 g3]/2 ') always plays [c3 g3]
     });
+    it('Supports zero-length queries', () => {
+      expect(steady('a')._slow(1).queryArc(0, 0)).toStrictEqual(steady('a').queryArc(0, 0));
+    });
+  });
+  describe('slow()', () => {
+    it('Supports zero-length queries', () => {
+      expect(steady('a').slow(1).setContext({}).queryArc(0, 0)).toStrictEqual(
+        steady('a').setContext({}).queryArc(0, 0),
+      );
+    });
   });
   describe('inside', () => {
     it('can rev inside a cycle', () => {
@@ -445,7 +472,7 @@ describe('Pattern', () => {
     it('Filters true', () => {
       expect(
         pure(true)
-          ._filterValues((x) => x)
+          .filterValues((x) => x)
           .firstCycle().length,
       ).toBe(1);
     });
@@ -470,7 +497,7 @@ describe('Pattern', () => {
         pure(10)
           .when(slowcat(true, false), (x) => x.add(3))
           .fast(4)
-          ._sortHapsByPart()
+          .sortHapsByPart()
           .firstCycle(),
       ).toStrictEqual(fastcat(13, 10, 13, 10).firstCycle());
     });
@@ -557,26 +584,36 @@ describe('Pattern', () => {
     });
   });
 
-  describe('every()', () => {
+  describe('firstOf()', () => {
     it('Can apply a function every 3rd time', () => {
       expect(
         pure('a')
-          .every(3, (x) => x._fast(2))
+          .firstOf(3, (x) => x._fast(2))
           ._fast(3)
           .firstCycle(),
       ).toStrictEqual(sequence(sequence('a', 'a'), 'a', 'a').firstCycle());
     });
-    it('works with currying', () => {
-      expect(pure('a').every(3, fast(2))._fast(3).firstCycle()).toStrictEqual(
+    it('Works as a toplevel function', () => {
+      expect(firstOf(3, fast(2), pure('a'))._fast(3).firstCycle()).toStrictEqual(
         sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
       );
-      expect(sequence(3, 4, 5).every(3, add(3)).fast(5).firstCycle()).toStrictEqual(
+    });
+    it('Works as a toplevel function, with a patterned first argument', () => {
+      expect(firstOf(pure(3), fast(2), pure('a'))._fast(3).firstCycle()).toStrictEqual(
+        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
+      );
+    });
+    it('works with currying', () => {
+      expect(pure('a').firstOf(3, fast(2))._fast(3).firstCycle()).toStrictEqual(
+        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
+      );
+      expect(sequence(3, 4, 5).firstOf(3, add(3)).fast(5).firstCycle()).toStrictEqual(
         sequence(6, 7, 8, 3, 4, 5, 3, 4, 5, 6, 7, 8, 3, 4, 5).firstCycle(),
       );
-      expect(sequence(3, 4, 5).every(2, sub(1)).fast(5).firstCycle()).toStrictEqual(
+      expect(sequence(3, 4, 5).firstOf(2, sub(1)).fast(5).firstCycle()).toStrictEqual(
         sequence(2, 3, 4, 3, 4, 5, 2, 3, 4, 3, 4, 5, 2, 3, 4).firstCycle(),
       );
-      expect(sequence(3, 4, 5).every(3, add(3)).every(2, sub(1)).fast(2).firstCycle()).toStrictEqual(
+      expect(sequence(3, 4, 5).firstOf(3, add(3)).firstOf(2, sub(1)).fast(2).firstCycle()).toStrictEqual(
         sequence(5, 6, 7, 3, 4, 5).firstCycle(),
       );
     });
@@ -672,7 +709,7 @@ describe('Pattern', () => {
     it('Can set the hap context', () => {
       expect(
         pure('a')
-          ._setContext([
+          .setContext([
             [
               [0, 1],
               [1, 2],
@@ -693,13 +730,13 @@ describe('Pattern', () => {
     it('Can update the hap context', () => {
       expect(
         pure('a')
-          ._setContext([
+          .setContext([
             [
               [0, 1],
               [1, 2],
             ],
           ])
-          ._withContext((c) => [
+          .withContext((c) => [
             ...c,
             [
               [3, 4],
@@ -723,7 +760,7 @@ describe('Pattern', () => {
   });
   describe('apply', () => {
     it('Can apply a function', () => {
-      expect(sequence('a', 'b')._apply(fast(2)).firstCycle()).toStrictEqual(sequence('a', 'b').fast(2).firstCycle());
+      expect(sequence('a', 'b').apply(fast(2)).firstCycle()).toStrictEqual(sequence('a', 'b').fast(2).firstCycle());
     }),
       it('Can apply a pattern of functions', () => {
         expect(sequence('a', 'b').apply(fast(2)).firstCycle()).toStrictEqual(sequence('a', 'b').fast(2).firstCycle());
@@ -764,18 +801,18 @@ describe('Pattern', () => {
   });
   describe('jux', () => {
     it('Can juxtapose', () => {
-      expect(pure({ a: 1 }).jux(fast(2))._sortHapsByPart().firstCycle()).toStrictEqual(
+      expect(pure({ a: 1 }).jux(fast(2)).sortHapsByPart().firstCycle()).toStrictEqual(
         stack(pure({ a: 1, pan: 0 }), pure({ a: 1, pan: 1 }).fast(2))
-          ._sortHapsByPart()
+          .sortHapsByPart()
           .firstCycle(),
       );
     });
   });
   describe('juxBy', () => {
     it('Can juxtapose by half', () => {
-      expect(pure({ a: 1 }).juxBy(0.5, fast(2))._sortHapsByPart().firstCycle()).toStrictEqual(
+      expect(pure({ a: 1 }).juxBy(0.5, fast(2)).sortHapsByPart().firstCycle()).toStrictEqual(
         stack(pure({ a: 1, pan: 0.25 }), pure({ a: 1, pan: 0.75 }).fast(2))
-          ._sortHapsByPart()
+          .sortHapsByPart()
           .firstCycle(),
       );
     });
@@ -785,7 +822,7 @@ describe('Pattern', () => {
       expect(
         sequence('a', ['a', 'a'])
           .fmap((a) => fastcat('b', 'c'))
-          ._squeezeJoin()
+          .squeezeJoin()
           .firstCycle(),
       ).toStrictEqual(
         sequence(
@@ -799,10 +836,11 @@ describe('Pattern', () => {
     });
     it('Squeezes to the correct cycle', () => {
       expect(
-        pure(time.struct(true))._squeezeJoin().queryArc(3,4).map(x => x.value)
-      ).toStrictEqual(
-        [Fraction(3.5)]
-      )
+        pure(time.struct(true))
+          .squeezeJoin()
+          .queryArc(3, 4)
+          .map((x) => x.value),
+      ).toStrictEqual([Fraction(3.5)]);
     });
   });
   describe('ply', () => {
@@ -836,7 +874,7 @@ describe('Pattern', () => {
       );
     });
     it('Can chop(2,3)', () => {
-      expect(pure({ sound: 'a' }).fast(2).chop(2, 3)._sortHapsByPart().firstCycle()).toStrictEqual(
+      expect(pure({ sound: 'a' }).fast(2).chop(2, 3).sortHapsByPart().firstCycle()).toStrictEqual(
         sequence(
           [
             { sound: 'a', begin: 0, end: 0.5 },
@@ -848,16 +886,14 @@ describe('Pattern', () => {
             { sound: 'a', begin: 2 / 3, end: 1 },
           ],
         )
-          ._sortHapsByPart()
+          .sortHapsByPart()
           .firstCycle(),
       );
     });
   });
   describe('range', () => {
     it('Can be patterned', () => {
-      expect(sequence(0, 0).range(sequence(0, 0.5), 1).firstCycle()).toStrictEqual(
-        sequence(0, 0.5).firstCycle(),
-      );
+      expect(sequence(0, 0).range(sequence(0, 0.5), 1).firstCycle()).toStrictEqual(sequence(0, 0.5).firstCycle());
     });
   });
   describe('range2', () => {
@@ -874,4 +910,25 @@ describe('Pattern', () => {
       );
     });
   });
+  describe('alignments', () => {
+    it('Can squeeze arguments', () => {
+      expect(sequence(1, 2).add.squeeze(4, 5).firstCycle()).toStrictEqual(sequence(5, 6, 6, 7).firstCycle());
+    });
+  });
+  describe('defragmentHaps', () => {
+    it('Can merge two touching haps with same whole and value', () => {
+      expect(stack(pure('a').mask(1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(1);
+    });
+    it('Doesnt merge two overlapping haps', () => {
+      expect(stack(pure('a').mask(1, 1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(
+        2,
+      );
+    });
+    it('Doesnt merge two touching haps with different values', () => {
+      expect(stack(pure('a').mask(1, 0), pure('b').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(2);
+    });
+    it('Doesnt merge two touching haps with different wholes', () => {
+      expect(stack(sequence('a', silence), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(2);
+    });
+  });
 });

packages/core/test/util.test.mjs

@@ -5,7 +5,21 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { pure } from '../pattern.mjs';
-import { isNote, tokenizeNote, toMidi, fromMidi, mod, compose, getFrequency, getPlayableNoteValue } from '../util.mjs';
+import {
+  isNote,
+  tokenizeNote,
+  toMidi,
+  fromMidi,
+  freqToMidi,
+  _mod,
+  compose,
+  getFrequency,
+  getPlayableNoteValue,
+  parseNumeral,
+  parseFractional,
+  numeralArgs,
+  fractionalArgs,
+} from '../util.mjs';
 import { describe, it, expect } from 'vitest';
 
 describe('isNote', () => {
@@ -81,6 +95,12 @@ describe('fromMidi', () => {
     expect(fromMidi(57)).toEqual(220);
   });
 });
+describe('freqToMidi', () => {
+  it('should turn frequency into midi', () => {
+    expect(freqToMidi(440)).toEqual(69);
+    expect(freqToMidi(220)).toEqual(57);
+  });
+});
 describe('getFrequency', () => {
   const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
   it('should turn note into frequency', () => {
@@ -92,35 +112,35 @@ describe('getFrequency', () => {
     expect(getFrequency(happify(57, { type: 'midi' }))).toEqual(220);
   });
   it('should return frequencies unchanged', () => {
-    expect(getFrequency(happify(440, { type: 'frequency' }))).toEqual(440); 
+    expect(getFrequency(happify(440, { type: 'frequency' }))).toEqual(440);
     expect(getFrequency(happify(432, { type: 'frequency' }))).toEqual(432);
   });
   it('should turn object with a "freq" property into frequency', () => {
-    expect(getFrequency(happify({freq: 220}))).toEqual(220)
-    expect(getFrequency(happify({freq: 440}))).toEqual(440)
+    expect(getFrequency(happify({ freq: 220 }))).toEqual(220);
+    expect(getFrequency(happify({ freq: 440 }))).toEqual(440);
   });
   it('should throw an error when given a non-note', () => {
-    expect(() => getFrequency(happify('Q'))).toThrowError(`not a note or frequency: Q`)
-    expect(() => getFrequency(happify('Z'))).toThrowError(`not a note or frequency: Z`)
+    expect(() => getFrequency(happify('Q'))).toThrowError(`not a note or frequency: Q`);
+    expect(() => getFrequency(happify('Z'))).toThrowError(`not a note or frequency: Z`);
   });
 });
 
-describe('mod', () => {
+describe('_mod', () => {
   it('should work like regular modulo with positive numbers', () => {
-    expect(mod(0, 3)).toEqual(0);
-    expect(mod(1, 3)).toEqual(1);
-    expect(mod(2, 3)).toEqual(2);
-    expect(mod(3, 3)).toEqual(0);
-    expect(mod(4, 3)).toEqual(1);
-    expect(mod(4, 2)).toEqual(0);
+    expect(_mod(0, 3)).toEqual(0);
+    expect(_mod(1, 3)).toEqual(1);
+    expect(_mod(2, 3)).toEqual(2);
+    expect(_mod(3, 3)).toEqual(0);
+    expect(_mod(4, 3)).toEqual(1);
+    expect(_mod(4, 2)).toEqual(0);
   });
   it('should work with negative numbers', () => {
-    expect(mod(-1, 3)).toEqual(2);
-    expect(mod(-2, 3)).toEqual(1);
-    expect(mod(-3, 3)).toEqual(0);
-    expect(mod(-4, 3)).toEqual(2);
-    expect(mod(-5, 3)).toEqual(1);
-    expect(mod(-3, 2)).toEqual(1);
+    expect(_mod(-1, 3)).toEqual(2);
+    expect(_mod(-2, 3)).toEqual(1);
+    expect(_mod(-3, 3)).toEqual(0);
+    expect(_mod(-4, 3)).toEqual(2);
+    expect(_mod(-5, 3)).toEqual(1);
+    expect(_mod(-3, 2)).toEqual(1);
   });
 });
 
@@ -140,22 +160,72 @@ describe('compose', () => {
 describe('getPlayableNoteValue', () => {
   const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
   it('should return object "note" property', () => {
-    expect(getPlayableNoteValue(happify({note: "a4"}))).toEqual('a4')
+    expect(getPlayableNoteValue(happify({ note: 'a4' }))).toEqual('a4');
   });
   it('should return object "n" property', () => {
-    expect(getPlayableNoteValue(happify({n: "a4"}))).toEqual('a4')
+    expect(getPlayableNoteValue(happify({ n: 'a4' }))).toEqual('a4');
   });
   it('should return object "value" property', () => {
-    expect(getPlayableNoteValue(happify({value: "a4"}))).toEqual('a4')
+    expect(getPlayableNoteValue(happify({ value: 'a4' }))).toEqual('a4');
   });
   it('should turn midi into frequency', () => {
-    expect(getPlayableNoteValue(happify(57, {type: 'midi'}))).toEqual(220)
-  })
+    expect(getPlayableNoteValue(happify(57, { type: 'midi' }))).toEqual(220);
+  });
   it('should return frequency value', () => {
-    expect(getPlayableNoteValue(happify(220, {type: 'frequency'}))).toEqual(220)
-  })
+    expect(getPlayableNoteValue(happify(220, { type: 'frequency' }))).toEqual(220);
+  });
   it('should throw an error if value is not an object, number, or string', () => {
-    expect(() => getPlayableNoteValue(happify(false))).toThrowError(`not a note: false`)
-    expect(() => getPlayableNoteValue(happify(undefined))).toThrowError(`not a note: undefined`)
-  })
-});
+    expect(() => getPlayableNoteValue(happify(false))).toThrowError(`not a note: false`);
+    expect(() => getPlayableNoteValue(happify(undefined))).toThrowError(`not a note: undefined`);
+  });
+});
+
+describe('parseNumeral', () => {
+  it('should parse numbers as is', () => {
+    expect(parseNumeral(4)).toBe(4);
+    expect(parseNumeral(0)).toBe(0);
+    expect(parseNumeral(20)).toBe(20);
+    expect(parseNumeral('20')).toBe(20);
+    expect(parseNumeral(1.5)).toBe(1.5);
+  });
+  it('should parse notes', () => {
+    expect(parseNumeral('c4')).toBe(60);
+    expect(parseNumeral('c#4')).toBe(61);
+    expect(parseNumeral('db4')).toBe(61);
+  });
+  it('should throw an error for unknown strings', () => {
+    expect(() => parseNumeral('xyz')).toThrowError('cannot parse as numeral: "xyz"');
+  });
+});
+
+describe('parseFractional', () => {
+  it('should parse numbers as is', () => {
+    expect(parseFractional(4)).toBe(4);
+    expect(parseFractional(0)).toBe(0);
+    expect(parseFractional(20)).toBe(20);
+    expect(parseFractional('20')).toBe(20);
+    expect(parseFractional(1.5)).toBe(1.5);
+  });
+  it('should parse fractional shorthands values', () => {
+    expect(parseFractional('w')).toBe(1);
+    expect(parseFractional('h')).toBe(0.5);
+    expect(parseFractional('q')).toBe(0.25);
+    expect(parseFractional('e')).toBe(0.125);
+  });
+  it('should throw an error for unknown strings', () => {
+    expect(() => parseFractional('xyz')).toThrowError('cannot parse as fractional: "xyz"');
+  });
+});
+
+describe('numeralArgs', () => {
+  it('should convert function arguments to numbers', () => {
+    const add = numeralArgs((a, b) => a + b);
+    expect(add('c4', 2)).toBe(62);
+  });
+});
+describe('fractionalArgs', () => {
+  it('should convert function arguments to numbers', () => {
+    const add = fractionalArgs((a, b) => a + b);
+    expect(add('q', 2)).toBe(2.25);
+  });
+});

packages/core/test/value.test.mjs

@@ -6,6 +6,8 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import { describe, it, expect } from 'vitest';
 import { map, valued, mul } from '../value.mjs';
+import controls from '../controls.mjs';
+const { n } = controls;
 
 describe('Value', () => {
   it('unionWith', () => {
@@ -21,4 +23,8 @@ describe('Value', () => {
     expect(valued(mul).ap(3).ap(3).value).toEqual(9);
     expect(valued(3).mul(3).value).toEqual(9);
   });
+  it('union bare numbers for numeral props', () => {
+    expect(n(3).cutoff(500).add(10).firstCycleValues).toEqual([{ n: 13, cutoff: 510 }]);
+    expect(n(3).cutoff(500).mul(2).firstCycleValues).toEqual([{ n: 6, cutoff: 1000 }]);
+  });
 });

packages/core/time.mjs

@@ -0,0 +1,11 @@
+let time;
+export function getTime() {
+  if (!time) {
+    throw new Error('no time set! use setTime to define a time source');
+  }
+  return time();
+}
+
+export function setTime(func) {
+  time = func;
+}

packages/core/timespan.mjs

@@ -18,6 +18,11 @@ export class TimeSpan {
     const end = this.end;
     const end_sam = end.sam();
 
+    // Support zero-width timespans
+    if (begin.equals(end)) {
+      return [new TimeSpan(begin, end)];
+    }
+
     while (end.gt(begin)) {
       // If begin and end are in the same cycle, we're done.
       if (begin.sam().equals(end_sam)) {
@@ -105,7 +110,7 @@ export class TimeSpan {
   }
 
   show() {
-    return this.begin.show() + ' -> ' + this.end.show();
+    return this.begin.show() + ' → ' + this.end.show();
   }
 }
 

packages/core/ui.mjs

@@ -4,19 +4,14 @@ 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 { Tone } from './tone.mjs';
-
-export const hideHeader = () => {
-  document.getElementById('header').style = 'display:none';
-};
+import { getTime } from './time.mjs';
 
 function frame(callback) {
   if (window.strudelAnimation) {
     cancelAnimationFrame(window.strudelAnimation);
   }
   const animate = (animationTime) => {
-    const toneTime = Tone.getTransport().seconds;
-    callback(animationTime, toneTime);
+    callback(animationTime, getTime());
     window.strudelAnimation = requestAnimationFrame(animate);
   };
   requestAnimationFrame(animate);
@@ -51,6 +46,7 @@ export const cleanupUi = () => {
   const container = document.getElementById('code');
   if (container) {
     container.style = '';
-    container.className = 'grow relative'; // has to match App.tsx
+    // TODO: find a way to remove that duplication..
+    container.className = 'grow flex text-gray-100 relative overflow-auto cursor-text pb-0'; // has to match App.tsx
   }
 };

packages/core/util.mjs

@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 // returns true if the given string is a note
-export const isNote = (name) => /^[a-gA-G][#b]*[0-9]$/.test(name);
+export const isNote = (name) => /^[a-gA-G][#bs]*[0-9]$/.test(name);
 export const tokenizeNote = (note) => {
   if (typeof note !== 'string') {
     return [];
@@ -31,6 +31,30 @@ export const fromMidi = (n) => {
   return Math.pow(2, (n - 69) / 12) * 440;
 };
 
+export const freqToMidi = (freq) => {
+  return (12 * Math.log(freq / 440)) / Math.LN2 + 69;
+};
+
+export const valueToMidi = (value, fallbackValue) => {
+  if (typeof value !== 'object') {
+    throw new Error('valueToMidi: expected object value');
+  }
+  let { freq, note } = value;
+  if (typeof freq === 'number') {
+    return freqToMidi(freq);
+  }
+  if (typeof note === 'string') {
+    return toMidi(note);
+  }
+  if (typeof note === 'number') {
+    return note;
+  }
+  if (!fallbackValue) {
+    throw new Error('valueToMidi: expected freq or note to be set');
+  }
+  return fallbackValue;
+};
+
 /**
  * @deprecated does not appear to be referenced or invoked anywhere in the codebase
  */
@@ -50,14 +74,17 @@ export const midi2note = (n) => {
   return pc + oct;
 };
 
-// modulo that works with negative numbers e.g. mod(-1, 3) = 2
-// const mod = (n: number, m: number): number => (n < 0 ? mod(n + m, m) : n % m);
-export const mod = (n, m) => ((n % m) + m) % m;
+// modulo that works with negative numbers e.g. _mod(-1, 3) = 2. Works on numbers (rather than patterns of numbers, as @mod@ from pattern.mjs does)
+export const _mod = (n, m) => ((n % m) + m) % m;
 
 export const getPlayableNoteValue = (hap) => {
-  let { value: note, context } = hap;
+  let { value, context } = hap;
+  let note = value;
   if (typeof note === 'object' && !Array.isArray(note)) {
     note = note.note || note.n || note.value;
+    if (note === undefined) {
+      throw new Error(`cannot find a playable note for ${JSON.stringify(value)}`);
+    }
   }
   // if value is number => interpret as midi number as long as its not marked as frequency
   if (typeof note === 'number' && context.type !== 'frequency') {
@@ -73,8 +100,11 @@ export const getPlayableNoteValue = (hap) => {
 export const getFrequency = (hap) => {
   let { value, context } = hap;
   // if value is number => interpret as midi number as long as its not marked as frequency
-  if (typeof value === 'object' && value.freq) {
-    return value.freq;
+  if (typeof value === 'object') {
+    if (value.freq) {
+      return value.freq;
+    }
+    return getFreq(value.note || value.n || value.value);
   }
   if (typeof value === 'number' && context.type !== 'frequency') {
     value = fromMidi(hap.value);
@@ -110,9 +140,9 @@ export const constant = (a, b) => a;
 
 export const listRange = (min, max) => Array.from({ length: max - min + 1 }, (_, i) => i + min);
 
-export function curry(func, overload) {
+export function curry(func, overload, arity = func.length) {
   const fn = function curried(...args) {
-    if (args.length >= func.length) {
+    if (args.length >= arity) {
       return func.apply(this, args);
     } else {
       const partial = function (...args2) {
@@ -130,3 +160,46 @@ export function curry(func, overload) {
   }
   return fn;
 }
+
+export function parseNumeral(numOrString) {
+  const asNumber = Number(numOrString);
+  if (!isNaN(asNumber)) {
+    return asNumber;
+  }
+  if (isNote(numOrString)) {
+    return toMidi(numOrString);
+  }
+  throw new Error(`cannot parse as numeral: "${numOrString}"`);
+}
+
+export function mapArgs(fn, mapFn) {
+  return (...args) => fn(...args.map(mapFn));
+}
+
+export function numeralArgs(fn) {
+  return mapArgs(fn, parseNumeral);
+}
+
+export function parseFractional(numOrString) {
+  const asNumber = Number(numOrString);
+  if (!isNaN(asNumber)) {
+    return asNumber;
+  }
+  const specialValue = {
+    pi: Math.PI,
+    w: 1,
+    h: 0.5,
+    q: 0.25,
+    e: 0.125,
+    s: 0.0625,
+    t: 1 / 3,
+    f: 0.2,
+    x: 1 / 6,
+  }[numOrString];
+  if (typeof specialValue !== 'undefined') {
+    return specialValue;
+  }
+  throw new Error(`cannot parse as fractional: "${numOrString}"`);
+}
+
+export const fractionalArgs = (fn) => mapArgs(fn, parseFractional);

packages/core/value.mjs

@@ -7,6 +7,13 @@ This program is free software: you can redistribute it and/or modify it under th
 import { curry } from './util.mjs';
 
 export function unionWithObj(a, b, func) {
+  if (typeof b?.value === 'number') {
+    // https://github.com/tidalcycles/strudel/issues/262
+    const numKeys = Object.keys(a).filter((k) => typeof a[k] === 'number');
+    const numerals = Object.fromEntries(numKeys.map((k) => [k, b.value]));
+    b = Object.assign(b, numerals);
+    delete b.value;
+  }
   const common = Object.keys(a).filter((k) => Object.keys(b).includes(k));
   return Object.assign({}, a, b, Object.fromEntries(common.map((k) => [k, func(a[k], b[k])])));
 }

packages/core/zyklus.mjs

@@ -0,0 +1,49 @@
+// will move to https://github.com/felixroos/zyklus
+// TODO: started flag
+
+function createClock(
+  getTime,
+  callback, // called slightly before each cycle
+  duration = 0.05, // duration of each cycle
+  interval = 0.1, // interval between callbacks
+  overlap = 0.1, // overlap between callbacks
+) {
+  let tick = 0; // counts callbacks
+  let phase = 0; // next callback time
+  let precision = 10 ** 4; // used to round phase
+  let minLatency = 0.01;
+  const setDuration = (setter) => (duration = setter(duration));
+  overlap = overlap || interval / 2;
+  const onTick = () => {
+    const t = getTime();
+    const lookahead = t + interval + overlap; // the time window for this tick
+    if (phase === 0) {
+      phase = t + minLatency;
+    }
+    // callback as long as we're inside the lookahead
+    while (phase < lookahead) {
+      phase = Math.round(phase * precision) / precision;
+      phase >= t && callback(phase, duration, tick);
+      phase < t && console.log('TOO LATE', phase); // what if latency is added from outside?
+      phase += duration; // increment phase by duration
+      tick++;
+    }
+  };
+  let intervalID;
+  const start = () => {
+    clear(); // just in case start was called more than once
+    onTick();
+    intervalID = setInterval(onTick, interval * 1000);
+  };
+  const clear = () => intervalID !== undefined && clearInterval(intervalID);
+  const pause = () => clear();
+  const stop = () => {
+    tick = 0;
+    phase = 0;
+    clear();
+  };
+  const getPhase = () => phase;
+  // setCallback
+  return { setDuration, start, stop, pause, duration, getPhase };
+}
+export default createClock;

packages/csound/csound.mjs

@@ -0,0 +1,170 @@
+import { getFrequency, logger, register } from '@strudel.cycles/core';
+import { getAudioContext } from '@strudel.cycles/webaudio';
+import csd from './project.csd?raw';
+// import livecodeOrc from './livecode.orc?raw';
+import presetsOrc from './presets.orc?raw';
+
+let csoundLoader, _csound;
+
+// initializes csound + can be used to reevaluate given instrument code
+export async function loadCSound(code = '') {
+  await init();
+  if (code) {
+    code = `${code}`;
+    //     ^       ^
+    // wrapping in backticks makes sure it works when calling as templated function
+    await _csound?.evalCode(code);
+  }
+}
+export const loadcsound = loadCSound;
+export const loadCsound = loadCSound;
+
+export const csound = register('csound', (instrument, pat) => {
+  instrument = instrument || 'triangle';
+  init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
+  // TODO: find a alternative way to wait for csound to load (to wait with first time playback)
+  return pat.onTrigger((time, hap) => {
+    if (!_csound) {
+      logger('[csound] not loaded yet', 'warning');
+      return;
+    }
+    if (typeof hap.value !== 'object') {
+      throw new Error('csound only support objects as hap values');
+    }
+    let { gain = 0.8 } = hap.value;
+    gain *= 0.2;
+
+    const freq = Math.round(getFrequency(hap));
+    const controls = Object.entries({ ...hap.value, freq })
+      .flat()
+      .join('/');
+    // TODO: find out how to send a precise ctx based time
+    // http://www.csounds.com/manual/html/i.html
+    const params = [
+      `"${instrument}"`, // p1: instrument name
+      time - getAudioContext().currentTime, //.toFixed(precision), // p2: starting time in arbitrary unit called beats
+      hap.duration + 0, // p3: duration in beats
+      // instrument specific params:
+      freq, //.toFixed(precision), // p4: frequency
+      gain, // p5: gain
+      `"${controls}"`, // p6 controls as string (like superdirt osc message)
+    ];
+    const msg = `i ${params.join(' ')}`;
+    _csound.inputMessage(msg);
+  });
+});
+
+function eventLogger(type, args) {
+  const [msg] = args;
+  if (
+    type === 'message' &&
+    (['[commit: HEAD]'].includes(msg) ||
+      msg.startsWith('--Csound version') ||
+      msg.startsWith('libsndfile') ||
+      msg.startsWith('sr =') ||
+      msg.startsWith('0dBFS') ||
+      msg.startsWith('audio buffered') ||
+      msg.startsWith('writing') ||
+      msg.startsWith('SECTION 1:'))
+  ) {
+    // ignore
+    return;
+  }
+  let logType = 'info';
+  if (msg.startsWith('error:')) {
+    logType = 'error';
+  }
+  logger(`[csound] ${msg || ''}`, logType);
+}
+
+async function load() {
+  if (window.__csound__) {
+    // Allows using some other csound instance.
+    // In that case, the external Csound is responsible
+    // for compiling an orchestra and starting to perform.
+    logger('[load] Using external Csound', 'warning');
+    _csound = window.__csound__;
+    return _csound;
+  } else {
+    const { Csound } = await import('@csound/browser');
+    _csound = await Csound({ audioContext: getAudioContext() });
+    _csound.removeAllListeners('message');
+    ['message'].forEach((k) => _csound.on(k, (...args) => eventLogger(k, args)));
+    await _csound.setOption('-m0d'); // see -m flag https://csound.com/docs/manual/CommandFlags.html
+    await _csound.setOption('--sample-accurate');
+    await _csound.compileCsdText(csd);
+    // await _csound.compileOrc(livecodeOrc);
+    await _csound.compileOrc(presetsOrc);
+    await _csound.start();
+    return _csound;
+  }
+}
+
+async function init() {
+  csoundLoader = csoundLoader || load();
+  return csoundLoader;
+}
+
+let orcCache = {};
+export async function loadOrc(url) {
+  await init();
+  if (typeof url !== 'string') {
+    throw new Error('loadOrc: expected url string');
+  }
+  if (url.startsWith('github:')) {
+    const [_, path] = url.split('github:');
+    url = `https://raw.githubusercontent.com/${path}`;
+  }
+  if (!orcCache[url]) {
+    orcCache[url] = fetch(url)
+      .then((res) => res.text())
+      .then((code) => _csound.compileOrc(code));
+  }
+  await orcCache[url];
+}
+
+/**
+ * Sends notes to Csound for rendering with MIDI semantics. The hap value is
+ * translated to these Csound pfields:
+ *
+ *  p1 -- Csound instrument either as a number (1-based, can be a fraction),
+ *        or as a string name.
+ *  p2 -- time in beats (usually seconds) from start of performance.
+ *  p3 -- duration in beats (usually seconds).
+ *  p4 -- MIDI key number (as a real number, not an integer but in [0, 127].
+ *  p5 -- MIDI velocity (as a real number, not an integer but in [0, 127].
+ *  p6 -- Strudel controls, as a string.
+ */
+export const csoundm = register('csoundm', (instrument, pat) => {
+  let p1 = instrument;
+  if (typeof instrument === 'string') {
+    p1 = `"{instrument}"`;
+  }
+  init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
+  return pat.onTrigger((tidal_time, hap) => {
+    if (!_csound) {
+      logger('[csound] not loaded yet', 'warning');
+      return;
+    }
+    if (typeof hap.value !== 'object') {
+      throw new Error('csound only support objects as hap values');
+    }
+    // Time in seconds counting from now.
+    const p2 = tidal_time - getAudioContext().currentTime;
+    const p3 = hap.duration.valueOf() + 0;
+    const frequency = getFrequency(hap);
+    // Translate frequency to MIDI key number _without_ rounding.
+    const C4 = 261.62558;
+    let octave = Math.log(frequency / C4) / Math.log(2.0) + 8.0;
+    const p4 = octave * 12.0 - 36.0;
+    // We prefer floating point precision, but over the MIDI range [0, 127].
+    const p5 = 127 * (hap.context?.velocity ?? 0.9);
+    // The Strudel controls as a string.
+    const p6 = Object.entries({ ...hap.value, frequency })
+      .flat()
+      .join('/');
+    const i_statement = `i ${p1} ${p2} ${p3} ${p4} ${p5} "${p6}"`;
+    console.log('[csoundm]:', i_statement);
+    _csound.inputMessage(i_statement);
+  });
+});

packages/csound/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "@strudel.cycles/csound",
+  "version": "0.5.1",
+  "description": "csound bindings for strudel",
+  "main": "csound.mjs",
+  "scripts": {
+    "test": "echo \"No tests present.\" && exit 0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tidalcycles/strudel.git"
+  },
+  "keywords": [
+    "tidalcycles",
+    "strudel",
+    "pattern",
+    "livecoding",
+    "algorave"
+  ],
+  "author": "Felix Roos <flix91@gmail.com>",
+  "contributors": [
+    "Alex McLean <alex@slab.org>"
+  ],
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/tidalcycles/strudel/issues"
+  },
+  "homepage": "https://github.com/tidalcycles/strudel#readme",
+  "dependencies": {
+    "@csound/browser": "^6.18.3"
+  }
+}

packages/csound/presets.orc

@@ -0,0 +1,96 @@
+; returns value of given key in given "string map"
+; keymap("freq", "note/c3/freq/220/gain/0.5")
+; yields "220"
+opcode keymap, S, SS
+  Skey, Smap xin
+  idelimiter = strindex(Smap, strcat(Skey, "/"))
+  ifrom = idelimiter + strlen(Skey) + 1
+  Svalue = strsub(Smap, ifrom, strlen(Smap))
+  Svalue = strsub(Svalue, 0, strindex(Svalue, "/"))
+  xout Svalue
+endop
+
+; TODO add incredibly dope synths
+instr organ
+    iduration = p3
+    ifreq = p4
+    igain = p5
+    ioct = octcps(ifreq)
+
+    asig = vco2(igain, ifreq, 12, .5) ; my edit
+    kpwm = oscili(.1, 5)
+    asig = vco2(igain, ifreq, 4, .5 + kpwm)
+    asig += vco2(igain/4, ifreq * 2)
+
+    ; filter
+    ; idepth = 2
+    ; acut = transegr:a(0, .005, 0, idepth, .06, -4.2, 0.001, .01, -4.2, 0) ; filter envelope
+    ; asig = zdf_2pole(asig, cpsoct(ioct + acut), 0.5)
+
+    ; amp envelope
+    iattack = .001
+    irelease = .05
+    asig *= linsegr:a(0, iattack, 1, iduration, 1, irelease, 0)
+
+    out(asig, asig)
+
+endin
+
+instr triangle
+  iduration = p3
+  ifreq = p4
+  igain = p5
+  ioct = octcps(ifreq)
+  
+  asig = vco2(igain, ifreq, 12, .5)
+  
+  ; amp envelope
+  iattack = .001
+  irelease = .05
+  asig *= linsegr:a(0, iattack, 1, iduration, 1, irelease, 0)
+  
+  out(asig, asig)
+endin
+
+instr pad
+    iduration = p3
+    ifreq = p4
+    igain = p5
+    ioct = octcps(ifreq)
+
+    asig = vco2(igain, ifreq, 0)
+
+    ; amp envelope
+    iattack = .5
+    irelease = .1
+    asig *= linsegr:a(0, iattack, 1, iduration, 1, irelease, 0)
+    
+    idepth = 2
+    acut = transegr:a(0, .005, 0, idepth, .06, -4.2, 0.001, .01, -4.2, 0)
+    asig = zdf_2pole(asig, 1000, 2)
+
+    out(asig, asig)
+endin
+
+
+gisine	ftgen	0, 0, 4096, 10, 1
+
+instr bow
+    kpres = 2
+    krat = 0.16
+    kvibf = 6.12723
+    
+    kvib  linseg 0, 0.5, 0, 1, 1, p3-0.5, 1	
+    kvamp = kvib * 0.01
+    asig  wgbow .7, p4, kpres, krat, kvibf, kvamp, gisine
+    asig = asig*p5
+    outs asig, asig
+endin
+
+
+instr Meta
+    Smap = strget(p6)
+    Sinstrument = keymap("s", Smap)
+    schedule(Sinstrument, 0, p3, p4, p5)
+    ; TODO find a way to pipe Sinstrument through effects
+endin

packages/csound/project.csd

@@ -0,0 +1,10 @@
+<CsoundSynthesizer>
+<CsInstruments>
+
+sr=48000
+ksmps=64
+nchnls=2
+0dbfs=1
+
+</CsInstruments>
+</CsoundSynthesizer>

packages/embed/README.md

@@ -10,15 +10,22 @@ Either install with `npm i @strudel.cycles/embed` or just use a cdn to import th
 <script src="https://unpkg.com/@strudel.cycles/embed@latest"></script>
 <strudel-repl>
   <!--
-      "a4 [a3 c3] a3 c3".color('#F9D649')
-    .sub("<7 12 5 12>".slow(2))
-    .off(1/4,x=>x.add(7).color("#FFFFFF #0C3AA1 #C63928"))
-    .off(1/8,x=>x.add(12).color('#215CB6'))
-    .slow(2)
-    .legato(sine.range(0.3, 2).slow(28))
-    .wave("sawtooth square".fast(2))
-    .filter('lowpass', cosine.range(500,4000).slow(16))
-    .pianoroll({minMidi:20,maxMidi:120,background:'#202124'})
+note(`[[e5 [b4 c5] d5 [c5 b4]]
+[a4 [a4 c5] e5 [d5 c5]]
+[b4 [~ c5] d5 e5]
+[c5 a4 a4 ~]
+[[~ d5] [~ f5] a5 [g5 f5]]
+[e5 [~ c5] e5 [d5 c5]]
+[b4 [b4 c5] d5 e5]
+[c5 a4 a4 ~]],
+[[e2 e3]*4]
+[[a2 a3]*4]
+[[g#2 g#3]*2 [e2 e3]*2]
+[a2 a3 a2 a3 a2 a3 b1 c2]
+[[d2 d3]*4]
+[[c2 c3]*4]
+[[b1 b2]*2 [e2 e3]*2]
+[[a1 a2]*4]`).slow(16)
       -->
 </strudel-repl>
 ```

packages/embed/example.html

@@ -2,14 +2,21 @@
 <!-- <script src="./embed.js"></script> -->
 <strudel-repl>
   <!--
-      "a4 [a3 c3] a3 c3".color('#F9D649')
-    .sub("<7 12 5 12>".slow(2))
-    .off(1/4,x=>x.add(7).color("#FFFFFF #0C3AA1 #C63928"))
-    .off(1/8,x=>x.add(12).color('#215CB6'))
-    .slow(2)
-    .legato(sine.range(0.3, 2).slow(28))
-    .wave("sawtooth square".fast(2))
-    .filter('lowpass', cosine.range(500,4000).slow(16))
-    .pianoroll({minMidi:20,maxMidi:120,background:'#202124'})
+note(`[[e5 [b4 c5] d5 [c5 b4]]
+[a4 [a4 c5] e5 [d5 c5]]
+[b4 [~ c5] d5 e5]
+[c5 a4 a4 ~]
+[[~ d5] [~ f5] a5 [g5 f5]]
+[e5 [~ c5] e5 [d5 c5]]
+[b4 [b4 c5] d5 e5]
+[c5 a4 a4 ~]],
+[[e2 e3]*4]
+[[a2 a3]*4]
+[[g#2 g#3]*2 [e2 e3]*2]
+[a2 a3 a2 a3 a2 a3 b1 c2]
+[[d2 d3]*4]
+[[c2 c3]*4]
+[[b1 b2]*2 [e2 e3]*2]
+[[a1 a2]*4]`).slow(16)
       -->
 </strudel-repl>

packages/embed/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/embed",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "Embeddable Web Component to load a Strudel REPL into an iframe",
   "main": "embed.js",
   "type": "module",

packages/eval/README.md

@@ -11,10 +11,9 @@ npm i @strudel.cycles/eval --save
 
 ## Example
 
-<!-- TODO: -extend +evalScope -->
-
 ```js
-import { evaluate, extend } from '@strudel.cycles/eval';
+import { evalScope } from '@strudel.cycles/core';
+import { evaluate } from '@strudel.cycles/eval';
 
 evalScope(
   import('@strudel.cycles/core'),

packages/eval/evaluate.mjs

@@ -4,46 +4,9 @@ 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 { evaluate as _evaluate } from '@strudel.cycles/core';
 import shapeshifter from './shapeshifter.mjs';
-import * as strudel from '@strudel.cycles/core';
-
-const { isPattern, Pattern } = strudel;
-
-export const extend = (...args) => {
-  console.warn('@strudel.cycles/eval extend is deprecated, please use evalScope instead');
-  Object.assign(globalThis, ...args);
-};
-
-let scoped = false;
-export const evalScope = async (...args) => {
-  if (scoped) {
-    console.warn('@strudel.cycles/eval evalScope was called more than once.');
-  }
-  scoped = true;
-  const results = await Promise.allSettled(args);
-  const modules = results.filter((result) => result.status === 'fulfilled').map((r) => r.value);
-  results.forEach((result, i) => {
-    if (result.status === 'rejected') {
-      console.warn(`evalScope: module with index ${i} could not be loaded:`, result.reason);
-    }
-  });
-  Object.assign(globalThis, ...modules, Pattern.prototype.bootstrap());
-};
-
-function safeEval(str) {
-  return Function('"use strict";return (' + str + ')')();
-}
 
 export const evaluate = async (code) => {
-  if (!scoped) {
-    await evalScope(); // at least scope Pattern.prototype.boostrap
-  }
-  const shapeshifted = shapeshifter(code); // transform syntactically correct js code to semantically usable code
-  let evaluated = await safeEval(shapeshifted);
-  if (!isPattern(evaluated)) {
-    console.log('evaluated', evaluated);
-    const message = `got "${typeof evaluated}" instead of pattern`;
-    throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
-  }
-  return { mode: 'javascript', pattern: evaluated };
+  return _evaluate(code, shapeshifter);
 };

packages/eval/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/eval",
-	"version": "0.2.0",
+	"version": "0.5.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {

packages/eval/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/eval",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "description": "Code evaluator for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -28,12 +28,12 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.2.0",
+    "@strudel.cycles/core": "^0.4.1",
     "estraverse": "^5.3.0",
-    "shift-ast": "^6.1.0",
-    "shift-codegen": "^7.0.3",
-    "shift-parser": "^7.0.3",
-    "shift-spec": "^2018.0.2",
+    "shift-ast": "^7.0.0",
+    "shift-codegen": "^8.1.0",
+    "shift-parser": "^8.0.0",
+    "shift-spec": "^2019.0.0",
     "shift-traverser": "^1.0.0"
   }
 }

packages/eval/shapeshifter.mjs

@@ -30,7 +30,8 @@ const isNote = (name) => /^[a-gC-G][bs]?[0-9]$/.test(name);
 const addLocations = true;
 export const addMiniLocations = true;
 export const minifyStrings = true;
-export const wrappedAsync = true;
+export const wrappedAsync = false; // this is now handled by core evaluate by default
+export const shouldAddReturn = true;
 
 export default (_code) => {
   const { code, addReturn } = wrapAsync(_code);
@@ -125,7 +126,7 @@ export default (_code) => {
     },
   });
   // add return to last statement (because it's wrapped in an async function artificially)
-  if (wrappedAsync) {
+  if (shouldAddReturn) {
     addReturn(shifted);
   }
   const generated = undisguiseImports(codegen(shifted));
@@ -153,7 +154,7 @@ ${code}
 })()`;
   }
   const addReturn = (ast) => {
-    const body = ast.statements[0].expression.callee.body; // actual code ast inside async function body
+    const body = wrappedAsync ? ast.statements[0].expression.callee.body : ast;
     body.statements = body.statements
       .slice(0, -1)
       .concat([new ReturnStatement({ expression: body.statements.slice(-1)[0] })]);
@@ -224,9 +225,8 @@ function isPatternArg(parents) {
 function hasModifierCall(parent) {
   // TODO: modifiers are more than composables, for example every is not composable but should be seen as modifier..
   // need all prototypes of Pattern
-  return (
-    parent?.type === 'StaticMemberExpression' && Object.keys(Pattern.prototype.composable).includes(parent.property)
-  );
+  return parent?.type === 'StaticMemberExpression';
+  // && Object.keys(Pattern.prototype.composable).includes(parent.property)
 }
 const factories = Object.keys(Pattern.prototype.factories).concat(['mini']);
 

packages/eval/test/evaluate.test.mjs

@@ -6,14 +6,14 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import { expect, describe, it } from 'vitest';
 
-import { evaluate, evalScope } from '../evaluate.mjs';
+import { evaluate } from '../evaluate.mjs';
 import { mini } from '@strudel.cycles/mini';
 import * as strudel from '@strudel.cycles/core';
-const { fastcat } = strudel;
+const { fastcat, evalScope } = strudel;
 
 describe('evaluate', async () => {
   await evalScope({ mini }, strudel);
-  const ev = async (code) => (await evaluate(code)).pattern._firstCycleValues;
+  const ev = async (code) => (await evaluate(code)).pattern.firstCycleValues;
   it('Should evaluate strudel functions', async () => {
     expect(await ev('pure("c3")')).toEqual(['c3']);
     expect(await ev('cat("c3")')).toEqual(['c3']);

packages/eval/test/shapeshifter.test.mjs

@@ -5,15 +5,21 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { describe, it, expect } from 'vitest';
-import shapeshifter from '../shapeshifter.mjs';
+import shapeshifter, { wrappedAsync } from '../shapeshifter.mjs';
 
 describe('shapeshifter', () => {
   it('Should shift simple double quote string', () => {
-    expect(shapeshifter('"c3"')).toEqual('(async()=>{return mini("c3").withMiniLocation([1,0,15],[1,4,19])})()');
-  });
-  it('Should handle dynamic imports', () => {
-    expect(shapeshifter('const { default: foo } = await import(\'https://bar.com/foo.js\');"c3"')).toEqual(
-      '(async()=>{const{default:foo}=await import("https://bar.com/foo.js");return mini("c3").withMiniLocation([1,64,79],[1,68,83])})()',
-    );
+    if (wrappedAsync) {
+      expect(shapeshifter('"c3"')).toEqual('(async()=>{return mini("c3").withMiniLocation([1,0,15],[1,4,19])})()');
+    } else {
+      expect(shapeshifter('"c3"')).toEqual('return mini("c3").withMiniLocation([1,0,0],[1,4,4])');
+    }
   });
+  if (wrappedAsync) {
+    it('Should handle dynamic imports', () => {
+      expect(shapeshifter('const { default: foo } = await import(\'https://bar.com/foo.js\');"c3"')).toEqual(
+        'const{default:foo}=await import("https://bar.com/foo.js");return mini("c3").withMiniLocation([1,64,79],[1,68,83])',
+      );
+    });
+  }
 });

packages/midi/midi.mjs

@@ -4,15 +4,19 @@ 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 { isNote } from 'tone';
-import _WebMidi from 'webmidi';
-import { Pattern, isPattern } from '@strudel.cycles/core';
-import { Tone } from '@strudel.cycles/tone';
+import * as _WebMidi from 'webmidi';
+import { Pattern, isPattern, isNote, getPlayableNoteValue, logger } from '@strudel.cycles/core';
+import { getAudioContext } from '@strudel.cycles/webaudio';
 
 // if you use WebMidi from outside of this package, make sure to import that instance:
-export const WebMidi = _WebMidi;
+export const { WebMidi } = _WebMidi;
 
-export function enableWebMidi() {
+export function enableWebMidi(options = {}) {
+  const { onReady, onConnected, onDisconnected } = options;
+
+  if (typeof navigator.requestMIDIAccess !== 'function') {
+    throw new Error('Your Browser does not support WebMIDI.');
+  }
   return new Promise((resolve, reject) => {
     if (WebMidi.enabled) {
       // if already enabled, just resolve WebMidi
@@ -23,6 +27,14 @@ export function enableWebMidi() {
       if (err) {
         reject(err);
       }
+      WebMidi.addListener('connected', (e) => {
+        onConnected?.(WebMidi);
+      });
+      // Reacting when a device becomes unavailable
+      WebMidi.addListener('disconnected', (e) => {
+        onDisconnected?.(WebMidi, e);
+      });
+      onReady?.(WebMidi);
       resolve(WebMidi);
     });
   });
@@ -31,7 +43,21 @@ export function enableWebMidi() {
 const outputByName = (name) => WebMidi.getOutputByName(name);
 
 // Pattern.prototype.midi = function (output: string | number, channel = 1) {
-Pattern.prototype.midi = function (output, channel = 1) {
+Pattern.prototype.midi = async function (output, channel = 1) {
+  await enableWebMidi({
+    onConnected: ({ outputs }) =>
+      logger(`Midi device connected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`),
+    onDisconnected: ({ outputs }) =>
+      logger(`Midi device disconnected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`),
+    onReady: ({ outputs }) => {
+      const chosenOutput = output ?? outputs[0];
+      const otherOutputs = outputs
+        .filter((o) => o.name !== chosenOutput.name)
+        .map((o) => `'${o.name}'`)
+        .join(' | ');
+      logger(`Midi connected! Using "${chosenOutput.name}". ${otherOutputs ? `Also available: ${otherOutputs}` : ''}`);
+    },
+  });
   if (isPattern(output?.constructor?.name)) {
     throw new Error(
       `.midi does not accept Pattern input. Make sure to pass device name with single quotes. Example: .midi('${
@@ -39,46 +65,42 @@ Pattern.prototype.midi = function (output, channel = 1) {
       }')`,
     );
   }
-  return this._withHap((hap) => {
-    // const onTrigger = (time: number, hap: any) => {
-    const onTrigger = (time, hap) => {
-      let note = hap.value;
-      const velocity = hap.context?.velocity ?? 0.9;
-      if (!isNote(note)) {
-        throw new Error('not a note: ' + note);
-      }
-      if (!WebMidi.enabled) {
-        throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
-      }
-      if (!WebMidi.outputs.length) {
-        throw new Error(`🔌 No MIDI devices found. Connect a device or enable IAC Driver.`);
-      }
-      let device;
-      if (typeof output === 'number') {
-        device = WebMidi.outputs[output];
-      } else if (typeof output === 'string') {
-        device = outputByName(output);
-      } else {
-        device = WebMidi.outputs[0];
-      }
-      if (!device) {
-        throw new Error(
-          `🔌 MIDI device '${output ? output : ''}' not found. Use one of ${WebMidi.outputs
-            .map((o) => `'${o.name}'`)
-            .join(' | ')}`,
-        );
-      }
-      // console.log('midi', value, output);
-      const timingOffset = WebMidi.time - Tone.getContext().currentTime * 1000;
-      time = time * 1000 + timingOffset;
-      // const inMs = '+' + (time - Tone.getContext().currentTime) * 1000;
-      // await enableWebMidi()
-      device.playNote(note, channel, {
-        time,
-        duration: hap.duration.valueOf() * 1000 - 5,
-        velocity,
-      });
-    };
-    return hap.setContext({ ...hap.context, onTrigger });
+  return this.onTrigger((time, hap) => {
+    let note = getPlayableNoteValue(hap);
+    const velocity = hap.context?.velocity ?? 0.9;
+    if (!isNote(note)) {
+      throw new Error('not a note: ' + note);
+    }
+    if (!WebMidi.enabled) {
+      throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
+    }
+    if (!WebMidi.outputs.length) {
+      throw new Error(`🔌 No MIDI devices found. Connect a device or enable IAC Driver.`);
+    }
+    let device;
+    if (typeof output === 'number') {
+      device = WebMidi.outputs[output];
+    } else if (typeof output === 'string') {
+      device = outputByName(output);
+    } else {
+      device = WebMidi.outputs[0];
+    }
+    if (!device) {
+      throw new Error(
+        `🔌 MIDI device '${output ? output : ''}' not found. Use one of ${WebMidi.outputs
+          .map((o) => `'${o.name}'`)
+          .join(' | ')}`,
+      );
+    }
+    // console.log('midi', value, output);
+    const timingOffset = WebMidi.time - getAudioContext().currentTime * 1000;
+    time = time * 1000 + timingOffset;
+    // const inMs = '+' + (time - Tone.getContext().currentTime) * 1000;
+    // await enableWebMidi()
+    device.playNote(note, channel, {
+      time,
+      duration: hap.duration.valueOf() * 1000 - 5,
+      attack: velocity,
+    });
   });
 };

packages/midi/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/midi",
-	"version": "0.2.0",
+	"version": "0.5.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {

packages/midi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/midi",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "description": "Midi API for strudel",
   "main": "index.mjs",
   "repository": {
@@ -21,8 +21,8 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/tone": "^0.2.0",
+    "@strudel.cycles/tone": "^0.5.0",
     "tone": "^14.7.77",
-    "webmidi": "^2.5.2"
+    "webmidi": "^3.0.21"
   }
 }

packages/mini/README.md

@@ -33,3 +33,12 @@ yields:
 ## Mini Notation API
 
 See "Mini Notation" in the [Strudel Tutorial](https://strudel.tidalcycles.org/tutorial/)
+
+## Building the Parser
+
+The parser [krill-parser.js] is generated from [krill.pegjs](./krill.pegjs) using [peggy](https://peggyjs.org/).
+To generate the parser, run
+
+```js
+npm run build:parser
+```

packages/mini/krill-parser.js

@@ -32,7 +32,7 @@ function peg$padEnd(str, targetLength, padString) {
 }
 
 peg$SyntaxError.prototype.format = function(sources) {
-  var str = "Error: " + this.message;
+  var str = "peg error: " + this.message;
   if (this.location) {
     var src = null;
     var k;

packages/mini/mini.mjs

@@ -6,16 +6,15 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import * as krill from './krill-parser.js';
 import * as strudel from '@strudel.cycles/core';
-import { addMiniLocations } from '@strudel.cycles/eval/shapeshifter.mjs';
 
-const { pure, Pattern, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel;
+const { pure, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel;
 
-var _seedState = 0;
+/* var _seedState = 0;
 const randOffset = 0.0002;
 
 function _nextSeed() {
   return _seedState++;
-}
+} */
 
 const applyOptions = (parent) => (pat, i) => {
   const ast = parent.source_[i];
@@ -23,13 +22,35 @@ const applyOptions = (parent) => (pat, i) => {
   const operator = options?.operator;
   if (operator) {
     switch (operator.type_) {
-      case 'stretch':
+      case 'stretch': {
         const speed = Fraction(operator.arguments_.amount).inverse();
         return reify(pat).fast(speed);
+      }
       case 'bjorklund':
         return pat.euclid(operator.arguments_.pulse, operator.arguments_.step, operator.arguments_.rotation);
       case 'degradeBy':
-        return reify(pat)._degradeByWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), operator.arguments_.amount);
+        // TODO: find out what is right here
+        // example:
+        /*
+           stack(
+             s("hh*8").degrade(),
+             s("[ht*8]?")
+           )
+        */
+        // above example will only be in sync when _degradeBy is used...
+        // it also seems that the nextSeed will create undeterministic behaviour
+        // as it uses a global _seedState. This is probably the reason for
+        // https://github.com/tidalcycles/strudel/issues/245
+
+        // this is how it was:
+        /* 
+        return reify(pat)._degradeByWith(
+          strudel.rand.early(randOffset * _nextSeed()).segment(1),
+          operator.arguments_.amount ?? 0.5,
+        ); 
+        */
+        return reify(pat)._degradeBy(operator.arguments_.amount ?? 0.5);
+
       // TODO: case 'fixed-step': "%"
     }
     console.warn(`operator "${operator.type_}" not implemented`);
@@ -82,17 +103,19 @@ function resolveReplications(ast) {
   });
 }
 
-export function patternifyAST(ast) {
+export function patternifyAST(ast, code) {
   switch (ast.type_) {
-    case 'pattern':
+    case 'pattern': {
       resolveReplications(ast);
-      const children = ast.source_.map(patternifyAST).map(applyOptions(ast));
+      const children = ast.source_.map((child) => patternifyAST(child, code)).map(applyOptions(ast));
       const alignment = ast.arguments_.alignment;
       if (alignment === 'v') {
         return stack(...children);
       }
       if (alignment === 'r') {
-        return strudel.chooseInWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), children);
+        // https://github.com/tidalcycles/strudel/issues/245#issuecomment-1345406422
+        // return strudel.chooseInWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), children);
+        return strudel.chooseCycles(...children);
       }
       const weightedChildren = ast.source_.some((child) => !!child.options_?.weight);
       if (!weightedChildren && alignment === 't') {
@@ -107,14 +130,12 @@ export function patternifyAST(ast) {
         return pat;
       }
       return sequence(...children);
-    case 'element':
+    }
+    case 'element': {
       if (ast.source_ === '~') {
         return silence;
       }
       if (typeof ast.source_ !== 'object') {
-        if (!addMiniLocations) {
-          return ast.source_;
-        }
         if (!ast.location_) {
           console.warn('no location for', ast);
           return ast.source_;
@@ -123,11 +144,20 @@ export function patternifyAST(ast) {
         const value = !isNaN(Number(ast.source_)) ? Number(ast.source_) : ast.source_;
         // the following line expects the shapeshifter append .withMiniLocation
         // because location_ is only relative to the mini string, but we need it relative to whole code
-        return pure(value).withLocation([start.line, start.column, start.offset], [end.line, end.column, end.offset]);
+        // make sure whitespaces are not part of the highlight:
+        const actual = code?.split('').slice(start.offset, end.offset).join('');
+        const [offsetStart = 0, offsetEnd = 0] = actual
+          ? actual.split(ast.source_).map((p) => p.split('').filter((c) => c === ' ').length)
+          : [];
+        return pure(value).withLocation(
+          [start.line, start.column + offsetStart, start.offset + offsetStart],
+          [start.line, end.column - offsetEnd, end.offset - offsetEnd],
+        );
       }
-      return patternifyAST(ast.source_);
+      return patternifyAST(ast.source_, code);
+    }
     case 'stretch':
-      return patternifyAST(ast.source_).slow(ast.arguments_.amount);
+      return patternifyAST(ast.source_, code).slow(ast.arguments_.amount);
     /* case 'scale':
       let [tonic, scale] = Scale.tokenize(ast.arguments_.scale);
       const intervals = Scale.get(scale).intervals;
@@ -159,8 +189,9 @@ export function patternifyAST(ast) {
 // mini notation only (wraps in "")
 export const mini = (...strings) => {
   const pats = strings.map((str) => {
-    const ast = krill.parse(`"${str}"`);
-    return patternifyAST(ast);
+    const code = `"${str}"`;
+    const ast = krill.parse(code);
+    return patternifyAST(ast, code);
   });
   return sequence(...pats);
 };
@@ -169,14 +200,9 @@ export const mini = (...strings) => {
 export const h = (string) => {
   const ast = krill.parse(string);
   // console.log('ast', ast);
-  return patternifyAST(ast);
+  return patternifyAST(ast, string);
 };
 
-// shorthand for mini
-Pattern.prototype.define('mini', mini, { composable: true });
-Pattern.prototype.define('m', mini, { composable: true });
-Pattern.prototype.define('h', h, { composable: true });
-
 export function minify(thing) {
   if (typeof thing === 'string') {
     return mini(thing);

packages/mini/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/mini",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {

packages/mini/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/mini",
-  "version": "0.2.0",
+  "version": "0.5.0",
   "description": "Mini notation for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -26,9 +26,9 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.2.0",
-    "@strudel.cycles/eval": "^0.2.0",
-    "@strudel.cycles/tone": "^0.2.0"
+    "@strudel.cycles/core": "^0.4.1",
+    "@strudel.cycles/eval": "^0.5.0",
+    "@strudel.cycles/tone": "^0.5.0"
   },
   "devDependencies": {
     "peggy": "^2.0.1"

packages/mini/test/mini.test.mjs

@@ -9,8 +9,8 @@ import '@strudel.cycles/core/euclid.mjs';
 import { describe, expect, it } from 'vitest';
 
 describe('mini', () => {
-  const minV = (v) => mini(v)._firstCycleValues;
-  const minS = (v) => mini(v)._showFirstCycle;
+  const minV = (v) => mini(v).firstCycleValues;
+  const minS = (v) => mini(v).showFirstCycle;
   it('supports single elements', () => {
     expect(minV('a')).toEqual(['a']);
   });
@@ -77,7 +77,7 @@ describe('mini', () => {
     expect(haps.length < 230).toBe(true);
     // 'Had too many cycles remaining after degradeBy 0.8');
   });
-  it('supports the random choice operator ("|") with nesting', () => {
+  /*it('supports the random choice operator ("|") with nesting', () => {
     const numCycles = 900;
     const haps = mini('a | [b | c] | [d | e | f]').queryArc(0, numCycles);
     // Should have about 1/3 a, 1/6 each of b | c, and 1/9 each of d | e | f.
@@ -103,5 +103,5 @@ describe('mini', () => {
     //  PRNG, this test should succeed
     expect(chisq <= 15.086).toBe(true);
     // assert(chisq <= 15.086, chisq + ' was expected to be less than 15.086 under chi-squared test');
-  });
+  });*/
 });

packages/osc/README.md

@@ -35,3 +35,5 @@ s("<bd sd> hh").osc()
 ```
 
 or just [click here](http://localhost:3000/#cygiPGJkIHNkPiBoaCIpLm9zYygp)...
+
+You can read more about [how to use Superdirt with Strudel the Tutorial](https://strudel.tidalcycles.org/tutorial/#superdirt-api)

packages/osc/osc.mjs

@@ -5,10 +5,34 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import OSC from 'osc-js';
-import { Pattern } from '@strudel.cycles/core';
+import { logger, parseNumeral, Pattern } from '@strudel.cycles/core';
+
+let connection; // Promise<OSC>
+function connect() {
+  if (!connection) {
+    // make sure this runs only once
+    connection = new Promise((resolve, reject) => {
+      const osc = new OSC();
+      osc.open();
+      osc.on('open', () => {
+        const url = osc.options?.plugin?.socket?.url;
+        logger(`[osc] connected${url ? ` to ${url}` : ''}`);
+        resolve(osc);
+      });
+      osc.on('close', () => {
+        connection = undefined; // allows new connection afterwards
+        console.log('[osc] disconnected');
+        reject('OSC connection closed');
+      });
+      osc.on('error', (err) => reject(err));
+    }).catch((err) => {
+      connection = undefined;
+      throw new Error('Could not connect to OSC server. Is it running?');
+    });
+  }
+  return connection;
+}
 
-const comm = new OSC();
-comm.open();
 const latency = 0.1;
 let startedAt = -1;
 
@@ -20,24 +44,25 @@ let startedAt = -1;
  * @memberof Pattern
  * @returns Pattern
  */
-Pattern.prototype.osc = function () {
-  return this._withHap((hap) => {
-    const onTrigger = (time, hap, currentTime, cps) => {
-      const cycle = hap.wholeOrPart().begin.valueOf();
-      const delta = hap.duration.valueOf();
-      // time should be audio time of onset
-      // currentTime should be current time of audio context (slightly before time)
-      if (startedAt < 0) {
-        startedAt = Date.now() - currentTime * 1000;
-      }
-      const controls = Object.assign({}, { cps, cycle, delta }, hap.value);
-      const keyvals = Object.entries(controls).flat();
-      const ts = Math.floor(startedAt + (time + latency) * 1000);
-      const message = new OSC.Message('/dirt/play', ...keyvals);
-      const bundle = new OSC.Bundle([message], ts);
-      bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60
-      comm.send(bundle);
-    };
-    return hap.setContext({ ...hap.context, onTrigger });
+Pattern.prototype.osc = async function () {
+  const osc = await connect();
+  return this.onTrigger((time, hap, currentTime, cps = 1) => {
+    const cycle = hap.wholeOrPart().begin.valueOf();
+    const delta = hap.duration.valueOf();
+    // time should be audio time of onset
+    // currentTime should be current time of audio context (slightly before time)
+    if (startedAt < 0) {
+      startedAt = Date.now() - currentTime * 1000;
+    }
+    const controls = Object.assign({}, { cps, cycle, delta }, hap.value);
+    // make sure n and note are numbers
+    controls.n && (controls.n = parseNumeral(controls.n));
+    controls.note && (controls.note = parseNumeral(controls.note));
+    const keyvals = Object.entries(controls).flat();
+    const ts = Math.floor(startedAt + (time + latency) * 1000);
+    const message = new OSC.Message('/dirt/play', ...keyvals);
+    const bundle = new OSC.Bundle([message], ts);
+    bundle.timestamp(ts); // workaround for https://github.com/adzialocha/osc-js/issues/60
+    osc.send(bundle);
   });
 };

packages/osc/package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/osc",
-	"version": "0.1.1",
+	"version": "0.4.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {

packages/osc/package.json

@@ -1,13 +1,14 @@
 {
   "name": "@strudel.cycles/osc",
-  "version": "0.1.1",
+  "version": "0.4.0",
   "description": "OSC messaging for strudel",
   "main": "osc.mjs",
   "scripts": {
     "test": "echo \"No tests present.\" && exit 0",
     "server": "node server.js",
     "tidal-sniffer": "node tidal-sniffer.js",
-    "client": "npx serve -p 4321"
+    "client": "npx serve -p 4321",
+    "build": "npx pkg server.js --targets node16-macos-x64,node16-win-x64,node16-linux-x64 --out-path bin"
   },
   "repository": {
     "type": "git",
@@ -30,6 +31,9 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "osc-js": "^2.3.2"
+    "osc-js": "^2.4.0"
+  },
+  "devDependencies": {
+    "pkg": "^5.7.0"
   }
 }

packages/osc/server.js

@@ -25,8 +25,6 @@ const config = {
   },
 };
 
-
-
 const osc = new OSC({ plugin: new OSC.BridgePlugin(config) });
 
 osc.open(); // start a WebSocket server on port 8080

packages/react/.npmignore

@@ -0,0 +1 @@
+examples

packages/react/README.md

@@ -1,4 +1,43 @@
 # @strudel.cycles/react
 
-This package contains react hooks and components for strudel.
-Example coming soon
+This package contains react hooks and components for strudel. It is used internally by the Strudel REPL.
+
+## Install
+
+```js
+npm i @strudel.cycles/react
+```
+
+## Usage
+
+Here is a minimal example of how to set up a MiniRepl:
+
+```jsx
+import { evalScope, controls } from '@strudel.cycles/core';
+import { MiniRepl } from '@strudel.cycles/react';
+import { prebake } from '../repl/src/prebake.mjs';
+
+evalScope(
+  controls,
+  import('@strudel.cycles/core'),
+  import('@strudel.cycles/tonal'),
+  import('@strudel.cycles/mini'),
+  import('@strudel.cycles/webaudio'),
+  /* probably import other strudel packages */
+);
+
+prebake();
+
+export function Repl({ tune }) {
+  return <MiniRepl tune={tune} hideOutsideView={true} />;
+}
+```
+
+## Development
+
+If you change something in here and want to see the changes in the repl, make sure to run `npm run build` inside this folder!
+
+```js
+npm run dev # dev server
+npm run build # build package
+```

packages/react/dist/index.es.js

@@ -1,582 +1,320 @@
-import React, { useCallback, useState, useEffect, useMemo, useRef, useLayoutEffect } from 'react';
-import _CodeMirror from '@uiw/react-codemirror';
-import { Decoration, EditorView } from '@codemirror/view';
-import { StateEffect, StateField } from '@codemirror/state';
-import { javascript } from '@codemirror/lang-javascript';
-import { tags } from '@lezer/highlight';
-import { createTheme } from '@uiw/codemirror-themes';
-import { useInView } from 'react-hook-inview';
-import { evaluate } from '@strudel.cycles/eval';
-import { Tone } from '@strudel.cycles/tone';
-import { TimeSpan, State } from '@strudel.cycles/core';
-import { webaudioOutputTrigger } from '@strudel.cycles/webaudio';
-import { WebMidi, enableWebMidi } from '@strudel.cycles/midi';
-
-var strudelTheme = createTheme({
-  theme: 'dark',
+import n, { useCallback as _, useRef as H, useEffect as L, useMemo as V, useState as w, useLayoutEffect as j } from "react";
+import X from "@uiw/react-codemirror";
+import { Decoration as E, EditorView as U } from "@codemirror/view";
+import { StateEffect as $, StateField as G } from "@codemirror/state";
+import { javascript as Y } from "@codemirror/lang-javascript";
+import { tags as r } from "@lezer/highlight";
+import { createTheme as Z } from "@uiw/codemirror-themes";
+import { useInView as ee } from "react-hook-inview";
+import { webaudioOutput as te, getAudioContext as re } from "@strudel.cycles/webaudio";
+import { repl as oe } from "@strudel.cycles/core";
+import { transpiler as ne } from "@strudel.cycles/transpiler";
+const ae = Z({
+  theme: "dark",
   settings: {
-    background: '#222',
-    foreground: '#75baff', // whats that?
-    caret: '#ffcc00',
-    selection: 'rgba(128, 203, 196, 0.5)',
-    selectionMatch: '#036dd626',
-    lineHighlight: '#8a91991a',
-    gutterBackground: 'transparent',
-    // gutterForeground: '#8a919966',
-    gutterForeground: '#676e95',
+    background: "#222",
+    foreground: "#75baff",
+    caret: "#ffcc00",
+    selection: "rgba(128, 203, 196, 0.5)",
+    selectionMatch: "#036dd626",
+    lineHighlight: "#00000050",
+    gutterBackground: "transparent",
+    gutterForeground: "#8a919966"
   },
   styles: [
-    { tag: tags.keyword, color: '#c792ea' },
-    { tag: tags.operator, color: '#89ddff' },
-    { tag: tags.special(tags.variableName), color: '#eeffff' },
-    { tag: tags.typeName, color: '#f07178' },
-    { tag: tags.atom, color: '#f78c6c' },
-    { tag: tags.number, color: '#ff5370' },
-    { tag: tags.definition(tags.variableName), color: '#82aaff' },
-    { tag: tags.string, color: '#c3e88d' },
-    { tag: tags.special(tags.string), color: '#f07178' },
-    { tag: tags.comment, color: '#7d8799' },
-    { tag: tags.variableName, color: '#f07178' },
-    { tag: tags.tagName, color: '#ff5370' },
-    { tag: tags.bracket, color: '#a2a1a4' },
-    { tag: tags.meta, color: '#ffcb6b' },
-    { tag: tags.attributeName, color: '#c792ea' },
-    { tag: tags.propertyName, color: '#c792ea' },
-    { tag: tags.className, color: '#decb6b' },
-    { tag: tags.invalid, color: '#ffffff' },
-  ],
+    { tag: r.keyword, color: "#c792ea" },
+    { tag: r.operator, color: "#89ddff" },
+    { tag: r.special(r.variableName), color: "#eeffff" },
+    { tag: r.typeName, color: "#c3e88d" },
+    { tag: r.atom, color: "#f78c6c" },
+    { tag: r.number, color: "#c3e88d" },
+    { tag: r.definition(r.variableName), color: "#82aaff" },
+    { tag: r.string, color: "#c3e88d" },
+    { tag: r.special(r.string), color: "#c3e88d" },
+    { tag: r.comment, color: "#7d8799" },
+    { tag: r.variableName, color: "#c792ea" },
+    { tag: r.tagName, color: "#c3e88d" },
+    { tag: r.bracket, color: "#525154" },
+    { tag: r.meta, color: "#ffcb6b" },
+    { tag: r.attributeName, color: "#c792ea" },
+    { tag: r.propertyName, color: "#c792ea" },
+    { tag: r.className, color: "#decb6b" },
+    { tag: r.invalid, color: "#ffffff" }
+  ]
 });
-
-var style = '';
-
-const setFlash = StateEffect.define();
-const flashField = StateField.define({
+const B = $.define(), se = G.define({
   create() {
-    return Decoration.none;
+    return E.none;
   },
-  update(flash2, tr) {
+  update(e, t) {
     try {
-      for (let e of tr.effects) {
-        if (e.is(setFlash)) {
-          if (e.value) {
-            const mark = Decoration.mark({ attributes: { style: `background-color: #FFCA2880` } });
-            flash2 = Decoration.set([mark.range(0, tr.newDoc.length)]);
-          } else {
-            flash2 = Decoration.set([]);
-          }
-        }
-      }
-      return flash2;
-    } catch (err) {
-      console.warn("flash error", err);
-      return flash2;
+      for (let o of t.effects)
+        if (o.is(B))
+          if (o.value) {
+            const a = E.mark({ attributes: { style: "background-color: #FFCA2880" } });
+            e = E.set([a.range(0, t.newDoc.length)]);
+          } else
+            e = E.set([]);
+      return e;
+    } catch (o) {
+      return console.warn("flash error", o), e;
     }
   },
-  provide: (f) => EditorView.decorations.from(f)
-});
-const flash = (view) => {
-  view.dispatch({ effects: setFlash.of(true) });
-  setTimeout(() => {
-    view.dispatch({ effects: setFlash.of(false) });
+  provide: (e) => U.decorations.from(e)
+}), ce = (e) => {
+  e.dispatch({ effects: B.of(!0) }), setTimeout(() => {
+    e.dispatch({ effects: B.of(!1) });
   }, 200);
-};
-const setHighlights = StateEffect.define();
-const highlightField = StateField.define({
+}, z = $.define(), ie = G.define({
   create() {
-    return Decoration.none;
+    return E.none;
   },
-  update(highlights, tr) {
+  update(e, t) {
     try {
-      for (let e of tr.effects) {
-        if (e.is(setHighlights)) {
-          const marks = e.value.map(
-            (hap) => (hap.context.locations || []).map(({ start, end }) => {
-              const color = hap.context.color || "#FFCA28";
-              let from = tr.newDoc.line(start.line).from + start.column;
-              let to = tr.newDoc.line(end.line).from + end.column;
-              const l = tr.newDoc.length;
-              if (from > l || to > l) {
-                return;
-              }
-              const mark = Decoration.mark({ attributes: { style: `outline: 1.5px solid ${color};` } });
-              return mark.range(from, to);
+      for (let o of t.effects)
+        if (o.is(z)) {
+          const a = o.value.map(
+            (s) => (s.context.locations || []).map(({ start: u, end: d }) => {
+              const f = s.context.color || "#FFCA28";
+              let c = t.newDoc.line(u.line).from + u.column, i = t.newDoc.line(d.line).from + d.column;
+              const m = t.newDoc.length;
+              return c > m || i > m ? void 0 : E.mark({ attributes: { style: `outline: 1.5px solid ${f};` } }).range(c, i);
             })
           ).flat().filter(Boolean) || [];
-          highlights = Decoration.set(marks, true);
+          e = E.set(a, !0);
         }
-      }
-      return highlights;
-    } catch (err) {
-      return Decoration.set([]);
+      return e;
+    } catch {
+      return E.set([]);
     }
   },
-  provide: (f) => EditorView.decorations.from(f)
-});
-const extensions = [javascript(), strudelTheme, highlightField, flashField];
-function CodeMirror({ value, onChange, onViewChanged, onSelectionChange, options, editorDidMount }) {
-  const handleOnChange = useCallback(
-    (value2) => {
-      onChange?.(value2);
+  provide: (e) => U.decorations.from(e)
+}), le = [Y(), ae, ie, se];
+function de({ value: e, onChange: t, onViewChanged: o, onSelectionChange: a, options: s, editorDidMount: u }) {
+  const d = _(
+    (i) => {
+      t?.(i);
     },
-    [onChange]
-  );
-  const handleOnCreateEditor = useCallback(
-    (view) => {
-      onViewChanged?.(view);
+    [t]
+  ), f = _(
+    (i) => {
+      o?.(i);
     },
-    [onViewChanged]
-  );
-  const handleOnUpdate = useCallback(
-    (viewUpdate) => {
-      if (viewUpdate.selectionSet && onSelectionChange) {
-        onSelectionChange?.(viewUpdate.state.selection);
-      }
+    [o]
+  ), c = _(
+    (i) => {
+      i.selectionSet && a && a?.(i.state.selection);
     },
-    [onSelectionChange]
+    [a]
   );
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(_CodeMirror, {
-    value,
-    onChange: handleOnChange,
-    onCreateEditor: handleOnCreateEditor,
-    onUpdate: handleOnUpdate,
-    extensions
+  return /* @__PURE__ */ n.createElement(n.Fragment, null, /* @__PURE__ */ n.createElement(X, {
+    value: e,
+    onChange: d,
+    onCreateEditor: f,
+    onUpdate: c,
+    extensions: le
   }));
 }
-
-/*
-useCycle.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/useCycle.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-/* export declare interface UseCycleProps {
-  onEvent: ToneEventCallback<any>;
-  onQuery?: (state: State) => Hap[];
-  onSchedule?: (events: Hap[], cycle: number) => void;
-  onDraw?: ToneEventCallback<any>;
-  ready?: boolean; // if false, query will not be called on change props
-} */
-
-// function useCycle(props: UseCycleProps) {
-function useCycle(props) {
-  // onX must use useCallback!
-  const { onEvent, onQuery, onSchedule, ready = true, onDraw } = props;
-  const [started, setStarted] = useState(false);
-  const cycleDuration = 1;
-  const activeCycle = () => Math.floor(Tone.getTransport().seconds / cycleDuration);
-
-  // pull events with onQuery + count up to next cycle
-  const query = (cycle = activeCycle()) => {
-    const timespan = new TimeSpan(cycle, cycle + 1);
-    const events = onQuery?.(new State(timespan)) || [];
-    onSchedule?.(events, cycle);
-    // cancel events after current query. makes sure no old events are player for rescheduled cycles
-    // console.log('schedule', cycle);
-    // query next cycle in the middle of the current
-    const cancelFrom = timespan.begin.valueOf();
-    Tone.getTransport().cancel(cancelFrom);
-    // const queryNextTime = (cycle + 1) * cycleDuration - 0.1;
-    const queryNextTime = (cycle + 1) * cycleDuration - 0.5;
-
-    // if queryNextTime would be before current time, execute directly (+0.1 for safety that it won't miss)
-    const t = Math.max(Tone.getTransport().seconds, queryNextTime) + 0.1;
-    Tone.getTransport().schedule(() => {
-      query(cycle + 1);
-    }, t);
-
-    // schedule events for next cycle
-    events
-      ?.filter((event) => event.part.begin.equals(event.whole?.begin))
-      .forEach((event) => {
-        Tone.getTransport().schedule((time) => {
-          onEvent(time, event, Tone.getContext().currentTime);
-          Tone.Draw.schedule(() => {
-            // do drawing or DOM manipulation here
-            onDraw?.(time, event);
-          }, time);
-        }, event.part.begin.valueOf());
-      });
-  };
-
-  useEffect(() => {
-    ready && query();
-  }, [onEvent, onSchedule, onQuery, onDraw, ready]);
-
-  const start = async () => {
-    setStarted(true);
-    await Tone.start();
-    Tone.getTransport().start('+0.1');
-  };
-  const stop = () => {
-    Tone.getTransport().pause();
-    setStarted(false);
-  };
-  const toggle = () => (started ? stop() : start());
-  return {
-    start,
-    stop,
-    onEvent,
-    started,
-    setStarted,
-    toggle,
-    query,
-    activeCycle,
-  };
+function K(...e) {
+  return e.filter(Boolean).join(" ");
 }
-
-/*
-usePostMessage.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/usePostMessage.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/>.
-*/
-
-function usePostMessage(listener) {
-  useEffect(() => {
-    window.addEventListener('message', listener);
-    return () => window.removeEventListener('message', listener);
-  }, [listener]);
-  return useCallback((data) => window.postMessage(data, '*'), []);
-}
-
-/*
-useRepl.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/useRepl.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/>.
-*/
-
-let s4 = () => {
-  return Math.floor((1 + Math.random()) * 0x10000)
-    .toString(16)
-    .substring(1);
-};
-const generateHash = (code) => encodeURIComponent(btoa(code));
-
-function useRepl({ tune, autolink = true, onEvent, onDraw: onDrawProp }) {
-  const id = useMemo(() => s4(), []);
-  const [code, setCode] = useState(tune);
-  const [activeCode, setActiveCode] = useState();
-  const [log, setLog] = useState('');
-  const [error, setError] = useState();
-  const [pending, setPending] = useState(false);
-  const [hash, setHash] = useState('');
-  const [pattern, setPattern] = useState();
-  const dirty = useMemo(() => code !== activeCode || error, [code, activeCode, error]);
-  const pushLog = useCallback((message) => setLog((log) => log + `${log ? '\n\n' : ''}${message}`), []);
-
-  // below block allows disabling the highlighting by including "strudel disable-highlighting" in the code (as comment)
-  const onDraw = useMemo(() => {
-    if (activeCode && !activeCode.includes('strudel disable-highlighting')) {
-      return (time, event) => onDrawProp?.(time, event, activeCode);
-    }
-  }, [activeCode, onDrawProp]);
-
-  const hideHeader = useMemo(() => activeCode && activeCode.includes('strudel hide-header'), [activeCode]);
-  const hideConsole = useMemo(() => activeCode && activeCode.includes('strudel hide-console'), [activeCode]);
-  // cycle hook to control scheduling
-  const cycle = useCycle({
-    onDraw,
-    onEvent: useCallback(
-      (time, event, currentTime) => {
-        try {
-          onEvent?.(event);
-          if (event.context.logs?.length) {
-            event.context.logs.forEach(pushLog);
-          }
-          const { onTrigger = webaudioOutputTrigger } = event.context;
-          onTrigger(time, event, currentTime, 1 /* cps */);
-        } catch (err) {
-          console.warn(err);
-          err.message = 'unplayable event: ' + err?.message;
-          pushLog(err.message); // not with setError, because then we would have to setError(undefined) on next playable event
-        }
-      },
-      [onEvent, pushLog],
-    ),
-    onQuery: useCallback(
-      (state) => {
-        try {
-          return pattern?.query(state) || [];
-        } catch (err) {
-          console.warn(err);
-          err.message = 'query error: ' + err.message;
-          setError(err);
-          return [];
-        }
-      },
-      [pattern],
-    ),
-    onSchedule: useCallback((_events, cycle) => logCycle(_events), []),
-    ready: !!pattern && !!activeCode,
-  });
-
-  const broadcast = usePostMessage(({ data: { from, type } }) => {
-    if (type === 'start' && from !== id) {
-      // console.log('message', from, type);
-      cycle.setStarted(false);
-      setActiveCode(undefined);
-    }
-  });
-
-  const activateCode = useCallback(
-    async (_code = code) => {
-      if (activeCode && !dirty) {
-        setError(undefined);
-        cycle.start();
-        return;
-      }
-      try {
-        setPending(true);
-        const parsed = await evaluate(_code);
-        cycle.start();
-        broadcast({ type: 'start', from: id });
-        setPattern(() => parsed.pattern);
-        if (autolink) {
-          window.location.hash = '#' + encodeURIComponent(btoa(code));
-        }
-        setHash(generateHash(code));
-        setError(undefined);
-        setActiveCode(_code);
-        setPending(false);
-      } catch (err) {
-        err.message = 'evaluation error: ' + err.message;
-        console.warn(err);
-        setError(err);
-      }
-    },
-    [activeCode, dirty, code, cycle, autolink, id, broadcast],
-  );
-  // logs events of cycle
-  const logCycle = (_events, cycle) => {
-    if (_events.length) ;
-  };
-
-  const togglePlay = () => {
-    if (!cycle.started) {
-      activateCode();
-    } else {
-      cycle.stop();
-    }
-  };
-
-  return {
-    hideHeader,
-    hideConsole,
-    pending,
-    code,
-    setCode,
-    pattern,
-    error,
-    cycle,
-    setPattern,
-    dirty,
-    log,
-    togglePlay,
-    setActiveCode,
-    activateCode,
-    activeCode,
-    pushLog,
-    hash,
-  };
-}
-
-/*
-cx.js - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/cx.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/>.
-*/
-
-function cx(...classes) {
-  // : Array<string | undefined>
-  return classes.filter(Boolean).join(' ');
-}
-
-let highlights = []; // actively highlighted events
-let lastEnd;
-
-function useHighlighting({ view, pattern, active }) {
-  useEffect(() => {
-    if (view) {
-      if (pattern && active) {
-        let frame = requestAnimationFrame(updateHighlights);
-
-        function updateHighlights() {
+function ue({ view: e, pattern: t, active: o, getTime: a }) {
+  const s = H([]), u = H();
+  L(() => {
+    if (e)
+      if (t && o) {
+        let d = requestAnimationFrame(function f() {
           try {
-            const audioTime = Tone.getTransport().seconds;
-            // force min framerate of 10 fps => fixes crash on tab refocus, where lastEnd could be far away
-            // see https://github.com/tidalcycles/strudel/issues/108
-            const begin = Math.max(lastEnd || audioTime, audioTime - 1 / 10);
-            const span = [begin, audioTime + 1 / 60];
-            lastEnd = audioTime + 1 / 60;
-            highlights = highlights.filter((hap) => hap.whole.end > audioTime); // keep only highlights that are still active
-            const haps = pattern.queryArc(...span).filter((hap) => hap.hasOnset());
-            highlights = highlights.concat(haps); // add potential new onsets
-            view.dispatch({ effects: setHighlights.of(highlights) }); // highlight all still active + new active haps
-          } catch (err) {
-            // console.log('error in updateHighlights', err);
-            view.dispatch({ effects: setHighlights.of([]) });
+            const c = a(), m = [Math.max(u.current || c, c - 1 / 10, 0), c + 1 / 60];
+            u.current = m[1], s.current = s.current.filter((g) => g.whole.end > c);
+            const h = t.queryArc(...m).filter((g) => g.hasOnset());
+            s.current = s.current.concat(h), e.dispatch({ effects: z.of(s.current) });
+          } catch {
+            e.dispatch({ effects: z.of([]) });
           }
-          frame = requestAnimationFrame(updateHighlights);
-        }
-
+          d = requestAnimationFrame(f);
+        });
         return () => {
-          cancelAnimationFrame(frame);
+          cancelAnimationFrame(d);
         };
-      } else {
-        highlights = [];
-        view.dispatch({ effects: setHighlights.of([]) });
-      }
-    }
-  }, [pattern, active, view]);
+      } else
+        s.current = [], e.dispatch({ effects: z.of([]) });
+  }, [t, o, e]);
 }
-
-var tailwind = '';
-
-const container = "_container_3i85k_1";
-const header = "_header_3i85k_5";
-const buttons = "_buttons_3i85k_9";
-const button = "_button_3i85k_9";
-const buttonDisabled = "_buttonDisabled_3i85k_17";
-const error = "_error_3i85k_21";
-const body = "_body_3i85k_25";
-var styles = {
-	container: container,
-	header: header,
-	buttons: buttons,
-	button: button,
-	buttonDisabled: buttonDisabled,
-	error: error,
-	body: body
+const fe = "_container_3i85k_1", me = "_header_3i85k_5", ge = "_buttons_3i85k_9", pe = "_button_3i85k_9", he = "_buttonDisabled_3i85k_17", be = "_error_3i85k_21", ve = "_body_3i85k_25", v = {
+  container: fe,
+  header: me,
+  buttons: ge,
+  button: pe,
+  buttonDisabled: he,
+  error: be,
+  body: ve
 };
-
-function Icon({ type }) {
-  return /* @__PURE__ */ React.createElement("svg", {
+function O({ type: e }) {
+  return /* @__PURE__ */ n.createElement("svg", {
     xmlns: "http://www.w3.org/2000/svg",
     className: "sc-h-5 sc-w-5",
     viewBox: "0 0 20 20",
     fill: "currentColor"
   }, {
-    refresh: /* @__PURE__ */ React.createElement("path", {
+    refresh: /* @__PURE__ */ n.createElement("path", {
       fillRule: "evenodd",
       d: "M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z",
       clipRule: "evenodd"
     }),
-    play: /* @__PURE__ */ React.createElement("path", {
+    play: /* @__PURE__ */ n.createElement("path", {
       fillRule: "evenodd",
       d: "M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z",
       clipRule: "evenodd"
     }),
-    pause: /* @__PURE__ */ React.createElement("path", {
+    pause: /* @__PURE__ */ n.createElement("path", {
       fillRule: "evenodd",
       d: "M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z",
       clipRule: "evenodd"
     })
-  }[type]);
+  }[e]);
 }
-
-function MiniRepl({ tune, hideOutsideView = false, init, onEvent, enableKeyboard }) {
-  const { code, setCode, pattern, activeCode, activateCode, evaluateOnly, error, cycle, dirty, togglePlay, stop } = useRepl({
-    tune,
-    autolink: false,
-    onEvent
-  });
-  useEffect(() => {
-    init && evaluateOnly();
-  }, [tune, init]);
-  const [view, setView] = useState();
-  const [ref, isVisible] = useInView({
+function Ee(e) {
+  return L(() => (window.addEventListener("message", e), () => window.removeEventListener("message", e)), [e]), _((t) => window.postMessage(t, "*"), []);
+}
+function we({
+  defaultOutput: e,
+  interval: t,
+  getTime: o,
+  evalOnMount: a = !1,
+  initialCode: s = "",
+  autolink: u = !1,
+  beforeEval: d,
+  afterEval: f,
+  onEvalError: c,
+  onToggle: i
+}) {
+  const m = V(() => ye(), []), [h, g] = w(), [C, N] = w(), [p, y] = w(s), [M, S] = w(), [k, D] = w(), [F, x] = w(!1), b = p !== M, { scheduler: A, evaluate: T, start: J, stop: q, pause: Q } = V(
+    () => oe({
+      interval: t,
+      defaultOutput: e,
+      onSchedulerError: g,
+      onEvalError: (l) => {
+        N(l), c?.(l);
+      },
+      getTime: o,
+      transpiler: ne,
+      beforeEval: ({ code: l }) => {
+        y(l), d?.();
+      },
+      afterEval: ({ pattern: l, code: P }) => {
+        S(P), D(l), N(), g(), u && (window.location.hash = "#" + encodeURIComponent(btoa(P))), f?.();
+      },
+      onToggle: (l) => {
+        x(l), i?.(l);
+      }
+    }),
+    [e, t, o]
+  ), W = Ee(({ data: { from: l, type: P } }) => {
+    P === "start" && l !== m && q();
+  }), R = _(
+    async (l = !0) => {
+      await T(p, l), W({ type: "start", from: m });
+    },
+    [T, p]
+  ), I = H();
+  return L(() => {
+    !I.current && a && p && (I.current = !0, R());
+  }, [R, a, p]), L(() => () => {
+    A.stop();
+  }, [A]), {
+    code: p,
+    setCode: y,
+    error: h || C,
+    schedulerError: h,
+    scheduler: A,
+    evalError: C,
+    evaluate: T,
+    activateCode: R,
+    activeCode: M,
+    isDirty: b,
+    pattern: k,
+    started: F,
+    start: J,
+    stop: q,
+    pause: Q,
+    togglePlay: async () => {
+      F ? A.pause() : await R();
+    }
+  };
+}
+function ye() {
+  return Math.floor((1 + Math.random()) * 65536).toString(16).substring(1);
+}
+const ke = () => re().currentTime;
+function Se({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
+  const {
+    code: s,
+    setCode: u,
+    evaluate: d,
+    activateCode: f,
+    error: c,
+    isDirty: i,
+    activeCode: m,
+    pattern: h,
+    started: g,
+    scheduler: C,
+    togglePlay: N,
+    stop: p
+  } = we({
+    initialCode: e,
+    defaultOutput: te,
+    getTime: ke
+  }), [y, M] = w(), [S, k] = ee({
     threshold: 0.01
-  });
-  const wasVisible = useRef();
-  const show = useMemo(() => {
-    if (isVisible || !hideOutsideView) {
-      wasVisible.current = true;
-    }
-    return isVisible || wasVisible.current;
-  }, [isVisible, hideOutsideView]);
-  useHighlighting({ view, pattern, active: cycle.started && !activeCode?.includes("strudel disable-highlighting") });
-  useLayoutEffect(() => {
-    if (enableKeyboard) {
-      const handleKeyPress = async (e) => {
-        if (e.ctrlKey || e.altKey) {
-          if (e.code === "Enter") {
-            e.preventDefault();
-            flash(view);
-            await activateCode();
-          } else if (e.code === "Period") {
-            cycle.stop();
-            e.preventDefault();
-          }
-        }
+  }), D = H(), F = V(() => ((k || !t) && (D.current = !0), k || D.current), [k, t]);
+  return ue({
+    view: y,
+    pattern: h,
+    active: g && !m?.includes("strudel disable-highlighting"),
+    getTime: () => C.getPhase()
+  }), j(() => {
+    if (a) {
+      const x = async (b) => {
+        (b.ctrlKey || b.altKey) && (b.code === "Enter" ? (b.preventDefault(), ce(y), await f()) : b.code === "Period" && (p(), b.preventDefault()));
       };
-      window.addEventListener("keydown", handleKeyPress, true);
-      return () => window.removeEventListener("keydown", handleKeyPress, true);
+      return window.addEventListener("keydown", x, !0), () => window.removeEventListener("keydown", x, !0);
     }
-  }, [enableKeyboard, pattern, code, activateCode, cycle, view]);
-  return /* @__PURE__ */ React.createElement("div", {
-    className: styles.container,
-    ref
-  }, /* @__PURE__ */ React.createElement("div", {
-    className: styles.header
-  }, /* @__PURE__ */ React.createElement("div", {
-    className: styles.buttons
-  }, /* @__PURE__ */ React.createElement("button", {
-    className: cx(styles.button, cycle.started ? "sc-animate-pulse" : ""),
-    onClick: () => togglePlay()
-  }, /* @__PURE__ */ React.createElement(Icon, {
-    type: cycle.started ? "pause" : "play"
-  })), /* @__PURE__ */ React.createElement("button", {
-    className: cx(dirty ? styles.button : styles.buttonDisabled),
-    onClick: () => activateCode()
-  }, /* @__PURE__ */ React.createElement(Icon, {
+  }, [a, h, s, d, p, y]), /* @__PURE__ */ n.createElement("div", {
+    className: v.container,
+    ref: S
+  }, /* @__PURE__ */ n.createElement("div", {
+    className: v.header
+  }, /* @__PURE__ */ n.createElement("div", {
+    className: v.buttons
+  }, /* @__PURE__ */ n.createElement("button", {
+    className: K(v.button, g ? "sc-animate-pulse" : ""),
+    onClick: () => N()
+  }, /* @__PURE__ */ n.createElement(O, {
+    type: g ? "pause" : "play"
+  })), /* @__PURE__ */ n.createElement("button", {
+    className: K(i ? v.button : v.buttonDisabled),
+    onClick: () => f()
+  }, /* @__PURE__ */ n.createElement(O, {
     type: "refresh"
-  }))), error && /* @__PURE__ */ React.createElement("div", {
-    className: styles.error
-  }, error.message)), /* @__PURE__ */ React.createElement("div", {
-    className: styles.body
-  }, show && /* @__PURE__ */ React.createElement(CodeMirror, {
-    value: code,
-    onChange: setCode,
-    onViewChanged: setView
+  }))), c && /* @__PURE__ */ n.createElement("div", {
+    className: v.error
+  }, c.message)), /* @__PURE__ */ n.createElement("div", {
+    className: v.body
+  }, F && /* @__PURE__ */ n.createElement(de, {
+    value: s,
+    onChange: u,
+    onViewChanged: M
   })));
 }
-
-/*
-useWebMidi.js - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/repl/src/useWebMidi.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/>.
-*/
-
-function useWebMidi(props) {
-  const { ready, connected, disconnected } = props;
-  const [loading, setLoading] = useState(true);
-  const [outputs, setOutputs] = useState(WebMidi?.outputs || []);
-  useEffect(() => {
-    enableWebMidi()
-      .then(() => {
-        // Reacting when a new device becomes available
-        WebMidi.addListener('connected', (e) => {
-          setOutputs([...WebMidi.outputs]);
-          connected?.(WebMidi, e);
-        });
-        // Reacting when a device becomes unavailable
-        WebMidi.addListener('disconnected', (e) => {
-          setOutputs([...WebMidi.outputs]);
-          disconnected?.(WebMidi, e);
-        });
-        ready?.(WebMidi);
-        setLoading(false);
-      })
-      .catch((err) => {
-        if (err) {
-          console.error(err);
-          //throw new Error("Web Midi could not be enabled...");
-          console.warn('Web Midi could not be enabled..');
-          return;
-        }
-      });
-  }, [ready, connected, disconnected, outputs]);
-  const outputByName = (name) => WebMidi.getOutputByName(name);
-  return { loading, outputs, outputByName };
-}
-
-export { CodeMirror, MiniRepl, cx, flash, useCycle, useHighlighting, usePostMessage, useRepl, useWebMidi };
+const Te = (e) => j(() => (window.addEventListener("keydown", e, !0), () => window.removeEventListener("keydown", e, !0)), [e]);
+export {
+  de as CodeMirror,
+  Se as MiniRepl,
+  K as cx,
+  ce as flash,
+  ue as useHighlighting,
+  Te as useKeydown,
+  Ee as usePostMessage,
+  we as useStrudel
+};

packages/react/dist/style.css

@@ -1 +1 @@
-.cm-editor{background-color:transparent!important;height:100%;z-index:11;font-size:16px}.cm-theme-light{width:100%}.cm-line>*{background:#00000095}*,:before,:after{--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.sc-h-5{height:1.25rem}.sc-w-5{width:1.25rem}@keyframes sc-pulse{50%{opacity:.5}}.sc-animate-pulse{animation:sc-pulse 2s cubic-bezier(.4,0,.6,1) infinite}._container_3i85k_1{overflow:hidden;border-radius:.375rem;--tw-bg-opacity: 1;background-color:rgb(34 34 34 / var(--tw-bg-opacity))}._header_3i85k_5{display:flex;justify-content:space-between;border-top-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity))}._buttons_3i85k_9{display:flex}._button_3i85k_9{display:flex;width:4rem;cursor:pointer;align-items:center;justify-content:center;border-right-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}._button_3i85k_9:hover{--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity))}._buttonDisabled_3i85k_17{display:flex;width:4rem;cursor:pointer;cursor:not-allowed;align-items:center;justify-content:center;--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(148 163 184 / var(--tw-text-opacity))}._error_3i85k_21{padding:.25rem;text-align:right;font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(254 202 202 / var(--tw-text-opacity))}._body_3i85k_25{position:relative;overflow:auto}
+.cm-editor{background-color:transparent!important;height:100%;z-index:11;font-size:18px}.cm-theme-light{width:100%}.cm-line>*{background:#00000095}*,:before,:after{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }::backdrop{--tw-border-spacing-x: 0;--tw-border-spacing-y: 0;--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.sc-h-5{height:1.25rem}.sc-w-5{width:1.25rem}@keyframes sc-pulse{50%{opacity:.5}}.sc-animate-pulse{animation:sc-pulse 2s cubic-bezier(.4,0,.6,1) infinite}._container_3i85k_1{overflow:hidden;border-radius:.375rem;--tw-bg-opacity: 1;background-color:rgb(34 34 34 / var(--tw-bg-opacity))}._header_3i85k_5{display:flex;justify-content:space-between;border-top-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity))}._buttons_3i85k_9{display:flex}._button_3i85k_9{display:flex;width:4rem;cursor:pointer;align-items:center;justify-content:center;border-right-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}._button_3i85k_9:hover{--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity))}._buttonDisabled_3i85k_17{display:flex;width:4rem;cursor:pointer;cursor:not-allowed;align-items:center;justify-content:center;--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(148 163 184 / var(--tw-text-opacity))}._error_3i85k_21{padding:.25rem;text-align:right;font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(254 202 202 / var(--tw-text-opacity))}._body_3i85k_25{position:relative;overflow:auto}

packages/react/examples/nano-repl/.gitignore

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

packages/react/examples/nano-repl/dist/assets/index.75f8960b.css

@@ -0,0 +1 @@
+.cm-editor{background-color:transparent!important;height:100%;z-index:11;font-size:16px}.cm-theme-light{width:100%}.cm-line>*{background:#00000095}*,:before,:after{box-sizing:border-box;border-width:0;border-style:solid;border-color:#e5e7eb}:before,:after{--tw-content: ""}html{line-height:1.5;-webkit-text-size-adjust:100%;-moz-tab-size:4;-o-tab-size:4;tab-size:4;font-family:ui-sans-serif,system-ui,-apple-system,BlinkMacSystemFont,Segoe UI,Roboto,Helvetica Neue,Arial,Noto Sans,sans-serif,"Apple Color Emoji","Segoe UI Emoji",Segoe UI Symbol,"Noto Color Emoji"}body{margin:0;line-height:inherit}hr{height:0;color:inherit;border-top-width:1px}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,samp,pre{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-size:1em}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{text-indent:0;border-color:inherit;border-collapse:collapse}button,input,optgroup,select,textarea{font-family:inherit;font-size:100%;line-height:inherit;color:inherit;margin:0;padding:0}button,select{text-transform:none}button,[type=button],[type=reset],[type=submit]{-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dl,dd,h1,h2,h3,h4,h5,h6,hr,figure,p,pre{margin:0}fieldset{margin:0;padding:0}legend{padding:0}ol,ul,menu{list-style:none;margin:0;padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{opacity:1;color:#9ca3af}input:-ms-input-placeholder,textarea:-ms-input-placeholder{opacity:1;color:#9ca3af}input::placeholder,textarea::placeholder{opacity:1;color:#9ca3af}button,[role=button]{cursor:pointer}:disabled{cursor:default}img,svg,video,canvas,audio,iframe,embed,object{display:block;vertical-align:middle}img,video{max-width:100%;height:auto}[hidden]{display:none}*,:before,:after{--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.fixed{position:fixed}.absolute{position:absolute}.bottom-0{bottom:0px}.z-\[12\]{z-index:12}.flex{display:flex}.w-full{width:100%}.justify-center{justify-content:center}.space-x-2>:not([hidden])~:not([hidden]){--tw-space-x-reverse: 0;margin-right:calc(.5rem * var(--tw-space-x-reverse));margin-left:calc(.5rem * calc(1 - var(--tw-space-x-reverse)))}.rounded-t-md{border-top-left-radius:.375rem;border-top-right-radius:.375rem}.bg-slate-500{--tw-bg-opacity: 1;background-color:rgb(100 116 139 / var(--tw-bg-opacity))}.px-2{padding-left:.5rem;padding-right:.5rem}body{background:#123}

packages/react/examples/nano-repl/dist/assets/index.e7ac54e9.js

@@ -0,0 +1 @@
+import{f as s,i as t,h as o,j as d,q as f,l as p,k as u,p as i,o as l,n as r,w as g}from"./index.ec9f9930.js";export{s as getAudioContext,t as getCachedBuffer,o as getDestination,d as getLoadedBuffer,f as getLoadedSamples,p as loadBuffer,u as loadGithubSamples,i as panic,l as resetLoadedSamples,r as samples,g as webaudioOutput};

packages/react/examples/nano-repl/dist/assets/serial.b42b098c.js

@@ -0,0 +1 @@
+import{P as w}from"./index.ec9f9930.js";var i,f=!1;async function b(a=38400){if(!f){if(f=!0,i)return i;if("serial"in navigator){const r=await navigator.serial.requestPort();await r.open({baudRate:a});const o=new TextEncoderStream;o.readable.pipeTo(r.writable);const s=o.writable.getWriter();i=function(e){s.write(e)}}else throw"Webserial is not available in this browser."}}const g=.1;w.prototype.serial=function(...a){return this._withHap(r=>{i||b(...a);const o=(s,e,u)=>{var t="";if(typeof e.value=="object")if("action"in e.value){t+=e.value.action+"(";var c=!0;for(const[n,l]of Object.entries(e.value))n!=="action"&&(c?c=!1:t+=",",t+=`${n}:${l}`);t+=")"}else for(const[n,l]of Object.entries(e.value))t+=`${n}:${l};`;else t=e.value;const v=(s-u+g)*1e3;window.setTimeout(i,v,t)};return r.setContext({...r.context,onTrigger:o})})};export{b as getWriter};

packages/react/examples/nano-repl/dist/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Strudel Nano REPL</title>
+    <script type="module" crossorigin src="./assets/index.ec9f9930.js"></script>
+    <link rel="stylesheet" href="./assets/index.75f8960b.css">
+  </head>
+  <body>
+    <div id="root"></div>
+    
+  </body>
+</html>

packages/react/examples/nano-repl/index.html

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Strudel Nano REPL</title>
+  </head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/src/main.jsx"></script>
+  </body>
+</html>

packages/react/examples/nano-repl/package.json

@@ -0,0 +1,24 @@
+{
+  "name": "nano-repl",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@types/react": "^18.0.17",
+    "@types/react-dom": "^18.0.6",
+    "@vitejs/plugin-react": "^2.0.1",
+    "autoprefixer": "^10.4.8",
+    "postcss": "^8.4.16",
+    "tailwindcss": "^3.1.8",
+    "vite": "^3.0.7"
+  }
+}

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

@@ -0,0 +1,139 @@
+import { evalScope, controls } from '@strudel.cycles/core';
+import { getAudioContext, panic, webaudioOutput } from '@strudel.cycles/webaudio';
+import { useCallback, useState } from 'react';
+import CodeMirror, { flash } from '../../../src/components/CodeMirror6';
+import useKeydown from '../../../src/hooks/useKeydown.mjs';
+import useStrudel from '../../../src/hooks/useStrudel';
+import useHighlighting from '../../../src/hooks/useHighlighting';
+import './style.css';
+// import { prebake } from '../../../../../repl/src/prebake.mjs';
+
+// TODO: only import stuff when play is pressed?
+evalScope(
+  controls,
+  import('@strudel.cycles/core'),
+  // import('@strudel.cycles/tone'),
+  // import('@strudel.cycles/midi'), // TODO: find out why midi loads tone.js
+  import('@strudel.cycles/tonal'),
+  import('@strudel.cycles/mini'),
+  import('@strudel.cycles/xen'),
+  import('@strudel.cycles/webaudio'),
+  import('@strudel.cycles/osc'),
+  import('@strudel.cycles/webdirt'),
+  import('@strudel.cycles/serial'),
+  import('@strudel.cycles/soundfonts'),
+);
+
+const defaultTune = `samples({
+  bd: ['bd/BT0AADA.wav','bd/BT0AAD0.wav','bd/BT0A0DA.wav','bd/BT0A0D3.wav','bd/BT0A0D0.wav','bd/BT0A0A7.wav'],
+  sd: ['sd/rytm-01-classic.wav','sd/rytm-00-hard.wav'],
+  hh: ['hh27/000_hh27closedhh.wav','hh/000_hh3closedhh.wav'],
+}, 'github:tidalcycles/Dirt-Samples/master/');
+stack(
+  s("bd,[~ <sd!3 sd(3,4,2)>],hh(3,4)") // drums
+  .speed(perlin.range(.7,.9)) // random sample speed variation
+  //.hush()
+  ,"<a1 b1*2 a1(3,8) e2>" // bassline
+  .off(1/8,x=>x.add(12).degradeBy(.5)) // random octave jumps
+  .add(perlin.range(0,.5)) // random pitch variation
+  .superimpose(add(.05)) // add second, slightly detuned voice
+  .n() // wrap in "n"
+  .decay(.15).sustain(0) // make each note of equal length
+  .s('sawtooth') // waveform
+  .gain(.4) // turn down
+  .cutoff(sine.slow(7).range(300,5000)) // automate cutoff
+  //.hush()
+  ,"<Am7!3 <Em7 E7b13 Em7 Ebm7b5>>".voicings() // chords
+  .superimpose(x=>x.add(.04)) // add second, slightly detuned voice
+  .add(perlin.range(0,.5)) // random pitch variation
+  .n() // wrap in "n"
+  .s('square') // waveform
+  .gain(.16) // turn down
+  .cutoff(500) // fixed cutoff
+  .attack(1) // slowly fade in
+  //.hush()
+  ,"a4 c5 <e6 a6>".struct("x(5,8)")
+  .superimpose(x=>x.add(.04)) // add second, slightly detuned voice
+  .add(perlin.range(0,.5)) // random pitch variation
+  .n() // wrap in "n"
+  .decay(.1).sustain(0) // make notes short
+  .s('triangle') // waveform
+  .degradeBy(perlin.range(0,.5)) // randomly controlled random removal :)
+  .echoWith(4,.125,(x,n)=>x.gain(.15*1/(n+1))) // echo notes
+  //.hush()
+)
+.fast(2/3)`;
+
+// await prebake();
+
+const ctx = getAudioContext();
+const getTime = () => ctx.currentTime;
+function App() {
+  const [code, setCode] = useState(defaultTune);
+  const [view, setView] = useState();
+  // const [code, setCode] = useState(`"c3".note().slow(2)`);
+  const { scheduler, evaluate, schedulerError, evalError, isDirty, activeCode, pattern } = useStrudel({
+    code,
+    defaultOutput: webaudioOutput,
+    getTime,
+  });
+
+  useHighlighting({
+    view,
+    pattern,
+    active: !activeCode?.includes('strudel disable-highlighting'),
+    getTime: () => scheduler.getPhase(),
+  });
+
+  const error = evalError || schedulerError;
+  useKeydown(
+    useCallback(
+      async (e) => {
+        if (e.ctrlKey || e.altKey) {
+          if (e.code === 'Enter') {
+            e.preventDefault();
+            flash(view);
+            await evaluate(code);
+            if (e.shiftKey) {
+              panic();
+              scheduler.stop();
+              scheduler.start();
+            }
+            if (!scheduler.started) {
+              scheduler.start();
+            }
+          } else if (e.code === 'Period') {
+            scheduler.pause();
+            panic();
+            e.preventDefault();
+          }
+        }
+      },
+      [scheduler, evaluate, view],
+    ),
+  );
+  return (
+    <div>
+      {/* <textarea value={code} onChange={(e) => setCode(e.target.value)} cols="64" rows="30" /> */}
+      <nav className="z-[12] w-full flex justify-center absolute bottom-0">
+        <div className="bg-slate-500 space-x-2 px-2 rounded-t-md">
+          <button
+            onClick={async () => {
+              await evaluate(code);
+              await getAudioContext().resume();
+              scheduler.start();
+            }}
+          >
+            start
+          </button>
+          <button onClick={() => scheduler.stop()}>stop</button>
+          {isDirty && <button onClick={() => evaluate(code)}>eval</button>}
+        </div>
+        {error && <p>error {error.message}</p>}
+      </nav>
+      <CodeMirror value={code} onChange={setCode} onViewChanged={setView} />
+    </div>
+  );
+}
+
+export default App;