Merge remote-tracking branch 'origin/main' into objectify-midi

Merge pull request #232 from tidalcycles/out-by-default
Out by default
2026-07-14 14:53:45 -04:00 · 2022-10-29 17:55:53 +02:00 · 2022-10-29 17:54:05 +02:00 · 2022-10-29 17:51:46 +02:00 · 2022-10-29 17:38:54 +02:00 · 2022-10-29 14:58:50 +02:00
101 changed files with 20634 additions and 7748 deletions
@@ -0,0 +1,46 @@
+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
@@ -34,4 +34,7 @@ repl_old
 tutorial.rendered.mdx
 doc.json
 talk/public/EmuSP12
-talk/public/samples
+talk/public/samples
+server/samples/old
+repl/stats.html
+coverage
@@ -2,5 +2,8 @@
    "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,10 +31,9 @@ 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
@@ -52,11 +51,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
-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
+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

 ## Write Tests

@@ -80,7 +79,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
@@ -97,7 +96,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
@@ -105,9 +104,18 @@ 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,6 +38,12 @@ 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,10 +1,12 @@
 {
  "name": "@strudel.cycles/monorepo",
-  "version": "0.0.1",
+  "version": "0.0.4",
  "private": true,
  "description": "Port of tidalcycles to javascript",
  "scripts": {
-    "test": "npm run test --workspaces --if-present && cd repl && npm run test",
+    "test": "vitest run --version",
+    "test-ui": "vitest --ui",
+    "test-coverage": "vitest --coverage",
    "bootstrap": "lerna bootstrap",
    "setup": "npm i && npm run bootstrap && cd repl && npm i && cd ../tutorial && npm i",
    "snapshot": "cd repl && npm run snapshot",
@@ -12,7 +14,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": "gh-pages -d out",
+    "deploy": "NODE_DEBUG=gh-pages gh-pages -d out",
    "jsdoc": "jsdoc packages/ -c jsdoc.config.json",
    "jsdoc-json": "jsdoc packages/ --template ./node_modules/jsdoc-json --destination doc.json -c jsdoc.config.json"
  },
@@ -37,12 +39,16 @@
  },
  "homepage": "https://strudel.tidalcycles.org",
  "devDependencies": {
+    "@vitest/ui": "^0.21.1",
+    "c8": "^7.12.0",
    "events": "^3.3.0",
    "gh-pages": "^4.0.0",
+    "happy-dom": "^6.0.4",
    "jsdoc": "^3.6.10",
    "jsdoc-json": "^2.0.2",
    "jsdoc-to-markdown": "^7.1.1",
    "lerna": "^4.0.0",
-    "mocha": "^9.1.4"
+    "rollup-plugin-visualizer": "^5.8.1",
+    "vitest": "^0.21.1"
  }
 }
@@ -0,0 +1,15 @@
+# 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
+```
@@ -11,7 +11,7 @@ const generic_params = [
  /**
   * Select a sound / sample by name.
   *
-   * <details>
+   * <details style={{display:'none'}}>
   * <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").osc()
+   * s("bd hh")
   *
   */
  ['s', 's', 'sound'],
@@ -62,12 +62,12 @@ const generic_params = [
   */
  ['f', 'accelerate', 'a pattern of numbers that speed up (or slow down) samples while they play.'],
  /**
-   * Like {@link amp}, but exponential.
+   * Controls the gain by an exponential amount.
   *
   * @name gain
   * @param {number | Pattern} amount gain.
   * @example
-   * s("bd*8").gain(".7*2 1 .7*2 1 .7 1").osc()
+   * s("hh*8").gain(".4!2 1 .4!2 1 .4 1")
   *
   */
  [
@@ -129,7 +129,7 @@ const generic_params = [
   * @name bandf
   * @param {number | Pattern} frequency center frequency
   * @example
-   * s("bd sd").bandf("<1000 2000 4000 8000>").osc()
+   * s("bd sd,hh*3").bandf("<1000 2000 4000 8000>")
   *
   */
  ['f', 'bandf', 'A pattern of numbers from 0 to 1. Sets the center frequency of the band-pass filter.'],
@@ -140,17 +140,19 @@ const generic_params = [
   * @name bandq
   * @param {number | Pattern} q q factor
   * @example
-   * s("bd sd").bandf(2000).bandq("<.2 .9>").osc()
+   * s("bd sd").bandf(500).bandq("<0 1 2 3>")
   *
   */
  ['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
-   * s("rave").begin("<0 .25 .5 .75>").osc()
+   * samples({ rave: 'rave/AREUREADY.wav' }, 'github:tidalcycles/Dirt-Samples/master/')
+   * s("rave").begin("<0 .25 .5 .75>")
   *
   */
  [
@@ -159,12 +161,13 @@ 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 {@link begin}, but cuts off the end off each sample.
+   * The same as .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,ho*4").end("<.1 .2 .5 1>").osc()
+   * s("bd*2,oh*4").end("<.1 .2 .5 1>")
   *
   */
  [
@@ -202,7 +205,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,jvbass*2").fast(2).crush("<16 8 7 6 5 4 3 2>").osc()
+   * s("<bd sd>,hh*3").fast(2).crush("<16 8 7 6 5 4 3 2>")
   *
   */
  [
@@ -211,12 +214,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
+   * fake-resampling for lowering the sample rate. Caution: This effect seems to only work in chromium based browsers
   *
   * @name coarse
   * @param {number | Pattern} factor 1 for original 2 for half, 3 for a third and so on.
   * @example
-   * s("xmas").coarse("<1 4 8 16 32>").osc()
+   * s("bd sd,hh*4").coarse("<1 4 8 16 32>")
   *
   */
  [
@@ -253,7 +256,7 @@ const generic_params = [
   * @name cutoff
   * @param {number | Pattern} frequency audible between 0 and 20000
   * @example
-   * s("bd,hh*2,<~ sd>").fast(2).cutoff("<4000 2000 1000 500 200 100>").osc()
+   * s("bd sd,hh*3").cutoff("<4000 2000 1000 500 200 100>")
   *
   */
  // TODO: add lpf synonym
@@ -264,7 +267,7 @@ const generic_params = [
   * @name hcutoff
   * @param {number | Pattern} frequency audible between 0 and 20000
   * @example
-   * s("bd,hh*2,<~ sd>").fast(2).hcutoff("<4000 2000 1000 500 200 100>").osc()
+   * s("bd sd,hh*4").hcutoff("<4000 2000 1000 500 200 100>")
   *
   */
  // TODO: add hpf synonym
@@ -274,12 +277,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 cutoff frequency of the high-pass filter.
+   * Applies the resonance of the high-pass filter.
   *
   * @name hresonance
-   * @param {number | Pattern} q resonance factor between 0 and 1
+   * @param {number | Pattern} q resonance factor between 0 and 50
   * @example
-   * s("bd,hh*2,<~ sd>").fast(2).hcutoff(2000).hresonance("<0 .2 .4 .6>").osc()
+   * s("bd sd,hh*4").hcutoff(2000).hresonance("<0 10 20 30>")
   *
   */
  [
@@ -292,15 +295,15 @@ const generic_params = [
   * Applies the cutoff frequency of the low-pass filter.
   *
   * @name resonance
-   * @param {number | Pattern} q resonance factor between 0 and 1
+   * @param {number | Pattern} q resonance factor between 0 and 50
   * @example
-   * s("bd,hh*2,<~ sd>").fast(2).cutoff(2000).resonance("<0 .2 .4 .6>").osc()
+   * s("bd sd,hh*4").cutoff(2000).resonance("<0 10 20 30>")
   *
   */
  ['f', 'resonance', 'a pattern of numbers from 0 to 1. Specifies the resonance of the low-pass filter.'],
  // TODO: add lpq synonym?
  /**
-   * Set detune of oscillators. Works only with some synths, see <a target="_blank" href="https://tidalcycles.org/docs/patternlib/tutorials/synthesizers">tidal doc</a>
+   * DJ filter, below 0.5 is low pass filter, above is high pass filter.
   *
   * @name djf
   * @param {number | Pattern} cutoff below 0.5 is low pass filter, above is high pass filter
@@ -368,7 +371,7 @@ const generic_params = [
   * @name fadeTime
   * @param {number | Pattern} time between 0 and 1
   * @example
-   * s("ho*4").end(.1).fadeTime("<0 .2 .4 .8>").osc()
+   * s("oh*4").end(.1).fadeTime("<0 .2 .4 .8>").osc()
   *
   */
  [
@@ -493,7 +496,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>").osc()
+   * s("[bd hh]*2").pan("<.5 1 .5 0>")
   *
   */
  [
@@ -581,6 +584,11 @@ 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', ''],
@@ -591,7 +599,7 @@ const generic_params = [
   * @name shape
   * @param {number | Pattern} distortion between 0 and 1
   * @example
-   * s("bd sd").shape("<0 .2 .4 .6 .8 1>").osc()
+   * s("bd sd,hh*4").shape("<0 .2 .4 .6 .8>")
   *
   */
  [
@@ -648,16 +656,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. Use a rest (~) to override the effect
+   * @param {string | Pattern} vowel You can use a e i o u.
   * @example
-   * vowel("a e i [o u]").slow(2)
-   * .n("<[0,7]!4 [2,7]!4>")
-   * .s('supersquare').osc()
+   * note("c2 <eb2 <g2 g1>>").s('sawtooth')
+   * .vowel("<a e i <o u>>")
   *
   */
  [
@@ -25,61 +25,70 @@ 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.
- * "c3".euclid(3,8)
+ * @example
+ * // The Cuban tresillo pattern.
+ * note("c3").euclid(3,8)
+ */
+
+/**
 * @example // A thirteenth century Persian rhythm called Khafif-e-ramal.
- * "c3".euclid(2,5)
+ * note("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)
+ * 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.
- * "c3".euclid(3,5,2)
+ * note("c3").euclid(3,5,2)
 * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
- * "c3".euclid(3,7)
+ * note("c3").euclid(3,7)
 * @example // The Cuban tresillo pattern.
- * "c3".euclid(3,8)
+ * note("c3").euclid(3,8)
 * @example // Another Ruchenitza Bulgarian folk-dance rhythm.
- * "c3".euclid(4,7)
+ * note("c3").euclid(4,7)
 * @example // The Aksak rhythm of Turkey.
- * "c3".euclid(4,9)
+ * note("c3").euclid(4,9)
 * @example // The metric pattern used by Frank Zappa in his piece titled Outside Now.
- * "c3".euclid(4,11)
+ * note("c3").euclid(4,11)
 * @example // Yields the York-Samai pattern, a popular Arab rhythm.
- * "c3".euclid(5,6)
+ * note("c3").euclid(5,6)
 * @example // The Nawakhat pattern, another popular Arab rhythm.
- * "c3".euclid(5,7)
+ * note("c3").euclid(5,7)
 * @example // The Cuban cinquillo pattern.
- * "c3".euclid(5,8)
+ * note("c3").euclid(5,8)
 * @example // A popular Arab rhythm called Agsag-Samai.
- * "c3".euclid(5,9)
+ * note("c3").euclid(5,9)
 * @example // The metric pattern used by Moussorgsky in Pictures at an Exhibition.
- * "c3".euclid(5,11)
+ * note("c3").euclid(5,11)
 * @example // The Venda clapping pattern of a South African children’s song.
- * "c3".euclid(5,12)
+ * note("c3").euclid(5,12)
 * @example // The Bossa-Nova rhythm necklace of Brazil.
- * "c3".euclid(5,16)
+ * note("c3").euclid(5,16)
 * @example // A typical rhythm played on the Bendir (frame drum).
- * "c3".euclid(7,8)
+ * note("c3").euclid(7,8)
 * @example // A common West African bell pattern.
- * "c3".euclid(7,12)
+ * note("c3").euclid(7,12)
 * @example // A Samba rhythm necklace from Brazil.
- * "c3".euclid(7,16,14)
+ * note("c3").euclid(7,16,14)
 * @example // A rhythm necklace used in the Central African Republic.
- * "c3".euclid(9,16)
+ * note("c3").euclid(9,16)
 * @example // A rhythm necklace of the Aka Pygmies of Central Africa.
- * "c3".euclid(11,24,14)
+ * note("c3").euclid(11,24,14)
 * @example // Another rhythm necklace of the Aka Pygmies of the upper Sangha.
- * "c3".euclid(13,24,5)
+ * note("c3").euclid(13,24,5)
 */
 Pattern.prototype.euclid = function (pulses, steps, rotation = 0) {
  return this.struct(euclid(pulses, steps, rotation));
 };

 /**
- * Similar to {@link Pattern#euclid}, but each pulse is held until the next pulse, so there will be no gaps.
+ * 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)
 */
 Pattern.prototype.euclidLegato = function (pulses, steps, rotation = 0) {
  const bin_pat = euclid(pulses, steps, rotation);
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/core",
-	"version": "0.1.2",
+	"version": "0.2.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,11 +1,11 @@
 {
  "name": "@strudel.cycles/core",
-  "version": "0.1.2",
+  "version": "0.2.0",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
  "scripts": {
-    "test": "mocha --colors"
+    "test": "vitest run"
  },
  "repository": {
    "type": "git",
@@ -28,8 +28,5 @@
    "bjork": "^0.0.1",
    "fraction.js": "^4.2.0"
  },
-  "devDependencies": {
-    "mocha": "^9.2.2"
-  },
  "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2"
 }
@@ -468,7 +468,11 @@ export class Pattern {
  /**
   * 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));
@@ -513,13 +517,16 @@ 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.
-   * @param {Number} min
-   * @param {Number} max
+   * 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
   * @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 +538,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 +549,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,13 +649,26 @@ 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) {
-        const pat = outerHap.value._compressSpan(outerHap.wholeOrPart().cycleArc());
-        const innerHaps = pat.query(state.setSpan(outerHap.part));
+        // 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
        function munge(outer, inner) {
          let whole = undefined;
          if (inner.whole && outer.whole) {
@@ -679,10 +699,27 @@ 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)));
  }
@@ -713,15 +750,25 @@ export class Pattern {
      const end = cycle.add(span.end.sub(cycle).mul(factor).min(1));
      return new TimeSpan(begin, end);
    };
-    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);
+    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);
    };
-    return this.withQuerySpan(qf).withHapSpan(ef)._splitQueries();
+    return this.withQuerySpan(qf)._withHap(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;
@@ -733,15 +780,25 @@ 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.
+   * Speed up a pattern by the given factor. Used by "*" in mini notation.
   *
   * @name fast
   * @memberof Pattern
   * @param {number | Pattern} factor speed up factor
   * @returns Pattern
   * @example
-   * seq(e5, b4, d5, c5).fast(2)
+   * s("<bd sd> hh").fast(2) // s("[<bd sd> hh]*2")
   */
  _fast(factor) {
    const fastQuery = this.withQueryTime((t) => t.mul(factor));
@@ -749,14 +806,14 @@ export class Pattern {
  }

  /**
-   * Slow down a pattern over the given number of cycles.
+   * Slow down a pattern over the given number of cycles. Like the "/" operator in mini notation.
   *
   * @name slow
   * @memberof Pattern
   * @param {number | Pattern} factor slow down factor
   * @returns Pattern
   * @example
-   * seq(e5, b4, d5, c5).slow(2)
+   * s("<bd sd> hh").slow(2) // s("[<bd sd> hh]/2")
   */
  _slow(factor) {
    return this._fast(Fraction(1).div(factor));
@@ -774,6 +831,20 @@ 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 }));
@@ -795,14 +866,32 @@ 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));
  }
@@ -829,6 +918,17 @@ 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);
@@ -876,6 +976,16 @@ 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);
@@ -885,10 +995,47 @@ 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);
@@ -896,6 +1043,23 @@ 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
@@ -906,6 +1070,15 @@ 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) {
@@ -948,6 +1121,15 @@ 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);
  }
@@ -956,11 +1138,28 @@ export class Pattern {
    return sequence(this, ...pats);
  }

-  // shorthand for sequence
+  /**
+   * 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)")
+   * )
+   */
  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);
  }
@@ -973,6 +1172,16 @@ 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)));
  }
@@ -985,24 +1194,70 @@ export class Pattern {
    return this.stutWith(times, time, (pat, i) => pat.velocity(Math.pow(feedback, i)));
  }

-  // these might change with: https://github.com/tidalcycles/Tidal/issues/902
+  /**
+   * 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)
+   */
  _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))));
  }

-  // known as iter' in tidalcycles
+  /**
+   * 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)
+   */
  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);
@@ -1010,6 +1265,14 @@ 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);
  }
@@ -1024,20 +1287,45 @@ export class Pattern {
  }

  // sets absolute duration of haps
-  _duration(value) {
+  /*   _duration(value) {
    return this.withHapSpan((span) => new TimeSpan(span.begin, span.begin.add(value)));
  }

-  // sets hap relative duration of haps
+  /**
+   *
+   * Multiplies the hap duration with the given factor.
+   * @name legato
+   * @memberof Pattern
+   * @example
+   * note("c3 eb3 g3 c4").legato("<.25 .5 1 2>")
+   */
  _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 }));
  }
+  */

-  // move this to controls? (speed and unit are controls)
+  /**
+   * 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)
+   */
  _loopAt(factor, cps = 1) {
    return this.speed((1 / factor) * cps)
      .unit('c')
@@ -1046,6 +1334,22 @@ export class Pattern {
  onTrigger(onTrigger) {
    return this._withHap((hap) => hap.setContext({ ...hap.context, onTrigger }));
  }
+  log(func = id) {
+    return this._withHap((hap) =>
+      hap.setContext({
+        ...hap.context,
+        onTrigger: (...args) => {
+          if (hap.context.onTrigger) {
+            hap.context.onTrigger(...args);
+          }
+          console.log(func(...args));
+        },
+      }),
+    );
+  }
+  logValues(func = id) {
+    return this.log((_, hap) => func(hap.value));
+  }
 }

 // TODO - adopt value.mjs fully..
@@ -1077,9 +1381,48 @@ 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: [(a, b) => a + b, numOrString], // 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: [(a, b) => a - b, num],
+    /**
+     *
+     * Multiplies each number by the given factor.
+     * @name mul
+     * @memberof Pattern
+     * @example
+     * "1 1.5 [1.66, <2 2.33>]".mul(150).freq()
+     */
    mul: [(a, b) => a * b, num],
+    /**
+     *
+     * Divides each number by the given factor.
+     * @name div
+     * @memberof Pattern
+     */
    div: [(a, b) => a / b, num],
    mod: [mod, num],
    pow: [Math.pow, num],
@@ -1115,10 +1458,14 @@ function _composeOp(a, b, func) {
          pat = preprocess(pat);
          other = preprocess(other);
        }
-        var result = pat['_op' + how](other, (a) => (b) => _composeOp(a, b, op));
+        var result;
        // 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;
      };
@@ -1155,19 +1502,21 @@ Pattern.prototype.patternified = [
  'chop',
  'color',
  'cpm',
-  'duration',
  'early',
  'fast',
  'jux',
  'late',
-  'legato',
  'linger',
  'ply',
  'segment',
  'striate',
  '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,
@@ -1190,12 +1539,11 @@ 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')
+ * pure('e4') // "e4"
 */
 export function pure(value) {
  function query(state) {
@@ -1225,12 +1573,11 @@ export function reify(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])
+ * stack(g3, b3, [e4, d4]).note() // "g3,b3,[e4,d4]".note()
 */
 export function stack(...pats) {
  // Array test here is to avoid infinite recursions..
@@ -1243,7 +1590,6 @@ export function stack(...pats) {
 *
 * synonyms: {@link cat}
 *
- * @param {...any} items - The items to concatenate
 * @return {Pattern}
 * @example
 * slowcat(e5, b4, [d5, c5])
@@ -1278,8 +1624,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];
-    return pat.query(state);
+    const pat = pats[pat_n]; // can be undefined for same cases e.g. /#cHVyZSg0MikKICAuZXZlcnkoMyxhZGQoNykpCiAgLmxhdGUoLjUp
+    return pat?.query(state) || [];
  };
  return new Pattern(query)._splitQueries();
 }
@@ -1299,16 +1645,22 @@ export function fastcat(...pats) {
  return slowcat(...pats)._fast(pats.length);
 }

-/** See {@link slowcat} */
+/** 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()
+ *
+ */
 export function cat(...pats) {
  return slowcat(...pats);
 }

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

-/** See {@link fastcat} */
+/** 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()
+ *
+ */
 export function seq(...pats) {
  return fastcat(...pats);
 }
@@ -1376,20 +1732,6 @@ 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));
@@ -1412,6 +1754,7 @@ 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));
@@ -1498,6 +1841,18 @@ 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 () {
@@ -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 } from './pattern.mjs';
+import { Pattern, fastcat, reify, silence, stack, isPattern } 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))
+ * "c3 [eb3,g3] g2 [g3,bb3]".legato(saw.slow(4)).note()
 * @example
- * saw.range(0,8).segment(8).scale('C major').slow(4)
+ * saw.range(0,8).segment(8).scale('C major').slow(4).note()
 *
 */
 export const saw = signal((t) => t % 1);
@@ -42,30 +42,28 @@ 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')
+ * sine.segment(16).range(0,15).slow(2).scale('C minor').note()
 *
 */
 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')
+ * stack(sine,cosine).segment(16).range(0,15).slow(2).scale('C minor').note()
 *
 */
 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')
+ * square.segment(2).range(0,7).scale('C minor').note()
 *
 */
 export const square = signal((t) => Math.floor((t * 2) % 2));
@@ -76,7 +74,7 @@ export const square2 = square._toBipolar();
 *
 * @return {Pattern}
 * @example
- * triangle.segment(2).range(0,7).scale('C minor')
+ * tri.segment(8).range(0,7).scale('C minor').note()
 *
 */
 export const tri = fastcat(isaw, saw);
@@ -112,28 +110,112 @@ 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)])
-    .outerJoin();
+  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();
 };

+/**
+ * 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 = [];
@@ -164,20 +246,68 @@ 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);

 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),
@@ -193,6 +323,25 @@ 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)
@@ -200,6 +349,7 @@ 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));
 };
@@ -211,6 +361,17 @@ 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);
 };
@@ -226,6 +387,19 @@ 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)
@@ -233,30 +407,100 @@ 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,52 +5,42 @@ 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 { strict as assert } from 'assert';
+import { describe, it, expect } from 'vitest';
 import drawLine from '../drawLine.mjs';

 describe('drawLine', () => {
  it('supports equal lengths', () => {
-    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');
+    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');
  });
  it('supports unequal lengths', () => {
-    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');
+    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');
  });
  it('supports unequal silence', () => {
-    assert.equal(drawLine(fastcat(0, silence, [1, 2]), 10), '|0-..12|0-..12');
+    expect(drawLine(fastcat(0, silence, [1, 2]), 10)).toEqual('|0-..12|0-..12');
  });
  it('supports polyrhythms', () => {
-    '0*2 1*3';
-    assert.equal(drawLine(fastcat(pure(0).fast(2), pure(1).fast(3)), 10), '|0--0--1-1-1-');
+    // 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-');
  });
  it('supports multiple lines', () => {
-    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
+    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
 |.2|.2|.2|.2
-|.3|.3|.3|.3`,
-    );
-    assert.equal(
-      drawLine(fastcat(0, 1, stack(2, 3, 4)), 10),
-      `|012|012|012
+|.3|.3|.3|.3`);
+    expect(drawLine(fastcat(0, 1, stack(2, 3, 4)), 10)).toEqual(`|012|012|012
 |..3|..3|..3
-|..4|..4|..4`,
-    );
+|..4|..4|..4`);
  });
  it('supports unequal cycle lengths', () => {
-    assert.equal(drawLine(slowcat(0, [1, 2]), 10), `|0|12|0|12`);
+    expect(drawLine(slowcat(0, [1, 2]), 10)).toEqual(`|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 { strict as assert } from 'assert';
+import { describe, it, expect } from 'vitest';

 describe('gcd', () => {
  it('should work', () => {
    const F = Fraction._original;
-    assert.equal(gcd(F(1 / 6), F(1 / 4)).toFraction(), '1/12');
+    expect(gcd(F(1 / 6), F(1 / 4)).toFraction()).toEqual('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 { deepStrictEqual, strict as assert } from 'assert';
+import { describe, it, expect } from 'vitest';

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

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

-//import { Time } from 'tone';
-import pkg from 'tone';
-const { Time } = pkg;
-
 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 +55,35 @@ const third = Fraction(1, 3);
 const twothirds = Fraction(2, 3);

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

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

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

  describe('every()', () => {
    it('Can apply a function every 3rd time', () => {
-      assert.deepStrictEqual(
+      expect(
        pure('a')
          .every(3, (x) => x._fast(2))
          ._fast(3)
          .firstCycle(),
-        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
-      );
+      ).toStrictEqual(sequence(sequence('a', 'a'), 'a', 'a').firstCycle());
    });
    it('works with currying', () => {
-      assert.deepStrictEqual(
-        pure('a').every(3, fast(2))._fast(3).firstCycle(),
+      expect(pure('a').every(3, fast(2))._fast(3).firstCycle()).toStrictEqual(
        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
      );
-      assert.deepStrictEqual(
-        sequence(3, 4, 5).every(3, add(3)).fast(5).firstCycle(),
+      expect(sequence(3, 4, 5).every(3, add(3)).fast(5).firstCycle()).toStrictEqual(
        sequence(6, 7, 8, 3, 4, 5, 3, 4, 5, 6, 7, 8, 3, 4, 5).firstCycle(),
      );
-      assert.deepStrictEqual(
-        sequence(3, 4, 5).every(2, sub(1)).fast(5).firstCycle(),
+      expect(sequence(3, 4, 5).every(2, sub(1)).fast(5).firstCycle()).toStrictEqual(
        sequence(2, 3, 4, 3, 4, 5, 2, 3, 4, 3, 4, 5, 2, 3, 4).firstCycle(),
      );
-      assert.deepStrictEqual(
-        sequence(3, 4, 5).every(3, add(3)).every(2, sub(1)).fast(2).firstCycle(),
+      expect(sequence(3, 4, 5).every(3, add(3)).every(2, sub(1)).fast(2).firstCycle()).toStrictEqual(
        sequence(5, 6, 7, 3, 4, 5).firstCycle(),
      );
    });
@@ -606,98 +586,91 @@ describe('Pattern', function () {
      sameFirst(sequence('a', 'b').brak()._fast(2), sequence('a', 'b', fastcat(silence, 'a'), fastcat('b', silence)));
    });
  });
-  describe('timeCat()', function () {
-    it('Can concatenate patterns with different relative durations', function () {
-      assert.deepStrictEqual(
-        sequence('a', ['a', 'a']).firstCycle(),
+  describe('timeCat()', () => {
+    it('Can concatenate patterns with different relative durations', () => {
+      expect(sequence('a', ['a', 'a']).firstCycle()).toStrictEqual(
        timeCat([1, 'a'], [0.5, 'a'], [0.5, 'a']).firstCycle(),
      );
    });
  });
-  describe('struct()', function () {
-    it('Can restructure a discrete pattern', function () {
-      assert.deepStrictEqual(sequence('a', 'b').struct(sequence(true, true, true)).firstCycle(), [
+  describe('struct()', () => {
+    it('Can restructure a discrete pattern', () => {
+      expect(sequence('a', 'b').struct(sequence(true, true, true)).firstCycle()).toStrictEqual([
        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'),
      ]);
-      assert.deepStrictEqual(
+
+      expect(
        pure('a')
          .struct(sequence(true, [true, false], true))
          .firstCycle(),
-        sequence('a', ['a', silence], 'a').firstCycle(),
-      );
-      assert.deepStrictEqual(
+      ).toStrictEqual(sequence('a', ['a', silence], 'a').firstCycle());
+
+      expect(
        pure('a')
          .struct(sequence(true, [true, false], true).invert())
          .firstCycle(),
-        sequence(silence, [silence, 'a'], silence).firstCycle(),
-      );
-      assert.deepStrictEqual(
+      ).toStrictEqual(sequence(silence, [silence, 'a'], silence).firstCycle());
+
+      expect(
        pure('a')
          .struct(sequence(true, [true, silence], true))
          .firstCycle(),
-        sequence('a', ['a', silence], 'a').firstCycle(),
-      );
+      ).toStrictEqual(sequence('a', ['a', silence], 'a').firstCycle());
    });
    it('Can structure a continuous pattern', () => {
-      assert.deepStrictEqual(
-        steady('a').struct(true, [true, true]).firstCycle(),
-        sequence('a', ['a', 'a']).firstCycle(),
-      );
+      expect(steady('a').struct(true, [true, true]).firstCycle()).toStrictEqual(sequence('a', ['a', 'a']).firstCycle());
    });
  });
-  describe('mask()', function () {
-    it('Can fragment a pattern', function () {
-      assert.deepStrictEqual(sequence('a', 'b').mask(sequence(true, true, true)).firstCycle(), [
+  describe('mask()', () => {
+    it('Can fragment a pattern', () => {
+      expect(sequence('a', 'b').mask(sequence(true, true, true)).firstCycle()).toStrictEqual([
        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', function () {
-      assert.deepStrictEqual(
-        sequence(['a', 'b'], 'c').mask(sequence(true, false)).firstCycle(),
+    it('Can mask off parts of a pattern', () => {
+      expect(sequence(['a', 'b'], 'c').mask(sequence(true, false)).firstCycle()).toStrictEqual(
        sequence(['a', 'b'], silence).firstCycle(),
      );
-      assert.deepStrictEqual(sequence('a').mask(sequence(true, false)).firstCycle(), [hap(ts(0, 1), ts(0, 0.5), 'a')]);
+
+      expect(sequence('a').mask(sequence(true, false)).firstCycle()).toStrictEqual([hap(ts(0, 1), ts(0, 0.5), 'a')]);
    });
  });
-  describe('invert()', function () {
-    it('Can invert a binary pattern', function () {
-      assert.deepStrictEqual(
-        sequence(true, false, [true, false]).invert().firstCycle(),
+  describe('invert()', () => {
+    it('Can invert a binary pattern', () => {
+      expect(sequence(true, false, [true, false]).invert().firstCycle()).toStrictEqual(
        sequence(false, true, [false, true]).firstCycle(),
      );
    });
  });
-  describe('signal()', function () {
-    it('Can make saw/saw2', function () {
-      assert.deepStrictEqual(
-        saw.struct(true, true, true, true).firstCycle(),
+  describe('signal()', () => {
+    it('Can make saw/saw2', () => {
+      expect(saw.struct(true, true, true, true).firstCycle()).toStrictEqual(
        sequence(1 / 8, 3 / 8, 5 / 8, 7 / 8).firstCycle(),
      );
-      assert.deepStrictEqual(
-        saw2.struct(true, true, true, true).firstCycle(),
+
+      expect(saw2.struct(true, true, true, true).firstCycle()).toStrictEqual(
        sequence(-3 / 4, -1 / 4, 1 / 4, 3 / 4).firstCycle(),
      );
    });
-    it('Can make isaw/isaw2', function () {
-      assert.deepStrictEqual(
-        isaw.struct(true, true, true, true).firstCycle(),
+    it('Can make isaw/isaw2', () => {
+      expect(isaw.struct(true, true, true, true).firstCycle()).toStrictEqual(
        sequence(7 / 8, 5 / 8, 3 / 8, 1 / 8).firstCycle(),
      );
-      assert.deepStrictEqual(
-        isaw2.struct(true, true, true, true).firstCycle(),
+
+      expect(isaw2.struct(true, true, true, true).firstCycle()).toStrictEqual(
        sequence(3 / 4, 1 / 4, -1 / 4, -3 / 4).firstCycle(),
      );
    });
  });
  describe('_setContext()', () => {
    it('Can set the hap context', () => {
-      assert.deepStrictEqual(
+      expect(
        pure('a')
          ._setContext([
            [
@@ -706,20 +679,19 @@ describe('Pattern', function () {
            ],
          ])
          .firstCycle(true),
-        [
-          hap(ts(0, 1), ts(0, 1), 'a', [
-            [
-              [0, 1],
-              [1, 2],
-            ],
-          ]),
-        ],
-      );
+      ).toStrictEqual([
+        hap(ts(0, 1), ts(0, 1), 'a', [
+          [
+            [0, 1],
+            [1, 2],
+          ],
+        ]),
+      ]);
    });
  });
  describe('_withContext()', () => {
    it('Can update the hap context', () => {
-      assert.deepStrictEqual(
+      expect(
        pure('a')
          ._setContext([
            [
@@ -735,52 +707,49 @@ describe('Pattern', function () {
            ],
          ])
          .firstCycle(true),
-        [
-          hap(ts(0, 1), ts(0, 1), 'a', [
-            [
-              [0, 1],
-              [1, 2],
-            ],
-            [
-              [3, 4],
-              [3, 4],
-            ],
-          ]),
-        ],
-      );
+      ).toStrictEqual([
+        hap(ts(0, 1), ts(0, 1), 'a', [
+          [
+            [0, 1],
+            [1, 2],
+          ],
+          [
+            [3, 4],
+            [3, 4],
+          ],
+        ]),
+      ]);
    });
  });
  describe('apply', () => {
    it('Can apply a function', () => {
-      assert.deepStrictEqual(sequence('a', 'b')._apply(fast(2)).firstCycle(), sequence('a', 'b').fast(2).firstCycle());
+      expect(sequence('a', 'b')._apply(fast(2)).firstCycle()).toStrictEqual(sequence('a', 'b').fast(2).firstCycle());
    }),
      it('Can apply a pattern of functions', () => {
-        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(),
+        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(
          sequence('a', 'b').fast(2, 3).firstCycle(),
        );
      });
  });
  describe('layer', () => {
    it('Can layer up multiple functions', () => {
-      assert.deepStrictEqual(
+      expect(
        sequence(1, 2, 3)
          .layer(fast(2), (pat) => pat.add(3, 4))
          .firstCycle(),
-        stack(sequence(1, 2, 3).fast(2), sequence(1, 2, 3).add(3, 4)).firstCycle(),
-      );
+      ).toStrictEqual(stack(sequence(1, 2, 3).fast(2), sequence(1, 2, 3).add(3, 4)).firstCycle());
    });
  });
  describe('early', () => {
    it('Can shift a hap earlier', () => {
-      assert.deepStrictEqual(pure(30)._late(0.25).query(st(1, 2)), [
+      expect(pure(30)._late(0.25).query(st(1, 2))).toStrictEqual([
        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', () => {
-      assert.deepStrictEqual(pure(30)._late(0.25).query(st(0, 1)), [
+      expect(pure(30)._late(0.25).query(st(0, 1))).toStrictEqual([
        hap(ts(-3 / 4, 1 / 4), ts(0, 1 / 4), 30),
        hap(ts(1 / 4, 5 / 4), ts(1 / 4, 1), 30),
      ]);
@@ -788,16 +757,14 @@ describe('Pattern', function () {
  });
  describe('off', () => {
    it('Can offset a transformed pattern from the original', () => {
-      assert.deepStrictEqual(
-        pure(30).off(0.25, add(2)).firstCycle(),
+      expect(pure(30).off(0.25, add(2)).firstCycle()).toStrictEqual(
        stack(pure(30), pure(30).late(0.25).add(2)).firstCycle(),
      );
    });
  });
  describe('jux', () => {
    it('Can juxtapose', () => {
-      assert.deepStrictEqual(
-        pure({ a: 1 }).jux(fast(2))._sortHapsByPart().firstCycle(),
+      expect(pure({ a: 1 }).jux(fast(2))._sortHapsByPart().firstCycle()).toStrictEqual(
        stack(pure({ a: 1, pan: 0 }), pure({ a: 1, pan: 1 }).fast(2))
          ._sortHapsByPart()
          .firstCycle(),
@@ -806,8 +773,7 @@ describe('Pattern', function () {
  });
  describe('juxBy', () => {
    it('Can juxtapose by half', () => {
-      assert.deepStrictEqual(
-        pure({ a: 1 }).juxBy(0.5, fast(2))._sortHapsByPart().firstCycle(),
+      expect(pure({ a: 1 }).juxBy(0.5, fast(2))._sortHapsByPart().firstCycle()).toStrictEqual(
        stack(pure({ a: 1, pan: 0.25 }), pure({ a: 1, pan: 0.75 }).fast(2))
          ._sortHapsByPart()
          .firstCycle(),
@@ -816,11 +782,12 @@ describe('Pattern', function () {
  });
  describe('_squeezeJoin', () => {
    it('Can squeeze', () => {
-      assert.deepStrictEqual(
+      expect(
        sequence('a', ['a', 'a'])
          .fmap((a) => fastcat('b', 'c'))
          ._squeezeJoin()
          .firstCycle(),
+      ).toStrictEqual(
        sequence(
          ['b', 'c'],
          [
@@ -830,17 +797,23 @@ describe('Pattern', function () {
        ).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)', () => {
-      assert.deepStrictEqual(
-        sequence('a', ['b', 'c']).ply(3).firstCycle(),
+      expect(sequence('a', ['b', 'c']).ply(3).firstCycle()).toStrictEqual(
        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
-      assert.equal(sequence(1, 2, 3).ply(2).early(8).firstCycle().length, 6);
+      expect(sequence(1, 2, 3).ply(2).early(8).firstCycle().length).toBe(6);
    });
  });
  describe('striate', () => {
@@ -853,8 +826,7 @@ describe('Pattern', function () {
  });
  describe('chop', () => {
    it('Can _chop(2)', () => {
-      assert.deepStrictEqual(
-        sequence({ sound: 'a' }, { sound: 'b' })._chop(2).firstCycle(),
+      expect(sequence({ sound: 'a' }, { sound: 'b' })._chop(2).firstCycle()).toStrictEqual(
        sequence(
          { sound: 'a', begin: 0, end: 0.5 },
          { sound: 'a', begin: 0.5, end: 1 },
@@ -864,8 +836,7 @@ describe('Pattern', function () {
      );
    });
    it('Can chop(2,3)', () => {
-      assert.deepStrictEqual(
-        pure({ sound: 'a' }).fast(2).chop(2, 3)._sortHapsByPart().firstCycle(),
+      expect(pure({ sound: 'a' }).fast(2).chop(2, 3)._sortHapsByPart().firstCycle()).toStrictEqual(
        sequence(
          [
            { sound: 'a', begin: 0, end: 0.5 },
@@ -882,18 +853,23 @@ describe('Pattern', function () {
      );
    });
  });
+  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', () => {
-      assert.deepStrictEqual(
-        sequence(-1, -0.5, 0, 0.5).range2(1000, 1100).firstCycle(),
+      expect(sequence(-1, -0.5, 0, 0.5).range2(1000, 1100).firstCycle()).toStrictEqual(
        sequence(1000, 1025, 1050, 1075).firstCycle(),
      );
    });
  });
  describe('linger', () => {
    it('Can linger on the first quarter of a cycle', () => {
-      assert.deepStrictEqual(
-        sequence(0, 1, 2, 3, 4, 5, 6, 7).linger(0.25).firstCycle(),
+      expect(sequence(0, 1, 2, 3, 4, 5, 6, 7).linger(0.25).firstCycle()).toStrictEqual(
        sequence(0, 1, 0, 1, 0, 1, 0, 1).firstCycle(),
      );
    });
@@ -1,120 +1,161 @@
 /*
-util.test.mjs - <short description TODO>
+util.test.mjs - Tests for the core 'util' module
 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 } from '../util.mjs';
+import { isNote, tokenizeNote, toMidi, fromMidi, mod, compose, getFrequency, getPlayableNoteValue } from '../util.mjs';
+import { describe, it, expect } from 'vitest';

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

 describe('isNote', () => {
  it('should tokenize notes without accidentals', () => {
-    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]);
+    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]);
  });
  it('should tokenize notes with accidentals', () => {
-    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]);
+    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]);
  });
  it('should tokenize notes without octave', () => {
-    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]);
+    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]);
  });
  it('should not tokenize invalid notes', () => {
-    assert.deepStrictEqual(tokenizeNote('X'), []);
-    assert.deepStrictEqual(tokenizeNote('asfasf'), []);
-    assert.deepStrictEqual(tokenizeNote(123), []);
+    expect(tokenizeNote('X')).toStrictEqual([]);
+    expect(tokenizeNote('asfasf')).toStrictEqual([]);
+    expect(tokenizeNote(123)).toStrictEqual([]);
  });
 });
 describe('toMidi', () => {
  it('should turn notes into midi', () => {
-    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);
+    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"`);
  });
 });
 describe('fromMidi', () => {
  it('should turn midi into frequency', () => {
-    assert.equal(fromMidi(69), 440);
-    assert.equal(fromMidi(57), 220);
+    expect(fromMidi(69)).toEqual(440);
+    expect(fromMidi(57)).toEqual(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', () => {
-    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);
+    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`)
  });
 });

 describe('mod', () => {
  it('should work like regular modulo with positive numbers', () => {
-    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);
+    expect(mod(0, 3)).toEqual(0);
+    expect(mod(1, 3)).toEqual(1);
+    expect(mod(2, 3)).toEqual(2);
+    expect(mod(3, 3)).toEqual(0);
+    expect(mod(4, 3)).toEqual(1);
+    expect(mod(4, 2)).toEqual(0);
  });
  it('should work with negative numbers', () => {
-    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);
+    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);
  });
 });

 describe('compose', () => {
  const add1 = (a) => a + 1;
  it('should compose', () => {
-    assert.equal(compose(add1, add1)(0), 2);
-    assert.equal(compose(add1)(0), 1);
+    expect(compose(add1, add1)(0)).toEqual(2);
+    expect(compose(add1)(0)).toEqual(1);
  });
  const addS = (s) => (a) => a + s;
  it('should compose left to right', () => {
-    assert.equal(compose(addS('a'), addS('b'))(''), 'ab');
-    assert.equal(compose(addS('a'), addS('b'))('x'), 'xab');
+    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`)
+  })
+});
@@ -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 { strict as assert } from 'assert';
+import { describe, it, expect } from 'vitest';
 import { map, valued, mul } from '../value.mjs';

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

  it('experiments', () => {
-    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);
+    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);
  });
 });
@@ -31,17 +31,41 @@ 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);
+  }
+  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];
+  return pc + oct;
+};
+
 // modulo that works with negative numbers e.g. mod(-1, 3) = 2
 // const mod = (n: number, m: number): number => (n < 0 ? mod(n + m, m) : n % m);
 export const mod = (n, m) => ((n % m) + m) % m;

 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 === 'string' && !isNote(note)) {
-    throw new Error('not a note: ' + note);
+  } 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));
  }
  return note;
 };
@@ -57,7 +81,7 @@ export const getFrequency = (hap) => {
  } 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;
 };
@@ -106,3 +130,10 @@ export function curry(func, overload) {
  }
  return fn;
 }
+
+export function objectify(value) {
+  if (typeof value === 'object' && !Array.isArray(value)) {
+    return value; // do nothing if its already an object
+  }
+  return { value };
+}
@@ -18,7 +18,6 @@ Either install with `npm i @strudel.cycles/embed` or just use a cdn to import th
    .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>
@@ -10,7 +10,6 @@
    .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/eval",
-	"version": "0.1.3",
+	"version": "0.2.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/eval",
-  "version": "0.1.3",
+  "version": "0.2.0",
  "description": "Code evaluator for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -8,7 +8,7 @@
    "test": "test"
  },
  "scripts": {
-    "test": "mocha --colors"
+    "test": "vitest run"
  },
  "repository": {
    "type": "git",
@@ -28,7 +28,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.1.2",
+    "@strudel.cycles/core": "^0.2.0",
    "estraverse": "^5.3.0",
    "shift-ast": "^6.1.0",
    "shift-codegen": "^7.0.3",
@@ -34,7 +34,7 @@ export const wrappedAsync = true;

 export default (_code) => {
  const { code, addReturn } = wrapAsync(_code);
-  const ast = parseScriptWithLocation(code);
+  const ast = parseScriptWithLocation(disguiseImports(code));
  const artificialNodes = [];
  const parents = [];
  const shifted = replace(ast.tree, {
@@ -128,10 +128,22 @@ export default (_code) => {
  if (wrappedAsync) {
    addReturn(shifted);
  }
-  const generated = codegen(shifted);
+  const generated = undisguiseImports(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
@@ -4,31 +4,29 @@ 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 { evaluate, extend } from '../evaluate.mjs';
+import { expect, describe, it } from 'vitest';
+
+import { evaluate, evalScope } from '../evaluate.mjs';
 import { mini } from '@strudel.cycles/mini';
 import * as strudel from '@strudel.cycles/core';
-
 const { fastcat } = strudel;

-extend({ mini }, strudel);
-// TODO: test evalScope
-
-describe('evaluate', () => {
+describe('evaluate', async () => {
+  await evalScope({ mini }, strudel);
  const ev = async (code) => (await evaluate(code)).pattern._firstCycleValues;
  it('Should evaluate strudel functions', async () => {
-    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']);
+    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']);
  });
-  it('Should be extendable', async () => {
-    extend({ myFunction: (...x) => fastcat(...x) });
-    assert.deepStrictEqual(await ev('myFunction(c3, d3)'), ['c3', 'd3']);
+  it('Scope should be extendable', async () => {
+    await evalScope({ myFunction: (...x) => fastcat(...x) });
+    expect(await ev('myFunction("c3", "d3")')).toEqual(['c3', 'd3']);
  });
  it('Should evaluate simple double quoted mini notation', async () => {
-    assert.deepStrictEqual(await ev('"c3"'), ['c3']);
-    assert.deepStrictEqual(await ev('"c3 d3"'), ['c3', 'd3']);
-    assert.deepStrictEqual(await ev('"<c3 d3>"'), ['c3']);
+    expect(await ev('"c3"')).toEqual(['c3']);
+    expect(await ev('"c3 d3"')).toEqual(['c3', 'd3']);
+    expect(await ev('"<c3 d3>"')).toEqual(['c3']);
  });
 });
@@ -4,11 +4,16 @@ 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 { describe, it, expect } from 'vitest';
 import shapeshifter from '../shapeshifter.mjs';

 describe('shapeshifter', () => {
  it('Should shift simple double quote string', () => {
-    assert.equal(shapeshifter('"c3"'), '(async()=>{return mini("c3").withMiniLocation([1,0,15],[1,4,19])})()');
+    expect(shapeshifter('"c3"')).toEqual('(async()=>{return mini("c3").withMiniLocation([1,0,15],[1,4,19])})()');
+  });
+  it('Should handle dynamic imports', () => {
+    expect(shapeshifter('const { default: foo } = await import(\'https://bar.com/foo.js\');"c3"')).toEqual(
+      '(async()=>{const{default:foo}=await import("https://bar.com/foo.js");return mini("c3").withMiniLocation([1,64,79],[1,68,83])})()',
+    );
  });
 });
@@ -4,10 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { isNote } from 'tone';
 import _WebMidi from 'webmidi';
-import { Pattern, isPattern } from '@strudel.cycles/core';
-import { Tone } from '@strudel.cycles/tone';
+import { Pattern, isPattern, isNote, getPlayableNoteValue, objectify } from '@strudel.cycles/core';

 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const WebMidi = _WebMidi;
@@ -32,53 +30,58 @@ const outputByName = (name) => WebMidi.getOutputByName(name);

 // Pattern.prototype.midi = function (output: string | number, channel = 1) {
 Pattern.prototype.midi = function (output, channel = 1) {
-  if (isPattern(output?.constructor?.name)) {
+  if (output?.constructor?.name && isPattern(output?.constructor?.name)) {
    throw new Error(
      `.midi does not accept Pattern input. Make sure to pass device name with single quotes. Example: .midi('${
        WebMidi.outputs?.[0]?.name || 'IAC Driver Bus 1'
      }')`,
    );
  }
-  return this._withHap((hap) => {
-    // const onTrigger = (time: number, hap: any) => {
-    const onTrigger = (time, hap) => {
-      let note = hap.value;
-      const velocity = hap.context?.velocity ?? 0.9;
-      if (!isNote(note)) {
-        throw new Error('not a note: ' + note);
-      }
-      if (!WebMidi.enabled) {
-        throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
-      }
-      if (!WebMidi.outputs.length) {
-        throw new Error(`🔌 No MIDI devices found. Connect a device or enable IAC Driver.`);
-      }
-      let device;
-      if (typeof output === 'number') {
-        device = WebMidi.outputs[output];
-      } else if (typeof output === 'string') {
-        device = outputByName(output);
-      } else {
-        device = WebMidi.outputs[0];
-      }
-      if (!device) {
-        throw new Error(
-          `🔌 MIDI device '${output ? output : ''}' not found. Use one of ${WebMidi.outputs
-            .map((o) => `'${o.name}'`)
-            .join(' | ')}`,
-        );
-      }
-      // console.log('midi', value, output);
-      const timingOffset = WebMidi.time - Tone.getContext().currentTime * 1000;
-      time = time * 1000 + timingOffset;
-      // const inMs = '+' + (time - Tone.getContext().currentTime) * 1000;
-      // await enableWebMidi()
+  return this.onTrigger((time, hap, currentTime) => {
+    let note;
+    try {
+      note = getPlayableNoteValue(hap);
+    } catch (err) {
+      // dont care if no note is found as we can still send cvs
+    }
+    const { velocity, nrpnn, nrpv, ccn, ccv, legato, duration: durationValue } = objectify(hap.value);
+    if (!WebMidi.enabled) {
+      throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
+    }
+    if (!WebMidi.outputs.length) {
+      throw new Error(`🔌 No MIDI devices found. Connect a device or enable IAC Driver.`);
+    }
+    let device;
+    if (typeof output === 'number') {
+      device = WebMidi.outputs[output];
+    } else if (typeof output === 'string') {
+      device = outputByName(output);
+    } else {
+      device = WebMidi.outputs[0];
+    }
+    if (!device) {
+      throw new Error(
+        `🔌 MIDI device '${output ? output : ''}' not found. Use one of ${WebMidi.outputs
+          .map((o) => `'${o.name}'`)
+          .join(' | ')}`,
+      );
+    }
+    // console.log('midi', value, output);
+    const deadline = (time - currentTime) * 1000;
+    time = WebMidi.time + deadline;
+    /* const timingOffset = WebMidi.time - currentTime * 1000;
+    time = time * 1000 + timingOffset; */
+    const duration = (durationValue ?? hap.duration.valueOf()) * (legato ?? 1) * 1000 - 5;
+
+    if (note) {
      device.playNote(note, channel, {
        time,
-        duration: hap.duration.valueOf() * 1000 - 5,
+        duration,
        velocity,
      });
-    };
-    return hap.setContext({ ...hap.context, onTrigger });
+    }
+    if (ccn && ccv) {
+      device.sendControlChange(ccn, ccv, channel, { time });
+    }
  });
 };
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/midi",
-	"version": "0.1.3",
+	"version": "0.2.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/midi",
-  "version": "0.1.3",
+  "version": "0.2.0",
  "description": "Midi API for strudel",
  "main": "index.mjs",
  "repository": {
@@ -21,7 +21,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/tone": "^0.1.3",
+    "@strudel.cycles/tone": "^0.2.0",
    "tone": "^14.7.77",
    "webmidi": "^2.5.2"
  }
@@ -8,6 +8,7 @@ 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


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

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

 // ------------------ steps and cycles ---------------------------
@@ -91,7 +93,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 ws "]" ws { return s}
+sub_cycle = ws  "[" ws s:stack_or_choose 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
@@ -102,7 +104,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_modifier = slice_weight / slice_bjorklund / slice_slow / slice_fast / slice_fixed_step / slice_replicate / slice_degrade

 slice_weight =  "@" a:number
  { return { weight: a} }
@@ -122,6 +124,9 @@ 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);}
@@ -132,14 +137,22 @@ 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 = 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");}  }
+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; } }

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

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

@@ -10,6 +10,13 @@ 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_;
@@ -21,6 +28,8 @@ 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`);
@@ -82,6 +91,9 @@ 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);
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/mini",
-  "version": "0.1.3",
+  "version": "0.2.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -1,11 +1,11 @@
 {
  "name": "@strudel.cycles/mini",
-  "version": "0.1.3",
+  "version": "0.2.0",
  "description": "Mini notation for strudel",
  "main": "index.mjs",
  "type": "module",
  "scripts": {
-    "test": "mocha --colors",
+    "test": "vitest run",
    "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.1.2",
-    "@strudel.cycles/eval": "^0.1.3",
-    "@strudel.cycles/tone": "^0.1.3"
+    "@strudel.cycles/core": "^0.2.0",
+    "@strudel.cycles/eval": "^0.2.0",
+    "@strudel.cycles/tone": "^0.2.0"
  },
  "devDependencies": {
    "peggy": "^2.0.1"
@@ -4,50 +4,104 @@ 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', () => {
-    assert.deepStrictEqual(minV('a'), ['a']);
+    expect(minV('a')).toEqual(['a']);
  });
  it('supports rest', () => {
-    assert.deepStrictEqual(minV('~'), []);
+    expect(minV('~')).toEqual([]);
  });
  it('supports cat', () => {
-    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']);
+    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']);
  });
  it('supports slowcat', () => {
-    assert.deepStrictEqual(minV('<a b>'), ['a']);
+    expect(minV('<a b>')).toEqual(['a']);
  });
  it('supports division', () => {
-    assert.deepStrictEqual(minS('a/2'), ['a: 0 - 2']);
-    assert.deepStrictEqual(minS('[c3 d3]/2'), ['c3: 0 - 1']);
+    expect(minS('a/2')).toEqual(['a: 0 - 2']);
+    expect(minS('[c3 d3]/2')).toEqual(['c3: 0 - 1']);
  });
  it('supports multiplication', () => {
-    assert.deepStrictEqual(minS('c3*2'), ['c3: 0 - 1/2', 'c3: 1/2 - 1']);
-    assert.deepStrictEqual(minV('[c3 d3]*2'), ['c3', 'd3', 'c3', 'd3']);
+    expect(minS('c3*2')).toEqual(['c3: 0 - 1/2', 'c3: 1/2 - 1']);
+    expect(minV('[c3 d3]*2')).toEqual(['c3', 'd3', 'c3', 'd3']);
  });
  it('supports brackets', () => {
-    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']);
+    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']);
  });
  it('supports commas', () => {
-    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']);
+    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']);
  });
  it('supports elongation', () => {
-    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']);
+    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']);
  });
  it('supports replication', () => {
-    assert.deepStrictEqual(minS('a!3 b'), ['a: 0 - 1/4', 'a: 1/4 - 1/2', 'a: 1/2 - 3/4', 'b: 3/4 - 1']);
+    expect(minS('a!3 b')).toEqual(['a: 0 - 1/4', 'a: 1/4 - 1/2', 'a: 1/2 - 3/4', 'b: 3/4 - 1']);
  });
  it('supports euclidean rhythms', () => {
-    assert.deepStrictEqual(minS('a(3, 8)'), ['a: 0 - 1/8', 'a: 3/8 - 1/2', 'a: 3/4 - 7/8']);
+    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');
  });
 });
@@ -1,149 +1,53 @@
-import React, { useState, useEffect, useCallback, useMemo, useRef } from 'react';
-import { CodeMirror as CodeMirror$1 } from 'react-codemirror6';
-import { EditorView, Decoration } from '@codemirror/view';
+import React, { useCallback, useState, useEffect, useMemo, useRef, useLayoutEffect } from 'react';
+import _CodeMirror from '@uiw/react-codemirror';
+import { Decoration, EditorView } from '@codemirror/view';
 import { StateEffect, StateField } from '@codemirror/state';
 import { javascript } from '@codemirror/lang-javascript';
-import { HighlightStyle, tags } from '@codemirror/highlight';
+import { tags } from '@lezer/highlight';
+import { createTheme } from '@uiw/codemirror-themes';
 import { useInView } from 'react-hook-inview';
 import { evaluate } from '@strudel.cycles/eval';
-import { getPlayableNoteValue } from '@strudel.cycles/core/util.mjs';
 import { Tone } from '@strudel.cycles/tone';
 import { TimeSpan, State } from '@strudel.cycles/core';
+import { webaudioOutputTrigger } from '@strudel.cycles/webaudio';
 import { WebMidi, enableWebMidi } from '@strudel.cycles/midi';

-/*
-  Credits for color palette:
-
-  Author:     Mattia Astorino (http://github.com/equinusocio)
-  Website:    https://material-theme.site/
-*/
-
-const ivory = '#abb2bf',
-  stone = '#7d8799', // Brightened compared to original to increase contrast
-  invalid = '#ffffff',
-  darkBackground = '#21252b',
-  highlightBackground = 'rgba(0, 0, 0, 0.5)',
-  // background = '#292d3e',
-  background = 'transparent',
-  tooltipBackground = '#353a42',
-  selection = 'rgba(128, 203, 196, 0.5)',
-  cursor = '#ffcc00';
-
-/// The editor theme styles for Material Palenight.
-const materialPalenightTheme = EditorView.theme(
-  {
-    // done
-    '&': {
-      color: '#ffffff',
-      backgroundColor: background,
-      fontSize: '15px',
-      'z-index': 11,
-    },
-
-    // done
-    '.cm-content': {
-      caretColor: cursor,
-      lineHeight: '22px',
-    },
-    '.cm-line': {
-      background: '#2C323699',
-    },
-    // done
-    '&.cm-focused .cm-cursor': {
-      backgroundColor: cursor,
-      width: '3px',
-    },
-
-    '&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': {
-      backgroundColor: selection,
-    },
-
-    '.cm-panels': { backgroundColor: darkBackground, color: '#ffffff' },
-    '.cm-panels.cm-panels-top': { borderBottom: '2px solid black' },
-    '.cm-panels.cm-panels-bottom': { borderTop: '2px solid black' },
-
-    // done, use onedarktheme
-    '.cm-searchMatch': {
-      backgroundColor: '#72a1ff59',
-      outline: '1px solid #457dff',
-    },
-    '.cm-searchMatch.cm-searchMatch-selected': {
-      backgroundColor: '#6199ff2f',
-    },
-
-    '.cm-activeLine': { backgroundColor: highlightBackground },
-    '.cm-selectionMatch': { backgroundColor: '#aafe661a' },
-
-    '&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket': {
-      backgroundColor: '#bad0f847',
-      outline: '1px solid #515a6b',
-    },
-
-    // done
-    '.cm-gutters': {
-      background: 'transparent',
-      color: '#676e95',
-      border: 'none',
-    },
-
-    '.cm-activeLineGutter': {
-      backgroundColor: highlightBackground,
-    },
-
-    '.cm-foldPlaceholder': {
-      backgroundColor: 'transparent',
-      border: 'none',
-      color: '#ddd',
-    },
-
-    '.cm-tooltip': {
-      border: 'none',
-      backgroundColor: tooltipBackground,
-    },
-    '.cm-tooltip .cm-tooltip-arrow:before': {
-      borderTopColor: 'transparent',
-      borderBottomColor: 'transparent',
-    },
-    '.cm-tooltip .cm-tooltip-arrow:after': {
-      borderTopColor: tooltipBackground,
-      borderBottomColor: tooltipBackground,
-    },
-    '.cm-tooltip-autocomplete': {
-      '& > ul > li[aria-selected]': {
-        backgroundColor: highlightBackground,
-        color: ivory,
-      },
-    },
+var strudelTheme = createTheme({
+  theme: 'dark',
+  settings: {
+    background: '#222',
+    foreground: '#75baff', // whats that?
+    caret: '#ffcc00',
+    selection: 'rgba(128, 203, 196, 0.5)',
+    selectionMatch: '#036dd626',
+    lineHighlight: '#8a91991a',
+    gutterBackground: 'transparent',
+    // gutterForeground: '#8a919966',
+    gutterForeground: '#676e95',
  },
-  { dark: true },
-);
+  styles: [
+    { tag: tags.keyword, color: '#c792ea' },
+    { tag: tags.operator, color: '#89ddff' },
+    { tag: tags.special(tags.variableName), color: '#eeffff' },
+    { tag: tags.typeName, color: '#f07178' },
+    { tag: tags.atom, color: '#f78c6c' },
+    { tag: tags.number, color: '#ff5370' },
+    { tag: tags.definition(tags.variableName), color: '#82aaff' },
+    { tag: tags.string, color: '#c3e88d' },
+    { tag: tags.special(tags.string), color: '#f07178' },
+    { tag: tags.comment, color: '#7d8799' },
+    { tag: tags.variableName, color: '#f07178' },
+    { tag: tags.tagName, color: '#ff5370' },
+    { tag: tags.bracket, color: '#a2a1a4' },
+    { tag: tags.meta, color: '#ffcb6b' },
+    { tag: tags.attributeName, color: '#c792ea' },
+    { tag: tags.propertyName, color: '#c792ea' },
+    { tag: tags.className, color: '#decb6b' },
+    { tag: tags.invalid, color: '#ffffff' },
+  ],
+});

-/// The highlighting style for code in the Material Palenight theme.
-const materialPalenightHighlightStyle = HighlightStyle.define([
-  { tag: tags.keyword, color: '#c792ea' },
-  { tag: tags.operator, color: '#89ddff' },
-  { tag: tags.special(tags.variableName), color: '#eeffff' },
-  { tag: tags.typeName, color: '#f07178' },
-  { tag: tags.atom, color: '#f78c6c' },
-  { tag: tags.number, color: '#ff5370' },
-  { tag: tags.definition(tags.variableName), color: '#82aaff' },
-  { tag: tags.string, color: '#c3e88d' },
-  { tag: tags.special(tags.string), color: '#f07178' },
-  { tag: tags.comment, color: stone },
-  { tag: tags.variableName, color: '#f07178' },
-  { tag: tags.tagName, color: '#ff5370' },
-  { tag: tags.bracket, color: '#a2a1a4' },
-  { tag: tags.meta, color: '#ffcb6b' },
-  { tag: tags.attributeName, color: '#c792ea' },
-  { tag: tags.propertyName, color: '#c792ea' },
-  { tag: tags.className, color: '#decb6b' },
-  { tag: tags.invalid, color: invalid },
-]);
-
-/// Extension to enable the Material Palenight theme (both the editor theme and
-/// the highlight style).
-// : Extension
-const materialPalenight = [materialPalenightTheme, materialPalenightHighlightStyle];
+var style = '';

 const setFlash = StateEffect.define();
 const flashField = StateField.define({
@@ -185,42 +89,57 @@ const highlightField = StateField.define({
    try {
      for (let e of tr.effects) {
        if (e.is(setHighlights)) {
-          highlights = Decoration.set(e.value.flatMap((hap) => (hap.context.locations || []).map(({ start, end }) => {
-            const color = hap.context.color || "#FFCA28";
-            let from = tr.newDoc.line(start.line).from + start.column;
-            let to = tr.newDoc.line(end.line).from + end.column;
-            const l = tr.newDoc.length;
-            if (from > l || to > l) {
-              return;
-            }
-            const mark = Decoration.mark({ attributes: { style: `outline: 1px solid ${color}` } });
-            return mark.range(from, to);
-          })).filter(Boolean), true);
+          const marks = e.value.map(
+            (hap) => (hap.context.locations || []).map(({ start, end }) => {
+              const color = hap.context.color || "#FFCA28";
+              let from = tr.newDoc.line(start.line).from + start.column;
+              let to = tr.newDoc.line(end.line).from + end.column;
+              const l = tr.newDoc.length;
+              if (from > l || to > l) {
+                return;
+              }
+              const mark = Decoration.mark({ attributes: { style: `outline: 1.5px solid ${color};` } });
+              return mark.range(from, to);
+            })
+          ).flat().filter(Boolean) || [];
+          highlights = Decoration.set(marks, true);
        }
      }
      return highlights;
    } catch (err) {
-      return highlights;
+      return Decoration.set([]);
    }
  },
  provide: (f) => EditorView.decorations.from(f)
 });
-function CodeMirror({ value, onChange, onViewChanged, onCursor, options, editorDidMount }) {
-  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(CodeMirror$1, {
-    onViewChange: onViewChanged,
-    style: {
-      display: "flex",
-      flexDirection: "column",
-      flex: "1 0 auto"
+const extensions = [javascript(), strudelTheme, highlightField, flashField];
+function CodeMirror({ value, onChange, onViewChanged, onSelectionChange, options, editorDidMount }) {
+  const handleOnChange = useCallback(
+    (value2) => {
+      onChange?.(value2);
    },
+    [onChange]
+  );
+  const handleOnCreateEditor = useCallback(
+    (view) => {
+      onViewChanged?.(view);
+    },
+    [onViewChanged]
+  );
+  const handleOnUpdate = useCallback(
+    (viewUpdate) => {
+      if (viewUpdate.selectionSet && onSelectionChange) {
+        onSelectionChange?.(viewUpdate.state.selection);
+      }
+    },
+    [onSelectionChange]
+  );
+  return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(_CodeMirror, {
    value,
-    onChange,
-    extensions: [
-      javascript(),
-      materialPalenight,
-      highlightField,
-      flashField
-    ]
+    onChange: handleOnChange,
+    onCreateEditor: handleOnCreateEditor,
+    onUpdate: handleOnUpdate,
+    extensions
  }));
 }

@@ -332,7 +251,7 @@ let s4 = () => {
 };
 const generateHash = (code) => encodeURIComponent(btoa(code));

-function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawProp }) {
+function useRepl({ tune, autolink = true, onEvent, onDraw: onDrawProp }) {
  const id = useMemo(() => s4(), []);
  const [code, setCode] = useState(tune);
  const [activeCode, setActiveCode] = useState();
@@ -351,6 +270,8 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawP
    }
  }, [activeCode, onDrawProp]);

+  const hideHeader = useMemo(() => activeCode && activeCode.includes('strudel hide-header'), [activeCode]);
+  const hideConsole = useMemo(() => activeCode && activeCode.includes('strudel hide-console'), [activeCode]);
  // cycle hook to control scheduling
  const cycle = useCycle({
    onDraw,
@@ -361,26 +282,15 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawP
          if (event.context.logs?.length) {
            event.context.logs.forEach(pushLog);
          }
-          const { onTrigger, velocity } = event.context;
-          if (!onTrigger) {
-            if (defaultSynth) {
-              const note = getPlayableNoteValue(event);
-              defaultSynth.triggerAttackRelease(note, event.duration.valueOf(), time, velocity);
-            } else {
-              throw new Error('no defaultSynth passed to useRepl.');
-            }
-            /* console.warn('no instrument chosen', event);
-          throw new Error(`no instrument chosen for ${JSON.stringify(event)}`); */
-          } else {
-            onTrigger(time, event, currentTime, 1 /* cps */);
-          }
+          const { onTrigger = webaudioOutputTrigger } = event.context;
+          onTrigger(time, event, currentTime, 1 /* cps */);
        } catch (err) {
          console.warn(err);
          err.message = 'unplayable event: ' + err?.message;
          pushLog(err.message); // not with setError, because then we would have to setError(undefined) on next playable event
        }
      },
-      [onEvent, pushLog, defaultSynth],
+      [onEvent, pushLog],
    ),
    onQuery: useCallback(
      (state) => {
@@ -395,7 +305,7 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawP
      },
      [pattern],
    ),
-    onSchedule: useCallback((_events, cycle) => logCycle(_events, cycle), []),
+    onSchedule: useCallback((_events, cycle) => logCycle(_events), []),
    ready: !!pattern && !!activeCode,
  });

@@ -449,6 +359,8 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawP
  };

  return {
+    hideHeader,
+    hideConsole,
    pending,
    code,
    setCode,
@@ -519,15 +431,13 @@ function useHighlighting({ view, pattern, active }) {

 var tailwind = '';

-var style = '';
-
-const container = "_container_10e1g_1";
-const header = "_header_10e1g_5";
-const buttons = "_buttons_10e1g_9";
-const button = "_button_10e1g_9";
-const buttonDisabled = "_buttonDisabled_10e1g_17";
-const error = "_error_10e1g_21";
-const body = "_body_10e1g_25";
+const container = "_container_3i85k_1";
+const header = "_header_3i85k_5";
+const buttons = "_buttons_3i85k_9";
+const button = "_button_3i85k_9";
+const buttonDisabled = "_buttonDisabled_3i85k_17";
+const error = "_error_3i85k_21";
+const body = "_body_3i85k_25";
 var styles = {
 	container: container,
 	header: header,
@@ -563,12 +473,15 @@ function Icon({ type }) {
  }[type]);
 }

-function MiniRepl({ tune, defaultSynth, hideOutsideView = false }) {
-  const { code, setCode, pattern, activateCode, error, cycle, dirty, togglePlay } = useRepl({
+function MiniRepl({ tune, hideOutsideView = false, init, onEvent, enableKeyboard }) {
+  const { code, setCode, pattern, activeCode, activateCode, evaluateOnly, error, cycle, dirty, togglePlay, stop } = useRepl({
    tune,
-    defaultSynth,
-    autolink: false
+    autolink: false,
+    onEvent
  });
+  useEffect(() => {
+    init && evaluateOnly();
+  }, [tune, init]);
  const [view, setView] = useState();
  const [ref, isVisible] = useInView({
    threshold: 0.01
@@ -580,7 +493,25 @@ function MiniRepl({ tune, defaultSynth, hideOutsideView = false }) {
    }
    return isVisible || wasVisible.current;
  }, [isVisible, hideOutsideView]);
-  useHighlighting({ view, pattern, active: cycle.started });
+  useHighlighting({ view, pattern, active: cycle.started && !activeCode?.includes("strudel disable-highlighting") });
+  useLayoutEffect(() => {
+    if (enableKeyboard) {
+      const handleKeyPress = async (e) => {
+        if (e.ctrlKey || e.altKey) {
+          if (e.code === "Enter") {
+            e.preventDefault();
+            flash(view);
+            await activateCode();
+          } else if (e.code === "Period") {
+            cycle.stop();
+            e.preventDefault();
+          }
+        }
+      };
+      window.addEventListener("keydown", handleKeyPress, true);
+      return () => window.removeEventListener("keydown", handleKeyPress, true);
+    }
+  }, [enableKeyboard, pattern, code, activateCode, cycle, view]);
  return /* @__PURE__ */ React.createElement("div", {
    className: styles.container,
    ref
@@ -1 +1 @@
-*,: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}
+.cm-editor{background-color:transparent!important;height:100%;z-index:11;font-size:16px}.cm-theme-light{width:100%}.cm-line>*{background:#00000095}*,:before,:after{--tw-translate-x: 0;--tw-translate-y: 0;--tw-rotate: 0;--tw-skew-x: 0;--tw-skew-y: 0;--tw-scale-x: 1;--tw-scale-y: 1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness: proximity;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width: 0px;--tw-ring-offset-color: #fff;--tw-ring-color: rgb(59 130 246 / .5);--tw-ring-offset-shadow: 0 0 #0000;--tw-ring-shadow: 0 0 #0000;--tw-shadow: 0 0 #0000;--tw-shadow-colored: 0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: }.sc-h-5{height:1.25rem}.sc-w-5{width:1.25rem}@keyframes sc-pulse{50%{opacity:.5}}.sc-animate-pulse{animation:sc-pulse 2s cubic-bezier(.4,0,.6,1) infinite}._container_3i85k_1{overflow:hidden;border-radius:.375rem;--tw-bg-opacity: 1;background-color:rgb(34 34 34 / var(--tw-bg-opacity))}._header_3i85k_5{display:flex;justify-content:space-between;border-top-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity))}._buttons_3i85k_9{display:flex}._button_3i85k_9{display:flex;width:4rem;cursor:pointer;align-items:center;justify-content:center;border-right-width:1px;--tw-border-opacity: 1;border-color:rgb(100 116 139 / var(--tw-border-opacity));--tw-bg-opacity: 1;background-color:rgb(51 65 85 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(255 255 255 / var(--tw-text-opacity))}._button_3i85k_9:hover{--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity))}._buttonDisabled_3i85k_17{display:flex;width:4rem;cursor:pointer;cursor:not-allowed;align-items:center;justify-content:center;--tw-bg-opacity: 1;background-color:rgb(71 85 105 / var(--tw-bg-opacity));padding:.25rem;--tw-text-opacity: 1;color:rgb(148 163 184 / var(--tw-text-opacity))}._error_3i85k_21{padding:.25rem;text-align:right;font-size:.875rem;line-height:1.25rem;--tw-text-opacity: 1;color:rgb(254 202 202 / var(--tw-text-opacity))}._body_3i85k_25{position:relative;overflow:auto}
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/react",
-  "version": "0.1.4",
+  "version": "0.2.0",
  "description": "React components for strudel",
  "main": "dist/index.cjs.js",
  "module": "dist/index.es.js",
@@ -37,11 +37,12 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@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",
+    "@codemirror/lang-javascript": "^6.0.2",
+    "@strudel.cycles/core": "^0.2.0",
+    "@strudel.cycles/eval": "^0.2.0",
+    "@strudel.cycles/tone": "^0.2.0",
+    "@uiw/codemirror-themes": "^4.11.4",
+    "@uiw/react-codemirror": "^4.11.4",
    "react-hook-inview": "^4.5.0"
  },
  "peerDependencies": {
@@ -1,13 +1,9 @@
 import React from 'react';
 import { MiniRepl } from './components/MiniRepl';
 import 'tailwindcss/tailwind.css';
-import { Tone, getDefaultSynth } from '@strudel.cycles/tone';
 import { evalScope } from '@strudel.cycles/eval';

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

 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)) {
-          highlights = Decoration.set(
+          const marks =
            e.value
-              .flatMap((hap) =>
+              .map((hap) =>
                (hap.context.locations || []).map(({ start, end }) => {
                  const color = hap.context.color || '#FFCA28';
                  let from = tr.newDoc.line(start.line).from + start.column;
@@ -60,43 +60,56 @@ const highlightField = StateField.define({
                  if (from > l || to > l) {
                    return; // dont mark outside of range, as it will throw an error
                  }
-                  const mark = Decoration.mark({ attributes: { style: `outline: 1px solid ${color}` } });
+                  // const mark = Decoration.mark({ attributes: { style: `outline: 1px solid ${color}` } });
+                  const mark = Decoration.mark({ attributes: { style: `outline: 1.5px solid ${color};` } });
                  return mark.range(from, to);
                }),
              )
-              .filter(Boolean),
-            true,
-          );
+              .flat()
+              .filter(Boolean) || [];
+          highlights = Decoration.set(marks, true);
        }
      }
      return highlights;
    } catch (err) {
      // console.warn('highlighting error', err);
-      return highlights;
+      return Decoration.set([]);
    }
  },
  provide: (f) => EditorView.decorations.from(f),
 });

-export default function CodeMirror({ value, onChange, onViewChanged, onCursor, options, editorDidMount }) {
+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],
+  );
  return (
    <>
      <_CodeMirror
-        onViewChange={onViewChanged}
-        style={{
-          display: 'flex',
-          flexDirection: 'column',
-          flex: '1 0 auto',
-        }}
        value={value}
-        onChange={onChange}
-        extensions={[
-          javascript(),
-          materialPalenight,
-          highlightField,
-          flashField,
-          // theme, language, ...
-        ]}
+        onChange={handleOnChange}
+        onCreateEditor={handleOnCreateEditor}
+        onUpdate={handleOnUpdate}
+        extensions={extensions}
      />
    </>
  );
@@ -1,20 +1,24 @@
-import React, { useState, useMemo, useRef } from 'react';
+import React, { useState, useMemo, useRef, useEffect, useLayoutEffect } from 'react';
 import { useInView } from 'react-hook-inview';
 import useRepl from '../hooks/useRepl.mjs';
 import cx from '../cx';
 import useHighlighting from '../hooks/useHighlighting.mjs';
-import CodeMirror6 from './CodeMirror6';
+import CodeMirror6, { flash } from './CodeMirror6';
 import 'tailwindcss/tailwind.css';
 import './style.css';
 import styles from './MiniRepl.module.css';
 import { Icon } from './Icon';

-export function MiniRepl({ tune, defaultSynth, hideOutsideView = false }) {
-  const { code, setCode, pattern, activateCode, error, cycle, dirty, togglePlay } = useRepl({
-    tune,
-    defaultSynth,
-    autolink: false,
-  });
+export function MiniRepl({ tune, hideOutsideView = false, init, onEvent, enableKeyboard }) {
+  const { code, setCode, pattern, activeCode, activateCode, evaluateOnly, error, cycle, dirty, togglePlay, stop } =
+    useRepl({
+      tune,
+      autolink: false,
+      onEvent,
+    });
+  useEffect(() => {
+    init && evaluateOnly();
+  }, [tune, init]);
  const [view, setView] = useState();
  const [ref, isVisible] = useInView({
    threshold: 0.01,
@@ -26,7 +30,28 @@ export function MiniRepl({ tune, defaultSynth, hideOutsideView = false }) {
    }
    return isVisible || wasVisible.current;
  }, [isVisible, hideOutsideView]);
-  useHighlighting({ view, pattern, active: cycle.started });
+  useHighlighting({ view, pattern, active: cycle.started && !activeCode?.includes('strudel disable-highlighting') });
+
+  // set active pattern on ctrl+enter
+  useLayoutEffect(() => {
+    if (enableKeyboard) {
+      const handleKeyPress = async (e) => {
+        if (e.ctrlKey || e.altKey) {
+          if (e.code === 'Enter') {
+            e.preventDefault();
+            flash(view);
+            await activateCode();
+          } else if (e.code === 'Period') {
+            cycle.stop();
+            e.preventDefault();
+          }
+        }
+      };
+      window.addEventListener('keydown', handleKeyPress, true);
+      return () => window.removeEventListener('keydown', handleKeyPress, true);
+    }
+  }, [enableKeyboard, pattern, code, activateCode, cycle, view]);
+
  return (
    <div className={styles.container} ref={ref}>
      <div className={styles.header}>
@@ -40,7 +65,7 @@ export function MiniRepl({ tune, defaultSynth, hideOutsideView = false }) {
        </div>
        {error && <div className={styles.error}>{error.message}</div>}
      </div>
-      <div className={styles.body} >
+      <div className={styles.body}>
        {show && <CodeMirror6 value={code} onChange={setCode} onViewChanged={setView} />}
      </div>
    </div>
@@ -1,5 +1,5 @@
 .container {
-  @apply sc-rounded-md sc-overflow-hidden sc-bg-[#444C57];
+  @apply sc-rounded-md sc-overflow-hidden sc-bg-[#222222];
 }

 .header {
@@ -1,3 +1,14 @@
 .cm-editor {
  background-color: transparent !important;
+  height: 100%;
+  z-index: 11;
+  font-size: 16px;
+}
+
+.cm-theme-light {
+  width: 100%;
+}
+
+.cm-line > * {
+  background: #00000095;
 }
@@ -6,9 +6,9 @@ This program is free software: you can redistribute it and/or modify it under th

 import { useCallback, useState, useMemo } from 'react';
 import { evaluate } from '@strudel.cycles/eval';
-import { getPlayableNoteValue } from '@strudel.cycles/core/util.mjs';
 import useCycle from './useCycle.mjs';
 import usePostMessage from './usePostMessage.mjs';
+import { webaudioOutputTrigger } from '@strudel.cycles/webaudio';

 let s4 = () => {
  return Math.floor((1 + Math.random()) * 0x10000)
@@ -17,7 +17,7 @@ let s4 = () => {
 };
 const generateHash = (code) => encodeURIComponent(btoa(code));

-function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawProp }) {
+function useRepl({ tune, autolink = true, onEvent, onDraw: onDrawProp }) {
  const id = useMemo(() => s4(), []);
  const [code, setCode] = useState(tune);
  const [activeCode, setActiveCode] = useState();
@@ -36,6 +36,8 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawP
    }
  }, [activeCode, onDrawProp]);

+  const hideHeader = useMemo(() => activeCode && activeCode.includes('strudel hide-header'), [activeCode]);
+  const hideConsole = useMemo(() => activeCode && activeCode.includes('strudel hide-console'), [activeCode]);
  // cycle hook to control scheduling
  const cycle = useCycle({
    onDraw,
@@ -46,26 +48,15 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawP
          if (event.context.logs?.length) {
            event.context.logs.forEach(pushLog);
          }
-          const { onTrigger, velocity } = event.context;
-          if (!onTrigger) {
-            if (defaultSynth) {
-              const note = getPlayableNoteValue(event);
-              defaultSynth.triggerAttackRelease(note, event.duration.valueOf(), time, velocity);
-            } else {
-              throw new Error('no defaultSynth passed to useRepl.');
-            }
-            /* console.warn('no instrument chosen', event);
-          throw new Error(`no instrument chosen for ${JSON.stringify(event)}`); */
-          } else {
-            onTrigger(time, event, currentTime, 1 /* cps */);
-          }
+          const { onTrigger = webaudioOutputTrigger } = event.context;
+          onTrigger(time, event, currentTime, 1 /* cps */);
        } catch (err) {
          console.warn(err);
          err.message = 'unplayable event: ' + err?.message;
          pushLog(err.message); // not with setError, because then we would have to setError(undefined) on next playable event
        }
      },
-      [onEvent, pushLog, defaultSynth],
+      [onEvent, pushLog],
    ),
    onQuery: useCallback(
      (state) => {
@@ -136,6 +127,8 @@ function useRepl({ tune, defaultSynth, autolink = true, onEvent, onDraw: onDrawP
  };

  return {
+    hideHeader,
+    hideConsole,
    pending,
    code,
    setCode,
@@ -1,136 +0,0 @@
-import { EditorView } from '@codemirror/view';
-import { HighlightStyle, tags as t } from '@codemirror/highlight';
-
-/*
-  Credits for color palette:
-
-  Author:     Mattia Astorino (http://github.com/equinusocio)
-  Website:    https://material-theme.site/
-*/
-
-const ivory = '#abb2bf',
-  stone = '#7d8799', // Brightened compared to original to increase contrast
-  invalid = '#ffffff',
-  darkBackground = '#21252b',
-  highlightBackground = 'rgba(0, 0, 0, 0.5)',
-  // background = '#292d3e',
-  background = 'transparent',
-  tooltipBackground = '#353a42',
-  selection = 'rgba(128, 203, 196, 0.5)',
-  cursor = '#ffcc00';
-
-/// The editor theme styles for Material Palenight.
-export const materialPalenightTheme = EditorView.theme(
-  {
-    // done
-    '&': {
-      color: '#ffffff',
-      backgroundColor: background,
-      fontSize: '15px',
-      'z-index': 11,
-    },
-
-    // done
-    '.cm-content': {
-      caretColor: cursor,
-      lineHeight: '22px',
-    },
-    '.cm-line': {
-      background: '#2C323699',
-    },
-    // done
-    '&.cm-focused .cm-cursor': {
-      backgroundColor: cursor,
-      width: '3px',
-    },
-
-    '&.cm-focused .cm-selectionBackground, .cm-selectionBackground, .cm-content ::selection': {
-      backgroundColor: selection,
-    },
-
-    '.cm-panels': { backgroundColor: darkBackground, color: '#ffffff' },
-    '.cm-panels.cm-panels-top': { borderBottom: '2px solid black' },
-    '.cm-panels.cm-panels-bottom': { borderTop: '2px solid black' },
-
-    // done, use onedarktheme
-    '.cm-searchMatch': {
-      backgroundColor: '#72a1ff59',
-      outline: '1px solid #457dff',
-    },
-    '.cm-searchMatch.cm-searchMatch-selected': {
-      backgroundColor: '#6199ff2f',
-    },
-
-    '.cm-activeLine': { backgroundColor: highlightBackground },
-    '.cm-selectionMatch': { backgroundColor: '#aafe661a' },
-
-    '&.cm-focused .cm-matchingBracket, &.cm-focused .cm-nonmatchingBracket': {
-      backgroundColor: '#bad0f847',
-      outline: '1px solid #515a6b',
-    },
-
-    // done
-    '.cm-gutters': {
-      background: 'transparent',
-      color: '#676e95',
-      border: 'none',
-    },
-
-    '.cm-activeLineGutter': {
-      backgroundColor: highlightBackground,
-    },
-
-    '.cm-foldPlaceholder': {
-      backgroundColor: 'transparent',
-      border: 'none',
-      color: '#ddd',
-    },
-
-    '.cm-tooltip': {
-      border: 'none',
-      backgroundColor: tooltipBackground,
-    },
-    '.cm-tooltip .cm-tooltip-arrow:before': {
-      borderTopColor: 'transparent',
-      borderBottomColor: 'transparent',
-    },
-    '.cm-tooltip .cm-tooltip-arrow:after': {
-      borderTopColor: tooltipBackground,
-      borderBottomColor: tooltipBackground,
-    },
-    '.cm-tooltip-autocomplete': {
-      '& > ul > li[aria-selected]': {
-        backgroundColor: highlightBackground,
-        color: ivory,
-      },
-    },
-  },
-  { dark: true },
-);
-
-/// The highlighting style for code in the Material Palenight theme.
-export const materialPalenightHighlightStyle = HighlightStyle.define([
-  { tag: t.keyword, color: '#c792ea' },
-  { tag: t.operator, color: '#89ddff' },
-  { tag: t.special(t.variableName), color: '#eeffff' },
-  { tag: t.typeName, color: '#f07178' },
-  { tag: t.atom, color: '#f78c6c' },
-  { tag: t.number, color: '#ff5370' },
-  { tag: t.definition(t.variableName), color: '#82aaff' },
-  { tag: t.string, color: '#c3e88d' },
-  { tag: t.special(t.string), color: '#f07178' },
-  { tag: t.comment, color: stone },
-  { tag: t.variableName, color: '#f07178' },
-  { tag: t.tagName, color: '#ff5370' },
-  { tag: t.bracket, color: '#a2a1a4' },
-  { tag: t.meta, color: '#ffcb6b' },
-  { tag: t.attributeName, color: '#c792ea' },
-  { tag: t.propertyName, color: '#c792ea' },
-  { tag: t.className, color: '#decb6b' },
-  { tag: t.invalid, color: invalid },
-]);
-
-/// Extension to enable the Material Palenight theme (both the editor theme and
-/// the highlight style).
-// : Extension
-export const materialPalenight = [materialPalenightTheme, materialPalenightHighlightStyle];
@@ -0,0 +1,36 @@
+import { tags as t } from '@lezer/highlight';
+import { createTheme } from '@uiw/codemirror-themes';
+export default createTheme({
+  theme: 'dark',
+  settings: {
+    background: '#222',
+    foreground: '#75baff', // whats that?
+    caret: '#ffcc00',
+    selection: 'rgba(128, 203, 196, 0.5)',
+    selectionMatch: '#036dd626',
+    lineHighlight: '#8a91991a',
+    gutterBackground: 'transparent',
+    // gutterForeground: '#8a919966',
+    gutterForeground: '#676e95',
+  },
+  styles: [
+    { tag: t.keyword, color: '#c792ea' },
+    { tag: t.operator, color: '#89ddff' },
+    { tag: t.special(t.variableName), color: '#eeffff' },
+    { tag: t.typeName, color: '#f07178' },
+    { tag: t.atom, color: '#f78c6c' },
+    { tag: t.number, color: '#ff5370' },
+    { tag: t.definition(t.variableName), color: '#82aaff' },
+    { tag: t.string, color: '#c3e88d' },
+    { tag: t.special(t.string), color: '#f07178' },
+    { tag: t.comment, color: '#7d8799' },
+    { tag: t.variableName, color: '#f07178' },
+    { tag: t.tagName, color: '#ff5370' },
+    { tag: t.bracket, color: '#a2a1a4' },
+    { tag: t.meta, color: '#ffcb6b' },
+    { tag: t.attributeName, color: '#c792ea' },
+    { tag: t.propertyName, color: '#c792ea' },
+    { tag: t.className, color: '#decb6b' },
+    { tag: t.invalid, color: '#ffffff' },
+  ],
+});
@@ -33,8 +33,14 @@ export default defineConfig({
        '@strudel.cycles/serial',
        '@strudel.cycles/webaudio',
        '@codemirror/view',
-        '@codemirror/highlight',
-        '@codemirror/state'
+        '@codemirror/lang-javascript',
+        '@codemirror/state',
+        '@codemirror/commands',
+        '@lezer/highlight',
+        '@codemirror/language',
+        '@uiw/codemirror-themes',
+        '@uiw/react-codemirror',
+        '@lezer/highlight',
      ],
    },
    target: 'esnext',
@@ -1,6 +1,6 @@
 import { getFontBufferSource } from './fontloader.mjs';
 import * as soundfontList from './list.mjs';
+import { startPresetNote } from 'sfumato';
+import { loadSoundfont } from './sfumato.mjs';

-globalThis.getFontBufferSource = getFontBufferSource;
-globalThis.soundfontList = soundfontList;
-globalThis.soundfontList = soundfontList;
+export { loadSoundfont, startPresetNote, getFontBufferSource, soundfontList };
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/soundfonts",
-  "version": "0.1.1",
+  "version": "0.2.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/soundfonts",
-  "version": "0.1.1",
+  "version": "0.2.1",
  "description": "Soundsfont support for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -22,8 +22,10 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "*",
-    "@strudel.cycles/webaudio": "^0.1.4"
+    "@strudel.cycles/core": "^0.2.0",
+    "@strudel.cycles/webaudio": "^0.2.0",
+    "sfumato": "^0.1.2",
+    "soundfont2": "^0.4.0"
  },
  "devDependencies": {
    "node-fetch": "^3.2.6"
@@ -0,0 +1,24 @@
+import { Pattern } from '@strudel.cycles/core';
+import { loadSoundfont as _loadSoundfont, startPresetNote } from 'sfumato';
+
+Pattern.prototype.soundfont = function (sf, n = 0) {
+  return this.onTrigger((t, h, ct) => {
+    const ctx = getAudioContext();
+    const note = getPlayableNoteValue(h);
+    const preset = sf.presets[n % sf.presets.length];
+    const deadline = ctx.currentTime + t - ct;
+    const args = [ctx, preset, toMidi(note), deadline];
+    const stop = startPresetNote(...args);
+    stop(deadline + h.duration);
+  });
+};
+
+const soundfontCache = new Map();
+export function loadSoundfont(url) {
+  if (soundfontCache.get(url)) {
+    return soundfontCache.get(url);
+  }
+  const sf = _loadSoundfont(url);
+  soundfontCache.set(url, sf);
+  return sf;
+}
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/tonal",
-	"version": "0.1.3",
+	"version": "0.2.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,11 +1,11 @@
 {
  "name": "@strudel.cycles/tonal",
-  "version": "0.1.3",
+  "version": "0.2.0",
  "description": "Tonal functions for strudel",
  "main": "index.mjs",
  "type": "module",
  "scripts": {
-    "test": "mocha --colors"
+    "test": "vitest run"
  },
  "repository": {
    "type": "git",
@@ -25,7 +25,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.1.2",
+    "@strudel.cycles/core": "^0.2.0",
    "@tonaljs/tonal": "^4.6.5",
    "webmidi": "^3.0.15"
  }
@@ -4,12 +4,14 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-import { strict as assert } from 'assert';
+// import { strict as assert } from 'assert';
+
 import '../tonal.mjs'; // need to import this to add prototypes
 import { pure } from '@strudel.cycles/core';
+import { describe, it, expect } from 'vitest';

 describe('tonal', () => {
  it('Should run tonal functions ', () => {
-    assert.deepStrictEqual(pure('c3').scale('C major').scaleTranspose(1)._firstCycleValues, ['D3']);
+    expect(pure('c3').scale('C major').scaleTranspose(1)._firstCycleValues).toEqual(['D3']);
  });
 });
@@ -69,9 +69,9 @@ function scaleOffset(scale, offset, note) {
 * @memberof Pattern
 * @name transpose
 * @example
- * "c2 c3".fast(2).transpose("<0 -2 5 3>".slow(2)).transpose(0)
+ * "c2 c3".fast(2).transpose("<0 -2 5 3>".slow(2)).note()
 * @example
- * "c2 c3".fast(2).transpose("<1P -2M 4P 3m>".slow(2)).transpose(0)
+ * "c2 c3".fast(2).transpose("<1P -2M 4P 3m>".slow(2)).note()
 */

 Pattern.prototype._transpose = function (intervalOrSemitones) {
@@ -107,6 +107,7 @@ Pattern.prototype._transpose = function (intervalOrSemitones) {
 * "-8 [2,4,6]"
 * .scale('C4 bebop major')
 * .scaleTranspose("<0 -1 -2 -3 -4 -5 -6 -4>")
+ * .note()
 */

 Pattern.prototype._scaleTranspose = function (offset /* : number | string */) {
@@ -134,9 +135,10 @@ Pattern.prototype._scaleTranspose = function (offset /* : number | string */) {
 * @name scale
 * @param {string} scale Name of scale
 * @returns Pattern
- * @example 
+ * @example
 * "0 2 4 6 4 2"
 * .scale(seq('C2 major', 'C2 minor').slow(2))
+ * .note()
 */

 Pattern.prototype._scale = function (scale /* : string */) {
@@ -40,7 +40,7 @@ Pattern.prototype.fmapNested = function (func) {
 * @param {range} range note range for possible voicings (optional, defaults to `['F3', 'A4']`)
 * @returns Pattern
 * @example
- * stack("<C^7 A7 Dm7 G7>".voicings(), "<C3 A2 D3 G2>")
+ * stack("<C^7 A7 Dm7 G7>".voicings(), "<C3 A2 D3 G2>").note()
 */

 Pattern.prototype.voicings = function (range) {
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/tone",
-	"version": "0.1.3",
+	"version": "0.2.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/tone",
-  "version": "0.1.3",
+  "version": "0.2.0",
  "description": "Tone.js API for strudel",
  "main": "index.mjs",
  "type": "module",
@@ -22,7 +22,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.1.2",
+    "@strudel.cycles/core": "^0.2.0",
    "@tonejs/piano": "^0.2.1",
    "chord-voicings": "^0.0.1",
    "tone": "^14.7.77"
@@ -22,10 +22,14 @@ Pattern.prototype.pianoroll = function ({
  flipTime = 0,
  flipValues = 0,
  hideNegative = false,
-  inactive = '#C9E597',
+  // inactive = '#C9E597',
+  // inactive = '#FFCA28',
+  inactive = '#7491D2',
  active = '#FFCA28',
  // background = '#2A3236',
  background = 'transparent',
+  smear = 0,
+  playheadColor = 'white',
  minMidi = 10,
  maxMidi = 90,
  autorange = 0,
@@ -58,12 +62,14 @@ Pattern.prototype.pianoroll = function ({
  flipTime && timeRange.reverse();
  flipValues && valueRange.reverse();

-  const playheadPosition = scale(-from / timeExtent, ...timeRange);
  this.draw(
    (ctx, events, t) => {
      ctx.fillStyle = background;
-      ctx.clearRect(0, 0, w, h);
-      ctx.fillRect(0, 0, w, h);
+      ctx.globalAlpha = 1; // reset!
+      if (!smear) {
+        ctx.clearRect(0, 0, w, h);
+        ctx.fillRect(0, 0, w, h);
+      }
      const inFrame = (event) =>
        (!hideNegative || event.whole.begin >= 0) && event.whole.begin <= t + to && event.whole.end >= t + from;
      events.filter(inFrame).forEach((event) => {
@@ -71,15 +77,6 @@ Pattern.prototype.pianoroll = function ({
        ctx.fillStyle = event.context?.color || inactive;
        ctx.strokeStyle = event.context?.color || active;
        ctx.globalAlpha = event.context.velocity ?? 1;
-        ctx.beginPath();
-        if (vertical) {
-          ctx.moveTo(0, playheadPosition);
-          ctx.lineTo(valueAxis, playheadPosition);
-        } else {
-          ctx.moveTo(playheadPosition, 0);
-          ctx.lineTo(playheadPosition, valueAxis);
-        }
-        ctx.stroke();
        const timePx = scale((event.whole.begin - (flipTime ? to : from)) / timeExtent, ...timeRange);
        let durationPx = scale(event.duration / timeExtent, 0, timeAxis);
        const value = getValue(event);
@@ -107,6 +104,19 @@ Pattern.prototype.pianoroll = function ({
        }
        isActive ? ctx.strokeRect(...coords) : ctx.fillRect(...coords);
      });
+      ctx.globalAlpha = 1; // reset!
+      const playheadPosition = scale(-from / timeExtent, ...timeRange);
+      // draw playhead
+      ctx.strokeStyle = playheadColor;
+      ctx.beginPath();
+      if (vertical) {
+        ctx.moveTo(0, playheadPosition);
+        ctx.lineTo(valueAxis, playheadPosition);
+      } else {
+        ctx.moveTo(playheadPosition, 0);
+        ctx.lineTo(playheadPosition, valueAxis);
+      }
+      ctx.stroke();
    },
    {
      from: from - overscan,
@@ -4,15 +4,15 @@ 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 '../tone.mjs';
 import { pure } from '@strudel.cycles/core';
-import Tone from 'tone';
+import { describe, it, expect } from 'vitest';

 describe('tone', () => {
  it('Should have working tone function', () => {
-    const s = synth().chain(out());
-    assert.deepStrictEqual(s, new Tone.Synth().chain(out()));
-    assert.deepStrictEqual(pure('c3').tone(s)._firstCycleValues, ['c3']);
+    // const s = synth().chain(out()); // TODO: mock audio context?
+    // assert.deepStrictEqual(s, new Tone.Synth().chain(out()));
+    const s = {};
+    expect(pure('c3').tone(s)._firstCycleValues).toEqual(['c3']);
  });
 });
@@ -15,13 +15,13 @@ npm i @strudel.cycles/webaudio --save
 import { Scheduler, getAudioContext } from '@strudel.cycles/webaudio';

 const scheduler = new Scheduler({
-    audioContext: getAudioContext(),
-    interval: 0.1,
-    onEvent: (e) => e.context?.createAudioNode?.(e),
-  });
-const pattern = sequence([55, 99], 110).osc('sawtooth').out()
+  audioContext: getAudioContext(),
+  interval: 0.1,
+  onEvent: (e) => e.context?.createAudioNode?.(e),
+});
+const pattern = sequence([55, 99], 110).osc('sawtooth');
 scheduler.setPattern(pattern);
-scheduler.start()
+scheduler.start();
 //scheduler.stop()
 ```

@@ -9,14 +9,12 @@ const stringifyFunction = (func) => '(' + func + ')();';
 const urlifyFunction = (func) => URL.createObjectURL(new Blob([stringifyFunction(func)], { type: 'text/javascript' }));
 const createWorker = (func) => new Worker(urlifyFunction(func));

-// this class is basically the tale of two clocks
+// this is just a setInterval with a counter, running in a worker
 export class ClockWorker {
  worker;
-  audioContext;
-  interval = 0.2; // query span
-  lastEnd = 0;
-  constructor(audioContext, callback, interval = this.interval) {
-    this.audioContext = audioContext;
+  interval = 0.1; // query span
+  tick = 0;
+  constructor(callback, interval = this.interval) {
    this.interval = interval;
    this.worker = createWorker(() => {
      // we cannot use closures here!
@@ -33,6 +31,7 @@ export class ClockWorker {
        if (!interval) {
          throw new Error('no interval set! call worker.postMessage({interval}) before starting.');
        }
+        postMessage('tick');
        timerID = setInterval(() => postMessage('tick'), interval * 1000);
      };
      self.onmessage = function (e) {
@@ -50,25 +49,23 @@ export class ClockWorker {
    });
    this.worker.postMessage({ interval });
    // const round = (n, d) => Math.round(n * d) / d;
-    const precision = 100;
    this.worker.onmessage = (e) => {
      if (e.data === 'tick') {
-        const begin = this.lastEnd || this.audioContext.currentTime;
-        const end = this.audioContext.currentTime + this.interval; // DONT reference begin here!
-        this.lastEnd = end;
        // callback with query span, using clock #2 (the audio clock)
-        callback(begin, end);
+        callback(this.tick++, this.interval);
      }
    };
  }
  start() {
-    console.log('start...');
-    this.audioContext.resume();
+    // console.log('start...');
    this.worker.postMessage('start');
  }
  stop() {
-    console.log('stop...');
+    // console.log('stop...');
    this.worker.postMessage('stop');
+    this.tick = 0;
+  }
+  setInterval(interval) {
+    this.worker.postMessage({ interval });
  }
 }
-
@@ -1,9 +1,11 @@
 <div style="position: absolute; top: 0; right: 0; padding: 4px">
  <button id="start" style="margin-bottom: 4px; font-size: 2em">start</button><br />
-  <button id="stop" style="font-size: 2em">stop</button>
+  <button id="stop" style="margin-bottom: 4px; font-size: 2em">stop</button><br />
+  <button id="slower" style="font-size: 2em">-</button>
+  <button id="faster" style="font-size: 2em">+</button>
 </div>
 <textarea
-  style="font-size: 2em; background: #bce865; color: #323230; height: 100%; width: 100%; outline: none; border: 0"
+  style="font-size: 2em; background: #052b49; color: #fff; height: 100%; width: 100%; outline: none; border: 0"
  id="text"
  spellcheck="false"
 >
@@ -11,11 +13,9 @@ Loading...</textarea
 >
 <script type="module">
  document.body.style = 'margin: 0';
-  // import * as strudel from '@strudel.cycles/core';
-  import * as strudel from '../../core/index.mjs';
-  import * as util from '../../core/util.mjs';
+  import * as strudel from '@strudel.cycles/core';
+  import * as util from '@strudel.cycles/core/util.mjs';
  import '@strudel.cycles/core/euclid.mjs';
-  // import { Scheduler, getAudioContext } from 'https://cdn.skypack.dev/@strudel.cycles/webaudio@0.0.4';
  import { Scheduler, getAudioContext } from '../index.mjs';

  const { cat, State, TimeSpan } = strudel;
@@ -33,11 +33,12 @@ Loading...</textarea
 .mul(slowcat(1,2))
 .mul(slowcat(1,3/2,4/3,5/3).slow(8))
 .fast(3)
+.freq()
 .velocity(.5)
-.wave(cat('sawtooth','square').fast(2))
-.adsr(0.01,.02,.5,0.1)
-.filter('lowshelf',800,25)
-.out()`;
+.s('sawtooth')
+.cutoff(800)
+.out()
+`;

  try {
    const base64 = decodeURIComponent(window.location.href.split('#')[1]);
@@ -61,4 +62,6 @@ Loading...</textarea

  document.getElementById('start').addEventListener('click', () => 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>
@@ -0,0 +1,31 @@
+if (typeof DelayNode !== 'undefined') {
+  class FeedbackDelayNode extends DelayNode {
+    constructor(ac, wet, time, feedback) {
+      super(ac);
+      wet = Math.abs(wet);
+      this.delayTime.value = time;
+
+      const feedbackGain = ac.createGain();
+      feedbackGain.gain.value = Math.min(Math.abs(feedback), 0.995);
+      this.feedback = feedbackGain.gain;
+
+      const delayGain = ac.createGain();
+      delayGain.gain.value = wet;
+      this.delayGain = delayGain;
+
+      this.connect(feedbackGain);
+      this.connect(delayGain);
+      feedbackGain.connect(this);
+
+      this.connect = (target) => delayGain.connect(target);
+      return this;
+    }
+    start(t) {
+      this.delayGain.gain.setValueAtTime(this.delayGain.gain.value, t + this.delayTime.value);
+    }
+  }
+
+  AudioContext.prototype.createFeedbackDelay = function (wet, time, feedback) {
+    return new FeedbackDelayNode(this, wet, time, feedback);
+  };
+}
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/webaudio",
-  "version": "0.1.4",
+  "version": "0.2.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/webaudio",
-  "version": "0.1.4",
+  "version": "0.2.0",
  "description": "Web Audio helpers for Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -28,6 +28,6 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.1.2"
+    "@strudel.cycles/core": "^0.2.0"
  }
 }
@@ -0,0 +1,23 @@
+if (typeof AudioContext !== 'undefined') {
+  AudioContext.prototype.impulseResponse = function (duration) {
+    const length = this.sampleRate * duration;
+    const impulse = this.createBuffer(2, length, this.sampleRate);
+    const IR = impulse.getChannelData(0);
+    for (let i = 0; i < length; i++) IR[i] = (2 * Math.random() - 1) * Math.pow(1 - i / length, duration);
+    return impulse;
+  };
+
+  AudioContext.prototype.createReverb = function (duration) {
+    const convolver = this.createConvolver();
+    convolver.setDuration = (d) => {
+      convolver.buffer = this.impulseResponse(d);
+      convolver.duration = duration;
+      return convolver;
+    };
+    convolver.setDuration(duration);
+    return convolver;
+  };
+}
+
+// TODO: make the reverb more exciting
+// check out https://blog.gskinner.com/archives/2019/02/reverb-web-audio-api.html
@@ -16,6 +16,15 @@ export const loadBuffer = (url, ac) => {
  return loadCache[url];
 };

+export function reverseBuffer(buffer) {
+  const ac = getAudioContext();
+  const reversed = ac.createBuffer(buffer.numberOfChannels, buffer.length, ac.sampleRate);
+  for (let channel = 0; channel < buffer.numberOfChannels; channel++) {
+    reversed.copyToChannel(buffer.getChannelData(channel).slice().reverse(), channel, channel);
+  }
+  return reversed;
+}
+
 export const getLoadedBuffer = (url) => {
  return bufferCache[url];
 };
@@ -82,14 +91,14 @@ export const loadGithubSamples = async (path, nameFn) => {
 };

 /**
- * load the given sample map for webdirt
+ * Loads a collection of samples to use with `s`
 *
 * @example
- * loadSamples({
- *   bd: '808bd/BD0000.WAV',
- *   sd: ['808sd/SD0000.WAV','808sd/SD0010.WAV','808sd/SD0050.WAV']
+ * samples({
+ *  bd: '808bd/BD0000.WAV',
+ *  sd: '808sd/SD0010.WAV'
 *  }, 'https://raw.githubusercontent.com/tidalcycles/Dirt-Samples/master/');
- *  s("bd <sd!7 sd(3,4,2)>").n(2).webdirt()
+ * s("[bd ~]*2, [~ hh]*2, ~ sd")
 *
 */

@@ -5,35 +5,43 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import { ClockWorker } from './clockworker.mjs';
-import { State, TimeSpan } from '@strudel.cycles/core';

 export class Scheduler {
  worker;
  pattern;
-  constructor({ audioContext, interval = 0.2, onEvent, latency = 0.2 }) {
-    this.worker = new ClockWorker(
-      audioContext,
-      (begin, end) => {
-        this.pattern.query(new State(new TimeSpan(begin + latency, end + latency))).forEach((e) => {
-          if (!e.part.begin.equals(e.whole.begin)) {
-            return;
-          }
-          if (e.context.onTrigger) {
-            // TODO: kill first param, as it's contained in e
-            e.context.onTrigger(e.whole.begin, e, audioContext.currentTime, 1 /* cps */);
-          }
-          if (onEvent) {
-            onEvent?.(e);
-          }
-        });
-      },
-      interval,
-    );
+  phase;
+  audioContext;
+  cps = 1;
+  constructor({ audioContext, interval = 0.1, onEvent, latency = 0.1 }) {
+    this.audioContext = audioContext;
+    this.worker = new ClockWorker((tick, interval) => {
+      const begin = this.phase;
+      const end = this.phase + interval * this.cps;
+      this.phase = end;
+      const haps = this.pattern.queryArc(begin, end);
+      haps.forEach((e) => {
+        if (typeof e.value?.cps === 'number') {
+          this.setCps(e.value?.cps);
+        }
+        if (!e.part.begin.equals(e.whole.begin)) {
+          return;
+        }
+        if (e.context.onTrigger) {
+          const ctxTime = (e.whole.begin - begin) / this.cps + this.audioContext.currentTime + latency;
+          e.context.onTrigger(ctxTime, e, this.audioContext.currentTime, this.cps);
+        }
+        if (onEvent) {
+          onEvent?.(e);
+        }
+      });
+    }, interval);
  }
  start() {
    if (!this.pattern) {
      throw new Error('Scheduler: no pattern set! call .setPattern first.');
    }
+    this.audioContext.resume();
+    this.phase = 0;
    this.worker.start();
  }
  stop() {
@@ -42,4 +50,7 @@ export class Scheduler {
  setPattern(pat) {
    this.pattern = pat;
  }
+  setCps(cps = 1) {
+    this.cps = cps;
+  }
 }
@@ -0,0 +1,38 @@
+// credits to webdirt: https://github.com/dktr0/WebDirt/blob/41342e81d6ad694a2310d491fef7b7e8b0929efe/js-src/Graph.js#L597
+export var vowelFormant = {
+  a: { freqs: [660, 1120, 2750, 3000, 3350], gains: [1, 0.5012, 0.0708, 0.0631, 0.0126], qs: [80, 90, 120, 130, 140] },
+  e: { freqs: [440, 1800, 2700, 3000, 3300], gains: [1, 0.1995, 0.1259, 0.1, 0.1], qs: [70, 80, 100, 120, 120] },
+  i: { freqs: [270, 1850, 2900, 3350, 3590], gains: [1, 0.0631, 0.0631, 0.0158, 0.0158], qs: [40, 90, 100, 120, 120] },
+  o: { freqs: [430, 820, 2700, 3000, 3300], gains: [1, 0.3162, 0.0501, 0.0794, 0.01995], qs: [40, 80, 100, 120, 120] },
+  u: { freqs: [370, 630, 2750, 3000, 3400], gains: [1, 0.1, 0.0708, 0.0316, 0.01995], qs: [40, 60, 100, 120, 120] },
+};
+if (typeof GainNode !== 'undefined') {
+  class VowelNode extends GainNode {
+    constructor(ac, letter) {
+      super(ac);
+      if (!vowelFormant[letter]) {
+        throw new Error('vowel: unknown vowel ' + letter);
+      }
+      const { gains, qs, freqs } = vowelFormant[letter];
+      const makeupGain = ac.createGain();
+      for (let i = 0; i < 5; i++) {
+        const gain = ac.createGain();
+        gain.gain.value = gains[i];
+        const filter = ac.createBiquadFilter();
+        filter.type = 'bandpass';
+        filter.Q.value = qs[i];
+        filter.frequency.value = freqs[i];
+        this.connect(filter);
+        filter.connect(gain);
+        gain.connect(makeupGain);
+      }
+      makeupGain.gain.value = 8; // how much makeup gain to add?
+      this.connect = (target) => makeupGain.connect(target);
+      return this;
+    }
+  }
+
+  AudioContext.prototype.createVowelFilter = function (letter) {
+    return new VowelNode(this, letter);
+  };
+}
@@ -6,9 +6,13 @@ This program is free software: you can redistribute it and/or modify it under th

 // import { Pattern, getFrequency, patternify2 } from '@strudel.cycles/core';
 import * as strudel from '@strudel.cycles/core';
-import { fromMidi, toMidi } from '@strudel.cycles/core';
-import { loadBuffer } from './sampler.mjs';
+import { fromMidi, isNote, toMidi } from '@strudel.cycles/core';
+import './feedbackdelay.mjs';
+import './reverb.mjs';
+import { loadBuffer, reverseBuffer } from './sampler.mjs';
 const { Pattern } = strudel;
+import './vowel.mjs';
+import workletsUrl from './worklets.mjs?url';

 // export const getAudioContext = () => Tone.getContext().rawContext;

@@ -20,6 +24,21 @@ export const getAudioContext = () => {
  return audioContext;
 };

+let destination;
+const getDestination = () => {
+  const ctx = getAudioContext();
+  if (!destination) {
+    destination = ctx.createGain();
+    destination.connect(ctx.destination);
+  }
+  return destination;
+};
+
+export const panic = () => {
+  getDestination().gain.linearRampToValueAtTime(0, getAudioContext().currentTime + 0.01);
+  destination = null;
+};
+
 const getFilter = (type, frequency, Q) => {
  const filter = getAudioContext().createBiquadFilter();
  filter.type = type;
@@ -36,6 +55,17 @@ const getADSR = (attack, decay, sustain, release, velocity, begin, end) => {
  gainNode.gain.setValueAtTime(sustain * velocity, end); // sustain end
  gainNode.gain.linearRampToValueAtTime(0, end + release); // release
  // for some reason, using exponential ramping creates little cracklings
+  /* let t = begin;
+  gainNode.gain.setValueAtTime(0, t);
+  gainNode.gain.exponentialRampToValueAtTime(velocity, (t += attack));
+  const sustainGain = Math.max(sustain * velocity, 0.001);
+  gainNode.gain.exponentialRampToValueAtTime(sustainGain, (t += decay));
+  if (end - begin < attack + decay) {
+    gainNode.gain.cancelAndHoldAtTime(end);
+  } else {
+    gainNode.gain.setValueAtTime(sustainGain, end);
+  }
+  gainNode.gain.exponentialRampToValueAtTime(0.001, end + release); // release */
  return gainNode;
 };

@@ -68,11 +98,15 @@ const getSoundfontKey = (s) => {
  return;
 };

-const getSampleBufferSource = async (s, n, note) => {
+const getSampleBufferSource = async (s, n, note, speed) => {
  let transpose = 0;
-  if (note) {
-    transpose = toMidi(note) - 36; // C3 is middle C
+  let midi;
+
+  if (note !== undefined) {
+    midi = typeof note === 'string' ? toMidi(note) : note;
+    transpose = midi - 36; // C3 is middle C
  }
+
  const ac = getAudioContext();
  // is sample from loaded samples(..)
  const samples = getLoadedSamples();
@@ -81,7 +115,11 @@ const getSampleBufferSource = async (s, n, note) => {
  }
  const bank = samples?.[s];
  if (!bank) {
-    throw new Error('sample not found:', s, 'try one of ' + Object.keys(samples));
+    throw new Error(
+      `sample not found: "${s}", try one of ${Object.keys(samples)
+        .map((s) => `"${s}"`)
+        .join(', ')}.`,
+    );
  }
  if (typeof bank !== 'object') {
    throw new Error('wrong format for sample bank:', s);
@@ -93,7 +131,7 @@ const getSampleBufferSource = async (s, n, note) => {
    if (!note) {
      throw new Error('no note(...) set for sound', s);
    }
-    const midiDiff = (noteA) => toMidi(noteA) - toMidi(note);
+    const midiDiff = (noteA) => toMidi(noteA) - midi;
    // object format will expect keys as notes
    const closest = Object.keys(bank)
      .filter((k) => !k.startsWith('_'))
@@ -104,7 +142,11 @@ const getSampleBufferSource = async (s, n, note) => {
    transpose = -midiDiff(closest); // semitones to repitch
    sampleUrl = bank[closest][n % bank[closest].length];
  }
-  const buffer = await loadBuffer(sampleUrl, ac);
+  let buffer = await loadBuffer(sampleUrl, ac);
+  if (speed < 0) {
+    // should this be cached?
+    buffer = reverseBuffer(buffer);
+  }
  const bufferSource = ac.createBufferSource();
  bufferSource.buffer = buffer;
  const playbackRate = 1.0 * Math.pow(2, transpose / 12);
@@ -124,11 +166,89 @@ const splitSN = (s, n) => {
  return [s2, n2];
 };

-Pattern.prototype.out = function () {
-  return this.onTrigger(async (t, hap, ct) => {
+let workletsLoading;
+function loadWorklets() {
+  if (workletsLoading) {
+    return workletsLoading;
+  }
+  workletsLoading = getAudioContext().audioWorklet.addModule(workletsUrl);
+  return workletsLoading;
+}
+
+function getWorklet(ac, processor, params) {
+  const node = new AudioWorkletNode(ac, processor);
+  Object.entries(params).forEach(([key, value]) => {
+    node.parameters.get(key).value = value;
+  });
+  return node;
+}
+
+if (typeof window !== 'undefined') {
+  try {
+    loadWorklets();
+  } catch (err) {
+    console.warn('could not load AudioWorklet effects coarse, crush and shape', err);
+  }
+}
+
+function gainNode(value) {
+  const node = getAudioContext().createGain();
+  node.gain.value = value;
+  return node;
+}
+const cutGroups = [];
+
+let delays = {};
+function getDelay(orbit, delaytime, delayfeedback, t) {
+  if (!delays[orbit]) {
    const ac = getAudioContext();
+    const dly = ac.createFeedbackDelay(1, delaytime, delayfeedback);
+    dly.start(t);
+    dly.connect(getDestination());
+    delays[orbit] = dly;
+  }
+  delays[orbit].delayTime.value !== delaytime && delays[orbit].delayTime.setValueAtTime(delaytime, t);
+  delays[orbit].feedback.value !== delayfeedback && delays[orbit].feedback.setValueAtTime(delayfeedback, t);
+  return delays[orbit];
+}
+
+let reverbs = {};
+function getReverb(orbit, duration = 2) {
+  if (!reverbs[orbit]) {
+    const ac = getAudioContext();
+    const reverb = ac.createReverb(duration);
+    reverb.connect(getDestination());
+    reverbs[orbit] = reverb;
+  }
+  if (reverbs[orbit].duration !== duration) {
+    reverbs[orbit] = reverbs[orbit].setDuration(duration);
+    reverbs[orbit].duration = duration;
+  }
+  return reverbs[orbit];
+}
+
+function effectSend(input, effect, wet) {
+  const send = gainNode(wet);
+  input.connect(send);
+  send.connect(effect);
+  return send;
+}
+
+// export const webaudioOutput = async (t, hap, ct, cps) => {
+export const webaudioOutput = async (hap, deadline, hapDuration) => {
+  try {
+    const ac = getAudioContext();
+    /* if (isNote(hap.value)) {
+      // supports primitive hap values that look like notes
+      hap.value = { note: hap.value };
+    } */
+    if (typeof hap.value !== 'object') {
+      throw new Error(
+        `hap.value ${hap.value} is not supported by webaudio output. Hint: append .note() or .s() to the end`,
+      );
+    }
    // calculate correct time (tone.js workaround)
-    t = ac.currentTime + t - ct;
+    let t = ac.currentTime + deadline;
    // destructure value
    let {
      freq,
@@ -137,21 +257,32 @@ Pattern.prototype.out = function () {
      clip = 0, // if 1, samples will be cut off when the hap ends
      n = 0,
      note,
-      gain = 1,
+      gain = 0.8,
      cutoff,
      resonance = 1,
      hcutoff,
      hresonance = 1,
      bandf,
      bandq = 1,
+      coarse,
+      crush,
+      shape,
      pan,
-      attack = 0.001,
-      decay = 0.05,
-      sustain = 0.5,
-      release = 0.001,
      speed = 1, // sample playback speed
      begin = 0,
      end = 1,
+      vowel,
+      delay = 0,
+      delayfeedback = 0.5,
+      delaytime = 0.25,
+      unit,
+      nudge = 0, // TODO: is this in seconds?
+      cut,
+      loop,
+      orbit = 1,
+      room,
+      size = 2,
+      roomsize = size,
    } = hap.value;
    const { velocity = 1 } = hap.context;
    gain *= velocity; // legacy fix for velocity
@@ -164,8 +295,10 @@ Pattern.prototype.out = function () {
      [note, n] = splitSN(note, n);
    }
    if (!s || ['sine', 'square', 'triangle', 'sawtooth'].includes(s)) {
+      // destructure adsr here, because the default should be different for synths and samples
+      const { attack = 0.001, decay = 0.05, sustain = 0.6, release = 0.01 } = hap.value;
      // with synths, n and note are the same thing
-      n = note || n;
+      n = note || n || 36;
      if (typeof n === 'string') {
        n = toMidi(n); // e.g. c3 => 48
      }
@@ -174,17 +307,17 @@ Pattern.prototype.out = function () {
        freq = fromMidi(n); // + 48);
      }
      // make oscillator
-      const o = getOscillator({ t, s, freq, duration: hap.duration, release });
+      const o = getOscillator({ t, s, freq, duration: hapDuration, release });
      chain.push(o);
      // level down oscillators as they are really loud compared to samples i've tested
-      const g = ac.createGain();
-      g.gain.value = 0.3;
-      chain.push(g);
+      chain.push(gainNode(0.3));
      // TODO: make adsr work with samples without pops
      // envelope
-      const adsr = getADSR(attack, decay, sustain, release, 1, t, t + hap.duration);
+      const adsr = getADSR(attack, decay, sustain, release, 1, t, t + hapDuration);
      chain.push(adsr);
    } else {
+      // destructure adsr here, because the default should be different for synths and samples
+      const { attack = 0.001, decay = 0.001, sustain = 1, release = 0.001 } = hap.value;
      // load sample
      if (speed === 0) {
        // no playback
@@ -203,7 +336,7 @@ Pattern.prototype.out = function () {
          bufferSource = await globalThis.getFontBufferSource(soundfont, note || n, ac);
        } else {
          // is sample from loaded samples(..)
-          bufferSource = await getSampleBufferSource(s, n, note);
+          bufferSource = await getSampleBufferSource(s, n, note, speed);
        }
      } catch (err) {
        console.warn(err);
@@ -219,53 +352,87 @@ Pattern.prototype.out = function () {
        return;
      }
      bufferSource.playbackRate.value = Math.abs(speed) * bufferSource.playbackRate.value;
-      // TODO: nudge, unit, cut, loop
-      let duration = soundfont || clip ? hap.duration : bufferSource.buffer.duration;
-      // let duration = bufferSource.buffer.duration;
-      const offset = begin * duration;
-      duration = ((end - begin) * duration) / Math.abs(speed);
-      if (soundfont || clip) {
-        bufferSource.start(t, offset); // duration does not work here for some reason
-      } else {
-        bufferSource.start(t, offset, duration);
+      if (unit === 'c') {
+        // are there other units?
+        bufferSource.playbackRate.value = bufferSource.playbackRate.value * bufferSource.buffer.duration;
+      }
+      let duration = soundfont || clip ? hapDuration : bufferSource.buffer.duration / bufferSource.playbackRate.value;
+      // "The computation of the offset into the sound is performed using the sound buffer's natural sample rate,
+      // rather than the current playback rate, so even if the sound is playing at twice its normal speed,
+      // the midway point through a 10-second audio buffer is still 5."
+      const offset = begin * duration * bufferSource.playbackRate.value;
+      duration = (end - begin) * duration;
+      if (loop) {
+        bufferSource.loop = true;
+        bufferSource.loopStart = offset;
+        bufferSource.loopEnd = offset + duration;
+        duration = loop * duration;
+      }
+      t += nudge;
+
+      bufferSource.start(t, offset);
+      if (cut !== undefined) {
+        cutGroups[cut]?.stop(t); // fade out?
+        cutGroups[cut] = bufferSource;
      }
      chain.push(bufferSource);
-      if (soundfont || clip) {
-        const env = ac.createGain();
-        const releaseLength = 0.1;
-        env.gain.value = 0.6;
-        env.gain.setValueAtTime(env.gain.value, t + duration);
-        env.gain.linearRampToValueAtTime(0, t + duration + releaseLength);
-        // env.gain.linearRampToValueAtTime(0, t + duration + releaseLength);
-        chain.push(env);
-        bufferSource.stop(t + duration + releaseLength);
-      } else {
-        bufferSource.stop(t + duration);
-      }
+      bufferSource.stop(t + duration + release);
+      const adsr = getADSR(attack, decay, sustain, release, 1, t, t + duration);
+      chain.push(adsr);
    }
-    // master out
-    const master = ac.createGain();
-    master.gain.value = gain;
-    chain.push(master);
+
+    // gain stage
+    chain.push(gainNode(gain));

    // filters
    cutoff !== undefined && chain.push(getFilter('lowpass', cutoff, resonance));
    hcutoff !== undefined && chain.push(getFilter('highpass', hcutoff, hresonance));
    bandf !== undefined && chain.push(getFilter('bandpass', bandf, bandq));
-    // TODO vowel
-    // TODO delay / delaytime / delayfeedback
+    vowel !== undefined && chain.push(ac.createVowelFilter(vowel));
+
+    // effects
+    coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse }));
+    crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
+    shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape }));
+
    // panning
    if (pan !== undefined) {
      const panner = ac.createStereoPanner();
      panner.pan.value = 2 * pan - 1;
      chain.push(panner);
    }
-    // master out
-    /* const master = ac.createGain();
-    master.gain.value = 0.8 * gain;
-    chain.push(master); */
-    chain.push(ac.destination);
+
+    // last gain
+    const post = gainNode(1);
+    chain.push(post);
+    post.connect(getDestination());
+
+    // delay
+    let delaySend;
+    if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
+      const delyNode = getDelay(orbit, delaytime, delayfeedback, t);
+      delaySend = effectSend(post, delyNode, delay);
+    }
+    // reverb
+    let reverbSend;
+    if (room > 0 && roomsize > 0) {
+      const reverbNode = getReverb(orbit, roomsize);
+      reverbSend = effectSend(post, reverbNode, room);
+    }
+
    // connect chain elements together
    chain.slice(1).reduce((last, current) => last.connect(current), chain[0]);
-  });
+
+    // disconnect all nodes when source node has ended:
+    chain[0].onended = () => chain.concat([delaySend, reverbSend]).forEach((n) => n?.disconnect());
+  } catch (e) {
+    console.warn('.out error:', e);
+  }
+};
+
+export const webaudioOutputTrigger = (t, hap, ct, cps) => webaudioOutput(hap, t - ct, hap.duration / cps);
+
+Pattern.prototype.out = function () {
+  // TODO: refactor (t, hap, ct, cps) to (hap, deadline, duration) ?
+  return this.onTrigger(webaudioOutputTrigger);
 };
@@ -0,0 +1,96 @@
+// LICENSE GNU General Public License v3.0 see https://github.com/dktr0/WebDirt/blob/main/LICENSE
+// all the credit goes to dktr0's webdirt: https://github.com/dktr0/WebDirt/blob/5ce3d698362c54d6e1b68acc47eb2955ac62c793/dist/AudioWorklets.js
+// <3
+
+class CoarseProcessor extends AudioWorkletProcessor {
+  static get parameterDescriptors() {
+    return [{ name: 'coarse', defaultValue: 1 }];
+  }
+
+  constructor() {
+    super();
+    this.notStarted = true;
+  }
+
+  process(inputs, outputs, parameters) {
+    const input = inputs[0];
+    const output = outputs[0];
+    const coarse = parameters.coarse;
+    const blockSize = 128;
+    const hasInput = !(input[0] === undefined);
+    if (hasInput) {
+      this.notStarted = false;
+      output[0][0] = input[0][0];
+      for (let n = 1; n < blockSize; n++) {
+        if (n % coarse == 0) output[0][n] = input[0][n];
+        else output[0][n] = output[0][n - 1];
+      }
+    }
+    return this.notStarted || hasInput;
+  }
+}
+
+registerProcessor('coarse-processor', CoarseProcessor);
+
+class CrushProcessor extends AudioWorkletProcessor {
+  static get parameterDescriptors() {
+    return [{ name: 'crush', defaultValue: 0 }];
+  }
+
+  constructor() {
+    super();
+    this.notStarted = true;
+  }
+
+  process(inputs, outputs, parameters) {
+    const input = inputs[0];
+    const output = outputs[0];
+    const crush = parameters.crush;
+    const blockSize = 128;
+    const hasInput = !(input[0] === undefined);
+    if (hasInput) {
+      this.notStarted = false;
+      if (crush.length === 1) {
+        const x = Math.pow(2, crush[0] - 1);
+        for (let n = 0; n < blockSize; n++) output[0][n] = Math.round(input[0][n] * x) / x;
+      } else {
+        for (let n = 0; n < blockSize; n++) {
+          let x = Math.pow(2, crush[n] - 1);
+          output[0][n] = Math.round(input[0][n] * x) / x;
+        }
+      }
+    }
+    return this.notStarted || hasInput;
+  }
+}
+registerProcessor('crush-processor', CrushProcessor);
+
+class ShapeProcessor extends AudioWorkletProcessor {
+  static get parameterDescriptors() {
+    return [{ name: 'shape', defaultValue: 0 }];
+  }
+
+  constructor() {
+    super();
+    this.notStarted = true;
+  }
+
+  process(inputs, outputs, parameters) {
+    const input = inputs[0];
+    const output = outputs[0];
+    const shape0 = parameters.shape[0];
+    const shape1 = shape0 < 1 ? shape0 : 1.0 - 4e-10;
+    const shape = (2.0 * shape1) / (1.0 - shape1);
+    const blockSize = 128;
+    const hasInput = !(input[0] === undefined);
+    if (hasInput) {
+      this.notStarted = false;
+      for (let n = 0; n < blockSize; n++) {
+        output[0][n] = ((1 + shape) * input[0][n]) / (1 + shape * Math.abs(input[0][n]));
+      }
+    }
+    return this.notStarted || hasInput;
+  }
+}
+
+registerProcessor('shape-processor', ShapeProcessor);
@@ -1,6 +1,6 @@
 {
 	"name": "@strudel.cycles/webdirt",
-	"version": "0.1.2",
+	"version": "0.2.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
@@ -1,6 +1,6 @@
 {
  "name": "@strudel.cycles/webdirt",
-  "version": "0.1.2",
+  "version": "0.2.0",
  "description": "WebDirt integration for Strudel",
  "main": "index.mjs",
  "type": "module",
@@ -22,7 +22,7 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.1.2",
+    "@strudel.cycles/core": "^0.2.0",
    "WebDirt": "github:dktr0/WebDirt"
  }
 }
@@ -1,10 +1,10 @@
 {
  "name": "@strudel.cycles/xen",
-  "version": "0.1.3",
+  "version": "0.2.0",
  "description": "Xenharmonic API for strudel",
  "main": "index.mjs",
  "scripts": {
-    "test": "mocha --colors"
+    "test": "vitest run"
  },
  "repository": {
    "type": "git",
@@ -24,6 +24,6 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel.cycles/core": "^0.1.2"
+    "@strudel.cycles/core": "^0.2.0"
  }
 }
@@ -4,11 +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 { strict as assert } from 'assert';
 import { edo } from '../xen.mjs';
+import { describe, it, expect } from 'vitest';

 describe('xen', () => {
  it('edo', () => {
-    assert.deepStrictEqual(edo('3edo'), [1, Math.pow(2, 1 / 3), Math.pow(2, 2 / 3)]);
+    expect(edo('3edo')).toEqual([1, Math.pow(2, 1 / 3), Math.pow(2, 2 / 3)]);
  });
 });
@@ -23,4 +23,5 @@ dist-ssr
 *.sln
 *.sw?

-oldtunes.mjs
+oldtunes.mjs
+public/samples/EMU World/
@@ -18,6 +18,7 @@
        "@vitejs/plugin-react": "^1.3.0",
        "autoprefixer": "^10.4.7",
        "postcss": "^8.4.13",
+        "rollup-plugin-visualizer": "^5.8.1",
        "tailwindcss": "^3.0.24",
        "vite": "^2.9.9"
      }
@@ -634,6 +635,15 @@
        "node": ">=0.4.0"
      }
    },
+    "node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/ansi-styles": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -838,6 +848,17 @@
        "node": ">= 6"
      }
    },
+    "node_modules/cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
    "node_modules/color-convert": {
      "version": "1.9.3",
      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -908,6 +929,15 @@
        }
      }
    },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/defined": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
@@ -949,6 +979,12 @@
      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
      "dev": true
    },
+    "node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
    "node_modules/es5-ext": {
      "version": "0.10.61",
      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz",
@@ -1465,6 +1501,15 @@
        "node": ">=6.9.0"
      }
    },
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true,
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
    "node_modules/glob-parent": {
      "version": "6.0.2",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -1531,6 +1576,21 @@
        "url": "https://github.com/sponsors/ljharb"
      }
    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true,
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/is-extglob": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
@@ -1540,6 +1600,15 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/is-glob": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -1566,6 +1635,18 @@
      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/js-tokens": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -1753,6 +1834,23 @@
        "node": ">= 6"
      }
    },
+    "node_modules/open": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "dev": true,
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/path-parse": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
@@ -1977,6 +2075,15 @@
        "node": ">=8.10.0"
      }
    },
+    "node_modules/require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
    "node_modules/resolve": {
      "version": "1.22.0",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
@@ -2019,6 +2126,44 @@
        "fsevents": "~2.3.2"
      }
    },
+    "node_modules/rollup-plugin-visualizer": {
+      "version": "5.8.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.8.1.tgz",
+      "integrity": "sha512-NBT/xN/LWCwDM2/j5vYmjzpEAKHyclo/8Cv8AfTCwgADAG+tLJDy1vzxMw6NO0dSDjmTeRELD9UU3FwknLv0GQ==",
+      "dev": true,
+      "dependencies": {
+        "nanoid": "^3.3.4",
+        "open": "^8.4.0",
+        "source-map": "^0.7.3",
+        "yargs": "^17.5.1"
+      },
+      "bin": {
+        "rollup-plugin-visualizer": "dist/bin/cli.js"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "rollup": "^2.0.0"
+      },
+      "peerDependenciesMeta": {
+        "rollup": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/rollup-plugin-visualizer/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/run-parallel": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -2066,6 +2211,15 @@
        "semver": "bin/semver.js"
      }
    },
+    "node_modules/source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 8"
+      }
+    },
    "node_modules/source-map-js": {
      "version": "1.0.2",
      "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
@@ -2075,6 +2229,32 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
    "node_modules/supports-color": {
      "version": "5.5.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -2281,6 +2461,56 @@
        "webidl-conversions": "^3.0.0"
      }
    },
+    "node_modules/wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/ansi-styles": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+      "dev": true,
+      "dependencies": {
+        "color-convert": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+      "dev": true,
+      "dependencies": {
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
+      }
+    },
+    "node_modules/wrap-ansi/node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "dev": true
+    },
    "node_modules/xtend": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
@@ -2290,6 +2520,15 @@
        "node": ">=0.4"
      }
    },
+    "node_modules/y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true,
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/yaeti": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
@@ -2306,6 +2545,33 @@
      "engines": {
        "node": ">= 6"
      }
+    },
+    "node_modules/yargs": {
+      "version": "17.5.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+      "dev": true,
+      "dependencies": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true,
+      "engines": {
+        "node": ">=12"
+      }
    }
  },
  "dependencies": {
@@ -2776,6 +3042,12 @@
      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
      "dev": true
    },
+    "ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "dev": true
+    },
    "ansi-styles": {
      "version": "3.2.1",
      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
@@ -2901,6 +3173,17 @@
        }
      }
    },
+    "cliui": {
+      "version": "7.0.4",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz",
+      "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==",
+      "dev": true,
+      "requires": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^7.0.0"
+      }
+    },
    "color-convert": {
      "version": "1.9.3",
      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
@@ -2957,6 +3240,12 @@
        "ms": "2.1.2"
      }
    },
+    "define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "dev": true
+    },
    "defined": {
      "version": "1.0.0",
      "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz",
@@ -2992,6 +3281,12 @@
      "integrity": "sha512-0Rcpald12O11BUogJagX3HsCN3FE83DSqWjgXoHo5a72KUKMSfI39XBgJpgNNxS9fuGzytaFjE06kZkiVFy2qA==",
      "dev": true
    },
+    "emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true
+    },
    "es5-ext": {
      "version": "0.10.61",
      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.61.tgz",
@@ -3289,6 +3584,12 @@
      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
      "dev": true
    },
+    "get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "dev": true
+    },
    "glob-parent": {
      "version": "6.0.2",
      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
@@ -3337,12 +3638,24 @@
        "has": "^1.0.3"
      }
    },
+    "is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "dev": true
+    },
    "is-extglob": {
      "version": "2.1.1",
      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
      "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
      "dev": true
    },
+    "is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "dev": true
+    },
    "is-glob": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -3363,6 +3676,15 @@
      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="
    },
+    "is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dev": true,
+      "requires": {
+        "is-docker": "^2.0.0"
+      }
+    },
    "js-tokens": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -3492,6 +3814,17 @@
      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
      "dev": true
    },
+    "open": {
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.0.tgz",
+      "integrity": "sha512-XgFPPM+B28FtCCgSb9I+s9szOC1vZRSwgWsRUA5ylIxRTgKozqjOCrVOqGsYABPYK5qnfqClxZTFBa8PKt2v6Q==",
+      "dev": true,
+      "requires": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      }
+    },
    "path-parse": {
      "version": "1.0.7",
      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
@@ -3619,6 +3952,12 @@
        "picomatch": "^2.2.1"
      }
    },
+    "require-directory": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+      "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==",
+      "dev": true
+    },
    "resolve": {
      "version": "1.22.0",
      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz",
@@ -3645,6 +3984,26 @@
        "fsevents": "~2.3.2"
      }
    },
+    "rollup-plugin-visualizer": {
+      "version": "5.8.1",
+      "resolved": "https://registry.npmjs.org/rollup-plugin-visualizer/-/rollup-plugin-visualizer-5.8.1.tgz",
+      "integrity": "sha512-NBT/xN/LWCwDM2/j5vYmjzpEAKHyclo/8Cv8AfTCwgADAG+tLJDy1vzxMw6NO0dSDjmTeRELD9UU3FwknLv0GQ==",
+      "dev": true,
+      "requires": {
+        "nanoid": "^3.3.4",
+        "open": "^8.4.0",
+        "source-map": "^0.7.3",
+        "yargs": "^17.5.1"
+      },
+      "dependencies": {
+        "nanoid": {
+          "version": "3.3.4",
+          "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
+          "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+          "dev": true
+        }
+      }
+    },
    "run-parallel": {
      "version": "1.2.0",
      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
@@ -3675,12 +4034,38 @@
      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
      "dev": true
    },
+    "source-map": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+      "dev": true
+    },
    "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
    },
+    "string-width": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "requires": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "requires": {
+        "ansi-regex": "^5.0.1"
+      }
+    },
    "supports-color": {
      "version": "5.5.0",
      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
@@ -3835,12 +4220,55 @@
        "webidl-conversions": "^3.0.0"
      }
    },
+    "wrap-ansi": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "requires": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.3.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+          "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+          "dev": true,
+          "requires": {
+            "color-convert": "^2.0.1"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        }
+      }
+    },
    "xtend": {
      "version": "4.0.2",
      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
      "dev": true
    },
+    "y18n": {
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
+      "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
+      "dev": true
+    },
    "yaeti": {
      "version": "0.0.6",
      "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz",
@@ -3851,6 +4279,27 @@
      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
      "dev": true
+    },
+    "yargs": {
+      "version": "17.5.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.5.1.tgz",
+      "integrity": "sha512-t6YAJcxDkNX7NFYiVtKvWUz8l+PaKTLiL63mJYWR2GnHq2gjEWISzsLp9wg3aY36dY1j+gfIEL3pIF+XlJJfbA==",
+      "dev": true,
+      "requires": {
+        "cliui": "^7.0.2",
+        "escalade": "^3.1.1",
+        "get-caller-file": "^2.0.5",
+        "require-directory": "^2.1.1",
+        "string-width": "^4.2.3",
+        "y18n": "^5.0.5",
+        "yargs-parser": "^21.0.0"
+      }
+    },
+    "yargs-parser": {
+      "version": "21.1.1",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+      "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+      "dev": true
    }
  }
 }
@@ -7,8 +7,8 @@
    "start": "vite",
    "build": "vite build",
    "preview": "vite preview",
-    "test": "NODE_OPTIONS='--experimental-fetch' mocha ./src/test --colors",
-    "snapshot": "cd ./src/ && rm -f ./tunes.snapshot.mjs && node ./shoot.mjs > ./tunes.snapshot.mjs",
+    "test": "vitest run --reporter verbose -v --no-isolate",
+    "snapshot": "vitest run -u --silent",
    "add-license": "cat etc/agpl-header.txt ../docs/static/js/*LICENSE.txt > /tmp/strudel-license.txt && cp /tmp/strudel-license.txt ../docs/static/js/*LICENSE.txt",
    "predeploy": "npm run build",
    "deploy": "gh-pages -d ../docs",
@@ -25,6 +25,7 @@
    "@vitejs/plugin-react": "^1.3.0",
    "autoprefixer": "^10.4.7",
    "postcss": "^8.4.13",
+    "rollup-plugin-visualizer": "^5.8.1",
    "tailwindcss": "^3.0.24",
    "vite": "^2.9.9"
  }
@@ -1,26 +1,15 @@
+@import '@strudel.cycles/react/dist/style.css';
@tailwind base;
@tailwind components;
@tailwind utilities;

 body {
-  background-color: #2a3236;
-}
-
-.react-codemirror2,
-.CodeMirror {
-  height: 100% !important;
-  background-color: transparent !important;
-  font-size: 15px;
-  z-index:20
-}
-
-.CodeMirror-line > span {
-  background-color: #2a323699;
+  background-color: #222;
 }

 .darken::before {
  content: ' ';
-  position: absolute;
+  position: fixed;
  top: 0;
  left: 0;
  width: 100vw;
@@ -28,4 +17,4 @@ body {
  display: block;
  background: black;
  opacity: 0.5;
-}
+}
@@ -7,14 +7,13 @@ This program is free software: you can redistribute it and/or modify it under th
 import controls from '@strudel.cycles/core/controls.mjs';
 import { evalScope, evaluate } from '@strudel.cycles/eval';
 import { CodeMirror, cx, flash, useHighlighting, useRepl, useWebMidi } from '@strudel.cycles/react';
-import { getDefaultSynth, cleanupDraw, cleanupUi, Tone } from '@strudel.cycles/tone';
+import { cleanupDraw, cleanupUi, Tone } from '@strudel.cycles/tone';
 import React, { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import './App.css';
 import logo from './logo.svg';
 import * as tunes from './tunes.mjs';
 import { prebake } from './prebake.mjs';
 import * as WebDirt from 'WebDirt';
-import { loadWebDirt } from '@strudel.cycles/webdirt';
 import { resetLoadedSamples, getAudioContext } from '@strudel.cycles/webaudio';
 import { createClient } from '@supabase/supabase-js';
 import { nanoid } from 'nanoid';
@@ -37,16 +36,10 @@ evalScope(
  import('@strudel.cycles/xen'),
  import('@strudel.cycles/webaudio'),
  import('@strudel.cycles/osc'),
-  import('@strudel.cycles/webdirt'),
  import('@strudel.cycles/serial'),
  import('@strudel.cycles/soundfonts'),
 );

-loadWebDirt({
-  sampleMapUrl: 'EmuSP12.json',
-  sampleFolder: 'EmuSP12',
-});
-
 prebake();

 async function initCode() {
@@ -87,7 +80,6 @@ function getRandomTune() {
 }

 const randomTune = getRandomTune();
-const defaultSynth = getDefaultSynth();
 const isEmbedded = window.location !== window.parent.location;
 function App() {
  // const [editor, setEditor] = useState();
@@ -108,9 +100,10 @@ function App() {
    pattern,
    pushLog,
    pending,
+    hideHeader,
+    hideConsole,
  } = useRepl({
    tune: '// LOADING...',
-    defaultSynth,
  });
  useEffect(() => {
    initCode().then((decoded) => setCode(decoded || randomTune));
@@ -167,142 +160,162 @@ function App() {

  return (
    <div className="min-h-screen flex flex-col">
-      <header
-        id="header"
-        className={cx(
-          'flex-none w-full px-2 flex border-b border-gray-200  justify-between z-[10] bg-gray-100',
-          isEmbedded ? 'h-8' : 'h-14',
-        )}
-      >
-        <div className="flex items-center space-x-2">
-          <img src={logo} className={cx('Tidal-logo', isEmbedded ? 'w-6 h-6' : 'w-10 h-10')} alt="logo" />
-          <h1 className={isEmbedded ? 'text-l' : 'text-xl'}>Strudel {isEmbedded ? 'Mini ' : ''}REPL</h1>
-        </div>
-        <div className="flex">
-          <button
-            onClick={() => {
-              getAudioContext().resume(); // fixes no sound in ios webkit
-              togglePlay();
-            }}
-            className={cx('hover:bg-gray-300', !isEmbedded ? 'p-2' : 'px-2')}
-          >
-            {!pending ? (
-              <span className={cx('flex items-center', isEmbedded ? 'w-16' : 'w-16')}>
-                {cycle.started ? (
-                  <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-                    <path
-                      fillRule="evenodd"
-                      d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z"
-                      clipRule="evenodd"
-                    />
-                  </svg>
-                ) : (
-                  <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
-                    <path
-                      fillRule="evenodd"
-                      d="M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z"
-                      clipRule="evenodd"
-                    />
-                  </svg>
-                )}
-                {cycle.started ? 'pause' : 'play'}
-              </span>
-            ) : (
-              <>loading...</>
-            )}
-          </button>
-          {!isEmbedded && (
+      {!hideHeader && (
+        <header
+          id="header"
+          className={cx(
+            'flex-none w-full px-2 flex border-b border-gray-200  justify-between z-[10] bg-gray-100',
+            isEmbedded ? 'h-8' : 'h-14',
+          )}
+        >
+          <div className="flex items-center space-x-2">
+            <img src={logo} className={cx('Tidal-logo', isEmbedded ? 'w-6 h-6' : 'w-10 h-10')} alt="logo" />
+            <h1 className={isEmbedded ? 'text-l' : 'text-xl'}>Strudel {isEmbedded ? 'Mini ' : ''}REPL</h1>
+          </div>
+          <div className="flex">
            <button
-              className="hover:bg-gray-300 p-2"
-              onClick={async () => {
-                const _code = getRandomTune();
-                console.log('tune', _code); // uncomment this to debug when random code fails
-                setCode(_code);
-                cleanupDraw();
-                cleanupUi();
-                resetLoadedSamples();
-                prebake();
-                const parsed = await evaluate(_code);
-                setPattern(parsed.pattern);
-                setActiveCode(_code);
+              onClick={() => {
+                getAudioContext().resume(); // fixes no sound in ios webkit
+                togglePlay();
              }}
+              className={cx('hover:bg-gray-300', !isEmbedded ? 'p-2' : 'px-2')}
            >
-              🎲 random
+              {!pending ? (
+                <span className={cx('flex items-center', isEmbedded ? 'w-16' : 'w-16')}>
+                  {cycle.started ? (
+                    <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+                      <path
+                        fillRule="evenodd"
+                        d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z"
+                        clipRule="evenodd"
+                      />
+                    </svg>
+                  ) : (
+                    <svg xmlns="http://www.w3.org/2000/svg" className="h-5 w-5" viewBox="0 0 20 20" fill="currentColor">
+                      <path
+                        fillRule="evenodd"
+                        d="M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z"
+                        clipRule="evenodd"
+                      />
+                    </svg>
+                  )}
+                  {cycle.started ? 'pause' : 'play'}
+                </span>
+              ) : (
+                <>loading...</>
+              )}
            </button>
-          )}
-          {!isEmbedded && (
-            <button className={cx('hover:bg-gray-300', !isEmbedded ? 'p-2' : 'px-2')}>
-              <a href="./tutorial">📚 tutorial</a>
-            </button>
-          )}
-          {!isEmbedded && (
            <button
-              className={cx('cursor-pointer hover:bg-gray-300', !isEmbedded ? 'p-2' : 'px-2')}
-              onClick={async () => {
-                const codeToShare = activeCode || code;
-                if (lastShared === codeToShare) {
-                  // alert('Link already generated!');
-                  pushLog(`Link already generated!`);
-                  return;
-                }
-                // generate uuid in the browser
-                const hash = nanoid(12);
-                const { data, error } = await supabase.from('code').insert([{ code: codeToShare, hash }]);
-                if (!error) {
-                  setLastShared(activeCode || code);
-                  const shareUrl = window.location.origin + '?' + hash;
-                  // copy shareUrl to clipboard
-                  navigator.clipboard.writeText(shareUrl);
-                  const message = `Link copied to clipboard: ${shareUrl}`;
-                  // alert(message);
-                  pushLog(message);
-                } else {
-                  console.log('error', error);
-                  const message = `Error: ${error.message}`;
-                  // alert(message);
-                  pushLog(message);
-                }
+              onClick={() => {
+                dirty && activateCode();
+                pushLog('Code updated! Tip: You can also update the code by pressing ctrl+enter.');
              }}
+              className={cx(
+                'hover:bg-gray-300',
+                !isEmbedded ? 'p-2' : 'px-2',
+                !dirty || !activeCode ? 'opacity-50' : '',
+              )}
            >
-              📣 share{lastShared && lastShared === (activeCode || code) ? 'd!' : ''}
+              🔄 update
            </button>
-          )}
-          {isEmbedded && (
-            <button className={cx('hover:bg-gray-300 px-2')}>
-              <a href={window.location.href} target="_blank" rel="noopener noreferrer" title="Open in REPL">
-                🚀 open
-              </a>
-            </button>
-          )}
-          {isEmbedded && (
-            <button className={cx('hover:bg-gray-300 px-2')}>
-              <a
-                onClick={() => {
-                  window.location.href = initialUrl;
-                  window.location.reload();
+            {!isEmbedded && (
+              <button
+                className="hover:bg-gray-300 p-2"
+                onClick={async () => {
+                  const _code = getRandomTune();
+                  // console.log('tune', _code); // uncomment this to debug when random code fails
+                  setCode(_code);
+                  cleanupDraw();
+                  cleanupUi();
+                  resetLoadedSamples();
+                  await prebake(); // declare default samples
+                  const parsed = await evaluate(_code);
+                  setPattern(parsed.pattern);
+                  setActiveCode(_code);
                }}
-                title="Reset"
              >
-                💔 reset
-              </a>
-            </button>
-          )}
-        </div>
-      </header>
+                🎲 random
+              </button>
+            )}
+            {!isEmbedded && (
+              <button className={cx('hover:bg-gray-300', !isEmbedded ? 'p-2' : 'px-2')}>
+                <a href="./tutorial">📚 tutorial</a>
+              </button>
+            )}
+            {!isEmbedded && (
+              <button
+                className={cx('cursor-pointer hover:bg-gray-300', !isEmbedded ? 'p-2' : 'px-2')}
+                onClick={async () => {
+                  const codeToShare = activeCode || code;
+                  if (lastShared === codeToShare) {
+                    // alert('Link already generated!');
+                    pushLog(`Link already generated!`);
+                    return;
+                  }
+                  // generate uuid in the browser
+                  const hash = nanoid(12);
+                  const { data, error } = await supabase.from('code').insert([{ code: codeToShare, hash }]);
+                  if (!error) {
+                    setLastShared(activeCode || code);
+                    const shareUrl = window.location.origin + '?' + hash;
+                    // copy shareUrl to clipboard
+                    navigator.clipboard.writeText(shareUrl);
+                    const message = `Link copied to clipboard: ${shareUrl}`;
+                    // alert(message);
+                    pushLog(message);
+                  } else {
+                    console.log('error', error);
+                    const message = `Error: ${error.message}`;
+                    // alert(message);
+                    pushLog(message);
+                  }
+                }}
+              >
+                📣 share{lastShared && lastShared === (activeCode || code) ? 'd!' : ''}
+              </button>
+            )}
+            {isEmbedded && (
+              <button className={cx('hover:bg-gray-300 px-2')}>
+                <a href={window.location.href} target="_blank" rel="noopener noreferrer" title="Open in REPL">
+                  🚀 open
+                </a>
+              </button>
+            )}
+            {isEmbedded && (
+              <button className={cx('hover:bg-gray-300 px-2')}>
+                <a
+                  onClick={() => {
+                    window.location.href = initialUrl;
+                    window.location.reload();
+                  }}
+                  title="Reset"
+                >
+                  💔 reset
+                </a>
+              </button>
+            )}
+          </div>
+        </header>
+      )}
      <section className="grow flex flex-col text-gray-100">
-        <div className="grow relative flex overflow-auto" id="code">
+        <div className="grow relative flex overflow-auto pb-8 cursor-text" id="code">
          {/* onCursor={markParens} */}
          <CodeMirror value={code} onChange={setCode} onViewChanged={setView} />
-          <span className="z-[20] py-1 px-2 absolute top-0 right-0 text-xs whitespace-pre text-right pointer-events-none">
+          <span className="z-[20] bg-black rounded-t-md py-1 px-2 fixed bottom-0 right-1 text-xs whitespace-pre text-right pointer-events-none">
            {!cycle.started ? `press ctrl+enter to play\n` : dirty ? `ctrl+enter to update\n` : 'no changes\n'}
          </span>
          {error && (
-            <div className={cx('absolute right-2 bottom-2 px-2', 'text-red-500')}>
+            <div
+              className={cx(
+                'rounded-md fixed pointer-events-none left-2 bottom-1 text-xs bg-black px-2 z-[20]',
+                'text-red-500',
+              )}
+            >
              {error?.message || 'unknown error'}
            </div>
          )}
        </div>
-        {!isEmbedded && (
+        {!isEmbedded && !hideConsole && (
          <textarea
            className="z-[10] h-16 border-0 text-xs bg-[transparent] border-t border-slate-600 resize-none"
            value={log}
@@ -1,7 +1,7 @@
 import { Pattern, toMidi } from '@strudel.cycles/core';
 import { samples } from '@strudel.cycles/webaudio';

-export function prebake() {
+export async function prebake({ isMock = false, baseDir = '.' } = {}) {
  samples(
    {
      piano: {
@@ -39,11 +39,13 @@ export function prebake() {
    },
    // https://archive.org/details/SalamanderGrandPianoV3
    // License: CC-by http://creativecommons.org/licenses/by/3.0/ Author: Alexander Holm
-    './piano/',
+    `${baseDir}/piano/`,
  );
-  fetch('EmuSP12.json')
-    .then(res => res.json())
-    .then(json => samples(json, './EmuSP12/'));
+  if (!isMock) {
+    await fetch('EmuSP12.json')
+      .then((res) => res.json())
+      .then((json) => samples(json, `${baseDir}/EmuSP12/`));
+  }
 }

 const maxPan = toMidi('C8');
@@ -52,9 +54,11 @@ const panwidth = (pan, width) => pan * width + (1 - width) / 2;
 Pattern.prototype.piano = function () {
  return this.clip(1)
    .s('piano')
+    .release(0.1)
    .fmap((value) => {
+      const midi = typeof value.note === 'string' ? toMidi(value.note) : value.note;
      // pan by pitch
-      const pan = panwidth(Math.min(toMidi(value.note) / maxPan, 1), 0.5);
+      const pan = panwidth(Math.min(midi / maxPan, 1), 0.5);
      return { ...value, pan: (value.pan || 1) * pan };
    });
 };
@@ -4,7 +4,7 @@

 // import * as tunes from './tunes.mjs';
 import { evaluate } from '@strudel.cycles/eval';
-import { extend } from '@strudel.cycles/eval';
+import { evalScope } from '@strudel.cycles/eval';
 import * as strudel from '@strudel.cycles/core';
 import * as webaudio from '@strudel.cycles/webaudio';
 import controls from '@strudel.cycles/core/controls.mjs';
@@ -123,10 +123,10 @@ const uiHelpersMocked = {
  backgroundImage: id,
 };

-prebake();
+prebake({ isMock: true });

 // TODO: refactor to evalScope
-extend(
+evalScope(
  // Tone,
  strudel,
  strudel.Pattern.prototype.bootstrap(),
@@ -6,11 +6,8 @@ This program is free software: you can redistribute it and/or modify it under th

 import { Tone } from '@strudel.cycles/tone';
 import { State, TimeSpan } from '@strudel.cycles/core';
-import { getPlayableNoteValue } from '@strudel.cycles/core/util.mjs';
 import { evaluate } from '@strudel.cycles/eval';
-import { getDefaultSynth } from '@strudel.cycles/tone';
-
-const defaultSynth = getDefaultSynth();
+import { webaudioOutputTrigger } from '@strudel.cycles/webaudio';

 // this is a test to play back events with as less runtime code as possible..
 // the code asks for the number of seconds to prequery
@@ -47,17 +44,8 @@ async function playStatic(code) {
  events.forEach((event) => {
    Tone.getTransport().schedule((time) => {
      try {
-        const { onTrigger, velocity } = event.context;
-        if (!onTrigger) {
-          if (defaultSynth) {
-            const note = getPlayableNoteValue(event);
-            defaultSynth.triggerAttackRelease(note, event.duration.valueOf(), time, velocity);
-          } else {
-            throw new Error('no defaultSynth passed to useRepl.');
-          }
-        } else {
-          onTrigger(time, event);
-        }
+        const { onTrigger = webaudioOutputTrigger } = event.context;
+        onTrigger(time, event);
      } catch (err) {
        console.warn(err);
        err.message = 'unplayable event: ' + err?.message;
@@ -1,18 +1,14 @@
 import { queryCode, testCycles } from '../runtime.mjs';
-import * as snaps from '../tunes.snapshot.mjs';
 import * as tunes from '../tunes.mjs';
-import { strict as assert } from 'assert';
+import { describe, it } from 'vitest';

-async function testTune(key) {
-  // console.log('test tune', key);
-  const haps = await queryCode(tunes[key], testCycles[key] || 1);
-  assert.deepStrictEqual(haps, snaps[key]);
-}
+const tuneKeys = Object.keys(tunes);

 describe('renders tunes', () => {
-  Object.keys(tunes).forEach((key) => {
-    it(`tune: ${key}`, async () => {
-      await testTune(key);
+  tuneKeys.forEach((key) => {
+    it(`tune: ${key}`, async ({ expect }) => {
+      const haps = await queryCode(tunes[key], testCycles[key] || 1);
+      expect(haps).toMatchSnapshot();
    });
  });
 });
@@ -0,0 +1,164 @@
+export const timeCatMini = `stack(
+  "c3@3 [eb3, g3, [c4 d4]/2]",
+  "c2 g2",
+  "[eb4@5 [f4 eb4 d4]@3] [eb4 c4]/2".slow(8)
+)`;
+
+export const timeCat = `stack(
+  timeCat([3, c3], [1, stack(eb3, g3, seq(c4, d4).slow(2))]),
+  seq(c2, g2),
+  seq(
+    timeCat([5, eb4], [3, seq(f4, eb4, d4)]), 
+    seq(eb4, c4).slow(2)
+  ).slow(4)
+)`;
+
+export const shapeShifted = `stack(
+  seq(
+    e5, [b4, c5], d5, [c5, b4],
+    a4, [a4, c5], e5, [d5, c5],
+    b4, [r, c5], d5, e5,
+    c5, a4, a4, r,
+    [r, d5], [r, f5], a5, [g5, f5],
+    e5, [r, c5], e5, [d5, c5],
+    b4, [b4, c5], d5, e5,
+    c5, a4, a4, r,
+  ).rev(),
+  seq(
+    e2, e3, e2, e3, e2, e3, e2, e3,
+    a2, a3, a2, a3, a2, a3, a2, a3,
+    gs2, gs3, gs2, gs3, e2, e3, e2, e3,
+    a2, a3, a2, a3, a2, a3, b1, c2,
+    d2, d3, d2, d3, d2, d3, d2, d3,
+    c2, c3, c2, c3, c2, c3, c2, c3,
+    b1, b2, b1, b2, e2, e3, e2, e3,
+    a1, a2, a1, a2, a1, a2, a1, a2,
+  ).rev()
+).slow(16)`;
+
+/* export const tetrisWithFunctions = `stack(seq(
+  'e5', seq('b4', 'c5'), 'd5', seq('c5', 'b4'),
+  'a4', seq('a4', 'c5'), 'e5', seq('d5', 'c5'),
+  'b4', seq(r, 'c5'), 'd5', 'e5',
+  'c5', 'a4', 'a4', r,
+  seq(r, 'd5'), seq(r, 'f5'), 'a5', seq('g5', 'f5'),
+  'e5', seq(r, 'c5'), 'e5', seq('d5', 'c5'),
+  'b4', seq('b4', 'c5'), 'd5', 'e5',
+  'c5', 'a4', 'a4', r),
+  seq(
+    'e2', 'e3', 'e2', 'e3', 'e2', 'e3', 'e2', 'e3',
+    'a2', 'a3', 'a2', 'a3', 'a2', 'a3', 'a2', 'a3',
+    'g#2', 'g#3', 'g#2', 'g#3', 'e2', 'e3', 'e2', 'e3',
+    'a2', 'a3', 'a2', 'a3', 'a2', 'a3', 'b1', 'c2',
+    'd2', 'd3', 'd2', 'd3', 'd2', 'd3', 'd2', 'd3',
+    'c2', 'c3', 'c2', 'c3', 'c2', 'c3', 'c2', 'c3',
+    'b1', 'b2', 'b1', 'b2', 'e2', 'e3', 'e2', 'e3',
+    'a1', 'a2', 'a1', 'a2', 'a1', 'a2', 'a1', 'a2',
+  )
+).slow(16)`; */
+
+/* export const tetris = `stack(
+  seq(
+    "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 ~"
+  ),
+  seq(
+    "e2 e3 e2 e3 e2 e3 e2 e3",
+    "a2 a3 a2 a3 a2 a3 a2 a3",
+    "g#2 g#3 g#2 g#3 e2 e3 e2 e3",
+    "a2 a3 a2 a3 a2 a3 b1 c2",
+    "d2 d3 d2 d3 d2 d3 d2 d3",
+    "c2 c3 c2 c3 c2 c3 c2 c3",
+    "b1 b2 b1 b2 e2 e3 e2 e3",
+    "a1 a2 a1 a2 a1 a2 a1 a2",
+  )
+).slow(16)`;
+ */
+
+export const whirlyStrudel = `seq(e4, [b2,  b3], c4)
+.every(4, fast(2))
+.every(3, slow(1.5))
+.fast(cat(1.25, 1, 1.5))
+.every(2, _ => seq(e4, r, e3, d4, r))`;
+
+export const transposedChordsHacked = `stack(
+  "c2 eb2 g2",
+  "Cm7".voicings(['g2','c4']).slow(2)
+).transpose(
+  "<1 2 3 2>".slow(2)
+).transpose(5)`;
+
+export const scaleTranspose = `"f2,f3,c4,ab4"
+.scale(seq('F minor', 'F harmonic minor').slow(4))
+.scaleTranspose("<0 -1 -2 -3>")
+.transpose("0 1".slow(16))`;
+
+export const struct = `stack(
+  "c2 g2 a2 [e2@2 eb2] d2 a2 g2 [d2 ~ db2]",
+  "[C^7 A7] [Dm7 G7]".struct("[x@2 x] [~@2 x] [~ x@2]@2 [x ~@2] ~ [~@2 x@4]@2")
+  .voicings(['G3','A4'])
+).slow(4)`;
+
+export const magicSofa = `stack(
+  "<C^7 F^7 ~> <Dm7 G7 A7 ~>"
+   .every(2, fast(2))
+   .voicings(),
+  "<c2 f2 g2> <d2 g2 a2 e2>"
+).transpose("<0 2 3 4>")`;
+// below doesn't work anymore due to constructor cleanup
+// ).slow(1).transpose.cat(0, 2, 3, 4)`;
+
+export const confusedPhone = `"[g2 ~@1.3] [c3 ~@1.3]"
+.superimpose(
+  transpose(-12).late(0),
+  transpose(7).late(0.1),
+  transpose(10).late(0.2),
+  transpose(12).late(0.3),
+  transpose(24).late(0.4)
+)
+.scale(cat('C dorian', 'C mixolydian'))
+.scaleTranspose("<0 1 2 1>")
+.slow(2)`;
+
+export const technoDrums = `stack(
+  "c1*2".tone(new MembraneSynth().toDestination()),
+  "~ x".tone(new NoiseSynth().toDestination()),
+  "[~ c4]*2".tone(new MetalSynth().set({envelope:{decay:0.06,sustain:0}}).chain(new Gain(0.5),getDestination()))
+)`;
+
+/*
+export const caverave = `const delay = new FeedbackDelay(1/8, .4).chain(vol(0.5), out());
+const kick = new MembraneSynth().chain(vol(.8), out());
+const snare = new NoiseSynth().chain(vol(.8), out());
+const hihat = new MetalSynth().set(adsr(0, .08, 0, .1)).chain(vol(.3).connect(delay),out());
+const bass = new Synth().set({ ...osc('sawtooth'), ...adsr(0, .1, .4) }).chain(lowpass(900), vol(.5), out());
+const keys = new PolySynth().set({ ...osc('sawtooth'), ...adsr(0, .5, .2, .7) }).chain(lowpass(1200), vol(.5), out());
+
+const drums = stack(
+  "c1*2".tone(kick).mask("<x@7 ~>/8"),
+  "~ <x!7 [x@3 x]>".tone(snare).mask("<x@7 ~>/4"),
+  "[~ c4]*2".tone(hihat)
+);
+
+const thru = (x) => x.transpose("<0 1>/8").transpose(-1);
+const synths = stack(
+  "<eb4 d4 c4 b3>/2".scale(timeCat([3,'C minor'],[1,'C melodic minor']).slow(8)).struct("[~ x]*2")
+  .layer(
+    scaleTranspose(0).early(0),
+    scaleTranspose(2).early(1/8),
+    scaleTranspose(7).early(1/4),
+    scaleTranspose(8).early(3/8)
+  ).apply(thru).tone(keys).mask("<~ x>/16"),
+  "<C2 Bb1 Ab1 [G1 [G2 G1]]>/2".struct("[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2".fast(2)).apply(thru).tone(bass),
+  "<Cm7 Bb7 Fm7 G7b13>/2".struct("~ [x@0.1 ~]".fast(2)).voicings().apply(thru).every(2, early(1/8)).tone(keys).mask("<x@7 ~>/8".early(1/4))
+)
+stack(
+  drums.fast(2), 
+  synths
+).slow(2)`; */
@@ -4,88 +4,6 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-export const timeCatMini = `stack(
-  "c3@3 [eb3, g3, [c4 d4]/2]",
-  "c2 g2",
-  "[eb4@5 [f4 eb4 d4]@3] [eb4 c4]/2".slow(8)
-)`;
-
-export const timeCat = `stack(
-  timeCat([3, c3], [1, stack(eb3, g3, seq(c4, d4).slow(2))]),
-  seq(c2, g2),
-  seq(
-    timeCat([5, eb4], [3, seq(f4, eb4, d4)]), 
-    seq(eb4, c4).slow(2)
-  ).slow(4)
-)`;
-
-export const shapeShifted = `stack(
-  seq(
-    e5, [b4, c5], d5, [c5, b4],
-    a4, [a4, c5], e5, [d5, c5],
-    b4, [r, c5], d5, e5,
-    c5, a4, a4, r,
-    [r, d5], [r, f5], a5, [g5, f5],
-    e5, [r, c5], e5, [d5, c5],
-    b4, [b4, c5], d5, e5,
-    c5, a4, a4, r,
-  ).rev(),
-  seq(
-    e2, e3, e2, e3, e2, e3, e2, e3,
-    a2, a3, a2, a3, a2, a3, a2, a3,
-    gs2, gs3, gs2, gs3, e2, e3, e2, e3,
-    a2, a3, a2, a3, a2, a3, b1, c2,
-    d2, d3, d2, d3, d2, d3, d2, d3,
-    c2, c3, c2, c3, c2, c3, c2, c3,
-    b1, b2, b1, b2, e2, e3, e2, e3,
-    a1, a2, a1, a2, a1, a2, a1, a2,
-  ).rev()
-).slow(16)`;
-
-/* export const tetrisWithFunctions = `stack(seq(
-  'e5', seq('b4', 'c5'), 'd5', seq('c5', 'b4'),
-  'a4', seq('a4', 'c5'), 'e5', seq('d5', 'c5'),
-  'b4', seq(r, 'c5'), 'd5', 'e5',
-  'c5', 'a4', 'a4', r,
-  seq(r, 'd5'), seq(r, 'f5'), 'a5', seq('g5', 'f5'),
-  'e5', seq(r, 'c5'), 'e5', seq('d5', 'c5'),
-  'b4', seq('b4', 'c5'), 'd5', 'e5',
-  'c5', 'a4', 'a4', r),
-  seq(
-    'e2', 'e3', 'e2', 'e3', 'e2', 'e3', 'e2', 'e3',
-    'a2', 'a3', 'a2', 'a3', 'a2', 'a3', 'a2', 'a3',
-    'g#2', 'g#3', 'g#2', 'g#3', 'e2', 'e3', 'e2', 'e3',
-    'a2', 'a3', 'a2', 'a3', 'a2', 'a3', 'b1', 'c2',
-    'd2', 'd3', 'd2', 'd3', 'd2', 'd3', 'd2', 'd3',
-    'c2', 'c3', 'c2', 'c3', 'c2', 'c3', 'c2', 'c3',
-    'b1', 'b2', 'b1', 'b2', 'e2', 'e3', 'e2', 'e3',
-    'a1', 'a2', 'a1', 'a2', 'a1', 'a2', 'a1', 'a2',
-  )
-).slow(16)`; */
-
-/* export const tetris = `stack(
-  seq(
-    "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 ~"
-  ),
-  seq(
-    "e2 e3 e2 e3 e2 e3 e2 e3",
-    "a2 a3 a2 a3 a2 a3 a2 a3",
-    "g#2 g#3 g#2 g#3 e2 e3 e2 e3",
-    "a2 a3 a2 a3 a2 a3 b1 c2",
-    "d2 d3 d2 d3 d2 d3 d2 d3",
-    "c2 c3 c2 c3 c2 c3 c2 c3",
-    "b1 b2 b1 b2 e2 e3 e2 e3",
-    "a1 a2 a1 a2 a1 a2 a1 a2",
-  )
-).slow(16)`;
- */
 export const tetrisMini = `\`[[e5 [b4 c5] d5 [c5 b4]]
 [a4 [a4 c5] e5 [d5 c5]]
 [b4 [~ c5] d5 e5]
@@ -104,12 +22,6 @@ export const tetrisMini = `\`[[e5 [b4 c5] d5 [c5 b4]]
 [[a1 a2]*4]\`.slow(16)
 `;

-export const whirlyStrudel = `seq(e4, [b2,  b3], c4)
-.every(4, fast(2))
-.every(3, slow(1.5))
-.fast(cat(1.25, 1, 1.5))
-.every(2, _ => seq(e4, r, e3, d4, r))`;
-
 export const swimming = `stack(
  seq(
    "~",
@@ -222,45 +134,6 @@ export const giantStepsReggae = `stack(
  .struct("x ~".fast(4*8))
 ).slow(25)`;

-export const transposedChordsHacked = `stack(
-  "c2 eb2 g2",
-  "Cm7".voicings(['g2','c4']).slow(2)
-).transpose(
-  "<1 2 3 2>".slow(2)
-).transpose(5)`;
-
-export const scaleTranspose = `"f2,f3,c4,ab4"
-.scale(seq('F minor', 'F harmonic minor').slow(4))
-.scaleTranspose("<0 -1 -2 -3>")
-.transpose("0 1".slow(16))`;
-
-export const struct = `stack(
-  "c2 g2 a2 [e2@2 eb2] d2 a2 g2 [d2 ~ db2]",
-  "[C^7 A7] [Dm7 G7]".struct("[x@2 x] [~@2 x] [~ x@2]@2 [x ~@2] ~ [~@2 x@4]@2")
-  .voicings(['G3','A4'])
-).slow(4)`;
-
-export const magicSofa = `stack(
-  "<C^7 F^7 ~> <Dm7 G7 A7 ~>"
-   .every(2, fast(2))
-   .voicings(),
-  "<c2 f2 g2> <d2 g2 a2 e2>"
-).transpose("<0 2 3 4>")`;
-// below doesn't work anymore due to constructor cleanup
-// ).slow(1).transpose.cat(0, 2, 3, 4)`;
-
-export const confusedPhone = `"[g2 ~@1.3] [c3 ~@1.3]"
-.superimpose(
-  transpose(-12).late(0),
-  transpose(7).late(0.1),
-  transpose(10).late(0.2),
-  transpose(12).late(0.3),
-  transpose(24).late(0.4)
-)
-.scale(cat('C dorian', 'C mixolydian'))
-.scaleTranspose("<0 1 2 1>")
-.slow(2)`;
-
 export const zeldasRescue = `stack(
  // melody
  \`[B3@2 D4] [A3@2 [G3 A3]] [B3@2 D4] [A3] 
@@ -276,79 +149,46 @@ export const zeldasRescue = `stack(
  [[B1 D3] G3@2] [[Bb1 Db3] G3@2] [[A1 C3] G3@2] [[D2 C3] F#3@2]
  [[F2 C3] E3@2] [[E2 B2] D3@2] [[D2 A2] C3@2] [[C2 G2] B2@2]
  [[F2 C3] E3@2] [[E2 B2] D3@2] [[Eb2 Bb2] Db3@2] [[D2 A2] C3 [F3,G2]]\`
-).transpose(12).slow(48).tone(
-  new PolySynth().chain(
-    new Gain(0.3), 
-    new Chorus(2, 2.5, 0.5).start(), 
-    new Freeverb(), 
-    getDestination())
-)`;
+).transpose(12).slow(48)
+  .superimpose(x=>x.add(0.06)) // add slightly detuned voice
+  .note()
+  .gain(.1)
+  .s('triangle')
+  .room(1)
+  `;

-export const technoDrums = `stack(
-  "c1*2".tone(new MembraneSynth().toDestination()),
-  "~ x".tone(new NoiseSynth().toDestination()),
-  "[~ c4]*2".tone(new MetalSynth().set({envelope:{decay:0.06,sustain:0}}).chain(new Gain(0.5),getDestination()))
-)`;
-
-export const caverave = `const delay = new FeedbackDelay(1/8, .4).chain(vol(0.5), out());
-const kick = new MembraneSynth().chain(vol(.8), out());
-const snare = new NoiseSynth().chain(vol(.8), out());
-const hihat = new MetalSynth().set(adsr(0, .08, 0, .1)).chain(vol(.3).connect(delay),out());
-const bass = new Synth().set({ ...osc('sawtooth'), ...adsr(0, .1, .4) }).chain(lowpass(900), vol(.5), out());
-const keys = new PolySynth().set({ ...osc('sawtooth'), ...adsr(0, .5, .2, .7) }).chain(lowpass(1200), vol(.5), out());
+export const caverave = `const keys = x => x.s('sawtooth').cutoff(1200).gain(.5).attack(0).decay(.16).sustain(.3).release(.1);

 const drums = stack(
-  "c1*2".tone(kick).mask("<x@7 ~>/8"),
-  "~ <x!7 [x@3 x]>".tone(snare).mask("<x@7 ~>/4"),
-  "[~ c4]*2".tone(hihat)
+  s("bd*2").mask("<x@7 ~>/8").gain(.8),
+  s("~ <sd!7 [sd@3 ~]>").mask("<x@7 ~>/4").gain(.5),
+  s("[~ hh]*2").delay(.3).delayfeedback(.5).delaytime(.125).gain(.4)
 );

 const thru = (x) => x.transpose("<0 1>/8").transpose(-1);
 const synths = stack(
-  "<eb4 d4 c4 b3>/2".scale(timeCat([3,'C minor'],[1,'C melodic minor']).slow(8)).struct("[~ x]*2")
+  "<eb4 d4 c4 b3>/2".scale(timeCat([3,'C minor'],[1,'C melodic minor'])
+  .slow(8)).struct("[~ x]*2")
  .layer(
    scaleTranspose(0).early(0),
    scaleTranspose(2).early(1/8),
    scaleTranspose(7).early(1/4),
    scaleTranspose(8).early(3/8)
-  ).apply(thru).tone(keys).mask("<~ x>/16"),
-  "<C2 Bb1 Ab1 [G1 [G2 G1]]>/2".struct("[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2".fast(2)).apply(thru).tone(bass),
-  "<Cm7 Bb7 Fm7 G7b13>/2".struct("~ [x@0.1 ~]".fast(2)).voicings().apply(thru).every(2, early(1/8)).tone(keys).mask("<x@7 ~>/8".early(1/4))
+  ).apply(thru).note().apply(keys).mask("<~ x>/16"),
+  note("<C2 Bb1 Ab1 [G1 [G2 G1]]>/2".apply(thru))
+  .struct("[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2".fast(2))
+  .s('sawtooth').attack(0.001).decay(0.2).sustain(1).cutoff(500),
+  "<Cm7 Bb7 Fm7 G7b13>/2".struct("~ [x@0.2 ~]".fast(2)).voicings()
+  .apply(thru).every(2, early(1/8)).note().apply(keys).sustain(0)
+  .delay(.4).delaytime(.12)
+  .mask("<x@7 ~>/8".early(1/4))
 )
 stack(
  drums.fast(2), 
  synths
 ).slow(2)`;

-export const callcenterhero = `const bpm = 90;
-const lead = polysynth().set({...osc('sine4'),...adsr(.004)}).chain(vol(0.15),out())
-const bass = fmsynth({...osc('sawtooth6'),...adsr(0.05,.6,0.8,0.1)}).chain(vol(0.6), out());
-const s = scale(cat('F3 minor', 'Ab3 major', 'Bb3 dorian', 'C4 phrygian dominant').slow(4));
-stack(
-  "0 2".struct("<x ~> [x ~]").apply(s).scaleTranspose(stack(0,2)).tone(lead),
-  "<6 7 9 7>".struct("[~ [x ~]*2]*2").apply(s).scaleTranspose("[0,2] [2,4]".fast(2).every(4,rev)).tone(lead),
-	"-14".struct("[~ x@0.8]*2".early(0.01)).apply(s).tone(bass),
-  "c2*2".tone(membrane().chain(vol(0.6), out())),
-  "~ c2".tone(noise().chain(vol(0.2), out())),
-  "c4*4".tone(metal(adsr(0,.05,0)).chain(vol(0.03), out()))
-)
-.slow(120 / bpm)`;
-
-export const primalEnemy = `const f = fast("<1 <2 [4 8]>>");
-stack(
-  "c3,g3,c4".struct("[x ~]*2").apply(f).transpose("<0 <3 [5 [7 [9 [11 13]]]]>>"),
-  "c2 [c2 ~]*2".tone(synth(osc('sawtooth8')).chain(vol(0.8),out())),
-  "c1*2".tone(membrane().chain(vol(0.8),out()))
-).slow(1)`;
-
-export const synthDrums = `stack(
-  "c1*2".tone(membrane().chain(vol(0.8),out())),
-  "~ c3".tone(noise().chain(vol(0.8),out())),
-  "c3*4".transpose("[-24 0]*2").tone(metal(adsr(0,.015)).chain(vol(0.8),out()))
-)
-`;
-
-export const sampleDrums = `const drums = await players({
+export const sampleDrums = `samples({
  bd: 'bd/BT0A0D0.wav',
  sn: 'sn/ST0T0S3.wav',
  hh: 'hh/000_hh3closedhh.wav'
@@ -358,9 +198,11 @@ stack(
  "<bd!3 bd(3,4,2)>",
  "hh*4",
  "~ <sn!3 sn(3,4,1)>"
-).tone(drums.chain(out()))
+).s()
 `;

+// TODO:
+/*
 export const xylophoneCalling = `const t = x => x.scaleTranspose("<0 2 4 3>/4").transpose(-2)
 const s = x => x.scale(cat('C3 minor pentatonic','G3 minor pentatonic').slow(4))
 const delay = new FeedbackDelay(1/8, .6).chain(vol(0.1), out());
@@ -397,7 +239,10 @@ stack(
  "c3*4".transpose("[-24 0]*2").tone(metal(adsr(0,.02)).chain(vol(0.5).connect(delay),out()))
 ).slow(1)
 // strudel disable-highlighting`;
+*/

+// TODO:
+/*
 export const sowhatelse = `// mixer
 const mix = (key) => vol({
  chords: .2,
@@ -434,6 +279,7 @@ stack(
  "[2,4]/4".scale('D dorian').apply(t).tone(instr('pad')).mask("<x x x ~>/8")
 ).fast(6/8)
 // strudel disable-highlighting`;
+*/

 export const barryHarris = `backgroundImage(
  'https://media.npr.org/assets/img/2017/02/03/barryharris_600dpi_wide-7eb49998aa1af377d62bb098041624c0a0d1a454.jpg',
@@ -444,18 +290,14 @@ export const barryHarris = `backgroundImage(
  .scale('C bebop major')
  .transpose("<0 1 2 1>/8")
  .slow(2)
-  .note().piano().out()
+  .note().piano()
 `;

-export const blippyRhodes = `const delay = new FeedbackDelay(1/12, .4).chain(vol(0.3), out());
-
-const drums = await players({
+export const blippyRhodes = `samples({
  bd: 'samples/tidal/bd/BT0A0D0.wav',
  sn: 'samples/tidal/sn/ST0T0S3.wav',
-  hh: 'samples/tidal/hh/000_hh3closedhh.wav'
-}, 'https://loophole-letters.vercel.app/')
-
-const rhodes = await sampler({
+  hh: 'samples/tidal/hh/000_hh3closedhh.wav',
+  rhodes: {
  E1: 'samples/rhodes/MK2Md2000.mp3',
  E2: 'samples/rhodes/MK2Md2012.mp3',
  E3: 'samples/rhodes/MK2Md2024.mp3',
@@ -463,33 +305,37 @@ const rhodes = await sampler({
  E5: 'samples/rhodes/MK2Md2048.mp3',
  E6: 'samples/rhodes/MK2Md2060.mp3',
  E7: 'samples/rhodes/MK2Md2072.mp3'
+  }
 }, 'https://loophole-letters.vercel.app/')

 const bass = synth(osc('sawtooth8')).chain(vol(.5),out())
 const scales = cat('C major', 'C mixolydian', 'F lydian', ['F minor', cat('Db major','Db mixolydian')])

 stack(
-  "<bd sn> <hh hh*2 hh*3>"
-  .tone(drums.chain(out())),
+  s("<bd sn> <hh hh*2 hh*3>"),
  "<g4 c5 a4 [ab4 <eb5 f5>]>"
  .scale(scales)
  .struct("x*8")
  .scaleTranspose("0 [-5,-2] -7 [-9,-2]")
  .legato(.3)
  .slow(2)
-  .tone(rhodes.chain(vol(0.5).connect(delay), out())),
-  //"<C^7 C7 F^7 [Fm7 <Db^7 Db7>]>".slow(2).voicings().struct("~ x").legato(.25).tone(rhodes),
+  .note()
+  .s('rhodes')
+  .clip(1)
+  .room(.5)
+  .delay(.3)
+  .delayfeedback(.4)
+  .delaytime(1/12).gain(.5),
  "<c2 c3 f2 [[F2 C2] db2]>"
  .legato("<1@3 [.3 1]>")
-  .slow(2)
-  .tone(bass),
+  .slow(2).superimpose(x=>x.add(.02))
+  .note().gain(.3)
+  .s('sawtooth').cutoff(600),
 ).fast(3/2)`;

-export const wavyKalimba = `const delay = new FeedbackDelay(1/3, .5).chain(vol(.2), out())
-let kalimba = await sampler({
-  C5: 'https://freesound.org/data/previews/536/536549_11935698-lq.mp3'
+export const wavyKalimba = `samples({
+  'kalimba': { c5:'https://freesound.org/data/previews/536/536549_11935698-lq.mp3' }
 })
-kalimba = kalimba.chain(vol(0.6).connect(delay),out());
 const scales = cat('C major', 'C mixolydian', 'F lydian', ['F minor', 'Db major'])

 stack(
@@ -498,8 +344,7 @@ stack(
  .scale(scales)
  .struct("x*8")
  .velocity("<.8 .3 .6>*8")
-  .slow(2)
-  .tone(kalimba),
+  .slow(2),
  "<c2 c2 f2 [[F2 C2] db2]>"
  .scale(scales)
  .scaleTranspose("[0 <2 4>]*2")
@@ -507,11 +352,17 @@ stack(
  .velocity("<.8 .5>*4")
  .velocity(0.8)
  .slow(2)
-  .tone(kalimba)
 )
  .legato("<.4 .8 1 1.2 1.4 1.6 1.8 2>/8")
-  .fast(1)`;
+  .fast(1)
+  .note()
+  .clip(1)
+  .s('kalimba')
+  .delay(.2)
+  `;

+// TODO: rework tune to use freq
+/*
 export const jemblung = `const delay = new FeedbackDelay(1/8, .6).chain(vol(0.15), out());
 const snare = noise({type:'white',...adsr(0,0.2,0)}).chain(lowpass(5000),vol(1.8),out());
 const s = polysynth().set({...osc('sawtooth4'),...adsr(0.01,.2,.6,0.2)}).chain(vol(.23).connect(delay),out());
@@ -538,20 +389,7 @@ stack(
  // hihat
  "c2*8".tone(noise().chain(highpass(6000),vol(0.5).connect(delay),out())),
 ).slow(3)`;
-
-export const risingEnemy = `stack(
-  "2,6"
-    .scale('F3 dorian')
-    .transpose(sine2.struct("x*64").slow(4).mul(2).round())
-    .fast(2)
-    .struct("x x*3")
-    .legato(".9 .3"),
-  "0@3 -3*3".legato(".95@3 .4").scale('F2 dorian')
-)
-  .transpose("<0 1 2 1>/2".early(0.5))
-  .transpose(5)
-  .fast(2 / 3)
-  .note().piano().out()`;
+*/

 export const festivalOfFingers = `const chords = "<Cm7 Fm7 G7 F#7>";
 stack(
@@ -563,21 +401,7 @@ stack(
  .scaleTranspose("0 4 0 6".early(".125 .5")).layer(scaleTranspose("0,<2 [4,6] [5,7]>/4"))
 ).slow(2)
 .velocity(sine.struct("x*8").add(3/5).mul(2/5).fast(8))
- .note().piano().out()`;
-
-export const festivalOfFingers2 = `const chords =       "<Cm7       Fm7        G7         F#7            >";
-const scales = cat('C minor','F dorian','G dorian','F# mixolydian')
-stack(
-  chords.voicings().struct("x(3,8,-1)").velocity(.5).off(1/7,x=>x.transpose(12).velocity(.2)),
-  chords.rootNotes(2).struct("x(4,8)"),
-  chords.rootNotes(4)
-  .scale(scales)
-  .struct("x(3,8,-2)".fast(2))
-  .scaleTranspose("0 4 0 6".early(".125 .5")).layer(scaleTranspose("0,<2 [4,6] [5,7]>/3"))
-).slow(2).transpose(-1)            
- .legato(cosine.struct("x*8").add(4/5).mul(4/5).fast(8))
- .velocity(sine.struct("x*8").add(3/5).mul(2/5).fast(8))
- .note().piano().out().fast(3/4)`;
+ .note().piano()`;

 // iter, echo, echoWith
 export const undergroundPlumber = `backgroundImage('https://images.nintendolife.com/news/2016/08/video_exploring_the_funky_inspiration_for_the_super_mario_bros_underground_theme/large.jpg',{ className:'darken' })
@@ -601,7 +425,7 @@ stack(
  .echoWith(4, 1/8, (x,n)=>x.transpose(n*12).velocity(Math.pow(.4,n)))
  .legato(.1)
  .layer(h).note()
-).out()
+)
  .fast(2/3)
  .pianoroll({})`;

@@ -620,7 +444,7 @@ stack(
  ).transpose(-1).note().piano(),
  s("mad").slow(2)
 ).cpm(78).slow(4)
-  .out()
+  
  .pianoroll()
 `;

@@ -639,7 +463,7 @@ stack(
  .scale(scale)
 .scaleTranspose("<0>".slow(4))
 .transpose(5)
-.note().piano().out()
+.note().piano()
 .velocity(.8)
 .slow(2)
 .pianoroll({maxMidi:100,minMidi:20})`;
@@ -651,7 +475,7 @@ export const echoPiano = `"<0 2 [4 6](3,4,1) 3*2>"
 .off(1/2, x=>x.scaleTranspose(6).color('steelblue'))
 .legato(.5)
 .echo(4, 1/8, .5)
-.note().piano().out()
+.note().piano()
 .pianoroll()`;

 export const sml1 = `
@@ -687,8 +511,10 @@ stack(
  f3!2 e3!2 ab3!2 ~!2
  >\`
  .legato(.5)
-).fast(2) // .note().piano().out()`;
+).fast(2) // .note().piano()`;

+/*
+// TODO: does not work on linux (at least for me..)
 export const speakerman = `backgroundImage('https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fi.ytimg.com%2Fvi%2FXR0rKqW3VwY%2Fmaxresdefault.jpg&f=1&nofb=1', 
 { className:'darken', style:'background-size:cover'})
 stack(
@@ -708,48 +534,29 @@ stack(
  'got to keep on running',
  ).speak("en zu en".slow(12), "<0 2 3 4 5 6>".slow(2)),
 ).slow(4)`;
+*/

-export const randomBells = `const delay = new FeedbackDelay(1/3, .8).chain(vol(.2), out());
-let bell = await sampler({
-  C6: 'https://freesound.org/data/previews/411/411089_5121236-lq.mp3'
+export const randomBells = `samples({
+  bell: { c6: 'https://freesound.org/data/previews/411/411089_5121236-lq.mp3' },
+  bass: { d2: 'https://freesound.org/data/previews/608/608286_13074022-lq.mp3' }
 })
-const bass = await sampler({
-  d2: 'https://freesound.org/data/previews/608/608286_13074022-lq.mp3'
-});
-bell = bell.chain(vol(0.6).connect(delay),out());

-"0".euclidLegato(3,8)
+stack(
+  // bells
+  "0".euclidLegato(3,8)
  .echo(3, 1/16, .5)
  .add(rand.range(0,12))
  .velocity(rand.range(.5,1))
  .legato(rand.range(.4,3))
-  .scale(cat('D minor pentatonic')).tone(bell)
-  .stack("<D2 A2 G2 F2>".euclidLegato(6,8,1).tone(bass.toDestination()))
-  .slow(6)
-  .pianoroll({minMidi:20,maxMidi:120,background:'transparent'})`;
-
-/* export const waa = `n("a4 [a3 c3] a3 c3")
-.sub("<7 12>/2")
-.off(1/8, add("12"))
-.off(1/4, add("7"))
-.legato(.5)
-.slow(2)
-.wave("sawtooth square")
-.filter('lowpass', "<2000 1000 500>")
-.out()`; */
-
-export const waa = `n(
-  "a4 [a3 c3] a3 c3"
-  .sub("<7 12>/2")
-  .off(1/8, add("12"))
-  .off(1/4, add("7"))
+  .scale(cat('D minor pentatonic')).note()
+  .s('bell').gain(.6).delay(.2).delaytime(1/3).delayfeedback(.8),
+  // bass
+  "<D2 A2 G2 F2>".euclidLegato(6,8,1).note().s('bass').clip(1).gain(.8)
 )
-  .legato(.5)
-  .slow(2)
-  .s("sawtooth square")
-  .cutoff("<2000 1000 500>")
-  .out()
-`;
+  .slow(6)
+  
+  .pianoroll({minMidi:20,maxMidi:120,background:'transparent'})
+  `;

 export const waa2 = `n(
  "a4 [a3 c3] a3 c3"
@@ -761,7 +568,9 @@ export const waa2 = `n(
  .legato(sine.range(0.3, 2).slow(28))
  .s("sawtooth square".fast(2))
  .cutoff(cosine.range(500,4000).slow(16))
-  .out()`;
+  .gain(.5)
+  .room(.5)
+  `;

 export const hyperpop = `const lfo = cosine.slow(15);
 const lfo2 = sine.slow(16);
@@ -769,7 +578,7 @@ const filter1 = x=>x.cutoff(lfo2.range(300,3000));
 const filter2 = x=>x.hcutoff(lfo.range(1000,6000)).cutoff(4000)
 const scales = cat('D3 major', 'G3 major').slow(8)

-const drums = await players({
+samples({
  bd: '344/344757_1676145-lq.mp3',
  sn: '387/387186_7255534-lq.mp3',
  hh: '561/561241_12517458-lq.mp3',
@@ -803,15 +612,13 @@ stack(
  .gain(sine.range(.1,.4).slow(8))
  .attack(.001).decay(.2).sustain(0)
  .apply(filter2)
-).out().stack(
+).stack(
  stack(
    "bd <~@7 [~ bd]>".fast(2),
    "~ sn",
    "[~ hh3]*2"
-  ).tone(drums.chain(vol(.18),out())).fast(2)
+  ).s().fast(2).gain(.7)
 ).slow(2)
-  
-//.pianoroll({minMidi:20, maxMidi:160})
 // strudel disable-highlighting`;

 export const festivalOfFingers3 = `"[-7*3],0,2,6,[8 7]"
@@ -827,7 +634,7 @@ export const festivalOfFingers3 = `"[-7*3],0,2,6,[8 7]"
 .scale(cat('D dorian','G mixolydian','C dorian','F mixolydian'))
 .legato(1)
 .slow(2)
-.note().piano().out()
+.note().piano()
 //.pianoroll({maxMidi:160})`;

 export const bossa = `
@@ -835,8 +642,8 @@ const scales = sequence('C minor', ['D locrian', 'G phrygian'], 'Bb2 minor', ['C
 stack(
  "<Cm7 [Dm7b5 G7b9] Bbm7 [Cm7b5 F7b9]>".fast(2).struct("x ~ x@3 x ~ x ~ ~ ~ x ~ x@3".late(1/8)).early(1/8).slow(2).voicings(),
  "[~ [0 ~]] 0 [~ [4 ~]] 4".sub(7).restart(scales).scale(scales).early(.25)
-).note().piano().out().slow(2)`;
-
+).note().piano().slow(2)`;
+/* 
 export const customTrigger = `stack(
  freq("55 [110,165] 110 [220,275]".mul("<1 <3/4 2/3>>").struct("x(3,8)").layer(x=>x.mul("1.006,.995"))),
  freq("440(5,8)".legato(.18).mul("<1 3/4 2 2/3>")).gain(perlin.range(.2,.8))
@@ -854,17 +661,7 @@ export const customTrigger = `stack(
  o.connect(master);
  o.start(t);
  o.stop(t + hap.duration);
-}).stack(s("bd(3,8),hh*4,~ sd").webdirt())`;
-
-export const bornagain = `stack(
-  freq("55 [110,165] 110 [220,275]".mul("<1 <3/4 2/3>>").struct("x(3,8)")
-       .layer(x=>x.mul("1.006,.995"))), // detune
-  freq("440(5,8)".legato(.18).mul("<1 3/4 2 2/3>")).gain(perlin.range(.2,.8))
-).s("<sawtooth square>/2")
-  .cutoff(perlin.range(100,4000).slow(4))
-  .jux(rev)
-  .out()
-  .stack(s("bd(3,8),hh*4,~ sd").webdirt())`;
+}).stack(s("bd(3,8),hh*4,~ sd").webdirt())`; */

 export const meltingsubmarine = `samples({
  bd: ['bd/BT0AADA.wav','bd/BT0AAD0.wav','bd/BT0A0DA.wav','bd/BT0A0D3.wav','bd/BT0A0D0.wav','bd/BT0A0A7.wav'],
@@ -904,7 +701,7 @@ stack(
  .echoWith(4,.125,(x,n)=>x.gain(.15*1/(n+1))) // echo notes
  //.hush()
 )
-  .out()
+  
  .slow(3/2)`;

 export const swimmingWithSoundfonts = `stack(
@@ -966,7 +763,7 @@ export const swimmingWithSoundfonts = `stack(
      "[G2 C2 F2 F2]"
    ).s('Acoustic Bass: Bass')
  ).slow(51)
-    .out()`;
+    `;

 export const outroMusic = `samples({
  bd: ['bd/BT0AADA.wav','bd/BT0AAD0.wav','bd/BT0A0DA.wav','bd/BT0A0D3.wav','bd/BT0A0D0.wav','bd/BT0A0A7.wav'],
@@ -993,7 +790,7 @@ export const outroMusic = `samples({
    .n(3).color('gray')
  ).slow(3/2)
  //.pianoroll({autorange:1,vertical:1,fold:0})
-  .out()`;
+  `;

 export const bassFuge = `samples({ flbass: ['00_c2_finger_long_neck.wav','01_c2_finger_short_neck.wav','02_c2_finger_long_bridge.wav','03_c2_finger_short_bridge.wav','04_c2_pick_long.wav','05_c2_pick_short.wav','06_c2_palm_mute.wav'] }, 
  'github:cleary/samples-flbass/main/')
@@ -1017,5 +814,46 @@ x=>x.add(7).color('steelblue')
 //.hcutoff(400)
 .clip(1)
 .stack(s("bd:1*2,~ sd:0,[~ hh:0]*2"))
-.out()
+
 .pianoroll({vertical:1})`;
+
+export const bossaRandom = `const chords = "<Am7 Am7 Dm7 E7>"
+const roots = chords.rootNotes(2)
+
+stack(
+  chords.voicings(['F4', 'A5']).struct(
+  \` x@2   ~ x ~ ~ ~ x |
+    x?  ~ ~ x@3   ~ x |
+    x?  ~ ~ x ~ x@3\`),
+  roots.struct("x [~ x?0.2] x [~ x?] | x!4 | x@2 ~ ~ ~ x x x").transpose("0 7")
+).slow(2).pianoroll().note().piano()`;
+
+export const chop = `samples({ p: 'https://cdn.freesound.org/previews/648/648433_11943129-lq.mp3' })
+
+s("p")
+  .loopAt(32,1)
+  .chop(128)
+  .jux(rev)
+  .shape(.4)
+  .decay(.1)
+  .sustain(.6)
+  `;
+
+export const delay = `stack(
+    s("bd <sd cp>")
+    .delay("<0 .5>")
+    .delaytime(".16 | .33")
+    .delayfeedback(".6 | .8")
+  ).sometimes(x=>x.speed("-1"))`;
+
+export const orbit = `stack(
+    s("bd <sd cp>")
+    .delay(.5)
+    .delaytime(.33)
+    .delayfeedback(.6),
+    s("hh*2")
+    .delay(.8)
+    .delaytime(.08)
+    .delayfeedback(.7)
+    .orbit(2)
+  ).sometimes(x=>x.speed("-1"))`;
@@ -1,10 +1,15 @@
 import { defineConfig } from 'vite';
 import react from '@vitejs/plugin-react';
+import { visualizer } from 'rollup-plugin-visualizer';

 // https://vitejs.dev/config/
 export default defineConfig({
  plugins: [react()],
  build: {
    outDir: '../out',
+    sourcemap: false,
+    rollupOptions: {
+      plugins: [visualizer({ template: 'treemap' })],
+    },
  },
 });
@@ -1,19 +1,14 @@
-import { Tone } from '@strudel.cycles/tone';
 import { evalScope } from '@strudel.cycles/eval';
 import { MiniRepl as _MiniRepl } from '@strudel.cycles/react';
 import controls from '@strudel.cycles/core/controls.mjs';
-import * as WebDirt from 'WebDirt';
-import { loadWebDirt } from '@strudel.cycles/webdirt';
+import { samples } from '@strudel.cycles/webaudio';
+import { prebake } from '../repl/src/prebake.mjs';

-export const defaultSynth = new Tone.PolySynth().chain(new Tone.Gain(0.5), Tone.Destination).set({
-  oscillator: { type: 'triangle' },
-  envelope: {
-    release: 0.01,
-  },
-});
+fetch('https://strudel.tidalcycles.org/EmuSP12.json')
+  .then((res) => res.json())
+  .then((json) => samples(json, 'https://strudel.tidalcycles.org/EmuSP12/'));

 evalScope(
-  Tone,
  controls,
  import('@strudel.cycles/core'),
  import('@strudel.cycles/tone'),
@@ -23,14 +18,10 @@ evalScope(
  import('@strudel.cycles/xen'),
  import('@strudel.cycles/webaudio'),
  import('@strudel.cycles/osc'),
-  import('@strudel.cycles/webdirt'),
 );

-loadWebDirt({
-  sampleMapUrl: '../EmuSP12.json',
-  sampleFolder: '../EmuSP12',
-});
+prebake();

 export function MiniRepl({ tune }) {
-  return <_MiniRepl tune={tune} defaultSynth={defaultSynth} hideOutsideView={true} />;
+  return <_MiniRepl tune={tune} hideOutsideView={true} />;
 }
@@ -13,9 +13,9 @@ import '@strudel.cycles/react/dist/style.css';

 ReactDOM.render(
  <React.StrictMode>
-    <div className="min-h-screen">
-      <header className="flex-none flex justify-start sticky top-0 z-[2] w-full h-16 px-2 items-center border-b border-gray-200 bg-white">
-        <div className="p-4 w-full flex justify-between">
+    <div className="min-h-screen bg-slate-900">
+      <header className="flex-none flex justify-start sticky top-0 z-[2] w-full h-16 px-2 items-center border-b border-slate-500 text-white bg-slate-900 z-[100]">
+        <div className="p-4 w-full flex justify-between items-center">
          <div className="flex items-center space-x-2">
            <img src={'https://tidalcycles.org/img/logo.svg'} className="Tidal-logo w-10 h-10" alt="logo" />
            <h1 className="text-xl cursor-pointer" onClick={() => window.scrollTo(0, 0)}>
@@ -23,15 +23,14 @@ ReactDOM.render(
            </h1>
          </div>
          {!window.location.href.includes('localhost') && (
-            <div className="flex space-x-4">
+            <div className="flex space-x-4 text-slate-200">
              <a href="../">go to REPL</a>
            </div>
          )}
        </div>
      </header>
-      <main className="p-4 pl-6 max-w-3xl prose">
+      <main className="p-4 pl-6 max-w-3xl prose prose-invert">
        <Tutorial />
-        {/*         <ApiDoc /> */}
      </main>
    </div>
  </React.StrictMode>,
@@ -0,0 +1,152 @@
+# Old APIs
+
+These APIs are outdated and might break in the future.
+
+## Webdirt API (deprecated)
+
+You can use the powerful sampling engine [Webdirt](https://github.com/dktr0/WebDirt) with Strudel.
+
+{{ 'Pattern.webdirt' | jsdoc }}
+
+<br />
+<br />
+
+## Tone API (deprecated)
+
+The Tone API uses Tone.js instruments ands effects to create sounds.
+
+<MiniRepl
+  tune={`stack(
+    "[c5 c5 bb4 c5] [~ g4 ~ g4] [c5 f5 e5 c5] ~"
+      .tone(synth(adsr(0,.1,0,0)).chain(out())),
+    "[c2 c3]*8"
+      .tone(synth({
+        ...osc('sawtooth'),
+        ...adsr(0,.1,0.4,0)
+      }).chain(lowpass(300), out()))
+  ).slow(4)`}
+/>
+
+### tone(instrument)
+
+To change the instrument of a pattern, you can pass any [Tone.js Source](https://tonejs.github.io/docs/14.7.77/index.html) to .tone:
+
+<MiniRepl
+  tune={`"[c4 c4 bb3 c4] [~ g3 ~ g3] [c4 f4 e4 c4] ~".slow(4)
+.tone(new FMSynth().toDestination())`}
+/>
+
+While this works, it is a little bit verbose. To simplify things, all Tone Synths have a shortcut:
+
+```js
+const amsynth = (options) => new AMSynth(options);
+const duosynth = (options) => new DuoSynth(options);
+const fmsynth = (options) => new FMSynth(options);
+const membrane = (options) => new MembraneSynth(options);
+const metal = (options) => new MetalSynth(options);
+const monosynth = (options) => new MonoSynth(options);
+const noise = (options) => new NoiseSynth(options);
+const pluck = (options) => new PluckSynth(options);
+const polysynth = (options) => new PolySynth(options);
+const synth = (options) => new Synth(options);
+const sampler = (options, baseUrl?) => new Sampler(options); // promisified, see below
+const players = (options, baseUrl?) => new Sampler(options); // promisified, see below
+```
+
+### sampler
+
+With sampler, you can create tonal instruments from samples:
+
+<MiniRepl
+  tune={`sampler({
+  C5: 'https://freesound.org/data/previews/536/536549_11935698-lq.mp3'
+}).then(kalimba => 
+  saw.struct("x*8").mul(16).round()
+  .legato(4).scale('D dorian').slow(2)
+  .tone(kalimba.toDestination())
+)`}
+/>
+
+The sampler function promisifies [Tone.js Sampler](https://tonejs.github.io/docs/14.7.77/Sampler).
+
+Note that this function currently only works with this promise notation, but in the future,
+it will be possible to use async instruments in a synchronous fashion.
+
+### players
+
+With players, you can create sound banks:
+
+<MiniRepl
+  tune={`players({
+    bd: 'samples/tidal/bd/BT0A0D0.wav',
+    sn: 'samples/tidal/sn/ST0T0S3.wav',
+    hh: 'samples/tidal/hh/000_hh3closedhh.wav'
+  }, 'https://loophole-letters.vercel.app/')
+  .then(drums=>
+  "bd hh sn hh".tone(drums.toDestination())
+)
+  `}
+/>
+
+The sampler function promisifies [Tone.js Players](https://tonejs.github.io/docs/14.7.77/Players).
+
+Note that this function currently only works with this promise notation, but in the future,
+it will be possible to use async instruments in a synchronous fashion.
+
+### out
+
+Shortcut for Tone.Destination. Intended to be used with Tone's .chain:
+
+<MiniRepl
+  tune={`"[c4 c4 bb3 c4] [~ g3 ~ g3] [c4 f4 e4 c4] ~".slow(4)
+.tone(membrane().chain(out()))`}
+/>
+
+This alone is not really useful, so read on..
+
+### vol(volume)
+
+Helper that returns a Gain Node with the given volume. Intended to be used with Tone's .chain:
+
+<MiniRepl
+  tune={`"[c4 c4 bb3 c4] [~ g3 ~ g3] [c4 f4 e4 c4] ~".slow(4)
+.tone(noise().chain(vol(0.5), out()))`}
+/>
+
+### osc(type)
+
+Helper to set the waveform of a synth, monosynth or polysynth:
+
+<MiniRepl
+  tune={`"[c4 c4 bb3 c4] [~ g3 ~ g3] [c4 f4 e4 c4] ~".slow(4)
+.tone(synth(osc('sawtooth4')).chain(out()))`}
+/>
+
+The base types are `sine`, `square`, `sawtooth`, `triangle`. You can also append a number between 1 and 32 to reduce the harmonic partials.
+
+### lowpass(cutoff)
+
+Helper that returns a Filter Node of type lowpass with the given cutoff. Intended to be used with Tone's .chain:
+
+<MiniRepl
+  tune={`"[c4 c4 bb3 c4] [~ g3 ~ g3] [c4 f4 e4 c4] ~".slow(4)
+.tone(synth(osc('sawtooth')).chain(lowpass(800), out()))`}
+/>
+
+### highpass(cutoff)
+
+Helper that returns a Filter Node of type highpass with the given cutoff. Intended to be used with Tone's .chain:
+
+<MiniRepl
+  tune={`"[c4 c4 bb3 c4] [~ g3 ~ g3] [c4 f4 e4 c4] ~".slow(4)
+.tone(synth(osc('sawtooth')).chain(highpass(2000), out()))`}
+/>
+
+### adsr
+
+Helper to set the envelope of a Tone.js instrument. Intended to be used with Tone's .set:
+
+<MiniRepl
+  tune={`"[c4 c4 bb3 c4] [~ g3 ~ g3] [c4 f4 e4 c4] ~".slow(4)
+.tone(synth(adsr(0,.1,0,0)).chain(out()))`}
+/>
@@ -23,8 +23,6 @@ ${item.description.replaceAll(/\{\@link ([a-zA-Z]+)?\#?([a-zA-Z]*)\}/g, (_, a, b
  return `<a href="#${a}${b ? `-${b}` : ''}">${a}${b ? `#${b}` : ''}</a>`;
 })}

-${!!item.params?.length ? '**Parameters**' : ''}
-  
 ${
  item.params
    ?.map(
@@ -36,8 +34,7 @@ ${

 ${
  item.examples?.length
-    ? `**Examples**
-
+    ? `
 <div className="space-y-2">
  ${item.examples?.map((example, k) => `<MiniRepl tune={\`${example}\`} />`).join('\n\n')}
 </div>`
@@ -1,3 +1,4 @@
+@import '@strudel.cycles/react/dist/style.css';
@tailwind base;
@tailwind components;
@tailwind utilities;
--- a/Show More
+++ b/Show More