experiment: render audio with web-audio-api-rs

This reverts commit 896ec69329, reversing
changes made to 32e64bbb6e.

.eslintignore

@@ -9,6 +9,9 @@ out/**
 postcss.config.js
 postcss.config.cjs
 tailwind.config.js
+tailwind.config.cjs
 vite.config.js
 /**/dist/**/*
 !**/*.mjs
+**/*.tsx
+**/*.ts

.github/workflows/deploy.yml

@@ -24,10 +24,10 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 18
           cache: "npm"
       - name: Install Dependencies
-        run: npm ci && cd repl && npm ci && cd ../tutorial && npm ci
+        run: npm ci && cd website && npm ci
 
       - name: Build
         run: npm run build
@@ -39,7 +39,7 @@ jobs:
         uses: actions/upload-pages-artifact@v1
         with:
           # Upload entire repository
-          path: "./out"
+          path: "./website/dist"
 
       - name: Deploy to GitHub Pages
         id: deployment

.github/workflows/test.yml

@@ -10,10 +10,12 @@ jobs:
         node-version: [18]
 
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-node@v3
-      with:
-        node-version: ${{ matrix.node-version }}
-        cache: 'npm'
-    - run: npm install
-    - run: npm test
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: "npm"
+      - run: npm install
+      - run: npm run format-check
+      - run: npm run lint
+      - run: npm test

.prettierignore

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

.prettierrc

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

.vscode/settings.json

@@ -5,5 +5,6 @@
     ],
     "yaml.schemas": {
       "https://json.schemastore.org/github-workflow.json": "file:///home/felix/projects/strudel/.github/workflows/deploy.yml"
-    }
+    },
+    "testing.automaticallyOpenPeekView": "never"
 }

CONTRIBUTING.md

@@ -12,8 +12,8 @@ To get in touch with the contributors, either
 
 ## Ask a Question
 
-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 you have any questions about strudel, make sure you've glanced through the
+[docs](https://strudel.tidalcycles.org/learn/) to find out if it answers your question.
 If not, use one of the Communication Channels above!
 
 Don't be afraid to ask! Your question might be of great value for other people too.
@@ -29,12 +29,10 @@ If you made some music with strudel, you can give back some love and share what
 Your creation could also be part of the random selection in the REPL if you want.
 Use one of the Communication Channels listed above.
 
-## Improve the Tutorial
+## Improve the Docs
 
-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.
+If you find some weak spots in the [docs](https://strudel.tidalcycles.org/learn/getting-started),
+you can edit each file directly on github via the "Edit this page" link located in the right sidebar.
 
 ## Propose a Feature
 

README.md

@@ -5,7 +5,7 @@
 An experiment in making a [Tidal](https://github.com/tidalcycles/tidal/) using web technologies. This software is slowly stabilising, but please continue to tread carefully.
 
 - Try it here: <https://strudel.tidalcycles.org/>
-- Tutorial: <https://strudel.tidalcycles.org/tutorial/>
+- Docs: <https://strudel.tidalcycles.org/learn/>
 - Technical Blog Post: <https://loophole-letters.vercel.app/strudel>
 
 ## Running Locally

my-patterns/README.md

@@ -0,0 +1,20 @@
+# my-patterns
+
+This directory can be used to save your own patterns, which then get
+made into a pattern swatch.
+
+0. fork and clone the strudel repository
+1. run `npm run setup` in the strudel folder
+1. Save one or more .txt files in this folder
+2. run `npm run repl` in the top-level strudel folder
+3. open `http://localhost:3000/swatch/` !
+
+## deploy
+
+1. in your fork, go to settings -> pages and select "Github Actions" as source
+2. edit `website/public/CNAME` to contain `<your-username>.github.io/strudel`
+3. edit `website/astro.config.mjs` to use site: `https://<your-username>.github.io` and base `/strudel`
+4. go to Actions -> `Build and Deploy` and click `Run workflow`
+5. view your patterns at `<your-username>.github.io/strudel/swatch/`
+
+Alternatively, github pages allows you to use a custom domain, like https://mycooldomain.org/swatch/. [See their documentation for details](https://docs.github.com/en/pages/configuring-a-custom-domain-for-your-github-pages-site).

package.json

@@ -1,24 +1,29 @@
 {
   "name": "@strudel.cycles/monorepo",
-  "version": "0.0.4",
+  "version": "0.5.0",
   "private": true,
   "description": "Port of tidalcycles to javascript",
   "scripts": {
-    "pretest": "cd tutorial && npm run jsdoc-json",
-    "test": "npm run lint && vitest run --version",
+    "pretest": "npm run jsdoc-json",
+    "prebuild": "npm run jsdoc-json",
+    "test": "vitest run --version",
     "test-ui": "vitest --ui",
     "test-coverage": "vitest --coverage",
     "bootstrap": "lerna bootstrap",
-    "setup": "npm i && npm run bootstrap && cd repl && npm i && cd ../tutorial && npm i",
+    "setup": "npm i && npm run jsdoc-json && npm run bootstrap && cd website && npm i",
     "snapshot": "vitest run -u --silent",
-    "repl": "cd repl && npm run dev",
+    "repl": "cd website && npm run dev",
     "osc": "cd packages/osc && npm run server",
-    "build": "rm -rf out && cd repl && npm run build && cd ../tutorial && npm run build",
-    "preview": "npx serve ./out",
+    "build": "cd website && npm run build",
+    "preview": "cd website && npm run preview",
     "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",
-    "lint": "npx eslint . --ext mjs,js --quiet"
+    "lint": "eslint . --ext mjs,js --quiet",
+    "codeformat": "prettier --write .",
+    "format-check": "prettier --check .",
+    "check": "npm run format-check && npm run lint && npm run test",
+    "iclc": "cd paper && pandoc --template=pandoc/iclc.html --citeproc  --number-sections iclc2023.md -o iclc2023.html && pandoc --template=pandoc/iclc.latex --citeproc --number-sections iclc2023.md -o iclc2023.pdf"
   },
   "workspaces": [
     "packages/*"
@@ -41,8 +46,9 @@
   },
   "homepage": "https://strudel.tidalcycles.org",
   "devDependencies": {
-    "@vitest/ui": "^0.21.1",
+    "@vitest/ui": "^0.25.7",
     "c8": "^7.12.0",
+    "canvas": "^2.11.0",
     "eslint": "^8.28.0",
     "events": "^3.3.0",
     "gh-pages": "^4.0.0",
@@ -50,7 +56,8 @@
     "jsdoc-json": "^2.0.2",
     "jsdoc-to-markdown": "^7.1.1",
     "lerna": "^4.0.0",
+    "prettier": "^2.8.1",
     "rollup-plugin-visualizer": "^5.8.1",
-    "vitest": "^0.21.1"
+    "vitest": "^0.25.7"
   }
 }

packages/core/animate.mjs

@@ -0,0 +1,67 @@
+import { controls, Pattern, getDrawContext, silence, register, pure } from './index.mjs';
+const { createParams } = controls;
+
+let clearColor = '#22222210';
+
+Pattern.prototype.animate = function ({ callback, sync = false, smear = 0.5 } = {}) {
+  window.frame && cancelAnimationFrame(window.frame);
+  const ctx = getDrawContext();
+  const { clientWidth: ww, clientHeight: wh } = ctx.canvas;
+  let smearPart = smear === 0 ? '99' : Number((1 - smear) * 100).toFixed(0);
+  smearPart = smearPart.length === 1 ? `0${smearPart}` : smearPart;
+  clearColor = `#200010${smearPart}`;
+  const render = (t) => {
+    let frame;
+    /*     if (sync) {
+      t = scheduler.now();
+      frame = this.queryArc(t, t);
+    } else { */
+    t = Math.round(t);
+    frame = this.slow(1000).queryArc(t, t);
+    // }
+    ctx.fillStyle = clearColor;
+    ctx.fillRect(0, 0, ww, wh);
+    frame.forEach((f) => {
+      let { x, y, w, h, s, r, a = 0, fill = 'darkseagreen' } = f.value;
+      w *= ww;
+      h *= wh;
+      if (r !== undefined && a !== undefined) {
+        const radians = a * 2 * Math.PI;
+        const [cx, cy] = [(ww - w) / 2, (wh - h) / 2];
+        x = cx + Math.cos(radians) * r * cx;
+        y = cy + Math.sin(radians) * r * cy;
+      } else {
+        x *= ww - w;
+        y *= wh - h;
+      }
+      const val = { ...f.value, x, y, w, h };
+      ctx.fillStyle = fill;
+      if (s === 'rect') {
+        ctx.fillRect(x, y, w, h);
+      } else if (s === 'ellipse') {
+        ctx.beginPath();
+        ctx.ellipse(x + w / 2, y + h / 2, w / 2, h / 2, 0, 0, 2 * Math.PI);
+        ctx.fill();
+      }
+      callback && callback(ctx, val, f);
+    });
+    window.frame = requestAnimationFrame(render);
+  };
+  window.frame = requestAnimationFrame(render);
+  return silence;
+};
+
+export const { x, y, w, h, a, r, fill, smear } = createParams('x', 'y', 'w', 'h', 'a', 'r', 'fill', 'smear');
+
+export const rescale = register('rescale', function (f, pat) {
+  return pat.mul(x(f).w(f).y(f).h(f));
+});
+
+export const moveXY = register('moveXY', function (dx, dy, pat) {
+  return pat.add(x(dx).y(dy));
+});
+
+export const zoomIn = register('zoomIn', function (f, pat) {
+  const d = pure(1).sub(f).div(2);
+  return pat.rescale(f).move(d, d);
+});

packages/core/color.mjs

@@ -0,0 +1,175 @@
+export const colorMap = {
+  aliceblue: '#f0f8ff',
+  antiquewhite: '#faebd7',
+  aqua: '#00ffff',
+  aquamarine: '#7fffd4',
+  azure: '#f0ffff',
+  beige: '#f5f5dc',
+  bisque: '#ffe4c4',
+  black: '#000000',
+  blanchedalmond: '#ffebcd',
+  blue: '#0000ff',
+  blueviolet: '#8a2be2',
+  brown: '#a52a2a',
+  burlywood: '#deb887',
+  cadetblue: '#5f9ea0',
+  chartreuse: '#7fff00',
+  chocolate: '#d2691e',
+  coral: '#ff7f50',
+  cornflowerblue: '#6495ed',
+  cornsilk: '#fff8dc',
+  crimson: '#dc143c',
+  cyan: '#00ffff',
+  darkblue: '#00008b',
+  darkcyan: '#008b8b',
+  darkgoldenrod: '#b8860b',
+  darkgray: '#a9a9a9',
+  darkgreen: '#006400',
+  darkgrey: '#a9a9a9',
+  darkkhaki: '#bdb76b',
+  darkmagenta: '#8b008b',
+  darkolivegreen: '#556b2f',
+  darkorange: '#ff8c00',
+  darkorchid: '#9932cc',
+  darkred: '#8b0000',
+  darksalmon: '#e9967a',
+  darkseagreen: '#8fbc8f',
+  darkslateblue: '#483d8b',
+  darkslategray: '#2f4f4f',
+  darkslategrey: '#2f4f4f',
+  darkturquoise: '#00ced1',
+  darkviolet: '#9400d3',
+  deeppink: '#ff1493',
+  deepskyblue: '#00bfff',
+  dimgray: '#696969',
+  dimgrey: '#696969',
+  dodgerblue: '#1e90ff',
+  firebrick: '#b22222',
+  floralwhite: '#fffaf0',
+  forestgreen: '#228b22',
+  fuchsia: '#ff00ff',
+  gainsboro: '#dcdcdc',
+  ghostwhite: '#f8f8ff',
+  gold: '#ffd700',
+  goldenrod: '#daa520',
+  gray: '#808080',
+  green: '#008000',
+  greenyellow: '#adff2f',
+  grey: '#808080',
+  honeydew: '#f0fff0',
+  hotpink: '#ff69b4',
+  indianred: '#cd5c5c',
+  indigo: '#4b0082',
+  ivory: '#fffff0',
+  khaki: '#f0e68c',
+  lavender: '#e6e6fa',
+  lavenderblush: '#fff0f5',
+  lawngreen: '#7cfc00',
+  lemonchiffon: '#fffacd',
+  lightblue: '#add8e6',
+  lightcoral: '#f08080',
+  lightcyan: '#e0ffff',
+  lightgoldenrodyellow: '#fafad2',
+  lightgray: '#d3d3d3',
+  lightgreen: '#90ee90',
+  lightgrey: '#d3d3d3',
+  lightpink: '#ffb6c1',
+  lightsalmon: '#ffa07a',
+  lightseagreen: '#20b2aa',
+  lightskyblue: '#87cefa',
+  lightslategray: '#778899',
+  lightslategrey: '#778899',
+  lightsteelblue: '#b0c4de',
+  lightyellow: '#ffffe0',
+  lime: '#00ff00',
+  limegreen: '#32cd32',
+  linen: '#faf0e6',
+  magenta: '#ff00ff',
+  maroon: '#800000',
+  mediumaquamarine: '#66cdaa',
+  mediumblue: '#0000cd',
+  mediumorchid: '#ba55d3',
+  mediumpurple: '#9370db',
+  mediumseagreen: '#3cb371',
+  mediumslateblue: '#7b68ee',
+  mediumspringgreen: '#00fa9a',
+  mediumturquoise: '#48d1cc',
+  mediumvioletred: '#c71585',
+  midnightblue: '#191970',
+  mintcream: '#f5fffa',
+  mistyrose: '#ffe4e1',
+  moccasin: '#ffe4b5',
+  navajowhite: '#ffdead',
+  navy: '#000080',
+  oldlace: '#fdf5e6',
+  olive: '#808000',
+  olivedrab: '#6b8e23',
+  orange: '#ffa500',
+  orangered: '#ff4500',
+  orchid: '#da70d6',
+  palegoldenrod: '#eee8aa',
+  palegreen: '#98fb98',
+  paleturquoise: '#afeeee',
+  palevioletred: '#db7093',
+  papayawhip: '#ffefd5',
+  peachpuff: '#ffdab9',
+  peru: '#cd853f',
+  pink: '#ffc0cb',
+  plum: '#dda0dd',
+  powderblue: '#b0e0e6',
+  purple: '#800080',
+  red: '#ff0000',
+  rosybrown: '#bc8f8f',
+  royalblue: '#4169e1',
+  saddlebrown: '#8b4513',
+  salmon: '#fa8072',
+  sandybrown: '#f4a460',
+  seagreen: '#2e8b57',
+  seashell: '#fff5ee',
+  sienna: '#a0522d',
+  silver: '#c0c0c0',
+  skyblue: '#87ceeb',
+  slateblue: '#6a5acd',
+  slategray: '#708090',
+  slategrey: '#708090',
+  snow: '#fffafa',
+  springgreen: '#00ff7f',
+  steelblue: '#4682b4',
+  tan: '#d2b48c',
+  teal: '#008080',
+  thistle: '#d8bfd8',
+  tomato: '#ff6347',
+  turquoise: '#40e0d0',
+  violet: '#ee82ee',
+  wheat: '#f5deb3',
+  white: '#ffffff',
+  whitesmoke: '#f5f5f5',
+  yellow: '#ffff00',
+  yellowgreen: '#9acd32',
+};
+
+export function convertColorToNumber(color) {
+  // Convert color to lowercase for easier matching
+  color = color.toLowerCase();
+
+  // If the color is a hex code, convert it to a number
+  if (color[0] === '#') {
+    return convertHexToNumber(color);
+  }
+
+  // If the color is a named color, return the corresponding number
+  if (colorMap[color] !== undefined) {
+    return convertHexToNumber(colorMap[color]);
+  }
+
+  // If the color is not recognized, return null
+  return -1;
+}
+
+export function convertHexToNumber(hex) {
+  // Remove the leading '#' from the hex code
+  hex = hex.slice(1);
+
+  // Convert the hex code to a number
+  return parseInt(hex, 16);
+}

packages/core/controls.mjs

@@ -51,6 +51,7 @@ const generic_params = [
    *
    * @name accelerate
    * @param {number | Pattern} amount acceleration.
+   * @superdirtOnly
    * @example
    * s("sax").accelerate("<0 1 2 4 8 16>").slow(2).osc()
    *
@@ -75,19 +76,20 @@ const generic_params = [
    *
    * @name amp
    * @param {number | Pattern} amount gain.
+   * @superdirtOnly
    * @example
    * s("bd*8").amp(".1*2 .5 .1*2 .5 .1 .5").osc()
    *
    */
   ['f', 'amp', 'like @gain@, but linear.'],
-  // TODO: find out why 0 does not work, and it generally seems not right
-  /*
+  /**
    * A pattern of numbers to specify the attack time of an envelope applied to each sample.
+   * [More info about envelopes](/learn/synths-samples-effects/#envelope)
    *
    * @name attack
    * @param {number | Pattern} attack time in seconds.
    * @example
-   * n("c5 e5").s('superpiano').attack("<0 .1>").osc()
+   * note("c3 e3").attack("<0 .1 .5>")
    *
    */
   [
@@ -107,18 +109,36 @@ const generic_params = [
    */
   ['f', 'bank', 'selects sound bank to use'],
 
-  // TODO: find out how this works?
-  /*
-   * Envelope decay time = the time it takes after the attack time to reach the sustain level.
+  /**
+   * Gain envelope decay time = the time it takes after the attack time to reach the sustain level.
+   * [More info about envelopes](/learn/synths-samples-effects/#envelope)
    *
    * @name decay
    * @param {number | Pattern} time decay time in seconds
    * @example
-   * s("sax").cut(1).decay("<.1 .2 .3 .4>").sustain(0).osc()
+   * note("c3 e3").decay("<.1 .2 .3 .4>").sustain(0)
    *
    */
   ['f', 'decay', ''],
+  /**
+   * Gain envelope sustain level. [More info about envelopes](/learn/synths-samples-effects/#envelope)
+   *
+   * @name sustain
+   * @param {number | Pattern} gain sustain level between 0 and 1
+   * @example
+   * note("c3 e3").decay(.2).sustain("<0 .1 .4 .6 1>")
+   *
+   */
   ['f', 'sustain', ''],
+  /**
+   * Gain envelope release time. [More info about envelopes](/learn/synths-samples-effects/#envelope)
+   *
+   * @name release
+   * @param {number | Pattern} time release time in seconds
+   * @example
+   * note("c3 e3 g3 c4").release("<0 .1 .4 .6 1>/2")
+   *
+   */
   [
     'f',
     'release',
@@ -135,22 +155,26 @@ const generic_params = [
    *
    * @name bandf
    * @param {number | Pattern} frequency center frequency
+   * @synonyms bpf
    * @example
    * 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.'],
+  ['f', 'bpf', ''],
   // TODO: in tidal, it seems to be normalized
   /**
    * Sets the q-factor of the band-pass filter
    *
    * @name bandq
    * @param {number | Pattern} q q factor
+   * @synonyms bpq
    * @example
    * 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.'],
+  ['f', 'bpq', ''],
   /**
    * 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.
    *
@@ -204,7 +228,7 @@ const generic_params = [
    * "c4 eb4 g4 bb4".legato("<0.125 .25 .5 .75 1 2 4>")
    *
    */
-  ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
+  // ['f', 'legato', 'controls the amount of overlap between two adjacent sounds'],
   // ['f', 'clhatdecay', ''],
   /**
    * bit crusher effect.
@@ -249,7 +273,7 @@ const generic_params = [
    * @name cut
    * @param {number | Pattern} group cut group number
    * @example
-   * s("bd sax").cut(1).osc()
+   * s("rd*4").cut(1)
    *
    */
   [
@@ -262,53 +286,50 @@ const generic_params = [
    *
    * @name cutoff
    * @param {number | Pattern} frequency audible between 0 and 20000
+   * @synonyms lpf
    * @example
    * s("bd sd,hh*3").cutoff("<4000 2000 1000 500 200 100>")
    *
    */
-  // TODO: add lpf synonym
   ['f', 'cutoff', 'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the low-pass filter.'],
+  ['f', 'lpf'],
   /**
    * Applies the cutoff frequency of the high-pass filter.
    *
    * @name hcutoff
    * @param {number | Pattern} frequency audible between 0 and 20000
+   * @synonyms hpf
    * @example
    * s("bd sd,hh*4").hcutoff("<4000 2000 1000 500 200 100>")
    *
    */
-  // TODO: add hpf synonym
-  [
-    'f',
-    'hcutoff',
-    'a pattern of numbers from 0 to 1. Applies the cutoff frequency of the high-pass filter. Also has alias @hpf@',
-  ],
+  ['f', 'hcutoff', ''],
+  ['f', 'hpf', ''],
   /**
    * Applies the resonance of the high-pass filter.
    *
    * @name hresonance
    * @param {number | Pattern} q resonance factor between 0 and 50
+   * @synonyms hpq
    * @example
    * s("bd sd,hh*4").hcutoff(2000).hresonance("<0 10 20 30>")
    *
    */
-  [
-    'f',
-    'hresonance',
-    'a pattern of numbers from 0 to 1. Applies the resonance of the high-pass filter. Has alias @hpq@',
-  ],
+  ['f', 'hpq', ''],
+  ['f', 'hresonance', ''],
   // TODO: add hpq synonym
   /**
    * Applies the cutoff frequency of the low-pass filter.
    *
    * @name resonance
    * @param {number | Pattern} q resonance factor between 0 and 50
+   * @synonyms lpq
    * @example
    * 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?
+  ['f', 'lpq'],
+  ['f', 'resonance', ''],
   /**
    * DJ filter, below 0.5 is low pass filter, above is high pass filter.
    *
@@ -321,17 +342,36 @@ const generic_params = [
   ['f', 'djf', 'DJ filter, below 0.5 is low pass filter, above is high pass filter.'],
   // ['f', 'cutoffegint', ''],
   // TODO: does not seem to work
-  /*
+  /**
    * Sets the level of the delay signal.
    *
    * @name delay
    * @param {number | Pattern} level between 0 and 1
    * @example
-   * s("bd").delay("<0 .5 .75 1>").osc()
+   * s("bd").delay("<0 .25 .5 1>")
    *
    */
   ['f', 'delay', 'a pattern of numbers from 0 to 1. Sets the level of the delay signal.'],
+  /**
+   * Sets the level of the signal that is fed back into the delay.
+   * Caution: Values >= 1 will result in a signal that gets louder and louder! Don't do it
+   *
+   * @name delayfeedback
+   * @param {number | Pattern} feedback between 0 and 1
+   * @example
+   * s("bd").delay(.25).delayfeedback("<.25 .5 .75 1>").slow(2)
+   *
+   */
   ['f', 'delayfeedback', 'a pattern of numbers from 0 to 1. Sets the amount of delay feedback.'],
+  /**
+   * Sets the time of the delay effect.
+   *
+   * @name delaytime
+   * @param {number | Pattern} seconds between 0 and Infinity
+   * @example
+   * s("bd").delay(.25).delaytime("<.125 .25 .5 1>").slow(2)
+   *
+   */
   ['f', 'delaytime', 'a pattern of numbers from 0 to 1. Sets the length of the delay.'],
   /* // TODO: test
    * Specifies whether delaytime is calculated relative to cps.
@@ -400,7 +440,7 @@ const generic_params = [
    * @example
    * freq("220 110 440 110").s("superzow").osc()
    * @example
-   * freq("110".mulOut(".5 1.5 .6 [2 3]")).s("superzow").osc()
+   * freq("110".mul.out(".5 1.5 .6 [2 3]")).s("superzow").osc()
    *
    */
   ['f', 'freq', ''],
@@ -484,11 +524,15 @@ const generic_params = [
   // ['f', 'ophatdecay', ''],
   // TODO: example
   /**
-   * a pattern of numbers. An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share hardware output bus offset and global effects, e.g. reverb and delay. The maximum number of orbits is specified in the superdirt startup, numbers higher than maximum will wrap around.
+   * An `orbit` is a global parameter context for patterns. Patterns with the same orbit will share the same global effects.
    *
    * @name orbit
    * @param {number | Pattern} number
-   *
+   * @example
+   * stack(
+   *   s("hh*3").delay(.5).delaytime(.25).orbit(1),
+   *   s("~ sd").delay(.5).delaytime(.125).orbit(2)
+   * )
    */
   [
     'i',
@@ -562,7 +606,7 @@ const generic_params = [
   // TODO: detune? https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
   ['f', 'semitone', ''],
   // TODO: dedup with synth param, see https://tidalcycles.org/docs/reference/synthesizers/#superpiano
-  ['f', 'velocity', ''],
+  // ['f', 'velocity', ''],
   ['f', 'voice', ''], // TODO: synth param
   /**
    * Sets the level of reverb.
@@ -570,7 +614,7 @@ const generic_params = [
    * @name room
    * @param {number | Pattern} level between 0 and 1
    * @example
-   * s("bd sd").room("<0 .2 .4 .6 .8 1>").osc()
+   * s("bd sd").room("<0 .2 .4 .6 .8 1>")
    *
    */
   ['f', 'room', 'a pattern of numbers from 0 to 1. Sets the level of reverb.'],
@@ -578,9 +622,9 @@ const generic_params = [
    * Sets the room size of the reverb, see {@link room}.
    *
    * @name size
-   * @param {number | Pattern} size between 0 and 1
+   * @param {number | Pattern} size between 0 and 10
    * @example
-   * s("bd sd").room(.8).size("<0 .2 .4 .6 .8 1>").osc()
+   * s("bd sd").room(.8).size("<0 1 2 4 8>")
    *
    */
   // TODO: find out why :
@@ -620,9 +664,9 @@ const generic_params = [
    * @name speed
    * @param {number | Pattern} speed -inf to inf, negative numbers play the sample backwards.
    * @example
-   * s("bd").speed("<1 2 4 1 -2 -4>").osc()
+   * s("bd").speed("<1 2 4 1 -2 -4>")
    * @example
-   * speed("1 1.5*2 [2 1.1]").s("sax").cut(1).osc()
+   * speed("1 1.5*2 [2 1.1]").s("piano").clip(1)
    *
    */
   [

packages/core/cyclist.mjs

@@ -49,6 +49,9 @@ export class Cyclist {
   getPhase() {
     return this.getTime() - this.origin - this.latency;
   }
+  now() {
+    return this.getTime() - this.origin + this.clock.minLatency;
+  }
   setStarted(v) {
     this.started = v;
     this.onToggle?.(v);

packages/core/euclid.mjs

@@ -1,47 +1,97 @@
 /*
-euclid.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/euclid.mjs>
+euclid.mjs - Bjorklund/Euclidean/Diaspora rhythms
+Copyright (C) 2023 Rohan Drape and strudel contributors
+
+See <https://github.com/tidalcycles/strudel/blob/main/packages/core/euclid.mjs> for authors of this file.
+
+The Bjorklund algorithm implementation is ported from the Haskell Music Theory Haskell module by Rohan Drape -
+https://rohandrape.net/?t=hmt
+
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern, timeCat } from './pattern.mjs';
-import bjork from 'bjork';
-import { rotate } from './util.mjs';
+import { Pattern, timeCat, register, silence } from './pattern.mjs';
+import { rotate, flatten } from './util.mjs';
 import Fraction from './fraction.mjs';
 
-const euclid = (pulses, steps, rotation = 0) => {
-  const b = bjork(steps, pulses);
-  if (rotation) {
-    return rotate(b, -rotation);
-  }
-  return b;
+const splitAt = function (index, value) {
+  return [value.slice(0, index), value.slice(index)];
+};
+
+const zipWith = (f, xs, ys) => xs.map((n, i) => f(n, ys[i]));
+
+const left = function (n, x) {
+  const [ons, offs] = n;
+  const [xs, ys] = x;
+  const [_xs, __xs] = splitAt(offs, xs);
+  return [
+    [offs, ons - offs],
+    [zipWith((a, b) => a.concat(b), _xs, ys), __xs],
+  ];
+};
+
+const right = function (n, x) {
+  const [ons, offs] = n;
+  const [xs, ys] = x;
+  const [_ys, __ys] = splitAt(ons, ys);
+  const result = [
+    [ons, offs - ons],
+    [zipWith((a, b) => a.concat(b), xs, _ys), __ys],
+  ];
+  return result;
+};
+
+const _bjork = function (n, x) {
+  const [ons, offs] = n;
+  return Math.min(ons, offs) <= 1 ? [n, x] : _bjork(...(ons > offs ? left(n, x) : right(n, x)));
+};
+
+const bjork = function (ons, steps) {
+  const offs = steps - ons;
+  const x = Array(ons).fill([1]);
+  const y = Array(offs).fill([0]);
+  const result = _bjork([ons, offs], [x, y]);
+  return flatten(result[1][0]).concat(flatten(result[1][1]));
 };
 
 /**
  * Changes the structure of the pattern to form an euclidean rhythm.
- * Euclidian rhythms are rhythms obtained using the greatest common divisor of two numbers.
- * They were described in 2004 by Godfried Toussaint, a canadian computer scientist.
- * Euclidian rhythms are really useful for computer/algorithmic music because they can accurately
- * describe a large number of rhythms used in the most important music world traditions.
+ * Euclidian rhythms are rhythms obtained using the greatest common
+ * divisor of two numbers.  They were described in 2004 by Godfried
+ * Toussaint, a canadian computer scientist.  Euclidian rhythms are
+ * really useful for computer/algorithmic music because they can
+ * describe a large number of rhythms with a couple of numbers.
  *
  * @memberof Pattern
  * @name euclid
  * @param {number} pulses the number of onsets / beats
  * @param {number} steps the number of steps to fill
- * @param {number} rotation (optional) offset in steps
  * @returns Pattern
  * @example
  * // The Cuban tresillo pattern.
  * note("c3").euclid(3,8)
  */
 
+/**
+ * Like `euclid`, but has an additional parameter for 'rotating' the resulting sequence.
+ * @memberof Pattern
+ * @name euclidRot
+ * @param {number} pulses the number of onsets / beats
+ * @param {number} steps the number of steps to fill
+ * @param {number} rotation offset in steps
+ * @returns Pattern
+ * @example
+ * // A Samba rhythm necklace from Brazil
+ * note("c3").euclidRot(3,16,14)
+ */
+
 /**
  * @example // A thirteenth century Persian rhythm called Khafif-e-ramal.
  * note("c3").euclid(2,5)
  * @example // The archetypal pattern of the Cumbia from Colombia, as well as a Calypso rhythm from Trinidad.
  * note("c3").euclid(3,4)
  * @example // Another thirteenth century Persian rhythm by the name of Khafif-e-ramal, as well as a Rumanian folk-dance rhythm.
- * note("c3").euclid(3,5,2)
+ * note("c3").euclidRot(3,5,2)
  * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
  * note("c3").euclid(3,7)
  * @example // The Cuban tresillo pattern.
@@ -71,34 +121,57 @@ const euclid = (pulses, steps, rotation = 0) => {
  * @example // A common West African bell pattern.
  * note("c3").euclid(7,12)
  * @example // A Samba rhythm necklace from Brazil.
- * note("c3").euclid(7,16,14)
+ * note("c3").euclidRot(7,16,14)
  * @example // A rhythm necklace used in the Central African Republic.
  * note("c3").euclid(9,16)
  * @example // A rhythm necklace of the Aka Pygmies of Central Africa.
- * note("c3").euclid(11,24,14)
+ * note("c3").euclidRot(11,24,14)
  * @example // Another rhythm necklace of the Aka Pygmies of the upper Sangha.
- * note("c3").euclid(13,24,5)
+ * note("c3").euclidRot(13,24,5)
  */
-Pattern.prototype.euclid = function (pulses, steps, rotation = 0) {
-  return this.struct(euclid(pulses, steps, rotation));
+
+const _euclidRot = function (pulses, steps, rotation) {
+  const b = bjork(pulses, steps);
+  if (rotation) {
+    return rotate(b, -rotation);
+  }
+  return b;
 };
 
+export const euclid = register('euclid', function (pulses, steps, pat) {
+  return pat.struct(_euclidRot(pulses, steps, 0));
+});
+
+export const { euclidrot, euclidRot } = register(['euclidrot', 'euclidRot'], function (pulses, steps, rotation, pat) {
+  return pat.struct(_euclidRot(pulses, steps, rotation));
+});
+
 /**
- * Similar to `.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);
-  const firstOne = bin_pat.indexOf(1);
-  const gapless = rotate(bin_pat, firstOne)
+
+const _euclidLegato = function (pulses, steps, rotation, pat) {
+  if (pulses < 1) {
+    return silence;
+  }
+  const bin_pat = _euclidRot(pulses, steps, rotation);
+  const gapless = bin_pat
     .join('')
     .split('1')
     .slice(1)
     .map((s) => [s.length + 1, true]);
-  return this.struct(timeCat(...gapless)).late(Fraction(firstOne).div(steps));
+  return pat.struct(timeCat(...gapless));
 };
 
-export default euclid;
+export const euclidLegato = register(['euclidLegato'], function (pulses, steps, pat) {
+  return _euclidLegato(pulses, steps, 0, pat);
+});
+
+export const euclidLegatoRot = register(['euclidLegatoRot'], function (pulses, steps, rotation, pat) {
+  return _euclidLegato(pulses, steps, rotation, pat);
+});

packages/core/evaluate.mjs

@@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { isPattern, Pattern } from './index.mjs';
+import { isPattern } from './index.mjs';
 
 let scoped = false;
 export const evalScope = async (...args) => {
@@ -19,7 +19,14 @@ export const evalScope = async (...args) => {
       console.warn(`evalScope: module with index ${i} could not be loaded:`, result.reason);
     }
   });
-  Object.assign(globalThis, ...modules, Pattern.prototype.bootstrap());
+  // Object.assign(globalThis, ...modules);
+  // below is a fix for above commented out line
+  // same error as https://github.com/vitest-dev/vitest/issues/1807 when running this on astro server
+  modules.forEach((module) => {
+    Object.entries(module).forEach(([name, value]) => {
+      globalThis[name] = value;
+    });
+  });
 };
 
 function safeEval(str, options = {}) {

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

@@ -16,7 +16,7 @@ evalScope(
   import('@strudel.cycles/tonal'),
 );
 
-setStringParser(mini)
+setStringParser(mini);
 
 const { evaluate } = repl({
   defaultOutput: webaudioOutput,

packages/core/hap.mjs

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

packages/core/index.mjs

@@ -21,6 +21,7 @@ export * from './repl.mjs';
 export * from './logger.mjs';
 export * from './time.mjs';
 export * from './draw.mjs';
+export * from './animate.mjs';
 export * from './pianoroll.mjs';
 export * from './ui.mjs';
 export { default as drawLine } from './drawLine.mjs';

packages/core/logger.mjs

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

packages/core/package-lock.json

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

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/core",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Port of Tidal Cycles to JavaScript",
   "main": "index.mjs",
   "type": "module",
@@ -25,7 +25,6 @@
   },
   "homepage": "https://strudel.tidalcycles.org",
   "dependencies": {
-    "bjork": "^0.0.1",
     "fraction.js": "^4.2.0"
   },
   "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2"

packages/core/pianoroll.mjs

@@ -4,13 +4,27 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern, toMidi, getDrawContext } from './index.mjs';
+import { Pattern, toMidi, getDrawContext, freqToMidi, isNote } from './index.mjs';
 
 const scale = (normalized, min, max) => normalized * (max - min) + min;
 const getValue = (e) => {
-  let value = typeof e.value === 'object' ? e.value.note ?? e.value.n : e.value;
-  if (typeof value === 'string') {
-    value = toMidi(value);
+  let { value } = e;
+  if (typeof e.value !== 'object') {
+    value = { value };
+  }
+  let { note, n, freq, s } = value;
+  if (freq) {
+    return freqToMidi(freq);
+  }
+  note = note ?? n;
+  if (typeof note === 'string') {
+    return toMidi(note);
+  }
+  if (typeof note === 'number') {
+    return note;
+  }
+  if (s) {
+    return '_' + s;
   }
   return value;
 };
@@ -48,9 +62,6 @@ Pattern.prototype.pianoroll = function ({
     from = 0;
     to = timeframeProp;
   }
-  if (!autorange && fold) {
-    console.warn('disabling autorange has no effect when fold is enabled');
-  }
   const timeAxis = vertical ? h : w;
   const valueAxis = vertical ? w : h;
   let timeRange = vertical ? [timeAxis, 0] : [0, timeAxis]; // pixel range for time
@@ -138,10 +149,137 @@ Pattern.prototype.pianoroll = function ({
           maxMidi = max;
           valueExtent = maxMidi - minMidi + 1;
         }
-        foldValues = values.sort((a, b) => a - b);
+        foldValues = values.sort((a, b) => String(a).localeCompare(String(b)));
         barThickness = fold ? valueAxis / foldValues.length : valueAxis / valueExtent;
       },
     },
   );
   return this;
 };
+
+// this function allows drawing a pianoroll without ties to Pattern.prototype
+// it will probably replace the above in the future
+export function pianoroll({
+  time,
+  haps,
+  cycles = 4,
+  playhead = 0.5,
+  flipTime = 0,
+  flipValues = 0,
+  hideNegative = false,
+  // inactive = '#C9E597',
+  // inactive = '#FFCA28',
+  inactive = '#7491D2',
+  active = '#FFCA28',
+  // background = '#2A3236',
+  background = 'transparent',
+  smear = 0,
+  playheadColor = 'white',
+  minMidi = 10,
+  maxMidi = 90,
+  autorange = 0,
+  timeframe: timeframeProp,
+  fold = 0,
+  vertical = 0,
+  ctx,
+} = {}) {
+  const w = ctx.canvas.width;
+  const h = ctx.canvas.height;
+  let from = -cycles * playhead;
+  let to = cycles * (1 - playhead);
+
+  if (timeframeProp) {
+    console.warn('timeframe is deprecated! use from/to instead');
+    from = 0;
+    to = timeframeProp;
+  }
+  const timeAxis = vertical ? h : w;
+  const valueAxis = vertical ? w : h;
+  let timeRange = vertical ? [timeAxis, 0] : [0, timeAxis]; // pixel range for time
+  const timeExtent = to - from; // number of seconds that fit inside the canvas frame
+  const valueRange = vertical ? [0, valueAxis] : [valueAxis, 0]; // pixel range for values
+  let valueExtent = maxMidi - minMidi + 1; // number of "slots" for values, overwritten if autorange true
+  let barThickness = valueAxis / valueExtent; // pixels per value, overwritten if autorange true
+  let foldValues = [];
+  flipTime && timeRange.reverse();
+  flipValues && valueRange.reverse();
+
+  // onQuery
+  const { min, max, values } = haps.reduce(
+    ({ min, max, values }, e) => {
+      const v = getValue(e);
+      return {
+        min: v < min ? v : min,
+        max: v > max ? v : max,
+        values: values.includes(v) ? values : [...values, v],
+      };
+    },
+    { min: Infinity, max: -Infinity, values: [] },
+  );
+  if (autorange) {
+    minMidi = min;
+    maxMidi = max;
+    valueExtent = maxMidi - minMidi + 1;
+  }
+  // foldValues = values.sort((a, b) => a - b);
+  foldValues = values.sort((a, b) => String(a).localeCompare(String(b)));
+  barThickness = fold ? valueAxis / foldValues.length : valueAxis / valueExtent;
+
+  ctx.fillStyle = background;
+  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 <= time + to && event.whole.end >= time + from; */
+  haps
+    // .filter(inFrame)
+    .forEach((event) => {
+      const isActive = event.whole.begin <= time && event.whole.end > time;
+      const color = event.value?.color || event.context?.color;
+      ctx.fillStyle = color || inactive;
+      ctx.strokeStyle = color || active;
+      ctx.globalAlpha = event.context.velocity ?? 1;
+      const timePx = scale((event.whole.begin - (flipTime ? to : from)) / timeExtent, ...timeRange);
+      let durationPx = scale(event.duration / timeExtent, 0, timeAxis);
+      const value = getValue(event);
+      const valuePx = scale(
+        fold ? foldValues.indexOf(value) / foldValues.length : (Number(value) - minMidi) / valueExtent,
+        ...valueRange,
+      );
+      let margin = 0;
+      const offset = scale(time / timeExtent, ...timeRange);
+      let coords;
+      if (vertical) {
+        coords = [
+          valuePx + 1 - (flipValues ? barThickness : 0), // x
+          timeAxis - offset + timePx + margin + 1 - (flipTime ? 0 : durationPx), // y
+          barThickness - 2, // width
+          durationPx - 2, // height
+        ];
+      } else {
+        coords = [
+          timePx - offset + margin + 1 - (flipTime ? durationPx : 0), // x
+          valuePx + 1 - (flipValues ? 0 : barThickness), // y
+          durationPx - 2, // widith
+          barThickness - 2, // height
+        ];
+      }
+      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();
+  return this;
+}

packages/core/repl.mjs

@@ -12,6 +12,7 @@ export function repl({
   afterEval,
   getTime,
   transpiler,
+  editPattern,
   onToggle,
 }) {
   const scheduler = new Cyclist({
@@ -41,8 +42,10 @@ export function repl({
     }
     try {
       beforeEval?.({ code });
-      const { pattern } = await _evaluate(code, transpiler);
+      let { pattern } = await _evaluate(code, transpiler);
+
       logger(`[eval] code updated`);
+      pattern = editPattern?.(pattern) || pattern;
       scheduler.setPattern(pattern, autostart);
       afterEval?.({ code, pattern });
       return pattern;

packages/core/signal.mjs

@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { Hap } from './hap.mjs';
-import { Pattern, fastcat, reify, silence, stack, isPattern } from './pattern.mjs';
+import { Pattern, fastcat, reify, silence, stack, register } from './pattern.mjs';
 import Fraction from './fraction.mjs';
 import { id } from './util.mjs';
 
@@ -258,9 +258,9 @@ export const perlinWith = (pat) => {
  */
 export const perlin = perlinWith(time.fmap((v) => Number(v)));
 
-Pattern.prototype._degradeByWith = function (withPat, x) {
-  return this.fmap((a) => (_) => a).appLeft(withPat.filterValues((v) => v > x));
-};
+export const degradeByWith = register('degradeByWith', (withPat, x, pat) =>
+  pat.fmap((a) => (_) => a).appLeft(withPat.filterValues((v) => v > x)),
+);
 
 /**
  * Randomly removes events from the pattern by a given amount.
@@ -276,9 +276,9 @@ Pattern.prototype._degradeByWith = function (withPat, x) {
  * @example
  * s("[hh?0.2]*8")
  */
-Pattern.prototype._degradeBy = function (x) {
-  return this._degradeByWith(rand, x);
-};
+export const degradeBy = register('degradeBy', function (x, pat) {
+  return pat._degradeByWith(rand, x);
+});
 
 /**
  *
@@ -292,9 +292,7 @@ Pattern.prototype._degradeBy = function (x) {
  * @example
  * s("[hh?]*8")
  */
-Pattern.prototype.degrade = function () {
-  return this._degradeBy(0.5);
-};
+export const degrade = register('degrade', (pat) => pat._degradeBy(0.5));
 
 /**
  * Inverse of {@link Pattern#degradeBy}: Randomly removes events from the pattern by a given amount.
@@ -309,26 +307,14 @@ Pattern.prototype.degrade = function () {
  * @example
  * s("hh*8").undegradeBy(0.2)
  */
-Pattern.prototype._undegradeBy = function (x) {
-  return this._degradeByWith(
+export const undegradeBy = register('undegradeBy', function (x, pat) {
+  return pat._degradeByWith(
     rand.fmap((r) => 1 - r),
     x,
   );
-};
+});
 
-Pattern.prototype.undegrade = function () {
-  return this._undegradeBy(0.5);
-};
-
-Pattern.prototype._sometimesBy = function (x, func) {
-  return stack(this._degradeBy(x), func(this._undegradeBy(1 - x)));
-};
-
-// https://github.com/tidalcycles/strudel/discussions/198
-/* Pattern.prototype._sometimesBy = function (x, other) {
-  other = typeof other === 'function' ? other(this._undegradeBy(1 - x)) : reify(other)._undegradeBy(1 - x);
-  return stack(this._degradeBy(x), other);
-}; */
+export const undegrade = register('undegrade', (pat) => pat._undegradeBy(0.5));
 
 /**
  *
@@ -343,24 +329,12 @@ Pattern.prototype._sometimesBy = function (x, func) {
  * @example
  * s("hh(3,8)").sometimesBy(.4, x=>x.speed("0.5"))
  */
-Pattern.prototype.sometimesBy = function (patx, func) {
-  const pat = this;
-  return reify(patx)
-    .fmap((x) => pat._sometimesBy(x, func))
-    .innerJoin();
-};
 
-// why does this exist? it is identical to sometimesBy
-Pattern.prototype._sometimesByPre = function (x, func) {
-  return stack(this._degradeBy(x), func(this).undegradeBy(1 - x));
-};
-
-Pattern.prototype.sometimesByPre = function (patx, func) {
-  const pat = this;
+export const sometimesBy = register('sometimesBy', function (patx, func, pat) {
   return reify(patx)
-    .fmap((x) => pat._sometimesByPre(x, func))
+    .fmap((x) => stack(pat._degradeBy(x), func(pat._undegradeBy(1 - x))))
     .innerJoin();
-};
+});
 
 /**
  *
@@ -373,20 +347,9 @@ Pattern.prototype.sometimesByPre = function (patx, func) {
  * @example
  * s("hh*4").sometimes(x=>x.speed("0.5"))
  */
-Pattern.prototype.sometimes = function (func) {
-  return this._sometimesBy(0.5, func);
-};
-
-Pattern.prototype.sometimesPre = function (func) {
-  return this._sometimesByPre(0.5, func);
-};
-
-Pattern.prototype._someCyclesBy = function (x, func) {
-  return stack(
-    this._degradeByWith(rand._segment(1), x),
-    func(this._degradeByWith(rand.fmap((r) => 1 - r)._segment(1), 1 - x)),
-  );
-};
+export const sometimes = register('sometimes', function (func, pat) {
+  return pat._sometimesBy(0.5, func);
+});
 
 /**
  *
@@ -401,12 +364,17 @@ Pattern.prototype._someCyclesBy = function (x, func) {
  * @example
  * s("hh(3,8)").someCyclesBy(.3, x=>x.speed("0.5"))
  */
-Pattern.prototype.someCyclesBy = function (patx, func) {
-  const pat = this;
+
+export const someCyclesBy = register('someCyclesBy', function (patx, func, pat) {
   return reify(patx)
-    .fmap((x) => pat._someCyclesBy(x, func))
+    .fmap((x) =>
+      stack(
+        pat._degradeByWith(rand._segment(1), x),
+        func(pat._degradeByWith(rand.fmap((r) => 1 - r)._segment(1), 1 - x)),
+      ),
+    )
     .innerJoin();
-};
+});
 
 /**
  *
@@ -418,9 +386,9 @@ Pattern.prototype.someCyclesBy = function (patx, func) {
  * @example
  * s("hh(3,8)").someCycles(x=>x.speed("0.5"))
  */
-Pattern.prototype.someCycles = function (func) {
-  return this._someCyclesBy(0.5, func);
-};
+export const someCycles = register('someCycles', function (func, pat) {
+  return pat._someCyclesBy(0.5, func);
+});
 
 /**
  *
@@ -432,9 +400,9 @@ Pattern.prototype.someCycles = function (func) {
  * @example
  * s("hh*8").often(x=>x.speed("0.5"))
  */
-Pattern.prototype.often = function (func) {
-  return this.sometimesBy(0.75, func);
-};
+export const often = register('often', function (func, pat) {
+  return pat.sometimesBy(0.75, func);
+});
 
 /**
  *
@@ -446,9 +414,9 @@ Pattern.prototype.often = function (func) {
  * @example
  * s("hh*8").rarely(x=>x.speed("0.5"))
  */
-Pattern.prototype.rarely = function (func) {
-  return this.sometimesBy(0.25, func);
-};
+export const rarely = register('rarely', function (func, pat) {
+  return pat.sometimesBy(0.25, func);
+});
 
 /**
  *
@@ -460,9 +428,9 @@ Pattern.prototype.rarely = function (func) {
  * @example
  * s("hh*8").almostNever(x=>x.speed("0.5"))
  */
-Pattern.prototype.almostNever = function (func) {
-  return this.sometimesBy(0.1, func);
-};
+export const almostNever = register('almostNever', function (func, pat) {
+  return pat.sometimesBy(0.1, func);
+});
 
 /**
  *
@@ -474,9 +442,9 @@ Pattern.prototype.almostNever = function (func) {
  * @example
  * s("hh*8").almostAlways(x=>x.speed("0.5"))
  */
-Pattern.prototype.almostAlways = function (func) {
-  return this.sometimesBy(0.9, func);
-};
+export const almostAlways = register('almostAlways', function (func, pat) {
+  return pat.sometimesBy(0.9, func);
+});
 
 /**
  *
@@ -488,9 +456,9 @@ Pattern.prototype.almostAlways = function (func) {
  * @example
  * s("hh*8").never(x=>x.speed("0.5"))
  */
-Pattern.prototype.never = function (func) {
-  return this;
-};
+export const never = register('never', function (_, pat) {
+  return pat;
+});
 
 /**
  *
@@ -502,8 +470,6 @@ Pattern.prototype.never = function (func) {
  * @example
  * s("hh*8").always(x=>x.speed("0.5"))
  */
-Pattern.prototype.always = function (func) {
-  return func(this);
-};
-
-Pattern.prototype.patternified.push('degradeBy', 'undegradeBy');
+export const always = register('always', function (func, pat) {
+  return func(pat);
+});

packages/core/speak.mjs

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

packages/core/test/pattern.test.mjs

@@ -16,6 +16,7 @@ import {
   pure,
   stack,
   fastcat,
+  firstOf,
   slowcat,
   cat,
   sequence,
@@ -153,35 +154,46 @@ describe('Pattern', () => {
       ).toBe(7);
     });
   });
+  describe('out()', () => {
+    it('is an alias for set.out()', () => {
+      sameFirst(sequence(1, 2).out(5, 6, 7, 8), sequence(1, 2).set.out(5, 6, 7, 8));
+    });
+  });
   describe('add()', () => {
+    it('works as toplevel function', () => {
+      expect(add(pure(4), pure(5)).query(st(0, 1))[0].value).toBe(9);
+    });
+    it('works as toplevel function, with bare values for arguments', () => {
+      expect(add(4, 5).query(st(0, 1))[0].value).toBe(9);
+    });
     it('can structure In()', () => {
       expect(pure(3).add(pure(4)).query(st(0, 1))[0].value).toBe(7);
-      expect(pure(3).addIn(pure(4)).query(st(0, 1))[0].value).toBe(7);
+      expect(pure(3).add.in(pure(4)).query(st(0, 1))[0].value).toBe(7);
     });
     it('can structure Out()', () => {
-      sameFirst(sequence(1, 2).addOut(4), sequence(5, 6).struct(true));
+      sameFirst(sequence(1, 2).add.out(4), sequence(5, 6).struct(true));
     });
     it('can Mix() structure', () => {
-      expect(sequence(1, 2).addMix(silence, 5, silence).firstCycle()).toStrictEqual([
+      expect(sequence(1, 2).add.mix(silence, 5, silence).firstCycle()).toStrictEqual([
         new Hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 6),
         new Hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 7),
       ]);
     });
     it('can Trig() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).addTrig(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trig(20, 30).early(2),
         sequence(26, 27, 36, 37),
       );
     });
     it('can Trigzero() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).addTrigzero(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trigzero(20, 30).early(2),
         sequence(21, 22, 31, 32),
       );
     });
     it('can Squeeze() structure', () => {
       sameFirst(
-        sequence(1, [2, 3]).addSqueeze(sequence(10, 20, 30)),
+        sequence(1, [2, 3]).add.squeeze(sequence(10, 20, 30)),
         sequence(
           [11, 21, 31],
           [
@@ -193,7 +205,7 @@ describe('Pattern', () => {
     });
     it('can SqueezeOut() structure', () => {
       sameFirst(
-        sequence(1, [2, 3]).addSqueezeOut(10, 20, 30),
+        sequence(1, [2, 3]).add.squeezeout(10, 20, 30),
         sequence([11, [12, 13]], [21, [22, 23]], [31, [32, 33]]),
       );
     });
@@ -204,32 +216,32 @@ describe('Pattern', () => {
   describe('keep()', () => {
     it('can structure In()', () => {
       expect(pure(3).keep(pure(4)).query(st(0, 1))[0].value).toBe(3);
-      expect(pure(3).keepIn(pure(4)).query(st(0, 1))[0].value).toBe(3);
+      expect(pure(3).keep.in(pure(4)).query(st(0, 1))[0].value).toBe(3);
     });
     it('can structure Out()', () => {
-      sameFirst(sequence(1, 2).keepOut(4), sequence(1, 2).struct(true));
+      sameFirst(sequence(1, 2).keep.out(4), sequence(1, 2).struct(true));
     });
     it('can Mix() structure', () => {
-      expect(sequence(1, 2).keepMix(silence, 5, silence).firstCycle()).toStrictEqual([
+      expect(sequence(1, 2).keep.mix(silence, 5, silence).firstCycle()).toStrictEqual([
         new Hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
         new Hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
       ]);
     });
     it('can Trig() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepTrig(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trig(20, 30).early(2),
         sequence(6, 7, 6, 7),
       );
     });
     it('can Trigzero() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepTrigzero(20, 30).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trigzero(20, 30).early(2),
         sequence(1, 2, 1, 2),
       );
     });
     it('can Squeeze() structure', () => {
       sameFirst(
-        sequence(1, [2, 3]).keepSqueeze(sequence(10, 20, 30)),
+        sequence(1, [2, 3]).keep.squeeze(sequence(10, 20, 30)),
         sequence(
           [1, 1, 1],
           [
@@ -240,38 +252,38 @@ describe('Pattern', () => {
       );
     });
     it('can SqueezeOut() structure', () => {
-      sameFirst(sequence(1, [2, 3]).keepSqueezeOut(10, 20, 30), sequence([1, [2, 3]], [1, [2, 3]], [1, [2, 3]]));
+      sameFirst(sequence(1, [2, 3]).keep.squeezeout(10, 20, 30), sequence([1, [2, 3]], [1, [2, 3]], [1, [2, 3]]));
     });
   });
   describe('keepif()', () => {
     it('can structure In()', () => {
       sameFirst(sequence(3, 4).keepif(true, false), sequence(3, silence));
-      sameFirst(sequence(3, 4).keepifIn(true, false), sequence(3, silence));
+      sameFirst(sequence(3, 4).keepif.in(true, false), sequence(3, silence));
     });
     it('can structure Out()', () => {
-      sameFirst(pure(1).keepifOut(true, false), sequence(1, silence));
+      sameFirst(pure(1).keepif.out(true, false), sequence(1, silence));
     });
     it('can Mix() structure', () => {
-      expect(sequence(1, 2).keepifMix(false, true, false).firstCycle()).toStrictEqual([
+      expect(sequence(1, 2).keepif.mix(false, true, false).firstCycle()).toStrictEqual([
         new Hap(ts(1 / 3, 1 / 2), ts(1 / 3, 1 / 2), 1),
         new Hap(ts(1 / 2, 2 / 3), ts(1 / 2, 2 / 3), 2),
       ]);
     });
     it('can Trig() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepifTrig(false, true).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trig(false, true).early(2),
         sequence(silence, silence, 6, 7),
       );
     });
     it('can Trigzero() structure', () => {
       sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepifTrigzero(false, true).early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trigzero(false, true).early(2),
         sequence(silence, silence, 1, 2),
       );
     });
     it('can Squeeze() structure', () => {
       sameFirst(
-        sequence(1, [2, 3]).keepifSqueeze(sequence(true, true, false)),
+        sequence(1, [2, 3]).keepif.squeeze(sequence(true, true, false)),
         sequence(
           [1, 1, silence],
           [
@@ -282,7 +294,7 @@ describe('Pattern', () => {
       );
     });
     it('can SqueezeOut() structure', () => {
-      sameFirst(sequence(1, [2, 3]).keepifSqueezeOut(true, true, false), sequence([1, [2, 3]], [1, [2, 3]], silence));
+      sameFirst(sequence(1, [2, 3]).keepif.squeezeout(true, true, false), sequence([1, [2, 3]], [1, [2, 3]], silence));
     });
   });
   describe('sub()', () => {
@@ -322,13 +334,13 @@ describe('Pattern', () => {
     });
     describe('setOut()', () => {
       it('Can set things with structure from second pattern', () => {
-        sameFirst(sequence(1, 2).setOut(4), pure(4).mask(true, true));
+        sameFirst(sequence(1, 2).set.out(4), pure(4).mask(true, true));
       });
     });
     describe('setSqueeze()', () => {
       it('Can squeeze one pattern inside the haps of another', () => {
         sameFirst(
-          sequence(1, [2, 3]).setSqueeze(sequence('a', 'b', 'c')),
+          sequence(1, [2, 3]).set.squeeze(sequence('a', 'b', 'c')),
           sequence(
             ['a', 'b', 'c'],
             [
@@ -338,7 +350,7 @@ describe('Pattern', () => {
           ),
         );
         sameFirst(
-          sequence(1, [2, 3]).setSqueeze('a', 'b', 'c'),
+          sequence(1, [2, 3]).set.squeeze('a', 'b', 'c'),
           sequence(
             ['a', 'b', 'c'],
             [
@@ -406,8 +418,8 @@ describe('Pattern', () => {
       );
     });
     it('defaults to accepting sequences', () => {
-      expect(sequence(1, 2, 3).fast(sequence(1.5, 2)).firstCycle()).toStrictEqual(
-        sequence(1, 2, 3).fast(1.5, 2).firstCycle(),
+      expect(sequence('a', 'b', 'c').fast(sequence(1.5, 2)).sortHapsByPart().firstCycle()).toStrictEqual(
+        sequence('a', 'b', 'c').fast(1.5, 2).sortHapsByPart().firstCycle(),
       );
     });
     it('works as a static function', () => {
@@ -586,6 +598,16 @@ describe('Pattern', () => {
           .firstCycle(),
       ).toStrictEqual(sequence(sequence('a', 'a'), 'a', 'a').firstCycle());
     });
+    it('Works as a toplevel function', () => {
+      expect(firstOf(3, fast(2), pure('a'))._fast(3).firstCycle()).toStrictEqual(
+        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
+      );
+    });
+    it('Works as a toplevel function, with a patterned first argument', () => {
+      expect(firstOf(pure(3), fast(2), pure('a'))._fast(3).firstCycle()).toStrictEqual(
+        sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
+      );
+    });
     it('works with currying', () => {
       expect(pure('a').firstOf(3, fast(2))._fast(3).firstCycle()).toStrictEqual(
         sequence(sequence('a', 'a'), 'a', 'a').firstCycle(),
@@ -895,9 +917,23 @@ describe('Pattern', () => {
   });
   describe('alignments', () => {
     it('Can squeeze arguments', () => {
-      expect(sequence(1, 2).add.squeeze(4, 5).firstCycle()).toStrictEqual(
-	sequence(5, 6, 6, 7).firstCycle()
+      expect(sequence(1, 2).add.squeeze(4, 5).firstCycle()).toStrictEqual(sequence(5, 6, 6, 7).firstCycle());
+    });
+  });
+  describe('defragmentHaps', () => {
+    it('Can merge two touching haps with same whole and value', () => {
+      expect(stack(pure('a').mask(1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(1);
+    });
+    it('Doesnt merge two overlapping haps', () => {
+      expect(stack(pure('a').mask(1, 1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(
+        2,
       );
     });
+    it('Doesnt merge two touching haps with different values', () => {
+      expect(stack(pure('a').mask(1, 0), pure('b').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(2);
+    });
+    it('Doesnt merge two touching haps with different wholes', () => {
+      expect(stack(sequence('a', silence), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(2);
+    });
   });
 });

packages/core/test/util.test.mjs

@@ -10,7 +10,8 @@ import {
   tokenizeNote,
   toMidi,
   fromMidi,
-  mod,
+  freqToMidi,
+  _mod,
   compose,
   getFrequency,
   getPlayableNoteValue,
@@ -32,9 +33,12 @@ describe('isNote', () => {
       expect(isNote(note)).toBe(true);
     });
   });
+  it('should recognize notes without octave', () => {
+    expect(isNote('C')).toBe(true);
+    expect(isNote('Bb')).toBe(true);
+  });
   it('should not recognize invalid notes', () => {
     expect(isNote('H5')).toBe(false);
-    expect(isNote('C')).toBe(false);
     expect(isNote('X')).toBe(false);
     expect(isNote(1)).toBe(false);
   });
@@ -94,6 +98,12 @@ describe('fromMidi', () => {
     expect(fromMidi(57)).toEqual(220);
   });
 });
+describe('freqToMidi', () => {
+  it('should turn frequency into midi', () => {
+    expect(freqToMidi(440)).toEqual(69);
+    expect(freqToMidi(220)).toEqual(57);
+  });
+});
 describe('getFrequency', () => {
   const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
   it('should turn note into frequency', () => {
@@ -118,22 +128,22 @@ describe('getFrequency', () => {
   });
 });
 
-describe('mod', () => {
+describe('_mod', () => {
   it('should work like regular modulo with positive numbers', () => {
-    expect(mod(0, 3)).toEqual(0);
-    expect(mod(1, 3)).toEqual(1);
-    expect(mod(2, 3)).toEqual(2);
-    expect(mod(3, 3)).toEqual(0);
-    expect(mod(4, 3)).toEqual(1);
-    expect(mod(4, 2)).toEqual(0);
+    expect(_mod(0, 3)).toEqual(0);
+    expect(_mod(1, 3)).toEqual(1);
+    expect(_mod(2, 3)).toEqual(2);
+    expect(_mod(3, 3)).toEqual(0);
+    expect(_mod(4, 3)).toEqual(1);
+    expect(_mod(4, 2)).toEqual(0);
   });
   it('should work with negative numbers', () => {
-    expect(mod(-1, 3)).toEqual(2);
-    expect(mod(-2, 3)).toEqual(1);
-    expect(mod(-3, 3)).toEqual(0);
-    expect(mod(-4, 3)).toEqual(2);
-    expect(mod(-5, 3)).toEqual(1);
-    expect(mod(-3, 2)).toEqual(1);
+    expect(_mod(-1, 3)).toEqual(2);
+    expect(_mod(-2, 3)).toEqual(1);
+    expect(_mod(-3, 3)).toEqual(0);
+    expect(_mod(-4, 3)).toEqual(2);
+    expect(_mod(-5, 3)).toEqual(1);
+    expect(_mod(-3, 2)).toEqual(1);
   });
 });
 
@@ -182,6 +192,7 @@ describe('parseNumeral', () => {
     expect(parseNumeral(1.5)).toBe(1.5);
   });
   it('should parse notes', () => {
+    expect(parseNumeral('c')).toBe(48);
     expect(parseNumeral('c4')).toBe(60);
     expect(parseNumeral('c#4')).toBe(61);
     expect(parseNumeral('db4')).toBe(61);

packages/core/test/value.test.mjs

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

packages/core/timespan.mjs

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

packages/core/util.mjs

@@ -5,7 +5,8 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 // returns true if the given string is a note
-export const isNote = (name) => /^[a-gA-G][#bs]*[0-9]$/.test(name);
+export const isNoteWithOctave = (name) => /^[a-gA-G][#bs]*[0-9]$/.test(name);
+export const isNote = (name) => /^[a-gA-G][#bs]*[0-9]?$/.test(name);
 export const tokenizeNote = (note) => {
   if (typeof note !== 'string') {
     return [];
@@ -19,7 +20,7 @@ export const tokenizeNote = (note) => {
 
 // turns the given note into its midi number representation
 export const toMidi = (note) => {
-  const [pc, acc, oct] = tokenizeNote(note);
+  const [pc, acc, oct = 3] = tokenizeNote(note);
   if (!pc) {
     throw new Error('not a note: "' + note + '"');
   }
@@ -31,6 +32,30 @@ export const fromMidi = (n) => {
   return Math.pow(2, (n - 69) / 12) * 440;
 };
 
+export const freqToMidi = (freq) => {
+  return (12 * Math.log(freq / 440)) / Math.LN2 + 69;
+};
+
+export const valueToMidi = (value, fallbackValue) => {
+  if (typeof value !== 'object') {
+    throw new Error('valueToMidi: expected object value');
+  }
+  let { freq, note } = value;
+  if (typeof freq === 'number') {
+    return freqToMidi(freq);
+  }
+  if (typeof note === 'string') {
+    return toMidi(note);
+  }
+  if (typeof note === 'number') {
+    return note;
+  }
+  if (!fallbackValue) {
+    throw new Error('valueToMidi: expected freq or note to be set');
+  }
+  return fallbackValue;
+};
+
 /**
  * @deprecated does not appear to be referenced or invoked anywhere in the codebase
  */
@@ -50,9 +75,8 @@ export const midi2note = (n) => {
   return pc + oct;
 };
 
-// modulo that works with negative numbers e.g. mod(-1, 3) = 2
-// const mod = (n: number, m: number): number => (n < 0 ? mod(n + m, m) : n % m);
-export const mod = (n, m) => ((n % m) + m) % m;
+// modulo that works with negative numbers e.g. _mod(-1, 3) = 2. Works on numbers (rather than patterns of numbers, as @mod@ from pattern.mjs does)
+export const _mod = (n, m) => ((n % m) + m) % m;
 
 export const getPlayableNoteValue = (hap) => {
   let { value, context } = hap;
@@ -117,9 +141,9 @@ export const constant = (a, b) => a;
 
 export const listRange = (min, max) => Array.from({ length: max - min + 1 }, (_, i) => i + min);
 
-export function curry(func, overload) {
+export function curry(func, overload, arity = func.length) {
   const fn = function curried(...args) {
-    if (args.length >= func.length) {
+    if (args.length >= arity) {
       return func.apply(this, args);
     } else {
       const partial = function (...args2) {

packages/core/value.mjs

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

packages/core/zyklus.mjs

@@ -44,6 +44,6 @@ function createClock(
   };
   const getPhase = () => phase;
   // setCallback
-  return { setDuration, start, stop, pause, duration, getPhase };
+  return { setDuration, start, stop, pause, duration, getPhase, minLatency };
 }
 export default createClock;

packages/csound/csound.mjs

@@ -1,4 +1,4 @@
-import { getFrequency, logger, Pattern } from '@strudel.cycles/core';
+import { getFrequency, logger, register } from '@strudel.cycles/core';
 import { getAudioContext } from '@strudel.cycles/webaudio';
 import csd from './project.csd?raw';
 // import livecodeOrc from './livecode.orc?raw';
@@ -6,12 +6,24 @@ import presetsOrc from './presets.orc?raw';
 
 let csoundLoader, _csound;
 
-// triggers given instrument name using csound.
-Pattern.prototype._csound = function (instrument) {
+// initializes csound + can be used to reevaluate given instrument code
+export async function loadCSound(code = '') {
+  await init();
+  if (code) {
+    code = `${code}`;
+    //     ^       ^
+    // wrapping in backticks makes sure it works when calling as templated function
+    await _csound?.evalCode(code);
+  }
+}
+export const loadcsound = loadCSound;
+export const loadCsound = loadCSound;
+
+export const csound = register('csound', (instrument, pat) => {
   instrument = instrument || 'triangle';
   init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
   // TODO: find a alternative way to wait for csound to load (to wait with first time playback)
-  return this.onTrigger((time, hap) => {
+  return pat.onTrigger((time, hap) => {
     if (!_csound) {
       logger('[csound] not loaded yet', 'warning');
       return;
@@ -40,20 +52,7 @@ Pattern.prototype._csound = function (instrument) {
     const msg = `i ${params.join(' ')}`;
     _csound.inputMessage(msg);
   });
-};
-
-// initializes csound + can be used to reevaluate given instrument code
-export async function csound(code = '') {
-  await init();
-  if (code) {
-    code = `${code}`;
-    //     ^       ^
-    // wrapping in backticks makes sure it works when calling as templated function
-    await _csound?.evalCode(code);
-  }
-}
-
-Pattern.prototype.define('csound', (a, pat) => pat.csound(a), { composable: false, patternified: true });
+});
 
 function eventLogger(type, args) {
   const [msg] = args;
@@ -80,21 +79,25 @@ function eventLogger(type, args) {
 
 async function load() {
   if (window.__csound__) {
-    // allows using some other csound instance
+    // Allows using some other csound instance.
+    // In that case, the external Csound is responsible
+    // for compiling an orchestra and starting to perform.
+    logger('[load] Using external Csound', 'warning');
     _csound = window.__csound__;
+    return _csound;
   } else {
     const { Csound } = await import('@csound/browser');
     _csound = await Csound({ audioContext: getAudioContext() });
+    _csound.removeAllListeners('message');
+    ['message'].forEach((k) => _csound.on(k, (...args) => eventLogger(k, args)));
+    await _csound.setOption('-m0d'); // see -m flag https://csound.com/docs/manual/CommandFlags.html
+    await _csound.setOption('--sample-accurate');
+    await _csound.compileCsdText(csd);
+    // await _csound.compileOrc(livecodeOrc);
+    await _csound.compileOrc(presetsOrc);
+    await _csound.start();
+    return _csound;
   }
-  _csound.removeAllListeners('message');
-  ['message'].forEach((k) => _csound.on(k, (...args) => eventLogger(k, args)));
-  await _csound.setOption('-m0d'); // see -m flag https://csound.com/docs/manual/CommandFlags.html
-  await _csound.setOption('--sample-accurate');
-  await _csound.compileCsdText(csd);
-  // await _csound.compileOrc(livecodeOrc);
-  await _csound.compileOrc(presetsOrc);
-  await _csound.start();
-  return _csound;
 }
 
 async function init() {
@@ -119,3 +122,49 @@ export async function loadOrc(url) {
   }
   await orcCache[url];
 }
+
+/**
+ * Sends notes to Csound for rendering with MIDI semantics. The hap value is
+ * translated to these Csound pfields:
+ *
+ *  p1 -- Csound instrument either as a number (1-based, can be a fraction),
+ *        or as a string name.
+ *  p2 -- time in beats (usually seconds) from start of performance.
+ *  p3 -- duration in beats (usually seconds).
+ *  p4 -- MIDI key number (as a real number, not an integer but in [0, 127].
+ *  p5 -- MIDI velocity (as a real number, not an integer but in [0, 127].
+ *  p6 -- Strudel controls, as a string.
+ */
+export const csoundm = register('csoundm', (instrument, pat) => {
+  let p1 = instrument;
+  if (typeof instrument === 'string') {
+    p1 = `"{instrument}"`;
+  }
+  init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
+  return pat.onTrigger((tidal_time, hap) => {
+    if (!_csound) {
+      logger('[csound] not loaded yet', 'warning');
+      return;
+    }
+    if (typeof hap.value !== 'object') {
+      throw new Error('csound only support objects as hap values');
+    }
+    // Time in seconds counting from now.
+    const p2 = tidal_time - getAudioContext().currentTime;
+    const p3 = hap.duration.valueOf() + 0;
+    const frequency = getFrequency(hap);
+    // Translate frequency to MIDI key number _without_ rounding.
+    const C4 = 261.62558;
+    let octave = Math.log(frequency / C4) / Math.log(2.0) + 8.0;
+    const p4 = octave * 12.0 - 36.0;
+    // We prefer floating point precision, but over the MIDI range [0, 127].
+    const p5 = 127 * (hap.context?.velocity ?? 0.9);
+    // The Strudel controls as a string.
+    const p6 = Object.entries({ ...hap.value, frequency })
+      .flat()
+      .join('/');
+    const i_statement = `i ${p1} ${p2} ${p3} ${p4} ${p5} "${p6}"`;
+    console.log('[csoundm]:', i_statement);
+    _csound.inputMessage(i_statement);
+  });
+});

packages/csound/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/csound",
-  "version": "0.3.0",
+  "version": "0.5.1",
   "description": "csound bindings for strudel",
   "main": "csound.mjs",
   "scripts": {

packages/eval/package-lock.json

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

packages/eval/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/eval",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Code evaluator for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
+    "@strudel.cycles/core": "^0.5.0",
     "estraverse": "^5.3.0",
     "shift-ast": "^7.0.0",
     "shift-codegen": "^8.1.0",

packages/eval/shapeshifter.mjs

@@ -225,9 +225,8 @@ function isPatternArg(parents) {
 function hasModifierCall(parent) {
   // TODO: modifiers are more than composables, for example every is not composable but should be seen as modifier..
   // need all prototypes of Pattern
-  return (
-    parent?.type === 'StaticMemberExpression' && Object.keys(Pattern.prototype.composable).includes(parent.property)
-  );
+  return parent?.type === 'StaticMemberExpression';
+  // && Object.keys(Pattern.prototype.composable).includes(parent.property)
 }
 const factories = Object.keys(Pattern.prototype.factories).concat(['mini']);
 

packages/midi/midi.mjs

@@ -11,10 +11,14 @@ import { getAudioContext } from '@strudel.cycles/webaudio';
 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const { WebMidi } = _WebMidi;
 
+function supportsMidi() {
+  return typeof navigator.requestMIDIAccess === 'function';
+}
+
 export function enableWebMidi(options = {}) {
   const { onReady, onConnected, onDisconnected } = options;
 
-  if (typeof navigator.requestMIDIAccess !== 'function') {
+  if (!supportsMidi()) {
     throw new Error('Your Browser does not support WebMIDI.');
   }
   return new Promise((resolve, reject) => {
@@ -42,23 +46,43 @@ export function enableWebMidi(options = {}) {
 // const outputByName = (name: string) => WebMidi.getOutputByName(name);
 const outputByName = (name) => WebMidi.getOutputByName(name);
 
+let midiReady;
+
+// output?: string | number, outputs: typeof WebMidi.outputs
+function getDevice(output, outputs) {
+  if (!outputs.length) {
+    throw new Error(`🔌 No MIDI devices found. Connect a device or enable IAC Driver.`);
+  }
+  if (typeof output === 'number') {
+    return outputs[output];
+  }
+  if (typeof output === 'string') {
+    return outputByName(output);
+  }
+  return outputs[0];
+}
+
 // Pattern.prototype.midi = function (output: string | number, channel = 1) {
-Pattern.prototype.midi = async function (output, channel = 1) {
-  await enableWebMidi({
+Pattern.prototype.midi = function (output, channel = 1) {
+  if (!supportsMidi()) {
+    throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
+  }
+  /* await */ enableWebMidi({
     onConnected: ({ outputs }) =>
       logger(`Midi device connected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`),
     onDisconnected: ({ outputs }) =>
       logger(`Midi device disconnected! Available: ${outputs.map((o) => `'${o.name}'`).join(', ')}`),
     onReady: ({ outputs }) => {
-      const chosenOutput = output ?? outputs[0];
+      const device = getDevice(output, outputs);
       const otherOutputs = outputs
-        .filter((o) => o.name !== chosenOutput.name)
+        .filter((o) => o.name !== device.name)
         .map((o) => `'${o.name}'`)
         .join(' | ');
-      logger(`Midi connected! Using "${chosenOutput.name}". ${otherOutputs ? `Also available: ${otherOutputs}` : ''}`);
+      midiReady = true;
+      logger(`Midi connected! Using "${device.name}". ${otherOutputs ? `Also available: ${otherOutputs}` : ''}`);
     },
   });
-  if (isPattern(output?.constructor?.name)) {
+  if (isPattern(output)) {
     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'
@@ -71,20 +95,10 @@ Pattern.prototype.midi = async function (output, channel = 1) {
     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 (!midiReady) {
+      return;
     }
+    const device = getDevice(output, WebMidi.outputs);
     if (!device) {
       throw new Error(
         `🔌 MIDI device '${output ? output : ''}' not found. Use one of ${WebMidi.outputs

packages/midi/package-lock.json

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

packages/midi/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/midi",
-  "version": "0.4.1",
+  "version": "0.5.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.4.1",
+    "@strudel.cycles/tone": "^0.5.0",
     "tone": "^14.7.77",
     "webmidi": "^3.0.21"
   }

packages/mini/README.md

@@ -32,7 +32,7 @@ yields:
 
 ## Mini Notation API
 
-See "Mini Notation" in the [Strudel Tutorial](https://strudel.tidalcycles.org/tutorial/)
+See "Mini Notation" in the [Strudel Tutorial](https://strudel.tidalcycles.org/learn/mini-notation)
 
 ## Building the Parser
 

packages/mini/krill.pegjs

@@ -5,13 +5,20 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 // Some terminology:
-// 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
+// mini(notation) = a series of elements placed between quotes
+// a stack = a series of vertically aligned slices sharing the same overall length
+// a sequence = a series of horizontally aligned elements
+// a choose = a series of elements, one of which is chosen at random
 
 
 {
+  var AtomStub = function(source)
+  {
+    this.type_ = "atom";
+    this.source_ = source;
+    this.location_ = location();
+  }
+
   var PatternStub = function(source, alignment)
   {
     this.type_ = "pattern";
@@ -90,82 +97,99 @@ quote = '"' / "'"
 
 // single step definition (e.g bd)
 step_char =  [0-9a-zA-Z~] / "-" / "#" / "." / "^" / "_" / ":"
-step = ws chars:step_char+ ws { return chars.join("") }
+step = ws chars:step_char+ ws { return new AtomStub(chars.join("")) }
 
 // define a sub cycle e.g. [1 2, 3 [4]]
-sub_cycle = ws  "[" ws s:stack_or_choose ws "]" ws { return s}
+sub_cycle = ws  "[" ws s:stack_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
-  { sc.arguments_.alignment = "t"; return sc;}
+// define a polymeter e.g. {1 2, 3 4 5}
+polymeter = ws  "{" ws s:polymeter_stack ws "}" stepsPerCycle:polymeter_steps? ws
+  { s.arguments_.stepsPerCycle = stepsPerCycle ; return s; }
+
+polymeter_steps = "%"a:slice
+  { return a }
+
+// define a step-per-cycle timeline e.g <1 3 [3 5]>. We simply defer to a sequence and
+// change the alignment to slowcat
+slow_sequence = ws "<" ws s:sequence ws ">" ws
+  { s.arguments_.alignment = 'slowcat'; return s; }
 
 // a slice is either a single step or a sub cycle
-slice = step / sub_cycle  / timeline
+slice = step / sub_cycle / polymeter / slow_sequence
 
 // slice modifier affects the timing/size of a slice (e.g. [a b c]@3)
 // at this point, we assume we can represent them as regular sequence operators
-slice_modifier = slice_weight / slice_bjorklund / slice_slow / slice_fast / slice_fixed_step / slice_replicate / slice_degrade
+slice_op = op_weight / op_bjorklund / op_slow / op_fast / op_replicate / op_degrade
 
-slice_weight =  "@" a:number
-  { return { weight: a} }
+op_weight =  "@" a:number
+  { return x => x.options_['weight'] = a }
   
-slice_replicate = "!"a:number
-  { return { replicate: a  } }
+op_replicate = "!"a:number
+  { return x => x.options_['reps'] = a }
 
-slice_bjorklund = "(" ws p:number ws comma ws s:number ws comma? ws r:number? ws ")"
-  { return { operator : { type_: "bjorklund", arguments_ :{ pulse: p, step:s, rotation:r || 0 } } } }
+op_bjorklund = "(" ws p:slice_with_ops ws comma ws s:slice_with_ops ws comma? ws r:slice_with_ops? ws ")"
+  { return x => x.options_['ops'].push({ type_: "bjorklund", arguments_ :{ pulse: p, step:s, rotation:r }}) }
 
-slice_slow = "/"a:number
-  { return { operator : { type_: "stretch", arguments_ :{ amount:a } } } }
+op_slow = "/"a:slice
+  { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'slow' }}) }
 
-slice_fast = "*"a:number
-  { return { operator : { type_: "stretch", arguments_ :{ amount:"1/"+a } } } }
+op_fast = "*"a:slice
+  { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'fast' }}) }
 
-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) } } } }
+op_degrade = "?"a:number?
+  { return x => x.options_['ops'].push({ type_: "degradeBy", arguments_ :{ amount:a } }) }
 
 // 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);}
+slice_with_ops = s:slice ops:slice_op*
+  { const result = new ElementStub(s, {ops: [], weight: 1, reps: 1});
+    for (const op of ops) {
+      op(result);
+    }
+    return result;
+  }
 
-// a single cycle is a combination of one or more successive slices (as an array). If we
-// have only one element, we skip the array and return the element itself
-single_cycle = s:(slice_with_modifier)+
-  { return new PatternStub(s,"h"); }
+// a sequence is a combination of one or more successive slices (as an array)
+sequence = s:(slice_with_ops)+
+  { return new PatternStub(s, 'fastcat'); }
 
-// 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 stack is a series of vertically aligned sequence, separated by a comma
+stack_tail = tail:(comma @sequence)+
+  { return { alignment: 'stack', 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 }; }
+// a choose is a series of pipe-separated sequence, one of which is
+// chosen at random, each cycle
+choose_tail = tail:(pipe @sequence)+
+  { return { alignment: 'rand', list: tail }; }
 
 // if the stack contains only one element, we don't create a stack but return the
 // underlying element
-stack_or_choose = head:single_cycle tail:(stack_tail / choose_tail)?
+stack_or_choose = head:sequence 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 sc:stack_or_choose quote
+polymeter_stack = head:sequence tail:stack_tail?
+  { return new PatternStub(tail ? [head, ...tail.list] : [head], 'polymeter'); }
+
+
+// Mini-notation innards ends
+// ---------->8---------->8---------->8---------->8---------->8----------
+// Experimental haskellish parser begins
+
+// mini-notation = a quoted stack
+mini = ws quote sc:stack_or_choose quote
   { return sc; }
 
 // ------------------ operators ---------------------------
 
 operator = scale / slow / fast / target / bjorklund / struct / rotR / rotL
 
-struct = "struct" ws s:sequence_or_operator
-  { return { name: "struct", args: { sequence:s }}}
+struct = "struct" ws s:mini_or_operator
+  { return { name: "struct", args: { mini:s }}}
 
 target = "target" ws quote s:step quote
   { return { name: "target", args : { name:s}}}
 
 bjorklund = "euclid" ws p:int ws s:int ws r:int?
-  { return { name: "bjorklund", args :{ pulse: parseInt(p), step:parseInt(s) }}}
+  { return { name: "bjorklund", args :{ pulse: p, step:parseInt(s) }}}
 
 slow = "slow" ws a:number
   { return { name: "stretch", args :{ amount: a}}}
@@ -189,27 +213,27 @@ comment = '//' p:([^\n]*)
 group_operator = cat
 
 // cat is another form of timeline
-cat = "cat" ws "[" ws  s:sequence_or_operator ss:(comma v:sequence_or_operator { return v})* ws "]"
-  { ss.unshift(s); return new PatternStub(ss,"t"); }
+cat = "cat" ws "[" ws  s:mini_or_operator ss:(comma v:mini_or_operator { return v})* ws "]"
+  { ss.unshift(s); return new PatternStub(ss, 'slowcat'); }
 
-// ------------------ high level sequence ---------------------------
+// ------------------ high level mini ---------------------------
 
-sequence_or_group =
+mini_or_group =
   group_operator /
-  sequence
+  mini
 
-sequence_or_operator =
-  sg:sequence_or_group ws (comment)*
+mini_or_operator =
+  sg:mini_or_group ws (comment)*
     {return sg}
-  / o:operator ws "$" ws soc:sequence_or_operator
+  / o:operator ws "$" ws soc:mini_or_operator
     { return new OperatorStub(o.name,o.args,soc)}
 
 sequ_or_operator_or_comment =
-  sc: sequence_or_operator
+  sc: mini_or_operator
     { return sc }
    / comment
 
-sequence_definition = s:sequ_or_operator_or_comment
+mini_definition = s:sequ_or_operator_or_comment
 
 // ---------------------- statements ----------------------------
 
@@ -227,4 +251,4 @@ hush = "hush"
 
 // ---------------------- statements ----------------------------
 
-statement = sequence_definition / command
+statement = mini_definition / command

packages/mini/mini.mjs

@@ -6,134 +6,158 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import * as krill from './krill-parser.js';
 import * as strudel from '@strudel.cycles/core';
-// import { addMiniLocations } from '@strudel.cycles/eval/shapeshifter.mjs';
 
-const { pure, Pattern, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel;
-
-var _seedState = 0;
+/* var _seedState = 0;
 const randOffset = 0.0002;
 
 function _nextSeed() {
   return _seedState++;
-}
+} */
 
-const applyOptions = (parent) => (pat, i) => {
+const applyOptions = (parent, code) => (pat, i) => {
   const ast = parent.source_[i];
   const options = ast.options_;
-  const operator = options?.operator;
-  if (operator) {
-    switch (operator.type_) {
-      case 'stretch': {
-        const speed = Fraction(operator.arguments_.amount).inverse();
-        return reify(pat).fast(speed);
-      }
-      case 'bjorklund':
-        return pat.euclid(operator.arguments_.pulse, operator.arguments_.step, operator.arguments_.rotation);
-      case 'degradeBy':
-        return reify(pat)._degradeByWith(
+  const ops = options?.ops;
+  if (ops) {
+    for (const op of ops) {
+      switch (op.type_) {
+        case 'stretch': {
+          const legalTypes = ['fast', 'slow'];
+          const { type, amount } = op.arguments_;
+          if (!legalTypes.includes(type)) {
+            throw new Error(`mini: stretch: type must be one of ${legalTypes.join('|')} but got ${type}`);
+          }
+          pat = strudel.reify(pat)[type](patternifyAST(amount, code));
+          break;
+        }
+        case 'bjorklund': {
+          if (op.arguments_.rotation) {
+            pat = pat.euclidRot(
+              patternifyAST(op.arguments_.pulse, code),
+              patternifyAST(op.arguments_.step, code),
+              patternifyAST(op.arguments_.rotation, code),
+            );
+          } else {
+            pat = pat.euclid(patternifyAST(op.arguments_.pulse, code), patternifyAST(op.arguments_.step, code));
+          }
+          break;
+        }
+        case 'degradeBy': {
+          // TODO: find out what is right here
+          // example:
+          /*
+           stack(
+             s("hh*8").degrade(),
+             s("[ht*8]?")
+           )
+        */
+          // above example will only be in sync when _degradeBy is used...
+          // it also seems that the nextSeed will create undeterministic behaviour
+          // as it uses a global _seedState. This is probably the reason for
+          // https://github.com/tidalcycles/strudel/issues/245
+
+          // this is how it was:
+          /* 
+        return strudel.reify(pat)._degradeByWith(
           strudel.rand.early(randOffset * _nextSeed()).segment(1),
-          operator.arguments_.amount,
-        );
-      // TODO: case 'fixed-step': "%"
+          op.arguments_.amount ?? 0.5,
+        ); 
+        */
+          pat = strudel.reify(pat).degradeBy(op.arguments_.amount === null ? 0.5 : op.arguments_.amount);
+          break;
+        }
+        default: {
+          console.warn(`operator "${op.type_}" not implemented`);
+        }
+      }
     }
-    console.warn(`operator "${operator.type_}" not implemented`);
-  }
-  if (options?.weight) {
-    // weight is handled by parent
-    return pat;
-  }
-  // TODO: bjorklund e.g. "c3(5,8)"
-  const unimplemented = Object.keys(options || {}).filter((key) => key !== 'operator');
-  if (unimplemented.length) {
-    console.warn(
-      `option${unimplemented.length > 1 ? 's' : ''} ${unimplemented.map((o) => `"${o}"`).join(', ')} not implemented`,
-    );
   }
+
   return pat;
 };
 
 function resolveReplications(ast) {
-  // the general idea here: x!3 = [x*3]@3
-  // could this be made easier?!
-  ast.source_ = ast.source_.map((child) => {
-    const { replicate, ...options } = child.options_ || {};
-    if (replicate) {
-      return {
-        ...child,
-        options_: { ...options, weight: replicate },
-        source_: {
-          type_: 'pattern',
-          arguments_: {
-            alignment: 'h',
-          },
-          source_: [
-            {
-              type_: 'element',
-              source_: child.source_,
-              location_: child.location_,
-              options_: {
-                operator: {
-                  type_: 'stretch',
-                  arguments_: { amount: Fraction(replicate).inverse().toString() },
-                },
-              },
-            },
-          ],
-        },
-      };
-    }
-    return child;
-  });
+  ast.source_ = strudel.flatten(
+    ast.source_.map((child) => {
+      const { reps } = child.options_ || {};
+      if (!reps) {
+        return [child];
+      }
+      delete child.options_.reps;
+      return Array(reps).fill(child);
+    }),
+  );
 }
 
-export function patternifyAST(ast) {
+export function patternifyAST(ast, code) {
   switch (ast.type_) {
     case 'pattern': {
       resolveReplications(ast);
-      const children = ast.source_.map(patternifyAST).map(applyOptions(ast));
+      const children = ast.source_.map((child) => patternifyAST(child, code)).map(applyOptions(ast, code));
       const alignment = ast.arguments_.alignment;
-      if (alignment === 'v') {
-        return stack(...children);
+      if (alignment === 'stack') {
+        return strudel.stack(...children);
       }
-      if (alignment === 'r') {
-        return strudel.chooseInWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), children);
+      if (alignment === 'polymeter') {
+        // polymeter
+        const stepsPerCycle = ast.arguments_.stepsPerCycle
+          ? patternifyAST(ast.arguments_.stepsPerCycle, code).fmap((x) => strudel.Fraction(x))
+          : strudel.pure(strudel.Fraction(children.length > 0 ? children[0].__weight : 1));
+
+        const aligned = children.map((child) => child.fast(stepsPerCycle.fmap((x) => x.div(child.__weight || 1))));
+        return strudel.stack(...aligned);
+      }
+      if (alignment === 'rand') {
+        // https://github.com/tidalcycles/strudel/issues/245#issuecomment-1345406422
+        // return strudel.chooseInWith(strudel.rand.early(randOffset * _nextSeed()).segment(1), children);
+        return strudel.chooseCycles(...children);
       }
       const weightedChildren = ast.source_.some((child) => !!child.options_?.weight);
-      if (!weightedChildren && alignment === 't') {
-        return slowcat(...children);
+      if (!weightedChildren && alignment === 'slowcat') {
+        return strudel.slowcat(...children);
       }
       if (weightedChildren) {
-        const pat = timeCat(...ast.source_.map((child, i) => [child.options_?.weight || 1, children[i]]));
-        if (alignment === 't') {
-          const weightSum = ast.source_.reduce((sum, child) => sum + (child.options_?.weight || 1), 0);
+        const weightSum = ast.source_.reduce((sum, child) => sum + (child.options_?.weight || 1), 0);
+        const pat = strudel.timeCat(...ast.source_.map((child, i) => [child.options_?.weight || 1, children[i]]));
+        if (alignment === 'slowcat') {
           return pat._slow(weightSum); // timecat + slow
         }
+        pat.__weight = weightSum;
         return pat;
       }
-      return sequence(...children);
+      const pat = strudel.sequence(...children);
+      pat.__weight = children.length;
+      return pat;
     }
     case 'element': {
+      return patternifyAST(ast.source_, code);
+    }
+    case 'atom': {
       if (ast.source_ === '~') {
-        return silence;
+        return strudel.silence;
       }
-      if (typeof ast.source_ !== 'object') {
-        /* if (!addMiniLocations) {
-          return ast.source_;
-        } */
-        if (!ast.location_) {
-          console.warn('no location for', ast);
-          return ast.source_;
-        }
-        const { start, end } = ast.location_;
-        const value = !isNaN(Number(ast.source_)) ? Number(ast.source_) : ast.source_;
-        // the following line expects the shapeshifter append .withMiniLocation
-        // because location_ is only relative to the mini string, but we need it relative to whole code
-        return pure(value).withLocation([start.line, start.column, start.offset], [end.line, end.column, end.offset]);
+      if (!ast.location_) {
+        console.warn('no location for', ast);
+        return ast.source_;
       }
-      return patternifyAST(ast.source_);
+      const { start, end } = ast.location_;
+      const value = !isNaN(Number(ast.source_)) ? Number(ast.source_) : ast.source_;
+      // the following line expects the shapeshifter append .withMiniLocation
+      // because location_ is only relative to the mini string, but we need it relative to whole code
+      // make sure whitespaces are not part of the highlight:
+      const actual = code?.split('').slice(start.offset, end.offset).join('');
+      const [offsetStart = 0, offsetEnd = 0] = actual
+        ? actual.split(ast.source_).map((p) => p.split('').filter((c) => c === ' ').length)
+        : [];
+      return strudel
+        .pure(value)
+        .withLocation(
+          [start.line, start.column + offsetStart, start.offset + offsetStart],
+          [start.line, end.column - offsetEnd, end.offset - offsetEnd],
+        );
     }
     case 'stretch':
-      return patternifyAST(ast.source_).slow(ast.arguments_.amount);
+      return patternifyAST(ast.source_, code).slow(patternifyAST(ast.arguments_.amount, code));
     /* case 'scale':
       let [tonic, scale] = Scale.tokenize(ast.arguments_.scale);
       const intervals = Scale.get(scale).intervals;
@@ -155,37 +179,33 @@ export function patternifyAST(ast) {
       }); */
     /* case 'struct':
       // TODO:
-      return silence; */
+      return strudel.silence; */
     default:
       console.warn(`node type "${ast.type_}" not implemented -> returning silence`);
-      return silence;
+      return strudel.silence;
   }
 }
 
 // mini notation only (wraps in "")
 export const mini = (...strings) => {
   const pats = strings.map((str) => {
-    const ast = krill.parse(`"${str}"`);
-    return patternifyAST(ast);
+    const code = `"${str}"`;
+    const ast = krill.parse(code);
+    return patternifyAST(ast, code);
   });
-  return sequence(...pats);
+  return strudel.sequence(...pats);
 };
 
 // includes haskell style (raw krill parsing)
 export const h = (string) => {
   const ast = krill.parse(string);
   // console.log('ast', ast);
-  return patternifyAST(ast);
+  return patternifyAST(ast, string);
 };
 
-// shorthand for mini
-Pattern.prototype.define('mini', mini, { composable: true });
-Pattern.prototype.define('m', mini, { composable: true });
-Pattern.prototype.define('h', h, { composable: true });
-
 export function minify(thing) {
   if (typeof thing === 'string') {
     return mini(thing);
   }
-  return reify(thing);
+  return strudel.reify(thing);
 }

packages/mini/package-lock.json

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

packages/mini/package.json

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

packages/mini/test/mini.test.mjs

@@ -9,8 +9,8 @@ import '@strudel.cycles/core/euclid.mjs';
 import { describe, expect, it } from 'vitest';
 
 describe('mini', () => {
-  const minV = (v) => mini(v).firstCycleValues;
-  const minS = (v) => mini(v).showFirstCycle;
+  const minV = (v) => mini(v).sortHapsByPart().firstCycleValues;
+  const minS = (v) => mini(v).sortHapsByPart().showFirstCycle;
   it('supports single elements', () => {
     expect(minV('a')).toEqual(['a']);
   });
@@ -21,6 +21,21 @@ describe('mini', () => {
     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 fast', () => {
+    expect(minS('a*3 b')).toEqual(minS('[a a a] b'));
+  });
+  it('supports patterned fast', () => {
+    expect(minS('[a*<3 5>]*2')).toEqual(minS('[a a a] [a a a a a]'));
+  });
+  it('supports slow', () => {
+    expect(minS('[a a a]/3 b')).toEqual(minS('a b'));
+  });
+  it('supports patterned slow', () => {
+    expect(minS('[a a a a a a a a]/[2 4]')).toEqual(minS('[a a] a'));
+  });
+  it('supports patterned fast', () => {
+    expect(minS('[a*<3 5>]*2')).toEqual(minS('[a a a] [a a a a a]'));
+  });
   it('supports slowcat', () => {
     expect(minV('<a b>')).toEqual(['a']);
   });
@@ -36,6 +51,16 @@ describe('mini', () => {
     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 curly brackets', () => {
+    expect(minS('{a b, c d e}*3')).toEqual(minS('[a b a b a b, c d e c d e]'));
+    expect(minS('{a b, c [d e] f}*3')).toEqual(minS('[a b a b a b, c [d e] f c [d e] f]'));
+    expect(minS('{a b c, d e}*2')).toEqual(minS('[a b c a b c, d e d e d e]'));
+  });
+  it('supports curly brackets with explicit step-per-cycle', () => {
+    expect(minS('{a b, c d e}%3')).toEqual(minS('[a b a, c d e]'));
+    expect(minS('{a b, c d e}%5')).toEqual(minS('[a b a b a, c d e c d]'));
+    expect(minS('{a b, c d e}%6')).toEqual(minS('[a b a b a b, c d e c d e]'));
+  });
   it('supports commas', () => {
     expect(minS('c3,e3,g3')).toEqual(['c3: 0 - 1', 'e3: 0 - 1', 'g3: 0 - 1']);
     expect(minS('[c3,e3,g3] f3')).toEqual(['c3: 0 - 1/2', 'e3: 0 - 1/2', 'g3: 0 - 1/2', 'f3: 1/2 - 1']);
@@ -46,10 +71,48 @@ describe('mini', () => {
   });
   it('supports replication', () => {
     expect(minS('a!3 b')).toEqual(['a: 0 - 1/4', 'a: 1/4 - 1/2', 'a: 1/2 - 3/4', 'b: 3/4 - 1']);
+    expect(minS('[<a b c>]!3 d')).toEqual(minS('<a b c> <a b c> <a b c> d'));
   });
   it('supports euclidean rhythms', () => {
     expect(minS('a(3, 8)')).toEqual(['a: 0 - 1/8', 'a: 3/8 - 1/2', 'a: 3/4 - 7/8']);
   });
+  it('supports patterning euclidean rhythms', () => {
+    expect(minS('[a(<3 5>, <8 16>)]*2')).toEqual(minS('a(3,8) a(5,16)'));
+  });
+  it("reproduces Toussaint's example euclidean algorithms", () => {
+    const checkEuclid = function (spec, target) {
+      expect(minS(`x(${spec[0]},${spec[1]})`)).toEqual(minS(target));
+    };
+    checkEuclid([1, 2], 'x ~');
+    checkEuclid([1, 3], 'x ~ ~');
+    checkEuclid([1, 4], 'x ~ ~ ~');
+    checkEuclid([4, 12], 'x ~ ~ x ~ ~ x ~ ~ x ~ ~');
+    checkEuclid([2, 5], 'x ~ x ~ ~');
+    // checkEuclid([3, 4], "x ~ x x"); // Toussaint is wrong..
+    checkEuclid([3, 4], 'x x x ~'); // correction
+    checkEuclid([3, 5], 'x ~ x ~ x');
+    checkEuclid([3, 7], 'x ~ x ~ x ~ ~');
+    checkEuclid([3, 8], 'x ~ ~ x ~ ~ x ~');
+    checkEuclid([4, 7], 'x ~ x ~ x ~ x');
+    checkEuclid([4, 9], 'x ~ x ~ x ~ x ~ ~');
+    checkEuclid([4, 11], 'x ~ ~ x ~ ~ x ~ ~ x ~');
+    // checkEuclid([5, 6], "x ~ x x x x"); // Toussaint is wrong..
+    checkEuclid([5, 6], 'x x x x x ~'); // correction
+    checkEuclid([5, 7], 'x ~ x x ~ x x');
+    checkEuclid([5, 8], 'x ~ x x ~ x x ~');
+    checkEuclid([5, 9], 'x ~ x ~ x ~ x ~ x');
+    checkEuclid([5, 11], 'x ~ x ~ x ~ x ~ x ~ ~');
+    checkEuclid([5, 12], 'x ~ ~ x ~ x ~ ~ x ~ x ~');
+    // checkEuclid([5, 16], "x ~ ~ x ~ ~ x ~ ~ x ~ ~ x ~ ~ ~ ~");  // Toussaint is wrong..
+    checkEuclid([5, 16], 'x ~ ~ x ~ ~ x ~ ~ x ~ ~ x ~ ~ ~'); // correction
+    // checkEuclid([7, 8], "x ~ x x x x x x"); // Toussaint is wrong..
+    checkEuclid([7, 8], 'x x x x x x x ~'); // Correction
+    checkEuclid([7, 12], 'x ~ x x ~ x ~ x x ~ x ~');
+    checkEuclid([7, 16], 'x ~ ~ x ~ x ~ x ~ ~ x ~ x ~ x ~');
+    checkEuclid([9, 16], 'x ~ x x ~ x ~ x ~ x x ~ x ~ x ~');
+    checkEuclid([11, 24], 'x ~ ~ x ~ x ~ x ~ x ~ x ~ ~ x ~ x ~ x ~ x ~ x ~');
+    checkEuclid([13, 24], 'x ~ x x ~ x ~ x ~ x ~ x ~ x x ~ x ~ x ~ x ~ x ~');
+  });
   it('supports the ? operator', () => {
     expect(
       mini('a?')
@@ -77,7 +140,7 @@ describe('mini', () => {
     expect(haps.length < 230).toBe(true);
     // 'Had too many cycles remaining after degradeBy 0.8');
   });
-  it('supports the random choice operator ("|") with nesting', () => {
+  /*it('supports the random choice operator ("|") with nesting', () => {
     const numCycles = 900;
     const haps = mini('a | [b | c] | [d | e | f]').queryArc(0, numCycles);
     // Should have about 1/3 a, 1/6 each of b | c, and 1/9 each of d | e | f.
@@ -103,5 +166,5 @@ describe('mini', () => {
     //  PRNG, this test should succeed
     expect(chisq <= 15.086).toBe(true);
     // assert(chisq <= 15.086, chisq + ' was expected to be less than 15.086 under chi-squared test');
-  });
+  });*/
 });

packages/osc/README.md

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

packages/osc/package-lock.json

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

packages/osc/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/osc",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "OSC messaging for strudel",
   "main": "osc.mjs",
   "scripts": {

packages/osc/server.js

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

packages/react/dist/index.es.js

@@ -1,15 +1,15 @@
-import n, { useCallback as _, useRef as H, useEffect as L, useMemo as V, useState as w, useLayoutEffect as j } from "react";
-import X from "@uiw/react-codemirror";
-import { Decoration as E, EditorView as U } from "@codemirror/view";
-import { StateEffect as $, StateField as G } from "@codemirror/state";
-import { javascript as Y } from "@codemirror/lang-javascript";
-import { tags as r } from "@lezer/highlight";
-import { createTheme as Z } from "@uiw/codemirror-themes";
-import { useInView as ee } from "react-hook-inview";
-import { webaudioOutput as te, getAudioContext as re } from "@strudel.cycles/webaudio";
-import { repl as oe } from "@strudel.cycles/core";
-import { transpiler as ne } from "@strudel.cycles/transpiler";
-const ae = Z({
+import l, { useCallback as N, useRef as k, useEffect as _, useMemo as K, useState as w, useLayoutEffect as G } from "react";
+import Z from "@uiw/react-codemirror";
+import { Decoration as y, EditorView as J } from "@codemirror/view";
+import { StateEffect as Q, StateField as X } from "@codemirror/state";
+import { javascript as ee } from "@codemirror/lang-javascript";
+import { tags as s } from "@lezer/highlight";
+import { createTheme as te } from "@uiw/codemirror-themes";
+import { repl as re, logger as ne, pianoroll as oe } from "@strudel.cycles/core";
+import { webaudioOutput as ae, getAudioContext as ce } from "@strudel.cycles/webaudio";
+import { useInView as se } from "react-hook-inview";
+import { transpiler as ie } from "@strudel.cycles/transpiler";
+const le = te({
   theme: "dark",
   settings: {
     background: "#222",
@@ -22,299 +22,380 @@ const ae = Z({
     gutterForeground: "#8a919966"
   },
   styles: [
-    { tag: r.keyword, color: "#c792ea" },
-    { tag: r.operator, color: "#89ddff" },
-    { tag: r.special(r.variableName), color: "#eeffff" },
-    { tag: r.typeName, color: "#c3e88d" },
-    { tag: r.atom, color: "#f78c6c" },
-    { tag: r.number, color: "#c3e88d" },
-    { tag: r.definition(r.variableName), color: "#82aaff" },
-    { tag: r.string, color: "#c3e88d" },
-    { tag: r.special(r.string), color: "#c3e88d" },
-    { tag: r.comment, color: "#7d8799" },
-    { tag: r.variableName, color: "#c792ea" },
-    { tag: r.tagName, color: "#c3e88d" },
-    { tag: r.bracket, color: "#525154" },
-    { tag: r.meta, color: "#ffcb6b" },
-    { tag: r.attributeName, color: "#c792ea" },
-    { tag: r.propertyName, color: "#c792ea" },
-    { tag: r.className, color: "#decb6b" },
-    { tag: r.invalid, color: "#ffffff" }
+    { tag: s.keyword, color: "#c792ea" },
+    { tag: s.operator, color: "#89ddff" },
+    { tag: s.special(s.variableName), color: "#eeffff" },
+    { tag: s.typeName, color: "#c3e88d" },
+    { tag: s.atom, color: "#f78c6c" },
+    { tag: s.number, color: "#c3e88d" },
+    { tag: s.definition(s.variableName), color: "#82aaff" },
+    { tag: s.string, color: "#c3e88d" },
+    { tag: s.special(s.string), color: "#c3e88d" },
+    { tag: s.comment, color: "#7d8799" },
+    { tag: s.variableName, color: "#c792ea" },
+    { tag: s.tagName, color: "#c3e88d" },
+    { tag: s.bracket, color: "#525154" },
+    { tag: s.meta, color: "#ffcb6b" },
+    { tag: s.attributeName, color: "#c792ea" },
+    { tag: s.propertyName, color: "#c792ea" },
+    { tag: s.className, color: "#decb6b" },
+    { tag: s.invalid, color: "#ffffff" }
   ]
 });
-const B = $.define(), se = G.define({
+const j = Q.define(), ue = X.define({
   create() {
-    return E.none;
+    return y.none;
   },
-  update(e, t) {
+  update(e, r) {
     try {
-      for (let o of t.effects)
-        if (o.is(B))
-          if (o.value) {
-            const a = E.mark({ attributes: { style: "background-color: #FFCA2880" } });
-            e = E.set([a.range(0, t.newDoc.length)]);
+      for (let t of r.effects)
+        if (t.is(j))
+          if (t.value) {
+            const a = y.mark({ attributes: { style: "background-color: #FFCA2880" } });
+            e = y.set([a.range(0, r.newDoc.length)]);
           } else
-            e = E.set([]);
+            e = y.set([]);
       return e;
-    } catch (o) {
-      return console.warn("flash error", o), e;
+    } catch (t) {
+      return console.warn("flash error", t), e;
     }
   },
-  provide: (e) => U.decorations.from(e)
-}), ce = (e) => {
-  e.dispatch({ effects: B.of(!0) }), setTimeout(() => {
-    e.dispatch({ effects: B.of(!1) });
+  provide: (e) => J.decorations.from(e)
+}), de = (e) => {
+  e.dispatch({ effects: j.of(!0) }), setTimeout(() => {
+    e.dispatch({ effects: j.of(!1) });
   }, 200);
-}, z = $.define(), ie = G.define({
+}, z = Q.define(), fe = X.define({
   create() {
-    return E.none;
+    return y.none;
   },
-  update(e, t) {
+  update(e, r) {
     try {
-      for (let o of t.effects)
-        if (o.is(z)) {
-          const a = o.value.map(
-            (s) => (s.context.locations || []).map(({ start: u, end: d }) => {
-              const f = s.context.color || "#FFCA28";
-              let c = t.newDoc.line(u.line).from + u.column, i = t.newDoc.line(d.line).from + d.column;
-              const m = t.newDoc.length;
-              return c > m || i > m ? void 0 : E.mark({ attributes: { style: `outline: 1.5px solid ${f};` } }).range(c, i);
+      for (let t of r.effects)
+        if (t.is(z)) {
+          const a = t.value.map(
+            (o) => (o.context.locations || []).map(({ start: i, end: u }) => {
+              const m = o.context.color || "#FFCA28";
+              let n = r.newDoc.line(i.line).from + i.column, d = r.newDoc.line(u.line).from + u.column;
+              const v = r.newDoc.length;
+              return n > v || d > v ? void 0 : y.mark({ attributes: { style: `outline: 1.5px solid ${m};` } }).range(n, d);
             })
           ).flat().filter(Boolean) || [];
-          e = E.set(a, !0);
+          e = y.set(a, !0);
         }
       return e;
     } catch {
-      return E.set([]);
+      return y.set([]);
     }
   },
-  provide: (e) => U.decorations.from(e)
-}), le = [Y(), ae, ie, se];
-function de({ value: e, onChange: t, onViewChanged: o, onSelectionChange: a, options: s, editorDidMount: u }) {
-  const d = _(
-    (i) => {
-      t?.(i);
+  provide: (e) => J.decorations.from(e)
+}), me = [ee(), le, fe, ue];
+function ge({ value: e, onChange: r, onViewChanged: t, onSelectionChange: a, options: o, editorDidMount: i }) {
+  const u = N(
+    (d) => {
+      r?.(d);
+    },
+    [r]
+  ), m = N(
+    (d) => {
+      t?.(d);
     },
     [t]
-  ), f = _(
-    (i) => {
-      o?.(i);
-    },
-    [o]
-  ), c = _(
-    (i) => {
-      i.selectionSet && a && a?.(i.state.selection);
+  ), n = N(
+    (d) => {
+      d.selectionSet && a && a?.(d.state.selection);
     },
     [a]
   );
-  return /* @__PURE__ */ n.createElement(n.Fragment, null, /* @__PURE__ */ n.createElement(X, {
+  return /* @__PURE__ */ l.createElement(l.Fragment, null, /* @__PURE__ */ l.createElement(Z, {
     value: e,
-    onChange: d,
-    onCreateEditor: f,
-    onUpdate: c,
-    extensions: le
+    onChange: u,
+    onCreateEditor: m,
+    onUpdate: n,
+    extensions: me
   }));
 }
-function K(...e) {
+function W(...e) {
   return e.filter(Boolean).join(" ");
 }
-function ue({ view: e, pattern: t, active: o, getTime: a }) {
-  const s = H([]), u = H();
-  L(() => {
+function pe({ view: e, pattern: r, active: t, getTime: a }) {
+  const o = k([]), i = k();
+  _(() => {
     if (e)
-      if (t && o) {
-        let d = requestAnimationFrame(function f() {
+      if (r && t) {
+        let u = requestAnimationFrame(function m() {
           try {
-            const c = a(), m = [Math.max(u.current || c, c - 1 / 10, 0), c + 1 / 60];
-            u.current = m[1], s.current = s.current.filter((g) => g.whole.end > c);
-            const h = t.queryArc(...m).filter((g) => g.hasOnset());
-            s.current = s.current.concat(h), e.dispatch({ effects: z.of(s.current) });
+            const n = a(), v = [Math.max(i.current || n, n - 1 / 10, 0), n + 1 / 60];
+            i.current = v[1], o.current = o.current.filter((p) => p.whole.end > n);
+            const h = r.queryArc(...v).filter((p) => p.hasOnset());
+            o.current = o.current.concat(h), e.dispatch({ effects: z.of(o.current) });
           } catch {
             e.dispatch({ effects: z.of([]) });
           }
-          d = requestAnimationFrame(f);
+          u = requestAnimationFrame(m);
         });
         return () => {
-          cancelAnimationFrame(d);
+          cancelAnimationFrame(u);
         };
       } else
-        s.current = [], e.dispatch({ effects: z.of([]) });
-  }, [t, o, e]);
+        o.current = [], e.dispatch({ effects: z.of([]) });
+  }, [r, t, e]);
 }
-const fe = "_container_3i85k_1", me = "_header_3i85k_5", ge = "_buttons_3i85k_9", pe = "_button_3i85k_9", he = "_buttonDisabled_3i85k_17", be = "_error_3i85k_21", ve = "_body_3i85k_25", v = {
-  container: fe,
-  header: me,
-  buttons: ge,
-  button: pe,
-  buttonDisabled: he,
-  error: be,
-  body: ve
-};
-function O({ type: e }) {
-  return /* @__PURE__ */ n.createElement("svg", {
+function he(e, r = !1) {
+  const t = k(), a = k(), o = (m) => {
+    if (a.current !== void 0) {
+      const n = m - a.current;
+      e(m, n);
+    }
+    a.current = m, t.current = requestAnimationFrame(o);
+  }, i = () => {
+    t.current = requestAnimationFrame(o);
+  }, u = () => {
+    t.current && cancelAnimationFrame(t.current), delete t.current;
+  };
+  return _(() => {
+    t.current && (u(), i());
+  }, [e]), _(() => (r && i(), u), []), {
+    start: i,
+    stop: u
+  };
+}
+function ve({ pattern: e, started: r, getTime: t, onDraw: a }) {
+  let o = k([]), i = k(null);
+  const { start: u, stop: m } = he(
+    N(() => {
+      const n = t();
+      if (i.current === null) {
+        i.current = n;
+        return;
+      }
+      const d = e.queryArc(Math.max(i.current, n - 1 / 10), n), v = 4;
+      i.current = n, o.current = (o.current || []).filter((h) => h.whole.end > n - v).concat(d.filter((h) => h.hasOnset())), a(n, o.current);
+    }, [e])
+  );
+  _(() => {
+    r ? u() : (o.current = [], m());
+  }, [r]);
+}
+function be(e) {
+  return _(() => (window.addEventListener("message", e), () => window.removeEventListener("message", e)), [e]), N((r) => window.postMessage(r, "*"), []);
+}
+function Ee({
+  defaultOutput: e,
+  interval: r,
+  getTime: t,
+  evalOnMount: a = !1,
+  initialCode: o = "",
+  autolink: i = !1,
+  beforeEval: u,
+  afterEval: m,
+  editPattern: n,
+  onEvalError: d,
+  onToggle: v,
+  canvasId: h
+}) {
+  const p = K(() => we(), []);
+  h = h || `canvas-${p}`;
+  const [F, A] = w(), [P, D] = w(), [b, q] = w(o), [x, V] = w(), [I, R] = w(), [L, B] = w(!1), H = b !== x, { scheduler: M, evaluate: c, start: f, stop: C, pause: O } = K(
+    () => re({
+      interval: r,
+      defaultOutput: e,
+      onSchedulerError: A,
+      onEvalError: (g) => {
+        D(g), d?.(g);
+      },
+      getTime: t,
+      transpiler: ie,
+      beforeEval: ({ code: g }) => {
+        q(g), u?.();
+      },
+      editPattern: n ? (g) => n(g, p) : void 0,
+      afterEval: ({ pattern: g, code: T }) => {
+        V(T), R(g), D(), A(), i && (window.location.hash = "#" + encodeURIComponent(btoa(T))), m?.();
+      },
+      onToggle: (g) => {
+        B(g), v?.(g);
+      }
+    }),
+    [e, r, t]
+  ), Y = be(({ data: { from: g, type: T } }) => {
+    T === "start" && g !== p && C();
+  }), S = N(
+    async (g = !0) => {
+      await c(b, g), Y({ type: "start", from: p });
+    },
+    [c, b]
+  ), U = k();
+  return _(() => {
+    !U.current && a && b && (U.current = !0, S());
+  }, [S, a, b]), _(() => () => {
+    M.stop();
+  }, [M]), {
+    id: p,
+    canvasId: h,
+    code: b,
+    setCode: q,
+    error: F || P,
+    schedulerError: F,
+    scheduler: M,
+    evalError: P,
+    evaluate: c,
+    activateCode: S,
+    activeCode: x,
+    isDirty: H,
+    pattern: I,
+    started: L,
+    start: f,
+    stop: C,
+    pause: O,
+    togglePlay: async () => {
+      L ? M.pause() : await S();
+    }
+  };
+}
+function we() {
+  return Math.floor((1 + Math.random()) * 65536).toString(16).substring(1);
+}
+function $({ type: e }) {
+  return /* @__PURE__ */ l.createElement("svg", {
     xmlns: "http://www.w3.org/2000/svg",
     className: "sc-h-5 sc-w-5",
     viewBox: "0 0 20 20",
     fill: "currentColor"
   }, {
-    refresh: /* @__PURE__ */ n.createElement("path", {
+    refresh: /* @__PURE__ */ l.createElement("path", {
       fillRule: "evenodd",
       d: "M4 2a1 1 0 011 1v2.101a7.002 7.002 0 0111.601 2.566 1 1 0 11-1.885.666A5.002 5.002 0 005.999 7H9a1 1 0 010 2H4a1 1 0 01-1-1V3a1 1 0 011-1zm.008 9.057a1 1 0 011.276.61A5.002 5.002 0 0014.001 13H11a1 1 0 110-2h5a1 1 0 011 1v5a1 1 0 11-2 0v-2.101a7.002 7.002 0 01-11.601-2.566 1 1 0 01.61-1.276z",
       clipRule: "evenodd"
     }),
-    play: /* @__PURE__ */ n.createElement("path", {
+    play: /* @__PURE__ */ l.createElement("path", {
       fillRule: "evenodd",
       d: "M10 18a8 8 0 100-16 8 8 0 000 16zM9.555 7.168A1 1 0 008 8v4a1 1 0 001.555.832l3-2a1 1 0 000-1.664l-3-2z",
       clipRule: "evenodd"
     }),
-    pause: /* @__PURE__ */ n.createElement("path", {
+    pause: /* @__PURE__ */ l.createElement("path", {
       fillRule: "evenodd",
       d: "M18 10a8 8 0 11-16 0 8 8 0 0116 0zM7 8a1 1 0 012 0v4a1 1 0 11-2 0V8zm5-1a1 1 0 00-1 1v4a1 1 0 102 0V8a1 1 0 00-1-1z",
       clipRule: "evenodd"
     })
   }[e]);
 }
-function Ee(e) {
-  return L(() => (window.addEventListener("message", e), () => window.removeEventListener("message", e)), [e]), _((t) => window.postMessage(t, "*"), []);
-}
-function we({
-  defaultOutput: e,
-  interval: t,
-  getTime: o,
-  evalOnMount: a = !1,
-  initialCode: s = "",
-  autolink: u = !1,
-  beforeEval: d,
-  afterEval: f,
-  onEvalError: c,
-  onToggle: i
-}) {
-  const m = V(() => ye(), []), [h, g] = w(), [C, N] = w(), [p, y] = w(s), [M, S] = w(), [k, D] = w(), [F, x] = w(!1), b = p !== M, { scheduler: A, evaluate: T, start: J, stop: q, pause: Q } = V(
-    () => oe({
-      interval: t,
-      defaultOutput: e,
-      onSchedulerError: g,
-      onEvalError: (l) => {
-        N(l), c?.(l);
-      },
-      getTime: o,
-      transpiler: ne,
-      beforeEval: ({ code: l }) => {
-        y(l), d?.();
-      },
-      afterEval: ({ pattern: l, code: P }) => {
-        S(P), D(l), N(), g(), u && (window.location.hash = "#" + encodeURIComponent(btoa(P))), f?.();
-      },
-      onToggle: (l) => {
-        x(l), i?.(l);
-      }
-    }),
-    [e, t, o]
-  ), W = Ee(({ data: { from: l, type: P } }) => {
-    P === "start" && l !== m && q();
-  }), R = _(
-    async (l = !0) => {
-      await T(p, l), W({ type: "start", from: m });
-    },
-    [T, p]
-  ), I = H();
-  return L(() => {
-    !I.current && a && p && (I.current = !0, R());
-  }, [R, a, p]), L(() => () => {
-    A.stop();
-  }, [A]), {
-    code: p,
-    setCode: y,
-    error: h || C,
-    schedulerError: h,
-    scheduler: A,
-    evalError: C,
-    evaluate: T,
-    activateCode: R,
-    activeCode: M,
-    isDirty: b,
-    pattern: k,
-    started: F,
-    start: J,
-    stop: q,
-    pause: Q,
-    togglePlay: async () => {
-      F ? A.pause() : await R();
-    }
-  };
-}
-function ye() {
-  return Math.floor((1 + Math.random()) * 65536).toString(16).substring(1);
-}
-const ke = () => re().currentTime;
-function Se({ tune: e, hideOutsideView: t = !1, init: o, enableKeyboard: a }) {
+const ye = "_container_3i85k_1", ke = "_header_3i85k_5", _e = "_buttons_3i85k_9", Fe = "_button_3i85k_9", Ce = "_buttonDisabled_3i85k_17", Ne = "_error_3i85k_21", xe = "_body_3i85k_25", E = {
+  container: ye,
+  header: ke,
+  buttons: _e,
+  button: Fe,
+  buttonDisabled: Ce,
+  error: Ne,
+  body: xe
+}, Me = () => ce().currentTime;
+function je({ tune: e, hideOutsideView: r = !1, enableKeyboard: t, withCanvas: a = !1, canvasHeight: o = 200 }) {
   const {
-    code: s,
+    code: i,
     setCode: u,
-    evaluate: d,
-    activateCode: f,
-    error: c,
-    isDirty: i,
-    activeCode: m,
-    pattern: h,
-    started: g,
-    scheduler: C,
-    togglePlay: N,
-    stop: p
-  } = we({
+    evaluate: m,
+    activateCode: n,
+    error: d,
+    isDirty: v,
+    activeCode: h,
+    pattern: p,
+    started: F,
+    scheduler: A,
+    togglePlay: P,
+    stop: D,
+    canvasId: b,
+    id: q
+  } = Ee({
     initialCode: e,
-    defaultOutput: te,
-    getTime: ke
-  }), [y, M] = w(), [S, k] = ee({
-    threshold: 0.01
-  }), D = H(), F = V(() => ((k || !t) && (D.current = !0), k || D.current), [k, t]);
-  return ue({
-    view: y,
-    pattern: h,
-    active: g && !m?.includes("strudel disable-highlighting"),
-    getTime: () => C.getPhase()
-  }), j(() => {
-    if (a) {
-      const x = async (b) => {
-        (b.ctrlKey || b.altKey) && (b.code === "Enter" ? (b.preventDefault(), ce(y), await f()) : b.code === "Period" && (p(), b.preventDefault()));
-      };
-      return window.addEventListener("keydown", x, !0), () => window.removeEventListener("keydown", x, !0);
+    defaultOutput: ae,
+    getTime: Me,
+    editPattern: (c, f) => c.withContext((C) => ({ ...C, id: f }))
+  });
+  ve({
+    pattern: p,
+    started: a && F,
+    getTime: () => A.now(),
+    onDraw: (c, f) => {
+      const C = document.querySelector("#" + b).getContext("2d");
+      oe({ ctx: C, time: c, haps: f, autorange: 1, fold: 1, playhead: 1 });
     }
-  }, [a, h, s, d, p, y]), /* @__PURE__ */ n.createElement("div", {
-    className: v.container,
-    ref: S
-  }, /* @__PURE__ */ n.createElement("div", {
-    className: v.header
-  }, /* @__PURE__ */ n.createElement("div", {
-    className: v.buttons
-  }, /* @__PURE__ */ n.createElement("button", {
-    className: K(v.button, g ? "sc-animate-pulse" : ""),
-    onClick: () => N()
-  }, /* @__PURE__ */ n.createElement(O, {
-    type: g ? "pause" : "play"
-  })), /* @__PURE__ */ n.createElement("button", {
-    className: K(i ? v.button : v.buttonDisabled),
-    onClick: () => f()
-  }, /* @__PURE__ */ n.createElement(O, {
+  });
+  const [x, V] = w(), [I, R] = se({
+    threshold: 0.01
+  }), L = k(), B = K(() => ((R || !r) && (L.current = !0), R || L.current), [R, r]);
+  pe({
+    view: x,
+    pattern: p,
+    active: F && !h?.includes("strudel disable-highlighting"),
+    getTime: () => A.getPhase()
+  }), G(() => {
+    if (t) {
+      const c = async (f) => {
+        (f.ctrlKey || f.altKey) && (f.code === "Enter" ? (f.preventDefault(), de(x), await n()) : f.code === "Period" && (D(), f.preventDefault()));
+      };
+      return window.addEventListener("keydown", c, !0), () => window.removeEventListener("keydown", c, !0);
+    }
+  }, [t, p, i, m, D, x]);
+  const [H, M] = w([]);
+  return Ae(
+    N((c) => {
+      const { data: f } = c.detail;
+      f?.hap?.context?.id === q && M((O) => O.concat([c.detail]).slice(-10));
+    }, [])
+  ), /* @__PURE__ */ l.createElement("div", {
+    className: E.container,
+    ref: I
+  }, /* @__PURE__ */ l.createElement("div", {
+    className: E.header
+  }, /* @__PURE__ */ l.createElement("div", {
+    className: E.buttons
+  }, /* @__PURE__ */ l.createElement("button", {
+    className: W(E.button, F ? "sc-animate-pulse" : ""),
+    onClick: () => P()
+  }, /* @__PURE__ */ l.createElement($, {
+    type: F ? "pause" : "play"
+  })), /* @__PURE__ */ l.createElement("button", {
+    className: W(v ? E.button : E.buttonDisabled),
+    onClick: () => n()
+  }, /* @__PURE__ */ l.createElement($, {
     type: "refresh"
-  }))), c && /* @__PURE__ */ n.createElement("div", {
-    className: v.error
-  }, c.message)), /* @__PURE__ */ n.createElement("div", {
-    className: v.body
-  }, F && /* @__PURE__ */ n.createElement(de, {
-    value: s,
+  }))), d && /* @__PURE__ */ l.createElement("div", {
+    className: E.error
+  }, d.message)), /* @__PURE__ */ l.createElement("div", {
+    className: E.body
+  }, B && /* @__PURE__ */ l.createElement(ge, {
+    value: i,
     onChange: u,
-    onViewChanged: M
-  })));
+    onViewChanged: V
+  })), a && /* @__PURE__ */ l.createElement("canvas", {
+    id: b,
+    className: "w-full pointer-events-none",
+    height: o,
+    ref: (c) => {
+      c && c.width !== c.clientWidth && (c.width = c.clientWidth);
+    }
+  }), !!H.length && /* @__PURE__ */ l.createElement("div", {
+    className: "sc-bg-gray-800 sc-rounded-md sc-p-2"
+  }, H.map(({ message: c }, f) => /* @__PURE__ */ l.createElement("div", {
+    key: f
+  }, c))));
 }
-const Te = (e) => j(() => (window.addEventListener("keydown", e, !0), () => window.removeEventListener("keydown", e, !0)), [e]);
+function Ae(e) {
+  De(ne.key, e);
+}
+function De(e, r, t = !1) {
+  _(() => (document.addEventListener(e, r, t), () => {
+    document.removeEventListener(e, r, t);
+  }), [r]);
+}
+const Ue = (e) => G(() => (window.addEventListener("keydown", e, !0), () => window.removeEventListener("keydown", e, !0)), [e]);
 export {
-  de as CodeMirror,
-  Se as MiniRepl,
-  K as cx,
-  ce as flash,
-  ue as useHighlighting,
-  Te as useKeydown,
-  Ee as usePostMessage,
-  we as useStrudel
+  ge as CodeMirror,
+  je as MiniRepl,
+  W as cx,
+  de as flash,
+  pe as useHighlighting,
+  Ue as useKeydown,
+  be as usePostMessage,
+  Ee as useStrudel
 };

packages/react/dist/style.css

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

packages/react/examples/nano-repl/vite.config.js

@@ -1,7 +1,7 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
+import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
 
 // https://vitejs.dev/config/
 export default defineConfig({
-  plugins: [react()]
-})
+  plugins: [react()],
+});

packages/react/index.html

@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-<!--     <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" /> -->
+    <!--     <link rel="icon" type="image/svg+xml" href="/src/favicon.svg" /> -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Strudel React Components</title>
   </head>

packages/react/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/react",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "React components for strudel",
   "main": "dist/index.cjs.js",
   "module": "dist/index.es.js",
@@ -39,10 +39,10 @@
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
     "@codemirror/lang-javascript": "^6.1.1",
-    "@strudel.cycles/core": "^0.4.1",
-    "@strudel.cycles/tone": "^0.4.1",
-    "@strudel.cycles/transpiler": "^0.4.1",
-    "@strudel.cycles/webaudio": "^0.4.2",
+    "@strudel.cycles/core": "^0.5.0",
+    "@strudel.cycles/tone": "^0.5.0",
+    "@strudel.cycles/transpiler": "^0.5.0",
+    "@strudel.cycles/webaudio": "^0.5.0",
     "@uiw/codemirror-themes": "^4.12.4",
     "@uiw/react-codemirror": "^4.12.4",
     "react-hook-inview": "^4.5.0"

packages/react/postcss.config.js

@@ -9,4 +9,4 @@ module.exports = {
     tailwindcss: {},
     autoprefixer: {},
   },
-}
+};

packages/react/src/components/MiniRepl.jsx

@@ -1,18 +1,21 @@
-import React, { useState, useMemo, useRef, useEffect, useLayoutEffect } from 'react';
+import { pianoroll } from '@strudel.cycles/core';
+import { getAudioContext, webaudioOutput } from '@strudel.cycles/webaudio';
+import React, { useLayoutEffect, useMemo, useRef, useState, useCallback, useEffect } from 'react';
 import { useInView } from 'react-hook-inview';
+import 'tailwindcss/tailwind.css';
 import cx from '../cx';
 import useHighlighting from '../hooks/useHighlighting.mjs';
-import CodeMirror6, { flash } from './CodeMirror6';
-import 'tailwindcss/tailwind.css';
-import './style.css';
-import styles from './MiniRepl.module.css';
-import { Icon } from './Icon';
-import { getAudioContext, webaudioOutput } from '@strudel.cycles/webaudio';
+import usePatternFrame from '../hooks/usePatternFrame.mjs';
 import useStrudel from '../hooks/useStrudel.mjs';
+import CodeMirror6, { flash } from './CodeMirror6';
+import { Icon } from './Icon';
+import styles from './MiniRepl.module.css';
+import './style.css';
+import { logger } from '@strudel.cycles/core';
 
 const getTime = () => getAudioContext().currentTime;
 
-export function MiniRepl({ tune, hideOutsideView = false, init, enableKeyboard }) {
+export function MiniRepl({ tune, hideOutsideView = false, enableKeyboard, withCanvas = false, canvasHeight = 200 }) {
   const {
     code,
     setCode,
@@ -26,11 +29,27 @@ export function MiniRepl({ tune, hideOutsideView = false, init, enableKeyboard }
     scheduler,
     togglePlay,
     stop,
+    canvasId,
+    id: replId,
   } = useStrudel({
     initialCode: tune,
     defaultOutput: webaudioOutput,
     getTime,
+    editPattern: (pat, id) => {
+      return pat.withContext((ctx) => ({ ...ctx, id }));
+    },
   });
+
+  usePatternFrame({
+    pattern,
+    started: withCanvas && started,
+    getTime: () => scheduler.now(),
+    onDraw: (time, haps) => {
+      const ctx = document.querySelector('#' + canvasId).getContext('2d');
+      pianoroll({ ctx, time, haps, autorange: 1, fold: 1, playhead: 1 });
+    },
+  });
+
   /*   useEffect(() => {
     init && activateCode();
   }, [init, activateCode]); */
@@ -72,6 +91,20 @@ export function MiniRepl({ tune, hideOutsideView = false, init, enableKeyboard }
     }
   }, [enableKeyboard, pattern, code, evaluate, stop, view]);
 
+  const [log, setLog] = useState([]);
+  useLogger(
+    useCallback((e) => {
+      const { data } = e.detail;
+      const logId = data?.hap?.context?.id;
+      // const logId = data?.pattern?.meta?.id;
+      if (logId === replId) {
+        setLog((l) => {
+          return l.concat([e.detail]).slice(-10);
+        });
+      }
+    }, []),
+  );
+
   return (
     <div className={styles.container} ref={ref}>
       <div className={styles.header}>
@@ -88,6 +121,40 @@ export function MiniRepl({ tune, hideOutsideView = false, init, enableKeyboard }
       <div className={styles.body}>
         {show && <CodeMirror6 value={code} onChange={setCode} onViewChanged={setView} />}
       </div>
+      {withCanvas && (
+        <canvas
+          id={canvasId}
+          className="w-full pointer-events-none"
+          height={canvasHeight}
+          ref={(el) => {
+            if (el && el.width !== el.clientWidth) {
+              el.width = el.clientWidth;
+            }
+          }}
+        ></canvas>
+      )}
+      {!!log.length && (
+        <div className="sc-bg-gray-800 sc-rounded-md sc-p-2">
+          {log.map(({ message }, i) => (
+            <div key={i}>{message}</div>
+          ))}
+        </div>
+      )}
     </div>
   );
 }
+
+// TODO: dedupe
+function useLogger(onTrigger) {
+  useEvent(logger.key, onTrigger);
+}
+
+// TODO: dedupe
+function useEvent(name, onTrigger, useCapture = false) {
+  useEffect(() => {
+    document.addEventListener(name, onTrigger, useCapture);
+    return () => {
+      document.removeEventListener(name, onTrigger, useCapture);
+    };
+  }, [onTrigger]);
+}

packages/react/src/hooks/useFrame.mjs

@@ -0,0 +1,43 @@
+import { useEffect, useRef } from 'react';
+
+function useFrame(callback, autostart = false) {
+  const requestRef = useRef();
+  const previousTimeRef = useRef();
+
+  const animate = (time) => {
+    if (previousTimeRef.current !== undefined) {
+      const deltaTime = time - previousTimeRef.current;
+      callback(time, deltaTime);
+    }
+    previousTimeRef.current = time;
+    requestRef.current = requestAnimationFrame(animate);
+  };
+
+  const start = () => {
+    requestRef.current = requestAnimationFrame(animate);
+  };
+  const stop = () => {
+    requestRef.current && cancelAnimationFrame(requestRef.current);
+    delete requestRef.current;
+  };
+  useEffect(() => {
+    if (requestRef.current) {
+      stop();
+      start();
+    }
+  }, [callback]);
+
+  useEffect(() => {
+    if (autostart) {
+      start();
+    }
+    return stop;
+  }, []); // Make sure the effect only runs once
+
+  return {
+    start,
+    stop,
+  };
+}
+
+export default useFrame;

packages/react/src/hooks/usePatternFrame.mjs

@@ -0,0 +1,34 @@
+import { useCallback, useEffect, useRef } from 'react';
+import 'tailwindcss/tailwind.css';
+import useFrame from '../hooks/useFrame.mjs';
+
+function usePatternFrame({ pattern, started, getTime, onDraw }) {
+  let visibleHaps = useRef([]);
+  let lastFrame = useRef(null);
+  const { start: startFrame, stop: stopFrame } = useFrame(
+    useCallback(() => {
+      const phase = getTime();
+      if (lastFrame.current === null) {
+        lastFrame.current = phase;
+        return;
+      }
+      const haps = pattern.queryArc(Math.max(lastFrame.current, phase - 1 / 10), phase);
+      const cycles = 4;
+      lastFrame.current = phase;
+      visibleHaps.current = (visibleHaps.current || [])
+        .filter((h) => h.whole.end > phase - cycles) // in frame
+        .concat(haps.filter((h) => h.hasOnset()));
+      onDraw(phase, visibleHaps.current);
+    }, [pattern]),
+  );
+  useEffect(() => {
+    if (started) {
+      startFrame();
+    } else {
+      visibleHaps.current = [];
+      stopFrame();
+    }
+  }, [started]);
+}
+
+export default usePatternFrame;

packages/react/src/hooks/useStrudel.mjs

@@ -12,10 +12,13 @@ function useStrudel({
   autolink = false,
   beforeEval,
   afterEval,
+  editPattern,
   onEvalError,
   onToggle,
+  canvasId,
 }) {
   const id = useMemo(() => s4(), []);
+  canvasId = canvasId || `canvas-${id}`;
   // scheduler
   const [schedulerError, setSchedulerError] = useState();
   const [evalError, setEvalError] = useState();
@@ -42,6 +45,7 @@ function useStrudel({
           setCode(code);
           beforeEval?.();
         },
+        editPattern: editPattern ? (pat) => editPattern(pat, id) : undefined,
         afterEval: ({ pattern: _pattern, code }) => {
           setActiveCode(code);
           setPattern(_pattern);
@@ -97,6 +101,8 @@ function useStrudel({
   };
   const error = schedulerError || evalError;
   return {
+    id,
+    canvasId,
     code,
     setCode,
     error,

packages/react/src/main.jsx

@@ -1,5 +1,10 @@
-import React from 'react'
-import ReactDOM from 'react-dom'
-import App from './App'
+import React from 'react';
+import ReactDOM from 'react-dom';
+import App from './App';
 
-ReactDOM.render(<React.StrictMode><App /></React.StrictMode>,document.getElementById('root'))
+ReactDOM.render(
+  <React.StrictMode>
+    <App />
+  </React.StrictMode>,
+  document.getElementById('root'),
+);

packages/serial/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/serial",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Webserial API for strudel",
   "main": "serial.mjs",
   "repository": {

packages/serial/serial.mjs

@@ -23,17 +23,16 @@ export async function getWriter(br = 38400) {
     const encoder = new TextEncoder();
     const writer = port.writable.getWriter();
     writeMessage = function (message, chk) {
-      const encoded = encoder.encode(message)
+      const encoded = encoder.encode(message);
       if (!chk) {
         writer.write(encoded);
-      }
-      else {
+      } else {
         const bytes = new Uint8Array(4);
         bytes[0] = 124; // | symbol
-        bytes[1] = (chk >> 8) & 0xFF;
-        bytes[2] = chk & 0xFF;
+        bytes[1] = (chk >> 8) & 0xff;
+        bytes[2] = chk & 0xff;
         bytes[3] = 59; // semicolon
-        const withchk = new Uint8Array(encoded.length+4)
+        const withchk = new Uint8Array(encoded.length + 4);
         withchk.set(encoded);
         withchk.set(bytes, encoded.length);
         writer.write(withchk);
@@ -48,12 +47,12 @@ const latency = 0.1;
 
 // crc16 (CCITT-FALSE) https://gist.github.com/tijnkooijmans/10981093
 function crc16(data) {
-  const length = data.length
+  const length = data.length;
   if (length == 0) {
     return 0;
   }
 
-  var crc = 0xFFFF;
+  var crc = 0xffff;
   for (var i = 0; i < length; ++i) {
     crc ^= data.charCodeAt(i) << 8;
     for (var j = 0; j < 8; ++j) {
@@ -64,7 +63,7 @@ function crc16(data) {
   return crc & 0xffff;
 }
 
-Pattern.prototype.serial = function (br=38400,sendcrc=false,singlecharids=false) {
+Pattern.prototype.serial = function (br = 38400, sendcrc = false, singlecharids = false) {
   return this.withHap((hap) => {
     if (!writeMessage) {
       getWriter(br);
@@ -96,7 +95,7 @@ Pattern.prototype.serial = function (br=38400,sendcrc=false,singlecharids=false)
           }
           message += ')';
           if (sendcrc) {
-            chk = crc16(message)
+            chk = crc16(message);
           }
         } else {
           for (const [key, val] of Object.entries(hap.value)) {
@@ -108,7 +107,9 @@ Pattern.prototype.serial = function (br=38400,sendcrc=false,singlecharids=false)
       }
       const offset = (time - currentTime + latency) * 1000;
 
-      window.setTimeout(function () {writeMessage(message, chk)}, offset);
+      window.setTimeout(function () {
+        writeMessage(message, chk);
+      }, offset);
     };
     return hap.setContext({ ...hap.context, onTrigger, dominantTrigger: true });
   });

packages/soundfonts/list.mjs

@@ -42,7 +42,7 @@ export const instruments = [
   '0031_FluidR3_GM_sf2_file',
   '0031_GeneralUserGS_sf2_file',
   '0031_SoundBlasterOld_sf2', // pianos until here
-  '0040_Aspirin_sf2_file', 
+  '0040_Aspirin_sf2_file',
   '0040_Chaos_sf2_file',
   '0040_FluidR3_GM_sf2_file', // rhodes
   '0040_GeneralUserGS_sf2_file', // staccato rhodes
@@ -59,7 +59,7 @@ export const instruments = [
   '0046_GeneralUserGS_sf2_file', // ?
   '0050_Aspirin_sf2_file', // glass organ
   '0050_Chaos_sf2_file', // short glass organ
-  '0050_FluidR3_GM_sf2_file',// long glass organ !
+  '0050_FluidR3_GM_sf2_file', // long glass organ !
   '0050_GeneralUserGS_sf2_file', // short glass organ
   '0050_JCLive_sf2_file', // glass organ
   '0050_SBLive_sf2', // ?
@@ -1635,7 +1635,7 @@ export const drums = [
   '81_4_Chaos_sf2_file',
 ];
 
-// see https://www.midi.org/specifications-old/item/gm-level-1-sound-set 
+// see https://www.midi.org/specifications-old/item/gm-level-1-sound-set
 export const instrumentNames = [];
 instrumentNames[0] = 'Acoustic Grand Piano: Piano';
 instrumentNames[1] = 'Bright Acoustic Piano: Piano';

packages/soundfonts/package-lock.json

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

packages/soundfonts/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/soundfonts",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Soundsfont support for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -22,8 +22,8 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
-    "@strudel.cycles/webaudio": "^0.4.2",
+    "@strudel.cycles/core": "^0.5.0",
+    "@strudel.cycles/webaudio": "^0.5.0",
     "sfumato": "^0.1.2",
     "soundfont2": "^0.4.0"
   },

packages/tonal/README.md

@@ -31,4 +31,4 @@ yields:
 
 ## Tonal API
 
-See "Tonal API" in the [Strudel Tutorial](https://strudel.tidalcycles.org/tutorial/)
+See "Tonal API" in the [Strudel Tutorial](https://strudel.tidalcycles.org/learn/tonal)

packages/tonal/index.mjs

@@ -1,2 +1,5 @@
 import './tonal.mjs';
 import './voicings.mjs';
+
+export * from './tonal.mjs';
+export * from './voicings.mjs';

packages/tonal/package-lock.json

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

packages/tonal/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/tonal",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Tonal functions for strudel",
   "main": "index.mjs",
   "type": "module",
@@ -25,7 +25,7 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
+    "@strudel.cycles/core": "^0.5.0",
     "@tonaljs/tonal": "^4.7.2",
     "chord-voicings": "^0.0.1",
     "webmidi": "^3.0.21"

packages/tonal/test/tonal.test.mjs

@@ -7,11 +7,27 @@ This program is free software: you can redistribute it and/or modify it under th
 // import { strict as assert } from 'assert';
 
 import '../tonal.mjs'; // need to import this to add prototypes
-import { pure } from '@strudel.cycles/core';
+import { pure, controls, seq } from '@strudel.cycles/core';
 import { describe, it, expect } from 'vitest';
+const { n } = controls;
 
 describe('tonal', () => {
   it('Should run tonal functions ', () => {
     expect(pure('c3').scale('C major').scaleTranspose(1).firstCycleValues).toEqual(['D3']);
   });
+  it('scale with plain values', () => {
+    expect(
+      seq(0, 1, 2)
+        .scale('C major')
+        .note()
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual(['C3', 'D3', 'E3']);
+  });
+  it('scale with n values', () => {
+    expect(
+      n(0, 1, 2)
+        .scale('C major')
+        .firstCycleValues.map((h) => h.note),
+    ).toEqual(['C3', 'D3', 'E3']);
+  });
 });

packages/tonal/tonal.mjs

@@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import { Note, Interval, Scale } from '@tonaljs/tonal';
-import { Pattern, mod } from '@strudel.cycles/core';
+import { register, _mod } from '@strudel.cycles/core';
 
 // transpose note inside scale by offset steps
 // function scaleOffset(scale: string, offset: number, note: string) {
@@ -29,7 +29,7 @@ function scaleOffset(scale, offset, note) {
   // TODO: find way to do this smarter
   while (Math.abs(i - noteIndex) < Math.abs(offset)) {
     i += direction;
-    const index = mod(i, notes.length);
+    const index = _mod(i, notes.length);
     if (direction < 0 && n[0] === 'C') {
       o += direction;
     }
@@ -74,8 +74,8 @@ function scaleOffset(scale, offset, note) {
  * "c2 c3".fast(2).transpose("<1P -2M 4P 3m>".slow(2)).note()
  */
 
-Pattern.prototype._transpose = function (intervalOrSemitones) {
-  return this.withHap((hap) => {
+export const transpose = register('transpose', function (intervalOrSemitones, pat) {
+  return pat.withHap((hap) => {
     const interval = !isNaN(Number(intervalOrSemitones))
       ? Interval.fromSemitones(intervalOrSemitones /*  as number */)
       : String(intervalOrSemitones);
@@ -87,11 +87,9 @@ Pattern.prototype._transpose = function (intervalOrSemitones) {
     // tone.js doesn't understand multiple sharps flats e.g. F##3 has to be turned into G3
     return hap.withValue(() => Note.simplify(Note.transpose(hap.value, interval)));
   });
-};
+});
 
 // example: transpose(3).late(0.2) will be equivalent to compose(transpose(3), late(0.2))
-// TODO: add Pattern.define(name, function, options) that handles all the meta programming stuff
-// TODO: find out how to patternify this function when it's standalone
 // e.g. `stack(c3).superimpose(transpose(slowcat(7, 5)))` or
 // or even `stack(c3).superimpose(transpose.slowcat(7, 5))` or
 
@@ -110,8 +108,8 @@ Pattern.prototype._transpose = function (intervalOrSemitones) {
  * .note()
  */
 
-Pattern.prototype._scaleTranspose = function (offset /* : number | string */) {
-  return this.withHap((hap) => {
+export const scaleTranspose = register('scaleTranspose', function (offset /* : number | string */, pat) {
+  return pat.withHap((hap) => {
     if (!hap.context.scale) {
       throw new Error('can only use scaleTranspose after .scale');
     }
@@ -120,7 +118,7 @@ Pattern.prototype._scaleTranspose = function (offset /* : number | string */) {
     }
     return hap.withValue(() => scaleOffset(hap.context.scale, Number(offset), hap.value));
   });
-};
+});
 
 /**
  * Turns numbers into notes in the scale (zero indexed). Also sets scale for other scale operations, like {@link Pattern#scaleTranspose}.
@@ -141,19 +139,16 @@ Pattern.prototype._scaleTranspose = function (offset /* : number | string */) {
  * .note()
  */
 
-Pattern.prototype._scale = function (scale /* : string */) {
-  return this.withHap((hap) => {
-    let note = hap.value;
+export const scale = register('scale', function (scale /* : string */, pat) {
+  return pat.withHap((hap) => {
+    const isObject = typeof hap.value === 'object';
+    let note = isObject ? hap.value.n : hap.value;
     const asNumber = Number(note);
     if (!isNaN(asNumber)) {
       let [tonic, scaleName] = Scale.tokenize(scale);
       const { pc, oct = 3 } = Note.get(tonic);
       note = scaleOffset(pc + ' ' + scaleName, asNumber, pc + oct);
     }
-    return hap.withValue(() => note).setContext({ ...hap.context, scale });
+    return hap.withValue(() => (isObject ? { ...hap.value, note } : note)).setContext({ ...hap.context, scale });
   });
-};
-
-Pattern.prototype.define('transpose', (a, pat) => pat.transpose(a), { composable: true, patternified: true });
-Pattern.prototype.define('scale', (a, pat) => pat.scale(a), { composable: true, patternified: true });
-Pattern.prototype.define('scaleTranspose', (a, pat) => pat.scaleTranspose(a), { composable: true, patternified: true });
+});

packages/tonal/voicings.mjs

@@ -4,31 +4,49 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern as _Pattern, stack, Hap, reify } from '@strudel.cycles/core';
+import { stack, register } from '@strudel.cycles/core';
 import _voicings from 'chord-voicings';
 const { dictionaryVoicing, minTopNoteDiff, lefthand } = _voicings.default || _voicings; // parcel module resolution fuckup
 
-const getVoicing = (chord, lastVoicing, range = ['F3', 'A4']) =>
-  dictionaryVoicing({
+export const voicingRegistry = {
+  lefthand: { dictionary: lefthand, range: ['F3', 'A4'] },
+};
+export const setVoicingRange = (name, range) => addVoicings(name, voicingRegistry[name].dictionary, range);
+
+/**
+ * Adds a new custom voicing dictionary.
+ *
+ * @name addVoicings
+ * @memberof Pattern
+ * @param {string} name identifier for the voicing dictionary
+ * @param {Object} dictionary maps chord symbol to possible voicings
+ * @param {Array} range min, max note
+ * @returns Pattern
+ * @example
+ * addVoicings('cookie', {
+ *   7: ['3M 7m 9M 12P 15P', '7m 10M 13M 16M 19P'],
+ *   '^7': ['3M 6M 9M 12P 14M', '7M 10M 13M 16M 19P'],
+ *   m7: ['8P 11P 14m 17m 19P', '5P 8P 11P 14m 17m'],
+ *   m7b5: ['3m 5d 8P 11P 14m', '5d 8P 11P 14m 17m'],
+ *   o7: ['3m 6M 9M 11A 15P'],
+ *   '7alt': ['3M 7m 10m 13m 15P'],
+ *   '7#11': ['7m 10m 13m 15P 17m'],
+ * }, ['C3', 'C6'])
+ * "<C^7 A7 Dm7 G7>".voicings('cookie').note()
+ */
+export const addVoicings = (name, dictionary, range = ['F3', 'A4']) => {
+  Object.assign(voicingRegistry, { [name]: { dictionary, range } });
+};
+
+const getVoicing = (chord, dictionaryName, lastVoicing) => {
+  const { dictionary, range } = voicingRegistry[dictionaryName];
+  return dictionaryVoicing({
     chord,
-    dictionary: lefthand,
+    dictionary,
     range,
     picker: minTopNoteDiff,
     lastVoicing,
   });
-
-const Pattern = _Pattern;
-
-Pattern.prototype.fmapNested = function (func) {
-  return new Pattern((span) =>
-    this.query(span)
-      .map((event) =>
-        reify(func(event))
-          .query(span)
-          .map((hap) => new Hap(event.whole, event.part, hap.value, hap.context)),
-      )
-      .flat(),
-  );
 };
 
 /**
@@ -37,32 +55,38 @@ Pattern.prototype.fmapNested = function (func) {
  *
  * @name voicings
  * @memberof Pattern
- * @param {range} range note range for possible voicings (optional, defaults to `['F3', 'A4']`)
+ * @param {string} dictionary which voicing dictionary to use.
  * @returns Pattern
  * @example
- * stack("<C^7 A7 Dm7 G7>".voicings(), "<C3 A2 D3 G2>").note()
+ * stack("<C^7 A7 Dm7 G7>".voicings('lefthand'), "<C3 A2 D3 G2>").note()
  */
 
-Pattern.prototype.voicings = function (range) {
-  let lastVoicing;
-  if (!range?.length) {
-    // allows to pass empty array, if too lazy to specify range
-    range = ['F3', 'A4'];
-  }
-  return this.fmapNested((event) => {
-    lastVoicing = getVoicing(event.value, lastVoicing, range);
-    return stack(...lastVoicing).withContext(() => ({
-      locations: event.context.locations || [],
-    }));
-  });
-};
+let lastVoicing; // this now has to be global until another solution is found :-/
+// it used to be local to the voicings function at evaluation time
+// but since register will patternify by default, means that
+// the function is called over and over again, resetting the lastVoicing variables
+export const voicings = register('voicings', function (dictionary, pat) {
+  return pat
+    .fmap((value) => {
+      lastVoicing = getVoicing(value, dictionary, lastVoicing);
+      return stack(...lastVoicing);
+    })
+    .outerJoin();
+});
 
-Pattern.prototype._rootNotes = function (octave = 2) {
-  return this.fmap((value) => {
+/**
+ * Maps the chords of the incoming pattern to root notes in the given octave.
+ *
+ * @name rootNotes
+ * @memberof Pattern
+ * @param {octave} octave octave to use
+ * @returns Pattern
+ * @example
+ * "<C^7 A7 Dm7 G7>".rootNotes(2).note()
+ */
+export const rootNotes = register('rootNotes', function (octave, pat) {
+  return pat.fmap((value) => {
     const root = value.match(/^([a-gA-G][b#]?).*$/)[1];
     return root + octave;
   });
-};
-
-Pattern.prototype.define('voicings', (range, pat) => pat.voicings(range), { composable: true });
-Pattern.prototype.define('rootNotes', (oct, pat) => pat.rootNotes(oct), { composable: true, patternified: true });
+});

packages/tone/README.md

@@ -1,5 +1,7 @@
 # @strudel.cycles/tone
 
+Note: This package still works but is no longer maintained in favor of `@strudel.cycles/webaudio`.
+
 This package adds Tone.js functions to strudel Patterns.
 
 ## Install
@@ -31,11 +33,3 @@ document.getElementById('play').addEventListener('click', async () => {
 
 [open in codesandbox](https://codesandbox.io/s/strudel-tone-example-5ph2te?file=/src/index.js:0-708)
 
-## API
-
-See "Tone API" in the [Strudel Tutorial](https://strudel.tidalcycles.org/tutorial/)
-
-## Dev Notes
-
-- `@tonejs/piano` has peer dependency on `webmidi@^2.5.1`! A newer version of webmidi will break.
-- If you use Tone in another package, make sure to `import { Tone } from '@strudel.cycles/tone`, to ensure you get the same AudioContext.

packages/tone/package-lock.json

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

packages/tone/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/tone",
-  "version": "0.4.1",
+  "version": "0.5.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.4.1",
+    "@strudel.cycles/core": "^0.5.0",
     "tone": "^14.7.77"
   }
 }

packages/tone/tone.mjs

@@ -4,18 +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 { Pattern } from '@strudel.cycles/core';
+import { register } from '@strudel.cycles/core';
 import * as _Tone from 'tone';
 
 // import Tone from here, to make sure to get the same AudioContext
 export const Tone = _Tone;
 
 const {
-  AutoFilter,
-  Destination,
   Filter,
   Gain,
-  isNote,
   Synth,
   PolySynth,
   MembraneSynth,
@@ -49,8 +46,8 @@ export const getDefaultSynth = () => {
 // https://www.charlie-roberts.com/gibberish/playground/
 
 // with this function, you can play the pattern with any tone synth
-Pattern.prototype.tone = function (instrument) {
-  return this.onTrigger((time, hap) => {
+export const tone = register('tone', function (instrument, pat) {
+  return pat.onTrigger((time, hap) => {
     let note;
     let velocity = hap.context?.velocity ?? 0.75;
     if (instrument instanceof PluckSynth) {
@@ -74,9 +71,7 @@ Pattern.prototype.tone = function (instrument) {
       instrument.triggerAttackRelease(note, hap.duration.valueOf(), time, velocity);
     }
   });
-};
-
-Pattern.prototype.define('tone', (type, pat) => pat.tone(type), { composable: true, patternified: false });
+});
 
 // synth helpers
 export const amsynth = (options) => new AMSynth(options);

packages/transpiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/transpiler",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Transpiler for strudel user code. Converts syntactically correct but semantically meaningless JS into evaluatable strudel code.",
   "main": "index.mjs",
   "scripts": {
@@ -24,7 +24,7 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.4.1",
+    "@strudel.cycles/core": "^0.5.0",
     "acorn": "^8.8.1",
     "escodegen": "^2.0.0",
     "estree-walker": "^3.0.1"

packages/transpiler/transpiler.mjs

@@ -1,7 +1,7 @@
 import escodegen from 'escodegen';
 import { parse } from 'acorn';
 import { walk } from 'estree-walker';
-import { isNote } from '@strudel.cycles/core';
+import { isNoteWithOctave } from '@strudel.cycles/core';
 
 export function transpiler(input, options = {}) {
   const { wrapAsync = false, addReturn = true, simpleLocs = false } = options;
@@ -25,11 +25,11 @@ export function transpiler(input, options = {}) {
         this.skip();
         return this.replace(miniWithLocation(value, node, simpleLocs));
       }
-      if (node.type === 'Identifier' && isNote(node.name)) {
+      // TODO: remove pseudo note variables?
+      if (node.type === 'Identifier' && isNoteWithOctave(node.name)) {
         this.skip();
         return this.replace({ type: 'Literal', value: node.name });
       }
-      // TODO:
     },
     leave(node, parent, prop, index) {},
   });

packages/webaudio/package-lock.json

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

packages/webaudio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/webaudio",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "description": "Web Audio helpers for Strudel",
   "main": "index.mjs",
   "type": "module",
@@ -30,6 +30,6 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.4.1"
+    "@strudel.cycles/core": "^0.5.0"
   }
 }

packages/webaudio/render.mjs

@@ -0,0 +1,313 @@
+import { toMidi, fromMidi } from '@strudel.cycles/core/util.mjs';
+// import './feedbackdelay.mjs';
+// import './reverb.mjs';
+
+// TODO: reuse as much logic as possible between webaudio.mjs and render.mjs
+
+const logger = console.log;
+
+export const splitSN = (s, n) => {
+  if (!s.includes(':')) {
+    return [s, n];
+  }
+  let [s2, n2] = s.split(':');
+  if (isNaN(Number(n2))) {
+    return [s, n];
+  }
+  return [s2, n2];
+};
+
+const getOscillator = (ac, { s, freq, t, duration, release }) => {
+  // make oscillator
+  const o = ac.createOscillator();
+  o.type = s || 'triangle';
+  o.frequency.value = Number(freq);
+  o.start(t);
+  o.stop(t + duration + release);
+  return o;
+};
+const getADSR = (ac, attack, decay, sustain, release, velocity, begin, end) => {
+  const gainNode = ac.createGain();
+  gainNode.gain.setValueAtTime(0, begin);
+  gainNode.gain.linearRampToValueAtTime(velocity, begin + attack); // attack
+  gainNode.gain.linearRampToValueAtTime(sustain * velocity, begin + attack + decay); // sustain start
+  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;
+};
+
+function gainNode(ac, value) {
+  const node = ac.createGain();
+  node.gain.value = value;
+  return node;
+}
+
+/* let delays = {};
+function getDelay(ac, orbit, delaytime, delayfeedback, t) {
+  if (!delays[orbit]) {
+    const dly = ac.createFeedbackDelay(1, delaytime, delayfeedback);
+    dly.start?.(t); // for some reason, this throws when audion extension is installed..
+    dly.connect(ac.destination);
+    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(ac, orbit, duration = 2) {
+  if (!reverbs[orbit]) {
+    const reverb = ac.createReverb(duration);
+    reverb.connect(ac.destination);
+    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;
+}
+
+const getFilter = (ac, type, frequency, Q) => {
+  const filter = ac.createBiquadFilter();
+  filter.type = type;
+  filter.frequency.value = frequency;
+  filter.Q.value = Q;
+  return filter;
+};
+
+// export const webaudioOutput = async (t, hap, ct, cps) => {
+export const renderHap = async (ac, hap, deadline) => {
+  const hapDuration = hap.duration;
+  /* if (isNote(hap.value)) {
+        // supports primitive hap values that look like notes
+        hap.value = { note: hap.value };
+      } */
+  if (typeof hap.value !== 'object') {
+    logger(
+      `hap.value "${hap.value}" is not supported by webaudio output. Hint: append .note() or .s() to the end`,
+      'error',
+    );
+    /*     throw new Error(
+        `hap.value "${hap.value}"" is not supported by webaudio output. Hint: append .note() or .s() to the end`,
+      ); */
+    return;
+  }
+  // calculate correct time (tone.js workaround)
+  let t = ac.currentTime + deadline;
+  // destructure value
+  let {
+    freq,
+    s,
+    bank,
+    sf,
+    clip = 0, // if 1, samples will be cut off when the hap ends
+    n = 0,
+    note,
+    gain = 0.8,
+    // low pass
+    lpf,
+    cutoff = lpf,
+    lpq = 1,
+    resonance = lpq,
+    // high pass
+    hpf,
+    hcutoff = hpf,
+    hpq = 1,
+    hresonance = hpq,
+    // band pass
+    bpf,
+    bandf = bpf,
+    bpq = 1,
+    bandq = bpq,
+    //
+    coarse,
+    crush,
+    shape,
+    pan,
+    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
+  // the chain will hold all audio nodes that connect to each other
+  const chain = [];
+  if (bank && s) {
+    s = `${bank}_${s}`;
+  }
+  if (typeof s === 'string') {
+    [s, n] = splitSN(s, n);
+  }
+  if (typeof note === 'string') {
+    [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 || 36;
+    if (typeof n === 'string') {
+      n = toMidi(n); // e.g. c3 => 48
+    }
+    // get frequency
+    if (!freq && typeof n === 'number') {
+      freq = fromMidi(n); // + 48);
+    }
+    // make oscillator
+    const o = getOscillator(ac, { t, s, freq, duration: hapDuration, release });
+    chain.push(o);
+    // level down oscillators as they are really loud compared to samples i've tested
+    chain.push(gainNode(ac, 0.3));
+    // TODO: make adsr work with samples without pops
+    // envelope
+    const adsr = getADSR(ac, attack, decay, sustain, release, 1, t, t + hapDuration);
+    chain.push(adsr);
+  } else {
+    // TODO: refactor sampler to node
+    /* 
+    // 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
+      return;
+    }
+    if (!s) {
+      console.warn('no sample specified');
+      return;
+    }
+    const soundfont = getSoundfontKey(s);
+    let bufferSource;
+
+    if (soundfont) {
+      // is soundfont
+      bufferSource = await globalThis.getFontBufferSource(soundfont, note || n, ac, freq);
+    } else {
+      // is sample from loaded samples(..)
+      bufferSource = await getSampleBufferSource(s, n, note, speed, freq);
+    }
+    // asny stuff above took too long?
+    if (ac.currentTime > t) {
+      logger(`[sampler] still loading sound "${s}:${n}"`, 'highlight');
+      // console.warn('sample still loading:', s, n);
+      return;
+    }
+    if (!bufferSource) {
+      console.warn('no buffer source');
+      return;
+    }
+    bufferSource.playbackRate.value = Math.abs(speed) * bufferSource.playbackRate.value;
+    if (unit === 'c') {
+      // are there other units?
+      bufferSource.playbackRate.value = bufferSource.playbackRate.value * bufferSource.buffer.duration;
+    }
+    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);
+    bufferSource.stop(t + duration + release);
+    const adsr = getADSR(ac, attack, decay, sustain, release, 1, t, t + duration);
+    chain.push(adsr); */
+  }
+
+  // gain stage
+  chain.push(gainNode(ac, gain));
+
+  // filters
+  cutoff !== undefined && chain.push(getFilter(ac, 'lowpass', cutoff, resonance));
+  hcutoff !== undefined && chain.push(getFilter(ac, 'highpass', hcutoff, hresonance));
+  bandf !== undefined && chain.push(getFilter(ac, 'bandpass', bandf, bandq));
+  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);
+  }
+
+  // last gain
+  const post = gainNode(ac, 1);
+  chain.push(post);
+  // post.connect(getDestination());
+  post.connect(ac.destination);
+
+  // TODO: refactor delay / reverb for node: extending nodes does not work..
+  // delay
+  /* let delaySend;
+  if (delay > 0 && delaytime > 0 && delayfeedback > 0) {
+    const delyNode = getDelay(ac, orbit, delaytime, delayfeedback, t);
+    delaySend = effectSend(post, delyNode, delay);
+  }
+  // reverb
+  let reverbSend;
+  if (room > 0 && roomsize > 0) {
+    const reverbNode = getReverb(ac, 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());
+};

packages/webaudio/sampler.mjs

@@ -1,4 +1,4 @@
-import { logger, toMidi } from '@strudel.cycles/core';
+import { logger, toMidi, valueToMidi } from '@strudel.cycles/core';
 import { getAudioContext } from './index.mjs';
 
 const bufferCache = {}; // string: Promise<ArrayBuffer>
@@ -20,9 +20,12 @@ function humanFileSize(bytes, si) {
   return bytes.toFixed(1) + ' ' + units[u];
 }
 
-export const getSampleBufferSource = async (s, n, note, speed) => {
+export const getSampleBufferSource = async (s, n, note, speed, freq) => {
   let transpose = 0;
-  let midi = typeof note === 'string' ? toMidi(note) : note || 36;
+  if (freq !== undefined && note !== undefined) {
+    logger('[sampler] hap has note and freq. ignoring note', 'warning');
+  }
+  let midi = valueToMidi({ freq, note }, 36);
   transpose = midi - 36; // C3 is middle C
 
   const ac = getAudioContext();

packages/webaudio/webaudio.mjs

@@ -4,7 +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/>.
 */
 
-// import { Pattern, getFrequency, patternify2 } from '@strudel.cycles/core';
 import * as strudel from '@strudel.cycles/core';
 import { fromMidi, logger, toMidi } from '@strudel.cycles/core';
 import './feedbackdelay.mjs';
@@ -196,9 +195,14 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {
       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`,
+    logger(
+      `hap.value "${hap.value}" is not supported by webaudio output. Hint: append .note() or .s() to the end`,
+      'error',
     );
+    /*     throw new Error(
+      `hap.value "${hap.value}"" is not supported by webaudio output. Hint: append .note() or .s() to the end`,
+    ); */
+    return;
   }
   // calculate correct time (tone.js workaround)
   let t = ac.currentTime + deadline;
@@ -212,12 +216,22 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {
     n = 0,
     note,
     gain = 0.8,
-    cutoff,
-    resonance = 1,
-    hcutoff,
-    hresonance = 1,
-    bandf,
-    bandq = 1,
+    // low pass
+    lpf,
+    cutoff = lpf,
+    lpq = 1,
+    resonance = lpq,
+    // high pass
+    hpf,
+    hcutoff = hpf,
+    hpq = 1,
+    hresonance = hpq,
+    // band pass
+    bpf,
+    bandf = bpf,
+    bpq = 1,
+    bandq = bpq,
+    //
     coarse,
     crush,
     shape,
@@ -289,10 +303,10 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {
 
     if (soundfont) {
       // is soundfont
-      bufferSource = await globalThis.getFontBufferSource(soundfont, note || n, ac);
+      bufferSource = await globalThis.getFontBufferSource(soundfont, note || n, ac, freq);
     } else {
       // is sample from loaded samples(..)
-      bufferSource = await getSampleBufferSource(s, n, note, speed);
+      bufferSource = await getSampleBufferSource(s, n, note, speed, freq);
     }
     // asny stuff above took too long?
     if (ac.currentTime > t) {
@@ -382,7 +396,7 @@ export const webaudioOutput = async (hap, deadline, hapDuration) => {
 
 export const webaudioOutputTrigger = (t, hap, ct, cps) => webaudioOutput(hap, t - ct, hap.duration / cps);
 
-Pattern.prototype.out = function () {
+Pattern.prototype.webaudio = function () {
   // TODO: refactor (t, hap, ct, cps) to (hap, deadline, duration) ?
   return this.onTrigger(webaudioOutputTrigger);
 };

packages/webdirt/package-lock.json

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

packages/webdirt/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/webdirt",
-  "version": "0.4.1",
+  "version": "0.5.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.4.1",
+    "@strudel.cycles/core": "^0.5.0",
     "WebDirt": "github:dktr0/WebDirt"
   }
 }

packages/xen/index.mjs

@@ -1,2 +1,4 @@
 import './xen.mjs';
 import './tune.mjs';
+
+export * from './xen.mjs';

packages/xen/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel.cycles/xen",
-  "version": "0.4.1",
+  "version": "0.5.0",
   "description": "Xenharmonic API for strudel",
   "main": "index.mjs",
   "scripts": {
@@ -24,6 +24,6 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "^0.4.1"
+    "@strudel.cycles/core": "^0.5.0"
   }
 }

packages/xen/tune.mjs

@@ -5,18 +5,16 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 import Tune from './tunejs.js';
-import { Pattern } from '@strudel.cycles/core';
+import { register } from '@strudel.cycles/core';
 
-Pattern.prototype._tune = function (scale, tonic = 220) {
+export const tune = register('tune', (scale, pat) => {
   const tune = new Tune();
   if (!tune.isValidScale(scale)) {
     throw new Error('not a valid tune.js scale name: "' + scale + '". See http://abbernie.github.io/tune/scales.html');
   }
   tune.loadScale(scale);
-  tune.tonicize(tonic);
-  return this._asNumber()._withHap((hap) => {
-    return hap.withValue(() => tune.note(hap.value)).setContext({ ...hap.context, type: 'frequency' });
+  tune.tonicize(1);
+  return pat.withHap((hap) => {
+    return hap.withValue(() => tune.note(hap.value));
   });
-};
-
-Pattern.prototype.define('tune', (scale, pat) => pat.tune(scale), { composable: true, patternified: true });
+});

packages/xen/xen.mjs

@@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern, mod } from '@strudel.cycles/core';
+import { register, _mod, parseNumeral } from '@strudel.cycles/core';
 
 export function edo(name) {
   if (!/^[1-9]+[0-9]*edo$/.test(name)) {
@@ -42,26 +42,23 @@ function getXenScale(scale, indices) {
 }
 
 function xenOffset(xenScale, offset, index = 0) {
-  const i = mod(index + offset, xenScale.length);
+  const i = _mod(index + offset, xenScale.length);
   const oct = Math.floor(offset / xenScale.length);
   return xenScale[i] * Math.pow(2, oct);
 }
 
 // scaleNameOrRatios: string || number[], steps?: number
-Pattern.prototype._xen = function (scaleNameOrRatios, steps) {
-  return this._asNumber()._withHap((hap) => {
+export const xen = register('xen', function (scaleNameOrRatios, pat) {
+  return pat.withHap((hap) => {
     const scale = getXenScale(scaleNameOrRatios);
-    steps = steps || scale.length;
-    const frequency = xenOffset(scale, hap.value);
-    return hap.withValue(() => frequency).setContext({ ...hap.context, type: 'frequency' });
+    const frequency = xenOffset(scale, parseNumeral(hap.value));
+    return hap.withValue(() => frequency);
   });
-};
+});
 
-Pattern.prototype.tuning = function (steps) {
-  return this._asNumber()._withHap((hap) => {
-    const frequency = xenOffset(steps, hap.value);
-    return hap.withValue(() => frequency).setContext({ ...hap.context, type: 'frequency' });
+export const tuning = register('tuning', function (ratios, pat) {
+  return pat.withHap((hap) => {
+    const frequency = xenOffset(ratios, parseNumeral(hap.value));
+    return hap.withValue(() => frequency);
   });
-};
-Pattern.prototype.define('xen', (scale, pat) => pat.xen(scale), { composable: true, patternified: true });
-// Pattern.prototype.define('tuning', (scale, pat) => pat.xen(scale), { composable: true, patternified: false });
+});

paper/Makefile

@@ -0,0 +1,16 @@
+all: iclc2023.pdf iclc2023.html
+
+clean:
+	rm iclc2023.pdf iclc2023.html
+
+iclc2023.html: iclc2023.md citations.json
+	pandoc --template=pandoc/iclc.html --citeproc --number-sections iclc2023.md -o iclc2023.html
+
+iclc2023.pdf: iclc2023.md citations.json pandoc/iclc.latex pandoc/iclc.sty
+	pandoc --template=pandoc/iclc.latex --citeproc --number-sections iclc2023.md -o iclc2023.pdf
+
+iclc2023.docx: iclc2023.md citations.json
+	pandoc --citeproc --number-sections iclc2023.md -o iclc2023.docx
+
+iclc2023x.pdf: iclc2023.md citations.json pandoc/iclc.latex pandoc/iclc.sty
+	pandoc --template=pandoc/iclc.latex --citeproc --number-sections iclc2023.md --pdf-engine=xelatex -o iclc2023x.pdf

paper/README.md

@@ -1,8 +1,22 @@
+# paper
+
+## iclc2023
+
+from the strudel project root:
+
+```sh
+npm run iclc
+npm run iclc-nocite # try this if you get an error
+```
+
+## old
+
 Work in progress on a paper about strudel
 
 To build you will need
-* pandoc
-  * pandoc-url2cite (`npm install -g pandoc-url2cite`)
-* latex/xelatex 
-* python
-  * pandocfilters (`pip3 install pandocfilters`)
+
+- pandoc
+  - pandoc-url2cite (`npm install -g pandoc-url2cite`)
+- latex/xelatex
+- python
+  - pandocfilters (`pip3 install pandocfilters`)

paper/citations.json

@@ -926,5 +926,7 @@
   {"id":"zhangDynamicFMRIStudy2006","abstract":"Functional MRI (fMRI) combined with the paired-stimuli paradigms (referred as dynamic fMRI) was used to study the illusory double-flash effect on brain activity in the human visual cortex. Three experiments were designed. The first two experiments aimed to examine the cross-modal neural interaction between the visual and auditory sensory systems caused by the illusory double-flash effect using combined auditory (beep sound) and visual (light flash) stimuli. The fMRI signal in the visual cortex was significantly increased in response to the illusory double flashes compared to the physical single flash when the inter-stimuli delay between the auditory and visual stimuli was 25 ms. This increase disappeared when the delay was prolonged to ∼300 ms. These results reveal that the illusory double-flash effect can significantly affect the brain activity in the visual cortex, and the degree of this effect is dynamically sensitive to the inter-stimuli delay. The third experiment was to address the spatial differentiation of brain activation in the visual cortex in response to the illusory double-flash stimulation. It was found that the illusory double-flash effect in the human visual cortex is much stronger in the periphery than the fovea. This finding suggests that the periphery may be involved in high-level brain processing beyond the retinotopic visual perception. The behavioral measures conducted in this study indicate an excellent correlation between the fMRI results and behavioral performance. Finally, this work demonstrates a unique merit of fMRI for providing both temporal and spatial information regarding cross-modal neural interaction between different sensory systems.","author":[{"family":"Zhang","given":"Nanyin"},{"family":"Chen","given":"Wei"}],"citation-key":"zhangDynamicFMRIStudy2006","container-title":"Experimental Brain Research","DOI":"10.1007/s00221-005-0304-7","ISSN":"0014-4819","issue":"1","issued":{"date-parts":[[2006,6]]},"page":"57–66","title":"A dynamic fMRI study of illusory double-flash effect on human visual cortex","type":"article-journal","URL":"http://dx.doi.org/10.1007/s00221-005-0304-7","volume":"172"},
   {"id":"zimmermannMiningVersionHistories2005","abstract":"We apply data mining to version histories in order to guide programmers along related changes: \"Programmers who changed these functions also changed....\" Given a set of existing changes, the mined association rules 1) suggest and predict likely further changes, 2) show up item coupling that is undetectable by program analysis, and 3) can prevent errors due to incomplete changes. After an initial change, our ROSE prototype can correctly predict further locations to be changed; the best predictive power is obtained for changes to existing software. In our evaluation based on the history of eight popular open source projects, ROSE's topmost three suggestions contained a correct location with a likelihood of more than 70 percent.","author":[{"family":"Zimmermann","given":"T."},{"family":"Zeller","given":"A."},{"family":"Weissgerber","given":"P."},{"family":"Diehl","given":"S."}],"citation-key":"zimmermannMiningVersionHistories2005","container-title":"Software Engineering, IEEE Transactions on","container-title-short":"Software Engineering, IEEE Transactions on","DOI":"10.1109/tse.2005.72","ISSN":"0098-5589","issue":"6","issued":{"date-parts":[[2005,6]]},"page":"429–445","title":"Mining version histories to guide software changes","type":"article-journal","URL":"http://dx.doi.org/10.1109/tse.2005.72","volume":"31"},
   {"id":"zittrainFutureInternetHow2009","author":[{"family":"Zittrain","given":"Jonathan"}],"citation-key":"zittrainFutureInternetHow2009","ISBN":"0-300-15124-1","issued":{"date-parts":[[2009,3]]},"note":"Published: Paperback","publisher":"Yale University Press","title":"The Future of the Internet–And How to Stop It","type":"book","URL":"http://www.worldcat.org/isbn/0300151241"},
-  {"id":"zivanovicDevelopmentCyberneticSculptor2005","abstract":"Edward Ihnatowicz (1926-1988) built one of the world's first computer-controlled robotic sculptures, The Senster, in 1968-70. Rather than concentrate entirely on this groundbreaking and influential piece of work, this paper describes the stages he went through in developing his ideas, as an illustration of how a conventional artist became a cybernetic sculptor.","author":[{"family":"Zivanovic","given":"Aleksandar"}],"citation-key":"zivanovicDevelopmentCyberneticSculptor2005","container-title":"C&C '05: Proceedings of the 5th conference on Creativity & cognition","DOI":"10.1145/1056224.1056240","event-place":"London, United Kingdom","ISBN":"1-59593-025-6","issued":{"date-parts":[[2005]]},"page":"102–108","publisher":"ACM","publisher-place":"London, United Kingdom","title":"The development of a cybernetic sculptor: Edward Ihnatowicz and the senster","type":"paper-conference","URL":"http://dx.doi.org/10.1145/1056224.1056240"}
+  {"id":"zivanovicDevelopmentCyberneticSculptor2005","abstract":"Edward Ihnatowicz (1926-1988) built one of the world's first computer-controlled robotic sculptures, The Senster, in 1968-70. Rather than concentrate entirely on this groundbreaking and influential piece of work, this paper describes the stages he went through in developing his ideas, as an illustration of how a conventional artist became a cybernetic sculptor.","author":[{"family":"Zivanovic","given":"Aleksandar"}],"citation-key":"zivanovicDevelopmentCyberneticSculptor2005","container-title":"C&C '05: Proceedings of the 5th conference on Creativity & cognition","DOI":"10.1145/1056224.1056240","event-place":"London, United Kingdom","ISBN":"1-59593-025-6","issued":{"date-parts":[[2005]]},"page":"102–108","publisher":"ACM","publisher-place":"London, United Kingdom","title":"The development of a cybernetic sculptor: Edward Ihnatowicz and the senster","type":"paper-conference","URL":"http://dx.doi.org/10.1145/1056224.1056240"},
+  {"id":"CsoundWebAssembly","abstract":"This paper describes WebAssembly AudioWorklet (WAAW)\r\nCsound, one of the implementations of Web Audio Csound.\r\nWe begin by introducing the background to this current implementation, stemming from the two first ports of Csound\r\nto the web platform using Native Clients and asm.js. The\r\ntechnology of WebAssembly is then introduced and discussed in its more relevant aspects. The AudioWorklet interface of Web Audio API is explored, together with its use in\r\nWAAW Csound. We complement this discussion by considering the overarching question of support for multiple platforms, which implement different versions of Web Audio.\r\nSome initial examples of the system are presented to illustrate various potential applications. Finally, we complement\r\nthe paper by discussing current issues that are fundamental\r\nfor this project and others that rely on the development of\r\na robust support for WASM-based audio computing.","author":[{"family":"Yi","given":"Steven"},{"family":"Lazzarini","given":"Victor"},{"family":"Costello","given":"Edward"}],"citation-key":"CsoundWebAssembly","event-place":"Berlin, Germany","issued":{"date-parts":[[2018]]},"publisher-place":"Berlin, Germany","title":"WebAssembly AudioWorklet Csound","type":"paper-conference","URL":"https://mural.maynoothuniversity.ie/16018/"},
+  {"id":"StrudelWAC2022","publisher":"Zenodo","DOI":"10.5281/zenodo.6768844","language":"eng","title":"Strudel: Algorithmic Patterns for the Web","issued":{"date-parts":[[2022,6,28]]},"abstract":"This paper introduces Strudel (or sometimes StrudelCycles), an alternative implementation of the Tidal (or Tidal-Cycles) live coding system, using the JavaScript programming language. Strudel is an attempt to make live coding more accessible, by creating a system that runs entirely in the browser, while opening Tidals approach to algorithmic patterns (Mclean 2020) up to modern audio/visual web technologies. The Strudel REPL is a live code editor dedicated to manipulating Strudel patterns while they play, with builtin visual feedback. While Strudel is written in JavaScript, the API is optimized for simplicity and readability by applying code transformations on the syntax tree level, allowing language operations that would otherwise be impossible. The application supports multiple ways to output sound, including Tone.js, Web Audio nodes, OSC (Open Sound Control) messages, Web Serial andWeb MIDI. The project is split into multiple packages, allowing granular reuse in other applications. Apart from TidalCycles, Strudel draws inspiration from many prior existing projects like TidalVortex (McLean et al. 2022), Gibber (Roberts and Kuchera-morin 2012), Estuary (Ogborn et al. 2017), Hydra (Jack [2022] 2022), Ocarina (Solomon [2021] 2022) and Feedforward (McLean 2020).","author":[{"family":"Roos", "given":"Felix "},{"family":"McLean","given":"Alex"}],"note":"Demo paper","event-place":"Cannes, France","type":"paper-conference","event":"Web Audio Conference 2022 (WAC 2022)"}
 ]

paper/iclc2023.html

@@ -0,0 +1,818 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <meta http-equiv="Content-Style-Type" content="text/css" />
+  <meta name="generator" content="pandoc" />
+  <meta name="date" content="2022-12-14" />
+  <title>Strudel: live coding patterns on the Web</title>
+  <style type="text/css">code{white-space: pre;}</style>
+  <style type="text/css">
+pre > code.sourceCode { white-space: pre; position: relative; }
+pre > code.sourceCode > span { display: inline-block; line-height: 1.25; }
+pre > code.sourceCode > span:empty { height: 1.2em; }
+.sourceCode { overflow: visible; }
+code.sourceCode > span { color: inherit; text-decoration: inherit; }
+div.sourceCode { margin: 1em 0; }
+pre.sourceCode { margin: 0; }
+@media screen {
+div.sourceCode { overflow: auto; }
+}
+@media print {
+pre > code.sourceCode { white-space: pre-wrap; }
+pre > code.sourceCode > span { text-indent: -5em; padding-left: 5em; }
+}
+pre.numberSource code
+  { counter-reset: source-line 0; }
+pre.numberSource code > span
+  { position: relative; left: -4em; counter-increment: source-line; }
+pre.numberSource code > span > a:first-child::before
+  { content: counter(source-line);
+    position: relative; left: -1em; text-align: right; vertical-align: baseline;
+    border: none; display: inline-block;
+    -webkit-touch-callout: none; -webkit-user-select: none;
+    -khtml-user-select: none; -moz-user-select: none;
+    -ms-user-select: none; user-select: none;
+    padding: 0 4px; width: 4em;
+    color: #aaaaaa;
+  }
+pre.numberSource { margin-left: 3em; border-left: 1px solid #aaaaaa;  padding-left: 4px; }
+div.sourceCode
+  {   }
+@media screen {
+pre > code.sourceCode > span > a:first-child::before { text-decoration: underline; }
+}
+code span.al { color: #ff0000; font-weight: bold; } /* Alert */
+code span.an { color: #60a0b0; font-weight: bold; font-style: italic; } /* Annotation */
+code span.at { color: #7d9029; } /* Attribute */
+code span.bn { color: #40a070; } /* BaseN */
+code span.bu { color: #008000; } /* BuiltIn */
+code span.cf { color: #007020; font-weight: bold; } /* ControlFlow */
+code span.ch { color: #4070a0; } /* Char */
+code span.cn { color: #880000; } /* Constant */
+code span.co { color: #60a0b0; font-style: italic; } /* Comment */
+code span.cv { color: #60a0b0; font-weight: bold; font-style: italic; } /* CommentVar */
+code span.do { color: #ba2121; font-style: italic; } /* Documentation */
+code span.dt { color: #902000; } /* DataType */
+code span.dv { color: #40a070; } /* DecVal */
+code span.er { color: #ff0000; font-weight: bold; } /* Error */
+code span.ex { } /* Extension */
+code span.fl { color: #40a070; } /* Float */
+code span.fu { color: #06287e; } /* Function */
+code span.im { color: #008000; font-weight: bold; } /* Import */
+code span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Information */
+code span.kw { color: #007020; font-weight: bold; } /* Keyword */
+code span.op { color: #666666; } /* Operator */
+code span.ot { color: #007020; } /* Other */
+code span.pp { color: #bc7a00; } /* Preprocessor */
+code span.sc { color: #4070a0; } /* SpecialChar */
+code span.ss { color: #bb6688; } /* SpecialString */
+code span.st { color: #4070a0; } /* String */
+code span.va { color: #19177c; } /* Variable */
+code span.vs { color: #4070a0; } /* VerbatimString */
+code span.wa { color: #60a0b0; font-weight: bold; font-style: italic; } /* Warning */
+  </style>
+  <link rel="stylesheet" href="css/iclc.css" />
+</head>
+<body>
+<div id="header">
+<h1 class="title">Strudel: live coding patterns on the Web</h1>
+<ul id="authorlist">
+<li>true</li>
+<li>true</li>
+</ul>
+<h3 class="date">2022-12-14</h3>
+</div>
+
+<h2 class="abstract">Abstract</h2>
+<div id="abstract">
+<p>This paper introduces Strudel, which brings the TidalCycles approach
+to live coding algorithmic patterns to native JavaScript and the web. We
+begin by giving a little background of the first year of development,
+before sharing some detail about its implementation and examples of use.
+We go on to outline the wide range of synthesis and other outputs
+available in Strudel, including WebAudio, MIDI, OSC (for SuperDirt),
+WebSerial and CSound, and introduce Strudel’s REPL live editor,
+including its built-in visualisations. We then compare Strudel with
+Tidal, the trade-offs involved between JavaScript and Haskell, and the
+unique capabilities offered by Strudel for aligning patterns.</p>
+</div>
+
+<h1 data-number="1" id="introduction"><span
+class="header-section-number">1</span> Introduction</h1>
+<p>In the following paper, we introduce <em>Strudel</em>, an alternative
+implementation of the TidalCycles (or ‘Tidal’ for short) live coding
+system, using the JavaScript programming language. Strudel is an attempt
+to make live coding more accessible, by creating a system that runs
+entirely in the browser, while opening Tidal’s approach to algorithmic
+patterns <span class="citation"
+data-cites="mcleanAlgorithmicPattern2020a">(Mclean 2020)</span> up to
+modern audio/visual web technologies. The Strudel REPL is a live code
+editor dedicated to manipulating patterns while they play, with builtin
+visual feedback. While Strudel is written in JavaScript, the API is
+optimized for simplicity and readability by applying code
+transformations on the syntax tree level, allowing language operations
+that would otherwise be impossible. The application supports multiple
+ways to output sound, including Tone.js, Web Audio Nodes, OSC (Open
+Sound Control) messages, Web Serial, Web MIDI and Csound. The project is
+split into multiple packages, allowing granular reuse in other
+applications. Apart from TidalCycles, Strudel draws inspiration from
+many prior existing projects like TidalVortex <span class="citation"
+data-cites="mcleanTidalVortexZero2022">(McLean et al. 2022)</span>,
+Gibber <span class="citation"
+data-cites="robertsGibberLiveCoding2012">(Roberts and Kuchera-morin
+2012)</span>, Estuary <span class="citation"
+data-cites="ogbornEstuaryBrowserbasedCollaborative2017">(Ogborn et al.
+2017)</span>, Hydra <span class="citation"
+data-cites="jackHydra2022">(Jack [2022] 2022)</span>, Ocarina <span
+class="citation" data-cites="solomonPurescriptocarina2022">(Solomon
+[2021] 2022)</span> and Feedforward <span class="citation"
+data-cites="mcleanFeedforward2020">(McLean 2020)</span>. This paper
+expands the Strudel Demo paper for the Web Audio Conference 2022 <span
+class="citation" data-cites="StrudelWAC2022">(Roos and McLean
+2022)</span>.</p>
+<p>The first tentative commit to the Strudel project was on 22nd January
+2022 by Alex McLean, with the core representation implemented over the
+following few days. Although this was his first attempt at a
+JavaScript-based application, by 27th January, Alex had managed to
+upload the initial version to the ‘npm’ javascript package database,
+sharing with the wider community for comment. By 4th February, Felix
+Roos had discovered Strudel and contributed a ‘REPL’ user interface to
+it, and then contributed a scheduler the next day, so that Strudel could
+already make sound. At this point, Alex and Felix shared ownership to
+the repository, and the project has since proved to be a productive
+confluence of Felix’s own work into music representation and
+visualisation, with Alex’s experience with making Tidal. Felix has since
+become the primary contributor to Strudel, with Alex continuing to jump
+between developing both Strudel and Tidal. Aspects of Strudel’s
+development have therefore fed back into TidalCycles, and both systems
+have maintained a shared conceptual underpinning. We plan to continue
+working towards feature parity between these systems, although within
+the syntactical trade-offs and library ecosystems of JavaScript and
+Haskell, some divergence is inevitable and healthy.</p>
+<p>Over the first year of its life, Strudel is now a fully-fledged live
+coding environment, porting Tidal’s core represention of patterns,
+pattern transformations, and mininotation for polymetric sequences,
+combined with a wealth of features for synthesising and visualising
+those patterns.</p>
+<h1 data-number="2" id="from-tidal-to-strudel-and-back"><span
+class="header-section-number">2</span> From Tidal to Strudel and
+back</h1>
+<p>As mentioned above, the original Tidal is implemented as a domain
+specific language (DSL) embedded in the Haskell pure functional
+programming language, and takes advantage of Haskell’s terse syntax and
+advanced, ‘strong’ type system. JavaScript on the other hand, is a
+multi-paradigm programming language, with a dynamic type system. Because
+Tidal leans heavily on many of Haskell’s more unique features, it was
+not always clear that it could meaningfully be ported to a
+multi-paradigm scripting language. However, this possibility was already
+demonstrated with an earlier port to Python [TidalVortex; <span
+class="citation" data-cites="mcleanTidalVortexZero2022">McLean et al.
+(2022)</span>], and we have now successfully implemented Tidal’s pure
+functional representation of patterns in Strudel, including partial
+application, currying, and the functor, applicative and monadic
+structures that underlie Tidal’s expressive pattern transformations. The
+result is a terse and highly composable system, where everything is
+either a pattern, or a function for combining and manipulating patterns,
+offering a rich creative ground for exploration.</p>
+<p>This development process has been far from a one-way port, however.
+The process of porting Tidal’s concepts has also opened up new
+possibilities, some just from revisiting every design decision, and some
+from the particular affordances and constraints offered by JavaScript.
+This has lead to new features (and indeed bugfixes) that have found
+their way back to Tidal where appropriate, and ongoing work that we will
+return to in the conclusion of this paper.</p>
+<h1 data-number="3" id="representing-patterns"><span
+class="header-section-number">3</span> Representing Patterns</h1>
+<p>Patterns are the essence of Tidal. Its patterns are abstract entities
+that represent flows of time as functions, adapting a technique called
+pure functional reactive programming. Taking a time span as its input, a
+Pattern can output a set of events that happen within that time span. It
+depends on the structure of the Pattern how the events are located in
+time. From now on, this process of generating events from a time span
+will be called <strong>querying</strong>. Example:</p>
+<div class="sourceCode" id="cb1"><pre class="sourceCode js"><code class="sourceCode javascript"><span id="cb1-1"><a href="#cb1-1" aria-hidden="true" tabindex="-1"></a><span class="kw">const</span> pattern <span class="op">=</span> <span class="fu">sequence</span>(c3<span class="op">,</span> [e3<span class="op">,</span> g3])</span>
+<span id="cb1-2"><a href="#cb1-2" aria-hidden="true" tabindex="-1"></a><span class="kw">const</span> events <span class="op">=</span> pattern<span class="op">.</span><span class="fu">queryArc</span>(<span class="dv">0</span><span class="op">,</span> <span class="dv">1</span>)</span>
+<span id="cb1-3"><a href="#cb1-3" aria-hidden="true" tabindex="-1"></a><span class="bu">console</span><span class="op">.</span><span class="fu">log</span>(events<span class="op">.</span><span class="fu">map</span>(e <span class="kw">=&gt;</span> e<span class="op">.</span><span class="fu">show</span>()))</span></code></pre></div>
+<p>In this example, we create a pattern using the <code>sequence</code>
+function and <strong>query</strong> it for the time span from
+<code>0</code> to <code>1</code>. Those numbers represent units of time
+called <strong>cycles</strong>. The length of one cycle depends on the
+tempo, which defaults to one cycle per second. The resulting events
+are:</p>
+<div class="sourceCode" id="cb2"><pre class="sourceCode js"><code class="sourceCode javascript"><span id="cb2-1"><a href="#cb2-1" aria-hidden="true" tabindex="-1"></a>[{ <span class="dt">value</span><span class="op">:</span> <span class="st">&#39;c3&#39;</span><span class="op">,</span> <span class="dt">begin</span><span class="op">:</span> <span class="dv">0</span><span class="op">,</span> <span class="dt">end</span><span class="op">:</span> <span class="dv">1</span><span class="op">/</span><span class="dv">2</span> }<span class="op">,</span></span>
+<span id="cb2-2"><a href="#cb2-2" aria-hidden="true" tabindex="-1"></a>{ <span class="dt">value</span><span class="op">:</span> <span class="st">&#39;e3&#39;</span><span class="op">,</span> <span class="dt">begin</span><span class="op">:</span> <span class="dv">1</span><span class="op">/</span><span class="dv">2</span><span class="op">,</span> <span class="dt">end</span><span class="op">:</span> <span class="dv">3</span><span class="op">/</span><span class="dv">4</span> }<span class="op">,</span></span>
+<span id="cb2-3"><a href="#cb2-3" aria-hidden="true" tabindex="-1"></a>{ <span class="dt">value</span><span class="op">:</span> <span class="st">&#39;g3&#39;</span><span class="op">,</span> <span class="dt">begin</span><span class="op">:</span> <span class="dv">3</span><span class="op">/</span><span class="dv">4</span><span class="op">,</span> <span class="dt">end</span><span class="op">:</span> <span class="dv">1</span> }]</span></code></pre></div>
+<p>Each event has a value, a begin time and an end time, where time is
+represented as a fraction. In the above case, the events are placed in
+sequential order, where c3 takes the first half, and e3 and g3 together
+take the second half. This temporal placement is the result of the
+<code>sequence</code> function, which divides its arguments equally over
+one cycle. If an argument is an array, the same rule applies to that
+part of the cycle. In the example, e3 and g3 are divided equally over
+the second half of the whole cycle.</p>
+<p>The above examples do not represent how Strudel is used in practice.
+In the live coding editor, the user only has to type in the pattern
+itself, the querying will be handled by the scheduler. The scheduler
+will repeatedly query the pattern for events, which are then scheduled
+as sound synthesis or other event triggers. Also, the above event data
+structure has been simplified for readability.</p>
+<figure>
+<img src="images/strudel-screenshot2.png" style="width:60.0%"
+alt="Screenshot of the Strudel ‘REPL’ live coding editor, including piano-roll visualisation." />
+<figcaption aria-hidden="true">Screenshot of the Strudel ‘REPL’ live
+coding editor, including piano-roll visualisation.</figcaption>
+</figure>
+<h1 data-number="4" id="making-patterns"><span
+class="header-section-number">4</span> Making Patterns</h1>
+<p>In practice, the end-user live coder will not deal with constructing
+patterns directly, but will rather build patterns using Strudel’s
+extensive combinator library to create, combine and transform
+patterns.</p>
+<p>The live coder will rarely use the <code>sequence</code> function as
+seen above, as sequencing is implicit in many functions. For example in
+the following, the <code>note</code> function constructs a pattern of
+notes, sequencing its arguments in the same manner as the previous
+example.</p>
+<div class="sourceCode" id="cb3"><pre class="sourceCode js"><code class="sourceCode javascript"><span id="cb3-1"><a href="#cb3-1" aria-hidden="true" tabindex="-1"></a><span class="fu">note</span>(c3<span class="op">,</span> [e3<span class="op">,</span> g3])</span></code></pre></div>
+<p>Perhaps more often, they will use the mini-notation for even terser
+notation of rhythmic sequences: [^This last example is also valid Tidal
+code, albeit the parenthesis is not required in its Haskell syntax in
+this case. Tidal does not support passing sequences as lists directly to
+the <code>note</code> function, however.].</p>
+<div class="sourceCode" id="cb4"><pre class="sourceCode js"><code class="sourceCode javascript"><span id="cb4-1"><a href="#cb4-1" aria-hidden="true" tabindex="-1"></a><span class="fu">note</span>(<span class="st">&quot;c3 [e3 g3]&quot;</span>)</span></code></pre></div>
+<p>Such sequences are often treated only a starting point for
+manipulation, where they then undergo pattern transformations such as
+repetition, symmetry, interference/combination or randomisation,
+potentially at multiple timescales. Because Strudel patterns are
+represented as pure functions of time rather than as data structures,
+very long and complex generative results can be represented and
+manipulated without having to store the resulting sequences in
+memory.</p>
+<h1 data-number="5" id="pattern-example"><span
+class="header-section-number">5</span> Pattern Example</h1>
+<p>The following example showcases how patterns can be utilized to
+create musical complexity from simple parts, using repetition and
+interference:</p>
+<div class="sourceCode" id="cb5"><pre class="sourceCode js"><code class="sourceCode javascript"><span id="cb5-1"><a href="#cb5-1" aria-hidden="true" tabindex="-1"></a><span class="st">&quot;&lt;0 2 [4 6](3,4,1) 3&gt;&quot;</span></span>
+<span id="cb5-2"><a href="#cb5-2" aria-hidden="true" tabindex="-1"></a><span class="op">.</span><span class="fu">off</span>(<span class="dv">1</span><span class="op">/</span><span class="dv">4</span><span class="op">,</span> <span class="fu">add</span>(<span class="dv">2</span>))</span>
+<span id="cb5-3"><a href="#cb5-3" aria-hidden="true" tabindex="-1"></a><span class="op">.</span><span class="fu">off</span>(<span class="dv">1</span><span class="op">/</span><span class="dv">2</span><span class="op">,</span> <span class="fu">add</span>(<span class="dv">6</span>))</span>
+<span id="cb5-4"><a href="#cb5-4" aria-hidden="true" tabindex="-1"></a><span class="op">.</span><span class="fu">scale</span>(<span class="st">&#39;D minor&#39;</span>)</span>
+<span id="cb5-5"><a href="#cb5-5" aria-hidden="true" tabindex="-1"></a><span class="op">.</span><span class="fu">legato</span>(<span class="op">.</span><span class="dv">25</span>)</span>
+<span id="cb5-6"><a href="#cb5-6" aria-hidden="true" tabindex="-1"></a><span class="op">.</span><span class="fu">note</span>()<span class="op">.</span><span class="fu">s</span>(<span class="st">&quot;sawtooth square&quot;</span>)</span>
+<span id="cb5-7"><a href="#cb5-7" aria-hidden="true" tabindex="-1"></a><span class="op">.</span><span class="fu">delay</span>(<span class="op">.</span><span class="dv">8</span>)<span class="op">.</span><span class="fu">delaytime</span>(<span class="op">.</span><span class="dv">125</span>)</span></code></pre></div>
+<p>The pattern starts with a rhythm of numbers in mini notation, which
+are later interpreted inside the scale of D minor. The first line could
+also be expressed without mini notation:</p>
+<div class="sourceCode" id="cb6"><pre class="sourceCode js"><code class="sourceCode javascript"><span id="cb6-1"><a href="#cb6-1" aria-hidden="true" tabindex="-1"></a><span class="fu">cat</span>(<span class="dv">0</span><span class="op">,</span> <span class="dv">2</span><span class="op">,</span> [<span class="dv">4</span><span class="op">,</span> <span class="dv">6</span>]<span class="op">.</span><span class="fu">euclid</span>(<span class="dv">3</span><span class="op">,</span> <span class="dv">4</span><span class="op">,</span> <span class="dv">1</span>)<span class="op">,</span> <span class="dv">3</span>)</span></code></pre></div>
+<p>These numbers then undergo various pattern transformations. Here is a
+short description of all the functions used:</p>
+<ul>
+<li><code>cat</code>: play elements sequentially, where each lasts one
+cycle</li>
+<li><code>brackets</code>: elements inside brackets are divided equally
+over the time of their parent</li>
+<li><code>.euclid(p, s, o)</code>: place p pulses evenly over s steps,
+with offset o <span class="citation"
+data-cites="toussaintEuclideanAlgorithmGenerates2005">(Toussaint
+2005)</span></li>
+<li><code>.off(n, f)</code>: layers a pattern on top of itself, with the
+new layer offset by n cycles, and with function f applied</li>
+<li><code>.legato(n)</code>: multiply the duration of all events in a
+pattern by a factor of n</li>
+<li><code>.echo(t, n, v)</code>: copy each event t times, with n cycles
+in between each copy, decreasing velocity by v</li>
+<li><code>.note()</code>: interpretes values as notes</li>
+<li><code>.s(name)</code>: play back each event with the given
+sound</li>
+<li><code>.delay(wet)</code>: add delay</li>
+<li><code>.delaytime(t)</code>: set delay time</li>
+</ul>
+<p>Much of the above will be familiar to Tidal users.</p>
+<!-- This example shows some of Strudel's unique support for chords and transposition familiar to students of Western music theory. This differs a little from Tidal's approach and thanks to the integration of the javascript library XXX (*TODO* ? or is this all your work Felix?), Strudel's support for tonal transformations such as voice leading is perhaps respects more advanced than Tidal. -->
+<h1 data-number="6" id="ways-to-make-sound-and-other-events"><span
+class="header-section-number">6</span> Ways to make Sound (and other
+events)</h1>
+<p>To generate sound, Strudel supports bindings for different
+outputs:</p>
+<ul>
+<li>Tone.js (deprecated)</li>
+<li>Web Audio API</li>
+<li>WebDirt, a js recreation of Tidal’s <em>Dirt</em> sample engine
+(deprecated)</li>
+<li>OSC via osc-js, compatible with superdirt</li>
+<li>Csound via the Csound WebAssembly build</li>
+<li>MIDI via WebMIDI</li>
+<li>Serial via WebSerial</li>
+</ul>
+<p>At first, we used Tone.js as sound output, but it proved to be
+limited for the use case of Strudel, where each individual event could
+potentially have a completely different audio graph. While the Web Audio
+API takes a <em>fire-and-forget</em> approach, creating a lot of Tone.js
+instruments and effects causes performance issues quickly. For that
+reason, we chose to search for alternatives.</p>
+<p>Strudel’s new default output uses the Web Audio API to create a new
+audio graph for each event. It currently supports basic oscillators,
+sample playback, various effects and an experimental support for
+soundfonts.</p>
+<p>WebDirt <span class="citation"
+data-cites="ogbornDktr0WebDirt2022">(Ogborn [2016] 2022)</span> was
+created as part of the Estuary Live Coding System <span class="citation"
+data-cites="ogbornEstuaryBrowserbasedCollaborative2017">(Ogborn et al.
+2017)</span>, and proved to be a solid choice for handling samples in
+Strudel as well. We are however focused on working more directly with
+the Web Audio API to be able to integrate new features more tightly.</p>
+<p>Using the OSC protocol via Strudel’s provided Node.js-based OSC proxy
+server, it is possible to send network messages to trigger events. This
+is mainly used to render sound using SuperDirt <span class="citation"
+data-cites="SuperDirt2022">(<em>SuperDirt</em> [2015] 2022)</span>,
+which is the well-developed Supercollider-based synthesis framework that
+Tidal live coders generally use as standard.</p>
+<p>Recently, the experimental integration of Csound proved to bring a
+new dimension of sound design capabilities to Strudel. Thanks to the
+WebAssembly distribution of this classic system <span class="citation"
+data-cites="CsoundWebAssembly">(Yi, Lazzarini, and Costello
+2018)</span>, Csound ‘orchestra’ synthesisers can be embedded in and
+then patterned with Strudel code.</p>
+<p>MIDI output can also be used to send MIDI messages to either external
+instruments or to other programs on the same device. Unlike OSC, Strudel
+is able to send MIDI directly without requiring additional proxy
+software, but only from web browsers that support it (at the time of
+writing, this means Chromium-based browsers).</p>
+<p>Finally, Strudel supports Serial output, for example to trigger
+events via microcontrollers. This has already been explored for robot
+choreography by Kate Sicchio and Alex McLean, via a performance
+presented at the International Conference on Live Interfaces 2022.</p>
+<h1 data-number="7" id="the-strudel-repl"><span
+class="header-section-number">7</span> The Strudel REPL</h1>
+<p>While Strudel can be used as a library in any JavaScript codebase,
+its main, reference user interface is the Strudel REPL[^REPL stands for
+read, evaluate, print/play, loop. It is friendly jargon for an
+interactive programming interface from computing heritage, usually for a
+commandline interface but also applied to live coding editors.], which
+is a browser-based live coding environment. This live code editor is
+dedicated to manipulating Strudel patterns while they play. The REPL
+features built-in visual feedback, which highlights which elements in
+the patterned (mini-notation) sequences are influencing the event that
+is currently being played. This feedback is designed to support both
+learning and live use of Strudel.</p>
+<p>Besides a UI for playback control and meta information, the main part
+of the REPL interface is the code editor powered by CodeMirror. In it,
+the user can edit and evaluate pattern code live, using one of the
+available synthesis outputs to create music and/or sound art. The
+control flow of the REPL follows 3 basic steps:</p>
+<ol type="1">
+<li>The user writes and updates code. Each update transpiles and
+evaluates it to create a <code>Pattern</code> instance</li>
+<li>While the REPL is running, the <code>Scheduler</code> queries the
+active <code>Pattern</code> by a regular interval, generating
+<code>Events</code> (also known as <code>Haps</code> in Strudel) for the
+next time span.</li>
+<li>For each scheduling tick, all generated <code>Events</code> are
+triggered by calling their <code>onTrigger</code> method, which is set
+by the output.</li>
+</ol>
+<figure>
+<img
+src="https://github.com/tidalcycles/strudel/raw/talk/talk/public/strudelflow.png?raw=true"
+style="width:43.0%" alt="REPL control flow" />
+<figcaption aria-hidden="true">REPL control flow</figcaption>
+</figure>
+<h2 data-number="7.1" id="user-code"><span
+class="header-section-number">7.1</span> User Code</h2>
+<p>To create a <code>Pattern</code> from the user code, two steps are
+needed:</p>
+<ol type="1">
+<li>Transpile the JS input code to make it functional</li>
+<li>Evaluate the transpiled code</li>
+</ol>
+<h3 data-number="7.1.1" id="transpilation-evaluation"><span
+class="header-section-number">7.1.1</span> Transpilation &amp;
+Evaluation</h3>
+<p>In the JavaScript world, using transpilation is a common practise to
+be able to use language features that are not supported by the base
+language. Tools like <code>babel</code> will transpile code that
+contains unsupported language features into a version of the code
+without those features.</p>
+<p>In the same tradition, Strudel can add a transpilation step to
+simplify the user code in the context of live coding. For example, the
+Strudel REPL lets the user create mini notation patterns using just
+double quoted strings, while single quoted strings remain what they
+are:</p>
+<div class="sourceCode" id="cb7"><pre class="sourceCode js"><code class="sourceCode javascript"><span id="cb7-1"><a href="#cb7-1" aria-hidden="true" tabindex="-1"></a><span class="st">&quot;c3 [e3 g3]*2&quot;</span></span></code></pre></div>
+<p>is transpiled to:</p>
+<div class="sourceCode" id="cb8"><pre class="sourceCode js"><code class="sourceCode javascript"><span id="cb8-1"><a href="#cb8-1" aria-hidden="true" tabindex="-1"></a><span class="fu">mini</span>(<span class="st">&quot;c3 [e3 g3]*2&quot;</span>)<span class="op">.</span><span class="fu">withMiniLocation</span>([<span class="dv">1</span><span class="op">,</span><span class="dv">0</span><span class="op">,</span><span class="dv">0</span>]<span class="op">,</span>[<span class="dv">1</span><span class="op">,</span><span class="dv">14</span><span class="op">,</span><span class="dv">14</span>])</span></code></pre></div>
+<p>Here, the string is wrapped in <code>mini</code>, which will create a
+pattern from a mini notation string. Additionally, the
+<code>withMiniLocation</code> method passes the original source code
+location of the string to the pattern, which enables highlighting active
+events.</p>
+<p>Other convenient features like pseudo variables, operator overloading
+and top level await are possible with transpilation.</p>
+<p>After the transpilation, the code is ready to be evaluated into a
+<code>Pattern</code>.</p>
+<p>Behind the scenes, the user code string is parsed with
+<code>acorn</code>, turning it into an Abstract Syntax Tree (AST). The
+AST allows changing the structure of the code before generating the
+transpiled version using <code>escodegen</code>.</p>
+<h3 data-number="7.1.2" id="mini-notation"><span
+class="header-section-number">7.1.2</span> Mini Notation</h3>
+<p>While the transpilation allows JavaScript to express Patterns in a
+less verbose way, it is still preferable to use the Mini Notation as a
+more compact way to express rhythm. Strudel aims to provide the same
+Mini Notation features and syntax as used in Tidal.</p>
+<p>The Mini Notation parser is implemented using <code>peggy</code>,
+which allows generating performant parsers for Domain Specific Languages
+(DSLs) using a concise grammar notation. The generated parser turns the
+Mini Notation string into an AST which is used to call the respective
+Strudel functions with the given structure. For example,
+<code>"c3 [e3 g3]*2"</code> will result in the following calls:</p>
+<div class="sourceCode" id="cb9"><pre class="sourceCode js"><code class="sourceCode javascript"><span id="cb9-1"><a href="#cb9-1" aria-hidden="true" tabindex="-1"></a><span class="fu">seq</span>(</span>
+<span id="cb9-2"><a href="#cb9-2" aria-hidden="true" tabindex="-1"></a>  <span class="fu">reify</span>(<span class="st">&#39;c3&#39;</span>)<span class="op">.</span><span class="fu">withLocation</span>([<span class="dv">1</span><span class="op">,</span><span class="dv">1</span><span class="op">,</span><span class="dv">1</span>]<span class="op">,</span> [<span class="dv">1</span><span class="op">,</span><span class="dv">4</span><span class="op">,</span><span class="dv">4</span>])<span class="op">,</span></span>
+<span id="cb9-3"><a href="#cb9-3" aria-hidden="true" tabindex="-1"></a>  <span class="fu">seq</span>(</span>
+<span id="cb9-4"><a href="#cb9-4" aria-hidden="true" tabindex="-1"></a>    <span class="fu">reify</span>(<span class="st">&#39;e3&#39;</span>)<span class="op">.</span><span class="fu">withLocation</span>([<span class="dv">1</span><span class="op">,</span><span class="dv">5</span><span class="op">,</span><span class="dv">5</span>]<span class="op">,</span> [<span class="dv">1</span><span class="op">,</span><span class="dv">8</span><span class="op">,</span><span class="dv">8</span>])<span class="op">,</span></span>
+<span id="cb9-5"><a href="#cb9-5" aria-hidden="true" tabindex="-1"></a>    <span class="fu">reify</span>(<span class="st">&#39;g3&#39;</span>)<span class="op">.</span><span class="fu">withLocation</span>([<span class="dv">1</span><span class="op">,</span><span class="dv">8</span><span class="op">,</span><span class="dv">8</span>]<span class="op">,</span> [<span class="dv">1</span><span class="op">,</span><span class="dv">10</span><span class="op">,</span><span class="dv">10</span>])<span class="op">,</span></span>
+<span id="cb9-6"><a href="#cb9-6" aria-hidden="true" tabindex="-1"></a>  )<span class="op">.</span><span class="fu">fast</span>(<span class="dv">2</span>)</span>
+<span id="cb9-7"><a href="#cb9-7" aria-hidden="true" tabindex="-1"></a>)</span></code></pre></div>
+<h3 data-number="7.1.3" id="highlighting-locations"><span
+class="header-section-number">7.1.3</span> Highlighting Locations</h3>
+<p>As seen in the examples above, both the JS and the Mini Notation
+parser add source code locations using <code>withMiniLocation</code> and
+<code>withLocation</code> methods. While the JS parser adds locations
+relative to the user code as a whole, the Mini Notation adds locations
+relative to the position of the mini notation string. The absolute
+location of elements within Mini Notation can be calculated by simply
+adding both locations together. This absolute location can be used to
+highlight active events in real time.</p>
+<h2 data-number="7.2" id="scheduling-events"><span
+class="header-section-number">7.2</span> Scheduling Events</h2>
+<p>After an instance of <code>Pattern</code> is obtained from the user
+code, it is used by the scheduler to get queried for events. Once
+started, the scheduler runs at a fixed interval to query active pattern
+for events withing the current interval’s time span. A simplified
+implementation looks like this:</p>
+<div class="sourceCode" id="cb10"><pre
+class="sourceCode js"><code class="sourceCode javascript"><span id="cb10-1"><a href="#cb10-1" aria-hidden="true" tabindex="-1"></a><span class="kw">let</span> pattern <span class="op">=</span> <span class="fu">seq</span>(<span class="st">&#39;c3&#39;</span><span class="op">,</span> [<span class="st">&#39;e3&#39;</span><span class="op">,</span> <span class="st">&#39;g3&#39;</span>])<span class="op">;</span> <span class="co">// pattern from user</span></span>
+<span id="cb10-2"><a href="#cb10-2" aria-hidden="true" tabindex="-1"></a><span class="kw">let</span> interval <span class="op">=</span> <span class="fl">0.5</span><span class="op">;</span> <span class="co">// query interval in seconds</span></span>
+<span id="cb10-3"><a href="#cb10-3" aria-hidden="true" tabindex="-1"></a><span class="kw">let</span> time <span class="op">=</span> <span class="dv">0</span><span class="op">;</span> <span class="co">// beginning of current time span</span></span>
+<span id="cb10-4"><a href="#cb10-4" aria-hidden="true" tabindex="-1"></a><span class="kw">let</span> minLatency <span class="op">=</span> <span class="op">.</span><span class="dv">1</span><span class="op">;</span> <span class="co">// min time before a hap should trigger</span></span>
+<span id="cb10-5"><a href="#cb10-5" aria-hidden="true" tabindex="-1"></a><span class="pp">setInterval</span>(() <span class="kw">=&gt;</span> {</span>
+<span id="cb10-6"><a href="#cb10-6" aria-hidden="true" tabindex="-1"></a>  <span class="kw">const</span> haps <span class="op">=</span> pattern<span class="op">.</span><span class="fu">queryArc</span>(time<span class="op">,</span> time <span class="op">+</span> interval)<span class="op">;</span></span>
+<span id="cb10-7"><a href="#cb10-7" aria-hidden="true" tabindex="-1"></a>  time <span class="op">+=</span> interval<span class="op">;</span> <span class="co">// increment time</span></span>
+<span id="cb10-8"><a href="#cb10-8" aria-hidden="true" tabindex="-1"></a>  haps<span class="op">.</span><span class="fu">forEach</span>((hap) <span class="kw">=&gt;</span> {</span>
+<span id="cb10-9"><a href="#cb10-9" aria-hidden="true" tabindex="-1"></a>    <span class="kw">const</span> deadline <span class="op">=</span> hap<span class="op">.</span><span class="at">whole</span><span class="op">.</span><span class="at">begin</span> <span class="op">-</span> time <span class="op">+</span> minLatency<span class="op">;</span></span>
+<span id="cb10-10"><a href="#cb10-10" aria-hidden="true" tabindex="-1"></a>    <span class="fu">onTrigger</span>(hap<span class="op">,</span> deadline<span class="op">,</span> duration)<span class="op">;</span></span>
+<span id="cb10-11"><a href="#cb10-11" aria-hidden="true" tabindex="-1"></a>  })<span class="op">;</span></span>
+<span id="cb10-12"><a href="#cb10-12" aria-hidden="true" tabindex="-1"></a>}<span class="op">,</span> interval <span class="op">*</span> <span class="dv">1000</span>)<span class="op">;</span> <span class="co">// query each &quot;interval&quot; seconds</span></span></code></pre></div>
+<p>Note that the above code is simplified for illustrative purposes. The
+actual implementation has to work around imprecise callbacks of
+<code>setInterval</code>. More about the implementation details can be
+read in <a
+href="https://loophole-letters.vercel.app/web-audio-scheduling">this
+blog post</a>.</p>
+<p>The fact that <code>Pattern.queryArc</code> is a pure function that
+maps a time span to a set of events allows us to choose any interval we
+like without changing the resulting output. It also means that when the
+pattern is changed from outside, the next scheduling callback will work
+with the new pattern, keeping its clock running.</p>
+<p>The latency between the time the pattern is evaluated and the change
+is heard is between <code>minLatency</code> and
+<code>interval + minLatency</code>, in our example between 100ms and
+600ms. In Strudel, the current query interval is 50ms with a minLatency
+of 100ms, meaning the latency is between 50ms and 150ms.</p>
+<h2 data-number="7.3" id="output"><span
+class="header-section-number">7.3</span> Output</h2>
+<p>The last step is to trigger each event in the chosen output. This is
+where the given time and value of each event is used to generate audio
+or any other form of time based output. The default output of the
+Strudel REPL is the WebAudio output. To understand what an output does,
+we first have to understand what control parameters are.</p>
+<h3 data-number="7.3.1" id="control-parameters"><span
+class="header-section-number">7.3.1</span> Control Parameters</h3>
+<p>To be able to manipulate multiple aspects of sound in parallel, so
+called control parameters are used to shape the value of each event.
+Example:</p>
+<div class="sourceCode" id="cb11"><pre
+class="sourceCode js"><code class="sourceCode javascript"><span id="cb11-1"><a href="#cb11-1" aria-hidden="true" tabindex="-1"></a><span class="fu">note</span>(<span class="st">&quot;c3 e3&quot;</span>)<span class="op">.</span><span class="fu">cutoff</span>(<span class="dv">1000</span>)<span class="op">.</span><span class="fu">s</span>(<span class="st">&#39;sawtooth&#39;</span>)</span>
+<span id="cb11-2"><a href="#cb11-2" aria-hidden="true" tabindex="-1"></a>  <span class="op">.</span><span class="fu">queryArc</span>(<span class="dv">0</span><span class="op">,</span> <span class="dv">1</span>)<span class="op">.</span><span class="fu">map</span>(hap <span class="kw">=&gt;</span> hap<span class="op">.</span><span class="at">value</span>)</span>
+<span id="cb11-3"><a href="#cb11-3" aria-hidden="true" tabindex="-1"></a><span class="co">/* [</span></span>
+<span id="cb11-4"><a href="#cb11-4" aria-hidden="true" tabindex="-1"></a><span class="co">  { note: &#39;c3&#39;, cutoff: 1000, s: &#39;sawtooth&#39; }</span></span>
+<span id="cb11-5"><a href="#cb11-5" aria-hidden="true" tabindex="-1"></a><span class="co">  { note: &#39;e3&#39;, cutoff: 1000, s: &#39;sawtooth&#39; }</span></span>
+<span id="cb11-6"><a href="#cb11-6" aria-hidden="true" tabindex="-1"></a><span class="co">] */</span></span></code></pre></div>
+<p>Here, the control parameter functions <code>note</code>,
+<code>cutoff</code> and <code>s</code> are used, where each controls a
+different property in the value object. Each control parameter function
+accepts a primitive value, a list of values to be sequenced into a
+<code>Pattern</code>, or a <code>Pattern</code>. In the example,
+<code>note</code> gets a <code>Pattern</code> from a Mini Notation
+expression (double quoted), while <code>cutoff</code> and <code>s</code>
+are given a <code>Number</code> and a (single quoted)
+<code>String</code> respectively.</p>
+<p>Strudel comes with a large default set of control parameter functions
+that are based on the ones used by Tidal and SuperDirt, focusing on
+music and audio terminology. It is however possible to create custom
+control paramters for any purpose:</p>
+<div class="sourceCode" id="cb12"><pre
+class="sourceCode js"><code class="sourceCode javascript"><span id="cb12-1"><a href="#cb12-1" aria-hidden="true" tabindex="-1"></a><span class="kw">const</span> { x<span class="op">,</span> y } <span class="op">=</span> <span class="fu">createParams</span>(<span class="st">&#39;x&#39;</span><span class="op">,</span> <span class="st">&#39;y&#39;</span>)</span>
+<span id="cb12-2"><a href="#cb12-2" aria-hidden="true" tabindex="-1"></a><span class="fu">x</span>(sine<span class="op">.</span><span class="fu">range</span>(<span class="dv">0</span><span class="op">,</span> <span class="dv">200</span>))<span class="op">.</span><span class="fu">y</span>(cosine<span class="op">.</span><span class="fu">range</span>(<span class="dv">0</span><span class="op">,</span><span class="dv">200</span>))</span></code></pre></div>
+<p>This example creates the custom control parameters <code>x</code> and
+<code>y</code> which are then used to form a pattern that descibes the
+coordinates of a circle.</p>
+<h3 data-number="7.3.2" id="outputs"><span
+class="header-section-number">7.3.2</span> Outputs</h3>
+<p>Now that we know how the value of an event is manipulated using
+control parameters, we can look at how outputs can use that value to
+generate anything. The scheduler above was calling the
+<code>onTrigger</code> function which is used to implement the output. A
+very simple version of the web audio output could look like this:</p>
+<div class="sourceCode" id="cb13"><pre
+class="sourceCode js"><code class="sourceCode javascript"><span id="cb13-1"><a href="#cb13-1" aria-hidden="true" tabindex="-1"></a><span class="kw">function</span> <span class="fu">onTrigger</span>(hap<span class="op">,</span> deadline<span class="op">,</span> duration) {</span>
+<span id="cb13-2"><a href="#cb13-2" aria-hidden="true" tabindex="-1"></a>  <span class="kw">const</span> { note } <span class="op">=</span> hap<span class="op">.</span><span class="at">value</span><span class="op">;</span></span>
+<span id="cb13-3"><a href="#cb13-3" aria-hidden="true" tabindex="-1"></a>  <span class="kw">const</span> time <span class="op">=</span> <span class="fu">getAudioContext</span>()<span class="op">.</span><span class="at">currentTime</span> <span class="op">+</span> deadline<span class="op">;</span></span>
+<span id="cb13-4"><a href="#cb13-4" aria-hidden="true" tabindex="-1"></a>  <span class="kw">const</span> o <span class="op">=</span> <span class="fu">getAudioContext</span>()<span class="op">.</span><span class="fu">createOscillator</span>()<span class="op">;</span></span>
+<span id="cb13-5"><a href="#cb13-5" aria-hidden="true" tabindex="-1"></a>  o<span class="op">.</span><span class="at">frequency</span><span class="op">.</span><span class="at">value</span> <span class="op">=</span> <span class="fu">getFreq</span>(note)<span class="op">;</span></span>
+<span id="cb13-6"><a href="#cb13-6" aria-hidden="true" tabindex="-1"></a>  o<span class="op">.</span><span class="fu">start</span>(time)<span class="op">;</span></span>
+<span id="cb13-7"><a href="#cb13-7" aria-hidden="true" tabindex="-1"></a>  o<span class="op">.</span><span class="fu">stop</span>(time <span class="op">+</span> <span class="bu">event</span><span class="op">.</span><span class="at">duration</span>)<span class="op">;</span></span>
+<span id="cb13-8"><a href="#cb13-8" aria-hidden="true" tabindex="-1"></a>  o<span class="op">.</span><span class="fu">connect</span>(<span class="fu">getAudioContext</span>()<span class="op">.</span><span class="at">destination</span>)<span class="op">;</span></span>
+<span id="cb13-9"><a href="#cb13-9" aria-hidden="true" tabindex="-1"></a>}</span></code></pre></div>
+<p>The above example will create an <code>OscillatorNode</code> for each
+event, where the frequency is controlled by the <code>note</code> param.
+In essence, this is how the WebAudio API output of Strudel works, only
+with many more parameters to control synths, samples and effects.</p>
+<h1 data-number="8" id="pattern-alignment-and-combination"><span
+class="header-section-number">8</span> Pattern alignment and
+combination</h1>
+<p>One core aspect of Strudel, inherited from Tidal, is the flexible way
+that patterns can be combined, irrespective of their structure. Its
+declarative approach means a live coder does not have to think about the
+details of <em>how</em> this is done, only <em>what</em> is to be
+done.</p>
+<p>As a simple example, consider two number patterns
+<code>"0 [1 2] 3"</code>, and <code>"10 20"</code>. The first has three
+contiguous steps of equal lengths, with the second step broken down into
+two substeps, giving four events in total. There are a very large number
+of ways in which the structure of these two patterns could be combined,
+but the default method in both Strudel and Tidal is to line up the
+cycles of the two patterns, and then take events from the first pattern
+and match them with those in the second pattern. Therefore, the
+following two lines are equivalent:</p>
+<div class="sourceCode" id="cb14"><pre
+class="sourceCode js"><code class="sourceCode javascript"><span id="cb14-1"><a href="#cb14-1" aria-hidden="true" tabindex="-1"></a><span class="st">&quot;0 [1 2] 3&quot;</span><span class="op">.</span><span class="fu">add</span>(<span class="st">&quot;10 20&quot;</span>)</span>
+<span id="cb14-2"><a href="#cb14-2" aria-hidden="true" tabindex="-1"></a><span class="st">&quot;10 [11 22] 23&quot;</span></span></code></pre></div>
+<p>Where the events only partially overlap, they are treated as
+fragments of the event in the first pattern. This is a little difficult
+to conceptualise, but lets start by comparing the two patterns in the
+following example:</p>
+<div class="sourceCode" id="cb15"><pre
+class="sourceCode js"><code class="sourceCode javascript"><span id="cb15-1"><a href="#cb15-1" aria-hidden="true" tabindex="-1"></a><span class="st">&quot;0 1 2&quot;</span><span class="op">.</span><span class="fu">add</span>(<span class="st">&quot;10 20&quot;</span>)</span>
+<span id="cb15-2"><a href="#cb15-2" aria-hidden="true" tabindex="-1"></a><span class="st">&quot;10 [11 21] 20&quot;</span></span></code></pre></div>
+<p>They are similar to the previous example in that the number
+<code>1</code> is split in two, with its two halves added to
+<code>10</code> and <code>20</code> respectively. However, the
+<code>11</code> ‘remembers’ that it is a fragment of that original
+<code>1</code> event, and so is treated as having a duration of a third
+of a cycle, despite only being active for a sixth of a cycle. Likewise,
+the <code>21</code> is also a fragment of that original <code>1</code>
+event, but a fragment of its second half. Because the start of its event
+is missing, it wouldn’t actually trigger a sound (unless it underwent
+further pattern transformations/combinations).</p>
+<p>In practice, the effect of this default, implicit method for
+combining two patterns is that the second pattern is added <em>in</em>
+to the first one, and indeed this can be made explicit:</p>
+<div class="sourceCode" id="cb16"><pre
+class="sourceCode js"><code class="sourceCode javascript"><span id="cb16-1"><a href="#cb16-1" aria-hidden="true" tabindex="-1"></a><span class="st">&quot;0 1 2&quot;</span><span class="op">.</span><span class="at">add</span><span class="op">.</span><span class="fu">in</span>(<span class="st">&quot;10 20&quot;</span>)</span></code></pre></div>
+<p>This makes way for other ways to align the pattern, and several are
+already defined, in particular:</p>
+<ul>
+<li><code>in</code> - as explained above, aligns cycles, and applies
+values from the pattern on the right <em>in</em> to the pattern on the
+left.</li>
+<li><code>out</code> - as with <code>in</code>, but values are applied
+<em>out</em> of the pattern on the left (i.e. <em>in</em> to the one on
+the right).</li>
+<li><code>mix</code> - structures from both patterns are combined, so
+that the new events are not fragments but are created at intersections
+of events from both sides.</li>
+<li><code>squeeze</code> - cycles from the pattern on the right are
+squeezed into events on the left. So that
+e.g. <code>"0 1 2".add.squeeze("10 20")</code> is equivalent to
+<code>"[10 20] [11 21] [12 22]"</code>.</li>
+<li><code>squeezeout</code> - as with <code>squeeze</code>, but cycles
+from the left are squeezed into events on the right. So,
+<code>"0 1 2".add.squeezeout("10 20")</code> is equivalent to
+<code>[10 11 12] [20 21 22]</code>.</li>
+<li><code>trig</code> is similar to <code>squeezeout</code> in that
+cycles from the right are aligned with events on the left. However those
+cycles are not ‘squeezed’, rather they are truncated to fit the event.
+So <code>"0 1 2 3 4 5 6 7".add.trig("10 [20 30]")</code> would be
+equivalent to <code>10 11 12 13 20 21 30 31</code>. In effect, events on
+the right ‘trigger’ cycles on the left.</li>
+<li><code>trigzero</code> is similar to <code>trig</code>, but the
+pattern is ‘triggered’ from its very first cycle, rather than from the
+current cycle. <code>trig</code> and <code>trigzero</code> therefore
+only give different results where the leftmost pattern differs from one
+cycle to the next.</li>
+</ul>
+<p>We will save going deeper into the background, design and
+practicalities of these alignment functions for future publications.
+However in the next section, we take them as a case study for looking at
+the different design affordances offered by Haskell to Tidal, and
+JavaScript to Strudel.</p>
+<h1 data-number="9" id="comparing-strudel-and-haskell-in-use"><span
+class="header-section-number">9</span> Comparing Strudel and Haskell in
+use</h1>
+<p>Unlike Haskell, JavaScript lacks the ability to define custom infix
+operators, or change the meaning of existing ones. So the above Strudel
+example of <code>"0 1 2".add.out("10 20")</code> is equivalent to the
+Tidal expression <code>"0 1 2" +| "10 20"</code>, where the vertical bar
+in the operator <code>+|</code> stands for <code>out</code> (where
+<code>a |+ b</code> would be equivalent of
+<code>a.add.in(b)</code>).</p>
+<p>From this we can already see that Tidal tends towards brevity through
+mixing infix operators with functions, and Strudel tends towards
+spelling out operations which are joined together with the
+<code>.</code> operator. This then is the design trade-off of Tidal’s
+tersity, versus Strudel’s simplicity.</p>
+<p>To demonstrate this, consider the following Tidal pattern:</p>
+<pre class="tidal"><code>iter 4 $ every 3 (||+ n &quot;10 20&quot;) $ (n &quot;0 1 3&quot;) # s &quot;triangle&quot; # crush 4</code></pre>
+<p>This can be directly translated to the Strudel equivalent:</p>
+<div class="sourceCode" id="cb18"><pre
+class="sourceCode js"><code class="sourceCode javascript"><span id="cb18-1"><a href="#cb18-1" aria-hidden="true" tabindex="-1"></a><span class="fu">iter</span>(<span class="dv">4</span><span class="op">,</span> <span class="fu">every</span>(<span class="dv">3</span><span class="op">,</span> add<span class="op">.</span><span class="fu">squeeze</span>(<span class="st">&quot;10 20&quot;</span>)<span class="op">,</span> <span class="fu">n</span>(<span class="st">&quot;0 1 3&quot;</span>)<span class="op">.</span><span class="fu">s</span>(<span class="st">&quot;triangle&quot;</span>)<span class="op">.</span><span class="fu">crush</span>(<span class="dv">4</span>)))</span></code></pre></div>
+<p>Although for a more canonical Strudel expression, we would reorder it
+as:</p>
+<div class="sourceCode" id="cb19"><pre
+class="sourceCode js"><code class="sourceCode javascript"><span id="cb19-1"><a href="#cb19-1" aria-hidden="true" tabindex="-1"></a><span class="fu">n</span>(<span class="st">&quot;0 1 3&quot;</span>)<span class="op">.</span><span class="fu">every</span>(<span class="dv">3</span><span class="op">,</span> add<span class="op">.</span><span class="fu">squeeze</span>(<span class="st">&quot;10 20&quot;</span>))<span class="op">.</span><span class="fu">iter</span>(<span class="dv">4</span>)<span class="op">.</span><span class="fu">s</span>(<span class="st">&quot;triangle&quot;</span>)<span class="op">.</span><span class="fu">crush</span>(<span class="dv">4</span>)</span></code></pre></div>
+<p>The Strudel example uses the <code>.</code> method call operator for
+all operations and combinations, whereas the Tidal example has
+<code>#</code> for the default method for combining patterns and uses
+infix operators for other methods. The lack of parenthesis in the Tidal
+example is partly due to the way that arguments are applied to Haskell’s
+functions, and partly due to the use of the <code>$</code> operator as
+an alternative way to establish precedence and control the order of
+evaluation.</p>
+<p>Considering the above, we argue that the Haskell syntax is a little
+cleaner, but that the Strudel syntax is easier to learn. Our informal
+observation is that while Haskell’s dollar <code>$</code> operator is
+very useful in making code easier to work with, it is one of the most
+difficult aspects of Tidal use for beginners to learn. On the other
+hand, the deeper levels of parenthesis in Strudel code can be difficult
+to keep track of, especially while coding under pressure of live musical
+performance. However this difficulty can be largely be mitigated by
+reordering expressions, and further mitigated by supporting editor
+features.</p>
+<p>With Strudel, we have little choice but to embrace the affordances
+and constraints offered by JavaScript, and while designing a
+domain-specific language entirely based on method calls is a challenge,
+through creative adoption of functional programming techniques like
+partial application, we are so far very happy with the results. Tidal’s
+functional reactive approach to pattern-making has in general translated
+well to JavaScript, and opportunities and constraints have overall
+traded off to create a very approachable and useable live coding
+environment.</p>
+<h2 data-number="9.1" id="the-trade-off-of-flexible-typing"><span
+class="header-section-number">9.1</span> The trade-off of flexible
+typing</h2>
+<p>We have identified one problem with porting Tidal to JavaScript where
+we have missed Haskell’s strict typing and type inference. In both Tidal
+and Strudel, time is rational, where any point in time is represented as
+the ratio of two integers. This allows representation of musical ratios
+such that are impossible to represent accurately using the more common
+floating point numbers. However while libraries are available that
+support rational numbers in JavaScript, the lack of strict typing means
+that it is easy to implement pattern methods where computationally
+expensive conversion from floating point to rational numbers are
+performed late, and therefore often enough to overload the CPUs, due to
+the large number of iterative calculations required to estimate a ratio
+for a given floating point number. To mitigate this problem, we might
+consider moving to TypeScript in the future.</p>
+<h1 data-number="10" id="future-outlook"><span
+class="header-section-number">10</span> Future Outlook</h1>
+<p>The project is still young, with many features on the horizon. As
+general guiding principles, Strudel aims to be</p>
+<ol type="1">
+<li>accessible</li>
+<li>consistent with Tidal’s approach to pattern</li>
+<li>modular and extensible</li>
+</ol>
+<p>While Haskell’s type system makes it a great language for the ongoing
+development of Tidal’s inner representation of pattern, JavaScript’s
+vibrant ecosystem, flexibility and accessibility makes it a great host
+for more ad-hoc experiments, including interface design. For the future,
+it is planned to integrate additional alternative sound engines such as
+Glicol <span class="citation" data-cites="lanChaosprintGlicol2022">(Lan
+[2020] 2022)</span> and Faust <span class="citation"
+data-cites="FaustProgrammingLanguage2022">(<em>Faust - Programming
+Language for Audio Applications and Plugins</em> [2016] 2022)</span>.
+Strudel is already approaching feature parity with Tidal, but there are
+more Tidal functions to be ported, and work to be done to improve
+compatibility with Tidal’s mininotation. Tidal version 2.0 is under
+development, which brings a new representation for sequences to its
+patterns, which will then be brought to Strudel. Besides sound, other
+ways to render events are being explored, such as graphical, and
+choreographic output. We are also looking into alternative ways of
+editing patterns, including multi-user editing for network music,
+parsing a novel syntax to escape the constraints of javascript, and
+developing hardware/e-textile interfaces. In summary, there is a lot of
+fun ahead.</p>
+<h1 data-number="11" id="links"><span
+class="header-section-number">11</span> Links</h1>
+<p>The Strudel REPL is available at <a
+href="https://strudel.tidalcycles.org"
+class="uri">https://strudel.tidalcycles.org</a>, including an
+interactive tutorial. The repository is at <a
+href="https://github.com/tidalcycles/strudel"
+class="uri">https://github.com/tidalcycles/strudel</a>, all the code is
+open source under the AGPL-3.0 License.</p>
+<h1 data-number="12" id="acknowledgments"><span
+class="header-section-number">12</span> Acknowledgments</h1>
+<p>Thanks to the Strudel and wider Tidal, live coding, WebAudio and
+free/open source software communities for inspiration and support. Alex
+McLean’s work on this project is supported by a UKRI Future Leaders
+Fellowship [grant number MR/V025260/1].</p>
+<h1 class="unnumbered" id="references">References</h1>
+<div id="refs" class="references csl-bib-body hanging-indent"
+role="doc-bibliography">
+<div id="ref-FaustProgrammingLanguage2022" class="csl-entry"
+role="doc-biblioentry">
+<em>Faust - Programming Language for Audio Applications and
+Plugins</em>. (2016) 2022. C++. GRAME. <a
+href="https://github.com/grame-cncm/faust">https://github.com/grame-cncm/faust</a>.
+</div>
+<div id="ref-jackHydra2022" class="csl-entry" role="doc-biblioentry">
+Jack, Olivia. (2022) 2022. <em>Hydra</em>. <a
+href="https://github.com/ojack/hydra">https://github.com/ojack/hydra</a>.
+</div>
+<div id="ref-lanChaosprintGlicol2022" class="csl-entry"
+role="doc-biblioentry">
+Lan, Qichao. (2020) 2022. <em>Chaosprint/Glicol</em>. Rust. <a
+href="https://github.com/chaosprint/glicol">https://github.com/chaosprint/glicol</a>.
+</div>
+<div id="ref-mcleanAlgorithmicPattern2020a" class="csl-entry"
+role="doc-biblioentry">
+Mclean, Alex. 2020. <span>“Algorithmic Pattern.”</span> In
+<em>Proceedings of the International Conference on New Interfaces for
+Musical Expression</em>, 265--270. Birmingham, UK. <a
+href="https://zenodo.org/record/4813352">https://zenodo.org/record/4813352</a>.
+</div>
+<div id="ref-mcleanFeedforward2020" class="csl-entry"
+role="doc-biblioentry">
+McLean, Alex. 2020. <span>“Feedforward.”</span> In <em>Proceedings of
+New Interfaces for Musical Expression</em>. Birmingham. <a
+href="https://zenodo.org/record/6353969">https://zenodo.org/record/6353969</a>.
+</div>
+<div id="ref-mcleanTidalVortexZero2022" class="csl-entry"
+role="doc-biblioentry">
+McLean, Alex, Raphaël Forment, Sylvain Le Beux, and Damián Silvani.
+2022. <span>“TidalVortex Zero.”</span> In <em>Proceedings of the 7th
+International Conference on Live Coding</em>. Limerick, Ireland: Zenodo.
+<a
+href="https://doi.org/10.5281/zenodo.6456380">https://doi.org/10.5281/zenodo.6456380</a>.
+</div>
+<div id="ref-ogbornDktr0WebDirt2022" class="csl-entry"
+role="doc-biblioentry">
+Ogborn, David. (2016) 2022. <em>Dktr0/WebDirt</em>. JavaScript. <a
+href="https://github.com/dktr0/WebDirt">https://github.com/dktr0/WebDirt</a>.
+</div>
+<div id="ref-ogbornEstuaryBrowserbasedCollaborative2017"
+class="csl-entry" role="doc-biblioentry">
+Ogborn, David, Jamie Beverley, Luis Navarro del Angel, Eldad Tsabary,
+and Alex McLean. 2017. <span>“Estuary: Browser-Based Collaborative
+Projectional Live Coding of Musical Patterns.”</span> In <em>Proceedings
+of the International Conference on Live Coding</em>, 11. Morelia.
+</div>
+<div id="ref-robertsGibberLiveCoding2012" class="csl-entry"
+role="doc-biblioentry">
+Roberts, Charles, and Joann Kuchera-morin. 2012. <span>“Gibber: Live
+Coding Audio in the Browser.”</span> In <em>In Proceedings of the 2012
+International Computer Music Conference</em>.
+</div>
+<div id="ref-StrudelWAC2022" class="csl-entry" role="doc-biblioentry">
+Roos, Felix, and Alex McLean. 2022. <span>“Strudel: Algorithmic Patterns
+for the Web.”</span> In. Zenodo. <a
+href="https://doi.org/10.5281/zenodo.6768844">https://doi.org/10.5281/zenodo.6768844</a>.
+</div>
+<div id="ref-solomonPurescriptocarina2022" class="csl-entry"
+role="doc-biblioentry">
+Solomon, Mike. (2021) 2022. <em>Purescript-Ocarina</em>. PureScript. <a
+href="https://github.com/mikesol/purescript-ocarina">https://github.com/mikesol/purescript-ocarina</a>.
+</div>
+<div id="ref-SuperDirt2022" class="csl-entry" role="doc-biblioentry">
+<em>SuperDirt</em>. (2015) 2022. SuperCollider. musikinformatik. <a
+href="https://github.com/musikinformatik/SuperDirt">https://github.com/musikinformatik/SuperDirt</a>.
+</div>
+<div id="ref-toussaintEuclideanAlgorithmGenerates2005" class="csl-entry"
+role="doc-biblioentry">
+Toussaint, Godfried. 2005. <span>“The Euclidean Algorithm Generates
+Traditional Musical Rhythms.”</span> In <em>In Proceedings of BRIDGES:
+Mathematical Connections in Art, Music and Science</em>, 47–56. <a
+href="http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.62.231">http://citeseerx.ist.psu.edu/viewdoc/summary?doi=10.1.1.62.231</a>.
+</div>
+<div id="ref-CsoundWebAssembly" class="csl-entry"
+role="doc-biblioentry">
+Yi, Steven, Victor Lazzarini, and Edward Costello. 2018.
+<span>“WebAssembly AudioWorklet Csound.”</span> In. Berlin, Germany. <a
+href="https://mural.maynoothuniversity.ie/16018/">https://mural.maynoothuniversity.ie/16018/</a>.
+</div>
+</div>
+</body>
+</html>

paper/iclc2023.md

@@ -0,0 +1,460 @@
+---
+title: 'Strudel: live coding patterns on the Web'
+author:
+  - name: Felix Roos
+    affiliation: Unaffiliated
+    email: flix91@gmail.com
+  - name: Alex McLean
+    affiliation: Then Try This
+    email: alex@slab.org
+abstract: |
+  This paper introduces Strudel, which brings the TidalCycles approach to live coding algorithmic patterns to native JavaScript and the web. We begin by giving a little background of the first year of development, before sharing some detail about its implementation and examples of use. We go on to outline the wide range of synthesis and other outputs available in Strudel, including WebAudio, MIDI, OSC (for SuperDirt), WebSerial and CSound, and introduce Strudel's REPL live editor, including its built-in visualisations. We then compare Strudel with Tidal, the trade-offs involved between JavaScript and Haskell, and the unique capabilities offered by Strudel for aligning patterns, before concluding with some thoughts about the future.
+bibliography: citations.json
+fontsize: 11pt
+geometry: margin=2cm
+fontfamily: libertine
+fontfamily: inconsolata
+mainfont: Linux Libertine O
+monofont: Inconsolata
+date: '2022-12-14'
+---
+
+# Introduction
+
+In the following paper, we introduce *Strudel*, an alternative
+implementation of the TidalCycles (or 'Tidal' for short) live coding
+system, using the JavaScript programming language. Strudel is an
+attempt to make live coding more accessible, by creating a system that
+runs entirely in the browser, while opening Tidal's approach to
+algorithmic patterns [@mcleanAlgorithmicPattern2020a] up to modern
+audio/visual web technologies. The Strudel REPL is a live code editor
+dedicated to manipulating patterns while they play, with builtin
+visual feedback. While Strudel is written in JavaScript, the API is
+optimized for simplicity and readability by applying code
+transformations on the syntax tree level, allowing language operations
+that would otherwise be impossible. The application supports multiple
+ways to output sound, including Tone.js, Web Audio Nodes, OSC (Open
+Sound Control) messages, Web Serial, Web MIDI and Csound. The project
+is split into multiple packages, allowing granular reuse in other
+applications. Apart from TidalCycles, Strudel draws inspiration from
+many prior existing projects like TidalVortex
+[@mcleanTidalVortexZero2022], Gibber [@robertsGibberLiveCoding2012],
+Estuary [@ogbornEstuaryBrowserbasedCollaborative2017], Hydra
+[@jackHydra2022], Ocarina [@solomonPurescriptocarina2022] and
+Feedforward [@mcleanFeedforward2020]. This paper expands the Strudel
+Demo paper for the Web Audio Conference 2022 [@StrudelWAC2022].
+
+The first tentative commit to the Strudel project was on 22nd January
+2022 by Alex McLean, with the core representation implemented over the
+following few days. Although this was his first attempt at a
+JavaScript-based application, by 27th January, Alex had managed to
+upload the initial version to the 'npm' javascript package database,
+sharing with the wider community for comment. By 4th February, Felix
+Roos had discovered Strudel and contributed a 'REPL' user interface to
+it, and then contributed a scheduler the next day, so that Strudel
+could already make sound.  At this point, Alex and Felix shared
+ownership to the repository, and the project has since proved to be a
+productive confluence of Felix's own work into music representation
+and visualisation, with Alex's experience with making Tidal. Felix has
+since become the primary contributor to Strudel, with Alex continuing
+to jump between developing both Strudel and Tidal. Aspects of
+Strudel's development have therefore fed back into TidalCycles, and
+both systems have maintained a shared conceptual underpinning. We plan
+to continue working towards feature parity between these systems,
+although within the syntactical trade-offs and library ecosystems of
+JavaScript and Haskell, some divergence is inevitable and healthy.
+
+Over the first year of its life, Strudel is now a fully-fledged live
+coding environment, porting Tidal's core represention of patterns,
+pattern transformations, and mini-notation for polymetric sequences,
+combined with a wealth of features for synthesising and visualising
+those patterns.
+
+# From Tidal to Strudel and back
+
+As mentioned above, the original Tidal is implemented as a domain specific language (DSL) embedded in the Haskell pure functional programming language, and takes advantage of Haskell's terse syntax and advanced, 'strong' type system. JavaScript on the other hand, is a multi-paradigm programming language, with a dynamic type system. Because Tidal leans heavily on many of Haskell's more unique features, it was not always clear that it could meaningfully be ported to a multi-paradigm scripting language. However, this possibility was already demonstrated with an earlier port to Python [TidalVortex; @mcleanTidalVortexZero2022], and we have now successfully implemented Tidal's pure functional representation of patterns in Strudel, including partial application, currying, and the functor, applicative and monadic structures that underlie Tidal's expressive pattern transformations. The result is a terse and highly composable system, where everything is either a pattern, or a function for combining and manipulating patterns, offering a rich creative ground for exploration.
+
+This development process has been far from a one-way port, however. The process of porting Tidal's concepts has also opened up new possibilities, some just from revisiting every design decision, and some from the particular affordances and constraints offered by JavaScript. This has lead to new features (and indeed bugfixes) that have found their way back to Tidal where appropriate, and ongoing work that we will return to in the conclusion of this paper.
+
+# Representing Patterns
+
+Patterns are the essence of Tidal. Its patterns are abstract entities that represent flows of time as functions, adapting a technique called pure functional reactive programming. Taking a time span as its input, a Pattern can output a set of events that happen within that time span. It depends on the structure of the Pattern how the events are located in time.
+From now on, this process of generating events from a time span will be called **querying**.
+Example:
+
+```js
+const pattern = sequence(c3, [e3, g3])
+const events = pattern.queryArc(0, 1)
+console.log(events.map(e => e.show()))
+```
+
+In this example, we create a pattern using the `sequence` function and **query** it for the time span from `0` to `1`.
+Those numbers represent units of time called **cycles**. The length of one cycle depends on the tempo, which defaults to one cycle per second.
+The resulting events are:
+
+```js
+ ["[ 0/1 -> 1/2 | c3 ]", 
+  "[ 1/2 -> 3/4 | e3 ]", 
+  "[ 3/4 -> 1/1 | g3 ]"
+ ]
+```
+
+Each event has a value, a begin time and an end time, where time is represented as a fraction. In the above case, the events are placed in sequential order, where c3 takes the first half, and e3 and g3 together take the second half. This temporal placement is the result of the `sequence` function, which divides its arguments equally over one cycle. If an argument is an array, the same rule applies to that part of the cycle. In the example, e3 and g3 are divided equally over the second half of the whole cycle.
+
+Note that the query function is not just a way to access a pattern, but true to the principles of functional programming, is the pattern itself. This means that in theory there is no way to change a pattern, it is opaque as a pure function. In practice though, Strudel and Tidal are all about transforming patterns, so how is this done? The answer is, by replacing the pattern with a new one, that calls the old one. This new one is only able to manipulate the query before passing it to the old pattern, and manipulate the results from it before returning them to caller. But, this is enough to support all the temporal and structural manipulations provided by Strudel (and Tidal's) extensive library of functions.
+
+The above examples do not represent how Strudel is used in practice. In the live coding editor, the user only has to type in the pattern itself, the querying will be handled by the scheduler. The scheduler will repeatedly query the pattern for events, which are then scheduled as sound synthesis or other event triggers.
+Also, the above event data structure has been simplified for readability.
+
+![Screenshot of the Strudel 'REPL' live coding editor, including piano-roll visualisation.](images/strudel-screenshot2.png){ width=60% }
+
+# Making Patterns
+
+In practice, the end-user live coder will not deal with constructing patterns directly, but will rather build patterns using Strudel's extensive combinator library to create, combine and transform patterns.
+
+The live coder will rarely use the `sequence` function as seen above, as sequencing is implicit in many functions. For example in the following, the `note` function constructs a pattern of notes, sequencing its arguments in the same manner as the previous example.
+
+```js
+note(c3, [e3, g3])
+```
+
+Perhaps more often, they will use the mini-notation for even terser notation of rhythmic sequences: ^[This last example is also valid Tidal code, albeit the parenthesis is not required in its Haskell syntax in this case. Tidal does not support passing sequences as lists directly to the `note` function, however.].
+
+```js
+note("c3 [e3 g3]")
+```
+
+Such sequences are often treated only as a starting point for manipulation, where they then undergo pattern transformations such as repetition, symmetry, interference/combination or randomisation, potentially at multiple timescales. Because Strudel patterns are represented as pure functions of time rather than as data structures, very long and complex generative results can be represented and manipulated without having to store the resulting sequences in memory.
+
+# Pattern Example
+
+The following example showcases how patterns can be utilized to create musical complexity from simple parts, using repetition and interference:
+
+```js
+"<0 2 [4 6](3,4,1) 3>"
+.off(1/4, add(2))
+.off(1/2, add(6))
+.scale('D minor')
+.legato(.25)
+.note().s("sawtooth square")
+.delay(.8).delaytime(.125)
+```
+
+The pattern starts with a rhythm of numbers in mini-notation, which are later interpreted inside the scale of D minor.
+The first line could also be expressed without mini-notation:
+
+```js
+cat(0, 2, [4, 6].euclid(3, 4, 1), 3)
+```
+
+These numbers then undergo various pattern transformations. Here is a short description of all the functions used:
+
+- `cat`: play elements sequentially, where each lasts one cycle
+- `brackets`: elements inside brackets are divided equally over the time of their parent
+- `.euclid(p, s, o)`: place p pulses evenly over s steps, with offset o [@toussaintEuclideanAlgorithmGenerates2005]
+- `.off(n, f)`: layers a pattern on top of itself, with the new layer offset by n cycles, and with function f applied
+- `.legato(n)`: multiply the duration of all events in a pattern by a factor of n
+- `.echo(t, n, v)`: copy each event t times, with n cycles in between each copy, decreasing velocity by v
+- `.note()`: interpretes values as notes
+- `.s(name)`: play back each event with the given sound
+- `.delay(wet)`: add delay
+- `.delaytime(t)`: set delay time
+
+Much of the above will be familiar to Tidal users.
+
+<!-- This example shows some of Strudel's unique support for chords and transposition familiar to students of Western music theory. This differs a little from Tidal's approach and thanks to the integration of the javascript library XXX (*TODO* ? or is this all your work Felix?), Strudel's support for tonal transformations such as voice leading is perhaps respects more advanced than Tidal. -->
+
+# Ways to make Sound (and other events)
+
+To generate sound, Strudel supports bindings for different outputs:
+
+- Tone.js (deprecated)
+- Web Audio API
+- WebDirt, a js recreation of Tidal's *Dirt* sample engine (deprecated)
+- OSC via osc-js, compatible with superdirt
+- Csound via the Csound WebAssembly build
+- MIDI via WebMIDI
+- Serial via WebSerial
+
+At first, we used Tone.js as sound output, but it proved to be limited for the use case of Strudel, where each individual event could potentially have a completely different audio graph.
+While the Web Audio API takes a *fire-and-forget* approach, creating a lot of Tone.js instruments and effects causes performance issues quickly. For that reason, we chose to search for alternatives.
+
+Strudel's new default output uses the Web Audio API to create a new audio graph for each event. It currently supports basic oscillators, sample playback, various effects and an experimental support for soundfonts.
+
+WebDirt [@ogbornDktr0WebDirt2022] was created as part of the Estuary Live Coding System [@ogbornEstuaryBrowserbasedCollaborative2017], and proved to be a solid choice for handling samples in Strudel as well. We are however focused on working more directly with the Web Audio API to be able to integrate new features more tightly.
+
+Using the OSC protocol via Strudel's provided Node.js-based OSC proxy server, it is possible to send network messages to trigger events. This is mainly used to render sound using SuperDirt [@SuperDirt2022], which is the well-developed Supercollider-based synthesis framework that Tidal live coders generally use as standard.
+
+Recently, the experimental integration of Csound proved to bring a new dimension of sound design capabilities to Strudel. Thanks to the WebAssembly distribution of this classic system [@CsoundWebAssembly], Csound 'orchestra' synthesisers can be embedded in and then patterned with Strudel code.
+
+MIDI output can also be used to send MIDI messages to either external instruments or to other programs on the same device. Unlike OSC, Strudel is able to send MIDI directly without requiring additional proxy software, but only from web browsers that support it (at the time of writing, this means Chromium-based browsers).
+
+Finally, Strudel supports Serial output, for example to trigger events
+via microcontrollers. This has already been explored for robot
+choreography by Kate Sicchio and Alex McLean, via a performance
+presented at the International Conference on Live Interfaces 2022.
+
+# The Strudel REPL
+
+While Strudel can be used as a library in any JavaScript codebase, its main, reference user interface is the Strudel REPL^[REPL stands for read, evaluate, print/play, loop. It is friendly jargon for an interactive programming interface from computing heritage, usually for a commandline interface but also applied to live coding editors.], which is a browser-based live coding environment. This live code editor is dedicated to manipulating Strudel patterns while they play. The REPL features built-in visual feedback, highlighting which elements in the patterned (mini-notation) sequences are influencing the event that is currently being played. This feedback is designed to support both learning and live use of Strudel.
+
+Besides a UI for playback control and meta information, the main part of the REPL interface is the code editor powered by CodeMirror. In it, the user can edit and evaluate pattern code live, using one of the available synthesis outputs to create music and/or sound art. The control flow of the REPL follows 3 basic steps:
+
+1. The user writes and updates code. Each update transpiles and evaluates it to create a `Pattern` instance
+2. While the REPL is running, the `Scheduler` queries the active `Pattern` by a regular interval, generating `Events` (also known as `Haps` in Strudel) for the next time span.
+3. For each scheduling tick, all generated `Events` are triggered by calling their `onTrigger` method, which is set by the output.
+
+![REPL control flow](images/strudelflow.png){ width=43% }
+
+## User Code
+
+To create a `Pattern` from the user code, two steps are needed:
+
+1. Transpile the JS input code to make it functional
+2. Evaluate the transpiled code
+
+### Transpilation & Evaluation
+
+In the JavaScript world, using transpilation is a common practise to be able to use language features that are not supported by the base language. Tools like `babel` will transpile code that contains unsupported language features into a version of the code without those features.
+
+In the same tradition, Strudel can add a transpilation step to simplify the user code in the context of live coding. For example, the Strudel REPL lets the user create mini-notation patterns using just double quoted strings, while single quoted strings remain what they are:
+
+```js
+"c3 [e3 g3]*2"
+```
+
+is transpiled to:
+
+```js
+mini("c3 [e3 g3]*2").withMiniLocation([1,0,0],[1,14,14])
+```
+
+Here, the string is wrapped in `mini`, which will create a pattern from a mini-notation string. Additionally, the `withMiniLocation` method passes the original source code location of the string to the pattern, which enables highlighting active events.
+
+Other convenient features like pseudo variables, operator overloading and top level await are possible with transpilation.
+
+After the transpilation, the code is ready to be evaluated into a `Pattern`.
+
+Behind the scenes, the user code string is parsed with `acorn`, turning it into an Abstract Syntax Tree (AST). The AST allows changing the structure of the code before generating the transpiled version using `escodegen`.
+
+### Mini-notation
+
+While the transpilation allows JavaScript to express Patterns in a less verbose way, it is still preferable to use the mini-notation as a more compact way to express rhythm. Strudel aims to provide the same mini-notation features and syntax as used in Tidal.
+
+The mini-notation parser is implemented using `peggy`, which allows generating performant parsers for Domain Specific Languages (DSLs) using a concise grammar notation. The generated parser turns the mini-notation string into an AST which is used to call the respective Strudel functions with the given structure. For example, `"c3 [e3 g3]*2"` will result in the following calls:
+
+```js
+seq(
+  reify('c3').withLocation([1,1,1], [1,4,4]),
+  seq(
+    reify('e3').withLocation([1,5,5], [1,8,8]),
+    reify('g3').withLocation([1,8,8], [1,10,10]),
+  ).fast(2)
+)
+```
+
+### Highlighting Locations
+
+As seen in the examples above, both the JS and the mini-notation parser add source code locations using `withMiniLocation` and `withLocation` methods. While the JS parser adds locations relative to the user code as a whole, the mini-notation adds locations relative to the position of the mini-notation string. The absolute location of elements within mini-notation can be calculated by simply adding both locations together. This absolute location can be used to highlight active events in real time.
+
+## Scheduling Events
+
+After an instance of `Pattern` is obtained from the user code,
+it is used by the scheduler to get queried for events. Once started, the scheduler runs at a fixed interval to query the active pattern for events within the current interval's time span. A simplified implementation looks like this:
+
+```js
+let pattern = seq('c3', ['e3', 'g3']); // pattern from user
+let interval = 0.5; // query interval in seconds
+let time = 0; // beginning of current time span
+let minLatency = .1; // min time before a hap should trigger
+setInterval(() => {
+  const haps = pattern.queryArc(time, time + interval);
+  time += interval; // increment time
+  haps.forEach((hap) => {
+    const deadline = hap.whole.begin - time + minLatency;
+    onTrigger(hap, deadline, duration);
+  });
+}, interval * 1000); // query each "interval" seconds
+```
+
+Note that the above code is simplified for illustrative purposes. The actual implementation has to work around imprecise callbacks of `setInterval`. More about the implementation details can be read in [this blog post](https://loophole-letters.vercel.app/web-audio-scheduling).
+
+The fact that `Pattern.queryArc` is a pure function that maps a time span to a set of events allows us to choose any interval we like without changing the resulting output. It also means that when the pattern is changed from outside, the next scheduling callback will work with the new pattern, keeping its clock running.
+
+The latency between the time the pattern is evaluated and the change is heard is between `minLatency` and `interval + minLatency`, in our example between 100ms and 600ms. In Strudel, the current query interval is 50ms with a minLatency of 100ms, meaning the latency is between 50ms and 150ms.
+
+## Output
+
+The last step is to trigger each event in the chosen output.
+This is where the given time and value of each event is used to generate audio or any other form of time based output. The default output of the Strudel REPL is the WebAudio output. To understand what an output does, we first have to understand what control parameters are.
+
+### Control Parameters
+
+To be able to manipulate multiple aspects of sound in parallel, so called control parameters are used to shape the value of each event. Example:
+
+```js
+note("c3 e3").cutoff(1000).s('sawtooth')
+  .queryArc(0, 1).map(hap => hap.value)
+/* [
+  { note: 'c3', cutoff: 1000, s: 'sawtooth' }
+  { note: 'e3', cutoff: 1000, s: 'sawtooth' }
+] */
+```
+
+Here, the control parameter functions `note`, `cutoff` and `s` are used, where each controls a different property in the value object. Each control parameter function accepts a primitive value, a list of values to be sequenced into a `Pattern`, or a `Pattern`. In the example, `note` gets a `Pattern` from a mini-notation expression (double quoted), while `cutoff` and `s` are given a `Number` and a (single quoted) `String` respectively.
+
+Strudel comes with a large default set of control parameter functions that are based on the ones used by Tidal and SuperDirt, focusing on music and audio terminology. It is however possible to create custom control parameters for any purpose:
+
+```js
+const { x, y } = createParams('x', 'y')
+x(sine.range(0, 200)).y(cosine.range(0,200))
+```
+
+This example creates the custom control parameters `x` and `y` which are then used to form a pattern that descibes the coordinates of a circle.
+
+### Outputs
+
+Now that we know how the value of an event is manipulated using control parameters, we can look at how outputs can use that value to generate anything. The scheduler above was calling the `onTrigger` function which is used to implement the output. A very simple version of the web audio output could look like this:
+
+```js
+function onTrigger(hap, deadline, duration) {
+  const { note } = hap.value;
+  const time = getAudioContext().currentTime + deadline;
+  const o = getAudioContext().createOscillator();
+  o.frequency.value = getFreq(note);
+  o.start(time);
+  o.stop(time + event.duration);
+  o.connect(getAudioContext().destination);
+}
+```
+
+The above example will create an `OscillatorNode` for each event, where the frequency is controlled by the `note` param. In essence, this is how the WebAudio API output of Strudel works, only with many more parameters to control synths, samples and effects.
+
+# Pattern alignment and combination
+
+One core aspect of Strudel, inherited from Tidal, is the flexible way that patterns can be combined, irrespective of their structure. Its declarative approach means a live coder does not have to think about the details of *how* this is done, only *what* is to be done.
+
+As a simple example, consider two number patterns `"0 [1 2] 3"`, and `"10 20"`. The first has three contiguous steps of equal lengths, with the second step broken down into two substeps, giving four events in total. There are a very large number of ways in which the structure of these two patterns could be combined, but the default method in both Strudel and Tidal is to line up the cycles of the two patterns, and then take events from the first pattern and match them with those in the second pattern. Therefore, the following two lines are equivalent:
+
+```js
+"0 [1 2] 3".add("10 20")
+"10 [11 22] 23"
+```
+
+Where the events only partially overlap, they are treated as fragments
+of the event in the first pattern. This is a little difficult to
+conceptualise, but lets start by comparing the two patterns in the
+following example:
+
+```js
+"0 1 2".add("10 20")
+"10 [11 21] 20"
+```
+
+They are similar to the previous example in that the number `1` is split in two, with its two halves added to `10` and `20` respectively. However, the `11` 'remembers' that it is a fragment of that original `1` event, and so is treated as having a duration of a third of a cycle, despite only being active for a sixth of a cycle. Likewise, the `21` is also a fragment of that original `1` event, but a fragment of its second half. Because the start of its event is missing, it wouldn't actually trigger a sound (unless it underwent further pattern transformations/combinations).
+
+In practice, the effect of this default, implicit method for combining two patterns is that the second pattern is added *in* to the first one, and indeed this can be made explicit:
+
+```js
+"0 1 2".add.in("10 20")
+```
+
+This makes way for other ways to align the pattern, and several are already defined, in particular:
+
+* `in` - as explained above, aligns cycles, and applies values from the pattern on the right *in* to the pattern on the left.
+* `out` - as with `in`, but values are applied *out* of the pattern on the left (i.e. *in* to the one on the right).
+* `mix` - structures from both patterns are combined, so that the new events are not fragments but are created at intersections of events from both sides.
+* `squeeze` - cycles from the pattern on the right are squeezed into events on the left. So that e.g. `"0 1 2".add.squeeze("10 20")` is equivalent to `"[10 20] [11 21] [12 22]"`.
+* `squeezeout` - as with `squeeze`, but cycles from the left are squeezed into events on the right. So, `"0 1 2".add.squeezeout("10 20")` is equivalent to `[10 11 12] [20 21 22]`.
+* `trig` is similar to `squeezeout` in that cycles from the right are aligned with events on the left. However those cycles are not 'squeezed', rather they are truncated to fit the event. So `"0 1 2 3 4 5 6 7".add.trig("10 [20 30]")` would be equivalent to `10 11 12 13 20 21 30 31`. In effect, events on the right 'trigger' cycles on the left.
+* `trigzero` is similar to `trig`, but the pattern is 'triggered' from its very first cycle, rather than from the current cycle. `trig` and `trigzero` therefore only give different results where the leftmost pattern differs from one cycle to the next.
+
+We will save going deeper into the background, design and practicalities of these alignment functions for future publications. However in the next section, we take them as a case study for looking at the different design affordances offered by Haskell to Tidal, and JavaScript to Strudel.
+
+# Comparing Strudel and Haskell in use
+
+Unlike Haskell, JavaScript lacks the ability to define custom infix
+operators, or change the meaning of existing ones. So the above
+Strudel example of `"0 1 2".add.out("10 20")` is equivalent to the
+Tidal expression `"0 1 2" +| "10 20"`, where the vertical bar in the
+operator `+|` stands for `out` (where `a |+ b` would be equivalent of
+`a.add.in(b)`).
+
+From this we can already see that Tidal tends towards brevity through
+mixing infix operators with functions, and Strudel tends towards
+spelling out operations which are joined together with the `.`
+operator. This then is the design trade-off of Tidal's tersity,
+versus Strudel's simplicity.
+
+To demonstrate this, consider the following Tidal pattern:
+
+```haskell
+iter 4 $ every 3 (||+ n "10 20") $ (n "0 1 3") # s "triangle" # crush 4
+```
+
+This can be directly translated to the Strudel equivalent:
+
+```js
+iter(4, every(3, add.squeeze("10 20"), n("0 1 3").s("triangle").crush(4)))
+```
+
+Although for a more canonical Strudel expression, we would reorder it
+as:
+
+```js
+n("0 1 3").every(3, add.squeeze("10 20")).iter(4).s("triangle").crush(4)
+```
+
+The Strudel example uses the `.` method call operator for all
+operations and combinations, whereas the Tidal example has `#` for the
+default method for combining patterns and uses infix operators for
+other methods. The relative lack of parenthesis in the Tidal example is partly
+due to the way that arguments are applied to Haskell's functions, and
+partly due to the use of the `$` operator as an alternative way to
+establish precedence and control the order of evaluation.
+
+Considering the above, we hypothesise that the Haskell syntax is a little
+cleaner, but that the Strudel syntax is easier to learn. Our informal
+observation is that while Haskell's dollar `$` operator is very useful
+in making code easier to work with, it is one of the most difficult
+aspects of Tidal use for beginners to learn. On the other hand, the
+deeper levels of parenthesis in Strudel code can be difficult to keep
+track of, especially while coding under pressure of live musical
+performance. However this difficulty can largely be mitigated by
+reordering expressions, and further mitigated by supporting editor
+features.
+
+With Strudel, we have little choice but to embrace the affordances and
+constraints offered by JavaScript, and while designing a
+domain-specific language based on method calls is a
+challenge, through creative adoption of functional programming
+techniques like partial application, we are so far very happy with the
+results. Tidal's functional reactive approach to pattern-making has in
+general translated well to JavaScript, and opportunities and
+constraints have overall traded off to create a very approachable and
+useable live coding environment.
+
+## The trade-off of flexible typing
+
+We have identified one problem with porting Tidal to JavaScript where we have missed Haskell's strict typing and type inference. In both Tidal and Strudel, time is rational, where any point in time is represented as the ratio of two integers. This allows representation of musical ratios such that are impossible to represent accurately using the more common floating point numbers. However while libraries are available that support rational numbers in JavaScript, the lack of strict typing means that it is easy to implement pattern methods where computationally expensive conversion from floating point to rational numbers are performed late, and therefore often enough to overload the CPUs, due to the large number of iterative calculations required to estimate a ratio for a given floating point number. To mitigate this problem, we might consider moving to TypeScript in the future.
+
+# Future Outlook
+
+The project is still young, with many features on the horizon. As general guiding principles, Strudel aims to be
+
+1. accessible
+2. consistent with Tidal's approach to pattern
+3. modular and extensible
+
+While Haskell's type system makes it a great language for the ongoing development of Tidal's inner representation of pattern, JavaScript's vibrant ecosystem, flexibility and accessibility makes it a great host for more ad-hoc experiments, including interface design. For the future, it is planned to integrate additional alternative sound engines such as Glicol [@lanChaosprintGlicol2022] and Faust [@FaustProgrammingLanguage2022]. Strudel is already approaching feature parity with Tidal, but there are more Tidal functions to be ported, and work to be done to improve compatibility with Tidal's mini-notation. Tidal version 2.0 is under development, which brings a new representation for sequences to its patterns, which will then be brought to Strudel. Besides sound, other ways to render events are being explored, such as graphical, and choreographic output. We are also looking into alternative ways of editing patterns, including multi-user editing for network music, parsing a novel syntax to escape the constraints of JavaScript, and developing hardware/e-textile interfaces. In summary, there is a lot of fun ahead.
+
+# Links
+
+The Strudel REPL is available at <https://strudel.tidalcycles.org>, including an interactive tutorial.
+The repository is at <https://github.com/tidalcycles/strudel>, all the code is open source under the AGPL-3.0 License.
+
+# Acknowledgments
+
+Thanks to the Strudel and wider Tidal, live coding, WebAudio and free/open source software communities for inspiration and support. Alex McLean's work on this project is supported by a UKRI Future Leaders Fellowship [grant number MR/V025260/1].
+
+# References