meetup talk

add new deck for meetup
Merge branch 'talk' of https://github.com/tidalcycles/strudel into talk
2026-07-14 14:53:45 -04:00 · 2022-09-11 22:11:25 +02:00 · 2022-09-09 21:38:35 +02:00 · 2022-09-04 21:01:55 +02:00 · 2022-07-28 22:23:05 +02:00 · 2022-07-19 08:59:46 +02:00
353 changed files with 22393 additions and 45060 deletions
@@ -1,46 +0,0 @@
-name: Build and Deploy
-
-on: [workflow_dispatch]
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-  deployments: write
-
-# Allow one concurrent deployment
-concurrency:
-  group: "pages"
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: "npm"
-      - name: Install Dependencies
-        run: npm ci && cd repl && npm ci && cd ../tutorial && npm ci
-
-      - name: Build
-        run: npm run build
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v2
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          # Upload entire repository
-          path: "./out"
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v1
@@ -7,7 +7,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node-version: [18]
+        node-version: [16, 17]

    steps:
    - uses: actions/checkout@v2
@@ -35,6 +35,4 @@ tutorial.rendered.mdx
 doc.json
 talk/public/EmuSP12
 talk/public/samples
-server/samples/old
-repl/stats.html
-coverage
+server/samples/old
@@ -2,8 +2,5 @@
    "cSpell.words": [
        "subspan",
        "vals"
-    ],
-    "yaml.schemas": {
-      "https://json.schemastore.org/github-workflow.json": "file:///home/felix/projects/strudel/.github/workflows/deploy.yml"
-    }
+    ]
 }
@@ -12,7 +12,7 @@ To get in touch with the contributors, either

 ## Ask a Question

-If you have any questions about strudel, make sure you've read the
+If you have any questions about strudel, make sure you've read the 
 [tutorial](https://strudel.tidalcycles.org/tutorial/) to find out if it answers your question.
 If not, use one of the Communication Channels above!

@@ -31,9 +31,10 @@ Use one of the Communication Channels listed above.

 ## Improve the Tutorial

-If you find some weak spots in the [tutorial](https://strudel.tidalcycles.org/),
+If you find some weak spots in the [tutorial](https://strudel.tidalcycles.org/), 
 you are welcome to improve them by editing [this file](https://github.com/tidalcycles/strudel/blob/main/tutorial/tutorial.mdx).

+
 This will even work without setting up a development environment, only a github account is required.

 ## Propose a Feature
@@ -51,11 +52,11 @@ Please check that it has not been reported before.
 To fix a bug that has been reported,

 1. check that nobody else is already fixing it and respond to the issue to let people know you're on it
-2. fork the repository
-3. make sure you've setup the project (see below)
-4. hopefully fix the bug
-5. make sure the tests pass
-6. send a pull request
+3. fork the repository
+4. make sure you've setup the project (see below)
+5. hopefully fix the bug
+6. make sure the tests pass
+7. send a pull request

 ## Write Tests

@@ -79,7 +80,7 @@ cd repl && npm i # install repl dependencies
 npm run start # start repl
 ```

-Those commands might look slightly different for your OS.
+Those commands might look slightly different for your OS. 
 Please report any problems you've had with the setup instructions!

 ## Code Style
@@ -96,7 +97,7 @@ If you use VSCode, you can

 The project is split into multiple [packages](https://github.com/tidalcycles/strudel/tree/main/packages) with independent versioning.
 When you run `npm i` on the root folder, [npm workspaces](https://docs.npmjs.com/cli/v7/using-npm/workspaces) will symlink all packages
-in the `node_modules` folder. This will allow any js file to import `@strudel.cycles/<package-name>` to get the local version,
+in the `node_modules` folder. This will allow any js file to import `@strudel.cycles/<package-name>` to get the local version, 
 which allows developing multiple packages at the same time

 ## Package Publishing
@@ -104,18 +105,9 @@ which allows developing multiple packages at the same time
 To publish all packages that have been changed since the last release, run:

 ```sh
-npm login
 npx lerna publish
 ```

-### New Packages
-
-To add a new package, you have to publish it manually the first time, using:
-
-```sh
-cd packages/<package-name> && npm publish --access public
-```
-
 ## Have Fun

 Remember to have fun, and that this project is driven by the passion of volunteers!
@@ -38,12 +38,6 @@ Click on the package names to find out more about each one.

 There are many ways to contribute to this project! See [contribution guide](./CONTRIBUTING.md).

-<a href="https://github.com/tidalcycles/strudel/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=tidalcycles/strudel" />
-</a>
-
-Made with [contrib.rocks](https://contrib.rocks).
-
 ## Community

 There is a #strudel channel on the TidalCycles discord: <https://discord.com/invite/HGEdXmRkzT>
@@ -1,13 +1,10 @@
 {
  "name": "@strudel.cycles/monorepo",
-  "version": "0.0.4",
+  "version": "0.0.1",
  "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",
+    "test": "npm run test --workspaces --if-present && cd repl && npm run test",
    "bootstrap": "lerna bootstrap",
    "setup": "npm i && npm run bootstrap && cd repl && npm i && cd ../tutorial && npm i",
    "snapshot": "cd repl && npm run snapshot",
@@ -15,7 +12,7 @@
    "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",
+    "deploy": "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"
  },
@@ -40,15 +37,12 @@
  },
  "homepage": "https://strudel.tidalcycles.org",
  "devDependencies": {
-    "@vitest/ui": "^0.21.1",
-    "c8": "^7.12.0",
    "events": "^3.3.0",
    "gh-pages": "^4.0.0",
    "jsdoc": "^3.6.10",
    "jsdoc-json": "^2.0.2",
    "jsdoc-to-markdown": "^7.1.1",
    "lerna": "^4.0.0",
-    "rollup-plugin-visualizer": "^5.8.1",
-    "vitest": "^0.21.1"
+    "mocha": "^9.1.4"
  }
 }
@@ -1,15 +0,0 @@
-# Packages
-
-Each folder represents one of the @strudel.cycles/* packages [published to npm](https://www.npmjs.com/org/strudel.cycles).
-
-To understand how those pieces connect, refer to the [Technical Manual](https://github.com/tidalcycles/strudel/wiki/Technical-Manual) or the individual READMEs.
-
-This is a graphical view of all the packages: [full screen](https://raw.githubusercontent.com/tidalcycles/strudel/main/dependencies.svg)
-
-![dependencies](https://raw.githubusercontent.com/tidalcycles/strudel/main/dependencies.svg)
-
-Generated with
-
-```sh
-npx depcruise --include-only "^packages" -X "node_modules" --output-type dot packages | dot -T svg > dependencygraph.svg
-```
@@ -1 +0,0 @@
-examples
@@ -11,7 +11,7 @@ const generic_params = [
  /**
   * Select a sound / sample by name.
   *
-   * <details style={{display:'none'}}>
+   * <details>
   * <summary>show all sounds</summary>
   *
   * 808 (6) 808bd (25) 808cy (25) 808hc (5) 808ht (5) 808lc (5) 808lt (5) 808mc (5) 808mt (5) 808oh (5) 808sd (25) 909 (1) ab (12) ade (10) ades2 (9) ades3 (7) ades4 (6) alex (2) alphabet (26) amencutup (32) armora (7) arp (2) arpy (11) auto (11) baa (7) baa2 (7) bass (4) bass0 (3) bass1 (30) bass2 (5) bass3 (11) bassdm (24) bassfoo (3) battles (2) bd (24) bend (4) bev (2) bin (2) birds (10) birds3 (19) bleep (13) blip (2) blue (2) bottle (13) breaks125 (2) breaks152 (1) breaks157 (1) breaks165 (1) breath (1) bubble (8) can (14) casio (3) cb (1) cc (6) chin (4) circus (3) clak (2) click (4) clubkick (5) co (4) coins (1) control (2) cosmicg (15) cp (2) cr (6) crow (4) d (4) db (13) diphone (38) diphone2 (12) dist (16) dork2 (4) dorkbot (2) dr (42) dr2 (6) dr55 (4) dr_few (8) drum (6) drumtraks (13) e (8) east (9) electro1 (13) em2 (6) erk (1) f (1) feel (7) feelfx (8) fest (1) fire (1) flick (17) fm (17) foo (27) future (17) gab (10) gabba (4) gabbaloud (4) gabbalouder (4) glasstap (3) glitch (8) glitch2 (8) gretsch (24) gtr (3) h (7) hand (17) hardcore (12) hardkick (6) haw (6) hc (6) hh (13) hh27 (13) hit (6) hmm (1) ho (6) hoover (6) house (8) ht (16) if (5) ifdrums (3) incoming (8) industrial (32) insect (3) invaders (18) jazz (8) jungbass (20) jungle (13) juno (12) jvbass (13) kicklinn (1) koy (2) kurt (7) latibro (8) led (1) less (4) lighter (33) linnhats (6) lt (16) made (7) made2 (1) mash (2) mash2 (4) metal (10) miniyeah (4) monsterb (6) moog (7) mouth (15) mp3 (4) msg (9) mt (16) mute (28) newnotes (15) noise (1) noise2 (8) notes (15) numbers (9) oc (4) odx (15) off (1) outdoor (6) pad (3) padlong (1) pebbles (1) perc (6) peri (15) pluck (17) popkick (10) print (11) proc (2) procshort (8) psr (30) rave (8) rave2 (4) ravemono (2) realclaps (4) reverbkick (1) rm (2) rs (1) sax (22) sd (2) seawolf (3) sequential (8) sf (18) sheffield (1) short (5) sid (12) sine (6) sitar (8) sn (52) space (18) speakspell (12) speech (7) speechless (10) speedupdown (9) stab (23) stomp (10) subroc3d (11) sugar (2) sundance (6) tabla (26) tabla2 (46) tablex (3) tacscan (22) tech (13) techno (7) tink (5) tok (4) toys (13) trump (11) ul (10) ulgab (5) uxay (3) v (6) voodoo (5) wind (10) wobble (1) world (3) xmas (1) yeah (31)
@@ -23,7 +23,7 @@ const generic_params = [
   * @name s
   * @param {string | Pattern} sound The sound / pattern of sounds to pick
   * @example
-   * s("bd hh")
+   * s("bd hh").osc()
   *
   */
  ['s', 's', 'sound'],
@@ -40,6 +40,11 @@ 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'],
@@ -57,12 +62,12 @@ const generic_params = [
   */
  ['f', 'accelerate', 'a pattern of numbers that speed up (or slow down) samples while they play.'],
  /**
-   * Controls the gain by an exponential amount.
+   * Like {@link amp}, but exponential.
   *
   * @name gain
   * @param {number | Pattern} amount gain.
   * @example
-   * s("hh*8").gain(".4!2 1 .4!2 1 .4 1")
+   * s("bd*8").gain(".7*2 1 .7*2 1 .7 1").osc()
   *
   */
  [
@@ -95,18 +100,6 @@ 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.
@@ -136,7 +129,7 @@ const generic_params = [
   * @name bandf
   * @param {number | Pattern} frequency center frequency
   * @example
-   * s("bd sd,hh*3").bandf("<1000 2000 4000 8000>")
+   * s("bd sd").bandf("<1000 2000 4000 8000>").osc()
   *
   */
  ['f', 'bandf', 'A pattern of numbers from 0 to 1. Sets the center frequency of the band-pass filter.'],
@@ -147,19 +140,17 @@ const generic_params = [
   * @name bandq
   * @param {number | Pattern} q q factor
   * @example
-   * s("bd sd").bandf(500).bandq("<0 1 2 3>")
+   * s("bd sd").bandf(2000).bandq("<.2 .9>").osc()
   *
   */
  ['f', 'bandq', 'a pattern of anumbers from 0 to 1. Sets the q-factor of the band-pass filter.'],
  /**
   * a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.
   *
-   * @memberof Pattern
   * @name begin
   * @param {number | Pattern} amount between 0 and 1, where 1 is the length of the sample
   * @example
-   * samples({ rave: 'rave/AREUREADY.wav' }, 'github:tidalcycles/Dirt-Samples/master/')
-   * s("rave").begin("<0 .25 .5 .75>")
+   * s("rave").begin("<0 .25 .5 .75>").osc()
   *
   */
  [
@@ -168,13 +159,12 @@ const generic_params = [
    'a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.',
  ],
  /**
-   * The same as .begin, but cuts off the end off each sample.
+   * The same as {@link begin}, but cuts off the end off each sample.
   *
-   * @memberof Pattern
   * @name end
   * @param {number | Pattern} length 1 = whole sample, .5 = half sample, .25 = quarter sample etc..
   * @example
-   * s("bd*2,oh*4").end("<.1 .2 .5 1>")
+   * s("bd*2,ho*4").end("<.1 .2 .5 1>").osc()
   *
   */
  [
@@ -212,7 +202,7 @@ const generic_params = [
   * @name crush
   * @param {number | Pattern} depth between 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).
   * @example
-   * s("<bd sd>,hh*3").fast(2).crush("<16 8 7 6 5 4 3 2>")
+   * s("<bd sd>,hh*3,jvbass*2").fast(2).crush("<16 8 7 6 5 4 3 2>").osc()
   *
   */
  [
@@ -221,12 +211,12 @@ const generic_params = [
    'bit crushing, a pattern of numbers from 1 (for drastic reduction in bit-depth) to 16 (for barely no reduction).',
  ],
  /**
-   * fake-resampling for lowering the sample rate. Caution: This effect seems to only work in chromium based browsers
+   * fake-resampling for lowering the sample rate
   *
   * @name coarse
   * @param {number | Pattern} factor 1 for original 2 for half, 3 for a third and so on.
   * @example
-   * s("bd sd,hh*4").coarse("<1 4 8 16 32>")
+   * s("xmas").coarse("<1 4 8 16 32>").osc()
   *
   */
  [
@@ -263,7 +253,7 @@ const generic_params = [
   * @name cutoff
   * @param {number | Pattern} frequency audible between 0 and 20000
   * @example
-   * s("bd sd,hh*3").cutoff("<4000 2000 1000 500 200 100>")
+   * s("bd,hh*2,<~ sd>").fast(2).cutoff("<4000 2000 1000 500 200 100>").osc()
   *
   */
  // TODO: add lpf synonym
@@ -274,7 +264,7 @@ const generic_params = [
   * @name hcutoff
   * @param {number | Pattern} frequency audible between 0 and 20000
   * @example
-   * s("bd sd,hh*4").hcutoff("<4000 2000 1000 500 200 100>")
+   * s("bd,hh*2,<~ sd>").fast(2).hcutoff("<4000 2000 1000 500 200 100>").osc()
   *
   */
  // TODO: add hpf synonym
@@ -284,12 +274,12 @@ const generic_params = [
    'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the high-pass filter. Also has alias @hpf@',
  ],
  /**
-   * Applies the resonance of the high-pass filter.
+   * Applies the cutoff frequency of the high-pass filter.
   *
   * @name hresonance
-   * @param {number | Pattern} q resonance factor between 0 and 50
+   * @param {number | Pattern} q resonance factor between 0 and 1
   * @example
-   * s("bd sd,hh*4").hcutoff(2000).hresonance("<0 10 20 30>")
+   * s("bd,hh*2,<~ sd>").fast(2).hcutoff(2000).hresonance("<0 .2 .4 .6>").osc()
   *
   */
  [
@@ -302,15 +292,15 @@ const generic_params = [
   * Applies the cutoff frequency of the low-pass filter.
   *
   * @name resonance
-   * @param {number | Pattern} q resonance factor between 0 and 50
+   * @param {number | Pattern} q resonance factor between 0 and 1
   * @example
-   * s("bd sd,hh*4").cutoff(2000).resonance("<0 10 20 30>")
+   * s("bd,hh*2,<~ sd>").fast(2).cutoff(2000).resonance("<0 .2 .4 .6>").osc()
   *
   */
  ['f', 'resonance', 'a pattern of numbers from 0 to 1. Specifies the resonance of the low-pass filter.'],
  // TODO: add lpq synonym?
  /**
-   * DJ filter, below 0.5 is low pass filter, above is high pass filter.
+   * Set detune of oscillators. Works only with some synths, see <a target="_blank" href="https://tidalcycles.org/docs/patternlib/tutorials/synthesizers">tidal doc</a>
   *
   * @name djf
   * @param {number | Pattern} cutoff below 0.5 is low pass filter, above is high pass filter
@@ -378,7 +368,7 @@ const generic_params = [
   * @name fadeTime
   * @param {number | Pattern} time between 0 and 1
   * @example
-   * s("oh*4").end(.1).fadeTime("<0 .2 .4 .8>").osc()
+   * s("ho*4").end(.1).fadeTime("<0 .2 .4 .8>").osc()
   *
   */
  [
@@ -503,7 +493,7 @@ const generic_params = [
   * @name pan
   * @param {number | Pattern} pan between 0 and 1, from left to right (assuming stereo), once round a circle (assuming multichannel)
   * @example
-   * s("[bd hh]*2").pan("<.5 1 .5 0>")
+   * s("[bd hh]*2").pan("<.5 1 .5 0>").osc()
   *
   */
  [
@@ -591,11 +581,6 @@ const generic_params = [
    'size',
    'a pattern of numbers from 0 to 1. Sets the perceptual size (reverb time) of the `room` to be used in reverb.',
  ],
-  [
-    'f',
-    'roomsize',
-    'a pattern of numbers from 0 to 1. Sets the perceptual size (reverb time) of the `room` to be used in reverb.',
-  ],
  // ['f', 'sagogo', ''],
  // ['f', 'sclap', ''],
  // ['f', 'sclaves', ''],
@@ -606,7 +591,7 @@ const generic_params = [
   * @name shape
   * @param {number | Pattern} distortion between 0 and 1
   * @example
-   * s("bd sd,hh*4").shape("<0 .2 .4 .6 .8>")
+   * s("bd sd").shape("<0 .2 .4 .6 .8 1>").osc()
   *
   */
  [
@@ -663,16 +648,16 @@ const generic_params = [
  // ['f', 'tomdecay', ''],
  // ['f', 'vcfegint', ''],
  // ['f', 'vcoegint', ''],
-  // TODO: Use a rest (~) to override the effect <- vowel
  /**
   *
   * Formant filter to make things sound like vowels.
   *
   * @name vowel
-   * @param {string | Pattern} vowel You can use a e i o u.
+   * @param {string | Pattern} vowel You can use a e i o u. Use a rest (~) to override the effect
   * @example
-   * note("c2 <eb2 <g2 g1>>").s('sawtooth')
-   * .vowel("<a e i <o u>>")
+   * vowel("a e i [o u]").slow(2)
+   * .n("<[0,7]!4 [2,7]!4>")
+   * .s('supersquare').osc()
   *
   */
  [
@@ -1,81 +0,0 @@
-/*
-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';
-
-export class Cyclist {
-  worker;
-  pattern;
-  started = false;
-  cps = 1; // TODO
-  getTime;
-  phase = 0;
-  constructor({ interval, onTrigger, onError, getTime, latency = 0.1 }) {
-    this.getTime = getTime;
-    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
-          // console.log('haps', haps.map((hap) => hap.value.n).join(' '));
-          haps.forEach((hap) => {
-            // console.log('hap', hap.value.n, hap.part.begin);
-            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) {
-          console.warn('scheduler error', e);
-          onError?.(e);
-        }
-      }, // called slightly before each cycle
-      interval, // duration of each cycle
-    );
-  }
-  getPhase() {
-    return this.phase;
-  }
-  start() {
-    if (!this.pattern) {
-      throw new Error('Scheduler: no pattern set! call .setPattern first.');
-    }
-    this.clock.start();
-    this.started = true;
-  }
-  pause() {
-    this.clock.stop();
-    delete this.origin;
-    this.started = false;
-  }
-  stop() {
-    delete this.origin;
-    this.clock.stop();
-    this.started = 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('')}`);
-  }
-}
@@ -21,7 +21,6 @@ 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;
@@ -25,70 +25,61 @@ const euclid = (pulses, steps, rotation = 0) => {
 * describe a large number of rhythms used in the most important music world traditions.
 *
 * @memberof Pattern
- * @name euclid
 * @param {number} pulses the number of onsets / beats
 * @param {number} steps the number of steps to fill
 * @param {number} rotation (optional) offset in steps
 * @returns Pattern
- * @example
- * // The Cuban tresillo pattern.
- * note("c3").euclid(3,8)
- */
-
-/**
- * @example // A thirteenth century Persian rhythm called Khafif-e-ramal.
- * note("c3").euclid(2,5)
- * @example // The archetypal pattern of the Cumbia from Colombia, as well as a Calypso rhythm from Trinidad.
- * note("c3").euclid(3,4)
- * @example // Another thirteenth century Persian rhythm by the name of Khafif-e-ramal, as well as a Rumanian folk-dance rhythm.
- * note("c3").euclid(3,5,2)
- * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
- * note("c3").euclid(3,7)
 * @example // The Cuban tresillo pattern.
- * note("c3").euclid(3,8)
+ * "c3".euclid(3,8)
+ * @example // A thirteenth century Persian rhythm called Khafif-e-ramal.
+ * "c3".euclid(2,5)
+ * @example // The archetypal pattern of the Cumbia from Colombia, as well as a Calypso rhythm from Trinidad.
+ * "c3".euclid(3,4)
+ * @example // Another thirteenth century Persian rhythm by the name of Khafif-e-ramal, as well as a Rumanian folk-dance rhythm.
+ * "c3".euclid(3,5,2)
+ * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
+ * "c3".euclid(3,7)
+ * @example // The Cuban tresillo pattern.
+ * "c3".euclid(3,8)
 * @example // Another Ruchenitza Bulgarian folk-dance rhythm.
- * note("c3").euclid(4,7)
+ * "c3".euclid(4,7)
 * @example // The Aksak rhythm of Turkey.
- * note("c3").euclid(4,9)
+ * "c3".euclid(4,9)
 * @example // The metric pattern used by Frank Zappa in his piece titled Outside Now.
- * note("c3").euclid(4,11)
+ * "c3".euclid(4,11)
 * @example // Yields the York-Samai pattern, a popular Arab rhythm.
- * note("c3").euclid(5,6)
+ * "c3".euclid(5,6)
 * @example // The Nawakhat pattern, another popular Arab rhythm.
- * note("c3").euclid(5,7)
+ * "c3".euclid(5,7)
 * @example // The Cuban cinquillo pattern.
- * note("c3").euclid(5,8)
+ * "c3".euclid(5,8)
 * @example // A popular Arab rhythm called Agsag-Samai.
- * note("c3").euclid(5,9)
+ * "c3".euclid(5,9)
 * @example // The metric pattern used by Moussorgsky in Pictures at an Exhibition.
- * note("c3").euclid(5,11)
+ * "c3".euclid(5,11)
 * @example // The Venda clapping pattern of a South African children’s song.
- * note("c3").euclid(5,12)
+ * "c3".euclid(5,12)
 * @example // The Bossa-Nova rhythm necklace of Brazil.
- * note("c3").euclid(5,16)
+ * "c3".euclid(5,16)
 * @example // A typical rhythm played on the Bendir (frame drum).
- * note("c3").euclid(7,8)
+ * "c3".euclid(7,8)
 * @example // A common West African bell pattern.
- * note("c3").euclid(7,12)
+ * "c3".euclid(7,12)
 * @example // A Samba rhythm necklace from Brazil.
- * note("c3").euclid(7,16,14)
+ * "c3".euclid(7,16,14)
 * @example // A rhythm necklace used in the Central African Republic.
- * note("c3").euclid(9,16)
+ * "c3".euclid(9,16)
 * @example // A rhythm necklace of the Aka Pygmies of Central Africa.
- * note("c3").euclid(11,24,14)
+ * "c3".euclid(11,24,14)
 * @example // Another rhythm necklace of the Aka Pygmies of the upper Sangha.
- * note("c3").euclid(13,24,5)
+ * "c3".euclid(13,24,5)
 */
 Pattern.prototype.euclid = function (pulses, steps, rotation = 0) {
  return this.struct(euclid(pulses, steps, rotation));
 };

 /**
- * Similar to `.euclid`, but each pulse is held until the next pulse, so there will be no gaps.
- * @name euclidLegato
- * @memberof Pattern
- * @example
- * n("g2").decay(.1).sustain(.3).euclidLegato(3,8)
+ * Similar to {@link Pattern#euclid}, but each pulse is held until the next pulse, so there will be no gaps.
 */
 Pattern.prototype.euclidLegato = function (pulses, steps, rotation = 0) {
  const bin_pat = euclid(pulses, steps, rotation);
@@ -1,55 +0,0 @@
-/*
-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 * as strudel from '@strudel.cycles/core';
-
-const { isPattern, Pattern } = strudel;
-
-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, Pattern.prototype.bootstrap());
-};
-
-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 };
-};
@@ -1,90 +0,0 @@
-<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()
-->
@@ -1,44 +0,0 @@
-<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>
@@ -1 +0,0 @@
-!dist
@@ -1,10 +0,0 @@
-# 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)
@@ -1 +0,0 @@
-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};
@@ -1 +0,0 @@
-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};
@@ -1,36 +0,0 @@
-<!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>
@@ -1,35 +0,0 @@
-<!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>
@@ -1,29 +0,0 @@
-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);
-});
@@ -1,885 +0,0 @@
-{
-  "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"
-      }
-    }
-  }
-}
@@ -1,15 +0,0 @@
-{
-  "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"
-  }
-}
@@ -1,39 +0,0 @@
-/* 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"))`;
@@ -4,10 +4,10 @@ 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 controls from './controls.mjs';
+export * from './controls.mjs';
 export * from './euclid.mjs';
 import Fraction from './fraction.mjs';
-export { Fraction, controls };
+export { Fraction };
 export * from './hap.mjs';
 export * from './pattern.mjs';
 export * from './signal.mjs';
@@ -15,9 +15,6 @@ 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 { 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';
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/core",
-	"version": "0.3.2",
+	"version": "0.1.2",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,11 +1,11 @@
 {
  "name": "@strudel.cycles/core",
-  "version": "0.3.2",
+  "version": "0.1.2",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
  "scripts": {
-    "test": "vitest run"
+    "test": "mocha --colors"
  },
  "repository": {
    "type": "git",
@@ -28,5 +28,8 @@
    "bjork": "^0.0.1",
    "fraction.js": "^4.2.0"
  },
+  "devDependencies": {
+    "mocha": "^9.2.2"
+  },
  "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2"
 }
@@ -10,15 +10,9 @@ import Hap from './hap.mjs';
 import State from './state.mjs';
 import { unionWithObj } from './value.mjs';

-import { compose, removeUndefineds, flatten, id, listRange, curry, mod, numeralArgs, parseNumeral } from './util.mjs';
+import { isNote, toMidi, compose, removeUndefineds, flatten, id, listRange, curry, mod } from './util.mjs';
 import drawLine from './drawLine.mjs';

-let stringParser;
-// parser is expected to turn a string into a pattern
-// if set, the reify function will parse all strings with it
-// intended to use with mini to automatically interpret all strings as mini notation
-export const setStringParser = (parser) => (stringParser = parser);
-
 /** @class Class representing a pattern. */
 export class Pattern {
  _Pattern = true; // this property is used to detect if a pattern that fails instanceof Pattern is an instance of another Pattern
@@ -38,10 +32,8 @@ export class Pattern {
   * @param {Fraction | number} end to time
   * @returns Hap[]
   * @example
-   * const pattern = sequence('a', ['b', 'c'])
-   * const haps = pattern.queryArc(0, 1)
-   * console.log(haps)
-   * silence
+   * const pattern = sequence('a', ['b', 'c']);
+   * const haps = pattern.queryArc(0, 1);
   */
  queryArc(begin, end) {
    return this.query(new State(new TimeSpan(begin, end)));
@@ -71,17 +63,6 @@ export class Pattern {
    return new Pattern((state) => this.query(state.withSpan(func)));
  }

-  withQuerySpanMaybe(func) {
-    const pat = this;
-    return new Pattern((state) => {
-      const newState = state.withSpan(func);
-      if (!newState.span) {
-        return [];
-      }
-      return pat.query(newState);
-    });
-  }
-
  /**
   * As with {@link Pattern#withQuerySpan}, but the function is applied to both the
   * begin and end time of the query timespan.
@@ -454,18 +435,40 @@ export class Pattern {
    return otherPat.fmap((b) => this.fmap((a) => func(a)(b)))._TrigzeroJoin();
  }

-  _asNumber() {
-    return this.fmap(parseNumeral);
+  _asNumber(dropfails = false, softfail = false) {
+    return this._withHap((hap) => {
+      const asNumber = Number(hap.value);
+      if (!isNaN(asNumber)) {
+        return hap.withValue(() => asNumber);
+      }
+      const specialValue = {
+        e: Math.E,
+        pi: Math.PI,
+      }[hap.value];
+      if (typeof specialValue !== 'undefined') {
+        return hap.withValue(() => specialValue);
+      }
+      if (isNote(hap.value)) {
+        // set context type to midi to let the player know its meant as midi number and not as frequency
+        return new Hap(hap.whole, hap.part, toMidi(hap.value), { ...hap.context, type: 'midi' });
+      }
+      if (dropfails) {
+        // return 'nothing'
+        return undefined;
+      }
+      if (softfail) {
+        // return original hap
+        return hap;
+      }
+      throw new Error('cannot parse as number: "' + hap.value + '"');
+      return hap;
+    });
  }

  /**
   * Assumes a numerical pattern. Returns a new pattern with all values rounded
   * to the nearest integer.
-   * @name round
-   * @memberof Pattern
   * @returns Pattern
-   * @example
-   * "0.5 1.5 2.5".round().scale('C major').note()
   */
  round() {
    return this._asNumber().fmap((v) => Math.round(v));
@@ -510,16 +513,13 @@ export class Pattern {
  }

  /**
-   * Assumes a numerical pattern, containing unipolar values in the range 0 .. 1.
-   * Returns a new pattern with values scaled to the given min/max range.
-   * Most useful in combination with continuous patterns.
-   * @name range
-   * @memberof Pattern
+   * Assumes a numerical pattern, containing unipolar values in the range 0 ..
+   * 1. Returns a new pattern with values scaled to the given min/max range.
+   * @param {Number} min
+   * @param {Number} max
   * @returns Pattern
-   * @example
-   * s("bd sd,hh*4").cutoff(sine.range(500,2000).slow(4))
   */
-  _range(min, max) {
+  range(min, max) {
    return this.mul(max - min).add(min);
  }

@@ -531,8 +531,8 @@ export class Pattern {
   * @param {Number} max
   * @returns Pattern
   */
-  _rangex(min, max) {
-    return this._range(Math.log(min), Math.log(max)).fmap(Math.exp);
+  rangex(min, max) {
+    return this.range(Math.log(min), Math.log(max)).fmap(Math.exp);
  }

  /**
@@ -542,8 +542,8 @@ export class Pattern {
   * @param {Number} max
   * @returns Pattern
   */
-  _range2(min, max) {
-    return this._fromBipolar()._range(min, max);
+  range2(min, max) {
+    return this._fromBipolar().range(min, max);
  }

  _bindWhole(choose_whole, func) {
@@ -642,26 +642,13 @@ export class Pattern {
    return this._trigJoin(true);
  }

-  // Like the other joins above, joins a pattern of patterns of values, into a flatter
-  // pattern of values. In this case it takes whole cycles of the inner pattern to fit each event
-  // in the outer pattern.
  _squeezeJoin() {
-    // A pattern of patterns, which we call the 'outer' pattern, with patterns
-    // as values which we call the 'inner' patterns.
    const pat_of_pats = this;
    function query(state) {
-      // Get the events with the inner patterns. Ignore continuous events (without 'wholes')
      const haps = pat_of_pats.discreteOnly().query(state);
-      // A function to map over the events from the outer pattern.
      function flatHap(outerHap) {
-        // Get the inner pattern, slowed and shifted so that the 'whole'
-        // timespan of the outer event corresponds to the first cycle of the
-        // inner event
-        const inner_pat = outerHap.value._focusSpan(outerHap.wholeOrPart());
-        // Get the inner events, from the timespan of the outer event's part
-        const innerHaps = inner_pat.query(state.setSpan(outerHap.part));
-        // A function to map over the inner events, to combine them with the
-        // outer event
+        const pat = outerHap.value._compressSpan(outerHap.wholeOrPart().cycleArc());
+        const innerHaps = pat.query(state.setSpan(outerHap.part));
        function munge(outer, inner) {
          let whole = undefined;
          if (inner.whole && outer.whole) {
@@ -692,27 +679,10 @@ export class Pattern {
    return this.fmap(func)._squeezeJoin();
  }

-  /**
-   * Like layer, but with a single function:
-   * @name apply
-   * @memberof Pattern
-   * @example
-   * "<c3 eb3 g3>".scale('C minor').apply(scaleTranspose("0,2,4")).note()
-   */
  _apply(func) {
    return func(this);
  }

-  /**
-   * Layers the result of the given function(s). Like {@link superimpose}, but without the original pattern:
-   * @name layer
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * "<0 2 4 6 ~ 4 ~ 2 0!3 ~!5>*4"
-   *   .layer(x=>x.add("0,2"))
-   *   .scale('C minor').note()
-   */
  layer(...funcs) {
    return stack(...funcs.map((func) => func(this)));
  }
@@ -737,36 +707,21 @@ export class Pattern {
    //     // there is no gap.. so maybe revert to _fast?
    //     return this._fast(factor)
    // }
-    // A bit fiddly, to drop zero-width queries at the start of the next cycle
    const qf = function (span) {
      const cycle = span.begin.sam();
-      const bpos = span.begin.sub(cycle).mul(factor).min(1);
-      const epos = span.end.sub(cycle).mul(factor).min(1);
-      if (bpos >= 1) {
-        return undefined;
-      }
-      return new TimeSpan(cycle.add(bpos), cycle.add(epos));
+      const begin = cycle.add(span.begin.sub(cycle).mul(factor).min(1));
+      const end = cycle.add(span.end.sub(cycle).mul(factor).min(1));
+      return new TimeSpan(begin, end);
    };
-    // Also fiddly, to maintain the right 'whole' relative to the part
-    const ef = function (hap) {
-      const begin = hap.part.begin;
-      const end = hap.part.end;
-      const cycle = begin.sam();
-      const beginPos = begin.sub(cycle).div(factor).min(1);
-      const endPos = end.sub(cycle).div(factor).min(1);
-      const newPart = new TimeSpan(cycle.add(beginPos), cycle.add(endPos));
-      const newWhole = !hap.whole
-        ? undefined
-        : new TimeSpan(
-            newPart.begin.sub(begin.sub(hap.whole.begin).div(factor)),
-            newPart.end.add(hap.whole.end.sub(end).div(factor)),
-          );
-      return new Hap(newWhole, newPart, hap.value, hap.context);
+    const ef = function (span) {
+      const cycle = span.begin.sam();
+      const begin = cycle.add(span.begin.sub(cycle).div(factor).min(1));
+      const end = cycle.add(span.end.sub(cycle).div(factor).min(1));
+      return new TimeSpan(begin, end);
    };
-    return this.withQuerySpanMaybe(qf)._withHap(ef)._splitQueries();
+    return this.withQuerySpan(qf).withHapSpan(ef)._splitQueries();
  }

-  // Compress each cycle into the given timespan, leaving a gap
  _compress(b, e) {
    if (b.gt(e) || b.gt(1) || e.gt(1) || b.lt(0) || e.lt(0)) {
      return silence;
@@ -778,25 +733,15 @@ export class Pattern {
    return this._compress(span.begin, span.end);
  }

-  // Similar to compress, but doesn't leave gaps, and the 'focus' can be
-  // bigger than a cycle
-  _focus(b, e) {
-    return this._fast(Fraction(1).div(e.sub(b))).late(b.cyclePos());
-  }
-
-  _focusSpan(span) {
-    return this._focus(span.begin, span.end);
-  }
-
  /**
-   * Speed up a pattern by the given factor. Used by "*" in mini notation.
+   * Speed up a pattern by the given factor.
   *
   * @name fast
   * @memberof Pattern
   * @param {number | Pattern} factor speed up factor
   * @returns Pattern
   * @example
-   * s("<bd sd> hh").fast(2) // s("[<bd sd> hh]*2")
+   * seq(e5, b4, d5, c5).fast(2)
   */
  _fast(factor) {
    const fastQuery = this.withQueryTime((t) => t.mul(factor));
@@ -804,14 +749,14 @@ export class Pattern {
  }

  /**
-   * Slow down a pattern over the given number of cycles. Like the "/" operator in mini notation.
+   * Slow down a pattern over the given number of cycles.
   *
   * @name slow
   * @memberof Pattern
   * @param {number | Pattern} factor slow down factor
   * @returns Pattern
   * @example
-   * s("<bd sd> hh").slow(2) // s("[<bd sd> hh]/2")
+   * seq(e5, b4, d5, c5).slow(2)
   */
  _slow(factor) {
    return this._fast(Fraction(1).div(factor));
@@ -829,20 +774,6 @@ export class Pattern {
    return this.fmap((x) => pure(x)._fast(factor))._squeezeJoin();
  }

-  /**
-   * Cuts each sample into the given number of parts, allowing you to explore a technique known as 'granular synthesis'.
-   * It turns a pattern of samples into a pattern of parts of samples.
-   * @name chop
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * samples({ rhodes: 'https://cdn.freesound.org/previews/132/132051_316502-lq.mp3' })
-   * s("rhodes")
-   *  .chop(4)
-   *  .rev() // reverse order of chops
-   *  .loopAt(4,1) // fit sample into 4 cycles
-   *
-   */
  _chop(n) {
    const slices = Array.from({ length: n }, (x, i) => i);
    const slice_objects = slices.map((i) => ({ begin: i / n, end: (i + 1) / n }));
@@ -864,32 +795,14 @@ export class Pattern {
    return this._fast(cpm / 60);
  }

-  /**
-   * Nudge a pattern to start earlier in time. Equivalent of Tidal's <~ operator
-   *
-   * @name early
-   * @memberof Pattern
-   * @param {number | Pattern} cycles number of cycles to nudge left
-   * @returns Pattern
-   * @example
-   * "bd ~".stack("hh ~".early(.1)).s()
-   */
  _early(offset) {
+    // Equivalent of Tidal's <~ operator
    offset = Fraction(offset);
    return this.withQueryTime((t) => t.add(offset)).withHapTime((t) => t.sub(offset));
  }

-  /**
-   * Nudge a pattern to start later in time. Equivalent of Tidal's ~> operator
-   *
-   * @name late
-   * @memberof Pattern
-   * @param {number | Pattern} cycles number of cycles to nudge right
-   * @returns Pattern
-   * @example
-   * "bd ~".stack("hh ~".late(.1)).s()
-   */
  _late(offset) {
+    // Equivalent of Tidal's ~> operator
    offset = Fraction(offset);
    return this._early(Fraction(0).sub(offset));
  }
@@ -916,17 +829,6 @@ export class Pattern {
    return this._zoom(0, t)._slow(t);
  }

-  /**
-   * Applies the given structure to the pattern:
-   *
-   * @name struct
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * note("c3,eb3,g3")
-   *   .struct("x ~ x ~ ~ x ~ x ~ ~ ~ x ~ x ~ ~")
-   *   .slow(4)
-   */
  // struct(...binary_pats) {
  //   // Re structure the pattern according to a binary pattern (false values are dropped)
  //   const binary_pat = sequence(binary_pats);
@@ -974,16 +876,6 @@ export class Pattern {
    return this.invert();
  }

-  /**
-   * Applies the given function whenever the given pattern is in a true state.
-   * @name when
-   * @memberof Pattern
-   * @param {Pattern} binary_pat
-   * @param {function} func
-   * @returns Pattern
-   * @example
-   * "c3 eb3 g3".when("<0 1>/2", x=>x.sub(5)).note()
-   */
  when(binary_pat, func) {
    //binary_pat = sequence(binary_pat)
    const true_pat = binary_pat._filterValues(id);
@@ -993,47 +885,10 @@ export class Pattern {
    return stack(with_pat, without_pat);
  }

-  /**
-   * Superimposes the function result on top of the original pattern, delayed by the given time.
-   * @name off
-   * @memberof Pattern
-   * @param {Pattern | number} time offset time
-   * @param {function} func function to apply
-   * @returns Pattern
-   * @example
-   * "c3 eb3 g3".off(1/8, x=>x.add(7)).note()
-   */
  off(time_pat, func) {
    return stack(this, func(this.late(time_pat)));
  }

-  /**
-   * Applies the given function every n cycles.
-   * @name every
-   * @memberof Pattern
-   * @param {number} n how many cycles
-   * @param {function} func function to apply
-   * @returns Pattern
-   * @example
-   * note("c3 d3 e3 g3").every(4, x=>x.rev())
-   */
-  every(n, func) {
-    const pat = this;
-    const pats = Array(n - 1).fill(pat);
-    // pats.unshift(func(pat));
-    pats.push(func(pat));
-    return slowcatPrime(...pats);
-  }
-  /**
-   * Applies the given function every n cycles, starting from the first cycle.
-   * @name every
-   * @memberof Pattern
-   * @param {number} n how many cycles
-   * @param {function} func function to apply
-   * @returns Pattern
-   * @example
-   * note("c3 d3 e3 g3").every(4, x=>x.rev())
-   */
  every(n, func) {
    const pat = this;
    const pats = Array(n - 1).fill(pat);
@@ -1041,23 +896,6 @@ export class Pattern {
    return slowcatPrime(...pats);
  }

-  /**
-   * Applies the given function every n cycles, starting from the last cycle.
-   * @name each
-   * @memberof Pattern
-   * @param {number} n how many cycles
-   * @param {function} func function to apply
-   * @returns Pattern
-   * @example
-   * note("c3 d3 e3 g3").every(4, x=>x.rev())
-   */
-  each(n, func) {
-    const pat = this;
-    const pats = Array(n - 1).fill(pat);
-    pats.push(func(pat));
-    return slowcatPrime(...pats);
-  }
-
  /**
   * Returns a new pattern where every other cycle is played once, twice as
   * fast, and offset in time by one quarter of a cycle. Creates a kind of
@@ -1068,15 +906,6 @@ export class Pattern {
    return this.when(slowcat(false, true), (x) => fastcat(x, silence)._late(0.25));
  }

-  /**
-   * Reverse all haps in a pattern
-   *
-   * @name rev
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * note("c3 d3 e3 g3").rev()
-   */
  rev() {
    const pat = this;
    const query = function (state) {
@@ -1119,15 +948,6 @@ export class Pattern {
    return this.juxBy(1, func);
  }

-  /**
-   * Stacks the given pattern(s) to the current pattern.
-   * @name stack
-   * @memberof Pattern
-   * @example
-   * s("hh*2").stack(
-   *   n("c2(3,8)")
-   * )
-   */
  stack(...pats) {
    return stack(this, ...pats);
  }
@@ -1136,28 +956,11 @@ export class Pattern {
    return sequence(this, ...pats);
  }

-  /**
-   * Appends the given pattern(s) to the current pattern. Synonyms: .sequence .fastcat
-   * @name seq
-   * @memberof Pattern
-   * @example
-   * s("hh*2").seq(
-   *   n("c2(3,8)")
-   * )
-   */
+  // shorthand for sequence
  seq(...pats) {
    return sequence(this, ...pats);
  }

-  /**
-   * Appends the given pattern(s) to the next cycle. Synonym: .slowcat
-   * @name cat
-   * @memberof Pattern
-   * @example
-   * s("hh*2").cat(
-   *   n("c2(3,8)")
-   * )
-   */
  cat(...pats) {
    return cat(this, ...pats);
  }
@@ -1170,16 +973,6 @@ export class Pattern {
    return slowcat(this, ...pats);
  }

-  /**
-   * Superimposes the result of the given function(s) on top of the original pattern:
-   * @name superimpose
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * "<0 2 4 6 ~ 4 ~ 2 0!3 ~!5>*4"
-   *   .superimpose(x=>x.add(2))
-   *   .scale('C minor').note()
-   */
  superimpose(...funcs) {
    return this.stack(...funcs.map((func) => func(this)));
  }
@@ -1192,70 +985,24 @@ export class Pattern {
    return this.stutWith(times, time, (pat, i) => pat.velocity(Math.pow(feedback, i)));
  }

-  /**
-   * Superimpose and offset multiple times, applying the given function each time.
-   * @name echoWith
-   * @memberof Pattern
-   * @returns Pattern
-   * @param {number} times how many times to repeat
-   * @param {number} time cycle offset between iterations
-   * @param {function} func function to apply, given the pattern and the iteration index
-   * @example
-   * "<0 [2 4]>"
-   * .echoWith(4, 1/8, (p,n) => p.add(n*2))
-   * .scale('C minor').note().legato(.2)
-   */
+  // these might change with: https://github.com/tidalcycles/Tidal/issues/902
  _echoWith(times, time, func) {
    return stack(...listRange(0, times - 1).map((i) => func(this.late(Fraction(time).mul(i)), i)));
  }

-  /**
-   * Superimpose and offset multiple times, gradually decreasing the velocity
-   * @name echo
-   * @memberof Pattern
-   * @returns Pattern
-   * @param {number} times how many times to repeat
-   * @param {number} time cycle offset between iterations
-   * @param {number} feedback velocity multiplicator for each iteration
-   * @example
-   * s("bd sd").echo(3, 1/6, .8)
-   */
  _echo(times, time, feedback) {
    return this._echoWith(times, time, (pat, i) => pat.velocity(Math.pow(feedback, i)));
  }

-  /**
-   * Divides a pattern into a given number of subdivisions, plays the subdivisions in order, but increments the starting subdivision each cycle. The pattern wraps to the first subdivision after the last subdivision is played.
-   * @name iter
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * note("0 1 2 3".scale('A minor')).iter(4)
-   */
  iter(times, back = false) {
    return slowcat(...listRange(0, times - 1).map((i) => (back ? this.late(i / times) : this.early(i / times))));
  }

-  /**
-   * Like `iter`, but plays the subdivisions in reverse order. Known as iter' in tidalcycles
-   * @name iterBack
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * note("0 1 2 3".scale('A minor')).iterBack(4)
-   */
+  // known as iter' in tidalcycles
  iterBack(times) {
    return this.iter(times, true);
  }

-  /**
-   * Divides a pattern into a given number of parts, then cycles through those parts in turn, applying the given function to each part in turn (one part per cycle).
-   * @name chunk
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * "0 1 2 3".chunk(4, x=>x.add(7)).scale('A minor').note()
-   */
  _chunk(n, func, back = false) {
    const binary = Array(n - 1).fill(false);
    binary.unshift(true);
@@ -1263,14 +1010,6 @@ export class Pattern {
    return this.when(binary_pat, func);
  }

-  /**
-   * Like `chunk`, but cycles through the parts in reverse order. Known as chunk' in tidalcycles
-   * @name chunkBack
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * "0 1 2 3".chunkBack(4, x=>x.add(7)).scale('A minor').note()
-   */
  _chunkBack(n, func) {
    return this._chunk(n, func, true);
  }
@@ -1289,40 +1028,16 @@ export class Pattern {
    return this.withHapSpan((span) => new TimeSpan(span.begin, span.begin.add(value)));
  }

-  /**
-   *
-   * Multiplies the hap duration with the given factor.
-   * @name legato
-   * @memberof Pattern
-   * @example
-   * note("c3 eb3 g3 c4").legato("<.25 .5 1 2>")
-   */
+  // sets hap relative duration of haps
  _legato(value) {
    return this.withHapSpan((span) => new TimeSpan(span.begin, span.begin.add(span.end.sub(span.begin).mul(value))));
  }

-  /**
-   *
-   * Sets the velocity from 0 to 1. Is multiplied together with gain.
-   * @name velocity
-   * @example
-   * s("hh*8")
-   * .gain(".4!2 1 .4!2 1 .4 1")
-   * .velocity(".4 1")
-   */
  _velocity(velocity) {
    return this._withContext((context) => ({ ...context, velocity: (context.velocity || 1) * velocity }));
  }

-  /**
-   * Makes the sample fit the given number of cycles by changing the speed.
-   * @name loopAt
-   * @memberof Pattern
-   * @returns Pattern
-   * @example
-   * samples({ rhodes: 'https://cdn.freesound.org/previews/132/132051_316502-lq.mp3' })
-   * s("rhodes").loopAt(4,1)
-   */
+  // move this to controls? (speed and unit are controls)
  _loopAt(factor, cps = 1) {
    return this.speed((1 / factor) * cps)
      .unit('c')
@@ -1368,6 +1083,9 @@ function _composeOp(a, b, func) {

 // Make composers
 (function () {
+  const num = (pat) => pat._asNumber();
+  const numOrString = (pat) => pat._asNumber(false, true);
+
  // pattern composers
  const composers = {
    set: [(a, b) => b],
@@ -1375,56 +1093,17 @@ function _composeOp(a, b, func) {
    keepif: [(a, b) => (b ? a : undefined)],

    // numerical functions
-    /**
-     *
-     * Assumes a pattern of numbers. Adds the given number to each item in the pattern.
-     * @name add
-     * @memberof Pattern
-     * @example
-     * // Here, the triad 0, 2, 4 is shifted by different amounts
-     * "0 2 4".add("<0 3 4 0>").scale('C major').note()
-     * // Without add, the equivalent would be:
-     * // "<[0 2 4] [3 5 7] [4 6 8] [0 2 4]>".scale('C major').note()
-     * @example
-     * // You can also use add with notes:
-     * "c3 e3 g3".add("<0 5 7 0>").note()
-     * // Behind the scenes, the notes are converted to midi numbers:
-     * // "48 52 55".add("<0 5 7 0>").note()
-     */
-    add: [numeralArgs((a, b) => a + b)], // support string concatenation
-    /**
-     *
-     * Like add, but the given numbers are subtracted.
-     * @name sub
-     * @memberof Pattern
-     * @example
-     * "0 2 4".sub("<0 1 2 3>").scale('C4 minor').note()
-     * // See add for more information.
-     */
-    sub: [numeralArgs((a, b) => a - b)],
-    /**
-     *
-     * Multiplies each number by the given factor.
-     * @name mul
-     * @memberof Pattern
-     * @example
-     * "1 1.5 [1.66, <2 2.33>]".mul(150).freq()
-     */
-    mul: [numeralArgs((a, b) => a * b)],
-    /**
-     *
-     * Divides each number by the given factor.
-     * @name div
-     * @memberof Pattern
-     */
-    div: [numeralArgs((a, b) => a / b)],
-    mod: [numeralArgs(mod)],
-    pow: [numeralArgs(Math.pow)],
-    _and: [numeralArgs((a, b) => a & b)],
-    _or: [numeralArgs((a, b) => a | b)],
-    _xor: [numeralArgs((a, b) => a ^ b)],
-    _lshift: [numeralArgs((a, b) => a << b)],
-    _rshift: [numeralArgs((a, b) => a >> b)],
+    add: [(a, b) => a + b, numOrString], // support string concatenation
+    sub: [(a, b) => a - b, num],
+    mul: [(a, b) => a * b, num],
+    div: [(a, b) => a / b, num],
+    mod: [mod, num],
+    pow: [Math.pow, num],
+    _and: [(a, b) => a & b, num],
+    _or: [(a, b) => a | b, num],
+    _xor: [(a, b) => a ^ b, num],
+    _lshift: [(a, b) => a << b, num],
+    _rshift: [(a, b) => a >> b, num],

    // TODO - force numerical comparison if both look like numbers?
    lt: [(a, b) => a < b],
@@ -1452,14 +1131,10 @@ function _composeOp(a, b, func) {
          pat = preprocess(pat);
          other = preprocess(other);
        }
-        var result;
+        var result = pat['_op' + how](other, (a) => (b) => _composeOp(a, b, op));
        // hack to remove undefs when doing 'keepif'
        if (what === 'keepif') {
-          // avoid union, as we want to throw away the value of 'b' completely
-          result = pat['_op' + how](other, (a) => (b) => op(a, b));
          result = result._removeUndefineds();
-        } else {
-          result = pat['_op' + how](other, (a) => (b) => _composeOp(a, b, op));
        }
        return result;
      };
@@ -1509,11 +1184,6 @@ Pattern.prototype.patternified = [
  'slow',
  'velocity',
 ];
-
-// aliases
-export const polyrhythm = stack;
-export const pr = stack;
-
 // methods that create patterns, which are added to patternified Pattern methods
 Pattern.prototype.factories = {
  pure,
@@ -1536,11 +1206,12 @@ Pattern.prototype.factories = {
 // Nothing
 export const silence = new Pattern((_) => []);

-/** A discrete value that repeats once per cycle.
+/** A discrete value that repeats once per cycle:
 *
+ * @param {any} value - The value to repeat
 * @returns {Pattern}
 * @example
- * pure('e4') // "e4"
+ * pure('e4')
 */
 export function pure(value) {
  function query(state) {
@@ -1552,7 +1223,8 @@ export function pure(value) {
 export function isPattern(thing) {
  // thing?.constructor?.name !== 'Pattern' // <- this will fail when code is mangled
  const is = thing instanceof Pattern || thing?._Pattern;
-  if (!thing instanceof Pattern) {
+
+  if (thing?._Pattern && !thing instanceof Pattern) {
    console.warn(
      `Found Pattern that fails "instanceof Pattern" check.
      This may happen if you are using multiple versions of @strudel.cycles/core. 
@@ -1567,17 +1239,15 @@ export function reify(thing) {
  if (isPattern(thing)) {
    return thing;
  }
-  if (stringParser && typeof thing === 'string') {
-    return stringParser(thing);
-  }
  return pure(thing);
 }

-/** The given items are played at the same time at the same length.
+/** The given items are played at the same time at the same length:
 *
+ * @param {...any} items - The items to stack
 * @return {Pattern}
 * @example
- * stack(g3, b3, [e4, d4]).note() // "g3,b3,[e4,d4]".note()
+ * stack(g3, b3, [e4, d4])
 */
 export function stack(...pats) {
  // Array test here is to avoid infinite recursions..
@@ -1590,6 +1260,7 @@ export function stack(...pats) {
 *
 * synonyms: {@link cat}
 *
+ * @param {...any} items - The items to concatenate
 * @return {Pattern}
 * @example
 * slowcat(e5, b4, [d5, c5])
@@ -1624,8 +1295,8 @@ export function slowcatPrime(...pats) {
  pats = pats.map(reify);
  const query = function (state) {
    const pat_n = Math.floor(state.span.begin) % pats.length;
-    const pat = pats[pat_n]; // can be undefined for same cases e.g. /#cHVyZSg0MikKICAuZXZlcnkoMyxhZGQoNykpCiAgLmxhdGUoLjUp
-    return pat?.query(state) || [];
+    const pat = pats[pat_n];
+    return pat.query(state);
  };
  return new Pattern(query)._splitQueries();
 }
@@ -1645,22 +1316,16 @@ export function fastcat(...pats) {
  return slowcat(...pats)._fast(pats.length);
 }

-/** The given items are con**cat**enated, where each one takes one cycle. Synonym: slowcat
- *
- * @param {...any} items - The items to concatenate
- * @return {Pattern}
- * @example
- * cat(e5, b4, [d5, c5]).note() // "<e5 b4 [d5 c5]>".note()
- *
- */
+/** See {@link slowcat} */
 export function cat(...pats) {
  return slowcat(...pats);
 }

-/** Like {@link seq}, but each step has a length, relative to the whole.
+/** Like {@link fastcat}, but where each step has a temporal weight:
+ * @param {...Array} items - The items to concatenate
 * @return {Pattern}
 * @example
- * timeCat([3,e3],[1, g3]).note() // "e3@3 g3".note()
+ * timeCat([3,e3],[1, g3])
 */
 export function timeCat(...timepats) {
  const total = timepats.map((a) => a[0]).reduce((a, b) => a.add(b), Fraction(0));
@@ -1679,11 +1344,7 @@ export function sequence(...pats) {
  return fastcat(...pats);
 }

-/** Like **cat**, but the items are crammed into one cycle. Synonyms: fastcat, sequence
- * @example
- * seq(e5, b4, [d5, c5]).note() // "e5 b4 [d5 c5]".note()
- *
- */
+/** See {@link fastcat} */
 export function seq(...pats) {
  return fastcat(...pats);
 }
@@ -1732,6 +1393,20 @@ export function pm(...args) {
  polymeter(...args);
 }

+export function polyrhythm(...xs) {
+  const seqs = xs.map((a) => sequence(a));
+
+  if (seqs.length == 0) {
+    return silence;
+  }
+  return stack(...seqs);
+}
+
+// alias
+export function pr(args) {
+  polyrhythm(args);
+}
+
 export const add = curry((a, pat) => pat.add(a));
 export const chop = curry((a, pat) => pat.chop(a));
 export const chunk = curry((a, pat) => pat.chunk(a));
@@ -1754,7 +1429,6 @@ export const mul = curry((a, pat) => pat.mul(a));
 export const off = curry((t, f, pat) => pat.off(t, f));
 export const ply = curry((a, pat) => pat.ply(a));
 export const range = curry((a, b, pat) => pat.range(a, b));
-export const rangex = curry((a, b, pat) => pat.rangex(a, b));
 export const range2 = curry((a, b, pat) => pat.range2(a, b));
 export const rev = (pat) => pat.rev();
 export const slow = curry((a, pat) => pat.slow(a));
@@ -1841,18 +1515,6 @@ Pattern.prototype.inside = function (...args) {
  args = args.map(reify);
  return patternify2(Pattern.prototype._inside)(...args, this);
 };
-Pattern.prototype.range = function (...args) {
-  args = args.map(reify);
-  return patternify2(Pattern.prototype._range)(...args, this);
-};
-Pattern.prototype.rangex = function (...args) {
-  args = args.map(reify);
-  return patternify2(Pattern.prototype._rangex)(...args, this);
-};
-Pattern.prototype.range2 = function (...args) {
-  args = args.map(reify);
-  return patternify2(Pattern.prototype._range2)(...args, this);
-};

 // call this after all Patter.prototype.define calls have been executed! (right before evaluate)
 Pattern.prototype.bootstrap = function () {
@@ -1905,3 +1567,8 @@ Pattern.prototype.define = (name, func, options = {}) => {
 // Pattern.prototype.define('early', (a, pat) => pat.early(a), { patternified: true, composable: true });
 Pattern.prototype.define('hush', (pat) => pat.hush(), { patternified: false, composable: true });
 Pattern.prototype.define('bypass', (pat) => pat.bypass(on), { patternified: true, composable: true });
+
+export async function loadScript(url) {
+  const code = await fetch(url).then((res) => res.text());
+  return eval(code);
+}
@@ -1,23 +0,0 @@
-import { Cyclist } from './cyclist.mjs';
-import { evaluate as _evaluate } from './evaluate.mjs';
-
-export function repl({ interval, defaultOutput, onSchedulerError, onEvalError, onEval, getTime, transpiler }) {
-  const scheduler = new Cyclist({ interval, onTrigger: defaultOutput, onError: onSchedulerError, getTime });
-  const evaluate = async (code) => {
-    if (!code) {
-      throw new Error('no code to evaluate');
-    }
-    try {
-      const { pattern } = await _evaluate(code, transpiler);
-      scheduler.setPattern(pattern, true);
-      onEval?.({
-        pattern,
-        code,
-      });
-    } catch (err) {
-      console.warn(`eval error: ${err.message}`);
-      onEvalError?.(err);
-    }
-  };
-  return { scheduler, evaluate };
-}
@@ -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 } from './pattern.mjs';
 import Fraction from './fraction.mjs';
 import { id } from './util.mjs';

@@ -27,9 +27,9 @@ export const isaw2 = isaw._toBipolar();
 *
 * @return {Pattern}
 * @example
- * "c3 [eb3,g3] g2 [g3,bb3]".legato(saw.slow(4)).note()
+ * "c3 [eb3,g3] g2 [g3,bb3]".legato(saw.slow(4))
 * @example
- * saw.range(0,8).segment(8).scale('C major').slow(4).note()
+ * saw.range(0,8).segment(8).scale('C major').slow(4)
 *
 */
 export const saw = signal((t) => t % 1);
@@ -42,28 +42,30 @@ export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));
 *
 * @return {Pattern}
 * @example
- * sine.segment(16).range(0,15).slow(2).scale('C minor').note()
+ * sine.segment(16).range(0,15).slow(2).scale('C minor')
 *
 */
 export const sine = sine2._fromBipolar();

+
 /**
 *  A cosine signal between 0 and 1.
 *
 * @return {Pattern}
 * @example
- * stack(sine,cosine).segment(16).range(0,15).slow(2).scale('C minor').note()
+ * stack(sine,cosine).segment(16).range(0,15).slow(2).scale('C minor')
 *
 */
 export const cosine = sine._early(Fraction(1).div(4));
 export const cosine2 = sine2._early(Fraction(1).div(4));

+
 /**
 *  A square signal between 0 and 1.
 *
 * @return {Pattern}
 * @example
- * square.segment(2).range(0,7).scale('C minor').note()
+ * square.segment(2).range(0,7).scale('C minor')
 *
 */
 export const square = signal((t) => Math.floor((t * 2) % 2));
@@ -74,7 +76,7 @@ export const square2 = square._toBipolar();
 *
 * @return {Pattern}
 * @example
- * tri.segment(8).range(0,7).scale('C minor').note()
+ * triangle.segment(2).range(0,7).scale('C minor')
 *
 */
 export const tri = fastcat(isaw, saw);
@@ -110,112 +112,28 @@ const timeToRandsPrime = (seed, n) => {

 const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);

-/**
- *
- */
-
-/**
- * A continuous pattern of random numbers, between 0 and 1.
- *
- * @name rand
- * @example
- * // randomly change the cutoff
- * s("bd sd,hh*4").cutoff(rand.range(500,2000))
- *
- */
 export const rand = signal(timeToRand);
-/**
- * A continuous pattern of random numbers, between -1 and 1
- */
-export const rand2 = rand._toBipolar();

 export const _brandBy = (p) => rand.fmap((x) => x < p);
 export const brandBy = (pPat) => reify(pPat).fmap(_brandBy).innerJoin();
 export const brand = _brandBy(0.5);

 export const _irand = (i) => rand.fmap((x) => Math.trunc(x * i));
-
-/**
- * A continuous pattern of random integers, between 0 and n-1.
- *
- * @name irand
- * @param {number} n max value (exclusive)
- * @example
- * // randomly select scale notes from 0 - 7 (= C to C)
- * irand(8).struct("x(3,8)").scale('C minor').note()
- *
- */
 export const irand = (ipat) => reify(ipat).fmap(_irand).innerJoin();

-export const __chooseWith = (pat, xs) => {
+export const chooseWith = (pat, xs) => {
  xs = xs.map(reify);
  if (xs.length == 0) {
    return silence;
  }
-  return pat.range(0, xs.length).fmap((i) => xs[Math.floor(i)]);
-};
-/**
- * Choose from the list of values (or patterns of values) using the given
- * pattern of numbers, which should be in the range of 0..1
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const chooseWith = (pat, xs) => {
-  return __chooseWith(pat, xs).outerJoin();
+  return pat
+    .range(0, xs.length)
+    .fmap((i) => xs[Math.floor(i)])
+    .outerJoin();
 };

-/**
- * As with {chooseWith}, but the structure comes from the chosen values, rather
- * than the pattern you're using to choose with.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const chooseInWith = (pat, xs) => {
-  return __chooseWith(pat, xs).innerJoin();
-};
-
-/**
- * Chooses randomly from the given list of elements.
- * @param  {...any} xs values / patterns to choose from.
- * @returns {Pattern} - a continuous pattern.
- */
 export const choose = (...xs) => chooseWith(rand, xs);

-/**
- * Chooses from the given list of values (or patterns of values), according
- * to the pattern that the method is called on. The pattern should be in
- * the range 0 .. 1.
- * @param  {...any} xs
- * @returns {Pattern}
- */
-Pattern.prototype.choose = function (...xs) {
-  return chooseWith(this, xs);
-};
-
-/**
- * As with choose, but the pattern that this method is called on should be
- * in the range -1 .. 1
- * @param  {...any} xs
- * @returns {Pattern}
- */
-Pattern.prototype.choose2 = function (...xs) {
-  return chooseWith(this._fromBipolar(), xs);
-};
-
-/**
- * Picks one of the elements at random each cycle.
- * @returns {Pattern}
- * @example
- * chooseCycles("bd", "hh", "sd").s().fast(4)
- * @example
- * "bd | hh | sd".s().fast(4)
- */
-export const chooseCycles = (...xs) => chooseInWith(rand.segment(1), xs);
-
-export const randcat = chooseCycles;
-
 const _wchooseWith = function (pat, ...pairs) {
  const values = pairs.map((pair) => reify(pair[0]));
  const weights = [];
@@ -238,7 +156,6 @@ 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);
@@ -247,68 +164,20 @@ export const perlinWith = (pat) => {
  return pat.sub(pata).fmap(interp).appBoth(pata.fmap(timeToRand)).appBoth(patb.fmap(timeToRand));
 };

-/**
- * Generates a continuous pattern of [perlin noise](https://en.wikipedia.org/wiki/Perlin_noise), in the range 0..1.
- *
- * @name perlin
- * @example
- * // randomly change the cutoff
- * s("bd sd,hh*4").cutoff(perlin.range(500,2000))
- *
- */
-export const perlin = perlinWith(time.fmap((v) => Number(v)));
+export const perlin = perlinWith(time);

 Pattern.prototype._degradeByWith = function (withPat, x) {
  return this.fmap((a) => (_) => a).appLeft(withPat._filterValues((v) => v > x));
 };

-/**
- * Randomly removes events from the pattern by a given amount.
- * 0 = 0% chance of removal
- * 1 = 100% chance of removal
- *
- * @name degradeBy
- * @memberof Pattern
- * @param {number} amount - a number between 0 and 1
- * @returns Pattern
- * @example
- * s("hh*8").degradeBy(0.2)
- * @example
- * s("[hh?0.2]*8")
- */
 Pattern.prototype._degradeBy = function (x) {
  return this._degradeByWith(rand, x);
 };

-/**
- *
- * Randomly removes 50% of events from the pattern. Shorthand for `.degradeBy(0.5)`
- *
- * @name degrade
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").degrade()
- * @example
- * s("[hh?]*8")
- */
 Pattern.prototype.degrade = function () {
  return this._degradeBy(0.5);
 };

-/**
- * Inverse of {@link Pattern#degradeBy}: Randomly removes events from the pattern by a given amount.
- * 0 = 100% chance of removal
- * 1 = 0% chance of removal
- * Events that would be removed by degradeBy are let through by undegradeBy and vice versa (see second example).
- *
- * @name undegradeBy
- * @memberof Pattern
- * @param {number} amount - a number between 0 and 1
- * @returns Pattern
- * @example
- * s("hh*8").undegradeBy(0.2)
- */
 Pattern.prototype._undegradeBy = function (x) {
  return this._degradeByWith(
    rand.fmap((r) => 1 - r),
@@ -324,25 +193,6 @@ 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);
-}; */
-
-/**
- *
- * Randomly applies the given function by the given probability.
- * Similar to {@link Pattern#someCyclesBy}
- *
- * @name sometimesBy
- * @memberof Pattern
- * @param {number | Pattern} probability - a number between 0 and 1
- * @param {function} function - the transformation to apply
- * @returns Pattern
- * @example
- * s("hh(3,8)").sometimesBy(.4, x=>x.speed("0.5"))
- */
 Pattern.prototype.sometimesBy = function (patx, func) {
  const pat = this;
  return reify(patx)
@@ -350,7 +200,6 @@ Pattern.prototype.sometimesBy = function (patx, 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));
 };
@@ -362,17 +211,6 @@ Pattern.prototype.sometimesByPre = function (patx, func) {
    .innerJoin();
 };

-/**
- *
- * Applies the given function with a 50% chance
- *
- * @name sometimes
- * @memberof Pattern
- * @param {function} function - the transformation to apply
- * @returns Pattern
- * @example
- * s("hh*4").sometimes(x=>x.speed("0.5"))
- */
 Pattern.prototype.sometimes = function (func) {
  return this._sometimesBy(0.5, func);
 };
@@ -388,19 +226,6 @@ Pattern.prototype._someCyclesBy = function (x, func) {
  );
 };

-/**
- *
- * Randomly applies the given function by the given probability on a cycle by cycle basis.
- * Similar to {@link Pattern#sometimesBy}
- *
- * @name someCyclesBy
- * @memberof Pattern
- * @param {number | Pattern} probability - a number between 0 and 1
- * @param {function} function - the transformation to apply
- * @returns Pattern
- * @example
- * s("hh(3,8)").someCyclesBy(.3, x=>x.speed("0.5"))
- */
 Pattern.prototype.someCyclesBy = function (patx, func) {
  const pat = this;
  return reify(patx)
@@ -408,100 +233,30 @@ Pattern.prototype.someCyclesBy = function (patx, func) {
    .innerJoin();
 };

-/**
- *
- * Shorthand for `.someCyclesBy(0.5, fn)`
- *
- * @name someCycles
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh(3,8)").someCycles(x=>x.speed("0.5"))
- */
 Pattern.prototype.someCycles = function (func) {
  return this._someCyclesBy(0.5, func);
 };

-/**
- *
- * Shorthand for `.sometimesBy(0.75, fn)`
- *
- * @name often
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").often(x=>x.speed("0.5"))
- */
 Pattern.prototype.often = function (func) {
  return this.sometimesBy(0.75, func);
 };

-/**
- *
- * Shorthand for `.sometimesBy(0.25, fn)`
- *
- * @name rarely
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").rarely(x=>x.speed("0.5"))
- */
 Pattern.prototype.rarely = function (func) {
  return this.sometimesBy(0.25, func);
 };

-/**
- *
- * Shorthand for `.sometimesBy(0.1, fn)`
- *
- * @name almostNever
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").almostNever(x=>x.speed("0.5"))
- */
 Pattern.prototype.almostNever = function (func) {
  return this.sometimesBy(0.1, func);
 };

-/**
- *
- * Shorthand for `.sometimesBy(0.9, fn)`
- *
- * @name almostAlways
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").almostAlways(x=>x.speed("0.5"))
- */
 Pattern.prototype.almostAlways = function (func) {
  return this.sometimesBy(0.9, func);
 };

-/**
- *
- * Shorthand for `.sometimesBy(0, fn)` (never calls fn)
- *
- * @name never
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").never(x=>x.speed("0.5"))
- */
 Pattern.prototype.never = function (func) {
  return this;
 };

-/**
- *
- * Shorthand for `.sometimesBy(1, fn)` (always calls fn)
- *
- * @name always
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").always(x=>x.speed("0.5"))
- */
 Pattern.prototype.always = function (func) {
  return func(this);
 };
@@ -5,42 +5,52 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import { fastcat, stack, slowcat, silence, pure } from '../pattern.mjs';
-import { describe, it, expect } from 'vitest';
+import { strict as assert } from 'assert';
 import drawLine from '../drawLine.mjs';

 describe('drawLine', () => {
  it('supports equal lengths', () => {
-    expect(drawLine(fastcat(0), 4)).toEqual('|0|0');
-    expect(drawLine(fastcat(0, 1), 4)).toEqual('|01|01');
-    expect(drawLine(fastcat(0, 1, 2), 6)).toEqual('|012|012');
+    assert.equal(drawLine(fastcat(0), 4), '|0|0');
+    assert.equal(drawLine(fastcat(0, 1), 4), '|01|01');
+    assert.equal(drawLine(fastcat(0, 1, 2), 6), '|012|012');
  });
  it('supports unequal lengths', () => {
-    expect(drawLine(fastcat(0, [1, 2]), 10)).toEqual('|0-12|0-12');
-    expect(drawLine(fastcat(0, [1, 2, 3]), 10)).toEqual('|0--123|0--123');
-    expect(drawLine(fastcat(0, 1, [2, 3]), 10)).toEqual('|0-1-23|0-1-23');
+    assert.equal(drawLine(fastcat(0, [1, 2]), 10), '|0-12|0-12');
+    assert.equal(drawLine(fastcat(0, [1, 2, 3]), 10), '|0--123|0--123');
+    assert.equal(drawLine(fastcat(0, 1, [2, 3]), 10), '|0-1-23|0-1-23');
  });
  it('supports unequal silence', () => {
-    expect(drawLine(fastcat(0, silence, [1, 2]), 10)).toEqual('|0-..12|0-..12');
+    assert.equal(drawLine(fastcat(0, silence, [1, 2]), 10), '|0-..12|0-..12');
  });
  it('supports polyrhythms', () => {
-    // assert.equal(drawLine(fastcat(pure(0).fast(2), pure(1).fast(3)), 10), '|0--0--1-1-1-');
-    expect(drawLine(fastcat(pure(0).fast(2), pure(1).fast(3)), 10)).toEqual('|0--0--1-1-1-');
+    '0*2 1*3';
+    assert.equal(drawLine(fastcat(pure(0).fast(2), pure(1).fast(3)), 10), '|0--0--1-1-1-');
  });
  it('supports multiple lines', () => {
-    expect(drawLine(fastcat(0, stack(1, 2)), 10)).toEqual(`|01|01|01|01
-|.2|.2|.2|.2`);
-
-    expect(drawLine(fastcat(0, 1, stack(2, 3)), 10)).toEqual(`|012|012|012
-|..3|..3|..3`);
-
-    expect(drawLine(fastcat(0, stack(1, 2, 3)), 10)).toEqual(`|01|01|01|01
+    assert.equal(
+      drawLine(fastcat(0, stack(1, 2)), 10),
+      `|01|01|01|01
+|.2|.2|.2|.2`,
+    );
+    assert.equal(
+      drawLine(fastcat(0, 1, stack(2, 3)), 10),
+      `|012|012|012
+|..3|..3|..3`,
+    );
+    assert.equal(
+      drawLine(fastcat(0, stack(1, 2, 3)), 10),
+      `|01|01|01|01
 |.2|.2|.2|.2
-|.3|.3|.3|.3`);
-    expect(drawLine(fastcat(0, 1, stack(2, 3, 4)), 10)).toEqual(`|012|012|012
+|.3|.3|.3|.3`,
+    );
+    assert.equal(
+      drawLine(fastcat(0, 1, stack(2, 3, 4)), 10),
+      `|012|012|012
 |..3|..3|..3
-|..4|..4|..4`);
+|..4|..4|..4`,
+    );
  });
  it('supports unequal cycle lengths', () => {
-    expect(drawLine(slowcat(0, [1, 2]), 10)).toEqual(`|0|12|0|12`);
+    assert.equal(drawLine(slowcat(0, [1, 2]), 10), `|0|12|0|12`);
  });
 });
@@ -5,11 +5,11 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import Fraction, { gcd } from '../fraction.mjs';
-import { describe, it, expect } from 'vitest';
+import { strict as assert } from 'assert';

 describe('gcd', () => {
  it('should work', () => {
    const F = Fraction._original;
-    expect(gcd(F(1 / 6), F(1 / 4)).toFraction()).toEqual('1/12');
+    assert.equal(gcd(F(1 / 6), F(1 / 4)).toFraction(), '1/12');
  });
 });
@@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th

 import Fraction from 'fraction.js';

-import { describe, it, expect } from 'vitest';
+import { deepStrictEqual, strict as assert } from 'assert';

 import {
  TimeSpan,
@@ -41,15 +41,15 @@ import {
  tri2,
  id,
  ply,
-  rev,
-  time,
+  rev
 } from '../index.mjs';

 import { steady } from '../signal.mjs';

-import controls from '../controls.mjs';
+//import { Time } from 'tone';
+import pkg from 'tone';
+const { Time } = pkg;

-const { n } = 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);
@@ -58,35 +58,35 @@ const third = Fraction(1, 3);
 const twothirds = Fraction(2, 3);

 const sameFirst = (a, b) => {
-  return expect(a._sortHapsByPart().firstCycle()).toStrictEqual(b._sortHapsByPart().firstCycle());
+  return assert.deepStrictEqual(a._sortHapsByPart().firstCycle(), b._sortHapsByPart().firstCycle());
 };

-describe('TimeSpan', () => {
-  describe('equals()', () => {
-    it('Should be equal to the same value', () => {
-      expect(new TimeSpan(0, 4).equals(new TimeSpan(0, 4))).toBe(true);
+describe('TimeSpan', function () {
+  describe('equals()', function () {
+    it('Should be equal to the same value', function () {
+      assert.equal(new TimeSpan(0, 4).equals(new TimeSpan(0, 4)), true);
    });
  });
-  describe('splitCycles', () => {
-    it('Should split two cycles into two', () => {
-      expect(new TimeSpan(Fraction(0), Fraction(2)).spanCycles.length).toBe(2);
+  describe('splitCycles', function () {
+    it('Should split two cycles into two', function () {
+      assert.equal(new TimeSpan(Fraction(0), Fraction(2)).spanCycles.length, 2);
    });
  });
-  describe('intersection_e', () => {
+  describe('intersection_e', function () {
    var a = new TimeSpan(Fraction(0), Fraction(2));
    var b = new TimeSpan(Fraction(1), Fraction(3));
    var c = new TimeSpan(Fraction(1), Fraction(2));
    var d = new TimeSpan(Fraction(1), Fraction(2));
-    it('Should create an intersection', () => {
-      expect(a.intersection_e(b).equals(c)).toBe(true);
+    it('Should create an intersection', function () {
+      assert.equal(a.intersection_e(b).equals(c), true);
    });
  });
 });

-describe('Hap', () => {
-  describe('hasOnset()', () => {
-    it('True if part includes onset from whole', () => {
-      expect(new Hap(new TimeSpan(0, 1), new TimeSpan(0, 1), 'thing').hasOnset()).toBe(true);
+describe('Hap', function () {
+  describe('hasOnset()', function () {
+    it('True if part includes onset from whole', function () {
+      assert.equal(new Hap(new TimeSpan(0, 1), new TimeSpan(0, 1), 'thing').hasOnset(), true);
    });
  });
  var a = new Hap(new TimeSpan(Fraction(0), Fraction(0.5)), new TimeSpan(Fraction(0), Fraction(0.5)), 'a');
@@ -94,19 +94,19 @@ describe('Hap', () => {
  var c = new Hap(new TimeSpan(Fraction(0), Fraction(0.25)), new TimeSpan(Fraction(0), Fraction(0.5)), 'c');
  var d = new Hap(undefined, new TimeSpan(Fraction(0), Fraction(0.5)), 'd');
  var e = new Hap(undefined, new TimeSpan(Fraction(0), Fraction(0.5)), 'e');
-  describe('spanEquals', () => {
-    it('True if two haps have the same whole and part', () => {
-      expect(a.spanEquals(b)).toBe(true);
+  describe('spanEquals', function () {
+    it('True if two haps have the same whole and part', function () {
+      assert.equal(a.spanEquals(b), true);
    });
-    it("False if two haps don't the same whole and part", () => {
-      expect(a.spanEquals(c)).toBe(false);
+    it("False if two haps don't the same whole and part", function () {
+      assert.equal(a.spanEquals(c), false);
    });
-    it('True if two haps have the same part and undefined wholes', () => {
-      expect(d.spanEquals(e)).toBe(true);
+    it('True if two haps have the same part and undefined wholes', function () {
+      assert.equal(d.spanEquals(e), true);
    });
  });
  describe('resolveState()', () => {
-    it('Can increment some state', () => {
+    it('Can increment some state', function () {
      const stateful_value = (state) => {
        const newValue = state['incrementme'];
        // TODO Does the state *need* duplicating here?
@@ -118,8 +118,8 @@ describe('Hap', () => {
      const ev1 = new Hap(ts(0, 1), ts(0, 1), stateful_value, {}, true);
      const [state2, ev2] = ev1.resolveState(state);
      const [state3, ev3] = ev1.resolveState(state2);
-      expect(ev3).toStrictEqual(new Hap(ts(0, 1), ts(0, 1), 11, {}, false));
-      expect(state3).toStrictEqual({ incrementme: 12 });
+      assert.deepStrictEqual(ev3, new Hap(ts(0, 1), ts(0, 1), 11, {}, false));
+      assert.deepStrictEqual(state3, { incrementme: 12 });
    });
  });
  describe('wholeOrPart()', () => {
@@ -128,43 +128,42 @@ describe('Hap', () => {
    const continuousHap = new Hap(undefined, ts1, 'hello');
    const discreteHap = new Hap(ts1, ts0_5, 'hello');
    it('Can pick a whole', () => {
-      expect(discreteHap.wholeOrPart()).toStrictEqual(ts1);
+      assert.deepStrictEqual(discreteHap.wholeOrPart(), ts1);
    });
    it('Can pick a part', () => {
-      expect(continuousHap.wholeOrPart()).toStrictEqual(ts1);
+      assert.deepStrictEqual(continuousHap.wholeOrPart(), ts1);
    });
  });
 });
-describe('Pattern', () => {
-  describe('pure', () => {
-    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('Pattern', function () {
+  describe('pure', function () {
+    it('Can make a pattern', function () {
+      assert.equal(pure('hello').query(st(0.5, 2.5)).length, 3);
    });
  });
-  describe('fmap()', () => {
-    it('Can add things', () => {
-      expect(
+  describe('fmap()', function () {
+    it('Can add things', function () {
+      assert.equal(
        pure(3)
          .fmap((x) => x + 4)
          .firstCycle()[0].value,
-      ).toBe(7);
+        7,
+      );
    });
  });
-  describe('add()', () => {
-    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);
+  describe('add()', function () {
+    it('can structure In()', function () {
+      assert.equal(pure(3).add(pure(4)).query(st(0, 1))[0].value, 7);
+      assert.equal(pure(3).addIn(pure(4)).query(st(0, 1))[0].value, 7);
    });
    it('can structure Out()', () => {
      sameFirst(sequence(1, 2).addOut(4), sequence(5, 6).struct(true));
    });
    it('can Mix() structure', () => {
-      expect(sequence(1, 2).addMix(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),
+      assert.deepStrictEqual(sequence(1, 2).addMix(silence, 5, silence).firstCycle(), [
+        hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 6),
+        hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 7),
      ]);
    });
    it('can Trig() structure', () => {
@@ -197,22 +196,19 @@ describe('Pattern', () => {
        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);
+  describe('keep()', function () {
+    it('can structure In()', function () {
+      assert.equal(pure(3).keep(pure(4)).query(st(0, 1))[0].value, 3);
+      assert.equal(pure(3).keepIn(pure(4)).query(st(0, 1))[0].value, 3);
    });
    it('can structure Out()', () => {
      sameFirst(sequence(1, 2).keepOut(4), sequence(1, 2).struct(true));
    });
    it('can Mix() structure', () => {
-      expect(sequence(1, 2).keepMix(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),
+      assert.deepStrictEqual(sequence(1, 2).keepMix(silence, 5, silence).firstCycle(), [
+        hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
+        hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
      ]);
    });
    it('can Trig() structure', () => {
@@ -243,8 +239,8 @@ describe('Pattern', () => {
      sameFirst(sequence(1, [2, 3]).keepSqueezeOut(10, 20, 30), sequence([1, [2, 3]], [1, [2, 3]], [1, [2, 3]]));
    });
  });
-  describe('keepif()', () => {
-    it('can structure In()', () => {
+  describe('keepif()', function () {
+    it('can structure In()', function () {
      sameFirst(sequence(3, 4).keepif(true, false), sequence(3, silence));
      sameFirst(sequence(3, 4).keepifIn(true, false), sequence(3, silence));
    });
@@ -252,9 +248,9 @@ describe('Pattern', () => {
      sameFirst(pure(1).keepifOut(true, false), sequence(1, silence));
    });
    it('can Mix() structure', () => {
-      expect(sequence(1, 2).keepifMix(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),
+      assert.deepStrictEqual(sequence(1, 2).keepifMix(false, true, false).firstCycle(), [
+        hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
+        hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
      ]);
    });
    it('can Trig() structure', () => {
@@ -285,39 +281,35 @@ describe('Pattern', () => {
      sameFirst(sequence(1, [2, 3]).keepifSqueezeOut(true, true, false), sequence([1, [2, 3]], [1, [2, 3]], silence));
    });
  });
-  describe('sub()', () => {
-    it('Can subtract things', () => {
-      expect(pure(3).sub(pure(4)).query(st(0, 1))[0].value).toBe(-1);
+  describe('sub()', function () {
+    it('Can subtract things', function () {
+      assert.equal(pure(3).sub(pure(4)).query(st(0, 1))[0].value, -1);
    });
  });
-  describe('mul()', () => {
-    it('Can multiply things', () => {
-      expect(pure(3).mul(pure(2)).firstCycle()[0].value).toBe(6);
+  describe('mul()', function () {
+    it('Can multiply things', function () {
+      assert.equal(pure(3).mul(pure(2)).firstCycle()[0].value, 6);
    });
  });
-  describe('div()', () => {
-    it('Can divide things', () => {
-      expect(pure(3).div(pure(2)).firstCycle()[0].value).toBe(1.5);
+  describe('div()', function () {
+    it('Can divide things', function () {
+      assert.equal(pure(3).div(pure(2)).firstCycle()[0].value, 1.5);
    });
  });
-  describe('set()', () => {
-    it('Can set things in objects', () => {
-      expect(
+  describe('set()', function () {
+    it('Can set things in objects', function () {
+      assert.deepStrictEqual(
        pure({ a: 4, b: 6 })
          .set(pure({ c: 7 }))
          .firstCycle()[0].value,
-      ).toStrictEqual({
-        a: 4,
-        b: 6,
-        c: 7,
-      });
-
+        { a: 4, b: 6, c: 7 },
+      );
      sameFirst(
        sequence({ a: 1, b: 2 }, { a: 2, b: 2 }, { a: 3, b: 2 }).set({ a: 4, c: 5 }),
        sequence({ a: 4, b: 2, c: 5 }).fast(3),
      );
    });
-    it('Can set things with plain values', () => {
+    it('Can set things with plain values', function () {
      sameFirst(sequence(1, 2, 3).set(4), sequence(4).fast(3));
    });
    describe('setOut()', () => {
@@ -350,228 +342,231 @@ describe('Pattern', () => {
      });
    });
  });
-  describe('stack()', () => {
-    it('Can stack things', () => {
-      expect(
+  describe('stack()', function () {
+    it('Can stack things', function () {
+      assert.deepStrictEqual(
        stack(pure('a'), pure('b'), pure('c'))
          .firstCycle()
          .map((h) => h.value),
-      ).toStrictEqual(['a', 'b', 'c']);
+        ['a', 'b', 'c'],
+      );
    });
-    it('Can stack subpatterns', () => {
+    it('Can stack subpatterns', function () {
      sameFirst(stack('a', ['b', 'c']), stack('a', sequence('b', 'c')));
    });
  });
-  describe('_fast()', () => {
-    it('Makes things faster', () => {
-      expect(pure('a')._fast(2).firstCycle().length).toBe(2);
+  describe('_fast()', function () {
+    it('Makes things faster', function () {
+      assert.equal(pure('a')._fast(2).firstCycle().length, 2);
    });
  });
-  describe('_fastGap()', () => {
-    it('Makes things faster, with a gap', () => {
-      expect(sequence('a', 'b', 'c')._fastGap(2).firstCycle()).toStrictEqual(
+  describe('_fastGap()', function () {
+    it('Makes things faster, with a gap', function () {
+      assert.deepStrictEqual(
+        sequence('a', 'b', 'c')._fastGap(2).firstCycle(),
        sequence(['a', 'b', 'c'], silence).firstCycle(),
      );
-      expect(sequence('a', 'b', 'c')._fastGap(3).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        sequence('a', 'b', 'c')._fastGap(3).firstCycle(),
        sequence(['a', 'b', 'c'], silence, silence).firstCycle(),
      );
    });
-    it('Makes things faster, with a gap, when speeded up further', () => {
-      expect(sequence('a', 'b', 'c')._fastGap(2).fast(2).firstCycle()).toStrictEqual(
+    it('Makes things faster, with a gap, when speeded up further', function () {
+      assert.deepStrictEqual(
+        sequence('a', 'b', 'c')._fastGap(2).fast(2).firstCycle(),
        sequence(['a', 'b', 'c'], silence, ['a', 'b', 'c'], silence).firstCycle(),
      );
    });
-    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'),
-      ]);
-    });
  });
-  describe('_compressSpan()', () => {
-    it('Can squash cycles of a pattern into a given timespan', () => {
-      expect(pure('a')._compressSpan(ts(0.25, 0.5)).firstCycle()).toStrictEqual(
+  describe('_compressSpan()', function () {
+    it('Can squash cycles of a pattern into a given timespan', function () {
+      assert.deepStrictEqual(
+        pure('a')._compressSpan(new TimeSpan(0.25, 0.5)).firstCycle(),
        sequence(silence, 'a', silence, silence).firstCycle(),
      );
    });
  });
-  describe('fast()', () => {
-    it('Makes things faster', () => {
-      expect(pure('a').fast(2).firstCycle().length).toBe(2);
+  describe('fast()', function () {
+    it('Makes things faster', function () {
+      assert.equal(pure('a').fast(2).firstCycle().length, 2);
    });
-    it('Makes things faster, with a pattern of factors', () => {
-      expect(pure('a').fast(sequence(1, 4)).firstCycle().length).toBe(3);
-      expect(pure('a').fast(sequence(1, 4)).firstCycle()).toStrictEqual(
+    it('Makes things faster, with a pattern of factors', function () {
+      assert.equal(pure('a').fast(sequence(1, 4)).firstCycle().length, 3);
+      // .fast(sequence(1,silence) is a quick hack to cut a hap in two..
+      assert.deepStrictEqual(
+        pure('a').fast(sequence(1, 4)).firstCycle(),
        stack(pure('a').fast(sequence(1, silence)), sequence(silence, ['a', 'a'])).firstCycle(),
      );
    });
-    it('defaults to accepting sequences', () => {
-      expect(sequence(1, 2, 3).fast(sequence(1.5, 2)).firstCycle()).toStrictEqual(
+    it('defaults to accepting sequences', function () {
+      assert.deepStrictEqual(
+        sequence(1, 2, 3).fast(sequence(1.5, 2)).firstCycle(),
        sequence(1, 2, 3).fast(1.5, 2).firstCycle(),
      );
    });
-    it('works as a static function', () => {
-      expect(sequence(1, 2, 3).fast(1, 2).firstCycle()).toStrictEqual(
+    it('works as a static function', function () {
+      assert.deepStrictEqual(
+        sequence(1, 2, 3).fast(1, 2).firstCycle(),
        fast(sequence(1, 2), sequence(1, 2, 3)).firstCycle(),
      );
    });
-    it('works as a curried static function', () => {
-      expect(sequence(1, 2, 3).fast(1, 2).firstCycle()).toStrictEqual(
+    it('works as a curried static function', function () {
+      assert.deepStrictEqual(
+        sequence(1, 2, 3).fast(1, 2).firstCycle(),
        fast(sequence(1, 2))(sequence(1, 2, 3)).firstCycle(),
      );
    });
  });
-
-  describe('_slow()', () => {
-    it('Makes things slower', () => {
-      expect(pure('a')._slow(2).firstCycle()[0]).toStrictEqual(hap(ts(0, 2), ts(0, 1), 'a'));
+  describe('_slow()', function () {
+    it('Makes things slower', function () {
+      assert.deepStrictEqual(
+        pure('a')._slow(2).firstCycle()[0],
+        new Hap(new TimeSpan(Fraction(0), Fraction(2)), new TimeSpan(Fraction(0), Fraction(1)), 'a'),
+      );

      const pat = sequence(pure('c3'), pure('eb3')._slow(2)); // => try mini('c3 eb3/2') in repl
-
-      expect(pat.query(st(0, 1))[1]).toStrictEqual(hap(ts(0.5, 1.5), ts(1 / 2, 1), 'eb3'));
-
+      assert.deepStrictEqual(pat.query(st(0, 1))[1], hap(ts(0.5, 1.5), ts(1 / 2, 1), 'eb3'));
      // the following test fails
-      //  assert.deepStrictEqual(
-      //   pat.query(ts(1,2))[1], undefined
-      // )
+      /* assert.deepStrictEqual(
+        pat.query(ts(1,2))[1], undefined
+      ) */
      // expecting [c3 eb3] [c3 ~]
      // what happens [c3 eb3] [c3 eb3]
      // notable examples:
      // 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', () => {
-      sameFirst(sequence('a', 'b', 'c', 'd').inside(2, rev), sequence('b', 'a', 'd', 'c'));
+      sameFirst(sequence('a', 'b', 'c', 'd').inside(2, rev),
+        sequence('b', 'a', 'd', 'c')
+      );
    });
  });
  describe('outside', () => {
    it('can rev outside a cycle', () => {
-      sameFirst(sequence('a', 'b', 'c', 'd')._slow(2).outside(2, rev), sequence('d', 'c'));
+      sameFirst(sequence('a', 'b', 'c', 'd')._slow(2).outside(2, rev),
+        sequence('d', 'c')
+      );
    });
  });
-  describe('_filterValues()', () => {
-    it('Filters true', () => {
-      expect(
+  describe('_filterValues()', function () {
+    it('Filters true', function () {
+      assert.equal(
        pure(true)
          ._filterValues((x) => x)
          .firstCycle().length,
-      ).toBe(1);
+        1,
+      );
    });
  });
-  describe('when()', () => {
-    it('Always faster', () => {
-      expect(
+  describe('when()', function () {
+    it('Always faster', function () {
+      assert.equal(
        pure('a')
          .when(pure(true), (x) => x._fast(2))
          .firstCycle().length,
-      ).toBe(2);
+        2,
+      );
    });
-    it('Never faster', () => {
-      expect(
+    it('Never faster', function () {
+      assert.equal(
        pure('a')
          .when(pure(false), (x) => x._fast(2))
          .firstCycle().length,
-      ).toBe(1);
+        1,
+      );
    });
-    it('Can alternate', () => {
-      expect(
-        pure(10)
-          .when(slowcat(true, false), (x) => x.add(3))
-          .fast(4)
-          ._sortHapsByPart()
-          .firstCycle(),
-      ).toStrictEqual(fastcat(13, 10, 13, 10).firstCycle());
+    it('Can alternate', function () {
+      assert.deepStrictEqual(
+        pure(10).when(slowcat(true, false), add(3)).fast(4)._sortHapsByPart().firstCycle(),
+        fastcat(13, 10, 13, 10).firstCycle(),
+      );
    });
  });
-  describe('fastcat()', () => {
-    it('Can concatenate two things', () => {
-      expect(
+  describe('fastcat()', function () {
+    it('Can concatenate two things', function () {
+      assert.deepStrictEqual(
        fastcat(pure('a'), pure('b'))
          .firstCycle()
          .map((x) => x.value),
-      ).toStrictEqual(['a', 'b']);
+        ['a', 'b'],
+      );
    });
  });
-  describe('fastcat()', () => {
-    it('Can go into negative time', () => {
+  describe('fastcat()', function () {
+    it('Can go into negative time', function () {
      sameFirst(fastcat('a', 'b', 'c').late(1000000), fastcat('a', 'b', 'c'));
    });
  });
-  describe('slowcat()', () => {
-    it('Can concatenate things slowly', () => {
-      expect(
+  describe('slowcat()', function () {
+    it('Can concatenate things slowly', function () {
+      assert.deepStrictEqual(
        slowcat('a', 'b')
          .firstCycle()
          .map((x) => x.value),
-      ).toStrictEqual(['a']);
-
-      expect(
+        ['a'],
+      );
+      assert.deepStrictEqual(
        slowcat('a', 'b')
          ._early(1)
          .firstCycle()
          .map((x) => x.value),
-      ).toStrictEqual(['b']);
-
-      expect(
+        ['b'],
+      );
+      assert.deepStrictEqual(
        slowcat('a', slowcat('b', 'c'))
          ._early(1)
          .firstCycle()
          .map((x) => x.value),
-      ).toStrictEqual(['b']);
-
-      expect(
+        ['b'],
+      );
+      assert.deepStrictEqual(
        slowcat('a', slowcat('b', 'c'))
          ._early(3)
          .firstCycle()
          .map((x) => x.value),
-      ).toStrictEqual(['c']);
+        ['c'],
+      );
    });
    it('Can cat subpatterns', () => {
      sameFirst(slowcat('a', ['b', 'c']).fast(4), sequence('a', ['b', 'c']).fast(2));
    });
  });
-  describe('rev()', () => {
-    it('Can reverse things', () => {
-      expect(
+  describe('rev()', function () {
+    it('Can reverse things', function () {
+      assert.deepStrictEqual(
        fastcat('a', 'b', 'c')
          .rev()
          .firstCycle()
          .sort((a, b) => a.part.begin.sub(b.part.begin))
          .map((a) => a.value),
-      ).toStrictEqual(['c', 'b', 'a']);
+        ['c', 'b', 'a'],
+      );
    });
  });
  describe('sequence()', () => {
    it('Can work like fastcat', () => {
-      expect(sequence(1, 2, 3).firstCycle()).toStrictEqual(fastcat(1, 2, 3).firstCycle());
+      assert.deepStrictEqual(sequence(1, 2, 3).firstCycle(), fastcat(1, 2, 3).firstCycle());
    });
  });
  describe('polyrhythm()', () => {
    it('Can layer up cycles', () => {
-      expect(polyrhythm(['a', 'b'], ['c']).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        polyrhythm(['a', 'b'], ['c']).firstCycle(),
        stack(fastcat(pure('a'), pure('b')), pure('c')).firstCycle(),
      );
    });
  });
  describe('polymeter()', () => {
    it('Can layer up cycles, stepwise', () => {
-      expect(polymeterSteps(3, ['d', 'e']).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        polymeterSteps(3, ['d', 'e']).firstCycle(),
        fastcat(pure('d'), pure('e'), pure('d')).firstCycle(),
      );
-
-      expect(polymeter(['a', 'b', 'c'], ['d', 'e']).fast(2).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        polymeter(['a', 'b', 'c'], ['d', 'e']).fast(2).firstCycle(),
        stack(sequence('a', 'b', 'c', 'a', 'b', 'c'), sequence('d', 'e', 'd', 'e', 'd', 'e')).firstCycle(),
      );
    });
@@ -579,24 +574,29 @@ describe('Pattern', () => {

  describe('every()', () => {
    it('Can apply a function every 3rd time', () => {
-      expect(
+      assert.deepStrictEqual(
        pure('a')
          .every(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(
        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
      );
-      expect(sequence(3, 4, 5).every(3, add(3)).fast(5).firstCycle()).toStrictEqual(
+    });
+    it('works with currying', () => {
+      assert.deepStrictEqual(
+        pure('a').every(3, fast(2))._fast(3).firstCycle(),
+        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
+      );
+      assert.deepStrictEqual(
+        sequence(3, 4, 5).every(3, add(3)).fast(5).firstCycle(),
        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(
+      assert.deepStrictEqual(
+        sequence(3, 4, 5).every(2, sub(1)).fast(5).firstCycle(),
        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(
+      assert.deepStrictEqual(
+        sequence(3, 4, 5).every(3, add(3)).every(2, sub(1)).fast(2).firstCycle(),
        sequence(5, 6, 7, 3, 4, 5).firstCycle(),
      );
    });
@@ -606,91 +606,98 @@ describe('Pattern', () => {
      sameFirst(sequence('a', 'b').brak()._fast(2), sequence('a', 'b', fastcat(silence, 'a'), fastcat('b', silence)));
    });
  });
-  describe('timeCat()', () => {
-    it('Can concatenate patterns with different relative durations', () => {
-      expect(sequence('a', ['a', 'a']).firstCycle()).toStrictEqual(
+  describe('timeCat()', function () {
+    it('Can concatenate patterns with different relative durations', function () {
+      assert.deepStrictEqual(
+        sequence('a', ['a', 'a']).firstCycle(),
        timeCat([1, 'a'], [0.5, 'a'], [0.5, 'a']).firstCycle(),
      );
    });
  });
-  describe('struct()', () => {
-    it('Can restructure a discrete pattern', () => {
-      expect(sequence('a', 'b').struct(sequence(true, true, true)).firstCycle()).toStrictEqual([
+  describe('struct()', function () {
+    it('Can restructure a discrete pattern', function () {
+      assert.deepStrictEqual(sequence('a', 'b').struct(sequence(true, true, true)).firstCycle(), [
        hap(ts(0, third), ts(0, third), 'a'),
        hap(ts(third, twothirds), ts(third, 0.5), 'a'),
        hap(ts(third, twothirds), ts(0.5, twothirds), 'b'),
        hap(ts(twothirds, 1), ts(twothirds, 1), 'b'),
      ]);
-
-      expect(
+      assert.deepStrictEqual(
        pure('a')
          .struct(sequence(true, [true, false], true))
          .firstCycle(),
-      ).toStrictEqual(sequence('a', ['a', silence], 'a').firstCycle());
-
-      expect(
+        sequence('a', ['a', silence], 'a').firstCycle(),
+      );
+      assert.deepStrictEqual(
        pure('a')
          .struct(sequence(true, [true, false], true).invert())
          .firstCycle(),
-      ).toStrictEqual(sequence(silence, [silence, 'a'], silence).firstCycle());
-
-      expect(
+        sequence(silence, [silence, 'a'], silence).firstCycle(),
+      );
+      assert.deepStrictEqual(
        pure('a')
          .struct(sequence(true, [true, silence], true))
          .firstCycle(),
-      ).toStrictEqual(sequence('a', ['a', silence], 'a').firstCycle());
+        sequence('a', ['a', silence], 'a').firstCycle(),
+      );
    });
    it('Can structure a continuous pattern', () => {
-      expect(steady('a').struct(true, [true, true]).firstCycle()).toStrictEqual(sequence('a', ['a', 'a']).firstCycle());
+      assert.deepStrictEqual(
+        steady('a').struct(true, [true, true]).firstCycle(),
+        sequence('a', ['a', 'a']).firstCycle(),
+      );
    });
  });
-  describe('mask()', () => {
-    it('Can fragment a pattern', () => {
-      expect(sequence('a', 'b').mask(sequence(true, true, true)).firstCycle()).toStrictEqual([
+  describe('mask()', function () {
+    it('Can fragment a pattern', function () {
+      assert.deepStrictEqual(sequence('a', 'b').mask(sequence(true, true, true)).firstCycle(), [
        hap(ts(0, 0.5), ts(0, third), 'a'),
        hap(ts(0, 0.5), ts(third, 0.5), 'a'),
        hap(ts(0.5, 1), ts(0.5, twothirds), 'b'),
        hap(ts(0.5, 1), ts(twothirds, 1), 'b'),
      ]);
    });
-    it('Can mask off parts of a pattern', () => {
-      expect(sequence(['a', 'b'], 'c').mask(sequence(true, false)).firstCycle()).toStrictEqual(
+    it('Can mask off parts of a pattern', function () {
+      assert.deepStrictEqual(
+        sequence(['a', 'b'], 'c').mask(sequence(true, false)).firstCycle(),
        sequence(['a', 'b'], silence).firstCycle(),
      );
-
-      expect(sequence('a').mask(sequence(true, false)).firstCycle()).toStrictEqual([hap(ts(0, 1), ts(0, 0.5), 'a')]);
+      assert.deepStrictEqual(sequence('a').mask(sequence(true, false)).firstCycle(), [hap(ts(0, 1), ts(0, 0.5), 'a')]);
    });
  });
-  describe('invert()', () => {
-    it('Can invert a binary pattern', () => {
-      expect(sequence(true, false, [true, false]).invert().firstCycle()).toStrictEqual(
+  describe('invert()', function () {
+    it('Can invert a binary pattern', function () {
+      assert.deepStrictEqual(
+        sequence(true, false, [true, false]).invert().firstCycle(),
        sequence(false, true, [false, true]).firstCycle(),
      );
    });
  });
-  describe('signal()', () => {
-    it('Can make saw/saw2', () => {
-      expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(
+  describe('signal()', function () {
+    it('Can make saw/saw2', function () {
+      assert.deepStrictEqual(
+        saw.struct(true, true, true, true).firstCycle(),
        sequence(1 / 8, 3 / 8, 5 / 8, 7 / 8).firstCycle(),
      );
-
-      expect(saw2.struct(true, true, true, true).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        saw2.struct(true, true, true, true).firstCycle(),
        sequence(-3 / 4, -1 / 4, 1 / 4, 3 / 4).firstCycle(),
      );
    });
-    it('Can make isaw/isaw2', () => {
-      expect(isaw.struct(true, true, true, true).firstCycle()).toStrictEqual(
+    it('Can make isaw/isaw2', function () {
+      assert.deepStrictEqual(
+        isaw.struct(true, true, true, true).firstCycle(),
        sequence(7 / 8, 5 / 8, 3 / 8, 1 / 8).firstCycle(),
      );
-
-      expect(isaw2.struct(true, true, true, true).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        isaw2.struct(true, true, true, true).firstCycle(),
        sequence(3 / 4, 1 / 4, -1 / 4, -3 / 4).firstCycle(),
      );
    });
  });
  describe('_setContext()', () => {
    it('Can set the hap context', () => {
-      expect(
+      assert.deepStrictEqual(
        pure('a')
          ._setContext([
            [
@@ -699,19 +706,20 @@ describe('Pattern', () => {
            ],
          ])
          .firstCycle(true),
-      ).toStrictEqual([
-        hap(ts(0, 1), ts(0, 1), 'a', [
-          [
-            [0, 1],
-            [1, 2],
-          ],
-        ]),
-      ]);
+        [
+          hap(ts(0, 1), ts(0, 1), 'a', [
+            [
+              [0, 1],
+              [1, 2],
+            ],
+          ]),
+        ],
+      );
    });
  });
  describe('_withContext()', () => {
    it('Can update the hap context', () => {
-      expect(
+      assert.deepStrictEqual(
        pure('a')
          ._setContext([
            [
@@ -727,49 +735,52 @@ describe('Pattern', () => {
            ],
          ])
          .firstCycle(true),
-      ).toStrictEqual([
-        hap(ts(0, 1), ts(0, 1), 'a', [
-          [
-            [0, 1],
-            [1, 2],
-          ],
-          [
-            [3, 4],
-            [3, 4],
-          ],
-        ]),
-      ]);
+        [
+          hap(ts(0, 1), ts(0, 1), 'a', [
+            [
+              [0, 1],
+              [1, 2],
+            ],
+            [
+              [3, 4],
+              [3, 4],
+            ],
+          ]),
+        ],
+      );
    });
  });
  describe('apply', () => {
    it('Can apply a function', () => {
-      expect(sequence('a', 'b')._apply(fast(2)).firstCycle()).toStrictEqual(sequence('a', 'b').fast(2).firstCycle());
+      assert.deepStrictEqual(sequence('a', 'b')._apply(fast(2)).firstCycle(), 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());
-        expect(sequence('a', 'b').apply(fast(2), fast(3)).firstCycle()).toStrictEqual(
+        assert.deepStrictEqual(sequence('a', 'b').apply(fast(2)).firstCycle(), sequence('a', 'b').fast(2).firstCycle());
+        assert.deepStrictEqual(
+          sequence('a', 'b').apply(fast(2), fast(3)).firstCycle(),
          sequence('a', 'b').fast(2, 3).firstCycle(),
        );
      });
  });
  describe('layer', () => {
    it('Can layer up multiple functions', () => {
-      expect(
+      assert.deepStrictEqual(
        sequence(1, 2, 3)
          .layer(fast(2), (pat) => pat.add(3, 4))
          .firstCycle(),
-      ).toStrictEqual(stack(sequence(1, 2, 3).fast(2), sequence(1, 2, 3).add(3, 4)).firstCycle());
+        stack(sequence(1, 2, 3).fast(2), sequence(1, 2, 3).add(3, 4)).firstCycle(),
+      );
    });
  });
  describe('early', () => {
    it('Can shift a hap earlier', () => {
-      expect(pure(30)._late(0.25).query(st(1, 2))).toStrictEqual([
+      assert.deepStrictEqual(pure(30)._late(0.25).query(st(1, 2)), [
        hap(ts(1 / 4, 5 / 4), ts(1, 5 / 4), 30),
        hap(ts(5 / 4, 9 / 4), ts(5 / 4, 2), 30),
      ]);
    });
    it('Can shift a hap earlier, into negative time', () => {
-      expect(pure(30)._late(0.25).query(st(0, 1))).toStrictEqual([
+      assert.deepStrictEqual(pure(30)._late(0.25).query(st(0, 1)), [
        hap(ts(-3 / 4, 1 / 4), ts(0, 1 / 4), 30),
        hap(ts(1 / 4, 5 / 4), ts(1 / 4, 1), 30),
      ]);
@@ -777,14 +788,16 @@ describe('Pattern', () => {
  });
  describe('off', () => {
    it('Can offset a transformed pattern from the original', () => {
-      expect(pure(30).off(0.25, add(2)).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        pure(30).off(0.25, add(2)).firstCycle(),
        stack(pure(30), pure(30).late(0.25).add(2)).firstCycle(),
      );
    });
  });
  describe('jux', () => {
    it('Can juxtapose', () => {
-      expect(pure({ a: 1 }).jux(fast(2))._sortHapsByPart().firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        pure({ a: 1 }).jux(fast(2))._sortHapsByPart().firstCycle(),
        stack(pure({ a: 1, pan: 0 }), pure({ a: 1, pan: 1 }).fast(2))
          ._sortHapsByPart()
          .firstCycle(),
@@ -793,7 +806,8 @@ describe('Pattern', () => {
  });
  describe('juxBy', () => {
    it('Can juxtapose by half', () => {
-      expect(pure({ a: 1 }).juxBy(0.5, fast(2))._sortHapsByPart().firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        pure({ a: 1 }).juxBy(0.5, fast(2))._sortHapsByPart().firstCycle(),
        stack(pure({ a: 1, pan: 0.25 }), pure({ a: 1, pan: 0.75 }).fast(2))
          ._sortHapsByPart()
          .firstCycle(),
@@ -802,12 +816,11 @@ describe('Pattern', () => {
  });
  describe('_squeezeJoin', () => {
    it('Can squeeze', () => {
-      expect(
+      assert.deepStrictEqual(
        sequence('a', ['a', 'a'])
          .fmap((a) => fastcat('b', 'c'))
          ._squeezeJoin()
          .firstCycle(),
-      ).toStrictEqual(
        sequence(
          ['b', 'c'],
          [
@@ -817,24 +830,17 @@ describe('Pattern', () => {
        ).firstCycle(),
      );
    });
-    it('Squeezes to the correct cycle', () => {
-      expect(
-        pure(time.struct(true))
-          ._squeezeJoin()
-          .queryArc(3, 4)
-          .map((x) => x.value),
-      ).toStrictEqual([Fraction(3.5)]);
-    });
  });
  describe('ply', () => {
    it('Can ply(3)', () => {
-      expect(sequence('a', ['b', 'c']).ply(3).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        sequence('a', ['b', 'c']).ply(3).firstCycle(),
        sequence(pure('a').fast(3), [pure('b').fast(3), pure('c').fast(3)]).firstCycle(),
      );
    });
    it('Doesnt drop haps in the 9th cycle', () => {
      // fixed with https://github.com/tidalcycles/strudel/commit/72eeaf446e3d5e186d63cc0d2276f0723cde017a
-      expect(sequence(1, 2, 3).ply(2).early(8).firstCycle().length).toBe(6);
+      assert.equal(sequence(1, 2, 3).ply(2).early(8).firstCycle().length, 6);
    });
  });
  describe('striate', () => {
@@ -847,7 +853,8 @@ describe('Pattern', () => {
  });
  describe('chop', () => {
    it('Can _chop(2)', () => {
-      expect(sequence({ sound: 'a' }, { sound: 'b' })._chop(2).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        sequence({ sound: 'a' }, { sound: 'b' })._chop(2).firstCycle(),
        sequence(
          { sound: 'a', begin: 0, end: 0.5 },
          { sound: 'a', begin: 0.5, end: 1 },
@@ -857,7 +864,8 @@ describe('Pattern', () => {
      );
    });
    it('Can chop(2,3)', () => {
-      expect(pure({ sound: 'a' }).fast(2).chop(2, 3)._sortHapsByPart().firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        pure({ sound: 'a' }).fast(2).chop(2, 3)._sortHapsByPart().firstCycle(),
        sequence(
          [
            { sound: 'a', begin: 0, end: 0.5 },
@@ -874,21 +882,18 @@ describe('Pattern', () => {
      );
    });
  });
-  describe('range', () => {
-    it('Can be patterned', () => {
-      expect(sequence(0, 0).range(sequence(0, 0.5), 1).firstCycle()).toStrictEqual(sequence(0, 0.5).firstCycle());
-    });
-  });
  describe('range2', () => {
    it('Can change the range of a bipolar pattern', () => {
-      expect(sequence(-1, -0.5, 0, 0.5).range2(1000, 1100).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        sequence(-1, -0.5, 0, 0.5).range2(1000, 1100).firstCycle(),
        sequence(1000, 1025, 1050, 1075).firstCycle(),
      );
    });
  });
  describe('linger', () => {
    it('Can linger on the first quarter of a cycle', () => {
-      expect(sequence(0, 1, 2, 3, 4, 5, 6, 7).linger(0.25).firstCycle()).toStrictEqual(
+      assert.deepStrictEqual(
+        sequence(0, 1, 2, 3, 4, 5, 6, 7).linger(0.25).firstCycle(),
        sequence(0, 1, 0, 1, 0, 1, 0, 1).firstCycle(),
      );
    });
@@ -1,224 +1,120 @@
 /*
-util.test.mjs - Tests for the core 'util' module
+util.test.mjs - <short description TODO>
 Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/util.test.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 { strict as assert } from 'assert';
 import { pure } from '../pattern.mjs';
-import {
-  isNote,
-  tokenizeNote,
-  toMidi,
-  fromMidi,
-  mod,
-  compose,
-  getFrequency,
-  getPlayableNoteValue,
-  parseNumeral,
-  parseFractional,
-  numeralArgs,
-  fractionalArgs,
-} from '../util.mjs';
-import { describe, it, expect } from 'vitest';
+import { isNote, tokenizeNote, toMidi, fromMidi, mod, compose, getFrequency } from '../util.mjs';

 describe('isNote', () => {
  it('should recognize notes without accidentals', () => {
    'C3 D3 E3 F3 G3 A3 B3 C4 D5 c5 d5 e5'.split(' ').forEach((note) => {
-      expect(isNote(note)).toBe(true);
+      assert.equal(isNote(note), true);
    });
  });
  it('should recognize notes with accidentals', () => {
    'C#3 D##3 Eb3 Fbb3 Bb5'.split(' ').forEach((note) => {
-      expect(isNote(note)).toBe(true);
+      assert.equal(isNote(note), true);
    });
  });
  it('should not recognize invalid notes', () => {
-    expect(isNote('H5')).toBe(false);
-    expect(isNote('C')).toBe(false);
-    expect(isNote('X')).toBe(false);
-    expect(isNote(1)).toBe(false);
+    assert.equal(isNote('H5'), false);
+    assert.equal(isNote('C'), false);
+    assert.equal(isNote('X'), false);
+    assert.equal(isNote(1), false);
  });
 });

 describe('isNote', () => {
  it('should tokenize notes without accidentals', () => {
-    expect(tokenizeNote('C3')).toStrictEqual(['C', '', 3]);
-    expect(tokenizeNote('D3')).toStrictEqual(['D', '', 3]);
-    expect(tokenizeNote('E3')).toStrictEqual(['E', '', 3]);
-    expect(tokenizeNote('F3')).toStrictEqual(['F', '', 3]);
-    expect(tokenizeNote('G3')).toStrictEqual(['G', '', 3]);
-    expect(tokenizeNote('A3')).toStrictEqual(['A', '', 3]);
-    expect(tokenizeNote('B3')).toStrictEqual(['B', '', 3]);
-    expect(tokenizeNote('C4')).toStrictEqual(['C', '', 4]);
-    expect(tokenizeNote('D5')).toStrictEqual(['D', '', 5]);
+    assert.deepStrictEqual(tokenizeNote('C3'), ['C', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('D3'), ['D', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('E3'), ['E', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('F3'), ['F', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('G3'), ['G', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('A3'), ['A', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('B3'), ['B', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('C4'), ['C', '', 4]);
+    assert.deepStrictEqual(tokenizeNote('D5'), ['D', '', 5]);
  });
  it('should tokenize notes with accidentals', () => {
-    expect(tokenizeNote('C#3')).toStrictEqual(['C', '#', 3]);
-    expect(tokenizeNote('D##3')).toStrictEqual(['D', '##', 3]);
-    expect(tokenizeNote('Eb3')).toStrictEqual(['E', 'b', 3]);
-    expect(tokenizeNote('Fbb3')).toStrictEqual(['F', 'bb', 3]);
-    expect(tokenizeNote('Bb5')).toStrictEqual(['B', 'b', 5]);
+    assert.deepStrictEqual(tokenizeNote('C#3'), ['C', '#', 3]);
+    assert.deepStrictEqual(tokenizeNote('D##3'), ['D', '##', 3]);
+    assert.deepStrictEqual(tokenizeNote('Eb3'), ['E', 'b', 3]);
+    assert.deepStrictEqual(tokenizeNote('Fbb3'), ['F', 'bb', 3]);
+    assert.deepStrictEqual(tokenizeNote('Bb5'), ['B', 'b', 5]);
  });
  it('should tokenize notes without octave', () => {
-    expect(tokenizeNote('C')).toStrictEqual(['C', '', undefined]);
-    expect(tokenizeNote('C#')).toStrictEqual(['C', '#', undefined]);
-    expect(tokenizeNote('Bb')).toStrictEqual(['B', 'b', undefined]);
-    expect(tokenizeNote('Bbb')).toStrictEqual(['B', 'bb', undefined]);
+    assert.deepStrictEqual(tokenizeNote('C'), ['C', '', undefined]);
+    assert.deepStrictEqual(tokenizeNote('C#'), ['C', '#', undefined]);
+    assert.deepStrictEqual(tokenizeNote('Bb'), ['B', 'b', undefined]);
+    assert.deepStrictEqual(tokenizeNote('Bbb'), ['B', 'bb', undefined]);
  });
  it('should not tokenize invalid notes', () => {
-    expect(tokenizeNote('X')).toStrictEqual([]);
-    expect(tokenizeNote('asfasf')).toStrictEqual([]);
-    expect(tokenizeNote(123)).toStrictEqual([]);
+    assert.deepStrictEqual(tokenizeNote('X'), []);
+    assert.deepStrictEqual(tokenizeNote('asfasf'), []);
+    assert.deepStrictEqual(tokenizeNote(123), []);
  });
 });
 describe('toMidi', () => {
  it('should turn notes into midi', () => {
-    expect(toMidi('A4')).toEqual(69);
-    expect(toMidi('C4')).toEqual(60);
-    expect(toMidi('Db4')).toEqual(61);
-    expect(toMidi('C3')).toEqual(48);
-    expect(toMidi('Cb3')).toEqual(47);
-    expect(toMidi('Cbb3')).toEqual(46);
-    expect(toMidi('C#3')).toEqual(49);
-    expect(toMidi('C#3')).toEqual(49);
-    expect(toMidi('C##3')).toEqual(50);
-  });
-  it('should throw an error when given a non-note', () => {
-    expect(() => toMidi('Q')).toThrowError(`not a note: "Q"`);
-    expect(() => toMidi('Z')).toThrowError(`not a note: "Z"`);
+    assert.equal(toMidi('A4'), 69);
+    assert.equal(toMidi('C4'), 60);
+    assert.equal(toMidi('Db4'), 61);
+    assert.equal(toMidi('C3'), 48);
+    assert.equal(toMidi('Cb3'), 47);
+    assert.equal(toMidi('Cbb3'), 46);
+    assert.equal(toMidi('C#3'), 49);
+    assert.equal(toMidi('C#3'), 49);
+    assert.equal(toMidi('C##3'), 50);
  });
 });
 describe('fromMidi', () => {
  it('should turn midi into frequency', () => {
-    expect(fromMidi(69)).toEqual(440);
-    expect(fromMidi(57)).toEqual(220);
+    assert.equal(fromMidi(69), 440);
+    assert.equal(fromMidi(57), 220);
  });
 });
 describe('getFrequency', () => {
-  const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
-  it('should turn note into frequency', () => {
-    expect(getFrequency(happify('a4'))).toEqual(440);
-    expect(getFrequency(happify('a3'))).toEqual(220);
-  });
  it('should turn midi into frequency', () => {
-    expect(getFrequency(happify(69, { type: 'midi' }))).toEqual(440);
-    expect(getFrequency(happify(57, { type: 'midi' }))).toEqual(220);
-  });
-  it('should return frequencies unchanged', () => {
-    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);
-  });
-  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`);
+    const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
+    assert.equal(getFrequency(happify('a4')), 440);
+    assert.equal(getFrequency(happify('a3')), 220);
+    assert.equal(getFrequency(happify(440, { type: 'frequency' })), 440); // TODO: migrate when values are objects..
+    assert.equal(getFrequency(happify(432, { type: 'frequency' })), 432);
  });
 });

 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);
+    assert.equal(mod(0, 3), 0);
+    assert.equal(mod(1, 3), 1);
+    assert.equal(mod(2, 3), 2);
+    assert.equal(mod(3, 3), 0);
+    assert.equal(mod(4, 3), 1);
+    assert.equal(mod(4, 2), 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);
+    assert.equal(mod(-1, 3), 2);
+    assert.equal(mod(-2, 3), 1);
+    assert.equal(mod(-3, 3), 0);
+    assert.equal(mod(-4, 3), 2);
+    assert.equal(mod(-5, 3), 1);
+    assert.equal(mod(-3, 2), 1);
  });
 });

 describe('compose', () => {
  const add1 = (a) => a + 1;
  it('should compose', () => {
-    expect(compose(add1, add1)(0)).toEqual(2);
-    expect(compose(add1)(0)).toEqual(1);
+    assert.equal(compose(add1, add1)(0), 2);
+    assert.equal(compose(add1)(0), 1);
  });
  const addS = (s) => (a) => a + s;
  it('should compose left to right', () => {
-    expect(compose(addS('a'), addS('b'))('')).toEqual('ab');
-    expect(compose(addS('a'), addS('b'))('x')).toEqual('xab');
-  });
-});
-
-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');
-  });
-  it('should return object "n" property', () => {
-    expect(getPlayableNoteValue(happify({ n: 'a4' }))).toEqual('a4');
-  });
-  it('should return object "value" property', () => {
-    expect(getPlayableNoteValue(happify({ value: 'a4' }))).toEqual('a4');
-  });
-  it('should turn midi into frequency', () => {
-    expect(getPlayableNoteValue(happify(57, { type: 'midi' }))).toEqual(220);
-  });
-  it('should return frequency value', () => {
-    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`);
-  });
-});
-
-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);
+    assert.equal(compose(addS('a'), addS('b'))(''), 'ab');
+    assert.equal(compose(addS('a'), addS('b'))('x'), 'xab');
  });
 });
@@ -4,21 +4,21 @@ 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 { describe, it, expect } from 'vitest';
+import { strict as assert } from 'assert';
 import { map, valued, mul } from '../value.mjs';

 describe('Value', () => {
  it('unionWith', () => {
    const { value } = valued({ freq: 2000, distortion: 1.2 }).unionWith({ distortion: 2 }, mul);
-    expect(value).toStrictEqual({ freq: 2000, distortion: 2.4 });
+    assert.deepStrictEqual(value, { freq: 2000, distortion: 2.4 });
  });

  it('experiments', () => {
-    expect(map(mul(5), valued(3)).value).toEqual(15);
-    expect(map(mul(null), valued(3)).value).toEqual(0);
-    expect(map(mul(3), valued(null)).value).toEqual(null);
-    expect(valued(3).map(mul).ap(3).value).toEqual(9);
-    expect(valued(mul).ap(3).ap(3).value).toEqual(9);
-    expect(valued(3).mul(3).value).toEqual(9);
+    assert.equal(map(mul(5), valued(3)).value, 15);
+    assert.equal(map(mul(null), valued(3)).value, 0);
+    assert.equal(map(mul(3), valued(null)).value, null);
+    assert.equal(valued(3).map(mul).ap(3).value, 9);
+    assert.equal(valued(mul).ap(3).ap(3).value, 9);
+    assert.equal(valued(3).mul(3).value, 9);
  });
 });
@@ -18,11 +18,6 @@ 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)) {
@@ -19,6 +19,9 @@ export const tokenizeNote = (note) => {

 // turns the given note into its midi number representation
 export const toMidi = (note) => {
+  if (typeof note === 'number') {
+    return note;
+  }
  const [pc, acc, oct] = tokenizeNote(note);
  if (!pc) {
    throw new Error('not a note: "' + note + '"');
@@ -31,9 +34,6 @@ export const fromMidi = (n) => {
  return Math.pow(2, (n - 69) / 12) * 440;
 };

-/**
- * @deprecated does not appear to be referenced or invoked anywhere in the codebase
- */
 export const getFreq = (noteOrMidi) => {
  if (typeof noteOrMidi === 'number') {
    return fromMidi(noteOrMidi);
@@ -41,9 +41,6 @@ export const getFreq = (noteOrMidi) => {
  return fromMidi(toMidi(noteOrMidi));
 };

-/**
- * @deprecated does not appear to be referenced or invoked anywhere in the codebase
- */
 export const midi2note = (n) => {
  const oct = Math.floor(n / 12) - 1;
  const pc = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'][n % 12];
@@ -56,16 +53,11 @@ export const mod = (n, m) => ((n % m) + m) % m;

 export const getPlayableNoteValue = (hap) => {
  let { value: note, context } = hap;
-  if (typeof note === 'object' && !Array.isArray(note)) {
-    note = note.note || note.n || note.value;
-  }
  // if value is number => interpret as midi number as long as its not marked as frequency
  if (typeof note === 'number' && context.type !== 'frequency') {
    note = fromMidi(hap.value);
-  } else if (typeof note === 'number' && context.type === 'frequency') {
-    note = hap.value; // legacy workaround.. will be removed in the future
-  } else if (typeof note !== 'string' || !isNote(note)) {
-    throw new Error('not a note: ' + JSON.stringify(note));
+  } else if (typeof note === 'string' && !isNote(note)) {
+    throw new Error('not a note: ' + note);
  }
  return note;
 };
@@ -73,18 +65,15 @@ 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') {
-    if (value.freq) {
-      return value.freq;
-    }
-    return getFreq(value.note || value.n || value.value);
+  if (typeof value === 'object' && value.freq) {
+    return value.freq;
  }
  if (typeof value === 'number' && context.type !== 'frequency') {
    value = fromMidi(hap.value);
  } else if (typeof value === 'string' && isNote(value)) {
    value = fromMidi(toMidi(hap.value));
  } else if (typeof value !== 'number') {
-    throw new Error('not a note or frequency: ' + value);
+    throw new Error('not a note or frequency:' + value);
  }
  return value;
 };
@@ -133,46 +122,3 @@ 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);
@@ -1,48 +0,0 @@
-// 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 = () => {
-    onTick();
-    intervalID = setInterval(onTick, interval * 1000);
-  };
-  const clear = () => 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;
@@ -10,22 +10,16 @@ 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>
  <!--
-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)
+      "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))
+    .out()
+    .pianoroll({minMidi:20,maxMidi:120,background:'#202124'})
      -->
 </strudel-repl>
 ```
@@ -2,21 +2,15 @@
 <!-- <script src="./embed.js"></script> -->
 <strudel-repl>
  <!--
-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)
+      "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))
+    .out()
+    .pianoroll({minMidi:20,maxMidi:120,background:'#202124'})
      -->
 </strudel-repl>
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/embed",
-  "version": "0.2.0",
+  "version": "0.1.1",
  "description": "Embeddable Web Component to load a Strudel REPL into an iframe",
  "main": "embed.js",
  "type": "module",
@@ -11,9 +11,10 @@ npm i @strudel.cycles/eval --save

 ## Example

+<!-- TODO: -extend +evalScope -->
+
 ```js
-import { evalScope } from '@strudel.cycles/core';
-import { evaluate } from '@strudel.cycles/eval';
+import { evaluate, extend } from '@strudel.cycles/eval';

 evalScope(
  import('@strudel.cycles/core'),
@@ -4,9 +4,46 @@ 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) => {
-  return _evaluate(code, shapeshifter);
+  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 };
 };
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/eval",
-	"version": "0.3.2",
+	"version": "0.1.3",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/eval",
-  "version": "0.3.2",
+  "version": "0.1.3",
  "description": "Code evaluator for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -8,7 +8,7 @@
    "test": "test"
  },
  "scripts": {
-    "test": "vitest run"
+    "test": "mocha --colors"
  },
  "repository": {
    "type": "git",
@@ -28,12 +28,12 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.3.2",
+    "@strudel.cycles/core": "^0.1.2",
    "estraverse": "^5.3.0",
-    "shift-ast": "^7.0.0",
-    "shift-codegen": "^8.1.0",
-    "shift-parser": "^8.0.0",
-    "shift-spec": "^2019.0.0",
+    "shift-ast": "^6.1.0",
+    "shift-codegen": "^7.0.3",
+    "shift-parser": "^7.0.3",
+    "shift-spec": "^2018.0.2",
    "shift-traverser": "^1.0.0"
  }
 }
@@ -30,12 +30,11 @@ 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 = false; // this is now handled by core evaluate by default
-export const shouldAddReturn = true;
+export const wrappedAsync = true;

 export default (_code) => {
  const { code, addReturn } = wrapAsync(_code);
-  const ast = parseScriptWithLocation(disguiseImports(code));
+  const ast = parseScriptWithLocation(code);
  const artificialNodes = [];
  const parents = [];
  const shifted = replace(ast.tree, {
@@ -126,25 +125,13 @@ export default (_code) => {
    },
  });
  // add return to last statement (because it's wrapped in an async function artificially)
-  if (shouldAddReturn) {
+  if (wrappedAsync) {
    addReturn(shifted);
  }
-  const generated = undisguiseImports(codegen(shifted));
+  const generated = codegen(shifted);
  return generated;
 };

-// renames all import statements to "_mport" as Shift doesn't support dynamic import.
-// there shouldn't be any side-effects from this as this change does not affect
-// the syntax & will be undone by the equivalent replace in "undisguiseImports".
-function disguiseImports(code) {
-  return code.replaceAll('import', '_mport'); // Must be the same length!
-}
-
-// Rename the renamed import statements back to "import"
-function undisguiseImports(code) {
-  return code.replaceAll('_mport', 'import');
-}
-
 function wrapAsync(code) {
  // wrap code in async to make await work on top level => this will create 1 line offset to locations
  // this is why line offset is -1 in getLocationObject calls below
@@ -154,7 +141,7 @@ ${code}
 })()`;
  }
  const addReturn = (ast) => {
-    const body = wrappedAsync ? ast.statements[0].expression.callee.body : ast;
+    const body = ast.statements[0].expression.callee.body; // actual code ast inside async function body
    body.statements = body.statements
      .slice(0, -1)
      .concat([new ReturnStatement({ expression: body.statements.slice(-1)[0] })]);
@@ -4,29 +4,31 @@ 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 { expect, describe, it } from 'vitest';
-
-import { evaluate } from '../evaluate.mjs';
+import { strict as assert } from 'assert';
+import { evaluate, extend } from '../evaluate.mjs';
 import { mini } from '@strudel.cycles/mini';
 import * as strudel from '@strudel.cycles/core';
-const { fastcat, evalScope } = strudel;

-describe('evaluate', async () => {
-  await evalScope({ mini }, strudel);
+const { fastcat } = strudel;
+
+extend({ mini }, strudel);
+// TODO: test evalScope
+
+describe('evaluate', () => {
  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']);
-    expect(await ev('fastcat("c3", "d3")')).toEqual(['c3', 'd3']);
-    expect(await ev('slowcat("c3", "d3")')).toEqual(['c3']);
+    assert.deepStrictEqual(await ev("pure('c3')"), ['c3']);
+    assert.deepStrictEqual(await ev('cat(c3)'), ['c3']);
+    assert.deepStrictEqual(await ev('fastcat(c3, d3)'), ['c3', 'd3']);
+    assert.deepStrictEqual(await ev('slowcat(c3, d3)'), ['c3']);
  });
-  it('Scope should be extendable', async () => {
-    await evalScope({ myFunction: (...x) => fastcat(...x) });
-    expect(await ev('myFunction("c3", "d3")')).toEqual(['c3', 'd3']);
+  it('Should be extendable', async () => {
+    extend({ myFunction: (...x) => fastcat(...x) });
+    assert.deepStrictEqual(await ev('myFunction(c3, d3)'), ['c3', 'd3']);
  });
  it('Should evaluate simple double quoted mini notation', async () => {
-    expect(await ev('"c3"')).toEqual(['c3']);
-    expect(await ev('"c3 d3"')).toEqual(['c3', 'd3']);
-    expect(await ev('"<c3 d3>"')).toEqual(['c3']);
+    assert.deepStrictEqual(await ev('"c3"'), ['c3']);
+    assert.deepStrictEqual(await ev('"c3 d3"'), ['c3', 'd3']);
+    assert.deepStrictEqual(await ev('"<c3 d3>"'), ['c3']);
  });
 });
@@ -4,22 +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/>.
 */

-import { describe, it, expect } from 'vitest';
-import shapeshifter, { wrappedAsync } from '../shapeshifter.mjs';
+import { strict as assert } from 'assert';
+import shapeshifter from '../shapeshifter.mjs';

 describe('shapeshifter', () => {
  it('Should shift simple double quote string', () => {
-    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])');
-    }
+    assert.equal(shapeshifter('"c3"'), '(async()=>{return mini("c3").withMiniLocation([1,0,15],[1,4,19])})()');
  });
-  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])',
-      );
-    });
-  }
 });
@@ -5,11 +5,12 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import { isNote } from 'tone';
-import * as _WebMidi from 'webmidi';
+import _WebMidi from 'webmidi';
 import { Pattern, isPattern } from '@strudel.cycles/core';
 import { Tone } from '@strudel.cycles/tone';
+
 // 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() {
  return new Promise((resolve, reject) => {
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/midi",
-	"version": "0.3.2",
+	"version": "0.1.3",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/midi",
-  "version": "0.3.2",
+  "version": "0.1.3",
  "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.3.2",
+    "@strudel.cycles/tone": "^0.1.3",
    "tone": "^14.7.77",
-    "webmidi": "^3.0.21"
+    "webmidi": "^2.5.2"
  }
 }
@@ -33,12 +33,3 @@ 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
-```
@@ -8,7 +8,6 @@ This program is free software: you can redistribute it and/or modify it under th
 // a sequence = a serie of elements placed between quotes
 // a stack = a serie of vertically aligned slices sharing the same overall length
 // a slice = a serie of horizontally aligned elements
-// a choose = a serie of elements, one of which is chosen at random


 {
@@ -82,8 +81,7 @@ DIGIT  = [0-9]
 // ------------------ delimiters ---------------------------

 ws "whitespace" = [ \n\r\t]*
-comma = ws "," ws
-pipe = ws "|" ws
+comma = ws "," ws;
 quote = '"' / "'"

 // ------------------ steps and cycles ---------------------------
@@ -93,7 +91,7 @@ step_char =  [0-9a-zA-Z~] / "-" / "#" / "." / "^" / "_" / ":"
 step = ws chars:step_char+ ws { return chars.join("") }

 // define a sub cycle e.g. [1 2, 3 [4]]
-sub_cycle = ws  "[" ws s:stack_or_choose ws "]" ws { return s}
+sub_cycle = ws  "[" ws s:stack ws "]" ws { return s}

 // define a timeline e.g <1 3 [3 5]>. We simply defer to a stack and change the alignement
 timeline = ws "<" ws sc:single_cycle ws ">" ws
@@ -104,7 +102,7 @@ slice = step / sub_cycle  / timeline

 // slice modifier affects the timing/size of a slice (e.g. [a b c]@3)
 // at this point, we assume we can represent them as regular sequence operators
-slice_modifier = slice_weight / slice_bjorklund / slice_slow / slice_fast / slice_fixed_step / slice_replicate / slice_degrade
+slice_modifier = slice_weight / slice_bjorklund / slice_slow / slice_fast / slice_fixed_step / slice_replicate

 slice_weight =  "@" a:number
  { return { weight: a} }
@@ -124,9 +122,6 @@ slice_fast = "*"a:number
 slice_fixed_step = "%"a:number
  { return { operator : { type_: "fixed-step", arguments_ :{ amount:a } } } }

-slice_degrade = "?"a:number?
-  { return { operator : { type_: "degradeBy", arguments_ :{ amount:(a? a : 0.5) } } } }
-
 // a slice with an modifier applied i.e [bd@4 sd@3]@2 hh]
 slice_with_modifier = s:slice o:slice_modifier?
  { return new ElementStub(s, o);}
@@ -137,22 +132,14 @@ single_cycle = s:(slice_with_modifier)+
  { return new PatternStub(s,"h"); }

 // a stack is a serie of vertically aligned single cycles, separated by a comma
-stack_tail = tail:(comma @single_cycle)+
-  { return { alignment: 'v', list: tail }; }
-
-// a choose is a serie of pipe-separated single cycles, one of which is chosen
-// at random each time through the pattern
-choose_tail = tail:(pipe @single_cycle)+
-  { return { alignment: 'r', list: tail }; }
-
 // if the stack contains only one element, we don't create a stack but return the
 // underlying element
-stack_or_choose = head:single_cycle tail:(stack_tail / choose_tail)?
-  { if (tail && tail.list.length > 0) { return new PatternStub([head, ...tail.list], tail.alignment); } else { return head; } }
+stack = c:single_cycle cs:(comma v:single_cycle { return v})*
+  { if (cs.length == 0 && c instanceof Object) { return c;} else { cs.unshift(c); return new PatternStub(cs,"v");}  }

 // a sequence is a quoted stack
-sequence = ws quote sc:stack_or_choose quote
-  { return sc; }
+sequence = ws quote s:stack quote
+  { return s; }

 // ------------------ operators ---------------------------

@@ -6,17 +6,10 @@ 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';
+import { addMiniLocations } from '@strudel.cycles/eval/shapeshifter.mjs';

 const { pure, Pattern, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel;

-var _seedState = 0;
-const randOffset = 0.0002;
-
-function _nextSeed() {
-  return _seedState++;
-}
-
 const applyOptions = (parent) => (pat, i) => {
  const ast = parent.source_[i];
  const options = ast.options_;
@@ -28,11 +21,6 @@ const applyOptions = (parent) => (pat, i) => {
        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: case 'fixed-step': "%"
    }
    console.warn(`operator "${operator.type_}" not implemented`);
@@ -94,9 +82,6 @@ export function patternifyAST(ast) {
      if (alignment === 'v') {
        return stack(...children);
      }
-      if (alignment === 'r') {
-        return strudel.chooseInWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), children);
-      }
      const weightedChildren = ast.source_.some((child) => !!child.options_?.weight);
      if (!weightedChildren && alignment === 't') {
        return slowcat(...children);
@@ -115,9 +100,9 @@ export function patternifyAST(ast) {
        return silence;
      }
      if (typeof ast.source_ !== 'object') {
-        /* if (!addMiniLocations) {
+        if (!addMiniLocations) {
          return ast.source_;
-        } */
+        }
        if (!ast.location_) {
          console.warn('no location for', ast);
          return ast.source_;
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/mini",
-  "version": "0.3.2",
+  "version": "0.1.3",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -1,11 +1,11 @@
 {
  "name": "@strudel.cycles/mini",
-  "version": "0.3.2",
+  "version": "0.1.3",
  "description": "Mini notation for strudel",
  "main": "index.mjs",
  "type": "module",
  "scripts": {
-    "test": "vitest run",
+    "test": "mocha --colors",
    "build:parser": "peggy -o krill-parser.js --format es ./krill.pegjs"
  },
  "repository": {
@@ -26,9 +26,9 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.3.2",
-    "@strudel.cycles/eval": "^0.3.2",
-    "@strudel.cycles/tone": "^0.3.2"
+    "@strudel.cycles/core": "^0.1.2",
+    "@strudel.cycles/eval": "^0.1.3",
+    "@strudel.cycles/tone": "^0.1.3"
  },
  "devDependencies": {
    "peggy": "^2.0.1"
@@ -4,104 +4,50 @@ 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 { strict as assert } from 'assert';
 import { mini } from '../mini.mjs';
 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;
  it('supports single elements', () => {
-    expect(minV('a')).toEqual(['a']);
+    assert.deepStrictEqual(minV('a'), ['a']);
  });
  it('supports rest', () => {
-    expect(minV('~')).toEqual([]);
+    assert.deepStrictEqual(minV('~'), []);
  });
  it('supports cat', () => {
-    expect(minS('a b')).toEqual(['a: 0 - 1/2', 'b: 1/2 - 1']);
-    expect(minS('a b c')).toEqual(['a: 0 - 1/3', 'b: 1/3 - 2/3', 'c: 2/3 - 1']);
+    assert.deepStrictEqual(minS('a b'), ['a: 0 - 1/2', 'b: 1/2 - 1']);
+    assert.deepStrictEqual(minS('a b c'), ['a: 0 - 1/3', 'b: 1/3 - 2/3', 'c: 2/3 - 1']);
  });
  it('supports slowcat', () => {
-    expect(minV('<a b>')).toEqual(['a']);
+    assert.deepStrictEqual(minV('<a b>'), ['a']);
  });
  it('supports division', () => {
-    expect(minS('a/2')).toEqual(['a: 0 - 2']);
-    expect(minS('[c3 d3]/2')).toEqual(['c3: 0 - 1']);
+    assert.deepStrictEqual(minS('a/2'), ['a: 0 - 2']);
+    assert.deepStrictEqual(minS('[c3 d3]/2'), ['c3: 0 - 1']);
  });
  it('supports multiplication', () => {
-    expect(minS('c3*2')).toEqual(['c3: 0 - 1/2', 'c3: 1/2 - 1']);
-    expect(minV('[c3 d3]*2')).toEqual(['c3', 'd3', 'c3', 'd3']);
+    assert.deepStrictEqual(minS('c3*2'), ['c3: 0 - 1/2', 'c3: 1/2 - 1']);
+    assert.deepStrictEqual(minV('[c3 d3]*2'), ['c3', 'd3', 'c3', 'd3']);
  });
  it('supports brackets', () => {
-    expect(minS('c3 [d3 e3]')).toEqual(['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 1']);
-    expect(minS('c3 [d3 [e3 f3]]')).toEqual(['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 7/8', 'f3: 7/8 - 1']);
+    assert.deepStrictEqual(minS('c3 [d3 e3]'), ['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 1']);
+    assert.deepStrictEqual(minS('c3 [d3 [e3 f3]]'), ['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 7/8', 'f3: 7/8 - 1']);
  });
  it('supports commas', () => {
-    expect(minS('c3,e3,g3')).toEqual(['c3: 0 - 1', 'e3: 0 - 1', 'g3: 0 - 1']);
-    expect(minS('[c3,e3,g3] f3')).toEqual(['c3: 0 - 1/2', 'e3: 0 - 1/2', 'g3: 0 - 1/2', 'f3: 1/2 - 1']);
+    assert.deepStrictEqual(minS('c3,e3,g3'), ['c3: 0 - 1', 'e3: 0 - 1', 'g3: 0 - 1']);
+    assert.deepStrictEqual(minS('[c3,e3,g3] f3'), ['c3: 0 - 1/2', 'e3: 0 - 1/2', 'g3: 0 - 1/2', 'f3: 1/2 - 1']);
  });
  it('supports elongation', () => {
-    expect(minS('a@3 b')).toEqual(['a: 0 - 3/4', 'b: 3/4 - 1']);
-    expect(minS('a@2 b@3')).toEqual(['a: 0 - 2/5', 'b: 2/5 - 1']);
+    assert.deepStrictEqual(minS('a@3 b'), ['a: 0 - 3/4', 'b: 3/4 - 1']);
+    assert.deepStrictEqual(minS('a@2 b@3'), ['a: 0 - 2/5', 'b: 2/5 - 1']);
  });
  it('supports replication', () => {
-    expect(minS('a!3 b')).toEqual(['a: 0 - 1/4', 'a: 1/4 - 1/2', 'a: 1/2 - 3/4', 'b: 3/4 - 1']);
+    assert.deepStrictEqual(minS('a!3 b'), ['a: 0 - 1/4', 'a: 1/4 - 1/2', 'a: 1/2 - 3/4', 'b: 3/4 - 1']);
  });
  it('supports euclidean rhythms', () => {
-    expect(minS('a(3, 8)')).toEqual(['a: 0 - 1/8', 'a: 3/8 - 1/2', 'a: 3/4 - 7/8']);
-  });
-  it('supports the ? operator', () => {
-    expect(
-      mini('a?')
-        .queryArc(0, 20)
-        .map((hap) => hap.whole.begin),
-    ).toEqual(
-      mini('a')
-        .degradeBy(0.5)
-        .queryArc(0, 20)
-        .map((hap) => hap.whole.begin),
-    );
-  });
-  // testing things that involve pseudo-randomness, so there's a probability we could fail by chance.
-  // these next few tests work with the current PRNG, and are intended to succeed with p > 0.99 even if the PRNG changes
-  //   (as long as the PRNG has a relatively-uniform distribution of values)
-  it('supports degradeBy with default of 50%', () => {
-    const haps = mini('a?').queryArc(0, 1000);
-    expect(459 <= haps.length && haps.length <= 541).toBe(true);
-    // 'Number of elements did not fall in 99% confidence interval for binomial with p=0.5',
-  });
-  it('supports degradeBy with an argument', () => {
-    const haps = mini('a?0.8').queryArc(0, 1000);
-    expect(haps.length > 0).toBe(true);
-    // 'Should have had at least one element when degradeBy was set at 0.8');
-    expect(haps.length < 230).toBe(true);
-    // 'Had too many cycles remaining after degradeBy 0.8');
-  });
-  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.
-    // Evaluating this distribution with a chi-squared test.
-    // Note: this just evaluates the overall distribution, not things like correlation/runs of values
-    const observed = haps.reduce((acc, hap) => {
-      acc[hap.value] = (acc[hap.value] || 0) + 1;
-      return acc;
-    }, {});
-    const expected = {
-      a: numCycles / 3,
-      b: numCycles / 6,
-      c: numCycles / 6,
-      d: numCycles / 9,
-      e: numCycles / 9,
-      f: numCycles / 9,
-    };
-    let chisq = -numCycles;
-    for (let k in expected) {
-      chisq += (observed[k] * observed[k]) / expected[k];
-    }
-    // 15.086 is the chisq for 5 degrees of freedom at 99%, so for 99% of uniformly-distributed
-    //  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');
+    assert.deepStrictEqual(minS('a(3, 8)'), ['a: 0 - 1/8', 'a: 3/8 - 1/2', 'a: 3/4 - 7/8']);
  });
 });
@@ -35,5 +35,3 @@ 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)
@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import OSC from 'osc-js';
-import { parseNumeral, Pattern } from '@strudel.cycles/core';
+import { Pattern } from '@strudel.cycles/core';

 const comm = new OSC();
 comm.open();
@@ -31,10 +31,6 @@ Pattern.prototype.osc = function () {
        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);
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/osc",
-	"version": "0.2.0",
+	"version": "0.1.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/osc",
-  "version": "0.2.0",
+  "version": "0.1.1",
  "description": "OSC messaging for strudel",
  "main": "osc.mjs",
  "scripts": {
@@ -30,6 +30,6 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "osc-js": "^2.4.0"
+    "osc-js": "^2.3.2"
  }
 }
@@ -1 +0,0 @@
-examples
@@ -1,43 +1,4 @@
 # @strudel.cycles/react

-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
-```
+This package contains react hooks and components for strudel.
+Example coming soon
@@ -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-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}
+*,: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}.cm-editor{background-color:transparent!important}._container_10e1g_1{overflow:hidden;border-radius:.375rem;--tw-bg-opacity: 1;background-color:rgb(68 76 87 / var(--tw-bg-opacity))}._header_10e1g_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_10e1g_9{display:flex}._button_10e1g_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_10e1g_9:hover{--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity))}._buttonDisabled_10e1g_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_10e1g_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_10e1g_25{position:relative;overflow:auto}
@@ -1 +0,0 @@
-.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}
@@ -1 +0,0 @@
-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};
@@ -1 +0,0 @@
-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};
@@ -1,14 +0,0 @@
-<!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>
@@ -1,24 +0,0 @@
-{
-  "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"
-  }
-}
@@ -1,139 +0,0 @@
-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.phase,
-  });
-
-  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;
@@ -1,9 +0,0 @@
-import React from 'react';
-import ReactDOM from 'react-dom/client';
-import App from './App';
-
-ReactDOM.createRoot(document.getElementById('root')).render(
-  <React.StrictMode>
-    <App />
-  </React.StrictMode>,
-);
@@ -1,7 +0,0 @@
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-body {
-  background: #123;
-}
@@ -1,7 +0,0 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [react()]
-})
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/react",
-  "version": "0.3.2",
+  "version": "0.1.4",
  "description": "React components for strudel",
  "main": "dist/index.cjs.js",
  "module": "dist/index.es.js",
@@ -37,12 +37,11 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@codemirror/lang-javascript": "^6.1.1",
-    "@strudel.cycles/core": "^0.3.2",
-    "@strudel.cycles/eval": "^0.3.2",
-    "@strudel.cycles/tone": "^0.3.2",
-    "@uiw/codemirror-themes": "^4.12.4",
-    "@uiw/react-codemirror": "^4.12.4",
+    "@codemirror/lang-javascript": "^0.19.0",
+    "@strudel.cycles/core": "^0.1.2",
+    "@strudel.cycles/eval": "^0.1.3",
+    "@strudel.cycles/tone": "^0.1.3",
+    "react-codemirror6": "^1.1.0",
    "react-hook-inview": "^4.5.0"
  },
  "peerDependencies": {
@@ -52,12 +51,12 @@
  "devDependencies": {
    "@types/react": "^17.0.2",
    "@types/react-dom": "^17.0.2",
-    "@vitejs/plugin-react": "^2.2.0",
+    "@vitejs/plugin-react": "^1.3.0",
    "autoprefixer": "^10.4.7",
-    "postcss": "^8.4.18",
+    "postcss": "^8.4.13",
    "react": "^17.0.2",
    "react-dom": "^17.0.2",
    "tailwindcss": "^3.0.24",
-    "vite": "^3.2.2"
+    "vite": "^2.9.9"
  }
 }
@@ -1,10 +1,13 @@
 import React from 'react';
 import { MiniRepl } from './components/MiniRepl';
 import 'tailwindcss/tailwind.css';
-import { controls, evalScope } from '@strudel.cycles/core';
+import { Tone, getDefaultSynth } from '@strudel.cycles/tone';
+import { evalScope } from '@strudel.cycles/eval';
+
+const defaultSynth = getDefaultSynth();

 evalScope(
-  controls,
+  Tone,
  import('@strudel.cycles/core'),
  import('@strudel.cycles/tone'),
  import('@strudel.cycles/tonal'),
@@ -17,7 +20,7 @@ evalScope(
 function App() {
  return (
    <div>
-      <MiniRepl tune={`note("c3")`} />
+      <MiniRepl tune={`"c3"`} defaultSynth={defaultSynth} />
    </div>
  );
 }
@@ -1,11 +1,11 @@
 import React from 'react';
-import _CodeMirror from '@uiw/react-codemirror';
+import { CodeMirror as _CodeMirror } from 'react-codemirror6';
+// import { CodeMirrorLite as _CodeMirror } from 'react-codemirror6/dist/lite';
 import { EditorView, Decoration } from '@codemirror/view';
 import { StateField, StateEffect } from '@codemirror/state';
 import { javascript } from '@codemirror/lang-javascript';
-import strudelTheme from '../themes/strudel-theme';
-import './style.css';
-import { useCallback } from 'react';
+// import { materialPalenight } from 'codemirror6-themes';
+import { materialPalenight } from '../themes/material-palenight';

 export const setFlash = StateEffect.define();
 const flashField = StateField.define({
@@ -49,9 +49,9 @@ const highlightField = StateField.define({
    try {
      for (let e of tr.effects) {
        if (e.is(setHighlights)) {
-          const marks =
+          highlights = Decoration.set(
            e.value
-              .map((hap) =>
+              .flatMap((hap) =>
                (hap.context.locations || []).map(({ start, end }) => {
                  const color = hap.context.color || '#FFCA28';
                  let from = tr.newDoc.line(start.line).from + start.column;
@@ -65,51 +65,39 @@ const highlightField = StateField.define({
                  return mark.range(from, to);
                }),
              )
-              .flat()
-              .filter(Boolean) || [];
-          highlights = Decoration.set(marks, true);
+              .filter(Boolean),
+            true,
+          );
        }
      }
      return highlights;
    } catch (err) {
      // console.warn('highlighting error', err);
-      return Decoration.set([]);
+      return highlights;
    }
  },
  provide: (f) => EditorView.decorations.from(f),
 });

-const extensions = [javascript(), strudelTheme, highlightField, flashField];
-
-export default function CodeMirror({ value, onChange, onViewChanged, onSelectionChange, options, editorDidMount }) {
-  const handleOnChange = useCallback(
-    (value) => {
-      onChange?.(value);
-    },
-    [onChange],
-  );
-  const handleOnCreateEditor = useCallback(
-    (view) => {
-      onViewChanged?.(view);
-    },
-    [onViewChanged],
-  );
-  const handleOnUpdate = useCallback(
-    (viewUpdate) => {
-      if (viewUpdate.selectionSet && onSelectionChange) {
-        onSelectionChange?.(viewUpdate.state.selection);
-      }
-    },
-    [onSelectionChange],
-  );
+export default function CodeMirror({ value, onChange, onViewChanged, onCursor, options, editorDidMount, theme }) {
  return (
    <>
      <_CodeMirror
+        onViewChange={onViewChanged}
+        style={{
+          display: 'flex',
+          flexDirection: 'column',
+          flex: '1 0 auto',
+        }}
        value={value}
-        onChange={handleOnChange}
-        onCreateEditor={handleOnCreateEditor}
-        onUpdate={handleOnUpdate}
-        extensions={extensions}
+        onChange={onChange}
+        extensions={[
+          javascript(),
+          theme || materialPalenight,
+          highlightField,
+          flashField,
+          // theme, language, ...
+        ]}
      />
    </>
  );
@@ -26,6 +26,13 @@ export function Icon({ type }) {
              clipRule="evenodd"
            />
          ),
+          stop: (
+            <path
+              fillRule="evenodd"
+              d="M10 18a8 8 0 100-16 8 8 0 000 16zM8 7a1 1 0 00-1 1v4a1 1 0 001 1h4a1 1 0 001-1V8a1 1 0 00-1-1H8z"
+              clipRule="evenodd"
+            />
+          ),
        }[type]
      }
    </svg>
@@ -8,12 +8,12 @@ import 'tailwindcss/tailwind.css';
 import './style.css';
 import styles from './MiniRepl.module.css';
 import { Icon } from './Icon';
-import { Tone } from '@strudel.cycles/tone';

-export function MiniRepl({ tune, hideOutsideView = false, init, onEvent, enableKeyboard }) {
+export function MiniRepl({ tune, defaultSynth, hideOutsideView = false, theme, init, onEvent, enableKeyboard }) {
  const { code, setCode, pattern, activeCode, activateCode, evaluateOnly, error, cycle, dirty, togglePlay, stop } =
    useRepl({
      tune,
+      defaultSynth,
      autolink: false,
      onEvent,
    });
@@ -31,12 +31,7 @@ export function MiniRepl({ tune, hideOutsideView = false, init, onEvent, enableK
    }
    return isVisible || wasVisible.current;
  }, [isVisible, hideOutsideView]);
-  useHighlighting({
-    view,
-    pattern,
-    active: cycle.started && !activeCode?.includes('strudel disable-highlighting'),
-    getTime: () => Tone.getTransport().seconds,
-  });
+  useHighlighting({ view, pattern, active: cycle.started && !activeCode?.includes('strudel disable-highlighting') });

  // set active pattern on ctrl+enter
  useLayoutEffect(() => {
@@ -68,11 +63,14 @@ export function MiniRepl({ tune, hideOutsideView = false, init, onEvent, enableK
          <button className={cx(dirty ? styles.button : styles.buttonDisabled)} onClick={() => activateCode()}>
            <Icon type="refresh" />
          </button>
+          <button className={cx(styles.button)} onClick={() => stop(true)}>
+            <Icon type="stop" />
+          </button>
        </div>
        {error && <div className={styles.error}>{error.message}</div>}
      </div>
      <div className={styles.body}>
-        {show && <CodeMirror6 value={code} onChange={setCode} onViewChanged={setView} />}
+        {show && <CodeMirror6 theme={theme} value={code} onChange={setCode} onViewChanged={setView} />}
      </div>
    </div>
  );
@@ -1,5 +1,5 @@
 .container {
-  @apply sc-rounded-md sc-overflow-hidden sc-bg-[#222222];
+  @apply sc-rounded-md sc-overflow-hidden sc-bg-[#444C57];
 }

 .header {
@@ -1,14 +1,3 @@
 .cm-editor {
  background-color: transparent !important;
-  height: 100%;
-  z-index: 11;
-  font-size: 16px;
-}
-
-.cm-theme-light {
-  width: 100%;
-}
-
-.cm-line > * {
-  background: #00000095;
 }
@@ -66,8 +66,13 @@ function useCycle(props) {
    await Tone.start();
    Tone.getTransport().start('+0.1');
  };
-  const stop = () => {
-    Tone.getTransport().pause();
+  const stop = (setZero = false) => {
+    if (setZero) {
+      Tone.getTransport().cancel();
+      Tone.getTransport().stop();
+    } else {
+      Tone.getTransport().pause();
+    }
    setStarted(false);
  };
  const toggle = () => (started ? stop() : start());
@@ -1,9 +1,11 @@
-import { useEffect, useRef } from 'react';
+import { useEffect } from 'react';
 import { setHighlights } from '../components/CodeMirror6';
+import { Tone } from '@strudel.cycles/tone';

-function useHighlighting({ view, pattern, active, getTime }) {
-  const highlights = useRef([]);
-  const lastEnd = useRef();
+let highlights = []; // actively highlighted events
+let lastEnd;
+
+function useHighlighting({ view, pattern, active }) {
  useEffect(() => {
    if (view) {
      if (pattern && active) {
@@ -11,16 +13,16 @@ function useHighlighting({ view, pattern, active, getTime }) {

        function updateHighlights() {
          try {
-            const audioTime = getTime();
+            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.current || audioTime, audioTime - 1 / 10);
+            const begin = Math.max(lastEnd || audioTime, audioTime - 1 / 10);
            const span = [begin, audioTime + 1 / 60];
-            lastEnd.current = audioTime + 1 / 60;
-            highlights.current = highlights.current.filter((hap) => hap.whole.end > audioTime); // keep only highlights that are still active
+            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.current = highlights.current.concat(haps); // add potential new onsets
-            view.dispatch({ effects: setHighlights.of(highlights.current) }); // highlight all still active + new active haps
+            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([]) });
@@ -32,7 +34,7 @@ function useHighlighting({ view, pattern, active, getTime }) {
          cancelAnimationFrame(frame);
        };
      } else {
-        highlights.current = [];
+        highlights = [];
        view.dispatch({ effects: setHighlights.of([]) });
      }
    }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Felix Roos	235f3672aa	meetup talk	2022-09-11 22:11:25 +02:00
Felix Roos	55dbcdde18	add new deck for meetup	2022-09-09 21:38:35 +02:00
Felix Roos	d3f10518cc	Merge branch 'talk' of https://github.com/tidalcycles/strudel into talk	2022-09-04 21:01:55 +02:00
Felix Roos	99fd5a53cd	Merge remote-tracking branch 'origin/HEAD' into talk	2022-07-28 22:23:05 +02:00
Felix Roos	7e21b683fb	loadScript helper	2022-07-19 08:59:46 +02:00
Felix Roos	a492628b33	more default samples (ignored wav files for now)	2022-07-10 20:59:07 +02:00
Felix Roos	53bb20c516	.out error handling	2022-07-10 20:55:05 +02:00
Felix Roos	588f74123e	pianoroll optimizations - fix flickering due to global alpha mutation - change default inactive color - add smear option - add playheadColor option	2022-07-10 20:54:44 +02:00
Felix Roos	e3473d5e70	demo ready slides	2022-07-10 20:53:27 +02:00
Felix Roos	8ce4de0c8d	style errors, fixed backdrop + hide console	2022-07-10 20:52:46 +02:00
Felix Roos	b87cea834f	style fixes + hide-console option - thicker highlighting outline - only shade actual characters, not whole lines - strudel hide-console will now hide console	2022-07-10 20:51:38 +02:00
Felix Roos	230ebe7439	talk now works offline too	2022-07-02 00:38:10 +02:00
Felix Roos	e1f017916c	small fixes	2022-07-02 00:11:57 +02:00
Felix Roos	6a445ee130	kind of finished slides	2022-07-01 23:55:04 +02:00
Felix Roos	8ea0044ffa	Merge commit '85d3d7392ecfdc985fa8cc93e01846bec0f16dc4' into talk	2022-07-01 13:05:32 +02:00
Felix Roos	2d76de5906	log helpers	2022-07-01 10:56:31 +02:00
Felix Roos	4cce65c9fe	now using symlinked samples folder from repl	2022-07-01 10:41:11 +02:00
Felix Roos	6b3687357e	move samples to dedicated samples folder	2022-07-01 10:40:33 +02:00
Felix Roos	1d6e74fc77	small fix	2022-06-30 17:14:02 +02:00
Felix Roos	c9fda97534	add prebake to maxirepl	2022-06-30 17:13:59 +02:00
Felix Roos	8796bcbdc3	fix: pianoroll	2022-06-30 17:13:47 +02:00
Felix Roos	4c66d9a553	Merge commit '8a1cd32d50e6689b14a77db0eca0b9033ab55312' into talk	2022-06-30 16:50:35 +02:00
Felix Roos	85d3d7392e	hide-header magic comment	2022-06-30 16:49:24 +02:00
Felix Roos	31d0225341	toMidi now understands numbers	2022-06-30 16:49:01 +02:00
Felix Roos	d0acb32497	piano nowalso understands n	2022-06-30 16:48:48 +02:00
Felix Roos	aa9a32c9af	add freq tunes from metro.html	2022-06-30 16:48:31 +02:00
Felix Roos	a8610d0078	revert changing removeUndefineds	2022-06-30 02:26:24 +02:00
Felix Roos	ef5dcd0dae	fix: undefined error	2022-06-30 02:23:12 +02:00
Felix Roos	ed86a94f99	add 2 tunes using new samples	2022-06-30 02:22:53 +02:00
Felix Roos	7be791f2d3	add some default samples	2022-06-30 02:22:38 +02:00
Felix Roos	cc31a21b6f	Merge remote-tracking branch 'origin/main' into talk	2022-06-22 20:21:55 +02:00
Felix Roos	72155d24c9	ec tal	2022-06-13 21:15:53 +02:00
Felix Roos	7672ca9971	small fixes	2022-06-07 22:34:39 +02:00
Felix Roos	07120e9e3b	comment out stuff + style fix	2022-06-07 21:55:31 +02:00
Felix Roos	72feb3b65a	pianoroll: do NOT round	2022-06-07 21:37:52 +02:00
Felix Roos	2f5ff44dc9	default to piano	2022-06-07 21:37:43 +02:00
Felix Roos	8051286904	react: usable onEvent	2022-06-07 21:16:17 +02:00
Felix Roos	8a57333f72	more slides	2022-06-07 20:40:29 +02:00
Felix Roos	512ba03fef	can now hide slides	2022-06-07 20:38:51 +02:00
Felix Roos	4f0d2f181b	more slides	2022-06-07 01:38:57 +02:00
Felix Roos	1339bc3b94	fix: piano now works with midi numbers	2022-06-07 01:38:12 +02:00
Felix Roos	edf2fb9781	more slides + style	2022-06-06 22:39:51 +02:00
Felix Roos	cf6bfd0e30	add clapping music	2022-06-06 19:10:48 +02:00
Felix Roos	a93d6e884d	repl: hard stop	2022-06-06 19:10:23 +02:00
Felix Roos	1a9b57e66c	add phasing example	2022-06-06 13:20:17 +02:00
Felix Roos	0aec9423ac	use new pianoroll settings	2022-06-05 23:33:08 +02:00
Felix Roos	54df4edca7	pianoroll: hideNegative flag	2022-06-05 23:32:10 +02:00
Felix Roos	be6310b8e2	pianoroll: flipTime + flipValues	2022-06-05 23:24:59 +02:00
Felix Roos	3ab32114a6	replace from to with cycles / playhead	2022-06-05 22:51:59 +02:00
Felix Roos	da85e1920b	pianoroll: autorange + fold + vertical	2022-06-05 22:45:14 +02:00
Felix Roos	352d701b7b	minirepl: highlighting can now be disabled	2022-06-05 22:44:24 +02:00
Felix Roos	349c1bc5d8	test new pianoroll	2022-06-04 23:55:26 +02:00
Felix Roos	9430caeb29	more flexible pianoroll	2022-06-04 23:55:05 +02:00
Felix Roos	eb0adf4194	use evaluateOnly in MaxiRepl	2022-06-04 23:54:39 +02:00
Felix Roos	6fde3f2231	add evaluateOnly	2022-06-04 23:54:33 +02:00
Felix Roos	1c77e7e5b3	more content + style	2022-06-04 15:02:04 +02:00
Felix Roos	061abecaca	added some slides	2022-06-04 01:01:59 +02:00
Felix Roos	98c131df9a	cooler pattern	2022-06-02 22:48:18 +02:00
Felix Roos	1af10157d6	basic slides setup	2022-06-02 22:19:35 +02:00
Felix Roos	a3eeaead2a	remove odd packages	2022-06-02 22:18:06 +02:00
Felix Roos	ff362da23f	themable codemirror + repl	2022-06-02 22:17:50 +02:00
				`@@ -1 +0,0 @@`
				`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};`
				`@@ -1 +0,0 @@`
				`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};`
				`@@ -1 +0,0 @@`
				.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}
				`@@ -1 +0,0 @@`
				`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};`
				`@@ -1 +0,0 @@`
				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};