Merge remote-tracking branch 'origin/HEAD' into webaudio

2026-07-13 14:26:58 -04:00 · 2022-04-15 20:54:33 +02:00
parent ff32485f67 9d2cbbaa2c
commit 2510399017
25 changed files with 195 additions and 1946 deletions
@@ -1,16 +1,16 @@
 {
  "files": {
    "main.css": "/static/css/main.0d689283.css",
-    "main.js": "/static/js/main.194ee673.js",
+    "main.js": "/static/js/main.4cb43873.js",
    "static/js/787.1c52cb78.chunk.js": "/static/js/787.1c52cb78.chunk.js",
    "static/media/logo.svg": "/static/media/logo.ac95051720b3dccfe511e0e02d8e1029.svg",
    "index.html": "/index.html",
    "main.0d689283.css.map": "/static/css/main.0d689283.css.map",
-    "main.194ee673.js.map": "/static/js/main.194ee673.js.map",
+    "main.4cb43873.js.map": "/static/js/main.4cb43873.js.map",
    "787.1c52cb78.chunk.js.map": "/static/js/787.1c52cb78.chunk.js.map"
  },
  "entrypoints": [
    "static/css/main.0d689283.css",
-    "static/js/main.194ee673.js"
+    "static/js/main.4cb43873.js"
  ]
 }
@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Strudel REPL"/><title>Strudel REPL</title><script defer="defer" src="/static/js/main.194ee673.js"></script><link href="/static/css/main.0d689283.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Strudel REPL"/><title>Strudel REPL</title><script defer="defer" src="/static/js/main.4cb43873.js"></script><link href="/static/css/main.0d689283.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
@@ -1 +1 @@
-<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><link rel="icon" href="/tutorial/favicon.e3ab9dd9.ico"><link rel="stylesheet" type="text/css" href="/tutorial/index.757e9f9d.css"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content="Strudel REPL"><title>Strudel Tutorial</title></head><body> <div id="root"></div> <noscript>You need to enable JavaScript to run this app.</noscript> <script src="/tutorial/index.3b5f65fb.js" defer></script> </body></html>
+<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><link rel="icon" href="/tutorial/favicon.e3ab9dd9.ico"><link rel="stylesheet" type="text/css" href="/tutorial/index.999678aa.css"><meta name="viewport" content="width=device-width, initial-scale=1"><meta name="description" content="Strudel REPL"><title>Strudel Tutorial</title></head><body> <div id="root"></div> <noscript>You need to enable JavaScript to run this app.</noscript> <script src="/tutorial/index.467be0e0.js" defer></script> </body></html>
@@ -5304,33 +5304,10 @@
        "node": ">=0.10.0"
      }
    },
-    "node_modules/extsprintf": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "engines": [
-        "node >=0.6.0"
-      ]
-    },
-    "node_modules/fancy-log": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz",
-      "integrity": "sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==",
-      "dependencies": {
-        "ansi-gray": "^0.1.1",
-        "color-support": "^1.1.3",
-        "parse-node-version": "^1.0.0",
-        "time-stamp": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
+    "node_modules/isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
      "dev": true
    },
    "node_modules/fast-glob": {
@@ -6807,51 +6784,12 @@
        "node": ">=4"
      }
    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
-      "dev": true
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
-      "dev": true
-    },
-    "node_modules/json-schema": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.4.0.tgz",
-      "integrity": "sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==",
-      "dev": true
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
-    },
-    "node_modules/json-source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz",
-      "integrity": "sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg==",
-      "dev": true
-    },
-    "node_modules/json-stringify-safe": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz",
-      "integrity": "sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
+    "node_modules/osc-js": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.2.tgz",
+      "integrity": "sha512-9i7J4u1hH+glooGMh+ki1ni0JGqKmylT8r0nXKugHbRK63rR+kl4O+5tGW6+/EszjbCju3KV+eXQQzFDdGrmhg==",
+      "dependencies": {
+        "ws": "^8.5.0"
      }
    },
    "node_modules/jsonfile": {
@@ -9453,13 +9391,12 @@
        "node": ">=4"
      }
    },
-    "node_modules/read-pkg/node_modules/pify": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
-      "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
+    "packages/osc": {
+      "name": "@strudel.cycles/osc",
+      "version": "0.0.1",
+      "license": "GPL-3.0-or-later",
+      "dependencies": {
+        "osc-js": "^2.3.2"
      }
    },
    "node_modules/read-pkg/node_modules/semver": {
@@ -13808,7 +13745,7 @@
    "@strudel.cycles/osc": {
      "version": "file:packages/osc",
      "requires": {
-        "osc-js": "^2.3.0"
+        "osc-js": "^2.3.2"
      }
    },
    "@strudel.cycles/tonal": {
@@ -16517,12 +16454,6 @@
      "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
      "dev": true
    },
-    "isomorphic-ws": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
-      "integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
-      "requires": {}
-    },
    "isstream": {
      "version": "0.1.2",
      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
@@ -17885,12 +17816,11 @@
      "dev": true
    },
    "osc-js": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.1.tgz",
-      "integrity": "sha512-DjpfUcyTsMmD7uLdyjqsT9zwuNkUOG8yJMc56H9spTCRqTls5vLt5QnlVploVqSRwQ2stvcc+CsY18ouxab9mg==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.2.tgz",
+      "integrity": "sha512-9i7J4u1hH+glooGMh+ki1ni0JGqKmylT8r0nXKugHbRK63rR+kl4O+5tGW6+/EszjbCju3KV+eXQQzFDdGrmhg==",
      "requires": {
-        "isomorphic-ws": "4.0.1",
-        "ws": "8.5.0"
+        "ws": "^8.5.0"
      }
    },
    "osenv": {
@@ -9,7 +9,8 @@
    "bootstrap": "lerna bootstrap",
    "setup": "npm i && npm run bootstrap && cd repl && npm i",
    "repl": "cd repl && npm run start",
-    "osc": "cd packages/osc && npm run server"
+    "osc": "cd packages/osc && npm run server",
+    "build": "cd repl && npm run build"
  },
  "workspaces": [
    "packages/*"
@@ -1,5 +1,5 @@
 import { Hap } from './hap.mjs';
-import { Pattern, fastcat } from './pattern.mjs';
+import { Pattern, fastcat, reify, silence } from './pattern.mjs';
 import Fraction from './fraction.mjs';

 export function steady(value) {
@@ -28,3 +28,50 @@ export const square2 = square._toBipolar();

 export const tri = fastcat(isaw, saw);
 export const tri2 = fastcat(isaw2, saw2);
+
+// random signals
+
+const xorwise = (x) => {
+  const a = (x << 13) ^ x;
+  const b = (a >> 17) ^ a;
+  return (b << 5) ^ b;
+};
+
+// stretch 300 cycles over the range of [0,2**29 == 536870912) then apply the xorshift algorithm
+const _frac = (x) => x - Math.trunc(x);
+
+const timeToIntSeed = (x) => xorwise(Math.trunc(_frac(x / 300) * 536870912));
+
+const intSeedToRand = (x) => (x % 536870912) / 536870912;
+
+const timeToRand = (x) => intSeedToRand(timeToIntSeed(x));
+
+const timeToRandsPrime = (seed, n) => {
+  const result = [];
+  for (let i = 0; i < n; ++n) {
+    result.push(intSeedToRand(seed));
+    seed = xorwise(seed);
+  }
+  return result;
+};
+
+const timeToRands = (t, n) => timeToRandsPrime(timeToIntSeed(t), n);
+
+export const rand2 = signal(timeToRand);
+export const rand = rand2.fmap(Math.abs);
+
+export const _brandBy = (p) => rand.fmap((x) => x < p);
+export const brandBy = (pPat) => reify(pPat).fmap(_brandBy).innerJoin();
+export const brand = _brandBy(0.5);
+
+export const _irand = (i) => rand.fmap((x) => Math.trunc(x * i));
+export const irand = (ipat) => reify(ipat).fmap(_irand).innerJoin();
+
+export const chooseWith = (pat, xs) => {
+  if (xs.length == 0) {
+    return silence;
+  }
+  return pat.range(0, xs.length).fmap((i) => xs[Math.floor(i)]);
+};
+
+export const choose = (...xs) => chooseWith(rand, xs);
@@ -1,4 +1,4 @@
-import OSC from './osc.js';
+import OSC from 'osc-js';
 import { Pattern } from '@strudel.cycles/core';

 const comm = new OSC();
@@ -9,24 +9,15 @@
 			"version": "0.0.1",
 			"license": "GPL-3.0-or-later",
 			"dependencies": {
-				"osc-js": "^2.3.0"
-			}
-		},
-		"node_modules/isomorphic-ws": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
-			"integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
-			"peerDependencies": {
-				"ws": "*"
+				"osc-js": "^2.3.2"
 			}
 		},
 		"node_modules/osc-js": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.0.tgz",
-			"integrity": "sha512-P2Oy9tf8Z9lQw8JZeR62HNqbKdxj7Kqbsag+ImiJvyxPDReGMVt5LtZbMh/7Ve/wbYEGODkQdFAaLHFVkIlHPw==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.2.tgz",
+			"integrity": "sha512-9i7J4u1hH+glooGMh+ki1ni0JGqKmylT8r0nXKugHbRK63rR+kl4O+5tGW6+/EszjbCju3KV+eXQQzFDdGrmhg==",
 			"dependencies": {
-				"isomorphic-ws": "4.0.1",
-				"ws": "8.5.0"
+				"ws": "^8.5.0"
 			}
 		},
 		"node_modules/ws": {
@@ -51,19 +42,12 @@
 		}
 	},
 	"dependencies": {
-		"isomorphic-ws": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-4.0.1.tgz",
-			"integrity": "sha512-BhBvN2MBpWTaSHdWRb/bwdZJ1WaehQ2L1KngkCkfLUGF0mAWAT1sQUQacEmQ0jXkFw/czDXPNQSL5u2/Krsz1w==",
-			"requires": {}
-		},
 		"osc-js": {
-			"version": "2.3.0",
-			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.0.tgz",
-			"integrity": "sha512-P2Oy9tf8Z9lQw8JZeR62HNqbKdxj7Kqbsag+ImiJvyxPDReGMVt5LtZbMh/7Ve/wbYEGODkQdFAaLHFVkIlHPw==",
+			"version": "2.3.2",
+			"resolved": "https://registry.npmjs.org/osc-js/-/osc-js-2.3.2.tgz",
+			"integrity": "sha512-9i7J4u1hH+glooGMh+ki1ni0JGqKmylT8r0nXKugHbRK63rR+kl4O+5tGW6+/EszjbCju3KV+eXQQzFDdGrmhg==",
 			"requires": {
-				"isomorphic-ws": "4.0.1",
-				"ws": "8.5.0"
+				"ws": "^8.5.0"
 			}
 		},
 		"ws": {
@@ -27,6 +27,6 @@
  },
  "homepage": "https://github.com/tidalcycles/strudel#readme",
  "dependencies": {
-    "osc-js": "^2.3.0"
+    "osc-js": "^2.3.2"
  }
 }
@@ -13,11 +13,8 @@ The REPL is deployed at [strudel.tidalcycles.org](https://strudel.tidalcycles.or

 ```bash
 # from project root
-npm install
-npx lerna bootstrap
-cd repl
-npm install
-npm run start
+npm run setup
+npm run repl
 ```

 ## Build REPL
@@ -27,7 +24,3 @@ cd repl
 npm run build # <- builds repl + tutorial to ../docs
 npm run static # <- test static build
 ```
-
-## Dev Notes
-
-~~Always run `npm i --legacy-peer-deps`, otherwise `@tonejs/piano` will break.~~
@@ -703,3 +703,23 @@ stack(
  >\`
  .legato(.5)
 ).fast(2) //.tone((await piano()).chain(out()))`;
+
+export const speakerman = `backgroundImage('https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Fi.ytimg.com%2Fvi%2FXR0rKqW3VwY%2Fmaxresdefault.jpg&f=1&nofb=1', 
+{ className:'darken', style:'background-size:cover'})
+stack(
+  "[g3,bb3,d4] [f3,a3,c4] [c3,e3,g3]@2".slow(2).late(.1),
+  slowcat(
+  'Baker man',
+  'is baking bread',
+  'Baker man',
+  'is baking bread',
+  'Sagabona',
+  'kunjani wena',
+  'Sagabona',
+  'kunjani wena',
+  'The night train, is coming',
+  'got to keep on running',
+  'The night train, is coming',
+  'got to keep on running',
+  ).speak("en zu en".slow(12), "<0 2 3 4 5 6>".slow(2)),
+).slow(4)`;
@@ -195,14 +195,14 @@ Internally, the mini notation will expand to use the actual functional JavaScrip

 Notes are automatically available as variables:

-<MiniRepl tune={`e4`} />
+<MiniRepl tune={`sequence(d4, fs4, a4)`} />

 An important difference to the mini notation:
 For sharp notes, the letter "s" is used instead of "#", because JavaScript does not support "#" in a variable name.

 The above is the same as:

-<MiniRepl tune={`"e4"`} />
+<MiniRepl tune={`sequence('d4', 'f#4', 'a4')`} />

 Using strings, you can also use "#".

@@ -39,7 +39,7 @@ function useCycle(props) {

    // schedule events for next cycle
    events
-      ?.filter((event) => event.part.begin.equals(event.whole.begin))
+      ?.filter((event) => event.part.begin.equals(event.whole?.begin))
      .forEach((event) => {
        Tone.getTransport().schedule((time) => {
          onEvent(time, event, Tone.getContext().currentTime);