Merge branch 'tidalcycles:main' into worklet_improvements

packages/codemirror/codemirror.mjs

@@ -2,7 +2,7 @@ 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 } from '@codemirror/language';
+import { defaultHighlightStyle, syntaxHighlighting, bracketMatching } from '@codemirror/language';
 import { Compartment, EditorState, Prec } from '@codemirror/state';
 import {
   EditorView,
@@ -24,6 +24,7 @@ import { persistentAtom } from '@nanostores/persistent';
 
 const extensions = {
   isLineWrappingEnabled: (on) => (on ? EditorView.lineWrapping : []),
+  isBracketMatchingEnabled: (on) => (on ? bracketMatching({ brackets: '()[]{}<>' }) : []),
   isLineNumbersDisplayed: (on) => (on ? lineNumbers() : []),
   theme,
   isAutoCompletionEnabled,
@@ -37,6 +38,7 @@ const compartments = Object.fromEntries(Object.keys(extensions).map((key) => [ke
 
 export const defaultSettings = {
   keybindings: 'codemirror',
+  isBracketMatchingEnabled: false,
   isLineNumbersDisplayed: true,
   isActiveLineHighlighted: false,
   isAutoCompletionEnabled: false,
@@ -290,6 +292,9 @@ export class StrudelMirror {
   setLineWrappingEnabled(enabled) {
     this.reconfigureExtension('isLineWrappingEnabled', enabled);
   }
+  setBracketMatchingEnabled(enabled) {
+    this.reconfigureExtension('isBracketMatchingEnabled', enabled);
+  }
   setLineNumbersDisplayed(enabled) {
     this.reconfigureExtension('isLineNumbersDisplayed', enabled);
   }

packages/codemirror/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@strudel/codemirror",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Codemirror Extensions for Strudel",
   "main": "index.mjs",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "build": "vite build",

packages/codemirror/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/core/animate.mjs

@@ -1,6 +1,4 @@
-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;
+import { Pattern, getDrawContext, silence, register, pure, createParams } from './index.mjs';
 
 let clearColor = '#22222210';
 

packages/core/index.mjs

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

packages/core/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@strudel/core",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Port of Tidal Cycles to JavaScript",
   "main": "index.mjs",
   "type": "module",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "test": "vitest run",

packages/core/pattern.mjs

@@ -2322,10 +2322,10 @@ const _loopAt = function (factor, pat, cps = 0.5) {
  * @memberof Pattern
  * @returns Pattern
  * @example
- * await samples('github:tidalcycles/Dirt-Samples/master')
+ * 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)
  * @example
- * await samples('github:tidalcycles/Dirt-Samples/master')
+ * samples('github:tidalcycles/dirt-samples')
  * s("breaks125").fit().slice([0,.25,.5,.75], "0 1 1 <2 3>")
  */
 
@@ -2351,7 +2351,7 @@ 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
- * await samples('github:tidalcycles/Dirt-Samples/master')
+ * samples('github:tidalcycles/dirt-samples')
  * s("breaks165")
  * .splice(8,  "0 1 [2 3 0]@2 3 0@2 7")
  */

packages/core/test/controls.test.mjs

@@ -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 controls from '../controls.mjs';
+import { s } from '../controls.mjs';
 import { mini } from '../../mini/mini.mjs';
 import { describe, it, expect } from 'vitest';
 
 describe('controls', () => {
   it('should support controls', () => {
-    expect(controls.s('bd').firstCycleValues).toEqual([{ s: 'bd' }]);
+    expect(s('bd').firstCycleValues).toEqual([{ s: 'bd' }]);
   });
   it('should support compound controls', () => {
-    expect(controls.s(mini('bd:3')).firstCycleValues).toEqual([{ s: 'bd', n: 3 }]);
-    expect(controls.s(mini('bd:3 sd:4:1.4')).firstCycleValues).toEqual([
+    expect(s(mini('bd:3')).firstCycleValues).toEqual([{ s: 'bd', n: 3 }]);
+    expect(s(mini('bd:3 sd:4:1.4')).firstCycleValues).toEqual([
       { s: 'bd', n: 3 },
       { s: 'sd', n: 4, gain: 1.4 },
     ]);
   });
   it('should support ignore extra elements in compound controls', () => {
-    expect(controls.s(mini('bd:3:0.4 sd:4:0.5:3:17')).firstCycleValues).toEqual([
+    expect(s(mini('bd:3:0.4 sd:4:0.5:3:17')).firstCycleValues).toEqual([
       { s: 'bd', n: 3, gain: 0.4 },
       { s: 'sd', n: 4, gain: 0.5 },
     ]);

packages/core/test/pattern.test.mjs

@@ -51,9 +51,8 @@ import {
 
 import { steady } from '../signal.mjs';
 
-import controls from '../controls.mjs';
+import { n, s } 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);

packages/core/test/value.test.mjs

@@ -6,8 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
 
 import { describe, it, expect } from 'vitest';
 import { map, valued, mul } from '../value.mjs';
-import controls from '../controls.mjs';
-const { n } = controls;
+import { n } from '../controls.mjs';
 
 describe('Value', () => {
   it('unionWith', () => {

packages/core/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/csound/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@strudel/csound",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "csound bindings for strudel",
   "main": "index.mjs",
+  "type": "module",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "build": "vite build",

packages/csound/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/desktopbridge/midibridge.mjs

@@ -6,11 +6,11 @@ const OFF_MESSAGE = 0x80;
 const CC_MESSAGE = 0xb0;
 
 Pattern.prototype.midi = function (output) {
-  return this.onTrigger((time, hap, currentTime) => {
+  return this.onTrigger((time, hap, currentTime, cps) => {
     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() * 1000 - 10);
+    const duration = Math.floor((hap.duration.valueOf() / cps) * 1000 - 10);
     const roundedOffset = Math.round(offset);
     const midichan = (hap.value.midichan ?? 1) - 1;
     const requestedport = output ?? 'IAC';

packages/hydra/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@strudel/hydra",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Hydra integration for strudel",
   "main": "hydra.mjs",
+  "type": "module",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "server": "node server.js",

packages/hydra/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'hydra.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/midi/midi.mjs

@@ -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() * 1000 - 10);
+    const duration = Math.floor((hap.duration.valueOf() / cps) * 1000 - 10);
     if (note != null) {
       const midiNumber = typeof note === 'number' ? note : noteToMidi(note);
       const midiNote = new Note(midiNumber, { attack: velocity, duration });
@@ -167,10 +167,16 @@ 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) {
+  if (initial || WebMidi.enabled) {
     const otherInputs = WebMidi.inputs.filter((o) => o.name !== device.name);
     logger(
       `Midi enabled! Using "${device.name}". ${

packages/midi/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@strudel/midi",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Midi API for strudel",
   "main": "index.mjs",
+  "type": "module",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "build": "vite build",

packages/midi/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/mini/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@strudel/mini",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Mini notation for strudel",
   "main": "index.mjs",
   "type": "module",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "test": "vitest run",

packages/mini/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/osc/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@strudel/osc",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "OSC messaging for strudel",
   "main": "osc.mjs",
+  "type": "module",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "server": "node server.js",

packages/osc/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'osc.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/repl/README.md

@@ -1,3 +1,5 @@
 # @strudel/repl
 
 The Strudel REPL as a web component.
+
+[Usage example](https://github.com/tidalcycles/strudel/blob/main/examples/buildless/web-component-no-iframe.html)

packages/repl/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@strudel/repl",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "Strudel REPL as a Web Component",
-  "main": "index.mjs",
+  "module": "index.mjs",
   "publishConfig": {
     "main": "dist/index.js",
     "module": "dist/index.mjs"

packages/repl/prebake.mjs

@@ -1,4 +1,4 @@
-import { controls, noteToMidi, valueToMidi, Pattern, evalScope } from '@strudel/core';
+import { noteToMidi, valueToMidi, Pattern, evalScope } from '@strudel/core';
 import { registerSynthSounds, registerZZFXSounds, samples } from '@strudel/webaudio';
 import * as core from '@strudel/core';
 
@@ -17,7 +17,6 @@ export async function prebake() {
     // import('@strudel/serial'),
     // import('@strudel/csound'),
     // import('@strudel/osc'),
-    controls, // sadly, this cannot be exported from core directly (yet)
   );
   // load samples
   const ds = 'https://raw.githubusercontent.com/felixroos/dough-samples/main/';

packages/serial/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@strudel/serial",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Webserial API for strudel",
   "main": "serial.mjs",
+  "type": "module",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "build": "vite build",

packages/serial/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'serial.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/soundfonts/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@strudel/soundfonts",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Soundsfont support for strudel",
   "main": "index.mjs",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "build": "vite build",

packages/soundfonts/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/superdough/README.md

@@ -19,7 +19,7 @@ import { superdough, samples, initAudioOnFirstClick, registerSynthSounds } from
 
 const init = Promise.all([
   initAudioOnFirstClick(),
-  samples('github:tidalcycles/Dirt-Samples/master'),
+  samples('github:tidalcycles/dirt-samples'),
   registerSynthSounds(),
 ]);
 
@@ -148,7 +148,7 @@ The json file is expected to have the same format as described above.
 Because it is common to use github for samples, there is a short way to load a sample map from github:
 
 ```js
-samples('github:tidalcycles/Dirt-Samples/master')
+samples('github:tidalcycles/dirt-samples')
 ```
 
 The format is `github:<user>/<repo>/<branch>`.

packages/superdough/package.json

@@ -1,12 +1,11 @@
 {
   "name": "superdough",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "simple web audio synth and sampler intended for live coding. inspired by superdirt and webdirt.",
   "main": "index.mjs",
   "type": "module",
   "publishConfig": {
-    "main": "dist/index.cjs",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "directories": {
     "example": "examples"

packages/superdough/sampler.mjs

@@ -99,6 +99,27 @@ export const getLoadedBuffer = (url) => {
   return bufferCache[url];
 };
 
+function resolveSpecialPaths(base) {
+  if (base.startsWith('bubo:')) {
+    const [_, repo] = base.split(':');
+    base = `github:Bubobubobubobubo/dough-${repo}`;
+  }
+  return base;
+}
+
+function githubPath(base, subpath = '') {
+  if (!base.startsWith('github:')) {
+    throw new Error('expected "github:" at the start of pseudoUrl');
+  }
+  let [_, path] = base.split('github:');
+  path = path.endsWith('/') ? path.slice(0, -1) : path;
+  if (path.split('/').length === 2) {
+    // assume main as default branch if none set
+    path += '/main';
+  }
+  return `https://raw.githubusercontent.com/${path}/${subpath}`;
+}
+
 export const processSampleMap = (sampleMap, fn, baseUrl = sampleMap._base || '') => {
   return Object.entries(sampleMap).forEach(([key, value]) => {
     if (typeof value === 'string') {
@@ -108,15 +129,19 @@ export const processSampleMap = (sampleMap, fn, baseUrl = sampleMap._base || '')
       throw new Error('wrong sample map format for ' + key);
     }
     baseUrl = value._base || baseUrl;
-    const replaceUrl = (v) => (baseUrl + v).replace('github:', 'https://raw.githubusercontent.com/');
+    baseUrl = resolveSpecialPaths(baseUrl);
+    if (baseUrl.startsWith('github:')) {
+      baseUrl = githubPath(baseUrl, '');
+    }
+    const fullUrl = (v) => baseUrl + v;
     if (Array.isArray(value)) {
       //return [key, value.map(replaceUrl)];
-      value = value.map(replaceUrl);
+      value = value.map(fullUrl);
     } else {
       // must be object
       value = Object.fromEntries(
         Object.entries(value).map(([note, samples]) => {
-          return [note, (typeof samples === 'string' ? [samples] : samples).map(replaceUrl)];
+          return [note, (typeof samples === 'string' ? [samples] : samples).map(fullUrl)];
         }),
       );
     }
@@ -142,7 +167,7 @@ function getSamplesPrefixHandler(url) {
 /**
  * Loads a collection of samples to use with `s`
  * @example
- * samples('github:tidalcycles/Dirt-Samples/master');
+ * samples('github:tidalcycles/dirt-samples');
  * s("[bd ~]*2, [~ hh]*2, ~ sd")
  * @example
  * samples({
@@ -165,18 +190,9 @@ export const samples = async (sampleMap, baseUrl = sampleMap._base || '', option
     if (handler) {
       return handler(sampleMap);
     }
-    if (sampleMap.startsWith('bubo:')) {
-      const [_, repo] = sampleMap.split(':');
-      sampleMap = `github:Bubobubobubobubo/dough-${repo}`;
-    }
+    sampleMap = resolveSpecialPaths(sampleMap);
     if (sampleMap.startsWith('github:')) {
-      let [_, path] = sampleMap.split('github:');
-      path = path.endsWith('/') ? path.slice(0, -1) : path;
-      if (path.split('/').length === 2) {
-        // assume main as default branch if none set
-        path += '/main';
-      }
-      sampleMap = `https://raw.githubusercontent.com/${path}/strudel.json`;
+      sampleMap = githubPath(sampleMap, 'strudel.json');
     }
     if (sampleMap.startsWith('shabda:')) {
       let [_, path] = sampleMap.split('shabda:');

packages/superdough/superdough.mjs

@@ -253,6 +253,11 @@ function effectSend(input, effect, wet) {
   return send;
 }
 
+export function resetGlobalEffects() {
+  delays = {};
+  reverbs = {};
+}
+
 export const superdough = async (value, deadline, hapDuration) => {
   const ac = getAudioContext();
   if (typeof value !== 'object') {

packages/superdough/vite.config.js

@@ -8,7 +8,7 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
+      formats: ['es'],
       fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.cjs' })[ext],
     },
     rollupOptions: {

packages/tonal/package.json

@@ -1,11 +1,10 @@
 {
   "name": "@strudel/tonal",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Tonal functions for strudel",
   "main": "index.mjs",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "build": "vite build",

packages/tonal/test/tonal.test.mjs

@@ -7,10 +7,9 @@ This program is free software: you can redistribute it and/or modify it under th
 // import { strict as assert } from 'assert';
 
 import '../tonal.mjs'; // need to import this to add prototypes
-import { pure, controls, seq } from '@strudel/core';
+import { pure, n, seq } from '@strudel/core';
 import { describe, it, expect } from 'vitest';
 import { mini } from '../../mini/mini.mjs';
-const { n } = controls;
 
 describe('tonal', () => {
   it('Should run tonal functions ', () => {

packages/tonal/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/transpiler/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@strudel/transpiler",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Transpiler for strudel user code. Converts syntactically correct but semantically meaningless JS into evaluatable strudel code.",
   "main": "index.mjs",
+  "type": "module",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "build": "vite build",

packages/transpiler/test/transpiler.test.mjs

@@ -23,6 +23,9 @@ describe('transpiler', () => {
   it('supports top level await', () => {
     expect(transpiler("await samples('xxx');", simple).output).toEqual("await samples('xxx');");
   });
+  it('adds await to bare samples call', () => {
+    expect(transpiler("samples('xxx');", simple).output).toEqual("await samples('xxx');");
+  });
   /*   it('parses dynamic imports', () => {
     expect(
       transpiler("const { default: foo } = await import('https://bar.com/foo.js');", {

packages/transpiler/transpiler.mjs

@@ -1,8 +1,7 @@
-import escodegen from 'escodegen';
-import { parse } from 'acorn';
-import { walk } from 'estree-walker';
-import { isNoteWithOctave } from '@strudel/core';
 import { getLeafLocations } from '@strudel/mini';
+import { parse } from 'acorn';
+import escodegen from 'escodegen';
+import { walk } from 'estree-walker';
 
 export function transpiler(input, options = {}) {
   const { wrapAsync = false, addReturn = true, emitMiniLocations = true, emitWidgets = true } = options;
@@ -47,6 +46,9 @@ export function transpiler(input, options = {}) {
           });
         return this.replace(widgetWithLocation(node));
       }
+      if (isBareSamplesCall(node, parent)) {
+        return this.replace(withAwait(node));
+      }
     },
     leave(node, parent, prop, index) {},
   });
@@ -119,3 +121,14 @@ function widgetWithLocation(node) {
   node.callee.name = 'sliderWithID';
   return node;
 }
+
+function isBareSamplesCall(node, parent) {
+  return node.type === 'CallExpression' && node.callee.name === 'samples' && parent.type !== 'AwaitExpression';
+}
+
+function withAwait(node) {
+  return {
+    type: 'AwaitExpression',
+    argument: node,
+  };
+}

packages/transpiler/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/web/README.md

@@ -43,7 +43,7 @@ By default, no external samples are loaded, but you can add them like this:
 
 ```js
 initStrudel({
-  prebake: () => samples('github:tidalcycles/Dirt-Samples/master'),
+  prebake: () => samples('github:tidalcycles/dirt-samples'),
 });
 
 document.getElementById('play').addEventListener('click', 

packages/web/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@strudel/web",
-  "version": "1.0.0",
+  "version": "1.0.3",
   "description": "Easy to setup, opiniated bundle of Strudel for the browser.",
-  "main": "web.mjs",
+  "module": "web.mjs",
   "publishConfig": {
     "main": "dist/index.js",
     "module": "dist/index.mjs"
@@ -37,7 +37,8 @@
     "@strudel/mini": "workspace:*",
     "@strudel/tonal": "workspace:*",
     "@strudel/transpiler": "workspace:*",
-    "@strudel/webaudio": "workspace:*"
+    "@strudel/webaudio": "workspace:*",
+    "@rollup/plugin-replace": "^5.0.5"
   },
   "devDependencies": {
     "vite": "^5.0.10"

packages/web/vite.config.js

@@ -1,6 +1,7 @@
 import { defineConfig } from 'vite';
 import { dependencies } from './package.json';
 import { resolve } from 'path';
+import replace from '@rollup/plugin-replace';
 
 // https://vitejs.dev/config/
 export default defineConfig({
@@ -8,11 +9,18 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'web.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      name: 'strudel',
+      formats: ['es', 'iife'],
+      fileName: (ext) => ({ es: 'index.mjs', iife: 'index.js' })[ext],
     },
     rollupOptions: {
-      external: [...Object.keys(dependencies)],
+      // external: [...Object.keys(dependencies)],
+      plugins: [
+        replace({
+          'process.env.NODE_ENV': JSON.stringify('production'),
+          preventAssignment: true,
+        }),
+      ],
     },
     target: 'esnext',
   },

packages/web/web.mjs

@@ -5,7 +5,7 @@ export * from '@strudel/transpiler';
 export * from '@strudel/mini';
 export * from '@strudel/tonal';
 export * from '@strudel/webaudio';
-import { Pattern, evalScope, controls } from '@strudel/core';
+import { Pattern, evalScope } from '@strudel/core';
 import { initAudioOnFirstClick, registerSynthSounds, webaudioScheduler } from '@strudel/webaudio';
 // import { registerSoundfonts } from '@strudel/soundfonts';
 import { evaluate as _evaluate } from '@strudel/transpiler';
@@ -15,7 +15,6 @@ import { miniAllStrings } from '@strudel/mini';
 export async function defaultPrebake() {
   const loadModules = evalScope(
     evalScope,
-    controls,
     import('@strudel/core'),
     import('@strudel/mini'),
     import('@strudel/tonal'),

packages/webaudio/README.md

@@ -12,9 +12,8 @@ npm i @strudel/webaudio --save
 ## Example
 
 ```js
-import { repl, controls } from "@strudel/core";
+import { repl, note } from "@strudel/core";
 import { initAudioOnFirstClick, getAudioContext, webaudioOutput } from "@strudel/webaudio";
-const { note } = controls;
 
 initAudioOnFirstClick();
 const ctx = getAudioContext();

packages/webaudio/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strudel/webaudio",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Web Audio helpers for Strudel",
   "main": "index.mjs",
   "type": "module",
@@ -8,8 +8,7 @@
     "example": "examples"
   },
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "example": "npx parcel examples/repl.html",

packages/webaudio/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],

packages/xen/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@strudel/xen",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Xenharmonic API for strudel",
   "main": "index.mjs",
+  "type": "module",
   "publishConfig": {
-    "main": "dist/index.js",
-    "module": "dist/index.mjs"
+    "main": "dist/index.mjs"
   },
   "scripts": {
     "build": "vite build",

packages/xen/vite.config.js

@@ -8,8 +8,8 @@ export default defineConfig({
   build: {
     lib: {
       entry: resolve(__dirname, 'index.mjs'),
-      formats: ['es', 'cjs'],
-      fileName: (ext) => ({ es: 'index.mjs', cjs: 'index.js' })[ext],
+      formats: ['es'],
+      fileName: (ext) => ({ es: 'index.mjs' })[ext],
     },
     rollupOptions: {
       external: [...Object.keys(dependencies)],