Merge branch 'main' into global-repl

make sliders really work
widget support
2026-10-04 16:28:24 -04:00 · 2023-11-15 17:46:03 +01:00 · 2023-11-03 14:08:13 +01:00 · 2023-11-03 13:50:18 +01:00 · 2023-11-03 12:07:19 +01:00 · 2023-11-03 11:46:32 +01:00
368 changed files with 16253 additions and 17097 deletions
@@ -20,5 +20,4 @@ vite.config.js
 **/dist
 /src-tauri/target/**/*
 reverbGen.mjs
-hydra.mjs
-jsdoc-synonyms.js
+hydra.mjs
@@ -21,13 +21,13 @@ jobs:
      name: github-pages
      url: ${{ steps.deployment.outputs.page_url }}
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - uses: pnpm/action-setup@v2
        with:
-          version: 8.11.0
+          version: 7
      - uses: actions/setup-node@v3
        with:
-          node-version: 20
+          node-version: 18
          cache: "pnpm"
      - name: Install Dependencies
        run: pnpm install
@@ -7,13 +7,13 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        node-version: [20]
+        node-version: [18]

    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
      - uses: pnpm/action-setup@v2
        with:
-          version: 8.11.0
+          version: 7
      - uses: actions/setup-node@v3
        with:
          node-version: ${{ matrix.node-version }}
@@ -43,87 +43,4 @@ dev-dist
 Dirt-Samples
 tidal-drum-machines
 webaudiofontdata
-src-tauri/target
-
-# BEGIN JetBrains -> END JetBrains
-
-# for JetBrains IDE users, e.g. WebStorm. Source: https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
-# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
-
-# User-specific stuff
-.idea/**/workspace.xml
-.idea/**/tasks.xml
-.idea/**/usage.statistics.xml
-.idea/**/dictionaries
-.idea/**/shelf
-
-# AWS User-specific
-.idea/**/aws.xml
-
-# Generated files
-.idea/**/contentModel.xml
-
-# Sensitive or high-churn files
-.idea/**/dataSources/
-.idea/**/dataSources.ids
-.idea/**/dataSources.local.xml
-.idea/**/sqlDataSources.xml
-.idea/**/dynamic.xml
-.idea/**/uiDesigner.xml
-.idea/**/dbnavigator.xml
-
-# Gradle
-.idea/**/gradle.xml
-.idea/**/libraries
-
-# Gradle and Maven with auto-import
-# When using Gradle or Maven with auto-import, you should exclude module files,
-# since they will be recreated, and may cause churn.  Uncomment if using
-# auto-import.
-# .idea/artifacts
-# .idea/compiler.xml
-# .idea/jarRepositories.xml
-# .idea/modules.xml
-# .idea/*.iml
-# .idea/modules
-# *.iml
-# *.ipr
-
-# CMake
-cmake-build-*/
-
-# Mongo Explorer plugin
-.idea/**/mongoSettings.xml
-
-# File-based project format
-*.iws
-
-# IntelliJ
-out/
-
-# mpeltonen/sbt-idea plugin
-.idea_modules/
-
-# JIRA plugin
-atlassian-ide-plugin.xml
-
-# Cursive Clojure plugin
-.idea/replstate.xml
-
-# SonarLint plugin
-.idea/sonarlint/
-
-# Crashlytics plugin (for Android Studio and IntelliJ)
-com_crashlytics_export_strings.xml
-crashlytics.properties
-crashlytics-build.properties
-fabric.properties
-
-# Editor-based Rest Client
-.idea/httpRequests
-
-# Android studio 3.1+ serialized cache file
-.idea/caches/build_file_checksums.ser
-
-# END JetBrains -> BEGIN JetBrains
+src-tauri/target
@@ -9,5 +9,4 @@ packages/xen/tunejs.js
 paper
 pnpm-lock.yaml
 pnpm-workspace.yaml
-**/dev-dist
-website/.astro
+**/dev-dist
@@ -66,7 +66,7 @@ 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/) (`curl -fsSL https://get.pnpm.io/install.sh | env PNPM_VERSION=8.11.0 sh -`)
+- [pnpm](https://pnpm.io/) (`npm i pnpm -g`)

 then, do the following:

@@ -114,7 +114,7 @@ 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/<package-name>` to get the local version,
+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.

 ## Package Publishing
@@ -2,13 +2,12 @@

 [![Strudel test status](https://github.com/tidalcycles/strudel/actions/workflows/test.yml/badge.svg)](https://github.com/tidalcycles/strudel/actions)

-An experiment in making a [Tidal](https://github.com/tidalcycles/tidal/) using web technologies. This software is a bit more stable now, but please continue to tread carefully.
+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.cc>
 - Docs: <https://strudel.cc/learn>
 - Technical Blog Post: <https://loophole-letters.vercel.app/strudel>
 - 1 Year of Strudel Blog Post: <https://loophole-letters.vercel.app/strudel1year>
- 2 Years of Strudel Blog Post: <https://strudel.cc/blog/#year-2>

 ## Running Locally

@@ -31,6 +30,7 @@ There are multiple npm packages you can use to use strudel, or only parts of it,
 - [`midi`](./packages/midi): webmidi bindings
 - [`serial`](./packages/serial): webserial bindings
 - [`tonal`](./packages/tonal): tonal functions
+- [`xen`](./packages/xen): microtonal / xenharmonic functions
 - ... [and there are more](./packages/)

 Click on the package names to find out more about each one.
@@ -1,3 +0,0 @@
-# examples
-
-This folder contains usage examples for different scenarios.
@@ -1,5 +0,0 @@
-# buildless examples
-
-These examples show you how strudel can be used in a regular html file, without the need for a build tool.
-
-Most examples are using [skypack](https://www.skypack.dev/)
@@ -1,31 +0,0 @@
-<script src="https://unpkg.com/@strudel/repl@1.0.2"></script>
-<strudel-editor>
-  <!--
-// @date 23-08-15
-// "golf rolf" @by froos @license CC BY-NC-SA 4.0
-
-setcps(1)
-stack(
-  s("bd*2, ~ rim*<1!3 2>, hh*4").bank('RolandTR909')
-  .off(-1/8, set(speed("1.5").gain(.25)))
-  .mask("<0!16 1!64>")
-  ,
-  note("g1(3,8)")
-  .s("gm_synth_bass_2:<0 2>")
-  .delay(".8:.25:.25")
-  .clip("<.5!16 2!32>")
-  .off(1/8, add(note("12?0.7")))
-  .lpf(sine.range(500,2000).slow(32)).lpq(8)
-  .add(note("0,.05"))
-  .mask("<0!8 1!32>")
-  ,
-  n("<0 1 2 3 4>*8").scale('G4 minor')
-  .s("gm_lead_6_voice")
-  .clip(sine.range(.2,.8).slow(8))
-  .jux(rev)
-  .room(2)
-  .sometimes(add(note("12")))
-  .lpf(perlin.range(200,20000).slow(4))
-).reset("<x@15 x(5,8)>")
-->
-</strudel-editor>
@@ -1,8 +0,0 @@
-<script src="https://unpkg.com/@strudel/web@1.0.3"></script>
-<button id="play">PLAY</button>
-<script>
-  initStrudel({
-    prebake: () => samples('github:tidalcycles/dirt-samples'),
-  });
-  document.getElementById('play').addEventListener('click', () => s('bd sd').play());
-</script>
@@ -1,8 +0,0 @@
-# codemirror-repl example
-
-This folder demonstrates how to set up a full strudel repl with the `@strudel/codemirror` package. Run it using:
-
-```sh
-pnpm i
-pnpm dev
-```
@@ -1,23 +0,0 @@
-{
-  "name": "vite-vanilla-repl-cm6",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "vite build",
-    "preview": "vite preview"
-  },
-  "devDependencies": {
-    "vite": "^5.0.10"
-  },
-  "dependencies": {
-    "@strudel/codemirror": "workspace:*",
-    "@strudel/core": "workspace:*",
-    "@strudel/mini": "workspace:*",
-    "@strudel/soundfonts": "workspace:*",
-    "@strudel/tonal": "workspace:*",
-    "@strudel/transpiler": "workspace:*",
-    "@strudel/webaudio": "workspace:*"
-  }
-}
@@ -1,13 +0,0 @@
-# headless-repl demo
-
-This demo shows how to use strudel in "headless mode".
-Buttons A / B / C will switch between different patterns.
-It showcases the usage of the `@strudel/web` package, using [vite](https://vitejs.dev/) as the dev server.
-
-## Running
-
-```sh
-pnpm i && cd examples/headless-repl
-pnpm dev
-# open http://localhost:5173/
-```
@@ -1 +0,0 @@
-dist
@@ -1,10 +0,0 @@
-# minimal repl
-
-This folder demonstrates how to set up a minimal strudel repl using vite and vanilla JS. Run it using:
-
-```sh
-npm i
-npm run dev
-```
-
-If you're looking for a more feature rich alternative, have a look at the [../codemirror-repl](codemirror-repl example)
@@ -1,11 +0,0 @@
-# superdough demo
-
-This demo shows how to use [superdough](https://www.npmjs.com/package/superdough) with [vite](https://vitejs.dev/).
-
-## Running
-
-```sh
-pnpm i && cd examples/headless-repl
-pnpm dev
-# open http://localhost:5173/
-```
@@ -1,38 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Superdough Example</title>
-    <meta charset="UTF-8" />
-  </head>
-
-  <body>
-    <button id="play">PLAAAAAAAY</button>
-    <script type="module">
-      import { superdough, samples, initAudioOnFirstClick, registerSynthSounds } from 'superdough';
-
-      const init = Promise.all([
-        initAudioOnFirstClick(),
-        samples('github:tidalcycles/dirt-samples'),
-        registerSynthSounds(),
-      ]);
-
-      const loop = (t = 0) => {
-        // superdough(value, time, duration)
-        superdough({ s: 'bd', delay: 0.5 }, t);
-        superdough({ note: 'g1', s: 'sawtooth', cutoff: 600, resonance: 8 }, t, 0.125);
-        superdough({ note: 'g2', s: 'sawtooth', cutoff: 600, resonance: 8 }, t + 0.25, 0.125);
-        superdough({ s: 'hh' }, t + 0.25);
-        superdough({ s: 'sd', room: 0.5 }, t + 0.5);
-        superdough({ s: 'hh' }, t + 0.75);
-      };
-
-      document.getElementById('play').addEventListener('click', async () => {
-        await init;
-        let t = 0.1;
-        while (t < 16) {
-          loop(t++);
-        }
-      });
-    </script>
-  </body>
-</html>
@@ -3,7 +3,7 @@
    "includePattern": ".+\\.(js(doc|x)?|mjs)$",
    "excludePattern": "node_modules|shift-parser|shift-reducer|shift-traverser|dist"
  },
-  "plugins": ["plugins/markdown", "jsdoc/jsdoc-synonyms"],
+  "plugins": ["plugins/markdown"],
  "opts": {
    "destination": "./out/",
    "recurse": true
@@ -1,6 +1,8 @@
 {
-  "packages": ["packages/*"],
+  "packages": [
+    "packages/*"
+  ],
  "version": "independent",
  "npmClient": "pnpm",
-  "$schema": "node_modules/lerna/schemas/lerna-schema.json"
+  "useWorkspaces": true
 }
@@ -1,5 +1,5 @@
 {
-  "name": "@strudel/monorepo",
+  "name": "@strudel.cycles/monorepo",
  "version": "0.5.0",
  "private": true,
  "description": "Port of tidalcycles to javascript",
@@ -18,12 +18,12 @@
    "build": "npm run prebuild && cd website && npm run build",
    "preview": "cd website && npm run preview",
    "osc": "cd packages/osc && npm run server",
-    "jsdoc": "jsdoc packages/ -c jsdoc/jsdoc.config.json",
-    "jsdoc-json": "jsdoc packages/ --template ./node_modules/jsdoc-json --destination doc.json -c jsdoc/jsdoc.config.json",
+    "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 jsdoc/undocumented.mjs > undocumented.json",
+    "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"
  },
@@ -45,27 +45,28 @@
  },
  "homepage": "https://strudel.cc",
  "dependencies": {
-    "@strudel/core": "workspace:*",
-    "@strudel/mini": "workspace:*",
-    "@strudel/tonal": "workspace:*",
-    "@strudel/transpiler": "workspace:*",
-    "@strudel/webaudio": "workspace:*",
-    "@strudel/xen": "workspace:*"
+    "@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"
  },
  "devDependencies": {
-    "dependency-tree": "^10.0.9",
-    "@tauri-apps/cli": "^1.5.9",
-    "@vitest/ui": "^1.1.0",
+    "@tauri-apps/cli": "^1.4.0",
+    "@vitest/ui": "^0.28.0",
    "canvas": "^2.11.2",
-    "eslint": "^8.56.0",
-    "eslint-plugin-import": "^2.29.1",
+    "eslint": "^8.39.0",
+    "eslint-plugin-import": "^2.27.5",
    "events": "^3.3.0",
    "jsdoc": "^4.0.2",
    "jsdoc-json": "^2.0.2",
    "jsdoc-to-markdown": "^8.0.0",
-    "lerna": "^8.0.1",
-    "prettier": "^3.1.1",
-    "rollup-plugin-visualizer": "^5.12.0",
-    "vitest": "^1.1.0"
+    "lerna": "^6.6.1",
+    "prettier": "^2.8.8",
+    "rollup-plugin-visualizer": "^5.8.1",
+    "vitest": "^0.33.0"
  }
 }
@@ -1,5 +1,15 @@
 # Packages

-Each folder represents one of the @strudel/* packages [published to npm](https://www.npmjs.com/org/strudel).
+Each folder represents one of the @strudel.cycles/* packages [published to npm](https://www.npmjs.com/org/strudel.cycles).

 To understand how those pieces connect, refer to the [Technical Manual](https://github.com/tidalcycles/strudel/wiki/Technical-Manual) or the individual READMEs.
+
+This is a graphical view of all the packages: [full screen](https://raw.githubusercontent.com/tidalcycles/strudel/main/dependencies.svg)
+
+![dependencies](https://raw.githubusercontent.com/tidalcycles/strudel/main/dependencies.svg)
+
+Generated with
+
+```sh
+npx depcruise --include-only "^packages" -X "node_modules" --output-type dot packages | dot -T svg > dependencygraph.svg
+```
@@ -1,13 +1,7 @@
+import { createRoot } from 'react-dom/client';
 import jsdoc from '../../doc.json';
 // import { javascriptLanguage } from '@codemirror/lang-javascript';
 import { autocompletion } from '@codemirror/autocomplete';
-import { h } from './html';
-
-function plaintext(str) {
-  const div = document.createElement('div');
-  div.innerText = str;
-  return div.innerHTML;
-}

 const getDocLabel = (doc) => doc.name || doc.longname;
 const getInnerText = (html) => {
@@ -16,32 +10,36 @@ const getInnerText = (html) => {
  return div.textContent || div.innerText || '';
 };

-export function Autocomplete({ doc, label }) {
-  return h`<div class="prose dark:prose-invert max-h-[400px] overflow-auto p-2">
-<h1 class="pt-0 mt-0">${label || getDocLabel(doc)}</h1>
-${doc.description}
-<ul>
-  ${doc.params?.map(
-    ({ name, type, description }) =>
-      `<li>${name} : ${type.names?.join(' | ')} ${description ? ` - ${getInnerText(description)}` : ''}</li>`,
-  )}
-</ul>
-<div>
-  ${doc.examples?.map((example) => `<div><pre>${plaintext(example)}</pre></div>`)}
-</div>
-</div>`[0];
-  /*
-<pre
-className="cursor-pointer"
-onMouseDown={(e) => {
-  console.log('ola!');
-  navigator.clipboard.writeText(example);
-  e.stopPropagation();
-}}
->
-{example}
-</pre>
-*/
+export function Autocomplete({ doc }) {
+  return (
+    <div className="prose dark:prose-invert  max-h-[400px] overflow-auto">
+      <h3 className="pt-0 mt-0">{getDocLabel(doc)}</h3>
+      <div dangerouslySetInnerHTML={{ __html: doc.description }} />
+      <ul>
+        {doc.params?.map(({ name, type, description }, i) => (
+          <li key={i}>
+            {name} : {type.names?.join(' | ')} {description ? <> - {getInnerText(description)}</> : ''}
+          </li>
+        ))}
+      </ul>
+      <div>
+        {doc.examples?.map((example, i) => (
+          <div key={i}>
+            <pre
+              className="cursor-pointer"
+              onMouseDown={(e) => {
+                console.log('ola!');
+                navigator.clipboard.writeText(example);
+                e.stopPropagation();
+              }}
+            >
+              {example}
+            </pre>
+          </div>
+        ))}
+      </div>
+    </div>
+  );
 }

 const jsdocCompletions = jsdoc.docs
@@ -56,7 +54,13 @@ const jsdocCompletions = jsdoc.docs
  .map((doc) /*: Completion */ => ({
    label: getDocLabel(doc),
    // detail: 'xxx', // An optional short piece of information to show (with a different style) after the label.
-    info: () => Autocomplete({ doc }),
+    info: () => {
+      const node = document.createElement('div');
+      // if Autocomplete is non-interactive, it could also be rendered at build time..
+      // .. using renderToStaticMarkup
+      createRoot(node).render(<Autocomplete doc={doc} />);
+      return node;
+    },
    type: 'function', // https://codemirror.net/docs/ref/#autocomplete.Completion.type
  }));

@@ -2,67 +2,33 @@ import { closeBrackets } from '@codemirror/autocomplete';
 // import { search, highlightSelectionMatches } from '@codemirror/search';
 import { history } from '@codemirror/commands';
 import { javascript } from '@codemirror/lang-javascript';
-import { defaultHighlightStyle, syntaxHighlighting, bracketMatching } from '@codemirror/language';
-import { Compartment, EditorState, Prec } from '@codemirror/state';
-import {
-  EditorView,
-  highlightActiveLineGutter,
-  highlightActiveLine,
-  keymap,
-  lineNumbers,
-  drawSelection,
-} from '@codemirror/view';
-import { Pattern, Drawer, repl, cleanupDraw } from '@strudel/core';
-import { isAutoCompletionEnabled } from './autocomplete.mjs';
-import { isTooltipEnabled } from './tooltip.mjs';
+import { defaultHighlightStyle, syntaxHighlighting } from '@codemirror/language';
+import { Compartment, EditorState } from '@codemirror/state';
+import { EditorView, highlightActiveLineGutter, highlightActiveLine, keymap, lineNumbers } from '@codemirror/view';
+import { Pattern, Drawer, repl, cleanupDraw } from '@strudel.cycles/core';
+import { isAutoCompletionEnabled } from './Autocomplete';
 import { flash, isFlashEnabled } from './flash.mjs';
 import { highlightMiniLocations, isPatternHighlightingEnabled, updateMiniLocations } from './highlight.mjs';
 import { keybindings } from './keybindings.mjs';
-import { initTheme, activateTheme, theme } from './themes.mjs';
+import { theme } from './themes.mjs';
 import { updateWidgets, sliderPlugin } from './slider.mjs';
-import { persistentAtom } from '@nanostores/persistent';

 const extensions = {
  isLineWrappingEnabled: (on) => (on ? EditorView.lineWrapping : []),
-  isBracketMatchingEnabled: (on) => (on ? bracketMatching({ brackets: '()[]{}<>' }) : []),
  isLineNumbersDisplayed: (on) => (on ? lineNumbers() : []),
  theme,
  isAutoCompletionEnabled,
-  isTooltipEnabled,
  isPatternHighlightingEnabled,
-  isActiveLineHighlighted: (on) => (on ? [highlightActiveLine(), highlightActiveLineGutter()] : []),
  isFlashEnabled,
  keybindings,
 };
 const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [key, new Compartment()]));

-export const defaultSettings = {
-  keybindings: 'codemirror',
-  isBracketMatchingEnabled: false,
-  isLineNumbersDisplayed: true,
-  isActiveLineHighlighted: false,
-  isAutoCompletionEnabled: false,
-  isPatternHighlightingEnabled: true,
-  isFlashEnabled: true,
-  isTooltipEnabled: false,
-  isLineWrappingEnabled: false,
-  theme: 'strudelTheme',
-  fontFamily: 'monospace',
-  fontSize: 18,
-};
-
-export const codemirrorSettings = persistentAtom('codemirror-settings', defaultSettings, {
-  encode: JSON.stringify,
-  decode: JSON.parse,
-});
-
 // https://codemirror.net/docs/guide/
-export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, root }) {
-  const settings = codemirrorSettings.get();
+export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, settings, root }) {
  const initialSettings = Object.keys(compartments).map((key) =>
    compartments[key].of(extensions[key](parseBooleans(settings[key]))),
  );
-  initTheme(settings.theme);
  let state = EditorState.create({
    doc: initialCode,
    extensions: [
@@ -74,32 +40,32 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
      // indentOnInput(), // works without. already brought with javascript extension?
      // bracketMatching(), // does not do anything
      closeBrackets(),
+      highlightActiveLineGutter(),
+      highlightActiveLine(),
      syntaxHighlighting(defaultHighlightStyle),
      history(),
      EditorView.updateListener.of((v) => onChange(v)),
-      drawSelection({ cursorBlinkRate: 0 }),
-      Prec.highest(
-        keymap.of([
-          {
-            key: 'Ctrl-Enter',
-            run: () => onEvaluate?.(),
+      keymap.of([
+        {
+          key: 'Ctrl-Enter',
+          run: () => onEvaluate?.(),
+        },
+        {
+          key: 'Alt-Enter',
+          run: () => onEvaluate?.(),
+        },
+        {
+          key: 'Ctrl-.',
+          run: () => onStop?.(),
+        },
+        {
+          key: 'Alt-.',
+          run: (_, e) => {
+            e.preventDefault();
+            onStop?.();
          },
-          {
-            key: 'Alt-Enter',
-            run: () => onEvaluate?.(),
-          },
-          {
-            key: 'Ctrl-.',
-            run: () => onStop?.(),
-          },
-          {
-            key: 'Alt-.',
-            run: (_, e) => {
-              e.preventDefault();
-              onStop?.();
-            },
-          },
-          /* {
+        },
+        /* {
          key: 'Ctrl-Shift-.',
          run: () => (onPanic ? onPanic() : onStop?.()),
        },
@@ -107,8 +73,7 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo
          key: 'Ctrl-Shift-Enter',
          run: () => (onReEvaluate ? onReEvaluate() : onEvaluate?.()),
        }, */
-        ]),
-      ),
+      ]),
    ],
  });

@@ -120,26 +85,14 @@ export function initEditor({ initialCode = '', onChange, onEvaluate, onStop, roo

 export class StrudelMirror {
  constructor(options) {
-    const {
-      root,
-      id,
-      initialCode = '',
-      onDraw,
-      drawTime = [0, 0],
-      autodraw,
-      prebake,
-      bgFill = true,
-      ...replOptions
-    } = options;
+    const { root, initialCode = '', onDraw, drawTime = [-2, 2], prebake, settings, ...replOptions } = options;
    this.code = initialCode;
    this.root = root;
    this.miniLocations = [];
    this.widgets = [];
    this.painters = [];
-    this.drawTime = drawTime;
    this.onDraw = onDraw;
    const self = this;
-    this.id = id || s4();

    this.drawer = new Drawer((haps, time) => {
      const currentFrame = haps.filter((hap) => time >= hap.whole.begin && time <= hap.endClipped);
@@ -147,29 +100,21 @@ export class StrudelMirror {
      this.onDraw?.(haps, time, currentFrame, this.painters);
    }, drawTime);

-    // this approach does not work with multiple repls on screen
-    // TODO: refactor onPaint usages + find fix, maybe remove painters here?
+    // this approach might not work with multiple repls on screen..
    Pattern.prototype.onPaint = function (onPaint) {
      self.painters.push(onPaint);
      return this;
    };

    this.prebaked = prebake();
-    autodraw && this.drawFirstFrame();
+    // this.drawFirstFrame();

    this.repl = repl({
      ...replOptions,
      onToggle: (started) => {
        replOptions?.onToggle?.(started);
        if (started) {
-          this.adjustDrawTime();
          this.drawer.start(this.repl.scheduler);
-          // stop other repls when this one is started
-          document.dispatchEvent(
-            new CustomEvent('start-repl', {
-              detail: this.id,
-            }),
-          );
        } else {
          this.drawer.stop();
          updateMiniLocations(this.editor, []);
@@ -189,46 +134,22 @@ export class StrudelMirror {
        updateWidgets(this.editor, this.widgets);
        updateMiniLocations(this.editor, this.miniLocations);
        replOptions?.afterEval?.(options);
-        this.adjustDrawTime();
        this.drawer.invalidate();
      },
    });
    this.editor = initEditor({
      root,
+      settings,
      initialCode,
      onChange: (v) => {
        if (v.docChanged) {
          this.code = v.state.doc.toString();
-          this.repl.setCode?.(this.code);
+          this.repl.setCode(this.code);
        }
      },
      onEvaluate: () => this.evaluate(),
      onStop: () => this.stop(),
    });
-    const cmEditor = this.root.querySelector('.cm-editor');
-    if (cmEditor) {
-      this.root.style.display = 'block';
-      if (bgFill) {
-        this.root.style.backgroundColor = 'var(--background)';
-      }
-      cmEditor.style.backgroundColor = 'transparent';
-    }
-    const settings = codemirrorSettings.get();
-    this.setFontSize(settings.fontSize);
-    this.setFontFamily(settings.fontFamily);
-
-    // stop this repl when another repl is started
-    this.onStartRepl = (e) => {
-      if (e.detail !== this.id) {
-        this.stop();
-      }
-    };
-    document.addEventListener('start-repl', this.onStartRepl);
-  }
-  // adjusts draw time depending on if there are painters
-  adjustDrawTime() {
-    // when no painters are set, [0,0] is enough (just highlighting)
-    this.drawer.setDrawTime(this.painters.length ? this.drawTime : [0, 0]);
  }
  async drawFirstFrame() {
    if (!this.onDraw) {
@@ -238,9 +159,8 @@ export class StrudelMirror {
    await this.prebaked;
    try {
      await this.repl.evaluate(this.code, false);
-      this.drawer.invalidate(this.repl.scheduler, -0.001);
-      // draw at -0.001 to avoid haps at 0 to be visualized as active
-      this.onDraw?.(this.drawer.visibleHaps, -0.001, [], this.painters);
+      this.drawer.invalidate(this.repl.scheduler);
+      this.onDraw?.(this.drawer.visibleHaps, 0, []);
    } catch (err) {
      console.warn('first frame could not be painted');
    }
@@ -254,7 +174,7 @@ export class StrudelMirror {
  }
  async toggle() {
    if (this.repl.scheduler.started) {
-      this.repl.stop();
+      this.repl.scheduler.stop();
    } else {
      this.evaluate();
    }
@@ -270,10 +190,6 @@ export class StrudelMirror {
  }
  setFontFamily(family) {
    this.root.style.fontFamily = family;
-    const scroller = this.root.querySelector('.cm-scroller');
-    if (scroller) {
-      scroller.style.fontFamily = family;
-    }
  }
  reconfigureExtension(key, value) {
    if (!extensions[key]) {
@@ -285,16 +201,10 @@ export class StrudelMirror {
    this.editor.dispatch({
      effects: compartments[key].reconfigure(newValue),
    });
-    if (key === 'theme') {
-      activateTheme(value);
-    }
  }
  setLineWrappingEnabled(enabled) {
    this.reconfigureExtension('isLineWrappingEnabled', enabled);
  }
-  setBracketMatchingEnabled(enabled) {
-    this.reconfigureExtension('isBracketMatchingEnabled', enabled);
-  }
  setLineNumbersDisplayed(enabled) {
    this.reconfigureExtension('isLineNumbersDisplayed', enabled);
  }
@@ -310,8 +220,6 @@ export class StrudelMirror {
    for (let key in extensions) {
      this.reconfigureExtension(key, settings[key]);
    }
-    const updated = { ...codemirrorSettings.get(), ...settings };
-    codemirrorSettings.set(updated);
  }
  changeSetting(key, value) {
    if (extensions[key]) {
@@ -327,18 +235,8 @@ export class StrudelMirror {
    const changes = { from: 0, to: this.editor.state.doc.length, insert: code };
    this.editor.dispatch({ changes });
  }
-  clear() {
-    this.onStartRepl && document.removeEventListener('start-repl', this.onStartRepl);
-  }
 }

 function parseBooleans(value) {
  return { true: true, false: false }[value] ?? value;
 }
-
-// helper function to generate repl ids
-function s4() {
-  return Math.floor((1 + Math.random()) * 0x10000)
-    .toString(16)
-    .substring(1);
-}
@@ -57,9 +57,6 @@ const visibleMiniLocations = StateField.define({
        // this is why we need to find a way to update the existing decorations, showing the ones that have an active range
        const haps = new Map();
        for (let hap of e.value.haps) {
-          if (!hap.context?.locations || !hap.whole) {
-            continue;
-          }
          for (let { start, end } of hap.context.locations) {
            let id = `${start}:${end}`;
            if (!haps.has(id) || haps.get(id).whole.begin.lt(hap.whole.begin)) {
@@ -67,6 +64,7 @@ const visibleMiniLocations = StateField.define({
            }
          }
        }
+
        visible = { atTime: e.value.atTime, haps };
      }
    }
@@ -1,17 +0,0 @@
-const parser = typeof DOMParser !== 'undefined' ? new DOMParser() : null;
-export let html = (string) => {
-  return parser?.parseFromString(string, 'text/html').querySelectorAll('*');
-};
-let parseChunk = (chunk) => {
-  if (Array.isArray(chunk)) return chunk.flat().join('');
-  if (chunk === undefined) return '';
-  return chunk;
-};
-export let h = (strings, ...vars) => {
-  let string = '';
-  for (let i in strings) {
-    string += parseChunk(strings[i]);
-    string += parseChunk(vars[i]);
-  }
-  return html(string);
-};
@@ -2,4 +2,3 @@ export * from './codemirror.mjs';
 export * from './highlight.mjs';
 export * from './flash.mjs';
 export * from './slider.mjs';
-export * from './themes.mjs';
@@ -1,10 +1,11 @@
 {
  "name": "@strudel/codemirror",
-  "version": "1.0.1",
+  "version": "0.9.0",
  "description": "Codemirror Extensions for Strudel",
  "main": "index.mjs",
  "publishConfig": {
-    "main": "dist/index.mjs"
+    "main": "dist/index.js",
+    "module": "dist/index.mjs"
  },
  "scripts": {
    "build": "vite build",
@@ -32,24 +33,23 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@codemirror/autocomplete": "^6.11.1",
-    "@codemirror/commands": "^6.3.3",
-    "@codemirror/lang-javascript": "^6.2.1",
-    "@codemirror/language": "^6.10.0",
-    "@codemirror/search": "^6.5.5",
-    "@codemirror/state": "^6.4.0",
-    "@codemirror/view": "^6.23.0",
-    "@lezer/highlight": "^1.2.0",
-    "@nanostores/persistent": "^0.9.1",
+    "@codemirror/autocomplete": "^6.6.0",
+    "@codemirror/commands": "^6.2.4",
+    "@codemirror/lang-javascript": "^6.1.7",
+    "@codemirror/language": "^6.6.0",
+    "@codemirror/search": "^6.0.0",
+    "@codemirror/state": "^6.2.0",
+    "@codemirror/view": "^6.10.0",
+    "@lezer/highlight": "^1.1.4",
    "@replit/codemirror-emacs": "^6.0.1",
-    "@replit/codemirror-vim": "^6.1.0",
+    "@replit/codemirror-vim": "^6.0.14",
    "@replit/codemirror-vscode-keymap": "^6.0.2",
-    "@strudel/core": "workspace:*",
-    "@uiw/codemirror-themes": "^4.21.21",
-    "@uiw/codemirror-themes-all": "^4.21.21",
-    "nanostores": "^0.9.5"
+    "@strudel.cycles/core": "workspace:*",
+    "@uiw/codemirror-themes": "^4.19.16",
+    "@uiw/codemirror-themes-all": "^4.19.16",
+    "react-dom": "^18.2.0"
  },
  "devDependencies": {
-    "vite": "^5.0.10"
+    "vite": "^4.3.3"
  }
 }
@@ -1,4 +1,4 @@
-import { ref, pure } from '@strudel/core';
+import { ref, pure } from '@strudel.cycles/core';
 import { WidgetType, ViewPlugin, Decoration } from '@codemirror/view';
 import { StateEffect, StateField } from '@codemirror/state';

@@ -111,15 +111,6 @@ export const sliderPlugin = ViewPlugin.fromClass(
  },
 );

-/**
- * Displays a slider widget to allow the user manipulate a value
- *
- * @name slider
- * @param {number} value Initial value
- * @param {number} min Minimum value - optional, defaults to 0
- * @param {number} max Maximum value - optional, defaults to 1
- * @param {number} step Step size - optional
- */
 export let slider = (value) => {
  console.warn('slider will only work when the transpiler is used... passing value as is');
  return pure(value);
@@ -473,9 +473,6 @@ function stringifySafe(json) {
  return JSON.stringify(json, getCircularReplacer());
 }

-export const theme = (theme) => themes[theme] || themes.strudelTheme;
-
-// css style injection helpers
 export function injectStyle(rule) {
  const newStyle = document.createElement('style');
  document.head.appendChild(newStyle);
@@ -484,44 +481,4 @@ export function injectStyle(rule) {
  return () => styleSheet.deleteRule(ruleIndex);
 }

-let currentTheme,
-  resetThemeStyle,
-  themeStyle,
-  styleID = 'strudel-theme-vars';
-export function initTheme(theme) {
-  if (!document.getElementById(styleID)) {
-    themeStyle = document.createElement('style');
-    themeStyle.id = styleID;
-    document.head.append(themeStyle);
-  }
-  activateTheme(theme);
-}
-
-export function activateTheme(name) {
-  if (currentTheme === name) {
-    return;
-  }
-  currentTheme = name;
-  if (!settings[name]) {
-    console.warn('theme', name, 'has no settings.. defaulting to strudelTheme settings');
-  }
-  const themeSettings = settings[name] || settings.strudelTheme;
-  // set css variables
-  themeStyle.innerHTML = `:root {
-      ${Object.entries(themeSettings)
-        // important to override fallback
-        .map(([key, value]) => `--${key}: ${value} !important;`)
-        .join('\n')}
-    }`;
-  // tailwind dark mode
-  if (themeSettings.light) {
-    document.documentElement.classList.remove('dark');
-  } else {
-    document.documentElement.classList.add('dark');
-  }
-  resetThemeStyle?.();
-  resetThemeStyle = undefined;
-  if (themeSettings.customStyle) {
-    resetThemeStyle = injectStyle(themeSettings.customStyle);
-  }
-}
+export const theme = (theme) => themes[theme] || themes.strudelTheme;
@@ -8,8 +8,8 @@ export default defineConfig({
  build: {
    lib: {
      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es'],
-      fileName: (ext) => ({ es: 'index.mjs' })[ext],
+      formats: ['es', 'cjs'],
+      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
    },
    rollupOptions: {
      external: [...Object.keys(dependencies)],
@@ -1,17 +1,17 @@
-# @strudel/core
+# @strudel.cycles/core

 This package contains the bare essence of strudel.

 ## Install

 ```sh
-npm i @strudel/core --save
+npm i @strudel.cycles/core --save
 ```

 ## Example

 ```js
-import { sequence } from '@strudel/core';
+import { sequence } from '@strudel.cycles/core';

 const pattern = sequence('a', ['b', 'c']);

@@ -33,7 +33,7 @@ b: 3/2 - 7/4
 c: 7/4 - 2
 ```

- [play with @strudel/core on codesandbox](https://codesandbox.io/s/strudel-core-test-forked-9ywhv7?file=/src/index.js).
+- [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/)
@@ -1,4 +1,6 @@
-import { Pattern, getDrawContext, silence, register, pure, createParams } from './index.mjs';
+import { Pattern, getDrawContext, silence, register, pure } from './index.mjs';
+import controls from './controls.mjs'; // do not import from index.mjs as it breaks for some reason..
+const { createParams } = controls;

 let clearColor = '#22222210';

@@ -10,15 +10,14 @@ import { logger } from './logger.mjs';
 export class Cyclist {
  constructor({ interval, onTrigger, onToggle, onError, getTime, latency = 0.1 }) {
    this.started = false;
-    this.cps = 0.5;
-    this.num_ticks_since_cps_change = 0;
+    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.num_cycles_since_last_cps_change = 0;
    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
@@ -26,24 +25,14 @@ export class Cyclist {
        if (tick === 0) {
          this.origin = phase;
        }
-        if (this.num_ticks_since_cps_change === 0) {
-          this.num_cycles_since_last_cps_change = this.lastEnd;
-        }
-        this.num_ticks_since_cps_change++;
        try {
          const time = getTime();
          const begin = this.lastEnd;
          this.lastBegin = begin;
-
-          //convert ticks to cycles, so you can query the pattern for events
-          const eventLength = duration * this.cps;
-          const end = this.num_cycles_since_last_cps_change + this.num_ticks_since_cps_change * eventLength;
+          const end = round(begin + duration * this.cps);
          this.lastEnd = end;
-
-          // query the pattern for events
-          const haps = this.pattern.queryArc(begin, end, { _cps: this.cps });
-
-          const tickdeadline = phase - time; // time left until the phase is a whole number
+          const haps = this.pattern.queryArc(begin, end);
+          const tickdeadline = phase - time; // time left till phase begins
          this.lastTick = time + tickdeadline;

          haps.forEach((hap) => {
@@ -70,8 +59,6 @@ export class Cyclist {
    this.onToggle?.(v);
  }
  start() {
-    this.num_ticks_since_cps_change = 0;
-    this.num_cycles_since_last_cps_change = 0;
    if (!this.pattern) {
      throw new Error('Scheduler: no pattern set! call .setPattern first.');
    }
@@ -96,12 +83,8 @@ export class Cyclist {
      this.start();
    }
  }
-  setCps(cps = 0.5) {
-    if (this.cps === cps) {
-      return;
-    }
+  setCps(cps = 1) {
    this.cps = cps;
-    this.num_ticks_since_cps_change = 0;
  }
  log(begin, end, haps) {
    const onsets = haps.filter((h) => h.hasOnset());
@@ -111,6 +111,8 @@ export class Framer {
 // see vite-vanilla-repl-cm6 for an example
 export class Drawer {
  constructor(onDraw, drawTime) {
+    let [lookbehind, lookahead] = drawTime; // e.g. [-2, 2]
+    lookbehind = Math.abs(lookbehind);
    this.visibleHaps = [];
    this.lastFrame = null;
    this.drawTime = drawTime;
@@ -120,8 +122,6 @@ export class Drawer {
          console.warn('Drawer: no scheduler');
          return;
        }
-        const lookbehind = Math.abs(this.drawTime[0]);
-        const lookahead = this.drawTime[1];
        // calculate current frame time (think right side of screen for pianoroll)
        const phase = this.scheduler.now() + lookahead;
        // first frame just captures the phase
@@ -134,7 +134,7 @@ export class Drawer {
        this.lastFrame = phase;
        this.visibleHaps = (this.visibleHaps || [])
          // filter out haps that are too far in the past (think left edge of screen for pianoroll)
-          .filter((h) => h.endClipped >= phase - lookbehind - lookahead)
+          .filter((h) => h.whole.end >= phase - lookbehind - lookahead)
          // add new haps with onset (think right edge bars scrolling in)
          .concat(haps.filter((h) => h.hasOnset()));
        const time = phase - lookahead;
@@ -145,16 +145,12 @@ export class Drawer {
      },
    );
  }
-  setDrawTime(drawTime) {
-    this.drawTime = drawTime;
-  }
-  invalidate(scheduler = this.scheduler, t) {
-    if (!scheduler) {
+  invalidate(scheduler = this.scheduler) {
+    if (!scheduler || !scheduler.pattern) {
      return;
    }
-    // TODO: scheduler.now() seems to move even when it's stopped, this hints at a bug...
-    t = t ?? scheduler.now();
    this.scheduler = scheduler;
+    const t = scheduler.now();
    let [_, lookahead] = this.drawTime;
    const [begin, end] = [Math.max(t, 0), t + lookahead + 0.1];
    // remove all future haps
@@ -41,17 +41,11 @@ const _bjork = function (n, x) {
 };

 export const bjork = function (ons, steps) {
-  const inverted = ons < 0;
-  ons = Math.abs(ons);
  const offs = steps - ons;
  const x = Array(ons).fill([1]);
  const y = Array(offs).fill([0]);
  const result = _bjork([ons, offs], [x, y]);
-  const p = flatten(result[1][0]).concat(flatten(result[1][1]));
-  if (inverted) {
-    return p.map((x) => (x === 0 ? 1 : 0));
-  }
-  return p;
+  return flatten(result[1][0]).concat(flatten(result[1][1]));
 };

 /**
@@ -151,10 +145,8 @@ export const { euclidrot, euclidRot } = register(['euclidrot', 'euclidRot'], fun
 * so there will be no gaps.
 * @name euclidLegato
 * @memberof Pattern
- * @param {number} pulses the number of onsets / beats
- * @param {number} steps the number of steps to fill
 * @example
- * note("c3").euclidLegato(3,8)
+ * n("g2").decay(.1).sustain(.3).euclidLegato(3,8)
 */

 const _euclidLegato = function (pulses, steps, rotation, pat) {
@@ -174,18 +166,6 @@ export const euclidLegato = register(['euclidLegato'], function (pulses, steps,
  return _euclidLegato(pulses, steps, 0, pat);
 });

-/**
- * Similar to `euclid`, but each pulse is held until the next pulse,
- * so there will be no gaps, and has an additional parameter for 'rotating'
- * the resulting sequence
- * @name euclidLegatoRot
- * @memberof Pattern
- * @param {number} pulses the number of onsets / beats
- * @param {number} steps the number of steps to fill
- * @param {number} rotation offset in steps
- * @example
- * note("c3").euclidLegatoRot(3,5,2)
- */
 export const euclidLegatoRot = register(['euclidLegatoRot'], function (pulses, steps, rotation, pat) {
  return _euclidLegato(pulses, steps, rotation, pat);
 });
@@ -47,5 +47,10 @@ export const evaluate = async (code, transpiler) => {
  // 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, meta };
 };
@@ -7,7 +7,7 @@
 />
 <div id="output"></div>
 <script type="module">
-  const strudel = await import('https://cdn.skypack.dev/@strudel/core@0.6.8');
+  const strudel = await import('https://cdn.skypack.dev/@strudel.cycles/core@0.6.8');
  Object.assign(window, strudel); // assign all strudel functions to global scope to use with eval
  const input = document.getElementById('text');
  const getEvents = () => {
@@ -8,7 +8,7 @@
  />
  <canvas id="canvas"></canvas>
  <script type="module">
-    const strudel = await import('https://cdn.skypack.dev/@strudel/core@0.6.8');
+    const strudel = await import('https://cdn.skypack.dev/@strudel.cycles/core@0.6.8');
    // this adds all strudel functions to the global scope, to be used by eval
    Object.assign(window, strudel);
    // setup elements
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
@@ -16,45 +16,38 @@
    </div>
    <div id="output"></div>
    <script type="module">
-      // TODO: refactor to use newer version without controls import
-      import { controls, repl, evalScope } from 'https://cdn.skypack.dev/@strudel/core@0.11.0';
-      import { mini } from 'https://cdn.skypack.dev/@strudel/mini@0.11.0';
-      import { transpiler } from 'https://cdn.skypack.dev/@strudel/transpiler@0.11.0';
+      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,
-        registerSynthSounds,
-      } from 'https://cdn.skypack.dev/@strudel/webaudio@0.11.0';
+      } from 'https://cdn.skypack.dev/@strudel.cycles/webaudio@0.6.0';

+      initAudioOnFirstClick();
      const ctx = getAudioContext();
      const input = document.getElementById('text');
      input.innerHTML = getTune();

-      const loadModules = evalScope(
+      evalScope(
        controls,
-        import('https://cdn.skypack.dev/@strudel/core@0.11.0'),
-        import('https://cdn.skypack.dev/@strudel/mini@0.11.0'),
-        import('https://cdn.skypack.dev/@strudel/tonal@0.11.0'),
-        import('https://cdn.skypack.dev/@strudel/webaudio@0.11.0'),
+        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 initAudio = Promise.all([initAudioOnFirstClick(), registerSynthSounds()]);
-
      const { evaluate } = repl({
        defaultOutput: webaudioOutput,
        getTime: () => ctx.currentTime,
        transpiler,
      });
-      document.getElementById('start').addEventListener('click', async () => {
-        await loadModules;
-        await initAudio;
-        evaluate(input.value);
-      });
+      document.getElementById('start').addEventListener('click', () => evaluate(input.value));

      function getTune() {
-        return `samples('github:tidalcycles/dirt-samples')
-setcps(1);
+        return `await samples('github:tidalcycles/Dirt-Samples/master')
+
 stack(
  // amen
  n("0 1 2 3 4 5 6 7")
@@ -0,0 +1,8 @@
+# vite-vanilla-repl-cm6
+
+This folder demonstrates how to set up a strudel repl using vite and vanilla JS + codemirror. Run it using:
+
+```sh
+pnpm i
+pnpm dev
+```
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
@@ -1,11 +1,11 @@
 import { StrudelMirror } from '@strudel/codemirror';
 import { funk42 } from './tunes';
-import { drawPianoroll, evalScope } from '@strudel/core';
+import { drawPianoroll, evalScope, controls } from '@strudel.cycles/core';
 import './style.css';
-import { initAudioOnFirstClick } from '@strudel/webaudio';
-import { transpiler } from '@strudel/transpiler';
-import { getAudioContext, webaudioOutput, registerSynthSounds } from '@strudel/webaudio';
-import { registerSoundfonts } from '@strudel/soundfonts';
+import { initAudioOnFirstClick } from '@strudel.cycles/webaudio';
+import { transpiler } from '@strudel.cycles/transpiler';
+import { getAudioContext, webaudioOutput, registerSynthSounds } from '@strudel.cycles/webaudio';
+import { registerSoundfonts } from '@strudel.cycles/soundfonts';

 // init canvas
 const canvas = document.getElementById('roll');
@@ -25,10 +25,11 @@ const editor = new StrudelMirror({
  prebake: async () => {
    initAudioOnFirstClick(); // needed to make the browser happy (don't await this here..)
    const loadModules = evalScope(
-      import('@strudel/core'),
-      import('@strudel/mini'),
-      import('@strudel/tonal'),
-      import('@strudel/webaudio'),
+      controls,
+      import('@strudel.cycles/core'),
+      import('@strudel.cycles/mini'),
+      import('@strudel.cycles/tonal'),
+      import('@strudel.cycles/webaudio'),
    );
    await Promise.all([loadModules, registerSynthSounds(), registerSoundfonts()]);
  },
@@ -0,0 +1,23 @@
+{
+  "name": "vite-vanilla-repl-cm6",
+  "private": true,
+  "version": "0.0.0",
+  "type": "module",
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "devDependencies": {
+    "vite": "^4.3.2"
+  },
+  "dependencies": {
+    "@strudel/codemirror": "workspace:*",
+    "@strudel.cycles/core": "workspace:*",
+    "@strudel.cycles/mini": "workspace:*",
+    "@strudel.cycles/soundfonts": "workspace:*",
+    "@strudel.cycles/tonal": "workspace:*",
+    "@strudel.cycles/transpiler": "workspace:*",
+    "@strudel.cycles/webaudio": "workspace:*"
+  }
+}
@@ -1,6 +1,6 @@
 export const bumpStreet = `// froos - "22 bump street", licensed with CC BY-NC-SA 4.0
-samples('github:felixroos/samples')
-samples('https://strudel.cc/tidal-drum-machines.json', 'github:ritchse/tidal-drum-machines/main/machines/')
+await samples('github:felixroos/samples/main')
+await samples('https://strudel.cc/tidal-drum-machines.json', 'github:ritchse/tidal-drum-machines/main/machines/')

 "<[0,<6 7 9>,13,<17 20 22 26>]!2>/2"
  // make it 22 edo
@@ -33,8 +33,8 @@ samples('https://strudel.cc/tidal-drum-machines.json', 'github:ritchse/tidal-dru

 export const trafficFlam = `// froos - "traffic flam", licensed with CC BY-NC-SA 4.0

-samples('github:felixroos/samples')
-samples('https://strudel.cc/tidal-drum-machines.json', 'github:ritchse/tidal-drum-machines/main/machines/')
+await samples('github:felixroos/samples/main')
+await samples('https://strudel.cc/tidal-drum-machines.json', 'github:ritchse/tidal-drum-machines/main/machines/')

 addVoicings('hip', {
  m11: ['2M 3m 4P 7m'],
@@ -69,8 +69,8 @@ export const funk42 = `// froos - how to funk in 42 lines of code
 // adapted from "how to funk in two minutes" by marc rebillet https://www.youtube.com/watch?v=3vBwRfQbXkg
 // thanks to peach for the transcription: https://www.youtube.com/watch?v=8eiPXvIgda4

-samples('github:felixroos/samples')
-samples('https://strudel.cc/tidal-drum-machines.json', 'github:ritchse/tidal-drum-machines/main/machines/')
+await samples('github:felixroos/samples/main')
+await samples('https://strudel.cc/tidal-drum-machines.json', 'github:ritchse/tidal-drum-machines/main/machines/')

 setcps(.5)

@@ -0,0 +1 @@
+!dist
@@ -0,0 +1,8 @@
+# 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
+```
@@ -0,0 +1 @@
+import{b as s,h as i,m,a as n,c as p,p as t}from"./index.4cbc0a10.js";export{s as SyntaxError,i as h,m as mini,n as minify,p as parse,t as patternifyAST};
@@ -0,0 +1 @@
+import{g as s,f as d,i as t,n as r,l as u,j as o,d as f,k as p,r as g,s as i,w as l,e as m}from"./index.4cbc0a10.js";export{s as getAudioContext,d as getCachedBuffer,t as getLoadedBuffer,r as getLoadedSamples,u as loadBuffer,o as loadGithubSamples,f as panic,p as resetLoadedSamples,g as reverseBuffer,i as samples,l as webaudioOutput,m as webaudioOutputTrigger};
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Vite Vanilla Strudel REPL</title>
+    <script type="module" crossorigin src="/tidalcycles/strudel/use-acorn/packages/core/examples/vite-vanilla-repl/dist/assets/index.4cbc0a10.js"></script>
+  </head>
+  <body style="margin: 0; background: #222">
+    <div style="display: grid; height: 100vh">
+      <textarea
+        id="text"
+        style="font-size: 2em; border: 0; color: white; background: transparent; outline: none; padding: 20px"
+        spellcheck="false"
+      ></textarea>
+    </div>
+    <button
+      id="start"
+      style="
+        position: absolute;
+        border-radius: 10px;
+        top: 20px;
+        right: 20px;
+        padding: 20px;
+        border: 2px solid white;
+        background: transparent;
+        color: white;
+        cursor: pointer;
+      "
+    >
+      evaluate
+    </button>
+    <div id="output"></div>
+    
+  </body>
+</html>
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="UTF-8" />
@@ -1,15 +1,20 @@
-import { repl, evalScope } from '@strudel/core';
-import { getAudioContext, webaudioOutput, initAudioOnFirstClick, registerSynthSounds } from '@strudel/webaudio';
-import { transpiler } from '@strudel/transpiler';
+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();
-registerSynthSounds();

-evalScope(import('@strudel/core'), import('@strudel/mini'), import('@strudel/webaudio'), import('@strudel/tonal'));
+evalScope(
+  controls,
+  import('@strudel.cycles/core'),
+  import('@strudel.cycles/mini'),
+  import('@strudel.cycles/webaudio'),
+  import('@strudel.cycles/tonal'),
+);

 const { evaluate } = repl({
  defaultOutput: webaudioOutput,
@@ -10,13 +10,13 @@
    "preview": "vite preview"
  },
  "devDependencies": {
-    "vite": "^5.0.10"
+    "vite": "^4.3.3"
  },
  "dependencies": {
-    "@strudel/core": "workspace:*",
-    "@strudel/mini": "workspace:*",
-    "@strudel/transpiler": "workspace:*",
-    "@strudel/webaudio": "workspace:*",
-    "@strudel/tonal": "workspace:*"
+    "@strudel.cycles/core": "workspace:*",
+    "@strudel.cycles/mini": "workspace:*",
+    "@strudel.cycles/transpiler": "workspace:*",
+    "@strudel.cycles/webaudio": "workspace:*",
+    "@strudel.cycles/tonal": "workspace:*"
  }
 }
@@ -1,5 +1,5 @@
-export default `samples('github:tidalcycles/dirt-samples')
-setcps(1)
+export default `await samples('github:tidalcycles/Dirt-Samples/master')
+
 stack(
  // amen
  n("0 1 2 3 4 5 6 7")
@@ -0,0 +1,12 @@
+/*
+gist.js - <short description TODO>
+Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/gist.js>
+This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+// this is a shortcut to eval code from a gist
+// why? to be able to shorten strudel code + e.g. be able to change instruments after links have been generated
+export default (route, cache = true) =>
+  fetch(`https://gist.githubusercontent.com/${route}?cachebust=${cache ? '' : Date.now()}`)
+    .then((res) => res.text())
+    .then((code) => eval(code));
@@ -3,7 +3,6 @@ hap.mjs - <short description TODO>
 Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/hap.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 Fraction from './fraction.mjs';

 export class Hap {
  /*
@@ -33,16 +32,7 @@ export class Hap {
  }

  get duration() {
-    let duration;
-    if (typeof this.value?.duration === 'number') {
-      duration = Fraction(this.value.duration);
-    } else {
-      duration = this.whole.end.sub(this.whole.begin);
-    }
-    if (typeof this.value?.clip === 'number') {
-      return duration.mul(this.value.clip);
-    }
-    return duration;
+    return this.whole.end.sub(this.whole.begin).mul(typeof this.value?.clip === 'number' ? this.value?.clip : 1);
  }

  get endClipped() {
@@ -4,12 +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 * as controls from './controls.mjs'; // legacy
+import controls from './controls.mjs';
 export * from './euclid.mjs';
 import Fraction from './fraction.mjs';
 import { logger } from './logger.mjs';
 export { Fraction, controls };
-export * from './controls.mjs';
 export * from './hap.mjs';
 export * from './pattern.mjs';
 export * from './signal.mjs';
@@ -28,15 +27,16 @@ export * from './pianoroll.mjs';
 export * from './spiral.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/core loaded 🌀');
+logger('🌀 @strudel.cycles/core loaded 🌀');
 if (globalThis._strudelLoaded) {
  console.warn(
-    `@strudel/core was loaded more than once...
+    `@strudel.cycles/core was loaded more than once...
 This might happen when you have multiple versions of strudel installed. 
-Please check with "npm ls @strudel/core".`,
+Please check with "npm ls @strudel.cycles/core".`,
  );
 }
 globalThis._strudelLoaded = true;
@@ -1,16 +1,6 @@
 export const logKey = 'strudel.log';

-let debounce = 1000,
-  lastMessage,
-  lastTime;
-
 export function logger(message, type, data = {}) {
-  let t = performance.now();
-  if (lastMessage === message && t - lastTime < debounce) {
-    return;
-  }
-  lastMessage = message;
-  lastTime = t;
  console.log(`%c${message}`, 'background-color: black;color:white;border-radius:15px');
  if (typeof document !== 'undefined' && typeof CustomEvent !== 'undefined') {
    document.dispatchEvent(
@@ -1,11 +1,12 @@
 {
-  "name": "@strudel/core",
-  "version": "1.0.1",
+  "name": "@strudel.cycles/core",
+  "version": "0.9.0",
  "description": "Port of Tidal Cycles to JavaScript",
  "main": "index.mjs",
  "type": "module",
  "publishConfig": {
-    "main": "dist/index.mjs"
+    "main": "dist/index.js",
+    "module": "dist/index.mjs"
  },
  "scripts": {
    "test": "vitest run",
@@ -30,11 +31,12 @@
  },
  "homepage": "https://strudel.cc",
  "dependencies": {
-    "fraction.js": "^4.3.7"
+    "fraction.js": "^4.2.0",
+    "nanostores": "^0.8.1"
  },
  "gitHead": "0e26d4e741500f5bae35b023608f062a794905c2",
  "devDependencies": {
-    "vite": "^5.0.10",
-    "vitest": "^1.1.0"
+    "vite": "^4.3.3",
+    "vitest": "^0.33.0"
  }
 }
@@ -26,7 +26,7 @@ export class Pattern {
  /**
   * Create a pattern. As an end user, you will most likely not create a Pattern directly.
   *
-   * @param {function} query - The function that maps a `State` to an array of `Hap`.
+   * @param {function} query - The function that maps a {@link State} to an array of {@link Hap}.
   * @noAutocomplete
   */
  constructor(query) {
@@ -39,7 +39,7 @@ export class Pattern {

  /**
   * Returns a new pattern, with the function applied to the value of
-   * each hap. It has the alias `fmap`.
+   * each hap. It has the alias {@link Pattern#fmap}.
   * @synonyms fmap
   * @param {Function} func to to apply to the value
   * @returns Pattern
@@ -51,7 +51,7 @@ export class Pattern {
  }

  /**
-   * see `withValue`
+   * see {@link Pattern#withValue}
   * @noAutocomplete
   */
  fmap(func) {
@@ -115,7 +115,7 @@ export class Pattern {
  }

  /**
-   * As with `appBoth`, but the `whole` timespan is not the intersection,
+   * As with {@link Pattern#appBoth}, but the `whole` timespan is not the intersection,
   * but the timespan from the function of patterns that this method is called
   * on. In practice, this means that the pattern structure, including onsets,
   * are preserved from the pattern of functions (often referred to as the left
@@ -148,7 +148,7 @@ export class Pattern {
  }

  /**
-   * As with `appLeft`, but `whole` timespans are instead taken from the
+   * As with {@link Pattern#appLeft}, but `whole` timespans are instead taken from the
   * pattern of values, i.e. structure is preserved from the right hand/outer
   * pattern.
   * @param {Pattern} pat_val
@@ -340,9 +340,9 @@ export class Pattern {
   * silence
   * @noAutocomplete
   */
-  queryArc(begin, end, controls = {}) {
+  queryArc(begin, end) {
    try {
-      return this.query(new State(new TimeSpan(begin, end), controls));
+      return this.query(new State(new TimeSpan(begin, end)));
    } catch (err) {
      logger(`[query]: ${err.message}`, 'error');
      return [];
@@ -387,7 +387,7 @@ export class Pattern {
  }

  /**
-   * As with `withQuerySpan`, but the function is applied to both the
+   * As with {@link Pattern#withQuerySpan}, but the function is applied to both the
   * begin and end time of the query timespan.
   * @param {Function} func the function to apply
   * @returns Pattern
@@ -398,7 +398,7 @@ export class Pattern {
  }

  /**
-   * Similar to `withQuerySpan`, but the function is applied to the timespans
+   * Similar to {@link Pattern#withQuerySpan}, but the function is applied to the timespans
   * of all haps returned by pattern queries (both `part` timespans, and where
   * present, `whole` timespans).
   * @param {Function} func
@@ -410,7 +410,7 @@ export class Pattern {
  }

  /**
-   * As with `withHapSpan`, but the function is applied to both the
+   * As with {@link Pattern#withHapSpan}, but the function is applied to both the
   * begin and end time of the hap timespans.
   * @param {Function} func the function to apply
   * @returns Pattern
@@ -427,11 +427,11 @@ export class Pattern {
   * @noAutocomplete
   */
  withHaps(func) {
-    return new Pattern((state) => func(this.query(state), state));
+    return new Pattern((state) => func(this.query(state)));
  }

  /**
-   * As with `withHaps`, but applies the function to every hap, rather than every list of haps.
+   * As with {@link Pattern#withHaps}, but applies the function to every hap, rather than every list of haps.
   * @param {Function} func
   * @returns Pattern
   * @noAutocomplete
@@ -499,7 +499,7 @@ export class Pattern {
  }

  /**
-   * As with `filterHaps`, but the function is applied to values
+   * As with {@link Pattern#filterHaps}, but the function is applied to values
   * inside haps.
   * @param {Function} value_test
   * @returns Pattern
@@ -621,7 +621,7 @@ export class Pattern {
  }

  /**
-   * More human-readable version of the `firstCycleValues` accessor.
+   * More human-readable version of the {@link Pattern#firstCycleValues} accessor.
   * @noAutocomplete
   */
  get showFirstCycle() {
@@ -691,13 +691,13 @@ export class Pattern {
  // Methods without corresponding toplevel functions

  /**
-   * Layers the result of the given function(s). Like `superimpose`, but without the original pattern:
+   * Layers the result of the given function(s). Like {@link Pattern.superimpose}, but without the original pattern:
   * @name layer
   * @memberof Pattern
   * @synonyms apply
   * @returns Pattern
   * @example
-   * "<0 2 4 6 ~ 4 ~ 2 0!3 ~!5>*8"
+   * "<0 2 4 6 ~ 4 ~ 2 0!3 ~!5>*4"
   *   .layer(x=>x.add("0,2"))
   *   .scale('C minor').note()
   */
@@ -711,7 +711,7 @@ export class Pattern {
   * @memberof Pattern
   * @returns Pattern
   * @example
-   * "<0 2 4 6 ~ 4 ~ 2 0!3 ~!5>*8"
+   * "<0 2 4 6 ~ 4 ~ 2 0!3 ~!5>*4"
   *   .superimpose(x=>x.add(2))
   *   .scale('C minor').note()
   */
@@ -727,8 +727,8 @@ export class Pattern {
   * @name stack
   * @memberof Pattern
   * @example
-   * s("hh*4").stack(
-   *   note("c4(5,8)")
+   * s("hh*2").stack(
+   *   note("c2(3,8)")
   * )
   */
  stack(...pats) {
@@ -745,8 +745,8 @@ export class Pattern {
   * @memberof Pattern
   * @synonyms sequence, fastcat
   * @example
-   * s("hh*4").seq(
-   *   note("c4(5,8)")
+   * s("hh*2").seq(
+   *   note("c2(3,8)")
   * )
   */
  seq(...pats) {
@@ -759,8 +759,8 @@ export class Pattern {
   * @memberof Pattern
   * @synonyms slowcat
   * @example
-   * s("hh*4").cat(
-   *   note("c4(5,8)")
+   * s("hh*2").cat(
+   *   note("c2(3,8)")
   * )
   */
  cat(...pats) {
@@ -858,7 +858,7 @@ Pattern.prototype.arpWith = function (func) {
 * Selects indices in in stacked notes.
 * @example
 * note("<[c,eb,g]!2 [c,f,ab] [d,f,ab]>")
- * .arp("0 [0,2] 1 [0,2]")
+ * .arp("0 [0,2] 1 [0,2]").slow(2)
 * */
 Pattern.prototype.arp = function (pat) {
  return this.arpWith((haps) => pat.fmap((i) => haps[i % haps.length]));
@@ -929,14 +929,14 @@ function _composeOp(a, b, func) {
     * @memberof Pattern
     * @example
     * // Here, the triad 0, 2, 4 is shifted by different amounts
-     * n("0 2 4".add("<0 3 4 0>")).scale("C:major")
+     * "0 2 4".add("<0 3 4 0>").scale('C major').note()
     * // Without add, the equivalent would be:
-     * // n("<[0 2 4] [3 5 7] [4 6 8] [0 2 4]>").scale("C:major")
+     * // "<[0 2 4] [3 5 7] [4 6 8] [0 2 4]>".scale('C major').note()
     * @example
     * // You can also use add with notes:
-     * note("c3 e3 g3".add("<0 5 7 0>"))
+     * "c3 e3 g3".add("<0 5 7 0>").note()
     * // Behind the scenes, the notes are converted to midi numbers:
-     * // note("48 52 55".add("<0 5 7 0>"))
+     * // "48 52 55".add("<0 5 7 0>").note()
     */
    add: [numeralArgs((a, b) => a + b)], // support string concatenation
    /**
@@ -945,7 +945,7 @@ function _composeOp(a, b, func) {
     * @name sub
     * @memberof Pattern
     * @example
-     * n("0 2 4".sub("<0 1 2 3>")).scale("C4:minor")
+     * "0 2 4".sub("<0 1 2 3>").scale('C4 minor').note()
     * // See add for more information.
     */
    sub: [numeralArgs((a, b) => a - b)],
@@ -955,7 +955,7 @@ function _composeOp(a, b, func) {
     * @name mul
     * @memberof Pattern
     * @example
-     * "<1 1.5 [1.66, <2 2.33>]>*4".mul(150).freq()
+     * "1 1.5 [1.66, <2 2.33>]".mul(150).freq()
     */
    mul: [numeralArgs((a, b) => a * b)],
    /**
@@ -1049,9 +1049,9 @@ function _composeOp(a, b, func) {
   * Applies the given structure to the pattern:
   *
   * @example
-   * note("c,eb,g")
+   * note("c3,eb3,g3")
   *   .struct("x ~ x ~ ~ x ~ x ~ ~ ~ x ~ x ~ ~")
-   *   .slow(2)
+   *   .slow(4)
   */
  Pattern.prototype.struct = function (...args) {
    return this.keepif.out(...args);
@@ -1063,7 +1063,7 @@ function _composeOp(a, b, func) {
   * Returns silence when mask is 0 or "~"
   *
   * @example
-   * note("c [eb,g] d [eb,g]").mask("<1 [0 1]>")
+   * note("c [eb,g] d [eb,g]").mask("<1 [0 1]>").slow(2)
   */
  Pattern.prototype.mask = function (...args) {
    return this.keepif.in(...args);
@@ -1075,7 +1075,7 @@ function _composeOp(a, b, func) {
   * Resets the pattern to the start of the cycle for each onset of the reset pattern.
   *
   * @example
-   * s("[<bd lt> sd]*2, hh*8").reset("<x@3 x(5,8)>")
+   * s("<bd lt> sd, hh*4").reset("<x@3 x(3,8)>")
   */
  Pattern.prototype.reset = function (...args) {
    return this.keepif.trig(...args);
@@ -1088,7 +1088,7 @@ function _composeOp(a, b, func) {
   * While reset will only reset the current cycle, restart will start from cycle 0.
   *
   * @example
-   * s("[<bd lt> sd]*2, hh*8").restart("<x@3 x(5,8)>")
+   * s("<bd lt> sd, hh*4").restart("<x@3 x(3,8)>")
   */
  Pattern.prototype.restart = function (...args) {
    return this.keepif.trigzero(...args);
@@ -1154,8 +1154,8 @@ export function isPattern(thing) {
  /* if (!thing instanceof Pattern) {
    console.warn(
      `Found Pattern that fails "instanceof Pattern" check.
-      This may happen if you are using multiple versions of @strudel/core.
-      Please check by running "npm ls @strudel/core".`,
+      This may happen if you are using multiple versions of @strudel.cycles/core. 
+      Please check by running "npm ls @strudel.cycles/core".`,
    );
    console.log(thing);
  } */
@@ -1178,8 +1178,7 @@ export function reify(thing) {
 * @return {Pattern}
 * @synonyms polyrhythm, pr
 * @example
- * stack("g3", "b3", ["e4", "d4"]).note()
- * // "g3,b3,[e4,d4]".note()
+ * stack(g3, b3, [e4, d4]).note() // "g3,b3,[e4,d4]".note()
 */
 export function stack(...pats) {
  // Array test here is to avoid infinite recursions..
@@ -1190,11 +1189,11 @@ export function stack(...pats) {

 /** Concatenation: combines a list of patterns, switching between them successively, one per cycle:
 *
- * synonyms: `cat`
+ * synonyms: {@link cat}
 *
 * @return {Pattern}
 * @example
- * slowcat("e5", "b4", ["d5", "c5"])
+ * slowcat(e5, b4, [d5, c5])
 *
 */
 export function slowcat(...pats) {
@@ -1238,19 +1237,17 @@ export function slowcatPrime(...pats) {
 * @synonyms slowcat
 * @return {Pattern}
 * @example
- * cat("e5", "b4", ["d5", "c5"]).note()
- * // "<e5 b4 [d5 c5]>".note()
+ * cat(e5, b4, [d5, c5]).note() // "<e5 b4 [d5 c5]>".note()
 *
 */
 export function cat(...pats) {
  return slowcat(...pats);
 }

-/** Like `seq`, but each step has a length, relative to the whole.
+/** Like {@link Pattern.seq}, but each step has a length, relative to the whole.
 * @return {Pattern}
 * @example
- * timeCat([3,"e3"],[1, "g3"]).note()
- * // "e3@3 g3".note()
+ * timeCat([3,e3],[1, g3]).note() // "e3@3 g3".note()
 */
 export function timeCat(...timepats) {
  const total = timepats.map((a) => a[0]).reduce((a, b) => a.add(b), Fraction(0));
@@ -1270,10 +1267,7 @@ export function timeCat(...timepats) {
 *
 * @return {Pattern}
 * @example
- * arrange(
- *   [4, "<c a f e>(3,8)"],
- *   [2, "<g a>(5,8)"]
- * ).note()
+ * arrange([4, "<c a f e>(3,8)"],[2, "<g a>(5,8)"]).note()
 */
 export function arrange(...sections) {
  const total = sections.reduce((sum, [cycles]) => sum + cycles, 0);
@@ -1285,7 +1279,7 @@ export function fastcat(...pats) {
  return slowcat(...pats)._fast(pats.length);
 }

-/** See `fastcat` */
+/** See {@link fastcat} */
 export function sequence(...pats) {
  return fastcat(...pats);
 }
@@ -1293,8 +1287,7 @@ export function sequence(...pats) {
 /** Like **cat**, but the items are crammed into one cycle.
 * @synonyms fastcat, sequence
 * @example
- * seq("e5", "b4", ["d5", "c5"]).note()
- * // "e5 b4 [d5 c5]".note()
+ * seq(e5, b4, [d5, c5]).note() // "e5 b4 [d5 c5]".note()
 *
 */
 export function seq(...pats) {
@@ -1320,9 +1313,9 @@ function _sequenceCount(x) {
 * @param  {number} steps how many items are placed in one cycle
 * @param  {any[]} sequences one or more arrays of Patterns / values
 * @example
- * polymeterSteps(4, ["c", "d", "e"])
- * .note().stack(s("bd"))
- * // note("{c d e}%4").stack(s("bd"))
+ * polymeterSteps(2, ["c", "d", "e", "f", "g", "f", "e", "d"])
+ * .note().stack(s("bd")) // 1 cycle = 1 bd = 2 notes
+ * // note("{c d e f g f e d}%2").stack(s("bd"))
 */
 export function polymeterSteps(steps, ...args) {
  const seqs = args.map((a) => _sequenceCount(a));
@@ -1470,7 +1463,7 @@ export function register(name, func, patternify = true) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * n("0.5 1.5 2.5".round()).scale("C:major")
+ * "0.5 1.5 2.5".round().scale('C major').note()
 */
 export const round = register('round', function (pat) {
  return pat.asNumber().fmap((v) => Math.round(v));
@@ -1484,7 +1477,7 @@ export const round = register('round', function (pat) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * note("42 42.1 42.5 43".floor())
+ * "42 42.1 42.5 43".floor().note()
 */
 export const floor = register('floor', function (pat) {
  return pat.asNumber().fmap((v) => Math.floor(v));
@@ -1498,7 +1491,7 @@ export const floor = register('floor', function (pat) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * note("42 42.1 42.5 43".ceil())
+ * "42 42.1 42.5 43".ceil().note()
 */
 export const ceil = register('ceil', function (pat) {
  return pat.asNumber().fmap((v) => Math.ceil(v));
@@ -1531,8 +1524,7 @@ export const fromBipolar = register('fromBipolar', function (pat) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * s("[bd sd]*2,hh*8")
- * .cutoff(sine.range(500,4000))
+ * s("bd sd,hh*4").cutoff(sine.range(500,2000).slow(4))
 */
 export const range = register('range', function (min, max, pat) {
  return pat.mul(max - min).add(min);
@@ -1546,8 +1538,7 @@ export const range = register('range', function (min, max, pat) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * s("[bd sd]*2,hh*8")
- * .cutoff(sine.rangex(500,4000))
+ * s("bd sd,hh*4").cutoff(sine.rangex(500,2000).slow(4))
 */
 export const rangex = register('rangex', function (min, max, pat) {
  return pat._range(Math.log(min), Math.log(max)).fmap(Math.exp);
@@ -1560,8 +1551,7 @@ export const rangex = register('rangex', function (min, max, pat) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * s("[bd sd]*2,hh*8")
- * .cutoff(sine2.range2(500,4000))
+ * s("bd sd,hh*4").cutoff(sine2.range2(500,2000).slow(4))
 */
 export const range2 = register('range2', function (min, max, pat) {
  return pat.fromBipolar()._range(min, max);
@@ -1574,8 +1564,7 @@ export const range2 = register('range2', function (min, max, pat) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * ratio("1, 5:4, 3:2").mul(110)
- * .freq().s("piano")
+ * ratio("1, 5:4, 3:2").mul(110).freq().s("piano").slow(2)
 */
 export const ratio = register('ratio', (pat) =>
  pat.fmap((v) => {
@@ -1647,7 +1636,7 @@ export const { fastGap, fastgap } = register(['fastGap', 'fastgap'], function (f
 });

 /**
- * Similar to `compress`, but doesn't leave gaps, and the 'focus' can be bigger than a cycle
+ * Similar to compress, but doesn't leave gaps, and the 'focus' can be bigger than a cycle
 * @example
 * s("bd hh sd hh").focus(1/4, 3/4)
 */
@@ -1678,7 +1667,7 @@ export const ply = register('ply', function (factor, pat) {
 * @param {number | Pattern} factor speed up factor
 * @returns Pattern
 * @example
- * s("bd hh sd hh").fast(2) // s("[bd hh sd hh]*2")
+ * s("<bd sd> hh").fast(2) // s("[<bd sd> hh]*2")
 */
 export const { fast, density } = register(['fast', 'density'], function (factor, pat) {
  if (factor === 0) {
@@ -1707,7 +1696,7 @@ export const hurry = register('hurry', function (r, pat) {
 * @param {number | Pattern} factor slow down factor
 * @returns Pattern
 * @example
- * s("bd hh sd hh").slow(2) // s("[bd hh sd hh]/2")
+ * s("<bd sd> hh").slow(2) // s("[<bd sd> hh]/2")
 */
 export const { slow, sparsity } = register(['slow', 'sparsity'], function (factor, pat) {
  if (factor === 0) {
@@ -1764,7 +1753,7 @@ export const lastOf = register('lastOf', function (n, func, pat) {
 */

 /**
- * An alias for `firstOf`
+ * An alias for {@link firstOf}
 * @name every
 * @memberof Pattern
 * @param {number} n how many cycles
@@ -1796,9 +1785,9 @@ export const apply = register('apply', function (func, pat) {
 * @example
 * s("<bd sd>,hh*2").cpm(90) // = 90 bpm
 */
-// this is redefined in repl.mjs, using the current cps as divisor
+// TODO - global clock
 export const cpm = register('cpm', function (cpm, pat) {
-  return pat._fast(cpm / 60 / 1);
+  return pat._fast(cpm / 60);
 });

 /**
@@ -1871,7 +1860,7 @@ export const linger = register('linger', function (t, pat) {
 * Samples the pattern at a rate of n events per cycle. Useful for turning a continuous pattern into a discrete one.
 * @param {number} segments number of segments per cycle
 * @example
- * note(saw.range(40,52).segment(24))
+ * note(saw.range(0,12).segment(24)).add(40)
 */
 export const segment = register('segment', function (rate, pat) {
  return pat.struct(pure(true)._fast(rate));
@@ -1897,7 +1886,7 @@ export const { invert, inv } = register(['invert', 'inv'], function (pat) {
 * @param {function} func
 * @returns Pattern
 * @example
- * "c3 eb3 g3".when("<0 1>/2", x=>x.sub("5")).note()
+ * "c3 eb3 g3".when("<0 1>/2", x=>x.sub(5)).note()
 */
 export const when = register('when', function (on, func, pat) {
  return on ? func(pat) : pat;
@@ -1934,7 +1923,7 @@ export const brak = register('brak', function (pat) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * note("c d e g").rev()
+ * note("c3 d3 e3 g3").rev()
 */
 export const rev = register('rev', function (pat) {
  const query = function (state) {
@@ -1986,9 +1975,9 @@ export const press = register('press', function (pat) {
 *   s("hh*3")
 * )
 */
-Pattern.prototype.hush = function () {
+export const hush = register('hush', function (pat) {
  return silence;
-};
+});

 /**
 * Applies `rev` to a pattern every other cycle, so that the pattern alternates between forwards and backwards.
@@ -1996,7 +1985,7 @@ Pattern.prototype.hush = function () {
 * note("c d e g").palindrome()
 */
 export const palindrome = register('palindrome', function (pat) {
-  return pat.lastOf(2, rev);
+  return pat.every(2, rev);
 });

 /**
@@ -2004,7 +1993,7 @@ export const palindrome = register('palindrome', function (pat) {
 * @name juxBy
 * @synonyms juxby
 * @example
- * s("bd lt [~ ht] mt cp ~ bd hh").juxBy("<0 .5 1>/2", rev)
+ * s("lt ht mt ht hh").juxBy("<0 .5 1>/2", rev)
 */
 export const { juxBy, juxby } = register(['juxBy', 'juxby'], function (by, func, pat) {
  by /= 2;
@@ -2023,11 +2012,7 @@ export const { juxBy, juxby } = register(['juxBy', 'juxby'], function (by, func,
 /**
 * The jux function creates strange stereo effects, by applying a function to a pattern, but only in the right-hand channel.
 * @example
- * s("bd lt [~ ht] mt cp ~ bd hh").jux(rev)
- * @example
- * s("bd lt [~ ht] mt cp ~ bd hh").jux(press)
- * @example
- * s("bd lt [~ ht] mt cp ~ bd hh").jux(iter(4))
+ * s("lt ht mt ht hh").jux(rev)
 */
 export const jux = register('jux', function (func, pat) {
  return pat._juxBy(1, func, pat);
@@ -2043,7 +2028,7 @@ export const jux = register('jux', function (func, pat) {
 * @example
 * "<0 [2 4]>"
 * .echoWith(4, 1/8, (p,n) => p.add(n*2))
- * .scale("C:minor").note()
+ * .scale('C minor').note().clip(.2)
 */
 export const { echoWith, echowith, stutWith, stutwith } = register(
  ['echoWith', 'echowith', 'stutWith', 'stutwith'],
@@ -2136,8 +2121,7 @@ const { repeatCycles } = register('repeatCycles', _repeatCycles);
 * @memberof Pattern
 * @returns Pattern
 * @example
- * "0 1 2 3".chunk(4, x=>x.add(7))
- * .scale("A:minor").note()
+ * "0 1 2 3".chunk(4, x=>x.add(7)).scale('A minor').note()
 */
 const _chunk = function (n, func, pat, back = false, fast = false) {
  const binary = Array(n - 1).fill(false);
@@ -2162,8 +2146,7 @@ const { chunk, slowchunk, slowChunk } = register(['chunk', 'slowchunk', 'slowChu
 * @memberof Pattern
 * @returns Pattern
 * @example
- * "0 1 2 3".chunkBack(4, x=>x.add(7))
- * .scale("A:minor").note()
+ * "0 1 2 3".chunkBack(4, x=>x.add(7)).scale('A minor').note()
 */
 export const { chunkBack, chunkback } = register(['chunkBack', 'chunkback'], function (n, func, pat) {
  return _chunk(n, func, pat, true);
@@ -2177,11 +2160,10 @@ export const { chunkBack, chunkback } = register(['chunkBack', 'chunkback'], fun
 * @memberof Pattern
 * @returns Pattern
 * @example
- * "<0 8> 1 2 3 4 5 6 7"
- * .fastChunk(4, x => x.color('red')).slow(2)
- * .scale("C2:major").note()
+ * "<0 8> 1 2 3 4 5 6 7".fastChunk(4, x => x.color('red')).slow(4).scale("C2:major").note()
+  .s("folkharp")
 */
-export const { fastchunk, fastChunk } = register(['fastchunk', 'fastChunk'], function (n, func, pat) {
+const { fastchunk, fastChunk } = register(['fastchunk', 'fastChunk'], function (n, func, pat) {
  return _chunk(n, func, pat, false, true);
 });

@@ -2196,19 +2178,15 @@ export const bypass = register('bypass', function (on, pat) {
 * @param {number} offset start point of loop in cycles
 * @param {number} cycles loop length in cycles
 * @example
- * note("<c d e f>").ribbon(1, 2).fast(2)
- * @example
 * // Looping a portion of randomness
 * note(irand(8).segment(4).scale('C3 minor')).ribbon(1337, 2)
 */
 export const ribbon = register('ribbon', (offset, cycles, pat) => pat.early(offset).restart(pure(1).slow(cycles)));

-export const hsla = register('hsla', (h, s, l, a, pat) => {
-  return pat.color(`hsla(${h}turn,${s * 100}%,${l * 100}%,${a})`);
-});
-
-export const hsl = register('hsl', (h, s, l, pat) => {
-  return pat.color(`hsl(${h}turn,${s * 100}%,${l * 100}%)`);
+// sets absolute duration of haps
+// TODO - fix
+export const duration = register('duration', function (value, pat) {
+  return pat.withHapSpan((span) => new TimeSpan(span.begin, span.begin.add(value)));
 });

 /**
@@ -2235,6 +2213,21 @@ export const velocity = register('velocity', function (velocity, pat) {
  return pat.withContext((context) => ({ ...context, velocity: (context.velocity || 1) * velocity }));
 });

+/**
+ *
+ * Multiplies the hap duration with the given factor.
+ * With samples, `clip` might be a better function to use ([more info](https://github.com/tidalcycles/strudel/pull/598))
+ * @name legato
+ * @memberof Pattern
+ * @example
+ * note("c3 eb3 g3 c4").legato("<.25 .5 1 2>")
+ */
+// TODO - fix
+export const legato = register('legato', function (value, pat) {
+  value = Fraction(value);
+  return pat.withHapSpan((span) => new TimeSpan(span.begin, span.begin.add(span.end.sub(span.begin).mul(value))));
+});
+
 //////////////////////////////////////////////////////////////////////
 // Control-related functions, i.e. ones that manipulate patterns of
 // objects
@@ -2250,7 +2243,7 @@ export const velocity = register('velocity', function (velocity, pat) {
 * s("rhodes")
 *  .chop(4)
 *  .rev() // reverse order of chops
- *  .loopAt(2) // fit sample into 2 cycles
+ *  .loopAt(4) // fit sample into 4 cycles
 *
 */
 export const chop = register('chop', function (n, pat) {
@@ -2268,7 +2261,7 @@ export const chop = register('chop', function (n, pat) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * s("numbers:0 numbers:1 numbers:2").striate(6).slow(3)
+ * s("numbers:0 numbers:1 numbers:2").striate(6).slow(6)
 */
 export const striate = register('striate', function (n, pat) {
  const slices = Array.from({ length: n }, (x, i) => i);
@@ -2284,10 +2277,10 @@ export const striate = register('striate', function (n, pat) {
 * @returns Pattern
 * @example
 * samples({ rhodes: 'https://cdn.freesound.org/previews/132/132051_316502-lq.mp3' })
- * s("rhodes").loopAt(2)
+ * s("rhodes").loopAt(4)
 */
 // TODO - global cps clock
-const _loopAt = function (factor, pat, cps = 0.5) {
+const _loopAt = function (factor, pat, cps = 1) {
  return pat
    .speed((1 / factor) * cps)
    .unit('c')
@@ -2301,11 +2294,11 @@ const _loopAt = function (factor, pat, cps = 0.5) {
 * @memberof Pattern
 * @returns Pattern
 * @example
- * samples('github:tidalcycles/dirt-samples')
- * s("breaks165").slice(8, "0 1 <2 2*2> 3 [4 0] 5 6 7".every(3, rev)).slow(0.75)
+ * await samples('github:tidalcycles/Dirt-Samples/master')
+ * s("breaks165").slice(8, "0 1 <2 2*2> 3 [4 0] 5 6 7".every(3, rev)).slow(1.5)
 * @example
- * samples('github:tidalcycles/dirt-samples')
- * s("breaks125").fit().slice([0,.25,.5,.75], "0 1 1 <2 3>")
+ * await samples('github:tidalcycles/Dirt-Samples/master')
+ * s("breaks125/2").fit().slice([0,.25,.5,.75], "0 1 1 <2 3>")
 */

 export const slice = register(
@@ -2330,54 +2323,53 @@ export const slice = register(
 * Works the same as slice, but changes the playback speed of each slice to match the duration of its step.
 * @name splice
 * @example
- * samples('github:tidalcycles/dirt-samples')
+ * await samples('github:tidalcycles/Dirt-Samples/master')
 * s("breaks165")
 * .splice(8,  "0 1 [2 3 0]@2 3 0@2 7")
+ * .hurry(0.65)
 */

 export const splice = register(
  'splice',
  function (npat, ipat, opat) {
    const sliced = slice(npat, ipat, opat);
-    return new Pattern((state) => {
-      // TODO - default cps to 0.5
-      const cps = state.controls._cps || 1;
-      const haps = sliced.query(state);
-      return haps.map((hap) =>
-        hap.withValue((v) => ({
-          ...{
-            speed: (cps / v._slices / hap.whole.duration) * (v.speed || 1),
-            unit: 'c',
-          },
-          ...v,
-        })),
-      );
+    return sliced.withHap(function (hap) {
+      return hap.withValue((v) => ({
+        ...{
+          speed: (1 / v._slices / hap.whole.duration) * (v.speed || 1),
+          unit: 'c',
+        },
+        ...v,
+      }));
    });
  },
  false, // turns off auto-patternification
 );

+// this function will be redefined in repl.mjs to use the correct cps value.
+// It is still here to work in cases where repl.mjs is not used
+
 export const { loopAt, loopat } = register(['loopAt', 'loopat'], function (factor, pat) {
-  return new Pattern((state) => _loopAt(factor, pat, state.controls._cps).query(state));
+  return _loopAt(factor, pat, 1);
 });

+// the fit function will be redefined in repl.mjs to use the correct cps value.
+// It is still here to work in cases where repl.mjs is not used
 /**
 * Makes the sample fit its event duration. Good for rhythmical loops like drum breaks.
- * Similar to `loopAt`.
+ * Similar to loopAt.
 * @name fit
 * @example
 * samples({ rhodes: 'https://cdn.freesound.org/previews/132/132051_316502-lq.mp3' })
- * s("rhodes/2").fit()
+ * s("rhodes/4").fit()
 */
 export const fit = register('fit', (pat) =>
-  pat.withHaps((haps, state) =>
-    haps.map((hap) =>
-      hap.withValue((v) => ({
-        ...v,
-        speed: (state.controls._cps || 1) / hap.whole.duration,
-        unit: 'c',
-      })),
-    ),
+  pat.withHap((hap) =>
+    hap.withValue((v) => ({
+      ...v,
+      speed: 1 / hap.whole.duration,
+      unit: 'c',
+    })),
  ),
 );

@@ -120,6 +120,7 @@ export function pianoroll({
  hideInactive = 0,
  colorizeInactive = 1,
  fontFamily,
+  clear = true,
  ctx,
 } = {}) {
  const w = ctx.canvas.width;
@@ -160,17 +161,12 @@ export function pianoroll({
    maxMidi = max;
    valueExtent = maxMidi - minMidi + 1;
  }
-  foldValues = values.sort((a, b) =>
-    typeof a === 'number' && typeof b === 'number'
-      ? a - b
-      : typeof a === 'number'
-        ? 1
-        : String(a).localeCompare(String(b)),
-  );
+  // foldValues = values.sort((a, b) => a - b);
+  foldValues = values.sort((a, b) => String(a).localeCompare(String(b)));
  barThickness = fold ? valueAxis / foldValues.length : valueAxis / valueExtent;
  ctx.fillStyle = background;
  ctx.globalAlpha = 1; // reset!
-  if (!smear) {
+  if (clear && !smear) {
    ctx.clearRect(0, 0, w, h);
    ctx.fillRect(0, 0, w, h);
  }
@@ -261,21 +257,12 @@ export function getDrawOptions(drawTime, options = {}) {
  return { fold: 1, ...options, cycles, playhead };
 }

-export const getPunchcardPainter =
-  (options = {}) =>
-  (ctx, time, haps, drawTime, paintOptions = {}) =>
-    pianoroll({ ctx, time, haps, ...getDrawOptions(drawTime, { ...paintOptions, ...options }) });
-
 Pattern.prototype.punchcard = function (options) {
-  return this.onPaint(getPunchcardPainter(options));
+  return this.onPaint((ctx, time, haps, drawTime, paintOptions = {}) =>
+    pianoroll({ ctx, time, haps, ...getDrawOptions(drawTime, { ...paintOptions, ...options }) }),
+  );
 };

-/**
- * Displays a vertical pianoroll with event labels.
- * Supports all the same options as pianoroll.
- *
- * @name wordfall
- */
 Pattern.prototype.wordfall = function (options) {
  return this.punchcard({ vertical: 1, labels: 1, stroke: 0, fillActive: 1, active: 'white', ...options });
 };
@@ -3,7 +3,23 @@ import { evaluate as _evaluate } from './evaluate.mjs';
 import { logger } from './logger.mjs';
 import { setTime } from './time.mjs';
 import { evalScope } from './evaluate.mjs';
-import { register, Pattern, isPattern, silence, stack } from './pattern.mjs';
+import { register } from './pattern.mjs';
+import { atom, computed } from 'nanostores';
+
+export const $replstate = atom({
+  schedulerError: undefined,
+  evalError: undefined,
+  code: '// LOADING',
+  activeCode: '// LOADING',
+  pattern: undefined,
+  miniLocations: [],
+  widgets: [],
+  pending: true,
+  started: false,
+});
+export const $repldirty = computed($replstate, (s) => s.code !== s.activeCode);
+
+export const setReplState = (key, value) => $replstate.set({ ...$replstate.get(), [key]: value });

 export function repl({
  interval,
@@ -16,146 +32,94 @@ export function repl({
  transpiler,
  onToggle,
  editPattern,
-  onUpdateState,
 }) {
-  const state = {
-    schedulerError: undefined,
-    evalError: undefined,
-    code: '// LOADING',
-    activeCode: '// LOADING',
-    pattern: undefined,
-    miniLocations: [],
-    widgets: [],
-    pending: false,
-    started: false,
-  };
-
-  const updateState = (update) => {
-    Object.assign(state, update);
-    state.isDirty = state.code !== state.activeCode;
-    state.error = state.evalError || state.schedulerError;
-    onUpdateState?.(state);
-  };
-
  const scheduler = new Cyclist({
    interval,
    onTrigger: getTrigger({ defaultOutput, getTime }),
    onError: onSchedulerError,
    getTime,
    onToggle: (started) => {
-      updateState({ started });
+      setReplState('started', started);
      onToggle?.(started);
    },
  });
-  let pPatterns = {};
-  let allTransform;
-
-  const hush = function () {
-    pPatterns = {};
-    allTransform = undefined;
-    return silence;
-  };
-
+  let playPatterns = [];
  const setPattern = (pattern, autostart = true) => {
    pattern = editPattern?.(pattern) || pattern;
    scheduler.setPattern(pattern, autostart);
  };
  setTime(() => scheduler.now()); // TODO: refactor?
-
+  const evaluate = async (code, autostart = true) => {
+    if (!code) {
+      throw new Error('no code to evaluate');
+    }
+    try {
+      setReplState('code', code);
+      setReplState('pending', true);
+      await beforeEval?.({ code });
+      playPatterns = [];
+      let { pattern, meta } = await _evaluate(code, transpiler);
+      if (playPatterns.length) {
+        pattern = pattern.stack(...playPatterns);
+      }
+      logger(`[eval] code updated`);
+      setPattern(pattern, autostart);
+      setReplState('miniLocations', meta?.miniLocations || []);
+      setReplState('widgets', meta?.widgets || []);
+      setReplState('activeCode', code);
+      setReplState('pattern', pattern);
+      setReplState('evalError', undefined);
+      setReplState('schedulerError', undefined);
+      setReplState('pending', false);
+      afterEval?.({ code, pattern, meta });
+      return pattern;
+    } catch (err) {
+      // console.warn(`[repl] eval error: ${err.message}`);
+      logger(`[eval] error: ${err.message}`, 'error');
+      setReplState('evalError', err);
+      setReplState('pending', false);
+      onEvalError?.(err);
+    }
+  };
  const stop = () => scheduler.stop();
  const start = () => scheduler.start();
  const pause = () => scheduler.pause();
  const toggle = () => scheduler.toggle();
  const setCps = (cps) => scheduler.setCps(cps);
  const setCpm = (cpm) => scheduler.setCps(cpm / 60);
-  const all = function (transform) {
-    allTransform = transform;
-    return silence;
-  };

-  // set pattern methods that use this repl via closure
-  const injectPatternMethods = () => {
-    Pattern.prototype.p = function (id) {
-      pPatterns[id] = this;
-      return this;
-    };
-    Pattern.prototype.q = function (id) {
-      return silence;
-    };
-    try {
-      for (let i = 1; i < 10; ++i) {
-        Object.defineProperty(Pattern.prototype, `d${i}`, {
-          get() {
-            return this.p(i);
-          },
-          configurable: true,
-        });
-        Object.defineProperty(Pattern.prototype, `p${i}`, {
-          get() {
-            return this.p(i);
-          },
-          configurable: true,
-        });
-        Pattern.prototype[`q${i}`] = silence;
-      }
-    } catch (err) {
-      console.warn('injectPatternMethods: error:', err);
-    }
-    const cpm = register('cpm', function (cpm, pat) {
-      return pat._fast(cpm / 60 / scheduler.cps);
-    });
-    evalScope({
-      all,
-      hush,
-      cpm,
-      setCps,
-      setcps: setCps,
-      setCpm,
-      setcpm: setCpm,
-    });
-  };
+  // the following functions use the cps value, which is why they are defined here..
+  const loopAt = register('loopAt', (cycles, pat) => {
+    return pat.loopAtCps(cycles, scheduler.cps);
+  });

-  const evaluate = async (code, autostart = true, shouldHush = true) => {
-    if (!code) {
-      throw new Error('no code to evaluate');
-    }
-    try {
-      updateState({ code, pending: true });
-      injectPatternMethods();
-      await beforeEval?.({ code });
-      shouldHush && hush();
-      let { pattern, meta } = await _evaluate(code, transpiler);
-      if (Object.keys(pPatterns).length) {
-        pattern = stack(...Object.values(pPatterns));
-      }
-      if (allTransform) {
-        pattern = allTransform(pattern);
-      }
-      if (!isPattern(pattern)) {
-        const message = `got "${typeof evaluated}" instead of pattern`;
-        throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
-      }
-      logger(`[eval] code updated`);
-      setPattern(pattern, autostart);
-      updateState({
-        miniLocations: meta?.miniLocations || [],
-        widgets: meta?.widgets || [],
-        activeCode: code,
-        pattern,
-        evalError: undefined,
-        schedulerError: undefined,
-        pending: false,
-      });
-      afterEval?.({ code, pattern, meta });
-      return pattern;
-    } catch (err) {
-      logger(`[eval] error: ${err.message}`, 'error');
-      updateState({ evalError: err, pending: false });
-      onEvalError?.(err);
-    }
-  };
-  const setCode = (code) => updateState({ code });
-  return { scheduler, evaluate, start, stop, pause, setCps, setPattern, setCode, toggle, state };
+  const play = register('play', (pat) => {
+    playPatterns.push(pat);
+    return pat;
+  });
+
+  const fit = register('fit', (pat) =>
+    pat.withHap((hap) =>
+      hap.withValue((v) => ({
+        ...v,
+        speed: scheduler.cps / hap.whole.duration, // overwrite speed completely?
+        unit: 'c',
+      })),
+    ),
+  );
+
+  evalScope({
+    loopAt,
+    fit,
+    play,
+    setCps,
+    setcps: setCps,
+    setCpm,
+    setcpm: setCpm,
+  });
+
+  const setCode = (c) => setReplState('code', c);
+  return { scheduler, evaluate, start, stop, pause, setCps, setPattern, setCode, toggle };
 }

 export const getTrigger =
@@ -7,7 +7,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 Fraction from './fraction.mjs';
-import { id, _mod, clamp, objectMap } from './util.mjs';
+import { id, _mod, clamp } from './util.mjs';

 export function steady(value) {
  // A continuous value
@@ -27,11 +27,9 @@ export const isaw2 = isaw.toBipolar();
 *
 * @return {Pattern}
 * @example
- * note("<c3 [eb3,g3] g2 [g3,bb3]>*8")
- * .clip(saw.slow(2))
+ * "c3 [eb3,g3] g2 [g3,bb3]".note().clip(saw.slow(4))
 * @example
- * n(saw.range(0,8).segment(8))
- * .scale('C major')
+ * saw.range(0,8).segment(8).scale('C major').slow(4).note()
 *
 */
 export const saw = signal((t) => t % 1);
@@ -44,8 +42,7 @@ export const sine2 = signal((t) => Math.sin(Math.PI * 2 * t));
 *
 * @return {Pattern}
 * @example
- * n(sine.segment(16).range(0,15))
- * .scale("C:minor")
+ * sine.segment(16).range(0,15).slow(2).scale('C minor').note()
 *
 */
 export const sine = sine2.fromBipolar();
@@ -55,8 +52,7 @@ export const sine = sine2.fromBipolar();
 *
 * @return {Pattern}
 * @example
- * n(stack(sine,cosine).segment(16).range(0,15))
- * .scale("C:minor")
+ * stack(sine,cosine).segment(16).range(0,15).slow(2).scale('C minor').note()
 *
 */
 export const cosine = sine._early(Fraction(1).div(4));
@@ -67,7 +63,7 @@ export const cosine2 = sine2._early(Fraction(1).div(4));
 *
 * @return {Pattern}
 * @example
- * n(square.segment(4).range(0,7)).scale("C:minor")
+ * square.segment(2).range(0,7).scale('C minor').note()
 *
 */
 export const square = signal((t) => Math.floor((t * 2) % 2));
@@ -78,7 +74,7 @@ export const square2 = square.toBipolar();
 *
 * @return {Pattern}
 * @example
- * n(tri.segment(8).range(0,7)).scale("C:minor")
+ * tri.segment(8).range(0,7).scale('C minor').note()
 *
 */
 export const tri = fastcat(isaw, saw);
@@ -105,7 +101,6 @@ const timeToRand = (x) => Math.abs(intSeedToRand(timeToIntSeed(x)));

 const timeToRandsPrime = (seed, n) => {
  const result = [];
-  // eslint-disable-next-line
  for (let i = 0; i < n; ++n) {
    result.push(intSeedToRand(seed));
    seed = xorwise(seed);
@@ -122,8 +117,8 @@ const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);
 /**
 * A discrete pattern of numbers from 0 to n-1
 * @example
- * n(run(4)).scale("C4:pentatonic")
- * // n("0 1 2 3").scale("C4:pentatonic")
+ * 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);

@@ -133,7 +128,7 @@ export const run = (n) => saw.range(0, n).floor().segment(n);
 * @name rand
 * @example
 * // randomly change the cutoff
- * s("bd*4,hh*8").cutoff(rand.range(500,8000))
+ * s("bd sd,hh*4").cutoff(rand.range(500,2000))
 *
 */
 export const rand = signal(timeToRand);
@@ -155,188 +150,36 @@ export const _irand = (i) => rand.fmap((x) => Math.trunc(x * i));
 * @param {number} n max value (exclusive)
 * @example
 * // randomly select scale notes from 0 - 7 (= C to C)
- * n(irand(8)).struct("x x*2 x x*3").scale("C:minor")
+ * irand(8).struct("x(3,8)").scale('C minor').note()
 *
 */
 export const irand = (ipat) => reify(ipat).fmap(_irand).innerJoin();

-const _pick = function (lookup, pat, modulo = true) {
-  const array = Array.isArray(lookup);
-  const len = Object.keys(lookup).length;
+/**
+ * pick from the list of values (or patterns of values) via the index using the given
+ * pattern of integers
+ * @param {Pattern} pat
+ * @param {*} xs
+ * @returns {Pattern}
+ * @example
+ * note(pick("<0 1 [2!2] 3>", ["g a", "e f", "f g f g" , "g a c d"]))
+ */

-  lookup = objectMap(lookup, reify);
-
-  if (len === 0) {
+export const pick = (pat, xs) => {
+  xs = xs.map(reify);
+  if (xs.length == 0) {
    return silence;
  }
-  return pat.fmap((i) => {
-    let key = i;
-    if (array) {
-      key = modulo ? Math.round(key) % len : clamp(Math.round(key), 0, lookup.length - 1);
-    }
-    return lookup[key];
-  });
+  return pat
+    .fmap((i) => {
+      const key = clamp(Math.round(i), 0, xs.length - 1);
+      return xs[key];
+    })
+    .innerJoin();
 };

-/** * Picks patterns (or plain values) either from a list (by index) or a lookup table (by name).
- * Similar to `inhabit`, but maintains the structure of the original patterns.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- * @example
- * note("<0 1 2!2 3>".pick(["g a", "e f", "f g f g" , "g c d"]))
- * @example
- * sound("<0 1 [2,0]>".pick(["bd sd", "cp cp", "hh hh"]))
- * @example
- * sound("<0!2 [0,1] 1>".pick(["bd(3,8)", "sd sd"]))
- * @example
- * s("<a!2 [a,b] b>".pick({a: "bd(3,8)", b: "sd sd"}))
- */
-
-export const pick = function (lookup, pat) {
-  // backward compatibility - the args used to be flipped
-  if (Array.isArray(pat)) {
-    [pat, lookup] = [lookup, pat];
-  }
-  return __pick(lookup, pat);
-};
-
-const __pick = register('pick', function (lookup, pat) {
-  return _pick(lookup, pat, false).innerJoin();
-});
-
-/** * The same as `pick`, but if you pick a number greater than the size of the list,
- * it wraps around, rather than sticking at the maximum value.
- * For example, if you pick the fifth pattern of a list of three, you'll get the
- * second one.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-
-export const pickmod = register('pickmod', function (lookup, pat) {
-  return _pick(lookup, pat, true).innerJoin();
-});
-
-/** * pickF lets you use a pattern of numbers to pick which function to apply to another pattern.
- * @param {Pattern} pat
- * @param {Pattern} lookup a pattern of indices
- * @param {function[]} funcs the array of functions from which to pull
- * @returns {Pattern}
- * @example
- * s("bd [rim hh]").pickF("<0 1 2>", [rev,jux(rev),fast(2)])
- * @example
- * note("<c2 d2>(3,8)").s("square")
- *     .pickF("<0 2> 1", [jux(rev),fast(2),x=>x.lpf(800)])
- */
-export const pickF = register('pickF', function (lookup, funcs, pat) {
-  return pat.apply(pick(lookup, funcs));
-});
-
-/** * The same as `pickF`, but if you pick a number greater than the size of the functions list,
- * it wraps around, rather than sticking at the maximum value.
- * @param {Pattern} pat
- * @param {Pattern} lookup a pattern of indices
- * @param {function[]} funcs the array of functions from which to pull
- * @returns {Pattern}
- */
-export const pickmodF = register('pickmodF', function (lookup, funcs, pat) {
-  return pat.apply(pickmod(lookup, funcs));
-});
-
-/** * Similar to `pick`, but it applies an outerJoin instead of an innerJoin.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const pickOut = register('pickOut', function (lookup, pat) {
-  return _pick(lookup, pat, false).outerJoin();
-});
-
-/** * The same as `pickOut`, but if you pick a number greater than the size of the list,
- * it wraps around, rather than sticking at the maximum value.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const pickmodOut = register('pickmodOut', function (lookup, pat) {
-  return _pick(lookup, pat, true).outerJoin();
-});
-
-/** * Similar to `pick`, but the choosen pattern is restarted when its index is triggered.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const pickRestart = register('pickRestart', function (lookup, pat) {
-  return _pick(lookup, pat, false).trigzeroJoin();
-});
-
-/** * The same as `pickRestart`, but if you pick a number greater than the size of the list,
- * it wraps around, rather than sticking at the maximum value.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const pickmodRestart = register('pickmodRestart', function (lookup, pat) {
-  return _pick(lookup, pat, true).trigzeroJoin();
-});
-
-/** * Similar to `pick`, but the choosen pattern is reset when its index is triggered.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const pickReset = register('pickReset', function (lookup, pat) {
-  return _pick(lookup, pat, false).trigJoin();
-});
-
-/** * The same as `pickReset`, but if you pick a number greater than the size of the list,
- * it wraps around, rather than sticking at the maximum value.
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-export const pickmodReset = register('pickmodReset', function (lookup, pat) {
-  return _pick(lookup, pat, true).trigJoin();
-});
-
 /**
-/** * Picks patterns (or plain values) either from a list (by index) or a lookup table (by name).
- * Similar to `pick`, but cycles are squeezed into the target ('inhabited') pattern.
- * @name inhabit
- * @synonyms pickSqueeze
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- * @example
- * "<a b [a,b]>".inhabit({a: s("bd(3,8)"),
-                          b: s("cp sd")
-                         })
- * @example
- * s("a@2 [a b] a".inhabit({a: "bd(3,8)", b: "sd sd"})).slow(4)
- */
-export const { inhabit, pickSqueeze } = register(['inhabit', 'pickSqueeze'], function (lookup, pat) {
-  return _pick(lookup, pat, false).squeezeJoin();
-});
-
-/** * The same as `inhabit`, but if you pick a number greater than the size of the list,
- * it wraps around, rather than sticking at the maximum value.
- * For example, if you pick the fifth pattern of a list of three, you'll get the
- * second one.
- * @name inhabitmod
- * @synonyms pickmodSqueeze
- * @param {Pattern} pat
- * @param {*} xs
- * @returns {Pattern}
- */
-
-export const { inhabitmod, pickmodSqueeze } = register(['inhabitmod', 'pickmodSqueeze'], function (lookup, pat) {
-  return _pick(lookup, pat, true).squeezeJoin();
-});
-
-/**
- * Pick from the list of values (or patterns of values) via the index using the given
+ * pick from the list of values (or patterns of values) via the index using the given
 * pattern of integers. The selected pattern will be compressed to fit the duration of the selecting event
 * @param {Pattern} pat
 * @param {*} xs
@@ -425,9 +268,9 @@ Pattern.prototype.choose2 = function (...xs) {
 * Picks one of the elements at random each cycle.
 * @returns {Pattern}
 * @example
- * chooseCycles("bd", "hh", "sd").s().fast(8)
+ * chooseCycles("bd", "hh", "sd").s().fast(4)
 * @example
- * s("bd | hh | sd").fast(8)
+ * "bd | hh | sd".s().fast(4)
 */
 export const chooseCycles = (...xs) => chooseInWith(rand.segment(1), xs);

@@ -470,7 +313,7 @@ export const perlinWith = (pat) => {
 * @name perlin
 * @example
 * // randomly change the cutoff
- * s("bd*4,hh*8").cutoff(perlin.range(500,8000))
+ * s("bd sd,hh*4").cutoff(perlin.range(500,2000))
 *
 */
 export const perlin = perlinWith(time.fmap((v) => Number(v)));
@@ -512,7 +355,7 @@ export const degradeBy = register('degradeBy', function (x, pat) {
 export const degrade = register('degrade', (pat) => pat._degradeBy(0.5));

 /**
- * Inverse of `degradeBy`: Randomly removes events from the pattern by a given amount.
+ * 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).
@@ -536,7 +379,7 @@ export const undegrade = register('undegrade', (pat) => pat._undegradeBy(0.5));
 /**
 *
 * Randomly applies the given function by the given probability.
- * Similar to `someCyclesBy`
+ * Similar to {@link Pattern#someCyclesBy}
 *
 * @name sometimesBy
 * @memberof Pattern
@@ -544,7 +387,7 @@ export const undegrade = register('undegrade', (pat) => pat._undegradeBy(0.5));
 * @param {function} function - the transformation to apply
 * @returns Pattern
 * @example
- * s("hh*8").sometimesBy(.4, x=>x.speed("0.5"))
+ * s("hh(3,8)").sometimesBy(.4, x=>x.speed("0.5"))
 */

 export const sometimesBy = register('sometimesBy', function (patx, func, pat) {
@@ -562,7 +405,7 @@ export const sometimesBy = register('sometimesBy', function (patx, func, pat) {
 * @param {function} function - the transformation to apply
 * @returns Pattern
 * @example
- * s("hh*8").sometimes(x=>x.speed("0.5"))
+ * s("hh*4").sometimes(x=>x.speed("0.5"))
 */
 export const sometimes = register('sometimes', function (func, pat) {
  return pat._sometimesBy(0.5, func);
@@ -571,7 +414,7 @@ export const sometimes = register('sometimes', function (func, pat) {
 /**
 *
 * Randomly applies the given function by the given probability on a cycle by cycle basis.
- * Similar to `sometimesBy`
+ * Similar to {@link Pattern#sometimesBy}
 *
 * @name someCyclesBy
 * @memberof Pattern
@@ -579,7 +422,7 @@ export const sometimes = register('sometimes', function (func, pat) {
 * @param {function} function - the transformation to apply
 * @returns Pattern
 * @example
- * s("bd,hh*8").someCyclesBy(.3, x=>x.speed("0.5"))
+ * s("hh(3,8)").someCyclesBy(.3, x=>x.speed("0.5"))
 */

 export const someCyclesBy = register('someCyclesBy', function (patx, func, pat) {
@@ -601,7 +444,7 @@ export const someCyclesBy = register('someCyclesBy', function (patx, func, pat)
 * @memberof Pattern
 * @returns Pattern
 * @example
- * s("bd,hh*8").someCycles(x=>x.speed("0.5"))
+ * s("hh(3,8)").someCycles(x=>x.speed("0.5"))
 */
 export const someCycles = register('someCycles', function (func, pat) {
  return pat._someCyclesBy(0.5, func);
@@ -67,9 +67,9 @@ Pattern.prototype.spiral = function (options = {}) {
    // logSpiral = true,
  } = options;

-  function spiral({ ctx, time, haps, drawTime }) {
+  function spiral({ ctx, time, haps, drawTime, clear }) {
    const [w, h] = [ctx.canvas.width, ctx.canvas.height];
-    ctx.clearRect(0, 0, w * 2, h * 2);
+    clear && ctx.clearRect(0, 0, w * 2, h * 2);
    const [cx, cy] = [w / 2, h / 2];
    const settings = {
      margin: size / stretch,
@@ -114,5 +114,5 @@ Pattern.prototype.spiral = function (options = {}) {
    });
  }

-  return this.onPaint((ctx, time, haps, drawTime) => spiral({ ctx, time, haps, drawTime }));
+  return this.onPaint((ctx, time, haps, drawTime, options) => spiral({ ctx, time, haps, drawTime, ...options }));
 };
@@ -4,23 +4,23 @@ Copyright (C) 2023 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 { s } from '../controls.mjs';
+import controls from '../controls.mjs';
 import { mini } from '../../mini/mini.mjs';
 import { describe, it, expect } from 'vitest';

 describe('controls', () => {
  it('should support controls', () => {
-    expect(s('bd').firstCycleValues).toEqual([{ s: 'bd' }]);
+    expect(controls.s('bd').firstCycleValues).toEqual([{ s: 'bd' }]);
  });
  it('should support compound controls', () => {
-    expect(s(mini('bd:3')).firstCycleValues).toEqual([{ s: 'bd', n: 3 }]);
-    expect(s(mini('bd:3 sd:4:1.4')).firstCycleValues).toEqual([
+    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(s(mini('bd:3:0.4 sd:4:0.5:3:17')).firstCycleValues).toEqual([
+    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 },
    ]);
@@ -20,7 +20,6 @@ import {
  slowcat,
  cat,
  sequence,
-  palindrome,
  polymeter,
  polymeterSteps,
  polyrhythm,
@@ -46,13 +45,13 @@ import {
  rev,
  time,
  run,
-  pick,
 } from '../index.mjs';

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

-import { n, s } from '../controls.mjs';
+import controls from '../controls.mjs';

+const { n, s } = controls;
 const st = (begin, end) => new State(ts(begin, end));
 const ts = (begin, end) => new TimeSpan(Fraction(begin), Fraction(end));
 const hap = (whole, part, value, context = {}) => new Hap(whole, part, value, context);
@@ -183,17 +182,13 @@ describe('Pattern', () => {
    });
    it('can Trig() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
-          .add.trig(20, 30)
-          .early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trig(20, 30).early(2),
        sequence(26, 27, 36, 37),
      );
    });
    it('can Trigzero() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
-          .add.trigzero(20, 30)
-          .early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trigzero(20, 30).early(2),
        sequence(21, 22, 31, 32),
      );
    });
@@ -235,17 +230,13 @@ describe('Pattern', () => {
    });
    it('can Trig() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
-          .keep.trig(20, 30)
-          .early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trig(20, 30).early(2),
        sequence(6, 7, 6, 7),
      );
    });
    it('can Trigzero() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
-          .keep.trigzero(20, 30)
-          .early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trigzero(20, 30).early(2),
        sequence(1, 2, 1, 2),
      );
    });
@@ -281,17 +272,13 @@ describe('Pattern', () => {
    });
    it('can Trig() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
-          .keepif.trig(false, true)
-          .early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trig(false, true).early(2),
        sequence(silence, silence, 6, 7),
      );
    });
    it('can Trigzero() structure', () => {
      sameFirst(
-        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
-          .keepif.trigzero(false, true)
-          .early(2),
+        slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trigzero(false, true).early(2),
        sequence(silence, silence, 1, 2),
      );
    });
@@ -584,18 +571,6 @@ describe('Pattern', () => {
      expect(sequence(1, 2, 3).firstCycle()).toStrictEqual(fastcat(1, 2, 3).firstCycle());
    });
  });
-  describe('palindrome()', () => {
-    it('Can create palindrome', () => {
-      expect(
-        fastcat('a', 'b', 'c')
-          .palindrome()
-          .fast(2)
-          .firstCycle()
-          .sort((a, b) => a.part.begin.sub(b.part.begin))
-          .map((a) => a.value),
-      ).toStrictEqual(['a', 'b', 'c', 'c', 'b', 'a']);
-    });
-  });
  describe('polyrhythm()', () => {
    it('Can layer up cycles', () => {
      expect(polyrhythm(['a', 'b'], ['c']).firstCycle()).toStrictEqual(
@@ -663,11 +638,7 @@ describe('Pattern', () => {
  });
  describe('struct()', () => {
    it('Can restructure a discrete pattern', () => {
-      expect(
-        sequence('a', 'b')
-          .struct(sequence(true, true, true))
-          .firstCycle(),
-      ).toStrictEqual([
+      expect(sequence('a', 'b').struct(sequence(true, true, true)).firstCycle()).toStrictEqual([
        hap(ts(0, third), ts(0, third), 'a'),
        hap(ts(third, twothirds), ts(third, 0.5), 'a'),
        hap(ts(third, twothirds), ts(0.5, twothirds), 'b'),
@@ -698,11 +669,7 @@ describe('Pattern', () => {
  });
  describe('mask()', () => {
    it('Can fragment a pattern', () => {
-      expect(
-        sequence('a', 'b')
-          .mask(sequence(true, true, true))
-          .firstCycle(),
-      ).toStrictEqual([
+      expect(sequence('a', 'b').mask(sequence(true, true, true)).firstCycle()).toStrictEqual([
        hap(ts(0, 0.5), ts(0, third), 'a'),
        hap(ts(0, 0.5), ts(third, 0.5), 'a'),
        hap(ts(0.5, 1), ts(0.5, twothirds), 'b'),
@@ -971,11 +938,9 @@ describe('Pattern', () => {
      expect(stack(pure('a').mask(1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(1);
    });
    it('Doesnt merge two overlapping haps', () => {
-      expect(
-        stack(pure('a').mask(1, 1, 0), pure('a').mask(0, 1))
-          .defragmentHaps()
-          .firstCycle().length,
-      ).toStrictEqual(2);
+      expect(stack(pure('a').mask(1, 1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(
+        2,
+      );
    });
    it('Doesnt merge two touching haps with different values', () => {
      expect(stack(pure('a').mask(1, 0), pure('b').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(2);
@@ -1057,63 +1022,4 @@ describe('Pattern', () => {
      expect(slowcat(0, 1).repeatCycles(2).fast(6).firstCycleValues).toStrictEqual([0, 0, 1, 1, 0, 0]);
    });
  });
-  describe('inhabit', () => {
-    it('Can pattern named patterns', () => {
-      expect(
-        sameFirst(
-          sequence('a', 'b', stack('a', 'b')).inhabit({ a: sequence(1, 2), b: sequence(10, 20, 30) }),
-          sequence([1, 2], [10, 20, 30], stack([1, 2], [10, 20, 30])),
-        ),
-      );
-    });
-    it('Can pattern indexed patterns', () => {
-      expect(
-        sameFirst(
-          sequence('0', '1', stack('0', '1')).inhabit([sequence(1, 2), sequence(10, 20, 30)]),
-          sequence([1, 2], [10, 20, 30], stack([1, 2], [10, 20, 30])),
-        ),
-      );
-    });
-  });
-  describe('pick', () => {
-    it('Can pattern named patterns', () => {
-      expect(
-        sameFirst(
-          sequence('a', 'b', 'a', stack('a', 'b')).pick({ a: sequence(1, 2, 3, 4), b: sequence(10, 20, 30, 40) }),
-          sequence(1, 20, 3, stack(4, 40)),
-        ),
-      );
-    });
-    it('Can pattern indexed patterns', () => {
-      expect(
-        sameFirst(
-          sequence(0, 1, 0, stack(0, 1)).pick([sequence(1, 2, 3, 4), sequence(10, 20, 30, 40)]),
-          sequence(1, 20, 3, stack(4, 40)),
-        ),
-      );
-    });
-    it('Clamps indexes', () => {
-      expect(
-        sameFirst(sequence(0, 1, 2, 3).pick([sequence(1, 2, 3, 4), sequence(10, 20, 30, 40)]), sequence(1, 20, 30, 40)),
-      );
-    });
-    it('Is backwards compatible', () => {
-      expect(
-        sameFirst(
-          pick([sequence('a', 'b'), sequence('c', 'd')], sequence(0, 1)),
-          pick(sequence(0, 1), [sequence('a', 'b'), sequence('c', 'd')]),
-        ),
-      );
-    });
-  });
-  describe('pickmod', () => {
-    it('Wraps indexes', () => {
-      expect(
-        sameFirst(
-          sequence(0, 1, 2, 3).pickmod([sequence(1, 2, 3, 4), sequence(10, 20, 30, 40)]),
-          sequence(1, 20, 3, 40),
-        ),
-      );
-    });
-  });
 });
@@ -6,7 +6,8 @@ This program is free software: you can redistribute it and/or modify it under th

 import { describe, it, expect } from 'vitest';
 import { map, valued, mul } from '../value.mjs';
-import { n } from '../controls.mjs';
+import controls from '../controls.mjs';
+const { n } = controls;

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

-import { logger } from './logger.mjs';
-
 // 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][#bsf]*[0-9]?$/.test(name);
@@ -86,18 +84,6 @@ export const midi2note = (n) => {
 // modulo that works with negative numbers e.g. _mod(-1, 3) = 2. Works on numbers (rather than patterns of numbers, as @mod@ from pattern.mjs does)
 export const _mod = (n, m) => ((n % m) + m) % m;

-export function nanFallback(value, fallback = 0) {
-  if (isNaN(Number(value))) {
-    logger(`"${value}" is not a number, falling back to ${fallback}`, 'warning');
-    return fallback;
-  }
-  return value;
-}
-// round to nearest int, negative numbers will output a subtracted index
-export const getSoundIndex = (n, numSounds) => {
-  return _mod(Math.round(nanFallback(n ?? 0, 0)), numSounds);
-};
-
 export const getPlayableNoteValue = (hap) => {
  let { value, context } = hap;
  let note = value;
@@ -276,50 +262,15 @@ export const sol2note = (n, notation = 'letters') => {
    notation === 'solfeggio'
      ? solfeggio /*check if its is any of the following*/
      : notation === 'indian'
-        ? indian
-        : notation === 'german'
-          ? german
-          : notation === 'byzantine'
-            ? byzantine
-            : notation === 'japanese'
-              ? japanese
-              : english; /*if not use standard version*/
+      ? indian
+      : notation === 'german'
+      ? german
+      : notation === 'byzantine'
+      ? byzantine
+      : notation === 'japanese'
+      ? japanese
+      : english; /*if not use standard version*/
  const note = pc[n % 12]; /*calculating the midi value to the note*/
  const oct = Math.floor(n / 12) - 1;
  return note + oct;
 };
-
-// code hashing helpers
-
-export function unicodeToBase64(text) {
-  const utf8Bytes = new TextEncoder().encode(text);
-  const base64String = btoa(String.fromCharCode(...utf8Bytes));
-  return base64String;
-}
-
-export function base64ToUnicode(base64String) {
-  const utf8Bytes = new Uint8Array(
-    atob(base64String)
-      .split('')
-      .map((char) => char.charCodeAt(0)),
-  );
-  const decodedText = new TextDecoder().decode(utf8Bytes);
-  return decodedText;
-}
-
-export function code2hash(code) {
-  return encodeURIComponent(unicodeToBase64(code));
-  //return '#' + encodeURIComponent(btoa(code));
-}
-
-export function hash2code(hash) {
-  return base64ToUnicode(decodeURIComponent(hash));
-  //return atob(decodeURIComponent(codeParam || ''));
-}
-
-export function objectMap(obj, fn) {
-  if (Array.isArray(obj)) {
-    return obj.map(fn);
-  }
-  return Object.fromEntries(Object.entries(obj).map(([k, v], i) => [k, fn(v, k, i)]));
-}
@@ -8,8 +8,8 @@ export default defineConfig({
  build: {
    lib: {
      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es'],
-      fileName: (ext) => ({ es: 'index.mjs' })[ext],
+      formats: ['es', 'cjs'],
+      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
    },
    rollupOptions: {
      external: [...Object.keys(dependencies)],
@@ -1 +0,0 @@
-# @strudel/csound
@@ -1,5 +1,5 @@
-import { getFrequency, logger, register } from '@strudel/core';
-import { getAudioContext } from '@strudel/webaudio';
+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';
@@ -1,11 +1,11 @@
 {
-  "name": "@strudel/csound",
-  "version": "1.0.1",
+  "name": "@strudel.cycles/csound",
+  "version": "0.9.0",
  "description": "csound bindings for strudel",
  "main": "index.mjs",
-  "type": "module",
  "publishConfig": {
-    "main": "dist/index.mjs"
+    "main": "dist/index.js",
+    "module": "dist/index.mjs"
  },
  "scripts": {
    "build": "vite build",
@@ -33,10 +33,10 @@
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
    "@csound/browser": "6.18.7",
-    "@strudel/core": "workspace:*",
-    "@strudel/webaudio": "workspace:*"
+    "@strudel.cycles/core": "workspace:*",
+    "@strudel.cycles/webaudio": "workspace:*"
  },
  "devDependencies": {
-    "vite": "^5.0.10"
+    "vite": "^4.3.3"
  }
 }
@@ -8,8 +8,8 @@ export default defineConfig({
  build: {
    lib: {
      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es'],
-      fileName: (ext) => ({ es: 'index.mjs' })[ext],
+      formats: ['es', 'cjs'],
+      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
    },
    rollupOptions: {
      external: [...Object.keys(dependencies)],
@@ -1,16 +1,16 @@
 import { Invoke } from './utils.mjs';
-import { Pattern, noteToMidi } from '@strudel/core';
+import { Pattern, noteToMidi } from '@strudel.cycles/core';

 const ON_MESSAGE = 0x90;
 const OFF_MESSAGE = 0x80;
 const CC_MESSAGE = 0xb0;

 Pattern.prototype.midi = function (output) {
-  return this.onTrigger((time, hap, currentTime, cps) => {
+  return this.onTrigger((time, hap, currentTime) => {
    const { note, nrpnn, nrpv, ccn, ccv } = hap.value;
    const offset = (time - currentTime) * 1000;
    const velocity = Math.floor((hap.context?.velocity ?? 0.9) * 100); // TODO: refactor velocity
-    const duration = Math.floor((hap.duration.valueOf() / cps) * 1000 - 10);
+    const duration = Math.floor(hap.duration.valueOf() * 1000 - 10);
    const roundedOffset = Math.round(offset);
    const midichan = (hap.value.midichan ?? 1) - 1;
    const requestedport = output ?? 'IAC';
@@ -1,4 +1,4 @@
-import { parseNumeral, Pattern } from '@strudel/core';
+import { parseNumeral, Pattern } from '@strudel.cycles/core';
 import { Invoke } from './utils.mjs';

 Pattern.prototype.osc = function () {
@@ -22,8 +22,8 @@
      "url": "https://github.com/tidalcycles/strudel/issues"
    },
    "dependencies": {
-        "@strudel/core": "workspace:*",
-        "@tauri-apps/api": "^1.5.3"
+        "@strudel.cycles/core": "workspace:*",
+        "@tauri-apps/api": "^1.4.0"
      },
    "homepage": "https://github.com/tidalcycles/strudel#readme"
  }
@@ -1,13 +1,13 @@
-# @strudel/embed
+# @strudel.cycles/embed

 This package contains a embeddable web component for the Strudel REPL.

 ## Usage

-Either install with `npm i @strudel/embed` or just use a cdn to import the script:
+Either install with `npm i @strudel.cycles/embed` or just use a cdn to import the script:

 ```html
-<script src="https://unpkg.com/@strudel/embed@latest"></script>
+<script src="https://unpkg.com/@strudel.cycles/embed@latest"></script>
 <strudel-repl>
  <!--
 note(`[[e5 [b4 c5] d5 [c5 b4]]
@@ -1,4 +1,4 @@
-<script src="https://unpkg.com/@strudel/embed@0.11.0"></script>
+<script src="https://unpkg.com/@strudel.cycles/embed@latest"></script>
 <!-- <script src="./embed.js"></script> -->
 <strudel-repl>
  <!--
@@ -1,6 +1,6 @@
 {
-  "name": "@strudel/embed",
-  "version": "1.0.0",
+  "name": "@strudel.cycles/embed",
+  "version": "0.2.0",
  "description": "Embeddable Web Component to load a Strudel REPL into an iframe",
  "main": "embed.js",
  "type": "module",
@@ -12,12 +12,6 @@ await initHydra();

 Then you can use hydra below!

-### options
-
-You can also pass options to the `initHydra` function. These can be used to set [hydra options](https://github.com/hydra-synth/hydra-synth#api) + these strudel specific options:
-
- `feedStrudel`: sends the strudel canvas to `s0`. The strudel canvas is used to draw `pianoroll`, `spiral`, `scope` etc..
-
 ## Usage via npm

 ```sh
@@ -27,7 +21,7 @@ npm i @strudel/hydra
 Then add the import to your evalScope:

 ```js
-import { evalScope } from '@strudel/core';
+import { evalScope } from '@strudel.cycles/core';

 evalScope(
  import('@strudel/hydra')
@@ -1,39 +1,14 @@
-import { getDrawContext } from '@strudel/core';
+import { getDrawContext } from '@strudel.cycles/core';

-let latestOptions;
-
-function appendCanvas(c) {
-  const { canvas: testCanvas } = getDrawContext();
-  c.canvas.id = 'hydra-canvas';
-  c.canvas.style.position = 'fixed';
-  c.canvas.style.top = '0px';
-  testCanvas.after(c.canvas);
-  return testCanvas;
-}
-
-export async function initHydra(options = {}) {
-  // reset if options have changed since last init
-  if (latestOptions && JSON.stringify(latestOptions) !== JSON.stringify(options)) {
-    document.getElementById('hydra-canvas').remove();
-  }
-  latestOptions = options;
-  //load and init hydra
+export async function initHydra() {
  if (!document.getElementById('hydra-canvas')) {
-    console.log('reinit..');
-    const {
-      src = 'https://unpkg.com/hydra-synth',
-      feedStrudel = false,
-      ...hydraConfig
-    } = { detectAudio: false, ...options };
-
-    await import(/* @vite-ignore */ src);
-    const hydra = new Hydra(hydraConfig);
-    if (feedStrudel) {
-      const { canvas } = getDrawContext();
-      canvas.style.display = 'none';
-      hydra.synth.s0.init({ src: canvas });
-    }
-    appendCanvas(hydra);
+    const { canvas: testCanvas } = getDrawContext();
+    await import('https://unpkg.com/hydra-synth');
+    const hydraCanvas = testCanvas.cloneNode(true);
+    hydraCanvas.id = 'hydra-canvas';
+    testCanvas.after(hydraCanvas);
+    new Hydra({ canvas: hydraCanvas, detectAudio: false });
+    s0.init({ src: testCanvas });
  }
 }

@@ -1,11 +1,11 @@
 {
  "name": "@strudel/hydra",
-  "version": "1.0.1",
+  "version": "0.9.0",
  "description": "Hydra integration for strudel",
  "main": "hydra.mjs",
-  "type": "module",
  "publishConfig": {
-    "main": "dist/index.mjs"
+    "main": "dist/index.js",
+    "module": "dist/index.mjs"
  },
  "scripts": {
    "server": "node server.js",
@@ -33,11 +33,11 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel/core": "workspace:*",
+    "@strudel.cycles/core": "workspace:*",
    "hydra-synth": "^1.3.29"
  },
  "devDependencies": {
    "pkg": "^5.8.1",
-    "vite": "^5.0.10"
+    "vite": "^4.3.3"
  }
 }
@@ -8,8 +8,8 @@ export default defineConfig({
  build: {
    lib: {
      entry: resolve(__dirname, 'hydra.mjs'),
-      formats: ['es'],
-      fileName: (ext) => ({ es: 'index.mjs' })[ext],
+      formats: ['es', 'cjs'],
+      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
    },
    rollupOptions: {
      external: [...Object.keys(dependencies)],
@@ -1,9 +1,9 @@
-# @strudel/midi
+# @strudel.cycles/midi

 This package adds midi functionality to strudel Patterns.

 ## Install

 ```sh
-npm i @strudel/midi --save
+npm i @strudel.cycles/midi --save
 ```
@@ -5,8 +5,8 @@ This program is free software: you can redistribute it and/or modify it under th
 */

 import * as _WebMidi from 'webmidi';
-import { Pattern, isPattern, logger, ref } from '@strudel/core';
-import { noteToMidi } from '@strudel/core';
+import { Pattern, isPattern, logger, ref } from '@strudel.cycles/core';
+import { noteToMidi } from '@strudel.cycles/core';
 import { Note } from 'webmidi';
 // if you use WebMidi from outside of this package, make sure to import that instance:
 export const { WebMidi } = _WebMidi;
@@ -129,7 +129,7 @@ Pattern.prototype.midi = function (output) {
    const velocity = hap.context?.velocity ?? 0.9; // TODO: refactor velocity

    // note off messages will often a few ms arrive late, try to prevent glitching by subtracting from the duration length
-    const duration = Math.floor((hap.duration.valueOf() / cps) * 1000 - 10);
+    const duration = Math.floor(hap.duration.valueOf() * 1000 - 10);
    if (note != null) {
      const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
      const midiNote = new Note(midiNumber, { attack: velocity, duration });
@@ -167,16 +167,10 @@ let listeners = {};
 const refs = {};

 export async function midin(input) {
-  if (isPattern(input)) {
-    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'
-      }')`,
-    );
-  }
  const initial = await enableWebMidi(); // only returns on first init
  const device = getDevice(input, WebMidi.inputs);
-  if (initial || WebMidi.enabled) {
+
+  if (initial) {
    const otherInputs = WebMidi.inputs.filter((o) => o.name !== device.name);
    logger(
      `Midi enabled! Using "${device.name}". ${
@@ -1,11 +1,11 @@
 {
-  "name": "@strudel/midi",
-  "version": "1.0.1",
+  "name": "@strudel.cycles/midi",
+  "version": "0.9.0",
  "description": "Midi API for strudel",
  "main": "index.mjs",
-  "type": "module",
  "publishConfig": {
-    "main": "dist/index.mjs"
+    "main": "dist/index.js",
+    "module": "dist/index.mjs"
  },
  "scripts": {
    "build": "vite build",
@@ -29,11 +29,11 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "@strudel/core": "workspace:*",
-    "@strudel/webaudio": "workspace:*",
-    "webmidi": "^3.1.8"
+    "@strudel.cycles/core": "workspace:*",
+    "@strudel.cycles/webaudio": "workspace:*",
+    "webmidi": "^3.1.5"
  },
  "devDependencies": {
-    "vite": "^5.0.10"
+    "vite": "^4.3.3"
  }
 }
@@ -8,8 +8,8 @@ export default defineConfig({
  build: {
    lib: {
      entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es'],
-      fileName: (ext) => ({ es: 'index.mjs' })[ext],
+      formats: ['es', 'cjs'],
+      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' }[ext]),
    },
    rollupOptions: {
      external: [...Object.keys(dependencies)],
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Felix Roos	6d6114beb6	Merge branch 'main' into global-repl	2023-11-15 17:46:03 +01:00
Felix Roos	82380a0f4e	make sliders really work	2023-11-03 14:08:13 +01:00
Felix Roos	c030f456c3	widget support	2023-11-03 13:50:18 +01:00
Felix Roos	694e44dc8a	better init + don't draw first frame by default	2023-11-03 12:07:19 +01:00
Felix Roos	351da196b9	StrudelMirror onPaint support	2023-11-03 11:46:32 +01:00
Felix Roos	e27ee03517	format	2023-11-03 11:11:23 +01:00
Felix Roos	19db419c53	handle shuffle	2023-11-03 11:10:53 +01:00
Felix Roos	ff60a89668	fix: autocomplete + add missing basic extensions	2023-11-03 10:47:05 +01:00
Felix Roos	7cc17fefcb	fix: undo redo key mapping + fix hidden line number style	2023-11-03 10:20:07 +01:00
Felix Roos	76ee9485f4	format	2023-11-03 10:05:37 +01:00
Felix Roos	1d65f09f3c	- enable most settings: - keybindings - line numbers - line wrapping - highlighting (new) - flashing (new) - autocomplete not working yet - move themes to codemirror package (currently duplicated) - generally simplify settings handling	2023-11-03 10:04:58 +01:00
Felix Roos	cc97f6395d	better keymap	2023-11-02 23:15:41 +01:00
Felix Roos	33eef619e4	no destructuring	2023-11-02 22:49:52 +01:00
Felix Roos	e9e3b97621	format	2023-11-02 22:45:52 +01:00
Felix Roos	1f765e54ca	Repl: use codemirror custom keys + use new prebake	2023-11-02 22:45:32 +01:00
Felix Roos	2b81cc5d0c	comment out (probably) dead end	2023-11-02 22:37:42 +01:00
Felix Roos	ca054dbd74	restore to old state	2023-11-02 22:37:31 +01:00
Felix Roos	a8433f61a4	add missing dep	2023-11-02 22:36:03 +01:00
Felix Roos	5850106eef	restore react hooks	2023-11-02 22:33:16 +01:00
Felix Roos	95a9ab6182	revert Repl.jsx	2023-11-02 22:29:27 +01:00
Felix Roos	ba19c4ddce	duplicate new lighter repl	2023-11-02 22:28:46 +01:00
Felix Roos	b49b1c98ae	make play and update buttons work	2023-11-02 17:14:59 +01:00
Felix Roos	7c00aa1a36	intermediate /vanilla repl + react is now only used for ui around editor! + ui still not fully functional	2023-11-02 16:31:45 +01:00
Felix Roos	07d6bb3c44	- encapsulate repl state from react - might still be buggy! - smarter way to flush sounds	2023-11-02 14:37:50 +01:00
Felix Roos	3f2e2554be	add back missing shortcuts	2023-11-02 11:29:36 +01:00
Felix Roos	9ebb7edde9	remove old export	2023-11-02 11:29:27 +01:00
Felix Roos	a89091cbc7	bind custom keyboard shortcuts via codemirror + add reevaluate and panic shortcuts	2023-11-02 11:24:23 +01:00
Felix Roos	0d1a99deb2	also pull in audio init to prebake	2023-11-02 10:37:38 +01:00
Felix Roos	b71f8a33d7	refactor: pull module loading into prebake	2023-11-02 10:21:39 +01:00
				`@@ -0,0 +1 @@`
				`import{b as s,h as i,m,a as n,c as p,p as t}from"./index.4cbc0a10.js";export{s as SyntaxError,i as h,m as mini,n as minify,p as parse,t as patternifyAST};`
				`@@ -0,0 +1 @@`
				`import{g as s,f as d,i as t,n as r,l as u,j as o,d as f,k as p,r as g,s as i,w as l,e as m}from"./index.4cbc0a10.js";export{s as getAudioContext,d as getCachedBuffer,t as getLoadedBuffer,r as getLoadedSamples,u as loadBuffer,o as loadGithubSamples,f as panic,p as resetLoadedSamples,g as reverseBuffer,i as samples,l as webaudioOutput,m as webaudioOutputTrigger};`