meetup talk

- fix flickering due to global alpha mutation
- change default inactive color
- add smear option
- add playheadColor option

.eslintignore

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

.eslintrc.json

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

.github/workflows/deploy.yml

@@ -1,49 +0,0 @@
-name: Build and Deploy
-
-on: [workflow_dispatch]
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
-  contents: read
-  pages: write
-  id-token: write
-  deployments: write
-
-# Allow one concurrent deployment
-concurrency:
-  group: "pages"
-  cancel-in-progress: true
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    steps:
-      - uses: actions/checkout@v2
-      - uses: pnpm/action-setup@v2
-        with:
-          version: 7
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 18
-          cache: "pnpm"
-      - name: Install Dependencies
-        run: pnpm install
-
-      - name: Build
-        run: pnpm build
-
-      - name: Setup Pages
-        uses: actions/configure-pages@v2
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
-        with:
-          # Upload entire repository
-          path: "./website/dist"
-
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v1

.github/workflows/test.yml

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

.gitignore

@@ -35,8 +35,4 @@ tutorial.rendered.mdx
 doc.json
 talk/public/EmuSP12
 talk/public/samples
-server/samples/old
-repl/stats.html
-coverage
-public/icons/apple-splash-*
-dev-dist
+server/samples/old

.prettierignore

@@ -1,12 +0,0 @@
-*.md
-*.json
-*.yml
-*.
-**/out
-**/dist
-packages/mini/krill-parser.js
-packages/xen/tunejs.js
-paper
-pnpm-lock.yaml
-pnpm-workspace.yaml
-**/dev-dist

.prettierrc

@@ -1,15 +1,16 @@
 {
-  "printWidth": 120,
-  "useTabs": false,
-  "tabWidth": 2,
-  "semi": true,
-  "singleQuote": true,
-  "jsxSingleQuote": false,
-  "trailingComma": "all",
-  "bracketSpacing": true,
-  "bracketSameLine": 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

@@ -2,9 +2,5 @@
     "cSpell.words": [
         "subspan",
         "vals"
-    ],
-    "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 glanced through the
-[docs](https://strudel.tidalcycles.org/learn/) to find out if it answers your 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 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,10 +29,13 @@ 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 Docs
+## Improve the Tutorial
 
-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.
+If you find some weak spots in the [tutorial](https://strudel.tidalcycles.org/), 
+you are welcome to improve them by editing [this file](https://github.com/tidalcycles/strudel/blob/main/tutorial/tutorial.mdx).
+
+
+This will even work without setting up a development environment, only a github account is required.
 
 ## Propose a Feature
 
@@ -49,43 +52,40 @@ Please check that it has not been reported before.
 To fix a bug that has been reported,
 
 1. check that nobody else is already fixing it and respond to the issue to let people know you're on it
-2. fork the repository
-3. make sure you've setup the project (see below)
-4. hopefully fix the bug
-5. make sure the tests pass
-6. send a pull request
+3. fork the repository
+4. make sure you've setup the project (see below)
+5. hopefully fix the bug
+6. make sure the tests pass
+7. send a pull request
 
 ## Write Tests
 
 There are still many tests that have not been written yet! Reading and writing tests is a great opportunity to get familiar with the codebase.
-You can find the tests in each package in the `test` folder. To run all tests, run `pnpm test` from the root folder.
+You can find the tests in each package in the `test` folder. To run all tests, run `npm test` from the root folder.
 
 ## Project Setup
 
 To get the project up and running for development, make sure you have installed:
 
-- [git](https://git-scm.com/)
-- [node](https://nodejs.org/en/) >= 18
-- [pnpm](https://pnpm.io/) (`npm i pnpm -g`)
+- git
+- node, preferably v16
 
 then, do the following:
 
 ```sh
 git clone https://github.com/tidalcycles/strudel.git && cd strudel
-pnpm i # install at root to symlink packages
-pnpm start # start repl
+npm i # install at root to symlink packages
+npx lerna bootstrap # install all dependencies in packages
+cd repl && npm i # install repl dependencies
+npm run start # start repl
 ```
 
-Those commands might look slightly different for your OS.
+Those commands might look slightly different for your OS. 
 Please report any problems you've had with the setup instructions!
 
 ## Code Style
 
 To make sure the code changes only where it should, we are using prettier to unify the code style.
-
-- You can format all files at once by running `pnpm prettier` from the project root
-- Run `pnpm format-check` from the project root to check if all files are well formatted
-
 If you use VSCode, you can
 
 1. install [the prettier extension](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
@@ -93,50 +93,21 @@ If you use VSCode, you can
 3. Choose "Configure Default Formatter..."
 4. Select prettier
 
-## ESLint
-
-To prevent unwanted runtime errors, this project uses [eslint](https://eslint.org/).
-
-- You can check for lint errors by running `pnpm lint`
-
-There are also eslint extensions / plugins for most editors.
-
-## Running Tests
-
-- Run all tests with `pnpm test`
-- Run all tests with UI using `pnpm test-ui`
-
-## Running all CI Checks
-
-When opening a PR, the CI runner will automatically check the code style and eslint, as well as run all tests.
-You can run the same check with `pnpm check`
-
 ## Package Workflow
 
 The project is split into multiple [packages](https://github.com/tidalcycles/strudel/tree/main/packages) with independent versioning.
-When you run `pnpm i` on the root folder, [pnpm workspaces](https://pnpm.io/workspaces) will install all dependencies of all subpackages. This will allow any js file to import `@strudel.cycles/<package-name>` to get the local version,
-allowing to develop multiple packages at the same time.
+When you run `npm i` on the root folder, [npm workspaces](https://docs.npmjs.com/cli/v7/using-npm/workspaces) will symlink all packages
+in the `node_modules` folder. This will allow any js file to import `@strudel.cycles/<package-name>` to get the local version, 
+which allows developing multiple packages at the same time
 
 ## Package Publishing
 
 To publish all packages that have been changed since the last release, run:
 
 ```sh
-npm login
 npx lerna publish
 ```
 
-To manually publish a single package, increase the version in the `package.json`, then run `pnpm publish`.
-Important: Always publish with `pnpm`, as `npm` does not support overriding main files in `publishConfig`, which is done in all the packages.
-
-### New Packages
-
-To add a new package, you have to publish it manually the first time, using:
-
-```sh
-cd packages/<package-name> && pnpm publish --access public
-```
-
 ## Have Fun
 
 Remember to have fun, and that this project is driven by the passion of volunteers!

README.md

@@ -5,17 +5,16 @@
 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/>
-- Docs: <https://strudel.tidalcycles.org/learn/>
+- Tutorial: <https://strudel.tidalcycles.org/tutorial/>
 - Technical Blog Post: <https://loophole-letters.vercel.app/strudel>
-- 1 Year of Strudel Blog Post: <https://loophole-letters.vercel.app/strudel1year>
 
 ## Running Locally
 
 After cloning the project, you can run the REPL locally:
 
 ```bash
-pnpm run setup
-pnpm run repl
+npm run setup
+npm run repl
 ```
 
 ## Using Strudel In Your Project
@@ -39,12 +38,6 @@ Click on the package names to find out more about each one.
 
 There are many ways to contribute to this project! See [contribution guide](./CONTRIBUTING.md).
 
-<a href="https://github.com/tidalcycles/strudel/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=tidalcycles/strudel" />
-</a>
-
-Made with [contrib.rocks](https://contrib.rocks).
-
 ## Community
 
 There is a #strudel channel on the TidalCycles discord: <https://discord.com/invite/HGEdXmRkzT>

index.mjs

@@ -1,17 +0,0 @@
-// this barrel export is currently only used to find undocumented exports
-export * from './packages/core/index.mjs';
-export * from './packages/csound/index.mjs';
-export * from './packages/embed/index.mjs';
-export * from './packages/eval/index.mjs';
-export * from './packages/midi/index.mjs';
-export * from './packages/mini/index.mjs';
-export * from './packages/osc/index.mjs';
-export * from './packages/react/index.mjs';
-export * from './packages/serial/index.mjs';
-export * from './packages/soundfonts/index.mjs';
-export * from './packages/tonal/index.mjs';
-export * from './packages/tone/index.mjs';
-export * from './packages/transpiler/index.mjs';
-export * from './packages/webaudio/index.mjs';
-export * from './packages/webdirt/index.mjs';
-export * from './packages/xen/index.mjs';

jsdoc.config.json

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

lerna.json

@@ -2,7 +2,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "independent",
-  "npmClient": "pnpm",
-  "useWorkspaces": true
+  "version": "independent"
 }

my-patterns/README.md

@@ -1,59 +0,0 @@
-# my-patterns
-
-This directory can be used to save your own patterns, which then get
-made into a pattern swatch.
-
-Example: <https://felixroos.github.io/strudel/swatch/>
-
-## deploy
-
-### 1. fork the [strudel repo on github](https://github.com/tidalcycles/strudel.git)
-
-### 2. clone your fork to your machine `git clone https://github.com/<your-username>/strudel.git strudel && cd strudel`
-
-### 3. create a separate branch like `git branch patternuary && git checkout patternuary`
-
-### 4. save one or more .txt files in the my-patterns folder
-
-### 5. edit `website/public/CNAME` to contain `<your-username>.github.io/strudel`
-
-### 6. edit `website/astro.config.mjs` to use site: `https://<your-username>.github.io` and base `/strudel`, like this
-
-```js
-const site = 'https://<your-username>.github.io';
-const base = '/strudel';
-```
-
-### 7. commit & push the changes
-
-```sh
-git add . && git commit -m "site config" && git push --set-upstream origin
-```
-
-### 8. deploy to github pages
-
-- go to settings -> pages and select "Github Actions" as source
-- go to settings -> environments -> github-pages and press the edit button next to `main` and type in `patternuary` (under "Deployment branches")
-- go to Actions -> `Build and Deploy` and click `Run workflow` with branch `patternuary`
-
-### 9. 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).
-
-### 10. optional: automatic deployment
-
-If you want to automatically deploy your site on push, go to `deploy.yml` and change `workflow_dispatch` to `push`.
-
-## running locally
-
-- install dependencies with `npm run setup`
-- run dev server with `npm run repl` and open `http://localhost:3000/strudel/swatch/`
-
-## tests fail?
-
-Your tests might fail if the code does not follow prettiers format.
-In that case, run `npm run codeformat`. To disable that, remove `npm run format-check` from `test.yml`
-
-## updating your fork
-
-To update your fork, you can pull the main branch and merge it into your `patternuary` branch.

package.json

@@ -1,33 +1,24 @@
 {
   "name": "@strudel.cycles/monorepo",
-  "version": "0.5.0",
+  "version": "0.0.1",
   "private": true,
   "description": "Port of tidalcycles to javascript",
   "scripts": {
-    "setup": "pnpm i",
-    "pretest": "npm run jsdoc-json",
-    "prebuild": "npm run jsdoc-json",
-    "prestart": "npm run jsdoc-json",
-    "test": "npm run pretest && vitest run --version",
-    "test-ui": "npm run pretest && vitest --ui",
-    "test-coverage": "npm run pretest && vitest --coverage",
-    "snapshot": "npm run pretest && vitest run -u --silent",
-    "repl": "npm run prestart && cd website && npm run dev",
-    "start": "npm run prestart && cd website && npm run dev",
-    "dev": "npm run prestart && cd website && npm run dev",
-    "build": "npm run prebuild && cd website && npm run build",
-    "preview": "cd website && npm run preview",
+    "test": "npm run test --workspaces --if-present && cd repl && npm run test",
+    "bootstrap": "lerna bootstrap",
+    "setup": "npm i && npm run bootstrap && cd repl && npm i && cd ../tutorial && npm i",
+    "snapshot": "cd repl && npm run snapshot",
+    "repl": "cd repl && npm run dev",
     "osc": "cd packages/osc && npm run server",
-    "deploy": "NODE_DEBUG=gh-pages gh-pages -d out",
+    "build": "rm -rf out && cd repl && npm run build && cd ../tutorial && npm run build",
+    "preview": "npx serve ./out",
+    "deploy": "gh-pages -d out",
     "jsdoc": "jsdoc packages/ -c jsdoc.config.json",
-    "jsdoc-json": "jsdoc packages/ --template ./node_modules/jsdoc-json --destination doc.json -c jsdoc.config.json",
-    "lint": "eslint . --ext mjs,js --quiet",
-    "codeformat": "prettier --write .",
-    "format-check": "prettier --check .",
-    "report-undocumented": "npm run jsdoc-json && node undocumented.mjs > undocumented.json",
-    "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"
+    "jsdoc-json": "jsdoc packages/ --template ./node_modules/jsdoc-json --destination doc.json -c jsdoc.config.json"
   },
+  "workspaces": [
+    "packages/*"
+  ],
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tidalcycles/strudel.git"
@@ -45,30 +36,13 @@
     "url": "https://github.com/tidalcycles/strudel/issues"
   },
   "homepage": "https://strudel.tidalcycles.org",
-  "dependencies": {
-    "@strudel.cycles/core": "workspace:*",
-    "@strudel.cycles/mini": "workspace:*",
-    "@strudel.cycles/tonal": "workspace:*",
-    "@strudel.cycles/transpiler": "workspace:*",
-    "@strudel.cycles/webaudio": "workspace:*",
-    "@strudel.cycles/xen": "workspace:*",
-    "acorn": "^8.8.1",
-    "dependency-tree": "^9.0.0",
-    "vitest": "^0.25.7"
-  },
   "devDependencies": {
-    "@vitest/ui": "^0.25.7",
-    "c8": "^7.12.0",
-    "canvas": "^2.11.0",
-    "eslint": "^8.28.0",
-    "eslint-plugin-import": "^2.27.5",
     "events": "^3.3.0",
     "gh-pages": "^4.0.0",
     "jsdoc": "^3.6.10",
     "jsdoc-json": "^2.0.2",
     "jsdoc-to-markdown": "^7.1.1",
-    "lerna": "^6.5.1",
-    "prettier": "^2.8.1",
-    "rollup-plugin-visualizer": "^5.8.1"
+    "lerna": "^4.0.0",
+    "mocha": "^9.1.4"
   }
 }

packages/README.md

@@ -1,15 +0,0 @@
-# Packages
-
-Each folder represents one of the @strudel.cycles/* packages [published to npm](https://www.npmjs.com/org/strudel.cycles).
-
-To understand how those pieces connect, refer to the [Technical Manual](https://github.com/tidalcycles/strudel/wiki/Technical-Manual) or the individual READMEs.
-
-This is a graphical view of all the packages: [full screen](https://raw.githubusercontent.com/tidalcycles/strudel/main/dependencies.svg)
-
-![dependencies](https://raw.githubusercontent.com/tidalcycles/strudel/main/dependencies.svg)
-
-Generated with
-
-```sh
-npx depcruise --include-only "^packages" -X "node_modules" --output-type dot packages | dot -T svg > dependencygraph.svg
-```

packages/core/.npmignore

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

packages/core/README.md

@@ -33,7 +33,6 @@ b: 3/2 - 7/4
 c: 7/4 - 2
 ```
 
-- [play with @strudel.cycles/core on codesandbox](https://codesandbox.io/s/strudel-core-test-forked-9ywhv7?file=/src/index.js).
-- [open color pattern example](https://raw.githack.com/tidalcycles/strudel/main/packages/core/examples/canvas.html)
-- [open minimal repl example](https://raw.githack.com/tidalcycles/strudel/main/packages/core/examples/vanilla.html)
-- [open minimal vite example](./examples/vite-vanilla-repl/)
+- [play with @strudel.cycles/core on codesandbox](https://codesandbox.io/s/strudel-core-test-qmz6qr?file=/src/index.js).
+- [open color pattern example](https://raw.githack.com/tidalcycles/strudel/package-examples/packages/core/examples/canvas.html)
+- [open minimal repl example](https://raw.githack.com/tidalcycles/strudel/package-examples/packages/core/examples/metro.html)

packages/core/animate.mjs

@@ -1,67 +0,0 @@
-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, angle = 0, fill = 'darkseagreen' } = f.value;
-      w *= ww;
-      h *= wh;
-      if (r !== undefined && angle !== undefined) {
-        const radians = angle * 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, angle, r, fill, smear } = createParams('x', 'y', 'w', 'h', 'angle', '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

@@ -1,175 +0,0 @@
-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/cyclist.mjs

@@ -1,92 +0,0 @@
-/*
-cyclist.mjs - <short description TODO>
-Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/cyclist.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import createClock from './zyklus.mjs';
-import { logger } from './logger.mjs';
-
-export class Cyclist {
-  constructor({ interval, onTrigger, onToggle, onError, getTime, latency = 0.1 }) {
-    this.started = false;
-    this.cps = 1;
-    this.lastTick = 0; // absolute time when last tick (clock callback) happened
-    this.lastBegin = 0; // query begin of last tick
-    this.lastEnd = 0; // query end of last tick
-    this.getTime = getTime; // get absolute time
-    this.onToggle = onToggle;
-    this.latency = latency; // fixed trigger time offset
-    const round = (x) => Math.round(x * 1000) / 1000;
-    this.clock = createClock(
-      getTime,
-      // called slightly before each cycle
-      (phase, duration, tick) => {
-        if (tick === 0) {
-          this.origin = phase;
-        }
-        try {
-          const time = getTime();
-          const begin = this.lastEnd;
-          this.lastBegin = begin;
-          const end = round(begin + duration * this.cps);
-          this.lastEnd = end;
-          const haps = this.pattern.queryArc(begin, end);
-          const tickdeadline = phase - time; // time left till phase begins
-          this.lastTick = time + tickdeadline;
-
-          haps.forEach((hap) => {
-            if (hap.part.begin.equals(hap.whole.begin)) {
-              const deadline = (hap.whole.begin - begin) / this.cps + tickdeadline + latency;
-              const duration = hap.duration / this.cps;
-              onTrigger?.(hap, deadline, duration, this.cps);
-            }
-          });
-        } catch (e) {
-          logger(`[cyclist] error: ${e.message}`);
-          onError?.(e);
-        }
-      },
-      interval, // duration of each cycle
-    );
-  }
-  now() {
-    const secondsSinceLastTick = this.getTime() - this.lastTick - this.clock.duration;
-    return this.lastBegin + secondsSinceLastTick * this.cps; // + this.clock.minLatency;
-  }
-  setStarted(v) {
-    this.started = v;
-    this.onToggle?.(v);
-  }
-  start() {
-    if (!this.pattern) {
-      throw new Error('Scheduler: no pattern set! call .setPattern first.');
-    }
-    logger('[cyclist] start');
-    this.clock.start();
-    this.setStarted(true);
-  }
-  pause() {
-    logger('[cyclist] pause');
-    this.clock.pause();
-    this.setStarted(false);
-  }
-  stop() {
-    logger('[cyclist] stop');
-    this.clock.stop();
-    this.setStarted(false);
-  }
-  setPattern(pat, autostart = false) {
-    this.pattern = pat;
-    if (autostart && !this.started) {
-      this.start();
-    }
-  }
-  setCps(cps = 1) {
-    this.cps = cps;
-  }
-  log(begin, end, haps) {
-    const onsets = haps.filter((h) => h.hasOnset());
-    console.log(`${begin.toFixed(4)} - ${end.toFixed(4)} ${Array(onsets.length).fill('I').join('')}`);
-  }
-}

packages/core/drawLine.mjs

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

packages/core/euclid.mjs

@@ -1,171 +1,95 @@
 /*
-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
-
+euclid.mjs - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/euclid.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Pattern, timeCat, register, silence } from './pattern.mjs';
-import { rotate, flatten, splitAt, zipWith } from './util.mjs';
+import { Pattern, timeCat } from './pattern.mjs';
+import bjork from 'bjork';
+import { rotate } from './util.mjs';
 import Fraction from './fraction.mjs';
 
-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)));
-};
-
-export 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
- * 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
- * @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").euclidRot(3,5,2)
- * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
- * note("c3").euclid(3,7)
- * @example // The Cuban tresillo pattern.
- * note("c3").euclid(3,8)
- * @example // Another Ruchenitza Bulgarian folk-dance rhythm.
- * note("c3").euclid(4,7)
- * @example // The Aksak rhythm of Turkey.
- * note("c3").euclid(4,9)
- * @example // The metric pattern used by Frank Zappa in his piece titled Outside Now.
- * note("c3").euclid(4,11)
- * @example // Yields the York-Samai pattern, a popular Arab rhythm.
- * note("c3").euclid(5,6)
- * @example // The Nawakhat pattern, another popular Arab rhythm.
- * note("c3").euclid(5,7)
- * @example // The Cuban cinquillo pattern.
- * note("c3").euclid(5,8)
- * @example // A popular Arab rhythm called Agsag-Samai.
- * note("c3").euclid(5,9)
- * @example // The metric pattern used by Moussorgsky in Pictures at an Exhibition.
- * note("c3").euclid(5,11)
- * @example // The Venda clapping pattern of a South African children’s song.
- * note("c3").euclid(5,12)
- * @example // The Bossa-Nova rhythm necklace of Brazil.
- * note("c3").euclid(5,16)
- * @example // A typical rhythm played on the Bendir (frame drum).
- * note("c3").euclid(7,8)
- * @example // A common West African bell pattern.
- * note("c3").euclid(7,12)
- * @example // A Samba rhythm necklace from Brazil.
- * 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").euclidRot(11,24,14)
- * @example // Another rhythm necklace of the Aka Pygmies of the upper Sangha.
- * note("c3").euclidRot(13,24,5)
- */
-
-const _euclidRot = function (pulses, steps, rotation) {
-  const b = bjork(pulses, steps);
+const euclid = (pulses, steps, rotation = 0) => {
+  const b = bjork(steps, pulses);
   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));
-});
+/**
+ * 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.
+ *
+ * @memberof Pattern
+ * @param {number} pulses the number of onsets / beats
+ * @param {number} steps the number of steps to fill
+ * @param {number} rotation (optional) offset in steps
+ * @returns Pattern
+ * @example // The Cuban tresillo pattern.
+ * "c3".euclid(3,8)
+ * @example // A thirteenth century Persian rhythm called Khafif-e-ramal.
+ * "c3".euclid(2,5)
+ * @example // The archetypal pattern of the Cumbia from Colombia, as well as a Calypso rhythm from Trinidad.
+ * "c3".euclid(3,4)
+ * @example // Another thirteenth century Persian rhythm by the name of Khafif-e-ramal, as well as a Rumanian folk-dance rhythm.
+ * "c3".euclid(3,5,2)
+ * @example // A Ruchenitza rhythm used in a Bulgarian folk-dance.
+ * "c3".euclid(3,7)
+ * @example // The Cuban tresillo pattern.
+ * "c3".euclid(3,8)
+ * @example // Another Ruchenitza Bulgarian folk-dance rhythm.
+ * "c3".euclid(4,7)
+ * @example // The Aksak rhythm of Turkey.
+ * "c3".euclid(4,9)
+ * @example // The metric pattern used by Frank Zappa in his piece titled Outside Now.
+ * "c3".euclid(4,11)
+ * @example // Yields the York-Samai pattern, a popular Arab rhythm.
+ * "c3".euclid(5,6)
+ * @example // The Nawakhat pattern, another popular Arab rhythm.
+ * "c3".euclid(5,7)
+ * @example // The Cuban cinquillo pattern.
+ * "c3".euclid(5,8)
+ * @example // A popular Arab rhythm called Agsag-Samai.
+ * "c3".euclid(5,9)
+ * @example // The metric pattern used by Moussorgsky in Pictures at an Exhibition.
+ * "c3".euclid(5,11)
+ * @example // The Venda clapping pattern of a South African children’s song.
+ * "c3".euclid(5,12)
+ * @example // The Bossa-Nova rhythm necklace of Brazil.
+ * "c3".euclid(5,16)
+ * @example // A typical rhythm played on the Bendir (frame drum).
+ * "c3".euclid(7,8)
+ * @example // A common West African bell pattern.
+ * "c3".euclid(7,12)
+ * @example // A Samba rhythm necklace from Brazil.
+ * "c3".euclid(7,16,14)
+ * @example // A rhythm necklace used in the Central African Republic.
+ * "c3".euclid(9,16)
+ * @example // A rhythm necklace of the Aka Pygmies of Central Africa.
+ * "c3".euclid(11,24,14)
+ * @example // Another rhythm necklace of the Aka Pygmies of the upper Sangha.
+ * "c3".euclid(13,24,5)
+ */
+Pattern.prototype.euclid = function (pulses, steps, rotation = 0) {
+  return this.struct(euclid(pulses, steps, rotation));
+};
 
 /**
- * Similar to `euclid`, but each pulse is held until the next pulse,
- * so there will be no gaps.
- * @name euclidLegato
- * @memberof Pattern
- * @example
- * n("g2").decay(.1).sustain(.3).euclidLegato(3,8)
+ * Similar to {@link Pattern#euclid}, but each pulse is held until the next pulse, so there will be no gaps.
  */
-
-const _euclidLegato = function (pulses, steps, rotation, pat) {
-  if (pulses < 1) {
-    return silence;
-  }
-  const bin_pat = _euclidRot(pulses, steps, rotation);
-  const gapless = bin_pat
+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)
     .join('')
     .split('1')
     .slice(1)
     .map((s) => [s.length + 1, true]);
-  return pat.struct(timeCat(...gapless));
+  return this.struct(timeCat(...gapless)).late(Fraction(firstOne).div(steps));
 };
 
-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);
-});
+export default euclid;

packages/core/evaluate.mjs

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

packages/core/examples/basic.html

@@ -1,13 +1,13 @@
 <input
   type="text"
   id="text"
-  value="seq('a', ['b', 'c'])"
+  value="cat('a', 'b')"
   style="width: 100%; font-size: 2em; outline: none; margin-bottom: 10px"
   spellcheck="false"
 />
 <div id="output"></div>
 <script type="module">
-  const strudel = await import('https://cdn.skypack.dev/@strudel.cycles/core@0.6.8');
+  const strudel = await import('https://cdn.skypack.dev/@strudel.cycles/core@0.0.2');
   Object.assign(window, strudel); // assign all strudel functions to global scope to use with eval
   const input = document.getElementById('text');
   const getEvents = () => {

packages/core/examples/canvas.html

@@ -2,13 +2,13 @@
   <input
     type="text"
     id="text"
-    value="seq('tomato', 'indigo', ['white', 'steelblue']).fast(4)"
+    value="cat('orange', 'indigo')"
     style="width: 100%; font-size: 2em; background: black; color: white; outline: none; position: absolute; top: 0"
     spellcheck="false"
   />
   <canvas id="canvas"></canvas>
   <script type="module">
-    const strudel = await import('https://cdn.skypack.dev/@strudel.cycles/core@0.6.8');
+    const strudel = await import('https://cdn.skypack.dev/@strudel.cycles/core@0.0.2');
     // this adds all strudel functions to the global scope, to be used by eval
     Object.assign(window, strudel);
     // setup elements

packages/core/examples/vanilla.html

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,22 +0,0 @@
-{
-  "name": "vite-vanilla-repl",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build-githack": "vite build --base /tidalcycles/strudel/use-acorn/packages/core/examples/vite-vanilla-repl/dist/",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "devDependencies": {
-    "vite": "^3.2.0"
-  },
-  "dependencies": {
-    "@strudel.cycles/core": "workspace:*",
-    "@strudel.cycles/mini": "workspace:*",
-    "@strudel.cycles/transpiler": "workspace:*",
-    "@strudel.cycles/webaudio": "workspace:*",
-    "@strudel.cycles/tonal": "workspace:*"
-  }
-}

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

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

packages/core/fraction.mjs

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

packages/core/hap.mjs

@@ -79,42 +79,15 @@ export class Hap {
     );
   }
 
-  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 + ' ]';
+  show() {
+    return (
+      '(' + (this.whole == undefined ? '~' : this.whole.show()) + ', ' + this.part.show() + ', ' + this.value + ')'
+    );
   }
 
-  showWhole(compact = false) {
+  showWhole() {
     return `${this.whole == undefined ? '~' : this.whole.show()}: ${
-      typeof this.value === 'object'
-        ? compact
-          ? JSON.stringify(this.value).slice(1, -1).replaceAll('"', '').replaceAll(',', ' ')
-          : JSON.stringify(this.value)
-        : this.value
+      typeof this.value === 'object' ? JSON.stringify(this.value) : this.value
     }`;
   }
 
@@ -126,19 +99,6 @@ export class Hap {
   setContext(context) {
     return new Hap(this.whole, this.part, this.value, context);
   }
-
-  ensureObjectValue() {
-    /* if (isNote(hap.value)) {
-      // supports primitive hap values that look like notes
-      hap.value = { note: hap.value };
-    } */
-    if (typeof this.value !== 'object') {
-      throw new Error(
-        `expected hap.value to be an object, but got "${this.value}". Hint: append .note() or .s() to the end`,
-        'error',
-      );
-    }
-  }
 }
 
 export default Hap;

packages/core/index.mjs

@@ -4,11 +4,10 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import controls from './controls.mjs';
+export * from './controls.mjs';
 export * from './euclid.mjs';
 import Fraction from './fraction.mjs';
-import { logger } from './logger.mjs';
-export { Fraction, controls };
+export { Fraction };
 export * from './hap.mjs';
 export * from './pattern.mjs';
 export * from './signal.mjs';
@@ -16,20 +15,14 @@ export * from './state.mjs';
 export * from './timespan.mjs';
 export * from './util.mjs';
 export * from './speak.mjs';
-export * from './evaluate.mjs';
-export * from './repl.mjs';
-export * from './logger.mjs';
-export * from './time.mjs';
-export * from './draw.mjs';
-export * from './animate.mjs';
-export * from './pianoroll.mjs';
-export * from './ui.mjs';
-export { default as drawLine } from './drawLine.mjs';
 export { default as gist } from './gist.js';
 // below won't work with runtime.mjs (json import fails)
 /* import * as p from './package.json';
 export const version = p.version; */
-logger('🌀 @strudel.cycles/core loaded 🌀');
+console.log(
+  '%c // 🌀 @strudel.cycles/core loaded 🌀', // keep "//" for runnable snapshot source..
+  'background-color: black;color:white;padding:4px;border-radius:15px',
+);
 if (globalThis._strudelLoaded) {
   console.warn(
     `@strudel.cycles/core was loaded more than once...

packages/core/logger.mjs

@@ -1,18 +0,0 @@
-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 document !== 'undefined' && typeof CustomEvent !== 'undefined') {
-    document.dispatchEvent(
-      new CustomEvent(logKey, {
-        detail: {
-          message,
-          type,
-          data,
-        },
-      }),
-    );
-  }
-}
-
-logger.key = logKey;

packages/core/package.json

@@ -1,17 +1,11 @@
 {
   "name": "@strudel.cycles/core",
-  "version": "0.7.0",
+  "version": "0.1.2",
   "description": "Port of Tidal Cycles to JavaScript",
   "main": "index.mjs",
   "type": "module",
-  "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
-  },
   "scripts": {
-    "test": "vitest run",
-    "build": "vite build",
-    "prepublishOnly": "pnpm build"
+    "test": "mocha --colors"
   },
   "repository": {
     "type": "git",
@@ -31,11 +25,11 @@
   },
   "homepage": "https://strudel.tidalcycles.org",
   "dependencies": {
+    "bjork": "^0.0.1",
     "fraction.js": "^4.2.0"
   },
-  "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2",
   "devDependencies": {
-    "vite": "^3.2.2",
-    "vitest": "^0.25.7"
-  }
+    "mocha": "^9.2.2"
+  },
+  "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2"
 }

packages/core/repl.mjs

@@ -1,78 +0,0 @@
-import { Cyclist } from './cyclist.mjs';
-import { evaluate as _evaluate } from './evaluate.mjs';
-import { logger } from './logger.mjs';
-import { setTime } from './time.mjs';
-import { evalScope } from './evaluate.mjs';
-
-export function repl({
-  interval,
-  defaultOutput,
-  onSchedulerError,
-  onEvalError,
-  beforeEval,
-  afterEval,
-  getTime,
-  transpiler,
-  onToggle,
-  editPattern,
-}) {
-  const scheduler = new Cyclist({
-    interval,
-    onTrigger: async (hap, deadline, duration, cps) => {
-      try {
-        if (!hap.context.onTrigger || !hap.context.dominantTrigger) {
-          await defaultOutput(hap, deadline, duration, cps);
-        }
-        if (hap.context.onTrigger) {
-          // call signature of output / onTrigger is different...
-          await hap.context.onTrigger(getTime() + deadline, hap, getTime(), cps);
-        }
-      } catch (err) {
-        logger(`[cyclist] error: ${err.message}`, 'error');
-      }
-    },
-    onError: onSchedulerError,
-    getTime,
-    onToggle,
-  });
-  setTime(() => scheduler.now()); // TODO: refactor?
-  const evaluate = async (code, autostart = true) => {
-    if (!code) {
-      throw new Error('no code to evaluate');
-    }
-    try {
-      beforeEval?.({ code });
-      scheduler.setCps(1); // reset cps in case the code does not contain a setCps call
-      // problem: when the code does contain a setCps after an awaited promise,
-      // the cps will be 1 until the promise resolves
-      // example:
-      /*
-      await new Promise(resolve => setTimeout(resolve,1000))
-      setCps(.5)
-      note("c a f e")
-      */
-      // to make sure the setCps inside the code is called immediately,
-      // it has to be placed first
-      let { pattern } = await _evaluate(code, transpiler);
-
-      logger(`[eval] code updated`);
-      pattern = editPattern?.(pattern) || pattern;
-      scheduler.setPattern(pattern, autostart);
-      afterEval?.({ code, pattern });
-      return pattern;
-    } catch (err) {
-      // console.warn(`[repl] eval error: ${err.message}`);
-      logger(`[eval] error: ${err.message}`, 'error');
-      onEvalError?.(err);
-    }
-  };
-  const stop = () => scheduler.stop();
-  const start = () => scheduler.start();
-  const pause = () => scheduler.pause();
-  const setCps = (cps) => scheduler.setCps(cps);
-  evalScope({
-    setCps,
-    setcps: setCps,
-  });
-  return { scheduler, evaluate, start, stop, pause, setCps };
-}

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, register } from './pattern.mjs';
+import { Pattern, fastcat, reify, silence, stack } from './pattern.mjs';
 import Fraction from './fraction.mjs';
 import { id } from './util.mjs';
 
@@ -20,20 +20,20 @@ export const signal = (func) => {
 };
 
 export const isaw = signal((t) => 1 - (t % 1));
-export const isaw2 = isaw.toBipolar();
+export const isaw2 = isaw._toBipolar();
 
 /**
  *  A sawtooth signal between 0 and 1.
  *
  * @return {Pattern}
  * @example
- * "c3 [eb3,g3] g2 [g3,bb3]".legato(saw.slow(4)).note()
+ * "c3 [eb3,g3] g2 [g3,bb3]".legato(saw.slow(4))
  * @example
- * saw.range(0,8).segment(8).scale('C major').slow(4).note()
+ * saw.range(0,8).segment(8).scale('C major').slow(4)
  *
  */
 export const saw = signal((t) => t % 1);
-export const saw2 = saw.toBipolar();
+export const saw2 = saw._toBipolar();
 
 export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));
 
@@ -42,39 +42,41 @@ export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));
  *
  * @return {Pattern}
  * @example
- * sine.segment(16).range(0,15).slow(2).scale('C minor').note()
+ * sine.segment(16).range(0,15).slow(2).scale('C minor')
  *
  */
-export const sine = sine2.fromBipolar();
+export const sine = sine2._fromBipolar();
+
 
 /**
  *  A cosine signal between 0 and 1.
  *
  * @return {Pattern}
  * @example
- * stack(sine,cosine).segment(16).range(0,15).slow(2).scale('C minor').note()
+ * stack(sine,cosine).segment(16).range(0,15).slow(2).scale('C minor')
  *
  */
 export const cosine = sine._early(Fraction(1).div(4));
 export const cosine2 = sine2._early(Fraction(1).div(4));
 
+
 /**
  *  A square signal between 0 and 1.
  *
  * @return {Pattern}
  * @example
- * square.segment(2).range(0,7).scale('C minor').note()
+ * square.segment(2).range(0,7).scale('C minor')
  *
  */
 export const square = signal((t) => Math.floor((t * 2) % 2));
-export const square2 = square.toBipolar();
+export const square2 = square._toBipolar();
 
 /**
  *  A triangle signal between 0 and 1.
  *
  * @return {Pattern}
  * @example
- * tri.segment(8).range(0,7).scale('C minor').note()
+ * triangle.segment(2).range(0,7).scale('C minor')
  *
  */
 export const tri = fastcat(isaw, saw);
@@ -110,120 +112,28 @@ const timeToRandsPrime = (seed, n) => {
 
 const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);
 
-/**
- *
- */
-
-/**
- * A discrete pattern of numbers from 0 to n-1
- * @example
- * run(4).scale('C4 major').note()
- * // "0 1 2 3".scale('C4 major').note()
- */
-export const run = (n) => saw.range(0, n).floor().segment(n);
-
-/**
- * A continuous pattern of random numbers, between 0 and 1.
- *
- * @name rand
- * @example
- * // randomly change the cutoff
- * s("bd sd,hh*4").cutoff(rand.range(500,2000))
- *
- */
 export const rand = signal(timeToRand);
-/**
- * A continuous pattern of random numbers, between -1 and 1
- */
-export const rand2 = rand.toBipolar();
 
 export const _brandBy = (p) => rand.fmap((x) => x < p);
 export const brandBy = (pPat) => reify(pPat).fmap(_brandBy).innerJoin();
 export const brand = _brandBy(0.5);
 
 export const _irand = (i) => rand.fmap((x) => Math.trunc(x * i));
-
-/**
- * A continuous pattern of random integers, between 0 and n-1.
- *
- * @name irand
- * @param {number} n max value (exclusive)
- * @example
- * // randomly select scale notes from 0 - 7 (= C to C)
- * irand(8).struct("x(3,8)").scale('C minor').note()
- *
- */
 export const irand = (ipat) => reify(ipat).fmap(_irand).innerJoin();
 
-export const __chooseWith = (pat, xs) => {
+export const chooseWith = (pat, xs) => {
   xs = xs.map(reify);
   if (xs.length == 0) {
     return silence;
   }
-  return pat.range(0, xs.length).fmap((i) => xs[Math.floor(i)]);
-};
-/**
- * Choose from the list of values (or patterns of values) using the given
- * pattern of numbers, which should be in the range of 0..1
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const chooseWith = (pat, xs) => {
-  return __chooseWith(pat, xs).outerJoin();
+  return pat
+    .range(0, xs.length)
+    .fmap((i) => xs[Math.floor(i)])
+    .outerJoin();
 };
 
-/**
- * As with {chooseWith}, but the structure comes from the chosen values, rather
- * than the pattern you're using to choose with.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const chooseInWith = (pat, xs) => {
-  return __chooseWith(pat, xs).innerJoin();
-};
-
-/**
- * Chooses randomly from the given list of elements.
- * @param  {...any} xs values / patterns to choose from.
- * @returns {Pattern} - a continuous pattern.
- */
 export const choose = (...xs) => chooseWith(rand, xs);
 
-/**
- * Chooses from the given list of values (or patterns of values), according
- * to the pattern that the method is called on. The pattern should be in
- * the range 0 .. 1.
- * @param  {...any} xs
- * @returns {Pattern}
- */
-Pattern.prototype.choose = function (...xs) {
-  return chooseWith(this, xs);
-};
-
-/**
- * As with choose, but the pattern that this method is called on should be
- * in the range -1 .. 1
- * @param  {...any} xs
- * @returns {Pattern}
- */
-Pattern.prototype.choose2 = function (...xs) {
-  return chooseWith(this.fromBipolar(), xs);
-};
-
-/**
- * Picks one of the elements at random each cycle.
- * @returns {Pattern}
- * @example
- * chooseCycles("bd", "hh", "sd").s().fast(4)
- * @example
- * "bd | hh | sd".s().fast(4)
- */
-export const chooseCycles = (...xs) => chooseInWith(rand.segment(1), xs);
-
-export const randcat = chooseCycles;
-
 const _wchooseWith = function (pat, ...pairs) {
   const values = pairs.map((pair) => reify(pair[0]));
   const weights = [];
@@ -246,7 +156,6 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
 
 export const wchooseCycles = (...pairs) => _wchooseWith(rand, ...pairs).innerJoin();
 
-// this function expects pat to be a pattern of floats...
 export const perlinWith = (pat) => {
   const pata = pat.fmap(Math.floor);
   const patb = pat.fmap((t) => Math.floor(t) + 1);
@@ -255,229 +164,101 @@ export const perlinWith = (pat) => {
   return pat.sub(pata).fmap(interp).appBoth(pata.fmap(timeToRand)).appBoth(patb.fmap(timeToRand));
 };
 
-/**
- * Generates a continuous pattern of [perlin noise](https://en.wikipedia.org/wiki/Perlin_noise), in the range 0..1.
- *
- * @name perlin
- * @example
- * // randomly change the cutoff
- * s("bd sd,hh*4").cutoff(perlin.range(500,2000))
- *
- */
-export const perlin = perlinWith(time.fmap((v) => Number(v)));
+export const perlin = perlinWith(time);
 
-export const degradeByWith = register('degradeByWith', (withPat, x, pat) =>
-  pat.fmap((a) => (_) => a).appLeft(withPat.filterValues((v) => v > x)),
-);
+Pattern.prototype._degradeByWith = function (withPat, x) {
+  return this.fmap((a) => (_) => a).appLeft(withPat._filterValues((v) => v > x));
+};
 
-/**
- * Randomly removes events from the pattern by a given amount.
- * 0 = 0% chance of removal
- * 1 = 100% chance of removal
- *
- * @name degradeBy
- * @memberof Pattern
- * @param {number} amount - a number between 0 and 1
- * @returns Pattern
- * @example
- * s("hh*8").degradeBy(0.2)
- * @example
- * s("[hh?0.2]*8")
- */
-export const degradeBy = register('degradeBy', function (x, pat) {
-  return pat._degradeByWith(rand, x);
-});
+Pattern.prototype._degradeBy = function (x) {
+  return this._degradeByWith(rand, x);
+};
 
-/**
- *
- * Randomly removes 50% of events from the pattern. Shorthand for `.degradeBy(0.5)`
- *
- * @name degrade
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").degrade()
- * @example
- * s("[hh?]*8")
- */
-export const degrade = register('degrade', (pat) => pat._degradeBy(0.5));
+Pattern.prototype.degrade = function () {
+  return this._degradeBy(0.5);
+};
 
-/**
- * Inverse of {@link Pattern#degradeBy}: Randomly removes events from the pattern by a given amount.
- * 0 = 100% chance of removal
- * 1 = 0% chance of removal
- * Events that would be removed by degradeBy are let through by undegradeBy and vice versa (see second example).
- *
- * @name undegradeBy
- * @memberof Pattern
- * @param {number} amount - a number between 0 and 1
- * @returns Pattern
- * @example
- * s("hh*8").undegradeBy(0.2)
- */
-export const undegradeBy = register('undegradeBy', function (x, pat) {
-  return pat._degradeByWith(
+Pattern.prototype._undegradeBy = function (x) {
+  return this._degradeByWith(
     rand.fmap((r) => 1 - r),
     x,
   );
-});
+};
 
-export const undegrade = register('undegrade', (pat) => pat._undegradeBy(0.5));
+Pattern.prototype.undegrade = function () {
+  return this._undegradeBy(0.5);
+};
 
-/**
- *
- * Randomly applies the given function by the given probability.
- * Similar to {@link Pattern#someCyclesBy}
- *
- * @name sometimesBy
- * @memberof Pattern
- * @param {number | Pattern} probability - a number between 0 and 1
- * @param {function} function - the transformation to apply
- * @returns Pattern
- * @example
- * s("hh(3,8)").sometimesBy(.4, x=>x.speed("0.5"))
- */
+Pattern.prototype._sometimesBy = function (x, func) {
+  return stack(this._degradeBy(x), func(this._undegradeBy(1 - x)));
+};
 
-export const sometimesBy = register('sometimesBy', function (patx, func, pat) {
+Pattern.prototype.sometimesBy = function (patx, func) {
+  const pat = this;
   return reify(patx)
-    .fmap((x) => stack(pat._degradeBy(x), func(pat._undegradeBy(1 - x))))
+    .fmap((x) => pat._sometimesBy(x, func))
     .innerJoin();
-});
+};
 
-/**
- *
- * Applies the given function with a 50% chance
- *
- * @name sometimes
- * @memberof Pattern
- * @param {function} function - the transformation to apply
- * @returns Pattern
- * @example
- * s("hh*4").sometimes(x=>x.speed("0.5"))
- */
-export const sometimes = register('sometimes', function (func, pat) {
-  return pat._sometimesBy(0.5, func);
-});
+Pattern.prototype._sometimesByPre = function (x, func) {
+  return stack(this._degradeBy(x), func(this).undegradeBy(1 - x));
+};
 
-/**
- *
- * Randomly applies the given function by the given probability on a cycle by cycle basis.
- * Similar to {@link Pattern#sometimesBy}
- *
- * @name someCyclesBy
- * @memberof Pattern
- * @param {number | Pattern} probability - a number between 0 and 1
- * @param {function} function - the transformation to apply
- * @returns Pattern
- * @example
- * s("hh(3,8)").someCyclesBy(.3, x=>x.speed("0.5"))
- */
-
-export const someCyclesBy = register('someCyclesBy', function (patx, func, pat) {
+Pattern.prototype.sometimesByPre = function (patx, func) {
+  const pat = this;
   return reify(patx)
-    .fmap((x) =>
-      stack(
-        pat._degradeByWith(rand._segment(1), x),
-        func(pat._degradeByWith(rand.fmap((r) => 1 - r)._segment(1), 1 - x)),
-      ),
-    )
+    .fmap((x) => pat._sometimesByPre(x, func))
     .innerJoin();
-});
+};
 
-/**
- *
- * Shorthand for `.someCyclesBy(0.5, fn)`
- *
- * @name someCycles
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh(3,8)").someCycles(x=>x.speed("0.5"))
- */
-export const someCycles = register('someCycles', function (func, pat) {
-  return pat._someCyclesBy(0.5, func);
-});
+Pattern.prototype.sometimes = function (func) {
+  return this._sometimesBy(0.5, func);
+};
 
-/**
- *
- * Shorthand for `.sometimesBy(0.75, fn)`
- *
- * @name often
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").often(x=>x.speed("0.5"))
- */
-export const often = register('often', function (func, pat) {
-  return pat.sometimesBy(0.75, func);
-});
+Pattern.prototype.sometimesPre = function (func) {
+  return this._sometimesByPre(0.5, func);
+};
 
-/**
- *
- * Shorthand for `.sometimesBy(0.25, fn)`
- *
- * @name rarely
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").rarely(x=>x.speed("0.5"))
- */
-export const rarely = register('rarely', function (func, pat) {
-  return pat.sometimesBy(0.25, 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)),
+  );
+};
 
-/**
- *
- * Shorthand for `.sometimesBy(0.1, fn)`
- *
- * @name almostNever
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").almostNever(x=>x.speed("0.5"))
- */
-export const almostNever = register('almostNever', function (func, pat) {
-  return pat.sometimesBy(0.1, func);
-});
+Pattern.prototype.someCyclesBy = function (patx, func) {
+  const pat = this;
+  return reify(patx)
+    .fmap((x) => pat._someCyclesBy(x, func))
+    .innerJoin();
+};
 
-/**
- *
- * Shorthand for `.sometimesBy(0.9, fn)`
- *
- * @name almostAlways
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").almostAlways(x=>x.speed("0.5"))
- */
-export const almostAlways = register('almostAlways', function (func, pat) {
-  return pat.sometimesBy(0.9, func);
-});
+Pattern.prototype.someCycles = function (func) {
+  return this._someCyclesBy(0.5, func);
+};
 
-/**
- *
- * Shorthand for `.sometimesBy(0, fn)` (never calls fn)
- *
- * @name never
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").never(x=>x.speed("0.5"))
- */
-export const never = register('never', function (_, pat) {
-  return pat;
-});
+Pattern.prototype.often = function (func) {
+  return this.sometimesBy(0.75, func);
+};
 
-/**
- *
- * Shorthand for `.sometimesBy(1, fn)` (always calls fn)
- *
- * @name always
- * @memberof Pattern
- * @returns Pattern
- * @example
- * s("hh*8").always(x=>x.speed("0.5"))
- */
-export const always = register('always', function (func, pat) {
-  return func(pat);
-});
+Pattern.prototype.rarely = function (func) {
+  return this.sometimesBy(0.25, func);
+};
+
+Pattern.prototype.almostNever = function (func) {
+  return this.sometimesBy(0.1, func);
+};
+
+Pattern.prototype.almostAlways = function (func) {
+  return this.sometimesBy(0.9, func);
+};
+
+Pattern.prototype.never = function (func) {
+  return this;
+};
+
+Pattern.prototype.always = function (func) {
+  return func(this);
+};
+
+Pattern.prototype.patternified.push('degradeBy', 'undegradeBy');

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 { register } from './index.mjs';
+import { Pattern, patternify2 } from './index.mjs';
 
 let synth;
 try {
@@ -16,7 +16,7 @@ try {
 let allVoices = synth?.getVoices();
 // console.log('voices', allVoices);
 
-function triggerSpeech(words, lang, voice) {
+function speak(words, lang, voice) {
   synth.cancel();
   const utterance = new SpeechSynthesisUtterance(words);
   utterance.lang = lang;
@@ -31,8 +31,15 @@ function triggerSpeech(words, lang, voice) {
   speechSynthesis.speak(utterance);
 }
 
-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 this._withHap((hap) => {
+    const onTrigger = (time, hap) => {
+      speak(hap.value, lang, voice);
+    };
+    return hap.setContext({ ...hap.context, onTrigger });
   });
-});
+};
+
+Pattern.prototype.speak = function (lang, voice) {
+  return patternify2(Pattern.prototype._speak)(reify(lang), reify(voice), this);
+};

packages/core/test/controls.test.mjs

@@ -1,28 +0,0 @@
-/*
-controls.test.mjs - <short description TODO>
-Copyright (C) 2023 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/controls.test.mjs>
-This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
-*/
-
-import controls from '../controls.mjs';
-import { mini } from '../../mini/mini.mjs';
-import { describe, it, expect } from 'vitest';
-
-describe('controls', () => {
-  it('should support controls', () => {
-    expect(controls.s('bd').firstCycleValues).toEqual([{ s: 'bd' }]);
-  });
-  it('should support compound controls', () => {
-    expect(controls.s(mini('bd:3')).firstCycleValues).toEqual([{ s: 'bd', n: 3 }]);
-    expect(controls.s(mini('bd:3 sd:4:1.4')).firstCycleValues).toEqual([
-      { s: 'bd', n: 3 },
-      { s: 'sd', n: 4, gain: 1.4 },
-    ]);
-  });
-  it('should support ignore extra elements in compound controls', () => {
-    expect(controls.s(mini('bd:3:0.4 sd:4:0.5:3:17')).firstCycleValues).toEqual([
-      { s: 'bd', n: 3, gain: 0.4 },
-      { s: 'sd', n: 4, gain: 0.5 },
-    ]);
-  });
-});

packages/core/test/drawLine.test.mjs

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

packages/core/test/fraction.test.mjs

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

packages/core/test/util.test.mjs

@@ -1,235 +1,120 @@
 /*
-util.test.mjs - Tests for the core 'util' module
+util.test.mjs - <short description TODO>
 Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/test/util.test.mjs>
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { strict as assert } from 'assert';
 import { pure } from '../pattern.mjs';
-import {
-  isNote,
-  tokenizeNote,
-  noteToMidi,
-  midiToFreq,
-  freqToMidi,
-  _mod,
-  compose,
-  getFrequency,
-  getPlayableNoteValue,
-  parseNumeral,
-  parseFractional,
-  numeralArgs,
-  fractionalArgs,
-} from '../util.mjs';
-import { describe, it, expect } from 'vitest';
+import { isNote, tokenizeNote, toMidi, fromMidi, mod, compose, getFrequency } from '../util.mjs';
 
 describe('isNote', () => {
   it('should recognize notes without accidentals', () => {
     'C3 D3 E3 F3 G3 A3 B3 C4 D5 c5 d5 e5'.split(' ').forEach((note) => {
-      expect(isNote(note)).toBe(true);
+      assert.equal(isNote(note), true);
     });
   });
   it('should recognize notes with accidentals', () => {
     'C#3 D##3 Eb3 Fbb3 Bb5'.split(' ').forEach((note) => {
-      expect(isNote(note)).toBe(true);
+      assert.equal(isNote(note), true);
     });
   });
-  it('should 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('X')).toBe(false);
-    expect(isNote(1)).toBe(false);
+    assert.equal(isNote('H5'), false);
+    assert.equal(isNote('C'), false);
+    assert.equal(isNote('X'), false);
+    assert.equal(isNote(1), false);
   });
 });
 
 describe('isNote', () => {
   it('should tokenize notes without accidentals', () => {
-    expect(tokenizeNote('C3')).toStrictEqual(['C', '', 3]);
-    expect(tokenizeNote('D3')).toStrictEqual(['D', '', 3]);
-    expect(tokenizeNote('E3')).toStrictEqual(['E', '', 3]);
-    expect(tokenizeNote('F3')).toStrictEqual(['F', '', 3]);
-    expect(tokenizeNote('G3')).toStrictEqual(['G', '', 3]);
-    expect(tokenizeNote('A3')).toStrictEqual(['A', '', 3]);
-    expect(tokenizeNote('B3')).toStrictEqual(['B', '', 3]);
-    expect(tokenizeNote('C4')).toStrictEqual(['C', '', 4]);
-    expect(tokenizeNote('D5')).toStrictEqual(['D', '', 5]);
+    assert.deepStrictEqual(tokenizeNote('C3'), ['C', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('D3'), ['D', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('E3'), ['E', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('F3'), ['F', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('G3'), ['G', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('A3'), ['A', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('B3'), ['B', '', 3]);
+    assert.deepStrictEqual(tokenizeNote('C4'), ['C', '', 4]);
+    assert.deepStrictEqual(tokenizeNote('D5'), ['D', '', 5]);
   });
   it('should tokenize notes with accidentals', () => {
-    expect(tokenizeNote('C#3')).toStrictEqual(['C', '#', 3]);
-    expect(tokenizeNote('D##3')).toStrictEqual(['D', '##', 3]);
-    expect(tokenizeNote('Eb3')).toStrictEqual(['E', 'b', 3]);
-    expect(tokenizeNote('Fbb3')).toStrictEqual(['F', 'bb', 3]);
-    expect(tokenizeNote('Bb5')).toStrictEqual(['B', 'b', 5]);
+    assert.deepStrictEqual(tokenizeNote('C#3'), ['C', '#', 3]);
+    assert.deepStrictEqual(tokenizeNote('D##3'), ['D', '##', 3]);
+    assert.deepStrictEqual(tokenizeNote('Eb3'), ['E', 'b', 3]);
+    assert.deepStrictEqual(tokenizeNote('Fbb3'), ['F', 'bb', 3]);
+    assert.deepStrictEqual(tokenizeNote('Bb5'), ['B', 'b', 5]);
   });
   it('should tokenize notes without octave', () => {
-    expect(tokenizeNote('C')).toStrictEqual(['C', '', undefined]);
-    expect(tokenizeNote('C#')).toStrictEqual(['C', '#', undefined]);
-    expect(tokenizeNote('Bb')).toStrictEqual(['B', 'b', undefined]);
-    expect(tokenizeNote('Bbb')).toStrictEqual(['B', 'bb', undefined]);
+    assert.deepStrictEqual(tokenizeNote('C'), ['C', '', undefined]);
+    assert.deepStrictEqual(tokenizeNote('C#'), ['C', '#', undefined]);
+    assert.deepStrictEqual(tokenizeNote('Bb'), ['B', 'b', undefined]);
+    assert.deepStrictEqual(tokenizeNote('Bbb'), ['B', 'bb', undefined]);
   });
   it('should not tokenize invalid notes', () => {
-    expect(tokenizeNote('X')).toStrictEqual([]);
-    expect(tokenizeNote('asfasf')).toStrictEqual([]);
-    expect(tokenizeNote(123)).toStrictEqual([]);
+    assert.deepStrictEqual(tokenizeNote('X'), []);
+    assert.deepStrictEqual(tokenizeNote('asfasf'), []);
+    assert.deepStrictEqual(tokenizeNote(123), []);
   });
 });
-describe('noteToMidi', () => {
+describe('toMidi', () => {
   it('should turn notes into midi', () => {
-    expect(noteToMidi('A4')).toEqual(69);
-    expect(noteToMidi('C4')).toEqual(60);
-    expect(noteToMidi('Db4')).toEqual(61);
-    expect(noteToMidi('C3')).toEqual(48);
-    expect(noteToMidi('Cb3')).toEqual(47);
-    expect(noteToMidi('Cbb3')).toEqual(46);
-    expect(noteToMidi('C#3')).toEqual(49);
-    expect(noteToMidi('C#3')).toEqual(49);
-    expect(noteToMidi('C##3')).toEqual(50);
-  });
-  it('should throw an error when given a non-note', () => {
-    expect(() => noteToMidi('Q')).toThrowError(`not a note: "Q"`);
-    expect(() => noteToMidi('Z')).toThrowError(`not a note: "Z"`);
+    assert.equal(toMidi('A4'), 69);
+    assert.equal(toMidi('C4'), 60);
+    assert.equal(toMidi('Db4'), 61);
+    assert.equal(toMidi('C3'), 48);
+    assert.equal(toMidi('Cb3'), 47);
+    assert.equal(toMidi('Cbb3'), 46);
+    assert.equal(toMidi('C#3'), 49);
+    assert.equal(toMidi('C#3'), 49);
+    assert.equal(toMidi('C##3'), 50);
   });
 });
-describe('midiToFreq', () => {
+describe('fromMidi', () => {
   it('should turn midi into frequency', () => {
-    expect(midiToFreq(69)).toEqual(440);
-    expect(midiToFreq(57)).toEqual(220);
-  });
-});
-describe('freqToMidi', () => {
-  it('should turn frequency into midi', () => {
-    expect(freqToMidi(440)).toEqual(69);
-    expect(freqToMidi(220)).toEqual(57);
+    assert.equal(fromMidi(69), 440);
+    assert.equal(fromMidi(57), 220);
   });
 });
 describe('getFrequency', () => {
-  const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
-  it('should turn note into frequency', () => {
-    expect(getFrequency(happify('a4'))).toEqual(440);
-    expect(getFrequency(happify('a3'))).toEqual(220);
-  });
   it('should turn midi into frequency', () => {
-    expect(getFrequency(happify(69, { type: 'midi' }))).toEqual(440);
-    expect(getFrequency(happify(57, { type: 'midi' }))).toEqual(220);
-  });
-  it('should return frequencies unchanged', () => {
-    expect(getFrequency(happify(440, { type: 'frequency' }))).toEqual(440);
-    expect(getFrequency(happify(432, { type: 'frequency' }))).toEqual(432);
-  });
-  it('should turn object with a "freq" property into frequency', () => {
-    expect(getFrequency(happify({ freq: 220 }))).toEqual(220);
-    expect(getFrequency(happify({ freq: 440 }))).toEqual(440);
-  });
-  it('should throw an error when given a non-note', () => {
-    expect(() => getFrequency(happify('Q'))).toThrowError(`not a note or frequency: Q`);
-    expect(() => getFrequency(happify('Z'))).toThrowError(`not a note or frequency: Z`);
+    const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
+    assert.equal(getFrequency(happify('a4')), 440);
+    assert.equal(getFrequency(happify('a3')), 220);
+    assert.equal(getFrequency(happify(440, { type: 'frequency' })), 440); // TODO: migrate when values are objects..
+    assert.equal(getFrequency(happify(432, { type: 'frequency' })), 432);
   });
 });
 
-describe('_mod', () => {
+describe('mod', () => {
   it('should work like regular modulo with positive numbers', () => {
-    expect(_mod(0, 3)).toEqual(0);
-    expect(_mod(1, 3)).toEqual(1);
-    expect(_mod(2, 3)).toEqual(2);
-    expect(_mod(3, 3)).toEqual(0);
-    expect(_mod(4, 3)).toEqual(1);
-    expect(_mod(4, 2)).toEqual(0);
+    assert.equal(mod(0, 3), 0);
+    assert.equal(mod(1, 3), 1);
+    assert.equal(mod(2, 3), 2);
+    assert.equal(mod(3, 3), 0);
+    assert.equal(mod(4, 3), 1);
+    assert.equal(mod(4, 2), 0);
   });
   it('should work with negative numbers', () => {
-    expect(_mod(-1, 3)).toEqual(2);
-    expect(_mod(-2, 3)).toEqual(1);
-    expect(_mod(-3, 3)).toEqual(0);
-    expect(_mod(-4, 3)).toEqual(2);
-    expect(_mod(-5, 3)).toEqual(1);
-    expect(_mod(-3, 2)).toEqual(1);
+    assert.equal(mod(-1, 3), 2);
+    assert.equal(mod(-2, 3), 1);
+    assert.equal(mod(-3, 3), 0);
+    assert.equal(mod(-4, 3), 2);
+    assert.equal(mod(-5, 3), 1);
+    assert.equal(mod(-3, 2), 1);
   });
 });
 
 describe('compose', () => {
   const add1 = (a) => a + 1;
   it('should compose', () => {
-    expect(compose(add1, add1)(0)).toEqual(2);
-    expect(compose(add1)(0)).toEqual(1);
+    assert.equal(compose(add1, add1)(0), 2);
+    assert.equal(compose(add1)(0), 1);
   });
   const addS = (s) => (a) => a + s;
   it('should compose left to right', () => {
-    expect(compose(addS('a'), addS('b'))('')).toEqual('ab');
-    expect(compose(addS('a'), addS('b'))('x')).toEqual('xab');
-  });
-});
-
-describe('getPlayableNoteValue', () => {
-  const happify = (val, context = {}) => pure(val).firstCycle()[0].setContext(context);
-  it('should return object "note" property', () => {
-    expect(getPlayableNoteValue(happify({ note: 'a4' }))).toEqual('a4');
-  });
-  it('should return object "n" property', () => {
-    expect(getPlayableNoteValue(happify({ n: 'a4' }))).toEqual('a4');
-  });
-  it('should return object "value" property', () => {
-    expect(getPlayableNoteValue(happify({ value: 'a4' }))).toEqual('a4');
-  });
-  it('should turn midi into frequency', () => {
-    expect(getPlayableNoteValue(happify(57, { type: 'midi' }))).toEqual(220);
-  });
-  it('should return frequency value', () => {
-    expect(getPlayableNoteValue(happify(220, { type: 'frequency' }))).toEqual(220);
-  });
-  it('should throw an error if value is not an object, number, or string', () => {
-    expect(() => getPlayableNoteValue(happify(false))).toThrowError(`not a note: false`);
-    expect(() => getPlayableNoteValue(happify(undefined))).toThrowError(`not a note: undefined`);
-  });
-});
-
-describe('parseNumeral', () => {
-  it('should parse numbers as is', () => {
-    expect(parseNumeral(4)).toBe(4);
-    expect(parseNumeral(0)).toBe(0);
-    expect(parseNumeral(20)).toBe(20);
-    expect(parseNumeral('20')).toBe(20);
-    expect(parseNumeral(1.5)).toBe(1.5);
-  });
-  it('should parse notes', () => {
-    expect(parseNumeral('c')).toBe(48);
-    expect(parseNumeral('c4')).toBe(60);
-    expect(parseNumeral('c#4')).toBe(61);
-    expect(parseNumeral('db4')).toBe(61);
-  });
-  it('should throw an error for unknown strings', () => {
-    expect(() => parseNumeral('xyz')).toThrowError('cannot parse as numeral: "xyz"');
-  });
-});
-
-describe('parseFractional', () => {
-  it('should parse numbers as is', () => {
-    expect(parseFractional(4)).toBe(4);
-    expect(parseFractional(0)).toBe(0);
-    expect(parseFractional(20)).toBe(20);
-    expect(parseFractional('20')).toBe(20);
-    expect(parseFractional(1.5)).toBe(1.5);
-  });
-  it('should parse fractional shorthands values', () => {
-    expect(parseFractional('w')).toBe(1);
-    expect(parseFractional('h')).toBe(0.5);
-    expect(parseFractional('q')).toBe(0.25);
-    expect(parseFractional('e')).toBe(0.125);
-  });
-  it('should throw an error for unknown strings', () => {
-    expect(() => parseFractional('xyz')).toThrowError('cannot parse as fractional: "xyz"');
-  });
-});
-
-describe('numeralArgs', () => {
-  it('should convert function arguments to numbers', () => {
-    const add = numeralArgs((a, b) => a + b);
-    expect(add('c4', 2)).toBe(62);
-  });
-});
-describe('fractionalArgs', () => {
-  it('should convert function arguments to numbers', () => {
-    const add = fractionalArgs((a, b) => a + b);
-    expect(add('q', 2)).toBe(2.25);
+    assert.equal(compose(addS('a'), addS('b'))(''), 'ab');
+    assert.equal(compose(addS('a'), addS('b'))('x'), 'xab');
   });
 });

packages/core/test/value.test.mjs

@@ -4,27 +4,21 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { describe, it, expect } from 'vitest';
+import { strict as assert } from 'assert';
 import { map, valued, mul } from '../value.mjs';
-import controls from '../controls.mjs';
-const { n } = controls;
 
 describe('Value', () => {
   it('unionWith', () => {
     const { value } = valued({ freq: 2000, distortion: 1.2 }).unionWith({ distortion: 2 }, mul);
-    expect(value).toStrictEqual({ freq: 2000, distortion: 2.4 });
+    assert.deepStrictEqual(value, { freq: 2000, distortion: 2.4 });
   });
 
   it('experiments', () => {
-    expect(map(mul(5), valued(3)).value).toEqual(15);
-    expect(map(mul(null), valued(3)).value).toEqual(0);
-    expect(map(mul(3), valued(null)).value).toEqual(null);
-    expect(valued(3).map(mul).ap(3).value).toEqual(9);
-    expect(valued(mul).ap(3).ap(3).value).toEqual(9);
-    expect(valued(3).mul(3).value).toEqual(9);
-  });
-  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 }]);
+    assert.equal(map(mul(5), valued(3)).value, 15);
+    assert.equal(map(mul(null), valued(3)).value, 0);
+    assert.equal(map(mul(3), valued(null)).value, null);
+    assert.equal(valued(3).map(mul).ap(3).value, 9);
+    assert.equal(valued(mul).ap(3).ap(3).value, 9);
+    assert.equal(valued(3).mul(3).value, 9);
   });
 });

packages/core/time.mjs

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

packages/core/timespan.mjs

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

packages/core/util.mjs

@@ -5,8 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 // returns true if the given string is a note
-export const isNoteWithOctave = (name) => /^[a-gA-G][#bs]*[0-9]$/.test(name);
-export const isNote = (name) => /^[a-gA-G][#bs]*[0-9]?$/.test(name);
+export const isNote = (name) => /^[a-gA-G][#b]*[0-9]$/.test(name);
 export const tokenizeNote = (note) => {
   if (typeof note !== 'string') {
     return [];
@@ -19,8 +18,11 @@ export const tokenizeNote = (note) => {
 };
 
 // turns the given note into its midi number representation
-export const noteToMidi = (note) => {
-  const [pc, acc, oct = 3] = tokenizeNote(note);
+export const toMidi = (note) => {
+  if (typeof note === 'number') {
+    return note;
+  }
+  const [pc, acc, oct] = tokenizeNote(note);
   if (!pc) {
     throw new Error('not a note: "' + note + '"');
   }
@@ -28,74 +30,34 @@ export const noteToMidi = (note) => {
   const offset = acc?.split('').reduce((o, char) => o + { '#': 1, b: -1, s: 1 }[char], 0) || 0;
   return (Number(oct) + 1) * 12 + chroma + offset;
 };
-export const midiToFreq = (n) => {
+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 noteToMidi(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
- * @noAutocomplete
- */
 export const getFreq = (noteOrMidi) => {
   if (typeof noteOrMidi === 'number') {
-    return midiToFreq(noteOrMidi);
+    return fromMidi(noteOrMidi);
   }
-  return midiToFreq(noteToMidi(noteOrMidi));
+  return fromMidi(toMidi(noteOrMidi));
 };
 
-/**
- * @deprecated does not appear to be referenced or invoked anywhere in the codebase
- * @noAutocomplete
- */
 export const midi2note = (n) => {
   const oct = Math.floor(n / 12) - 1;
   const pc = ['C', 'Db', 'D', 'Eb', 'E', 'F', 'Gb', 'G', 'Ab', 'A', 'Bb', 'B'][n % 12];
   return pc + oct;
 };
 
-// modulo that works with negative numbers e.g. _mod(-1, 3) = 2. Works on numbers (rather than patterns of numbers, as @mod@ from pattern.mjs does)
-export const _mod = (n, m) => ((n % m) + m) % m;
+// modulo that works with negative numbers e.g. mod(-1, 3) = 2
+// const mod = (n: number, m: number): number => (n < 0 ? mod(n + m, m) : n % m);
+export const mod = (n, m) => ((n % m) + m) % m;
 
 export const getPlayableNoteValue = (hap) => {
-  let { value, context } = hap;
-  let note = value;
-  if (typeof note === 'object' && !Array.isArray(note)) {
-    note = note.note || note.n || note.value;
-    if (note === undefined) {
-      throw new Error(`cannot find a playable note for ${JSON.stringify(value)}`);
-    }
-  }
+  let { value: note, context } = hap;
   // if value is number => interpret as midi number as long as its not marked as frequency
   if (typeof note === 'number' && context.type !== 'frequency') {
-    note = midiToFreq(hap.value);
-  } else if (typeof note === 'number' && context.type === 'frequency') {
-    note = hap.value; // legacy workaround.. will be removed in the future
-  } else if (typeof note !== 'string' || !isNote(note)) {
-    throw new Error('not a note: ' + JSON.stringify(note));
+    note = fromMidi(hap.value);
+  } else if (typeof note === 'string' && !isNote(note)) {
+    throw new Error('not a note: ' + note);
   }
   return note;
 };
@@ -103,18 +65,15 @@ export const getPlayableNoteValue = (hap) => {
 export const getFrequency = (hap) => {
   let { value, context } = hap;
   // if value is number => interpret as midi number as long as its not marked as frequency
-  if (typeof value === 'object') {
-    if (value.freq) {
-      return value.freq;
-    }
-    return getFreq(value.note || value.n || value.value);
+  if (typeof value === 'object' && value.freq) {
+    return value.freq;
   }
   if (typeof value === 'number' && context.type !== 'frequency') {
-    value = midiToFreq(hap.value);
+    value = fromMidi(hap.value);
   } else if (typeof value === 'string' && isNote(value)) {
-    value = midiToFreq(noteToMidi(hap.value));
+    value = fromMidi(toMidi(hap.value));
   } else if (typeof value !== 'number') {
-    throw new Error('not a note or frequency: ' + value);
+    throw new Error('not a note or frequency:' + value);
   }
   return value;
 };
@@ -143,9 +102,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, arity = func.length) {
+export function curry(func, overload) {
   const fn = function curried(...args) {
-    if (args.length >= arity) {
+    if (args.length >= func.length) {
       return func.apply(this, args);
     } else {
       const partial = function (...args2) {
@@ -163,52 +122,3 @@ export function curry(func, overload, arity = func.length) {
   }
   return fn;
 }
-
-export function parseNumeral(numOrString) {
-  const asNumber = Number(numOrString);
-  if (!isNaN(asNumber)) {
-    return asNumber;
-  }
-  if (isNote(numOrString)) {
-    return noteToMidi(numOrString);
-  }
-  throw new Error(`cannot parse as numeral: "${numOrString}"`);
-}
-
-export function mapArgs(fn, mapFn) {
-  return (...args) => fn(...args.map(mapFn));
-}
-
-export function numeralArgs(fn) {
-  return mapArgs(fn, parseNumeral);
-}
-
-export function parseFractional(numOrString) {
-  const asNumber = Number(numOrString);
-  if (!isNaN(asNumber)) {
-    return asNumber;
-  }
-  const specialValue = {
-    pi: Math.PI,
-    w: 1,
-    h: 0.5,
-    q: 0.25,
-    e: 0.125,
-    s: 0.0625,
-    t: 1 / 3,
-    f: 0.2,
-    x: 1 / 6,
-  }[numOrString];
-  if (typeof specialValue !== 'undefined') {
-    return specialValue;
-  }
-  throw new Error(`cannot parse as fractional: "${numOrString}"`);
-}
-
-export const fractionalArgs = (fn) => mapArgs(fn, parseFractional);
-
-export const splitAt = function (index, value) {
-  return [value.slice(0, index), value.slice(index)];
-};
-
-export const zipWith = (f, xs, ys) => xs.map((n, i) => f(n, ys[i]));

packages/core/value.mjs

@@ -7,13 +7,6 @@ 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/vite.config.js

@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});

packages/core/zyklus.mjs

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

packages/csound/index.mjs

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

packages/csound/package.json

@@ -1,42 +0,0 @@
-{
-  "name": "@strudel.cycles/csound",
-  "version": "0.7.0",
-  "description": "csound bindings for strudel",
-  "main": "index.mjs",
-  "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
-  },
-  "scripts": {
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/tidalcycles/strudel.git"
-  },
-  "keywords": [
-    "tidalcycles",
-    "strudel",
-    "pattern",
-    "livecoding",
-    "algorave"
-  ],
-  "author": "Felix Roos <flix91@gmail.com>",
-  "contributors": [
-    "Alex McLean <alex@slab.org>"
-  ],
-  "license": "AGPL-3.0-or-later",
-  "bugs": {
-    "url": "https://github.com/tidalcycles/strudel/issues"
-  },
-  "homepage": "https://github.com/tidalcycles/strudel#readme",
-  "dependencies": {
-    "@csound/browser": "6.18.5",
-    "@strudel.cycles/core": "workspace:*",
-    "@strudel.cycles/webaudio": "workspace:*"
-  },
-  "devDependencies": {
-    "vite": "^3.2.2"
-  }
-}

packages/csound/presets.orc

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

packages/csound/project.csd

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

packages/csound/vite.config.js

@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});

packages/embed/README.md

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

packages/embed/example.html

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

packages/embed/package.json

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

packages/eval/README.md

@@ -3,10 +3,6 @@
 This package contains the strudel code transformer and evaluator.
 It allows creating strudel patterns from input code that is optimized for minimal keystrokes and human readability.
 
-## Deprecation Note
-
-This package will not be developed further. Consider using `@strudel.cycles/transpiler` as a replacement.
-
 ## Install
 
 ```sh
@@ -15,9 +11,10 @@ npm i @strudel.cycles/eval --save
 
 ## Example
 
+<!-- TODO: -extend +evalScope -->
+
 ```js
-import { evalScope } from '@strudel.cycles/core';
-import { evaluate } from '@strudel.cycles/eval';
+import { evaluate, extend } from '@strudel.cycles/eval';
 
 evalScope(
   import('@strudel.cycles/core'),

packages/eval/evaluate.mjs

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

packages/eval/package-lock.json

@@ -0,0 +1,297 @@
+{
+	"name": "@strudel.cycles/eval",
+	"version": "0.1.3",
+	"lockfileVersion": 2,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "@strudel.cycles/eval",
+			"version": "0.1.1",
+			"license": "AGPL-3.0-or-later",
+			"dependencies": {
+				"estraverse": "^5.3.0",
+				"shift-ast": "^6.1.0",
+				"shift-codegen": "^7.0.3",
+				"shift-parser": "^7.0.3",
+				"shift-spec": "^2018.0.2",
+				"shift-traverser": "^1.0.0"
+			}
+		},
+		"node_modules/estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+			"engines": {
+				"node": ">=4.0"
+			}
+		},
+		"node_modules/esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/multimap": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
+			"integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw=="
+		},
+		"node_modules/object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/shift-ast": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/shift-ast/-/shift-ast-6.1.0.tgz",
+			"integrity": "sha512-Vj4XUIJIFPIh6VcBGJ1hjH/kM88XGer94Pr7Rvxa+idEylDsrwtLw268HoxGo5xReL6T3DdRl/9/Pr1XihZ/8Q=="
+		},
+		"node_modules/shift-codegen": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/shift-codegen/-/shift-codegen-7.0.3.tgz",
+			"integrity": "sha512-dfCVVdBF0qZ6pkajQ3bjxRdNEltyxEITVe7tBJkQt2eCI3znUkSxq0VSe/tTWq1LKHeAS4HuOiqYEuHMFkSq9w==",
+			"dependencies": {
+				"esutils": "^2.0.2",
+				"object-assign": "^4.1.0",
+				"shift-reducer": "6.0.0"
+			}
+		},
+		"node_modules/shift-parser": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/shift-parser/-/shift-parser-7.0.3.tgz",
+			"integrity": "sha512-uYX2ORyZfKZrUc4iKKkO9KOhzUSxCrSBk7QK6ZmShId+BOo1gh1IwecVy97ynyOTpmhPWUttjC8BzsnQl65Zew==",
+			"dependencies": {
+				"multimap": "^1.0.2",
+				"shift-ast": "6.0.0",
+				"shift-reducer": "6.0.0",
+				"shift-regexp-acceptor": "2.0.3"
+			}
+		},
+		"node_modules/shift-parser/node_modules/shift-ast": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/shift-ast/-/shift-ast-6.0.0.tgz",
+			"integrity": "sha512-XXxDcEBWVBzqWXfNYJlLyJ1/9kMvOXVRXiqPjkOrTCC5qRsBvEMJMRLLFhU3tn8ue56Y7IZyBE6bexFum5QLUw=="
+		},
+		"node_modules/shift-reducer": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/shift-reducer/-/shift-reducer-6.0.0.tgz",
+			"integrity": "sha512-2rJraRP8drIOjvaE/sALa+0tGJmMVUzlmS3wIJerJbaYuCjpFAiF0WjkTOFVtz1144Nm/ECmqeG+7yRhuMVsMg==",
+			"dependencies": {
+				"shift-ast": "6.0.0"
+			}
+		},
+		"node_modules/shift-reducer/node_modules/shift-ast": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/shift-ast/-/shift-ast-6.0.0.tgz",
+			"integrity": "sha512-XXxDcEBWVBzqWXfNYJlLyJ1/9kMvOXVRXiqPjkOrTCC5qRsBvEMJMRLLFhU3tn8ue56Y7IZyBE6bexFum5QLUw=="
+		},
+		"node_modules/shift-regexp-acceptor": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/shift-regexp-acceptor/-/shift-regexp-acceptor-2.0.3.tgz",
+			"integrity": "sha512-sxL7e5JNUFxm+gutFRXktX2D6KVgDAHNuDsk5XHB9Z+N5yXooZG6pdZ1GEbo3Jz6lF7ETYLBC4WAjIFm2RKTmA==",
+			"dependencies": {
+				"unicode-match-property-ecmascript": "1.0.4",
+				"unicode-match-property-value-ecmascript": "1.0.2",
+				"unicode-property-aliases-ecmascript": "1.0.4"
+			}
+		},
+		"node_modules/shift-spec": {
+			"version": "2018.0.2",
+			"resolved": "https://registry.npmjs.org/shift-spec/-/shift-spec-2018.0.2.tgz",
+			"integrity": "sha512-5CP/cKDEim4rZ6ViCSipTLY2U7HJr8q/kpDuCBmebFqbx/0DeozWO+9ienHmYjgGLDfHrqj+LBAN67FRK2vE6w=="
+		},
+		"node_modules/shift-traverser": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/shift-traverser/-/shift-traverser-1.0.0.tgz",
+			"integrity": "sha512-DMY3512wJbdC+IC+nhLH3/Stgr2BbxbNcg7qyZ6+e5qNnNs8TBQJWdMsRgHlX1JXwF4C0ONKS8VUxsPT0Tf7aw==",
+			"dependencies": {
+				"estraverse": "4.2.0",
+				"shift-spec": "2018.0.0"
+			}
+		},
+		"node_modules/shift-traverser/node_modules/estraverse": {
+			"version": "4.2.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+			"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+			"engines": {
+				"node": ">=0.10.0"
+			}
+		},
+		"node_modules/shift-traverser/node_modules/shift-spec": {
+			"version": "2018.0.0",
+			"resolved": "https://registry.npmjs.org/shift-spec/-/shift-spec-2018.0.0.tgz",
+			"integrity": "sha512-/aiPOkj7dbe+CV2VZhIMTHQToZmgniofpRG7Yr7x2/0sO6CSVC++py1Wzf+s+rWSTDHKcLvziVAxjRRV4i4EoQ=="
+		},
+		"node_modules/unicode-canonical-property-names-ecmascript": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+			"integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-match-property-ecmascript": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+			"integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+			"dependencies": {
+				"unicode-canonical-property-names-ecmascript": "^1.0.4",
+				"unicode-property-aliases-ecmascript": "^1.0.4"
+			},
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-match-property-value-ecmascript": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz",
+			"integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ==",
+			"engines": {
+				"node": ">=4"
+			}
+		},
+		"node_modules/unicode-property-aliases-ecmascript": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz",
+			"integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==",
+			"engines": {
+				"node": ">=4"
+			}
+		}
+	},
+	"dependencies": {
+		"estraverse": {
+			"version": "5.3.0",
+			"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+			"integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA=="
+		},
+		"esutils": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+			"integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g=="
+		},
+		"multimap": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/multimap/-/multimap-1.1.0.tgz",
+			"integrity": "sha512-0ZIR9PasPxGXmRsEF8jsDzndzHDj7tIav+JUmvIFB/WHswliFnquxECT/De7GR4yg99ky/NlRKJT82G1y271bw=="
+		},
+		"object-assign": {
+			"version": "4.1.1",
+			"resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+			"integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+		},
+		"shift-ast": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/shift-ast/-/shift-ast-6.1.0.tgz",
+			"integrity": "sha512-Vj4XUIJIFPIh6VcBGJ1hjH/kM88XGer94Pr7Rvxa+idEylDsrwtLw268HoxGo5xReL6T3DdRl/9/Pr1XihZ/8Q=="
+		},
+		"shift-codegen": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/shift-codegen/-/shift-codegen-7.0.3.tgz",
+			"integrity": "sha512-dfCVVdBF0qZ6pkajQ3bjxRdNEltyxEITVe7tBJkQt2eCI3znUkSxq0VSe/tTWq1LKHeAS4HuOiqYEuHMFkSq9w==",
+			"requires": {
+				"esutils": "^2.0.2",
+				"object-assign": "^4.1.0",
+				"shift-reducer": "6.0.0"
+			}
+		},
+		"shift-parser": {
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/shift-parser/-/shift-parser-7.0.3.tgz",
+			"integrity": "sha512-uYX2ORyZfKZrUc4iKKkO9KOhzUSxCrSBk7QK6ZmShId+BOo1gh1IwecVy97ynyOTpmhPWUttjC8BzsnQl65Zew==",
+			"requires": {
+				"multimap": "^1.0.2",
+				"shift-ast": "6.0.0",
+				"shift-reducer": "6.0.0",
+				"shift-regexp-acceptor": "2.0.3"
+			},
+			"dependencies": {
+				"shift-ast": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/shift-ast/-/shift-ast-6.0.0.tgz",
+					"integrity": "sha512-XXxDcEBWVBzqWXfNYJlLyJ1/9kMvOXVRXiqPjkOrTCC5qRsBvEMJMRLLFhU3tn8ue56Y7IZyBE6bexFum5QLUw=="
+				}
+			}
+		},
+		"shift-reducer": {
+			"version": "6.0.0",
+			"resolved": "https://registry.npmjs.org/shift-reducer/-/shift-reducer-6.0.0.tgz",
+			"integrity": "sha512-2rJraRP8drIOjvaE/sALa+0tGJmMVUzlmS3wIJerJbaYuCjpFAiF0WjkTOFVtz1144Nm/ECmqeG+7yRhuMVsMg==",
+			"requires": {
+				"shift-ast": "6.0.0"
+			},
+			"dependencies": {
+				"shift-ast": {
+					"version": "6.0.0",
+					"resolved": "https://registry.npmjs.org/shift-ast/-/shift-ast-6.0.0.tgz",
+					"integrity": "sha512-XXxDcEBWVBzqWXfNYJlLyJ1/9kMvOXVRXiqPjkOrTCC5qRsBvEMJMRLLFhU3tn8ue56Y7IZyBE6bexFum5QLUw=="
+				}
+			}
+		},
+		"shift-regexp-acceptor": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/shift-regexp-acceptor/-/shift-regexp-acceptor-2.0.3.tgz",
+			"integrity": "sha512-sxL7e5JNUFxm+gutFRXktX2D6KVgDAHNuDsk5XHB9Z+N5yXooZG6pdZ1GEbo3Jz6lF7ETYLBC4WAjIFm2RKTmA==",
+			"requires": {
+				"unicode-match-property-ecmascript": "1.0.4",
+				"unicode-match-property-value-ecmascript": "1.0.2",
+				"unicode-property-aliases-ecmascript": "1.0.4"
+			}
+		},
+		"shift-spec": {
+			"version": "2018.0.2",
+			"resolved": "https://registry.npmjs.org/shift-spec/-/shift-spec-2018.0.2.tgz",
+			"integrity": "sha512-5CP/cKDEim4rZ6ViCSipTLY2U7HJr8q/kpDuCBmebFqbx/0DeozWO+9ienHmYjgGLDfHrqj+LBAN67FRK2vE6w=="
+		},
+		"shift-traverser": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/shift-traverser/-/shift-traverser-1.0.0.tgz",
+			"integrity": "sha512-DMY3512wJbdC+IC+nhLH3/Stgr2BbxbNcg7qyZ6+e5qNnNs8TBQJWdMsRgHlX1JXwF4C0ONKS8VUxsPT0Tf7aw==",
+			"requires": {
+				"estraverse": "4.2.0",
+				"shift-spec": "2018.0.0"
+			},
+			"dependencies": {
+				"estraverse": {
+					"version": "4.2.0",
+					"resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+					"integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM="
+				},
+				"shift-spec": {
+					"version": "2018.0.0",
+					"resolved": "https://registry.npmjs.org/shift-spec/-/shift-spec-2018.0.0.tgz",
+					"integrity": "sha512-/aiPOkj7dbe+CV2VZhIMTHQToZmgniofpRG7Yr7x2/0sO6CSVC++py1Wzf+s+rWSTDHKcLvziVAxjRRV4i4EoQ=="
+				}
+			}
+		},
+		"unicode-canonical-property-names-ecmascript": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+			"integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ=="
+		},
+		"unicode-match-property-ecmascript": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+			"integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+			"requires": {
+				"unicode-canonical-property-names-ecmascript": "^1.0.4",
+				"unicode-property-aliases-ecmascript": "^1.0.4"
+			}
+		},
+		"unicode-match-property-value-ecmascript": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.0.2.tgz",
+			"integrity": "sha512-Rx7yODZC1L/T8XKo/2kNzVAQaRE88AaMvI1EF/Xnj3GW2wzN6fop9DDWuFAKUVFH7vozkz26DzP0qyWLKLIVPQ=="
+		},
+		"unicode-property-aliases-ecmascript": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz",
+			"integrity": "sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg=="
+		}
+	}
+}

packages/eval/package.json

@@ -1,21 +1,15 @@
 {
   "name": "@strudel.cycles/eval",
-  "version": "0.7.0",
+  "version": "0.1.3",
   "description": "Code evaluator for strudel",
   "main": "index.mjs",
-  "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
-  },
-  "scripts": {
-    "build": "vite build",
-    "test": "vitest run",
-    "prepublishOnly": "npm run build"
-  },
   "type": "module",
   "directories": {
     "test": "test"
   },
+  "scripts": {
+    "test": "mocha --colors"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tidalcycles/strudel.git"
@@ -34,17 +28,12 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "workspace:*",
+    "@strudel.cycles/core": "^0.1.2",
     "estraverse": "^5.3.0",
-    "shift-ast": "^7.0.0",
-    "shift-codegen": "^8.1.0",
-    "shift-parser": "^8.0.0",
-    "shift-spec": "^2019.0.0",
+    "shift-ast": "^6.1.0",
+    "shift-codegen": "^7.0.3",
+    "shift-parser": "^7.0.3",
+    "shift-spec": "^2018.0.2",
     "shift-traverser": "^1.0.0"
-  },
-  "devDependencies": {
-    "@strudel.cycles/mini": "workspace:*",
-    "vite": "^3.2.2",
-    "vitest": "^0.25.7"
   }
 }

packages/eval/shapeshifter.mjs

@@ -30,12 +30,11 @@ const isNote = (name) => /^[a-gC-G][bs]?[0-9]$/.test(name);
 const addLocations = true;
 export const addMiniLocations = true;
 export const minifyStrings = true;
-export const wrappedAsync = false; // this is now handled by core evaluate by default
-export const shouldAddReturn = true;
+export const wrappedAsync = true;
 
 export default (_code) => {
   const { code, addReturn } = wrapAsync(_code);
-  const ast = parseScriptWithLocation(disguiseImports(code));
+  const ast = parseScriptWithLocation(code);
   const artificialNodes = [];
   const parents = [];
   const shifted = replace(ast.tree, {
@@ -126,25 +125,13 @@ export default (_code) => {
     },
   });
   // add return to last statement (because it's wrapped in an async function artificially)
-  if (shouldAddReturn) {
+  if (wrappedAsync) {
     addReturn(shifted);
   }
-  const generated = undisguiseImports(codegen(shifted));
+  const generated = codegen(shifted);
   return generated;
 };
 
-// renames all import statements to "_mport" as Shift doesn't support dynamic import.
-// there shouldn't be any side-effects from this as this change does not affect
-// the syntax & will be undone by the equivalent replace in "undisguiseImports".
-function disguiseImports(code) {
-  return code.replaceAll('import', '_mport'); // Must be the same length!
-}
-
-// Rename the renamed import statements back to "import"
-function undisguiseImports(code) {
-  return code.replaceAll('_mport', 'import');
-}
-
 function wrapAsync(code) {
   // wrap code in async to make await work on top level => this will create 1 line offset to locations
   // this is why line offset is -1 in getLocationObject calls below
@@ -154,7 +141,7 @@ ${code}
 })()`;
   }
   const addReturn = (ast) => {
-    const body = wrappedAsync ? ast.statements[0].expression.callee.body : ast;
+    const body = ast.statements[0].expression.callee.body; // actual code ast inside async function body
     body.statements = body.statements
       .slice(0, -1)
       .concat([new ReturnStatement({ expression: body.statements.slice(-1)[0] })]);
@@ -225,8 +212,9 @@ function isPatternArg(parents) {
 function hasModifierCall(parent) {
   // TODO: modifiers are more than composables, for example every is not composable but should be seen as modifier..
   // need all prototypes of Pattern
-  return parent?.type === 'StaticMemberExpression';
-  // && Object.keys(Pattern.prototype.composable).includes(parent.property)
+  return (
+    parent?.type === 'StaticMemberExpression' && Object.keys(Pattern.prototype.composable).includes(parent.property)
+  );
 }
 const factories = Object.keys(Pattern.prototype.factories).concat(['mini']);
 

packages/eval/test/evaluate.test.mjs

@@ -4,29 +4,31 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { expect, describe, it } from 'vitest';
-
-import { evaluate } from '../evaluate.mjs';
+import { strict as assert } from 'assert';
+import { evaluate, extend } from '../evaluate.mjs';
 import { mini } from '@strudel.cycles/mini';
 import * as strudel from '@strudel.cycles/core';
-const { fastcat, evalScope } = strudel;
 
-describe('evaluate', async () => {
-  await evalScope({ mini }, strudel);
-  const ev = async (code) => (await evaluate(code)).pattern.firstCycleValues;
+const { fastcat } = strudel;
+
+extend({ mini }, strudel);
+// TODO: test evalScope
+
+describe('evaluate', () => {
+  const ev = async (code) => (await evaluate(code)).pattern._firstCycleValues;
   it('Should evaluate strudel functions', async () => {
-    expect(await ev('pure("c3")')).toEqual(['c3']);
-    expect(await ev('cat("c3")')).toEqual(['c3']);
-    expect(await ev('fastcat("c3", "d3")')).toEqual(['c3', 'd3']);
-    expect(await ev('slowcat("c3", "d3")')).toEqual(['c3']);
+    assert.deepStrictEqual(await ev("pure('c3')"), ['c3']);
+    assert.deepStrictEqual(await ev('cat(c3)'), ['c3']);
+    assert.deepStrictEqual(await ev('fastcat(c3, d3)'), ['c3', 'd3']);
+    assert.deepStrictEqual(await ev('slowcat(c3, d3)'), ['c3']);
   });
-  it('Scope should be extendable', async () => {
-    await evalScope({ myFunction: (...x) => fastcat(...x) });
-    expect(await ev('myFunction("c3", "d3")')).toEqual(['c3', 'd3']);
+  it('Should be extendable', async () => {
+    extend({ myFunction: (...x) => fastcat(...x) });
+    assert.deepStrictEqual(await ev('myFunction(c3, d3)'), ['c3', 'd3']);
   });
   it('Should evaluate simple double quoted mini notation', async () => {
-    expect(await ev('"c3"')).toEqual(['c3']);
-    expect(await ev('"c3 d3"')).toEqual(['c3', 'd3']);
-    expect(await ev('"<c3 d3>"')).toEqual(['c3']);
+    assert.deepStrictEqual(await ev('"c3"'), ['c3']);
+    assert.deepStrictEqual(await ev('"c3 d3"'), ['c3', 'd3']);
+    assert.deepStrictEqual(await ev('"<c3 d3>"'), ['c3']);
   });
 });

packages/eval/test/shapeshifter.test.mjs

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

packages/eval/vite.config.js

@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});

packages/midi/README.md

@@ -7,3 +7,7 @@ This package adds midi functionality to strudel Patterns.
 ```sh
 npm i @strudel.cycles/midi --save
 ```
+
+## Dev Notes
+
+- is this package really necessary? currently, /tone also depends on webmidi through @tonejs/piano. Either move piano out of /tone or merge /midi into /tone...

packages/midi/midi.mjs

@@ -4,24 +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 * as _WebMidi from 'webmidi';
-import { Pattern, isPattern, logger } from '@strudel.cycles/core';
-import { getAudioContext } from '@strudel.cycles/webaudio';
-import { noteToMidi } from '@strudel.cycles/core';
+import { isNote } from 'tone';
+import _WebMidi from 'webmidi';
+import { Pattern, isPattern } from '@strudel.cycles/core';
+import { Tone } from '@strudel.cycles/tone';
 
 // if you use WebMidi from outside of this package, make sure to import that instance:
-export const { WebMidi } = _WebMidi;
+export const WebMidi = _WebMidi;
 
-function supportsMidi() {
-  return typeof navigator.requestMIDIAccess === 'function';
-}
-
-export function enableWebMidi(options = {}) {
-  const { onReady, onConnected, onDisconnected } = options;
-
-  if (!supportsMidi()) {
-    throw new Error('Your Browser does not support WebMIDI.');
-  }
+export function enableWebMidi() {
   return new Promise((resolve, reject) => {
     if (WebMidi.enabled) {
       // if already enabled, just resolve WebMidi
@@ -32,14 +23,6 @@ export function enableWebMidi(options = {}) {
       if (err) {
         reject(err);
       }
-      WebMidi.addListener('connected', (e) => {
-        onConnected?.(WebMidi);
-      });
-      // Reacting when a device becomes unavailable
-      WebMidi.addListener('disconnected', (e) => {
-        onDisconnected?.(WebMidi, e);
-      });
-      onReady?.(WebMidi);
       resolve(WebMidi);
     });
   });
@@ -47,89 +30,55 @@ 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 = function (output) {
-  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 device = getDevice(output, outputs);
-      const otherOutputs = outputs
-        .filter((o) => o.name !== device.name)
-        .map((o) => `'${o.name}'`)
-        .join(' | ');
-      midiReady = true;
-      logger(`Midi connected! Using "${device.name}". ${otherOutputs ? `Also available: ${otherOutputs}` : ''}`);
-    },
-  });
-  if (isPattern(output)) {
+Pattern.prototype.midi = function (output, channel = 1) {
+  if (isPattern(output?.constructor?.name)) {
     throw new Error(
       `.midi does not accept Pattern input. Make sure to pass device name with single quotes. Example: .midi('${
         WebMidi.outputs?.[0]?.name || 'IAC Driver Bus 1'
       }')`,
     );
   }
-  return this.onTrigger((time, hap) => {
-    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
-          .map((o) => `'${o.name}'`)
-          .join(' | ')}`,
-      );
-    }
-    hap.ensureObjectValue();
-
-    // calculate time
-    const timingOffset = WebMidi.time - getAudioContext().currentTime * 1000;
-    time = time * 1000 + timingOffset;
-
-    // destructure value
-    const { note, nrpnn, nrpv, ccn, ccv, midichan = 1 } = hap.value;
-    const velocity = hap.context?.velocity ?? 0.9; // TODO: refactor velocity
-    const duration = hap.duration.valueOf() * 1000 - 5;
-
-    if (note) {
-      const midiNumber = noteToMidi(note);
-      device.playNote(midiNumber, midichan, {
+  return this._withHap((hap) => {
+    // const onTrigger = (time: number, hap: any) => {
+    const onTrigger = (time, hap) => {
+      let note = hap.value;
+      const velocity = hap.context?.velocity ?? 0.9;
+      if (!isNote(note)) {
+        throw new Error('not a note: ' + note);
+      }
+      if (!WebMidi.enabled) {
+        throw new Error(`🎹 WebMidi is not enabled. Supported Browsers: https://caniuse.com/?search=webmidi`);
+      }
+      if (!WebMidi.outputs.length) {
+        throw new Error(`🔌 No MIDI devices found. Connect a device or enable IAC Driver.`);
+      }
+      let device;
+      if (typeof output === 'number') {
+        device = WebMidi.outputs[output];
+      } else if (typeof output === 'string') {
+        device = outputByName(output);
+      } else {
+        device = WebMidi.outputs[0];
+      }
+      if (!device) {
+        throw new Error(
+          `🔌 MIDI device '${output ? output : ''}' not found. Use one of ${WebMidi.outputs
+            .map((o) => `'${o.name}'`)
+            .join(' | ')}`,
+        );
+      }
+      // console.log('midi', value, output);
+      const timingOffset = WebMidi.time - Tone.getContext().currentTime * 1000;
+      time = time * 1000 + timingOffset;
+      // const inMs = '+' + (time - Tone.getContext().currentTime) * 1000;
+      // await enableWebMidi()
+      device.playNote(note, channel, {
         time,
-        duration,
-        attack: velocity,
+        duration: hap.duration.valueOf() * 1000 - 5,
+        velocity,
       });
-    }
-    if (ccv && ccn) {
-      if (typeof ccv !== 'number' || ccv < 0 || ccv > 1) {
-        throw new Error('expected ccv to be a number between 0 and 1');
-      }
-      if (!['string', 'number'].includes(typeof ccn)) {
-        throw new Error('expected ccn to be a number or a string');
-      }
-      const scaled = Math.round(ccv * 127);
-      device.sendControlChange(ccn, scaled, midichan, { time });
-    }
+    };
+    return hap.setContext({ ...hap.context, onTrigger });
   });
 };

packages/midi/package-lock.json

@@ -0,0 +1,130 @@
+{
+	"name": "@strudel.cycles/midi",
+	"version": "0.1.3",
+	"lockfileVersion": 2,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "@strudel.cycles/midi",
+			"version": "0.1.1",
+			"license": "AGPL-3.0-or-later",
+			"dependencies": {
+				"tone": "^14.7.77",
+				"webmidi": "^2.5.2"
+			}
+		},
+		"node_modules/@babel/runtime": {
+			"version": "7.17.8",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz",
+			"integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
+			"dependencies": {
+				"regenerator-runtime": "^0.13.4"
+			},
+			"engines": {
+				"node": ">=6.9.0"
+			}
+		},
+		"node_modules/automation-events": {
+			"version": "4.0.14",
+			"resolved": "https://registry.npmjs.org/automation-events/-/automation-events-4.0.14.tgz",
+			"integrity": "sha512-CB2Me0yW8sz7gSGwMiSfgfs1Oqlgs53k+eVESN6axvRyMAD3zlSp2nqndD2TQAtW3yOtSEJWNGsw0r48+f1wtw==",
+			"dependencies": {
+				"@babel/runtime": "^7.17.2",
+				"tslib": "^2.3.1"
+			},
+			"engines": {
+				"node": ">=12.20.1"
+			}
+		},
+		"node_modules/regenerator-runtime": {
+			"version": "0.13.9",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+		},
+		"node_modules/standardized-audio-context": {
+			"version": "25.3.21",
+			"resolved": "https://registry.npmjs.org/standardized-audio-context/-/standardized-audio-context-25.3.21.tgz",
+			"integrity": "sha512-CZEnayJJjNefeU+z1QGDhaid1LAAYxWYa2ipNk75ropwec9rq6fmclyhXb1wGtDsZ402irX3HLt1U/PwP9+1fA==",
+			"dependencies": {
+				"@babel/runtime": "^7.17.2",
+				"automation-events": "^4.0.14",
+				"tslib": "^2.3.1"
+			}
+		},
+		"node_modules/tone": {
+			"version": "14.7.77",
+			"resolved": "https://registry.npmjs.org/tone/-/tone-14.7.77.tgz",
+			"integrity": "sha512-tCfK73IkLHyzoKUvGq47gyDyxiKLFvKiVCOobynGgBB9Dl0NkxTM2p+eRJXyCYrjJwy9Y0XCMqD3uOYsYt2Fdg==",
+			"dependencies": {
+				"standardized-audio-context": "^25.1.8",
+				"tslib": "^2.0.1"
+			}
+		},
+		"node_modules/tslib": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+			"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+		},
+		"node_modules/webmidi": {
+			"version": "2.5.3",
+			"resolved": "https://registry.npmjs.org/webmidi/-/webmidi-2.5.3.tgz",
+			"integrity": "sha512-PyMGvKcDGpvbQUfnmBORQJciyG3VAZ4aHlGy1iRZ3uEs4kG4HCvI7KRthUpM1vuHDPL98lidRIUaoRomkJtWtg==",
+			"engines": {
+				"node": ">0.6.x"
+			}
+		}
+	},
+	"dependencies": {
+		"@babel/runtime": {
+			"version": "7.17.8",
+			"resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz",
+			"integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==",
+			"requires": {
+				"regenerator-runtime": "^0.13.4"
+			}
+		},
+		"automation-events": {
+			"version": "4.0.14",
+			"resolved": "https://registry.npmjs.org/automation-events/-/automation-events-4.0.14.tgz",
+			"integrity": "sha512-CB2Me0yW8sz7gSGwMiSfgfs1Oqlgs53k+eVESN6axvRyMAD3zlSp2nqndD2TQAtW3yOtSEJWNGsw0r48+f1wtw==",
+			"requires": {
+				"@babel/runtime": "^7.17.2",
+				"tslib": "^2.3.1"
+			}
+		},
+		"regenerator-runtime": {
+			"version": "0.13.9",
+			"resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
+			"integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+		},
+		"standardized-audio-context": {
+			"version": "25.3.21",
+			"resolved": "https://registry.npmjs.org/standardized-audio-context/-/standardized-audio-context-25.3.21.tgz",
+			"integrity": "sha512-CZEnayJJjNefeU+z1QGDhaid1LAAYxWYa2ipNk75ropwec9rq6fmclyhXb1wGtDsZ402irX3HLt1U/PwP9+1fA==",
+			"requires": {
+				"@babel/runtime": "^7.17.2",
+				"automation-events": "^4.0.14",
+				"tslib": "^2.3.1"
+			}
+		},
+		"tone": {
+			"version": "14.7.77",
+			"resolved": "https://registry.npmjs.org/tone/-/tone-14.7.77.tgz",
+			"integrity": "sha512-tCfK73IkLHyzoKUvGq47gyDyxiKLFvKiVCOobynGgBB9Dl0NkxTM2p+eRJXyCYrjJwy9Y0XCMqD3uOYsYt2Fdg==",
+			"requires": {
+				"standardized-audio-context": "^25.1.8",
+				"tslib": "^2.0.1"
+			}
+		},
+		"tslib": {
+			"version": "2.3.1",
+			"resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz",
+			"integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw=="
+		},
+		"webmidi": {
+			"version": "2.5.3",
+			"resolved": "https://registry.npmjs.org/webmidi/-/webmidi-2.5.3.tgz",
+			"integrity": "sha512-PyMGvKcDGpvbQUfnmBORQJciyG3VAZ4aHlGy1iRZ3uEs4kG4HCvI7KRthUpM1vuHDPL98lidRIUaoRomkJtWtg=="
+		}
+	}
+}

packages/midi/package.json

@@ -1,16 +1,8 @@
 {
   "name": "@strudel.cycles/midi",
-  "version": "0.7.0",
+  "version": "0.1.3",
   "description": "Midi API for strudel",
   "main": "index.mjs",
-  "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
-  },
-  "scripts": {
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
-  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/tidalcycles/strudel.git"
@@ -29,11 +21,8 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "workspace:*",
-    "@strudel.cycles/webaudio": "workspace:*",
-    "webmidi": "^3.0.21"
-  },
-  "devDependencies": {
-    "vite": "^3.2.2"
+    "@strudel.cycles/tone": "^0.1.3",
+    "tone": "^14.7.77",
+    "webmidi": "^2.5.2"
   }
 }

packages/midi/vite.config.js

@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});

packages/mini/README.md

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

packages/mini/krill.pegjs

@@ -5,27 +5,16 @@ This program is free software: you can redistribute it and/or modify it under th
 */
 
 // Some terminology:
-// 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
+// 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
 
 
 {
-  var AtomStub = function(source)
-  {
-    this.type_ = "atom";
-    this.source_ = source;
-    this.location_ = location();
-  }
-
-  var PatternStub = function(source, alignment, seed)
+  var PatternStub = function(source, alignment)
   {
     this.type_ = "pattern";
-    this.arguments_ = { alignment: alignment };
-    if (seed !== undefined) {
-      this.arguments_.seed = seed;
-    }
+    this.arguments_ = { alignment : alignment};
     this.source_ = source;
   }
 
@@ -51,7 +40,6 @@ This program is free software: you can redistribute it and/or modify it under th
     this.options_ = options;
   }
 
-  var seed = 0;
 }
 
 start = statement
@@ -93,110 +81,78 @@ DIGIT  = [0-9]
 // ------------------ delimiters ---------------------------
 
 ws "whitespace" = [ \n\r\t]*
-comma = ws "," ws
-pipe = ws "|" ws
+comma = ws "," ws;
 quote = '"' / "'"
 
 // ------------------ steps and cycles ---------------------------
 
 // single step definition (e.g bd)
-step_char =  [0-9a-zA-Z~] / "-" / "#" / "." / "^" / "_"
-step = ws chars:step_char+ ws { return new AtomStub(chars.join("")) }
+step_char =  [0-9a-zA-Z~] / "-" / "#" / "." / "^" / "_" / ":"
+step = ws chars:step_char+ ws { return chars.join("") }
 
 // define a sub cycle e.g. [1 2, 3 [4]]
-sub_cycle = ws  "[" ws s:stack_or_choose ws "]" ws { return s }
+sub_cycle = ws  "[" ws s:stack ws "]" ws { return s}
 
-// define a 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; }
+// 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;}
 
 // a slice is either a single step or a sub cycle
-slice = step / sub_cycle / polymeter / slow_sequence
+slice = step / sub_cycle  / timeline
 
 // slice modifier affects the timing/size of a slice (e.g. [a b c]@3)
 // at this point, we assume we can represent them as regular sequence operators
-slice_op = op_weight / op_bjorklund / op_slow / op_fast / op_replicate / op_degrade / op_tail
+slice_modifier = slice_weight / slice_bjorklund / slice_slow / slice_fast / slice_fixed_step / slice_replicate
 
-op_weight =  "@" a:number
-  { return x => x.options_['weight'] = a }
+slice_weight =  "@" a:number
+  { return { weight: a} }
   
-op_replicate = "!"a:number
-  { return x => x.options_['reps'] = a }
+slice_replicate = "!"a:number
+  { return { replicate: a  } }
 
-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_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_slow = "/"a:slice
-  { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'slow' }}) }
+slice_slow = "/"a:number
+  { return { operator : { type_: "stretch", arguments_ :{ amount:a } } } }
 
-op_fast = "*"a:slice
-  { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'fast' }}) }
+slice_fast = "*"a:number
+  { return { operator : { type_: "stretch", arguments_ :{ amount:"1/"+a } } } }
 
-op_degrade = "?"a:number?
-  { return x => x.options_['ops'].push({ type_: "degradeBy", arguments_ :{ amount:a, seed: seed++ } }) }
-
-op_tail = ":" s:slice
-  { return x => x.options_['ops'].push({ type_: "tail", arguments_ :{ element:s } }) }
+slice_fixed_step = "%"a:number
+  { return { operator : { type_: "fixed-step", arguments_ :{ amount:a } } } }
 
 // a slice with an modifier applied i.e [bd@4 sd@3]@2 hh]
-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;
-  }
+slice_with_modifier = s:slice o:slice_modifier?
+  { return new ElementStub(s, o);}
 
-// 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 series of vertically aligned sequence, separated by a comma
-stack_tail = tail:(comma @sequence)+
-  { return { alignment: 'stack', 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, seed: seed++ }; }
+// 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 stack is a serie of vertically aligned single cycles, separated by a comma
 // if the stack contains only one element, we don't create a stack but return the
 // underlying element
-stack_or_choose = head:sequence tail:(stack_tail / choose_tail)?
-  { if (tail && tail.list.length > 0) { return new PatternStub([head, ...tail.list], tail.alignment, tail.seed); } else { return head; } }
+stack = c:single_cycle cs:(comma v:single_cycle { return v})*
+  { if (cs.length == 0 && c instanceof Object) { return c;} else { cs.unshift(c); return new PatternStub(cs,"v");}  }
 
-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; }
+// a sequence is a quoted stack
+sequence = ws quote s:stack quote
+  { return s; }
 
 // ------------------ operators ---------------------------
 
 operator = scale / slow / fast / target / bjorklund / struct / rotR / rotL
 
-struct = "struct" ws s:mini_or_operator
-  { return { name: "struct", args: { mini:s }}}
+struct = "struct" ws s:sequence_or_operator
+  { return { name: "struct", args: { sequence: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: p, step:parseInt(s) }}}
+  { return { name: "bjorklund", args :{ pulse: parseInt(p), step:parseInt(s) }}}
 
 slow = "slow" ws a:number
   { return { name: "stretch", args :{ amount: a}}}
@@ -220,27 +176,27 @@ comment = '//' p:([^\n]*)
 group_operator = cat
 
 // cat is another form of timeline
-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'); }
+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"); }
 
-// ------------------ high level mini ---------------------------
+// ------------------ high level sequence ---------------------------
 
-mini_or_group =
+sequence_or_group =
   group_operator /
-  mini
+  sequence
 
-mini_or_operator =
-  sg:mini_or_group ws (comment)*
+sequence_or_operator =
+  sg:sequence_or_group ws (comment)*
     {return sg}
-  / o:operator ws "$" ws soc:mini_or_operator
+  / o:operator ws "$" ws soc:sequence_or_operator
     { return new OperatorStub(o.name,o.args,soc)}
 
 sequ_or_operator_or_comment =
-  sc: mini_or_operator
+  sc: sequence_or_operator
     { return sc }
    / comment
 
-mini_definition = s:sequ_or_operator_or_comment
+sequence_definition = s:sequ_or_operator_or_comment
 
 // ---------------------- statements ----------------------------
 
@@ -258,4 +214,4 @@ hush = "hush"
 
 // ---------------------- statements ----------------------------
 
-statement = mini_definition / command
+statement = sequence_definition / command

packages/mini/mini.mjs

@@ -6,139 +6,116 @@ 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 randOffset = 0.0003;
+const { pure, Pattern, Fraction, stack, slowcat, sequence, timeCat, silence, reify } = strudel;
 
-const applyOptions = (parent, code) => (pat, i) => {
+const applyOptions = (parent) => (pat, i) => {
   const ast = parent.source_[i];
   const options = ast.options_;
-  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': {
-          pat = strudel
-            .reify(pat)
-            ._degradeByWith(strudel.rand.early(randOffset * op.arguments_.seed), op.arguments_.amount ?? 0.5);
-          break;
-        }
-        case 'tail': {
-          const friend = patternifyAST(op.arguments_.element, code);
-          pat = pat.fmap((a) => (b) => Array.isArray(a) ? [...a, b] : [a, b]).appLeft(friend);
-          break;
-        }
-        default: {
-          console.warn(`operator "${op.type_}" not implemented`);
-        }
-      }
+  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);
+      // TODO: case 'fixed-step': "%"
     }
+    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) {
-  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);
-    }),
-  );
+  // 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;
+  });
 }
 
-export function patternifyAST(ast, code) {
+export function patternifyAST(ast) {
   switch (ast.type_) {
-    case 'pattern': {
+    case 'pattern':
       resolveReplications(ast);
-      const children = ast.source_.map((child) => patternifyAST(child, code)).map(applyOptions(ast, code));
+      const children = ast.source_.map(patternifyAST).map(applyOptions(ast));
       const alignment = ast.arguments_.alignment;
-      if (alignment === 'stack') {
-        return strudel.stack(...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') {
-        return strudel.chooseInWith(strudel.rand.early(randOffset * ast.arguments_.seed).segment(1), children);
+      if (alignment === 'v') {
+        return stack(...children);
       }
       const weightedChildren = ast.source_.some((child) => !!child.options_?.weight);
-      if (!weightedChildren && alignment === 'slowcat') {
-        return strudel.slowcat(...children);
+      if (!weightedChildren && alignment === 't') {
+        return slowcat(...children);
       }
       if (weightedChildren) {
-        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') {
+        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);
           return pat._slow(weightSum); // timecat + slow
         }
-        pat.__weight = weightSum;
         return pat;
       }
-      const pat = strudel.sequence(...children);
-      pat.__weight = children.length;
-      return pat;
-    }
-    case 'element': {
-      return patternifyAST(ast.source_, code);
-    }
-    case 'atom': {
+      return sequence(...children);
+    case 'element':
       if (ast.source_ === '~') {
-        return strudel.silence;
+        return silence;
       }
-      if (!ast.location_) {
-        console.warn('no location for', ast);
-        return ast.source_;
+      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]);
       }
-      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],
-        );
-    }
+      return patternifyAST(ast.source_);
     case 'stretch':
-      return patternifyAST(ast.source_, code).slow(patternifyAST(ast.arguments_.amount, code));
+      return patternifyAST(ast.source_).slow(ast.arguments_.amount);
     /* case 'scale':
       let [tonic, scale] = Scale.tokenize(ast.arguments_.scale);
       const intervals = Scale.get(scale).intervals;
@@ -160,33 +137,37 @@ export function patternifyAST(ast, code) {
       }); */
     /* case 'struct':
       // TODO:
-      return strudel.silence; */
+      return silence; */
     default:
       console.warn(`node type "${ast.type_}" not implemented -> returning silence`);
-      return strudel.silence;
+      return silence;
   }
 }
 
 // mini notation only (wraps in "")
 export const mini = (...strings) => {
   const pats = strings.map((str) => {
-    const code = `"${str}"`;
-    const ast = krill.parse(code);
-    return patternifyAST(ast, code);
+    const ast = krill.parse(`"${str}"`);
+    return patternifyAST(ast);
   });
-  return strudel.sequence(...pats);
+  return sequence(...pats);
 };
 
 // includes haskell style (raw krill parsing)
 export const h = (string) => {
   const ast = krill.parse(string);
   // console.log('ast', ast);
-  return patternifyAST(ast, string);
+  return patternifyAST(ast);
 };
 
+// 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 strudel.reify(thing);
+  return reify(thing);
 }

packages/mini/package.json

@@ -1,18 +1,12 @@
 {
   "name": "@strudel.cycles/mini",
-  "version": "0.7.0",
+  "version": "0.1.3",
   "description": "Mini notation for strudel",
   "main": "index.mjs",
   "type": "module",
-  "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
-  },
   "scripts": {
-    "test": "vitest run",
-    "build:parser": "peggy -o krill-parser.js --format es ./krill.pegjs",
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
+    "test": "mocha --colors",
+    "build:parser": "peggy -o krill-parser.js --format es ./krill.pegjs"
   },
   "repository": {
     "type": "git",
@@ -32,11 +26,11 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "workspace:*"
+    "@strudel.cycles/core": "^0.1.2",
+    "@strudel.cycles/eval": "^0.1.3",
+    "@strudel.cycles/tone": "^0.1.3"
   },
   "devDependencies": {
-    "peggy": "^2.0.1",
-    "vite": "^3.2.2",
-    "vitest": "^0.25.7"
+    "peggy": "^2.0.1"
   }
 }

packages/mini/test/mini.test.mjs

@@ -4,184 +4,50 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
 This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
+import { strict as assert } from 'assert';
 import { mini } from '../mini.mjs';
 import '@strudel.cycles/core/euclid.mjs';
-import { describe, expect, it } from 'vitest';
 
 describe('mini', () => {
-  const minV = (v) => mini(v).sortHapsByPart().firstCycleValues;
-  const minS = (v) => mini(v).sortHapsByPart().showFirstCycle;
+  const minV = (v) => mini(v)._firstCycleValues;
+  const minS = (v) => mini(v)._showFirstCycle;
   it('supports single elements', () => {
-    expect(minV('a')).toEqual(['a']);
+    assert.deepStrictEqual(minV('a'), ['a']);
   });
   it('supports rest', () => {
-    expect(minV('~')).toEqual([]);
+    assert.deepStrictEqual(minV('~'), []);
   });
   it('supports cat', () => {
-    expect(minS('a b')).toEqual(['a: 0 - 1/2', 'b: 1/2 - 1']);
-    expect(minS('a b c')).toEqual(['a: 0 - 1/3', 'b: 1/3 - 2/3', 'c: 2/3 - 1']);
-  });
-  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]'));
+    assert.deepStrictEqual(minS('a b'), ['a: 0 - 1/2', 'b: 1/2 - 1']);
+    assert.deepStrictEqual(minS('a b c'), ['a: 0 - 1/3', 'b: 1/3 - 2/3', 'c: 2/3 - 1']);
   });
   it('supports slowcat', () => {
-    expect(minV('<a b>')).toEqual(['a']);
+    assert.deepStrictEqual(minV('<a b>'), ['a']);
   });
   it('supports division', () => {
-    expect(minS('a/2')).toEqual(['a: 0 - 2']);
-    expect(minS('[c3 d3]/2')).toEqual(['c3: 0 - 1']);
+    assert.deepStrictEqual(minS('a/2'), ['a: 0 - 2']);
+    assert.deepStrictEqual(minS('[c3 d3]/2'), ['c3: 0 - 1']);
   });
   it('supports multiplication', () => {
-    expect(minS('c3*2')).toEqual(['c3: 0 - 1/2', 'c3: 1/2 - 1']);
-    expect(minV('[c3 d3]*2')).toEqual(['c3', 'd3', 'c3', 'd3']);
+    assert.deepStrictEqual(minS('c3*2'), ['c3: 0 - 1/2', 'c3: 1/2 - 1']);
+    assert.deepStrictEqual(minV('[c3 d3]*2'), ['c3', 'd3', 'c3', 'd3']);
   });
   it('supports brackets', () => {
-    expect(minS('c3 [d3 e3]')).toEqual(['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 1']);
-    expect(minS('c3 [d3 [e3 f3]]')).toEqual(['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 7/8', 'f3: 7/8 - 1']);
-  });
-  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]'));
+    assert.deepStrictEqual(minS('c3 [d3 e3]'), ['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 1']);
+    assert.deepStrictEqual(minS('c3 [d3 [e3 f3]]'), ['c3: 0 - 1/2', 'd3: 1/2 - 3/4', 'e3: 3/4 - 7/8', 'f3: 7/8 - 1']);
   });
   it('supports commas', () => {
-    expect(minS('c3,e3,g3')).toEqual(['c3: 0 - 1', 'e3: 0 - 1', 'g3: 0 - 1']);
-    expect(minS('[c3,e3,g3] f3')).toEqual(['c3: 0 - 1/2', 'e3: 0 - 1/2', 'g3: 0 - 1/2', 'f3: 1/2 - 1']);
+    assert.deepStrictEqual(minS('c3,e3,g3'), ['c3: 0 - 1', 'e3: 0 - 1', 'g3: 0 - 1']);
+    assert.deepStrictEqual(minS('[c3,e3,g3] f3'), ['c3: 0 - 1/2', 'e3: 0 - 1/2', 'g3: 0 - 1/2', 'f3: 1/2 - 1']);
   });
   it('supports elongation', () => {
-    expect(minS('a@3 b')).toEqual(['a: 0 - 3/4', 'b: 3/4 - 1']);
-    expect(minS('a@2 b@3')).toEqual(['a: 0 - 2/5', 'b: 2/5 - 1']);
+    assert.deepStrictEqual(minS('a@3 b'), ['a: 0 - 3/4', 'b: 3/4 - 1']);
+    assert.deepStrictEqual(minS('a@2 b@3'), ['a: 0 - 2/5', 'b: 2/5 - 1']);
   });
   it('supports replication', () => {
-    expect(minS('a!3 b')).toEqual(['a: 0 - 1/4', 'a: 1/4 - 1/2', 'a: 1/2 - 3/4', 'b: 3/4 - 1']);
-    expect(minS('[<a b c>]!3 d')).toEqual(minS('<a b c> <a b c> <a b c> d'));
+    assert.deepStrictEqual(minS('a!3 b'), ['a: 0 - 1/4', 'a: 1/4 - 1/2', 'a: 1/2 - 3/4', 'b: 3/4 - 1']);
   });
   it('supports euclidean rhythms', () => {
-    expect(minS('a(3, 8)')).toEqual(['a: 0 - 1/8', 'a: 3/8 - 1/2', 'a: 3/4 - 7/8']);
-  });
-  it('supports 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?')
-        .queryArc(0, 20)
-        .map((hap) => hap.whole.begin),
-    ).toEqual(
-      mini('a')
-        .degradeBy(0.5)
-        .queryArc(0, 20)
-        .map((hap) => hap.whole.begin),
-    );
-  });
-  // testing things that involve pseudo-randomness, so there's a probability we could fail by chance.
-  // these next few tests work with the current PRNG, and are intended to succeed with p > 0.99 even if the PRNG changes
-  //   (as long as the PRNG has a relatively-uniform distribution of values)
-  it('supports degradeBy with default of 50%', () => {
-    const haps = mini('a?').queryArc(0, 1000);
-    expect(459 <= haps.length && haps.length <= 541).toBe(true);
-    // 'Number of elements did not fall in 99% confidence interval for binomial with p=0.5',
-  });
-  it('supports degradeBy with an argument', () => {
-    const haps = mini('a?0.8').queryArc(0, 1000);
-    expect(haps.length > 0).toBe(true);
-    // 'Should have had at least one element when degradeBy was set at 0.8');
-    expect(haps.length < 230).toBe(true);
-    // 'Had too many cycles remaining after degradeBy 0.8');
-  });
-  it('supports multiple independent uses of the random choice operator ("|")', () => {
-    const numCycles = 1000;
-    const values = mini('[a|b] [a|b]')
-      .queryArc(0, numCycles)
-      .map((e) => e.value);
-    const observed = { aa: 0, ab: 0, ba: 0, bb: 0 };
-    for (let i = 0; i < values.length; i += 2) {
-      const chunk = values.slice(i, i + 2);
-      observed[chunk.join('')]++;
-    }
-    for (const count of Object.values(observed)) {
-      // Should fall within 99% confidence interval for binomial with p=0.25.
-      expect(215 <= count && count <= 286).toBe(true);
-    }
-  });
-  it('supports the random choice operator ("|") with nesting', () => {
-    const numCycles = 900;
-    const haps = mini('a | [b | c] | [d | e | f]').queryArc(0, numCycles);
-    // Should have about 1/3 a, 1/6 each of b | c, and 1/9 each of d | e | f.
-    // Evaluating this distribution with a chi-squared test.
-    // Note: this just evaluates the overall distribution, not things like correlation/runs of values
-    const observed = haps.reduce((acc, hap) => {
-      acc[hap.value] = (acc[hap.value] || 0) + 1;
-      return acc;
-    }, {});
-    const expected = {
-      a: numCycles / 3,
-      b: numCycles / 6,
-      c: numCycles / 6,
-      d: numCycles / 9,
-      e: numCycles / 9,
-      f: numCycles / 9,
-    };
-    let chisq = -numCycles;
-    for (let k in expected) {
-      chisq += (observed[k] * observed[k]) / expected[k];
-    }
-    // 15.086 is the chisq for 5 degrees of freedom at 99%, so for 99% of uniformly-distributed
-    //  PRNG, this test should succeed
-    expect(chisq <= 15.086).toBe(true);
-  });
-  it('supports lists', () => {
-    expect(minV('a:b c:d:[e:f] g')).toEqual([['a', 'b'], ['c', 'd', ['e', 'f']], 'g']);
+    assert.deepStrictEqual(minS('a(3, 8)'), ['a: 0 - 1/8', 'a: 3/8 - 1/2', 'a: 3/4 - 7/8']);
   });
 });

packages/mini/vite.config.js

@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});

packages/osc/README.md

@@ -34,6 +34,4 @@ Now open the REPL and type:
 s("<bd sd> hh").osc()
 ```
 
-or just [click here](https://strudel.tidalcycles.org/#cygiPGJkIHNkPiBoaCIpLm9zYygp)...
-
-You can read more about [how to use Superdirt with Strudel the Tutorial](https://strudel.tidalcycles.org/learn/input-output/#superdirt-api)
+or just [click here](http://localhost:3000/#cygiPGJkIHNkPiBoaCIpLm9zYygp)...

packages/osc/osc.mjs

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

packages/osc/package-lock.json

@@ -0,0 +1,60 @@
+{
+	"name": "@strudel.cycles/osc",
+	"version": "0.1.1",
+	"lockfileVersion": 2,
+	"requires": true,
+	"packages": {
+		"": {
+			"name": "@strudel.cycles/osc",
+			"version": "0.1.0",
+			"license": "AGPL-3.0-or-later",
+			"dependencies": {
+				"osc-js": "^2.3.2"
+			}
+		},
+		"node_modules/osc-js": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.2.tgz",
+			"integrity": "sha512-9i7J4u1hH+glooGMh+ki1ni0JGqKmylT8r0nXKugHbRK63rR+kl4O+5tGW6+/EszjbCju3KV+eXQQzFDdGrmhg==",
+			"dependencies": {
+				"ws": "^8.5.0"
+			}
+		},
+		"node_modules/ws": {
+			"version": "8.5.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+			"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+			"engines": {
+				"node": ">=10.0.0"
+			},
+			"peerDependencies": {
+				"bufferutil": "^4.0.1",
+				"utf-8-validate": "^5.0.2"
+			},
+			"peerDependenciesMeta": {
+				"bufferutil": {
+					"optional": true
+				},
+				"utf-8-validate": {
+					"optional": true
+				}
+			}
+		}
+	},
+	"dependencies": {
+		"osc-js": {
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.2.tgz",
+			"integrity": "sha512-9i7J4u1hH+glooGMh+ki1ni0JGqKmylT8r0nXKugHbRK63rR+kl4O+5tGW6+/EszjbCju3KV+eXQQzFDdGrmhg==",
+			"requires": {
+				"ws": "^8.5.0"
+			}
+		},
+		"ws": {
+			"version": "8.5.0",
+			"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz",
+			"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==",
+			"requires": {}
+		}
+	}
+}

packages/osc/package.json

@@ -1,19 +1,13 @@
 {
   "name": "@strudel.cycles/osc",
-  "version": "0.7.0",
+  "version": "0.1.1",
   "description": "OSC messaging for strudel",
   "main": "osc.mjs",
-  "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
-  },
   "scripts": {
+    "test": "echo \"No tests present.\" && exit 0",
     "server": "node server.js",
     "tidal-sniffer": "node tidal-sniffer.js",
-    "client": "npx serve -p 4321",
-    "build-bin": "npx pkg server.js --targets node16-macos-x64,node16-win-x64,node16-linux-x64 --out-path bin",
-    "build": "vite build",
-    "prepublishOnly": "npm run build"
+    "client": "npx serve -p 4321"
   },
   "repository": {
     "type": "git",
@@ -36,11 +30,6 @@
   },
   "homepage": "https://github.com/tidalcycles/strudel#readme",
   "dependencies": {
-    "@strudel.cycles/core": "workspace:*",
-    "osc-js": "^2.4.0"
-  },
-  "devDependencies": {
-    "pkg": "^5.7.0",
-    "vite": "^3.2.2"
+    "osc-js": "^2.3.2"
   }
 }

packages/osc/server.js

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

packages/osc/vite.config.js

@@ -1,19 +0,0 @@
-import { defineConfig } from 'vite';
-import { dependencies } from './package.json';
-import { resolve } from 'path';
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [],
-  build: {
-    lib: {
-      entry: resolve(__dirname, 'osc.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
-    },
-    rollupOptions: {
-      external: [...Object.keys(dependencies)],
-    },
-    target: 'esnext',
-  },
-});

packages/react/.gitignore

@@ -11,6 +11,8 @@ node_modules
 dist-ssr
 *.local
 
+!dist
+
 # Editor directories and files
 .vscode/*
 !.vscode/extensions.json