elias/strudel-docker
1
0
Fork 0
mirror of https://github.com/eliasstepanik/strudel-docker.git synced 2026-01-27 21:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tidalcycles:main' into udels

Browse Source
This commit is contained in:
Jade (Rose) Rowland 2024-06-13 22:52:06 -04:00 committed by GitHub
commit d23038d386
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
126 changed files with 4976 additions and 8255 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.eslintignore
View File

@ -21,4 +21,5 @@ vite.config.js
/src-tauri/target/**/* /src-tauri/target/**/*
reverbGen.mjs reverbGen.mjs
hydra.mjs hydra.mjs
jsdoc-synonyms.js jsdoc-synonyms.js
packages/hs2js/src/hs2js.mjs

1
.eslintrc.json
View File

@ -1,5 +1,6 @@
{ {
"env": { "env": {
"node": true,
"browser": true, "browser": true,
"es2021": true "es2021": true
}, },

12
CONTRIBUTING.md
View File

@ -130,20 +130,14 @@ npx lerna version --no-private
# publish all packages inside /packages using pnpm! don't use lerna to publish!! # publish all packages inside /packages using pnpm! don't use lerna to publish!!
pnpm --filter "./packages/**" publish --dry-run pnpm --filter "./packages/**" publish --dry-run
# the last command was only a dry-run, make sure everything looks ok, if yes, run the same command without flag # the last command was only a dry-run. if everything looks ok, run this:
pnpm --filter "./packages/**" publish --access public
``` ```
To manually publish a single package, increase the version in the `package.json`, then run `pnpm publish`. To manually publish a single package, increase the version in the `package.json`, then run `pnpm publish`.
Important: Always publish with `pnpm`, as `npm` does not support overriding main files in `publishConfig`, which is done in all the packages. Important: Always publish with `pnpm`, as `npm` does not support overriding main files in `publishConfig`, which is done in all the packages.
### New Packages
To add a new package, you have to publish it manually the first time, using:
```sh
cd packages/<package-name> && pnpm publish --access public
```
## Have Fun ## Have Fun
Remember to have fun, and that this project is driven by the passion of volunteers! Remember to have fun, and that this project is driven by the passion of volunteers!

22
bench/tunes.bench.mjs Normal file
View File

@ -0,0 +1,22 @@
import { queryCode, testCycles } from '../test/runtime.mjs';
import * as tunes from '../website/src/repl/tunes.mjs';
import { describe, bench } from 'vitest';
import { calculateTactus } from '../packages/core/index.mjs';
const tuneKeys = Object.keys(tunes);
describe('renders tunes', () => {
tuneKeys.forEach((key) => {
describe(key, () => {
calculateTactus(true);
bench(`+tactus`, async () => {
await queryCode(tunes[key], testCycles[key] || 1);
});
calculateTactus(false);
bench(`-tactus`, async () => {
await queryCode(tunes[key], testCycles[key] || 1);
});
calculateTactus(true);
});
});
});

38
examples/buildless/headless-simple.html
View File

@ -1,9 +1,31 @@
<!doctype html> <!doctype html>
<script src="https://unpkg.com/@strudel/web@1.0.3"></script> <html>
<button id="play">play</button> <head>
<button id="stop">stop</button> <meta charset="UTF-8" />
<script> <!-- <script src="../../packages/web/dist/index.js"></script> -->
strudel.initStrudel(); <script src="https://unpkg.com/@strudel/web@1.0.3"></script>
document.getElementById('play').addEventListener('click', () => evaluate('note("c a f e").jux(rev)')); </head>
document.getElementById('play').addEventListener('stop', () => hush()); <body style="background: #222">
</script> <button id="play">play</button>
<button id="stop">stop</button>
<script>
strudel.initStrudel();
document.getElementById('play').addEventListener('click', () =>
evaluate(`
//@title washover @by Switch Angel
//@social https://www.instagram.com/_switch_angel/
n("{0 1 3 5 2 }%16")
.add(n(tri.range(0, 6).slow(3)))
.scale("C4:pentatonic")
.sound("sawtooth").att(saw.range(0, 0.05).fast(6))
.release(3).pan(rand).decay(rand.range(0.1, 0.3))
.lpf(tri.range(200, 8000).slow(5)).lpq(0)
.gain(.4).vib(1).vibmod(.1)
.scope({pos:.5})
`),
);
document.getElementById('stop').addEventListener('click', () => strudel.hush());
</script>
</body>
</html>

38
examples/buildless/headless-with-samples.html
View File

@ -1,16 +1,24 @@
<!doctype html> <!doctype html>
<script src="https://unpkg.com/@strudel/web@1.0.3"></script> <html>
<button id="a">A</button> <head>
<button id="b">B</button> <meta charset="UTF-8" />
<button id="c">C</button> <!-- <script src="../../packages/web/dist/index.js"></script> -->
<button id="stop">stop</button> <script src="https://unpkg.com/@strudel/web@1.0.3"></script>
<script> </head>
initStrudel({ <body style="background: #222">
prebake: () => samples('github:tidalcycles/dirt-samples'), <button id="a">A</button>
}); <button id="b">B</button>
const click = (id, action) => document.getElementById(id).addEventListener('click', action); <button id="c">C</button>
click('a', () => evaluate(`s('bd,jvbass(3,8)').jux(rev)`)); <button id="stop">stop</button>
click('b', () => s('bd*2,hh(3,4),jvbass(5,8,1)').jux(rev).play()); <script>
click('c', () => s('bd*2,hh(3,4),jvbass:[0 4](5,8,1)').jux(rev).stack(s('~ sd')).play()); initStrudel({
click('stop', () => hush()); prebake: () => samples('github:tidalcycles/dirt-samples'),
</script> });
const click = (id, action) => document.getElementById(id).addEventListener('click', action);
click('a', () => evaluate(`s('bd,jvbass(3,8)').jux(rev)`));
click('b', () => s('bd*2,hh(3,4),jvbass(5,8,1)').jux(rev).play());
click('c', () => s('bd*2,hh(3,4),jvbass:[0 4](5,8,1)').jux(rev).stack(s('~ sd')).play());
click('stop', () => hush());
</script>
</body>
</html>

9
examples/buildless/hs2js.html Normal file
View File

@ -0,0 +1,9 @@
<script src="https://unpkg.com/hs2js@0.0.4"></script>
<button id="hello">hello</button>
<script>
hs2js.setBase('https://unpkg.com/hs2js@0.0.4/dist/');
hs2js.loadParser();
document.getElementById('hello').addEventListener('click', () => {
hs2js.evaluate('alert "hello from haskell!"');
});
</script>

98
examples/buildless/tidal.html Normal file
View File

@ -0,0 +1,98 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>tidal.html</title>
</head>
<body style="margin: 0; padding: 0">
<textarea id="code" style="width: 100%; height: 200px"></textarea>
<pre id="result"></pre>
<script src="https://unpkg.com/hs2js@0.0.8"></script>
<script src="https://unpkg.com/@strudel/web@1.0.3"></script>
<script>
const { initStrudel } = strudel;
const { run, parse, setBase, loadParser } = hs2js;
setBase('https://unpkg.com/hs2js@0.0.4/dist/');
const ready = loadParser();
initStrudel({
prebake: () => samples('github:tidalcycles/dirt-samples'),
});
const textarea = document.getElementById('code');
if (window.location.hash) {
textarea.value = atob(window.location.hash.slice(1));
} else {
textarea.value = 'd1 $ s "jvbass(3,8)"';
}
textarea.addEventListener('input', (e) => {
window.location.hash = btoa(e.target.value);
update();
});
update();
function getInfixOperators() {
let operators = {
'>': 'set',
'#': 'set',
'+': 'add',
'-': 'sub',
'*': 'mul',
'/': 'div',
};
let alignments = {
in: (s) => '|' + s,
out: (s) => s + '|',
mix: (s) => '|' + s + '|',
};
let ops = {};
Object.entries(operators).forEach(([o, name]) => {
// operator without alignment
ops[o] = (l, r) => reify(l)[name](reify(r));
Object.entries(alignments).forEach(([a, getSymbol]) => {
// get symbol with alignment
let symbol = getSymbol(o);
ops[symbol] = (l, r) => reify(l)[name][a](reify(r));
});
});
ops['~>'] = (l, r) => reify(l).late(reify(r));
ops['<~'] = (l, r) => reify(l).early(reify(r));
ops['<$>'] = (l, r) => reify(r).fmap(l).outerJoin(); // is this right?
return ops;
}
const ops = getInfixOperators();
async function update() {
let result, tree;
await ready;
try {
tree = parse(textarea.value);
} catch (err) {
console.warn('parse error');
console.error(err);
}
console.log('parsed tree');
console.log(tree.rootNode.toString());
try {
let patterns = {};
window.p = (name, pattern) => {
patterns[name] = pattern;
};
window.d1 = (pat) => window.p(1, pat);
window.d2 = (pat) => window.p(2, pat);
window.d3 = (pat) => window.p(3, pat);
window.rot = late;
result = run(tree.rootNode, window, ops);
if (Object.values(patterns).length) {
stack(...Object.values(patterns)).play();
}
} catch (err) {
console.warn('eval error');
console.error(err);
result = 'ERROR: ' + err.message;
}
document.getElementById('result').innerHTML = 'Result: ' + result;
}
</script>
</body>
</html>

4
examples/codemirror-repl/main.js
View File

@ -1,6 +1,7 @@
import { StrudelMirror } from '@strudel/codemirror'; import { StrudelMirror } from '@strudel/codemirror';
import { funk42 } from './tunes'; import { funk42 } from './tunes';
import { drawPianoroll, evalScope } from '@strudel/core'; import { evalScope } from '@strudel/core';
import { drawPianoroll } from '@strudel/draw';
import './style.css'; import './style.css';
import { initAudioOnFirstClick } from '@strudel/webaudio'; import { initAudioOnFirstClick } from '@strudel/webaudio';
import { transpiler } from '@strudel/transpiler'; import { transpiler } from '@strudel/transpiler';
@ -26,6 +27,7 @@ const editor = new StrudelMirror({
initAudioOnFirstClick(); // needed to make the browser happy (don't await this here..) initAudioOnFirstClick(); // needed to make the browser happy (don't await this here..)
const loadModules = evalScope( const loadModules = evalScope(
import('@strudel/core'), import('@strudel/core'),
import('@strudel/draw'),
import('@strudel/mini'), import('@strudel/mini'),
import('@strudel/tonal'), import('@strudel/tonal'),
import('@strudel/webaudio'), import('@strudel/webaudio'),

1
examples/codemirror-repl/package.json
View File

@ -14,6 +14,7 @@
"dependencies": { "dependencies": {
"@strudel/codemirror": "workspace:*", "@strudel/codemirror": "workspace:*",
"@strudel/core": "workspace:*", "@strudel/core": "workspace:*",
"@strudel/draw": "workspace:*",
"@strudel/mini": "workspace:*", "@strudel/mini": "workspace:*",
"@strudel/soundfonts": "workspace:*", "@strudel/soundfonts": "workspace:*",
"@strudel/tonal": "workspace:*", "@strudel/tonal": "workspace:*",

27
examples/tidal-repl/.gitignore vendored Normal file
View File

@ -0,0 +1,27 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*
node_modules
dist
dist-ssr
*.local
# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
public/tree-sitter.wasm
public/tree-sitter-haskell.wasm

10
examples/tidal-repl/README.md Normal file
View File

@ -0,0 +1,10 @@
# @strudel/tidal
This is an experiment in implementing tree-sitter for parsing haskell.
```sh
pnpm i
cd haskell
pnpm copy-wasm
pnpm dev
```

32
examples/tidal-repl/index.html Normal file
View File

@ -0,0 +1,32 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Tree sitter test</title>
<style>
body {
background-color: #121213;
color: white;
}
textarea {
padding: 10px;
color: white;
background-color: transparent;
outline: none;
}
a {
color: white;
}
</style>
</head>
<body style="margin: 0; padding: 0">
<textarea id="code" style="width: 100%; height: 200px"></textarea>
<pre id="result"></pre>
<script
type="module"
src="/main.js
"
></script>
</body>
</html>

83
examples/tidal-repl/main.js Normal file
View File

@ -0,0 +1,83 @@
import { run, parse, loadParser } from 'hs2js';
import { initStrudel, reify, late, samples, stack } from '@strudel/web';
initStrudel({
prebake: () => samples('github:tidalcycles/dirt-samples'),
});
const ready = loadParser();
const textarea = document.getElementById('code');
if (window.location.hash) {
textarea.value = atob(window.location.hash.slice(1));
} else {
textarea.value = 'd1 $ s "jvbass(3,8)"';
}
textarea.addEventListener('input', (e) => {
window.location.hash = btoa(e.target.value);
update();
});
update();
function getInfixOperators() {
let operators = {
'>': 'set',
'#': 'set',
'+': 'add',
'-': 'sub',
'*': 'mul',
'/': 'div',
};
let alignments = {
in: (s) => '|' + s,
out: (s) => s + '|',
mix: (s) => '|' + s + '|',
};
let ops = {};
Object.entries(operators).forEach(([o, name]) => {
// operator without alignment
ops[o] = (l, r) => reify(l)[name](reify(r));
Object.entries(alignments).forEach(([a, getSymbol]) => {
// get symbol with alignment
let symbol = getSymbol(o);
ops[symbol] = (l, r) => reify(l)[name][a](reify(r));
});
});
ops['~>'] = (l, r) => reify(l).late(reify(r));
ops['<~'] = (l, r) => reify(l).early(reify(r));
ops['<$>'] = (l, r) => reify(r).fmap(l).outerJoin(); // is this right?
return ops;
}
const ops = getInfixOperators();
async function update() {
let result, tree;
await ready;
try {
tree = parse(textarea.value);
} catch (err) {
console.warn('parse error');
console.error(err);
}
console.log('parsed tree');
console.log(tree.rootNode.toString());
try {
let patterns = {};
window.p = (name, pattern) => {
patterns[name] = pattern;
};
window.d1 = (pat) => window.p(1, pat);
window.d2 = (pat) => window.p(2, pat);
window.d3 = (pat) => window.p(3, pat);
window.rot = late;
result = run(tree.rootNode, window, ops);
if (Object.values(patterns).length) {
stack(...Object.values(patterns)).play();
}
} catch (err) {
console.warn('eval error');
console.error(err);
result = 'ERROR: ' + err.message;
}
document.getElementById('result').innerHTML = 'Result: ' + result;
}

36
examples/tidal-repl/package.json Normal file
View File

@ -0,0 +1,36 @@
{
"name": "tidal-repl",
"private": true,
"version": "0.0.1",
"type": "module",
"scripts": {
"dev": "vite",
"build": "pnpm copy-wasm && vite build",
"preview": "vite preview",
"copy-wasm": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
},
"repository": {
"type": "git",
"url": "git+https://github.com/tidalcycles/strudel.git"
},
"keywords": [
"titdalcycles",
"strudel",
"pattern",
"livecoding",
"algorave"
],
"author": "Felix Roos <flix91@gmail.com>",
"license": "AGPL-3.0-or-later",
"bugs": {
"url": "https://github.com/tidalcycles/strudel/issues"
},
"homepage": "https://github.com/tidalcycles/strudel#readme",
"dependencies": {
"@strudel/web": "workspace:*",
"hs2js": "workspace:*"
},
"devDependencies": {
"vite": "^5.0.8"
}
}

3
examples/tidal-repl/public/README.md Normal file
View File

@ -0,0 +1,3 @@
# public
this file is just here to make sure the public folder exists

1
package.json
View File

@ -11,6 +11,7 @@
"test": "npm run pretest && vitest run --version", "test": "npm run pretest && vitest run --version",
"test-ui": "npm run pretest && vitest --ui", "test-ui": "npm run pretest && vitest --ui",
"test-coverage": "npm run pretest && vitest --coverage", "test-coverage": "npm run pretest && vitest --coverage",
"bench": "npm run pretest && vitest bench",
"snapshot": "npm run pretest && vitest run -u --silent", "snapshot": "npm run pretest && vitest run -u --silent",
"repl": "npm run prestart && cd website && npm run dev", "repl": "npm run prestart && cd website && npm run dev",
"start": "npm run prestart && cd website && npm run dev", "start": "npm run prestart && cd website && npm run dev",

50
packages/codemirror/codemirror.mjs
View File

@ -140,27 +140,25 @@ export class StrudelMirror {
this.root = root; this.root = root;
this.miniLocations = []; this.miniLocations = [];
this.widgets = []; this.widgets = [];
this.painters = [];
this.drawTime = drawTime; this.drawTime = drawTime;
this.drawContext = drawContext; this.drawContext = drawContext;
this.onDraw = onDraw || this.draw; this.onDraw = onDraw || this.draw;
this.id = id || s4(); this.id = id || s4();
this.drawer = new Drawer((haps, time) => { this.drawer = new Drawer((haps, time, _, painters) => {
const currentFrame = haps.filter((hap) => hap.isActive(time)); const currentFrame = haps.filter((hap) => hap.isActive(time));
this.highlight(currentFrame, time); this.highlight(currentFrame, time);
this.onDraw(haps, time, this.painters); this.onDraw(haps, time, painters);
}, drawTime); }, drawTime);
this.prebaked = prebake(); this.prebaked = prebake();
autodraw && this.drawFirstFrame(); autodraw && this.drawFirstFrame();
this.repl = repl({ this.repl = repl({
...replOptions, ...replOptions,
id,
onToggle: (started) => { onToggle: (started) => {
replOptions?.onToggle?.(started); replOptions?.onToggle?.(started);
if (started) { if (started) {
this.adjustDrawTime();
this.drawer.start(this.repl.scheduler); this.drawer.start(this.repl.scheduler);
// stop other repls when this one is started // stop other repls when this one is started
document.dispatchEvent( document.dispatchEvent(
@ -171,20 +169,11 @@ export class StrudelMirror {
} else { } else {
this.drawer.stop(); this.drawer.stop();
updateMiniLocations(this.editor, []); updateMiniLocations(this.editor, []);
cleanupDraw(false); cleanupDraw(true, id);
} }
}, },
beforeEval: async () => { beforeEval: async () => {
cleanupDraw(); cleanupDraw(true, id);
this.painters = [];
const self = this;
// this is similar to repl.mjs > injectPatternMethods
// maybe there is a solution without prototype hacking, but hey, it works
// we need to do this befor every eval to make sure it works with multiple StrudelMirror's side by side
Pattern.prototype.onPaint = function (onPaint) {
self.painters.push(onPaint);
return this;
};
await this.prebaked; await this.prebaked;
await replOptions?.beforeEval?.(); await replOptions?.beforeEval?.();
}, },
@ -198,8 +187,11 @@ export class StrudelMirror {
updateWidgets(this.editor, widgets); updateWidgets(this.editor, widgets);
updateMiniLocations(this.editor, this.miniLocations); updateMiniLocations(this.editor, this.miniLocations);
replOptions?.afterEval?.(options); replOptions?.afterEval?.(options);
this.adjustDrawTime(); // if no painters are set (.onPaint was not called), then we only need the present moment (for highlighting)
this.drawer.invalidate(); const drawTime = options.pattern.getPainters().length ? this.drawTime : [0, 0];
this.drawer.setDrawTime(drawTime);
// invalidate drawer after we've set the appropriate drawTime
this.drawer.invalidate(this.repl.scheduler);
}, },
}); });
this.editor = initEditor({ this.editor = initEditor({
@ -234,13 +226,8 @@ export class StrudelMirror {
}; };
document.addEventListener('start-repl', this.onStartRepl); document.addEventListener('start-repl', this.onStartRepl);
} }
// adjusts draw time depending on if there are painters draw(haps, time, painters) {
adjustDrawTime() { painters?.forEach((painter) => painter(this.drawContext, time, haps, this.drawTime));
// when no painters are set, [0,0] is enough (just highlighting)
this.drawer.setDrawTime(this.painters.length ? this.drawTime : [0, 0]);
}
draw(haps, time) {
this.painters?.forEach((painter) => painter(this.drawContext, time, haps, this.drawTime));
} }
async drawFirstFrame() { async drawFirstFrame() {
if (!this.onDraw) { if (!this.onDraw) {
@ -252,7 +239,7 @@ export class StrudelMirror {
await this.repl.evaluate(this.code, false); await this.repl.evaluate(this.code, false);
this.drawer.invalidate(this.repl.scheduler, -0.001); this.drawer.invalidate(this.repl.scheduler, -0.001);
// draw at -0.001 to avoid haps at 0 to be visualized as active // draw at -0.001 to avoid haps at 0 to be visualized as active
this.onDraw?.(this.drawer.visibleHaps, -0.001, this.painters); this.onDraw?.(this.drawer.visibleHaps, -0.001, this.drawer.painters);
} catch (err) { } catch (err) {
console.warn('first frame could not be painted'); console.warn('first frame could not be painted');
} }
@ -345,6 +332,17 @@ export class StrudelMirror {
clear() { clear() {
this.onStartRepl && document.removeEventListener('start-repl', this.onStartRepl); this.onStartRepl && document.removeEventListener('start-repl', this.onStartRepl);
} }
getCursorLocation() {
return this.editor.state.selection.main.head;
}
setCursorLocation(col) {
return this.editor.dispatch({ selection: { anchor: col } });
}
appendCode(code) {
const cursor = this.getCursorLocation();
this.setCode(this.code + code);
this.setCursorLocation(cursor);
}
} }
function parseBooleans(value) { function parseBooleans(value) {

2
packages/codemirror/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/codemirror", "name": "@strudel/codemirror",
"version": "1.0.1", "version": "1.1.0",
"description": "Codemirror Extensions for Strudel", "description": "Codemirror Extensions for Strudel",
"main": "index.mjs", "main": "index.mjs",
"publishConfig": { "publishConfig": {

2
packages/codemirror/themes/algoboy.mjs vendored
View File

@ -12,7 +12,7 @@ export const settings = {
gutterBackground: 'transparent', gutterBackground: 'transparent',
gutterForeground: '#0f380f', gutterForeground: '#0f380f',
light: true, light: true,
customStyle: '.cm-line { line-height: 1 }', // customStyle: '.cm-line { line-height: 1 }',
}; };
export default createTheme({ export default createTheme({
theme: 'light', theme: 'light',

2
packages/codemirror/themes/teletext.mjs vendored
View File

@ -17,7 +17,7 @@ export const settings = {
lineBackground: '#00000040', lineBackground: '#00000040',
gutterBackground: 'transparent', gutterBackground: 'transparent',
gutterForeground: '#8a919966', gutterForeground: '#8a919966',
customStyle: '.cm-line { line-height: 1 }', // customStyle: '.cm-line { line-height: 1 }',
}; };
let punctuation = colorD; let punctuation = colorD;

46
packages/core/bench/pattern.bench.mjs Normal file
View File

@ -0,0 +1,46 @@
import { describe, bench } from 'vitest';
import { calculateTactus, sequence, stack } from '../index.mjs';
const pat64 = sequence(...Array(64).keys());
describe('tactus', () => {
calculateTactus(true);
bench(
'+tactus',
() => {
pat64.iter(64).fast(64).firstCycle();
},
{ time: 1000 },
);
calculateTactus(false);
bench(
'-tactus',
() => {
pat64.iter(64).fast(64).firstCycle();
},
{ time: 1000 },
);
});
describe('stack', () => {
calculateTactus(true);
bench(
'+tactus',
() => {
stack(pat64, pat64, pat64, pat64, pat64, pat64, pat64, pat64).fast(64).firstCycle();
},
{ time: 1000 },
);
calculateTactus(false);
bench(
'-tactus',
() => {
stack(pat64, pat64, pat64, pat64, pat64, pat64, pat64, pat64).fast(64).firstCycle();
},
{ time: 1000 },
);
});
calculateTactus(true);

67
packages/core/controls.mjs
View File

@ -47,7 +47,7 @@ export function createParam(names) {
return func; return func;
} }
function registerControl(names, ...aliases) { export function registerControl(names, ...aliases) {
const name = Array.isArray(names) ? names[0] : names; const name = Array.isArray(names) ? names[0] : names;
let bag = {}; let bag = {};
bag[name] = createParam(names); bag[name] = createParam(names);
@ -191,7 +191,7 @@ export const { attack, att } = registerControl('attack', 'att');
* note("c e g b g e") * note("c e g b g e")
* .fm(4) * .fm(4)
* .fmh("<1 2 1.5 1.61>") * .fmh("<1 2 1.5 1.61>")
* .scope() * ._scope()
* *
*/ */
export const { fmh } = registerControl(['fmh', 'fmi'], 'fmh'); export const { fmh } = registerControl(['fmh', 'fmi'], 'fmh');
@ -205,7 +205,7 @@ export const { fmh } = registerControl(['fmh', 'fmi'], 'fmh');
* @example * @example
* note("c e g b g e") * note("c e g b g e")
* .fm("<0 1 2 8 32>") * .fm("<0 1 2 8 32>")
* .scope() * ._scope()
* *
*/ */
export const { fmi, fm } = registerControl(['fmi', 'fmh'], 'fm'); export const { fmi, fm } = registerControl(['fmi', 'fmh'], 'fm');
@ -221,7 +221,7 @@ export const { fmi, fm } = registerControl(['fmi', 'fmh'], 'fm');
* .fmdecay(.2) * .fmdecay(.2)
* .fmsustain(0) * .fmsustain(0)
* .fmenv("<exp lin>") * .fmenv("<exp lin>")
* .scope() * ._scope()
* *
*/ */
export const { fmenv } = registerControl('fmenv'); export const { fmenv } = registerControl('fmenv');
@ -234,7 +234,7 @@ export const { fmenv } = registerControl('fmenv');
* note("c e g b g e") * note("c e g b g e")
* .fm(4) * .fm(4)
* .fmattack("<0 .05 .1 .2>") * .fmattack("<0 .05 .1 .2>")
* .scope() * ._scope()
* *
*/ */
export const { fmattack } = registerControl('fmattack'); export const { fmattack } = registerControl('fmattack');
@ -248,7 +248,7 @@ export const { fmattack } = registerControl('fmattack');
* .fm(4) * .fm(4)
* .fmdecay("<.01 .05 .1 .2>") * .fmdecay("<.01 .05 .1 .2>")
* .fmsustain(.4) * .fmsustain(.4)
* .scope() * ._scope()
* *
*/ */
export const { fmdecay } = registerControl('fmdecay'); export const { fmdecay } = registerControl('fmdecay');
@ -262,7 +262,7 @@ export const { fmdecay } = registerControl('fmdecay');
* .fm(4) * .fm(4)
* .fmdecay(.1) * .fmdecay(.1)
* .fmsustain("<1 .75 .5 0>") * .fmsustain("<1 .75 .5 0>")
* .scope() * ._scope()
* *
*/ */
export const { fmsustain } = registerControl('fmsustain'); export const { fmsustain } = registerControl('fmsustain');
@ -392,7 +392,7 @@ export const { loop } = registerControl('loop');
* @synonyms loopb * @synonyms loopb
* @example * @example
* s("space").loop(1) * s("space").loop(1)
* .loopBegin("<0 .125 .25>").scope() * .loopBegin("<0 .125 .25>")._scope()
*/ */
export const { loopBegin, loopb } = registerControl('loopBegin', 'loopb'); export const { loopBegin, loopb } = registerControl('loopBegin', 'loopb');
/** /**
@ -405,7 +405,7 @@ export const { loopBegin, loopb } = registerControl('loopBegin', 'loopb');
* @synonyms loope * @synonyms loope
* @example * @example
* s("space").loop(1) * s("space").loop(1)
* .loopEnd("<1 .75 .5 .25>").scope() * .loopEnd("<1 .75 .5 .25>")._scope()
*/ */
export const { loopEnd, loope } = registerControl('loopEnd', 'loope'); export const { loopEnd, loope } = registerControl('loopEnd', 'loope');
/** /**
@ -430,6 +430,17 @@ export const { crush } = registerControl('crush');
*/ */
export const { coarse } = registerControl('coarse'); export const { coarse } = registerControl('coarse');
/**
* filter overdrive for supported filter types
*
* @name drive
* @param {number | Pattern} amount
* @example
* note("{f g g c d a a#}%16".sub(17)).s("supersaw").lpenv(8).lpf(150).lpq(.8).ftype('ladder').drive("<.5 4>")
*
*/
export const { drive } = registerControl('drive');
/** /**
* Allows you to set the output channels on the interface * Allows you to set the output channels on the interface
* *
@ -542,7 +553,7 @@ export const { cutoff, ctf, lpf, lp } = registerControl(['cutoff', 'resonance',
* @example * @example
* note("c2 e2 f2 g2") * note("c2 e2 f2 g2")
* .sound('sawtooth') * .sound('sawtooth')
* .lpf(500) * .lpf(300)
* .lpa(.5) * .lpa(.5)
* .lpenv("<4 2 1 0 -1 -2 -4>/4") * .lpenv("<4 2 1 0 -1 -2 -4>/4")
*/ */
@ -581,7 +592,7 @@ export const { bpenv, bpe } = registerControl('bpenv', 'bpe');
* @example * @example
* note("c2 e2 f2 g2") * note("c2 e2 f2 g2")
* .sound('sawtooth') * .sound('sawtooth')
* .lpf(500) * .lpf(300)
* .lpa("<.5 .25 .1 .01>/4") * .lpa("<.5 .25 .1 .01>/4")
* .lpenv(4) * .lpenv(4)
*/ */
@ -620,9 +631,8 @@ export const { bpattack, bpa } = registerControl('bpattack', 'bpa');
* @example * @example
* note("c2 e2 f2 g2") * note("c2 e2 f2 g2")
* .sound('sawtooth') * .sound('sawtooth')
* .lpf(500) * .lpf(300)
* .lpd("<.5 .25 .1 0>/4") * .lpd("<.5 .25 .1 0>/4")
* .lps(0.2)
* .lpenv(4) * .lpenv(4)
*/ */
export const { lpdecay, lpd } = registerControl('lpdecay', 'lpd'); export const { lpdecay, lpd } = registerControl('lpdecay', 'lpd');
@ -662,7 +672,7 @@ export const { bpdecay, bpd } = registerControl('bpdecay', 'bpd');
* @example * @example
* note("c2 e2 f2 g2") * note("c2 e2 f2 g2")
* .sound('sawtooth') * .sound('sawtooth')
* .lpf(500) * .lpf(300)
* .lpd(.5) * .lpd(.5)
* .lps("<0 .25 .5 1>/4") * .lps("<0 .25 .5 1>/4")
* .lpenv(4) * .lpenv(4)
@ -705,7 +715,7 @@ export const { bpsustain, bps } = registerControl('bpsustain', 'bps');
* note("c2 e2 f2 g2") * note("c2 e2 f2 g2")
* .sound('sawtooth') * .sound('sawtooth')
* .clip(.5) * .clip(.5)
* .lpf(500) * .lpf(300)
* .lpenv(4) * .lpenv(4)
* .lpr("<.5 .25 .1 0>/4") * .lpr("<.5 .25 .1 0>/4")
* .release(.5) * .release(.5)
@ -742,17 +752,28 @@ export const { hprelease, hpr } = registerControl('hprelease', 'hpr');
*/ */
export const { bprelease, bpr } = registerControl('bprelease', 'bpr'); export const { bprelease, bpr } = registerControl('bprelease', 'bpr');
/** /**
* Sets the filter type. The 24db filter is more aggressive. More types might be added in the future. * Sets the filter type. The ladder filter is more aggressive. More types might be added in the future.
* @name ftype * @name ftype
* @param {number | Pattern} type 12db (default) or 24db * @param {number | Pattern} type 12db (0), ladder (1), or 24db (2)
* @example * @example
* note("c2 e2 f2 g2") * note("{f g g c d a a#}%8").s("sawtooth").lpenv(4).lpf(500).ftype("<0 1 2>").lpq(1)
* @example
* note("c f g g a c d4").fast(2)
* .sound('sawtooth') * .sound('sawtooth')
* .lpf(500) * .lpf(200).fanchor(0)
* .bpenv(4) * .lpenv(3).lpq(1)
* .ftype("12db 24db") * .ftype("<ladder 12db 24db>")
*/ */
export const { ftype } = registerControl('ftype'); export const { ftype } = registerControl('ftype');
/**
* controls the center of the filter envelope. 0 is unipolar positive, .5 is bipolar, 1 is unipolar negative
* @name fanchor
* @param {number | Pattern} center 0 to 1
* @example
* note("{f g g c d a a#}%8").s("sawtooth").lpf("{1000}%2")
* .lpenv(8).fanchor("<0 .5 1>")
*/
export const { fanchor } = registerControl('fanchor'); export const { fanchor } = registerControl('fanchor');
/** /**
* Applies the cutoff frequency of the **h**igh-**p**ass **f**ilter. * Applies the cutoff frequency of the **h**igh-**p**ass **f**ilter.
@ -779,10 +800,12 @@ export const { fanchor } = registerControl('fanchor');
* @example * @example
* note("a e") * note("a e")
* .vib("<.5 1 2 4 8 16>") * .vib("<.5 1 2 4 8 16>")
* ._scope()
* @example * @example
* // change the modulation depth with ":" * // change the modulation depth with ":"
* note("a e") * note("a e")
* .vib("<.5 1 2 4 8 16>:12") * .vib("<.5 1 2 4 8 16>:12")
* ._scope()
*/ */
export const { vib, vibrato, v } = registerControl(['vib', 'vibmod'], 'vibrato', 'v'); export const { vib, vibrato, v } = registerControl(['vib', 'vibmod'], 'vibrato', 'v');
/** /**
@ -803,10 +826,12 @@ export const { noise } = registerControl('noise');
* @example * @example
* note("a e").vib(4) * note("a e").vib(4)
* .vibmod("<.25 .5 1 2 12>") * .vibmod("<.25 .5 1 2 12>")
* ._scope()
* @example * @example
* // change the vibrato frequency with ":" * // change the vibrato frequency with ":"
* note("a e") * note("a e")
* .vibmod("<.25 .5 1 2 12>:8") * .vibmod("<.25 .5 1 2 12>:8")
* ._scope()
*/ */
export const { vibmod, vmod } = registerControl(['vibmod', 'vib'], 'vmod'); export const { vibmod, vmod } = registerControl(['vibmod', 'vib'], 'vmod');
export const { hcutoff, hpf, hp } = registerControl(['hcutoff', 'hresonance', 'hpenv'], 'hpf', 'hp'); export const { hcutoff, hpf, hp } = registerControl(['hcutoff', 'hresonance', 'hpenv'], 'hpf', 'hp');

20
packages/core/cyclist.mjs
View File

@ -8,8 +8,19 @@ import createClock from './zyklus.mjs';
import { logger } from './logger.mjs'; import { logger } from './logger.mjs';
export class Cyclist { export class Cyclist {
constructor({ interval, onTrigger, onToggle, onError, getTime, latency = 0.1, setInterval, clearInterval }) { constructor({
interval,
onTrigger,
onToggle,
onError,
getTime,
latency = 0.1,
setInterval,
clearInterval,
beforeStart,
}) {
this.started = false; this.started = false;
this.beforeStart = beforeStart;
this.cps = 0.5; this.cps = 0.5;
this.num_ticks_since_cps_change = 0; this.num_ticks_since_cps_change = 0;
this.lastTick = 0; // absolute time when last tick (clock callback) happened this.lastTick = 0; // absolute time when last tick (clock callback) happened
@ -82,7 +93,8 @@ export class Cyclist {
this.started = v; this.started = v;
this.onToggle?.(v); this.onToggle?.(v);
} }
start() { async start() {
await this.beforeStart?.();
this.num_ticks_since_cps_change = 0; this.num_ticks_since_cps_change = 0;
this.num_cycles_at_cps_change = 0; this.num_cycles_at_cps_change = 0;
if (!this.pattern) { if (!this.pattern) {
@ -103,10 +115,10 @@ export class Cyclist {
this.lastEnd = 0; this.lastEnd = 0;
this.setStarted(false); this.setStarted(false);
} }
setPattern(pat, autostart = false) { async setPattern(pat, autostart = false) {
this.pattern = pat; this.pattern = pat;
if (autostart && !this.started) { if (autostart && !this.started) {
this.start(); await this.start();
} }
} }
setCps(cps = 0.5) { setCps(cps = 0.5) {

4
packages/core/evaluate.mjs
View File

@ -37,11 +37,11 @@ function safeEval(str, options = {}) {
return Function(body)(); return Function(body)();
} }
export const evaluate = async (code, transpiler) => { export const evaluate = async (code, transpiler, transpilerOptions) => {
let meta = {}; let meta = {};
if (transpiler) { if (transpiler) {
// transform syntactically correct js code to semantically usable code // transform syntactically correct js code to semantically usable code
const transpiled = transpiler(code); const transpiled = transpiler(code, transpilerOptions);
code = transpiled.output; code = transpiled.output;
meta = transpiled; meta = transpiled;
} }

36
packages/core/fraction.mjs
View File

@ -6,6 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
import Fraction from 'fraction.js'; import Fraction from 'fraction.js';
import { TimeSpan } from './timespan.mjs'; import { TimeSpan } from './timespan.mjs';
import { removeUndefineds } from './util.mjs';
// Returns the start of the cycle. // Returns the start of the cycle.
Fraction.prototype.sam = function () { Fraction.prototype.sam = function () {
@ -47,6 +48,10 @@ Fraction.prototype.eq = function (other) {
return this.compare(other) == 0; return this.compare(other) == 0;
}; };
Fraction.prototype.ne = function (other) {
return this.compare(other) != 0;
};
Fraction.prototype.max = function (other) { Fraction.prototype.max = function (other) {
return this.gt(other) ? this : other; return this.gt(other) ? this : other;
}; };
@ -60,6 +65,22 @@ Fraction.prototype.min = function (other) {
return this.lt(other) ? this : other; return this.lt(other) ? this : other;
}; };
Fraction.prototype.mulmaybe = function (other) {
return other !== undefined ? this.mul(other) : undefined;
};
Fraction.prototype.divmaybe = function (other) {
return other !== undefined ? this.div(other) : undefined;
};
Fraction.prototype.addmaybe = function (other) {
return other !== undefined ? this.add(other) : undefined;
};
Fraction.prototype.submaybe = function (other) {
return other !== undefined ? this.sub(other) : undefined;
};
Fraction.prototype.show = function (/* excludeWhole = false */) { Fraction.prototype.show = function (/* excludeWhole = false */) {
// return this.toFraction(excludeWhole); // return this.toFraction(excludeWhole);
return this.s * this.n + '/' + this.d; return this.s * this.n + '/' + this.d;
@ -85,11 +106,24 @@ const fraction = (n) => {
}; };
export const gcd = (...fractions) => { export const gcd = (...fractions) => {
fractions = removeUndefineds(fractions);
if (fractions.length === 0) {
return undefined;
}
return fractions.reduce((gcd, fraction) => gcd.gcd(fraction), fraction(1)); return fractions.reduce((gcd, fraction) => gcd.gcd(fraction), fraction(1));
}; };
export const lcm = (...fractions) => { export const lcm = (...fractions) => {
return fractions.reduce((lcm, fraction) => lcm.lcm(fraction), fraction(1)); fractions = removeUndefineds(fractions);
if (fractions.length === 0) {
return undefined;
}
return fractions.reduce(
(lcm, fraction) => (lcm === undefined || fraction === undefined ? undefined : lcm.lcm(fraction)),
fraction(1),
);
}; };
fraction._original = Fraction; fraction._original = Fraction;

3
packages/core/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/core", "name": "@strudel/core",
"version": "1.0.1", "version": "1.1.0",
"description": "Port of Tidal Cycles to JavaScript", "description": "Port of Tidal Cycles to JavaScript",
"main": "index.mjs", "main": "index.mjs",
"type": "module", "type": "module",
@ -9,6 +9,7 @@
}, },
"scripts": { "scripts": {
"test": "vitest run", "test": "vitest run",
"bench": "vitest bench",
"build": "vite build", "build": "vite build",
"prepublishOnly": "pnpm build" "prepublishOnly": "pnpm build"
}, },

367
packages/core/pattern.mjs
View File

@ -10,12 +10,29 @@ import Hap from './hap.mjs';
import State from './state.mjs'; import State from './state.mjs';
import { unionWithObj } from './value.mjs'; import { unionWithObj } from './value.mjs';
import { compose, removeUndefineds, flatten, id, listRange, curry, _mod, numeralArgs, parseNumeral } from './util.mjs'; import {
uniqsortr,
removeUndefineds,
flatten,
id,
listRange,
curry,
_mod,
numeralArgs,
parseNumeral,
pairs,
} from './util.mjs';
import drawLine from './drawLine.mjs'; import drawLine from './drawLine.mjs';
import { logger } from './logger.mjs'; import { logger } from './logger.mjs';
let stringParser; let stringParser;
let __tactus = true;
export const calculateTactus = function (x) {
__tactus = x ? true : false;
};
// parser is expected to turn a string into a pattern // parser is expected to turn a string into a pattern
// if set, the reify function will parse all strings with it // if set, the reify function will parse all strings with it
// intended to use with mini to automatically interpret all strings as mini notation // intended to use with mini to automatically interpret all strings as mini notation
@ -31,16 +48,16 @@ export class Pattern {
*/ */
constructor(query, tactus = undefined) { constructor(query, tactus = undefined) {
this.query = query; this.query = query;
this._Pattern = true; // this property is used to detect if a pattern that fails instanceof Pattern is an instance of another Pattern this._Pattern = true; // this property is used to detectinstance of another Pattern
this.__tactus = tactus; // in terms of number of beats per cycle this.tactus = tactus; // in terms of number of steps per cycle
} }
get tactus() { get tactus() {
return this.__tactus ?? Fraction(1); return this.__tactus;
} }
set tactus(tactus) { set tactus(tactus) {
this.__tactus = Fraction(tactus); this.__tactus = tactus === undefined ? undefined : Fraction(tactus);
} }
setTactus(tactus) { setTactus(tactus) {
@ -48,6 +65,17 @@ export class Pattern {
return this; return this;
} }
withTactus(f) {
if (!__tactus) {
return this;
}
return new Pattern(this.query, this.tactus === undefined ? undefined : f(this.tactus));
}
get hasTactus() {
return this.tactus !== undefined;
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Haskell-style functor, applicative and monadic operations // Haskell-style functor, applicative and monadic operations
@ -66,6 +94,14 @@ export class Pattern {
return result; return result;
} }
// runs func on query state
withState(func) {
return this.withHaps((haps, state) => {
func(state);
return haps;
});
}
/** /**
* see `withValue` * see `withValue`
* @noAutocomplete * @noAutocomplete
@ -130,7 +166,9 @@ export class Pattern {
return span_a.intersection_e(span_b); return span_a.intersection_e(span_b);
}; };
const result = pat_func.appWhole(whole_func, pat_val); const result = pat_func.appWhole(whole_func, pat_val);
result.tactus = lcm(pat_val.tactus, pat_func.tactus); if (__tactus) {
result.tactus = lcm(pat_val.tactus, pat_func.tactus);
}
return result; return result;
} }
@ -242,12 +280,12 @@ export class Pattern {
} }
outerBind(func) { outerBind(func) {
return this.bindWhole((a) => a, func); return this.bindWhole((a) => a, func).setTactus(this.tactus);
} }
outerJoin() { outerJoin() {
// Flattens a pattern of patterns into a pattern, where wholes are // Flattens a pattern of patterns into a pattern, where wholes are
// taken from inner haps. // taken from outer haps.
return this.outerBind(id); return this.outerBind(id);
} }
@ -1137,24 +1175,24 @@ function _composeOp(a, b, func) {
export const polyrhythm = stack; export const polyrhythm = stack;
export const pr = stack; export const pr = stack;
export const pm = polymeter; export const pm = s_polymeter;
// methods that create patterns, which are added to patternified Pattern methods // methods that create patterns, which are added to patternified Pattern methods
// TODO: remove? this is only used in old transpiler (shapeshifter) // TODO: remove? this is only used in old transpiler (shapeshifter)
Pattern.prototype.factories = { // Pattern.prototype.factories = {
pure, // pure,
stack, // stack,
slowcat, // slowcat,
fastcat, // fastcat,
cat, // cat,
timecat, // timecat,
sequence, // sequence,
seq, // seq,
polymeter, // polymeter,
pm, // pm,
polyrhythm, // polyrhythm,
pr, // pr,
}; // };
// the magic happens in Pattern constructor. Keeping this in prototype enables adding methods from the outside (e.g. see tonal.ts) // the magic happens in Pattern constructor. Keeping this in prototype enables adding methods from the outside (e.g. see tonal.ts)
// Elemental patterns // Elemental patterns
@ -1166,7 +1204,7 @@ Pattern.prototype.factories = {
* @example * @example
* gap(3) // "~@3" * gap(3) // "~@3"
*/ */
export const gap = (tactus) => new Pattern(() => [], Fraction(tactus)); export const gap = (tactus) => new Pattern(() => [], tactus);
/** /**
* Does absolutely nothing.. * Does absolutely nothing..
@ -1235,7 +1273,9 @@ export function stack(...pats) {
pats = pats.map((pat) => (Array.isArray(pat) ? sequence(...pat) : reify(pat))); pats = pats.map((pat) => (Array.isArray(pat) ? sequence(...pat) : reify(pat)));
const query = (state) => flatten(pats.map((pat) => pat.query(state))); const query = (state) => flatten(pats.map((pat) => pat.query(state)));
const result = new Pattern(query); const result = new Pattern(query);
result.tactus = lcm(...pats.map((pat) => pat.tactus)); if (__tactus) {
result.tactus = lcm(...pats.map((pat) => pat.tactus));
}
return result; return result;
} }
@ -1248,20 +1288,20 @@ function _stackWith(func, pats) {
return pats[0]; return pats[0];
} }
const [left, ...right] = pats.map((pat) => pat.tactus); const [left, ...right] = pats.map((pat) => pat.tactus);
const tactus = left.maximum(...right); const tactus = __tactus ? left.maximum(...right) : undefined;
return stack(...func(tactus, pats)); return stack(...func(tactus, pats));
} }
export function stackLeft(...pats) { export function stackLeft(...pats) {
return _stackWith( return _stackWith(
(tactus, pats) => pats.map((pat) => (pat.tactus.eq(tactus) ? pat : timecat(pat, gap(tactus.sub(pat.tactus))))), (tactus, pats) => pats.map((pat) => (pat.tactus.eq(tactus) ? pat : s_cat(pat, gap(tactus.sub(pat.tactus))))),
pats, pats,
); );
} }
export function stackRight(...pats) { export function stackRight(...pats) {
return _stackWith( return _stackWith(
(tactus, pats) => pats.map((pat) => (pat.tactus.eq(tactus) ? pat : timecat(gap(tactus.sub(pat.tactus)), pat))), (tactus, pats) => pats.map((pat) => (pat.tactus.eq(tactus) ? pat : s_cat(gap(tactus.sub(pat.tactus)), pat))),
pats, pats,
); );
} }
@ -1274,7 +1314,7 @@ export function stackCentre(...pats) {
return pat; return pat;
} }
const g = gap(tactus.sub(pat.tactus).div(2)); const g = gap(tactus.sub(pat.tactus).div(2));
return timecat(g, pat, g); return s_cat(g, pat, g);
}), }),
pats, pats,
); );
@ -1288,7 +1328,7 @@ export function stackBy(by, ...pats) {
left: stackLeft, left: stackLeft,
right: stackRight, right: stackRight,
expand: stack, expand: stack,
repeat: (...args) => polymeterSteps(tactus, ...args), repeat: (...args) => s_polymeterSteps(tactus, ...args),
}; };
return by return by
.inhabit(lookup) .inhabit(lookup)
@ -1328,7 +1368,7 @@ export function slowcat(...pats) {
const offset = span.begin.floor().sub(span.begin.div(pats.length).floor()); const offset = span.begin.floor().sub(span.begin.div(pats.length).floor());
return pat.withHapTime((t) => t.add(offset)).query(state.setSpan(span.withTime((t) => t.sub(offset)))); return pat.withHapTime((t) => t.add(offset)).query(state.setSpan(span.withTime((t) => t.sub(offset))));
}; };
const tactus = lcm(...pats.map((x) => x.tactus)); const tactus = __tactus ? lcm(...pats.map((x) => x.tactus)) : undefined;
return new Pattern(query).splitQueries().setTactus(tactus); return new Pattern(query).splitQueries().setTactus(tactus);
} }
@ -1374,7 +1414,7 @@ export function cat(...pats) {
export function arrange(...sections) { export function arrange(...sections) {
const total = sections.reduce((sum, [cycles]) => sum + cycles, 0); const total = sections.reduce((sum, [cycles]) => sum + cycles, 0);
sections = sections.map(([cycles, section]) => [cycles, section.fast(cycles)]); sections = sections.map(([cycles, section]) => [cycles, section.fast(cycles)]);
return timecat(...sections).slow(total); return s_cat(...sections).slow(total);
} }
export function fastcat(...pats) { export function fastcat(...pats) {
@ -1454,7 +1494,7 @@ export const func = curry((a, b) => reify(b).func(a));
* @noAutocomplete * @noAutocomplete
* *
*/ */
export function register(name, func, patternify = true, preserveTactus = false) { export function register(name, func, patternify = true, preserveTactus = false, join = (x) => x.innerJoin()) {
if (Array.isArray(name)) { if (Array.isArray(name)) {
const result = {}; const result = {};
for (const name_item of name) { for (const name_item of name) {
@ -1491,7 +1531,7 @@ export function register(name, func, patternify = true, preserveTactus = false)
return func(...args, pat); return func(...args, pat);
}; };
mapFn = curry(mapFn, null, arity - 1); mapFn = curry(mapFn, null, arity - 1);
result = right.reduce((acc, p) => acc.appLeft(p), left.fmap(mapFn)).innerJoin(); result = join(right.reduce((acc, p) => acc.appLeft(p), left.fmap(mapFn)));
} }
} }
if (preserveTactus) { if (preserveTactus) {
@ -1535,6 +1575,11 @@ export function register(name, func, patternify = true, preserveTactus = false)
return curry(pfunc, null, arity); return curry(pfunc, null, arity);
} }
// Like register, but defaults to stepJoin
function stepRegister(name, func, patternify = true, preserveTactus = false, join = (x) => x.stepJoin()) {
return register(name, func, patternify, preserveTactus, join);
}
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
// Numerical transformations // Numerical transformations
@ -1742,7 +1787,9 @@ export const { focusSpan, focusspan } = register(['focusSpan', 'focusspan'], fun
*/ */
export const ply = register('ply', function (factor, pat) { export const ply = register('ply', function (factor, pat) {
const result = pat.fmap((x) => pure(x)._fast(factor)).squeezeJoin(); const result = pat.fmap((x) => pure(x)._fast(factor)).squeezeJoin();
result.tactus = pat.tactus.mul(factor); if (__tactus) {
result.tactus = Fraction(factor).mulmaybe(pat.tactus);
}
return result; return result;
}); });
@ -1757,16 +1804,19 @@ export const ply = register('ply', function (factor, pat) {
* @example * @example
* s("bd hh sd hh").fast(2) // s("[bd hh sd hh]*2") * s("bd hh sd hh").fast(2) // s("[bd hh sd hh]*2")
*/ */
export const { fast, density } = register(['fast', 'density'], function (factor, pat) { export const { fast, density } = register(
if (factor === 0) { ['fast', 'density'],
return silence; function (factor, pat) {
} if (factor === 0) {
factor = Fraction(factor); return silence;
const fastQuery = pat.withQueryTime((t) => t.mul(factor)); }
const result = fastQuery.withHapTime((t) => t.div(factor)); factor = Fraction(factor);
result.tactus = factor.mul(pat.tactus); const fastQuery = pat.withQueryTime((t) => t.mul(factor));
return result; return fastQuery.withHapTime((t) => t.div(factor)).setTactus(pat.tactus);
}); },
true,
true,
);
/** /**
* Both speeds up the pattern (like 'fast') and the sample playback (like 'speed'). * Both speeds up the pattern (like 'fast') and the sample playback (like 'speed').
@ -1934,7 +1984,7 @@ export const zoom = register('zoom', function (s, e, pat) {
return nothing; return nothing;
} }
const d = e.sub(s); const d = e.sub(s);
const tactus = pat.tactus.mul(d); const tactus = __tactus ? pat.tactus.mulmaybe(d) : undefined;
return pat return pat
.withQuerySpan((span) => span.withCycle((t) => t.mul(d).add(s))) .withQuerySpan((span) => span.withCycle((t) => t.mul(d).add(s)))
.withHapSpan((span) => span.withCycle((t) => t.sub(s).div(d))) .withHapSpan((span) => span.withCycle((t) => t.sub(s).div(d)))
@ -1976,6 +2026,24 @@ export const segment = register('segment', function (rate, pat) {
return pat.struct(pure(true)._fast(rate)).setTactus(rate); return pat.struct(pure(true)._fast(rate)).setTactus(rate);
}); });
/**
* The function `swingBy x n` breaks each cycle into `n` slices, and then delays events in the second half of each slice by the amount `x`, which is relative to the size of the (half) slice. So if `x` is 0 it does nothing, `0.5` delays for half the note duration, and 1 will wrap around to doing nothing again. The end result is a shuffle or swing-like rhythm
* @param {number} subdivision
* @param {number} offset
* @example
* s("hh*8").swingBy(1/3, 4)
*/
export const swingBy = register('swingBy', (swing, n, pat) => pat.inside(n, late(seq(0, swing / 2))));
/**
* Shorthand for swingBy with 1/3:
* @param {number} subdivision
* @example
* s("hh*8").swing(4)
* // s("hh*8").swingBy(1/3, 4)
*/
export const swing = register('swing', (n, pat) => pat.swingBy(1 / 3, n));
/** /**
* Swaps 1s and 0s in a binary pattern. * Swaps 1s and 0s in a binary pattern.
* @name invert * @name invert
@ -2131,7 +2199,7 @@ export const { juxBy, juxby } = register(['juxBy', 'juxby'], function (by, func,
const left = pat.withValue((val) => Object.assign({}, val, { pan: elem_or(val, 'pan', 0.5) - by })); const left = pat.withValue((val) => Object.assign({}, val, { pan: elem_or(val, 'pan', 0.5) - by }));
const right = func(pat.withValue((val) => Object.assign({}, val, { pan: elem_or(val, 'pan', 0.5) + by }))); const right = func(pat.withValue((val) => Object.assign({}, val, { pan: elem_or(val, 'pan', 0.5) + by })));
return stack(left, right).setTactus(lcm(left.tactus, right.tactus)); return stack(left, right).setTactus(__tactus ? lcm(left.tactus, right.tactus) : undefined);
}); });
/** /**
@ -2250,7 +2318,13 @@ export const { iterBack, iterback } = register(
export const { repeatCycles } = register( export const { repeatCycles } = register(
'repeatCycles', 'repeatCycles',
function (n, pat) { function (n, pat) {
return slowcat(...Array(n).fill(pat)); return new Pattern(function (state) {
const cycle = state.span.begin.sam();
const source_cycle = cycle.div(n).sam();
const delta = cycle.sub(source_cycle);
state = state.withSpan((span) => span.withTime((spant) => spant.sub(delta)));
return pat.query(state).map((hap) => hap.withSpan((span) => span.withTime((spant) => spant.add(delta))));
}).splitQueries();
}, },
true, true,
true, true,
@ -2357,14 +2431,69 @@ Pattern.prototype.tag = function (tag) {
// Tactus-related functions, i.e. ones that do stepwise // Tactus-related functions, i.e. ones that do stepwise
// transformations // transformations
Pattern.prototype.stepJoin = function () {
const pp = this;
const first_t = s_cat(..._retime(_slices(pp.queryArc(0, 1)))).tactus;
const q = function (state) {
const shifted = pp.early(state.span.begin.sam());
const haps = shifted.query(state.setSpan(new TimeSpan(Fraction(0), Fraction(1))));
const pat = s_cat(..._retime(_slices(haps)));
return pat.query(state);
};
return new Pattern(q, first_t);
};
export function _retime(timedHaps) {
const occupied_perc = timedHaps.filter((t, pat) => pat.hasTactus).reduce((a, b) => a.add(b), Fraction(0));
const occupied_tactus = removeUndefineds(timedHaps.map((t, pat) => pat.tactus)).reduce(
(a, b) => a.add(b),
Fraction(0),
);
const total_tactus = occupied_perc.eq(0) ? undefined : occupied_tactus.div(occupied_perc);
function adjust(dur, pat) {
if (pat.tactus === undefined) {
return [dur.mulmaybe(total_tactus), pat];
}
return [pat.tactus, pat];
}
return timedHaps.map((x) => adjust(...x));
}
export function _slices(haps) {
// slices evs = map (\s -> ((snd s - fst s), stack $ map value $ fit s evs))
// $ pairs $ sort $ nubOrd $ 0:1:concatMap (\ev -> start (part ev):stop (part ev):[]) evs
const breakpoints = flatten(haps.map((hap) => [hap.part.begin, hap.part.end]));
const unique = uniqsortr([Fraction(0), Fraction(1), ...breakpoints]);
const slicespans = pairs(unique);
return slicespans.map((s) => [
s[1].sub(s[0]),
stack(..._fitslice(new TimeSpan(...s), haps).map((x) => x.value.withHap((h) => h.setContext(h.combineContext(x))))),
]);
}
export function _fitslice(span, haps) {
return removeUndefineds(haps.map((hap) => _match(span, hap)));
}
export function _match(span, hap_p) {
const subspan = span.intersection(hap_p.part);
if (subspan == undefined) {
return undefined;
}
return new Hap(hap_p.whole, subspan, hap_p.value, hap_p.context);
}
/** /**
* *EXPERIMENTAL* - Speeds a pattern up or down, to fit to the given metrical 'tactus'. * *EXPERIMENTAL* - Speeds a pattern up or down, to fit to the given number of steps per cycle (aka tactus).
* @example * @example
* s("bd sd cp").toTactus(4) * s("bd sd cp").steps(4)
* // The same as s("{bd sd cp}%4") * // The same as s("{bd sd cp}%4")
*/ */
export const toTactus = register('toTactus', function (targetTactus, pat) { export const steps = register('steps', function (targetTactus, pat) {
if (pat.tactus.eq(0)) { if (pat.tactus === undefined) {
return pat;
}
if (pat.tactus.eq(Fraction(0))) {
// avoid divide by zero.. // avoid divide by zero..
return nothing; return nothing;
} }
@ -2397,14 +2526,14 @@ export function _polymeterListSteps(steps, ...args) {
* Aligns one or more given patterns to the given number of steps per cycle. * Aligns one or more given patterns to the given number of steps per cycle.
* This relies on patterns having coherent number of steps per cycle, * This relies on patterns having coherent number of steps per cycle,
* *
* @name polymeterSteps * @name s_polymeterSteps
* @param {number} steps how many items are placed in one cycle * @param {number} steps how many items are placed in one cycle
* @param {any[]} patterns one or more patterns * @param {any[]} patterns one or more patterns
* @example * @example
* // the same as "{c d, e f g}%4" * // the same as "{c d, e f g}%4"
* polymeterSteps(4, "c d", "e f g") * s_polymeterSteps(4, "c d", "e f g").note()
*/ */
export function polymeterSteps(steps, ...args) { export function s_polymeterSteps(steps, ...args) {
if (args.length == 0) { if (args.length == 0) {
return silence; return silence;
} }
@ -2413,27 +2542,33 @@ export function polymeterSteps(steps, ...args) {
return _polymeterListSteps(steps, ...args); return _polymeterListSteps(steps, ...args);
} }
return polymeter(...args).toTactus(steps); return s_polymeter(...args).steps(steps);
} }
/** /**
* *EXPERIMENTAL* - Combines the given lists of patterns with the same pulse, creating polymeters when different sized sequences are used. * *EXPERIMENTAL* - Combines the given lists of patterns with the same pulse, creating polymeters when different sized sequences are used.
* @synonyms pm * @synonyms pm
* @example * @example
* // The same as "{c eb g, c2 g2}" * // The same as note("{c eb g, c2 g2}")
* polymeter("c eb g", "c2 g2") * s_polymeter("c eb g", "c2 g2").note()
* *
*/ */
export function polymeter(...args) { export function s_polymeter(...args) {
if (Array.isArray(args[0])) { if (Array.isArray(args[0])) {
// Support old behaviour // Support old behaviour
return _polymeterListSteps(0, ...args); return _polymeterListSteps(0, ...args);
} }
// TODO currently ignoring arguments without tactus...
args = args.filter((arg) => arg.hasTactus);
if (args.length == 0) { if (args.length == 0) {
return silence; return silence;
} }
const tactus = args[0].tactus; const tactus = args[0].tactus;
if (tactus.eq(Fraction(0))) {
return nothing;
}
const [head, ...tail] = args; const [head, ...tail] = args;
const result = stack(head, ...tail.map((pat) => pat._slow(pat.tactus.div(tactus)))); const result = stack(head, ...tail.map((pat) => pat._slow(pat.tactus.div(tactus))));
@ -2443,18 +2578,38 @@ export function polymeter(...args) {
/** Sequences patterns like `seq`, but each pattern has a length, relative to the whole. /** Sequences patterns like `seq`, but each pattern has a length, relative to the whole.
* This length can either be provided as a [length, pattern] pair, or inferred from * This length can either be provided as a [length, pattern] pair, or inferred from
* the pattern's 'tactus', generally inferred by the mininotation. * the pattern's 'tactus', generally inferred by the mininotation. Has the alias `timecat`.
* @name s_cat
* @synonyms timeCat, timecat
* @return {Pattern} * @return {Pattern}
* @example * @example
* timecat([3,"e3"],[1, "g3"]).note() * s_cat([3,"e3"],[1, "g3"]).note()
* // the same as "e3@3 g3".note() * // the same as "e3@3 g3".note()
* @example * @example
* timecat("bd sd cp","hh hh").sound() * s_cat("bd sd cp","hh hh").sound()
* // the same as "bd sd cp hh hh".sound() * // the same as "bd sd cp hh hh".sound()
*/ */
export function timecat(...timepats) { export function s_cat(...timepats) {
if (timepats.length === 0) {
return nothing;
}
const findtactus = (x) => (Array.isArray(x) ? x : [x.tactus, x]); const findtactus = (x) => (Array.isArray(x) ? x : [x.tactus, x]);
timepats = timepats.map(findtactus); timepats = timepats.map(findtactus);
if (timepats.find((x) => x[0] === undefined)) {
const times = timepats.map((a) => a[0]).filter((x) => x !== undefined);
if (times.length === 0) {
return fastcat(...timepats.map((x) => x[1]));
}
if (times.length === timepats.length) {
return nothing;
}
const avg = times.reduce((a, b) => a.add(b), Fraction(0)).div(times.length);
for (let timepat of timepats) {
if (timepat[0] === undefined) {
timepat[0] = avg;
}
}
}
if (timepats.length == 1) { if (timepats.length == 1) {
const result = reify(timepats[0][1]); const result = reify(timepats[0][1]);
result.tactus = timepats[0][0]; result.tactus = timepats[0][0];
@ -2477,18 +2632,19 @@ export function timecat(...timepats) {
return result; return result;
} }
/** Deprecated alias for `timecat` */ /** Aliases for `s_cat` */
export const timeCat = timecat; export const timecat = s_cat;
export const timeCat = s_cat;
/** /**
* *EXPERIMENTAL* - Concatenates patterns stepwise, according to their 'tactus'. * *EXPERIMENTAL* - Concatenates patterns stepwise, according to their 'tactus'.
* Similar to `timecat`, but if an argument is a list, the whole pattern will be repeated for each element in the list. * Similar to `s_cat`, but if an argument is a list, the whole pattern will alternate between the elements in the list.
* *
* @return {Pattern} * @return {Pattern}
* @example * @example
* stepcat(["bd cp", "mt"], "bd").sound() * s_alt(["bd cp", "mt"], "bd").sound()
*/ */
export function stepcat(...groups) { export function s_alt(...groups) {
groups = groups.map((a) => (Array.isArray(a) ? a.map(reify) : [reify(a)])); groups = groups.map((a) => (Array.isArray(a) ? a.map(reify) : [reify(a)]));
const cycles = lcm(...groups.map((x) => Fraction(x.length))); const cycles = lcm(...groups.map((x) => Fraction(x.length)));
@ -2497,9 +2653,9 @@ export function stepcat(...groups) {
for (let cycle = 0; cycle < cycles; ++cycle) { for (let cycle = 0; cycle < cycles; ++cycle) {
result.push(...groups.map((x) => (x.length == 0 ? silence : x[cycle % x.length]))); result.push(...groups.map((x) => (x.length == 0 ? silence : x[cycle % x.length])));
} }
result = result.filter((x) => x.tactus > 0); result = result.filter((x) => x.hasTactus && x.tactus > 0);
const tactus = result.reduce((a, b) => a.add(b.tactus), Fraction(0)); const tactus = result.reduce((a, b) => a.add(b.tactus), Fraction(0));
result = timecat(...result); result = s_cat(...result);
result.tactus = tactus; result.tactus = tactus;
return result; return result;
} }
@ -2507,7 +2663,10 @@ export function stepcat(...groups) {
/** /**
* *EXPERIMENTAL* - Retains the given number of steps in a pattern (and dropping the rest), according to its 'tactus'. * *EXPERIMENTAL* - Retains the given number of steps in a pattern (and dropping the rest), according to its 'tactus'.
*/ */
export const stepwax = register('stepwax', function (i, pat) { export const s_add = stepRegister('s_add', function (i, pat) {
if (!pat.hasTactus) {
return nothing;
}
if (pat.tactus.lte(0)) { if (pat.tactus.lte(0)) {
return nothing; return nothing;
} }
@ -2535,23 +2694,40 @@ export const stepwax = register('stepwax', function (i, pat) {
/** /**
* *EXPERIMENTAL* - Removes the given number of steps from a pattern, according to its 'tactus'. * *EXPERIMENTAL* - Removes the given number of steps from a pattern, according to its 'tactus'.
*/ */
export const stepwane = register('stepwane', function (i, pat) { export const s_sub = stepRegister('s_sub', function (i, pat) {
if (!pat.hasTactus) {
return nothing;
}
i = Fraction(i); i = Fraction(i);
if (i.lt(0)) { if (i.lt(0)) {
return pat.stepwax(Fraction(0).sub(pat.tactus.add(i))); return pat.s_add(Fraction(0).sub(pat.tactus.add(i)));
} }
return pat.stepwax(pat.tactus.sub(i)); return pat.s_add(pat.tactus.sub(i));
});
export const s_expand = stepRegister('s_expand', function (factor, pat) {
return pat.withTactus((t) => t.mul(Fraction(factor)));
});
export const s_contract = stepRegister('s_contract', function (factor, pat) {
return pat.withTactus((t) => t.div(Fraction(factor)));
}); });
/** /**
* *EXPERIMENTAL* * *EXPERIMENTAL*
*/ */
Pattern.prototype.taperlist = function (amount, times) { Pattern.prototype.s_taperlist = function (amount, times) {
const pat = this; const pat = this;
if (!pat.hasTactus) {
return [pat];
}
times = times - 1; times = times - 1;
if (times === 0) { if (times === 0) {
return pat; return [pat];
} }
const list = []; const list = [];
@ -2568,23 +2744,33 @@ Pattern.prototype.taperlist = function (amount, times) {
} }
return list; return list;
}; };
export const taperlist = (amount, times, pat) => pat.taperlist(amount, times); export const s_taperlist = (amount, times, pat) => pat.s_taperlist(amount, times);
/** /**
* *EXPERIMENTAL* * *EXPERIMENTAL*
*/ */
export const steptaper = register('steptaper', function (amount, times, pat) { export const s_taper = register(
const list = pat.taperlist(amount, times); 's_taper',
const result = timecat(...list); function (amount, times, pat) {
result.tactus = list.reduce((a, b) => a.add(b.tactus), Fraction(0)); if (!pat.hasTactus) {
return result; return nothing;
}); }
const list = pat.s_taperlist(amount, times);
const result = s_cat(...list);
result.tactus = list.reduce((a, b) => a.add(b.tactus), Fraction(0));
return result;
},
true,
false,
(x) => x.stepJoin(),
);
/** /**
* *EXPERIMENTAL* * *EXPERIMENTAL*
*/ */
Pattern.prototype.steptour = function (...many) { Pattern.prototype.s_tour = function (...many) {
return stepcat( return s_cat(
...[].concat( ...[].concat(
...many.map((x, i) => [...many.slice(0, many.length - i), this, ...many.slice(many.length - i)]), ...many.map((x, i) => [...many.slice(0, many.length - i), this, ...many.slice(many.length - i)]),
this, this,
@ -2593,8 +2779,8 @@ Pattern.prototype.steptour = function (...many) {
); );
}; };
export const steptour = function (pat, ...many) { export const s_tour = function (pat, ...many) {
return pat.steptour(...many); return pat.s_tour(...many);
}; };
////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////
@ -2621,7 +2807,7 @@ export const chop = register('chop', function (n, pat) {
const func = function (o) { const func = function (o) {
return sequence(slice_objects.map((slice_o) => Object.assign({}, o, slice_o))); return sequence(slice_objects.map((slice_o) => Object.assign({}, o, slice_o)));
}; };
return pat.squeezeBind(func).setTactus(pat.tactus.mul(n)); return pat.squeezeBind(func).setTactus(__tactus ? Fraction(n).mulmaybe(pat.tactus) : undefined);
}); });
/** /**
@ -2636,7 +2822,10 @@ export const striate = register('striate', function (n, pat) {
const slices = Array.from({ length: n }, (x, i) => i); const slices = Array.from({ length: n }, (x, i) => i);
const slice_objects = slices.map((i) => ({ begin: i / n, end: (i + 1) / n })); const slice_objects = slices.map((i) => ({ begin: i / n, end: (i + 1) / n }));
const slicePat = slowcat(...slice_objects); const slicePat = slowcat(...slice_objects);
return pat.set(slicePat)._fast(n); return pat
.set(slicePat)
._fast(n)
.setTactus(__tactus ? Fraction(n).mulmaybe(pat.tactus) : undefined);
}); });
/** /**

28
packages/core/repl.mjs
View File

@ -10,6 +10,7 @@ export function repl({
defaultOutput, defaultOutput,
onEvalError, onEvalError,
beforeEval, beforeEval,
beforeStart,
afterEval, afterEval,
getTime, getTime,
transpiler, transpiler,
@ -19,6 +20,7 @@ export function repl({
sync = false, sync = false,
setInterval, setInterval,
clearInterval, clearInterval,
id,
}) { }) {
const state = { const state = {
schedulerError: undefined, schedulerError: undefined,
@ -32,6 +34,10 @@ export function repl({
started: false, started: false,
}; };
const transpilerOptions = {
id,
};
const updateState = (update) => { const updateState = (update) => {
Object.assign(state, update); Object.assign(state, update);
state.isDirty = state.code !== state.activeCode; state.isDirty = state.code !== state.activeCode;
@ -48,23 +54,27 @@ export function repl({
}, },
setInterval, setInterval,
clearInterval, clearInterval,
beforeStart,
}; };
// NeoCyclist uses a shared worker to communicate between instances, which is not supported on mobile chrome // NeoCyclist uses a shared worker to communicate between instances, which is not supported on mobile chrome
const scheduler = const scheduler =
sync && typeof SharedWorker != 'undefined' ? new NeoCyclist(schedulerOptions) : new Cyclist(schedulerOptions); sync && typeof SharedWorker != 'undefined' ? new NeoCyclist(schedulerOptions) : new Cyclist(schedulerOptions);
let pPatterns = {}; let pPatterns = {};
let anonymousIndex = 0;
let allTransform; let allTransform;
const hush = function () { const hush = function () {
pPatterns = {}; pPatterns = {};
anonymousIndex = 0;
allTransform = undefined; allTransform = undefined;
return silence; return silence;
}; };
const setPattern = (pattern, autostart = true) => { const setPattern = async (pattern, autostart = true) => {
pattern = editPattern?.(pattern) || pattern; pattern = editPattern?.(pattern) || pattern;
scheduler.setPattern(pattern, autostart); await scheduler.setPattern(pattern, autostart);
return pattern;
}; };
setTime(() => scheduler.now()); // TODO: refactor? setTime(() => scheduler.now()); // TODO: refactor?
@ -82,6 +92,15 @@ export function repl({
// set pattern methods that use this repl via closure // set pattern methods that use this repl via closure
const injectPatternMethods = () => { const injectPatternMethods = () => {
Pattern.prototype.p = function (id) { Pattern.prototype.p = function (id) {
if (id.startsWith('_') || id.endsWith('_')) {
// allows muting a pattern x with x_ or _x
return silence;
}
if (id === '$') {
// allows adding anonymous patterns with $:
id = `$${anonymousIndex}`;
anonymousIndex++;
}
pPatterns[id] = this; pPatterns[id] = this;
return this; return this;
}; };
@ -128,9 +147,10 @@ export function repl({
try { try {
updateState({ code, pending: true }); updateState({ code, pending: true });
await injectPatternMethods(); await injectPatternMethods();
setTime(() => scheduler.now()); // TODO: refactor?
await beforeEval?.({ code }); await beforeEval?.({ code });
shouldHush && hush(); shouldHush && hush();
let { pattern, meta } = await _evaluate(code, transpiler); let { pattern, meta } = await _evaluate(code, transpiler, transpilerOptions);
if (Object.keys(pPatterns).length) { if (Object.keys(pPatterns).length) {
pattern = stack(...Object.values(pPatterns)); pattern = stack(...Object.values(pPatterns));
} }
@ -142,7 +162,7 @@ export function repl({
throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.')); throw new Error(message + (typeof evaluated === 'function' ? ', did you forget to call a function?' : '.'));
} }
logger(`[eval] code updated`); logger(`[eval] code updated`);
setPattern(pattern, autostart); pattern = await setPattern(pattern, autostart);
updateState({ updateState({
miniLocations: meta?.miniLocations || [], miniLocations: meta?.miniLocations || [],
widgets: meta?.widgets || [], widgets: meta?.widgets || [],

36
packages/core/signal.mjs
View File

@ -86,6 +86,38 @@ export const tri2 = fastcat(isaw2, saw2);
export const time = signal(id); export const time = signal(id);
/**
* The mouse's x position value ranges from 0 to 1.
* @name mousex
* @return {Pattern}
* @example
* n(mousex.segment(4).range(0,7)).scale("C:minor")
*
*/
/**
* The mouse's y position value ranges from 0 to 1.
* @name mousey
* @return {Pattern}
* @example
* n(mousey.segment(4).range(0,7)).scale("C:minor")
*
*/
let _mouseY = 0,
_mouseX = 0;
if (typeof window !== 'undefined') {
//document.onmousemove = (e) => {
document.addEventListener('mousemove', (e) => {
_mouseY = e.clientY / document.body.clientHeight;
_mouseX = e.clientX / document.body.clientWidth;
});
}
export const mousey = signal(() => _mouseY);
export const mouseY = signal(() => _mouseY);
export const mousex = signal(() => _mouseX);
export const mouseX = signal(() => _mouseX);
// random signals // random signals
const xorwise = (x) => { const xorwise = (x) => {
@ -486,8 +518,10 @@ export const wchoose = (...pairs) => wchooseWith(rand, ...pairs);
* @returns {Pattern} * @returns {Pattern}
* @example * @example
* wchooseCycles(["bd",10], ["hh",1], ["sd",1]).s().fast(8) * wchooseCycles(["bd",10], ["hh",1], ["sd",1]).s().fast(8)
* @example
* wchooseCycles(["bd bd bd",5], ["hh hh hh",3], ["sd sd sd",1]).fast(4).s()
*/ */
export const wchooseCycles = (...pairs) => _wchooseWith(rand, ...pairs).innerJoin(); export const wchooseCycles = (...pairs) => _wchooseWith(rand.segment(1), ...pairs).innerJoin();
export const wrandcat = wchooseCycles; export const wrandcat = wchooseCycles;

91
packages/core/test/pattern.test.mjs
View File

@ -21,8 +21,8 @@ import {
cat, cat,
sequence, sequence,
palindrome, palindrome,
polymeter, s_polymeter,
polymeterSteps, s_polymeterSteps,
polyrhythm, polyrhythm,
silence, silence,
fast, fast,
@ -47,6 +47,11 @@ import {
time, time,
run, run,
pick, pick,
stackLeft,
stackRight,
stackCentre,
s_cat,
calculateTactus,
} from '../index.mjs'; } from '../index.mjs';
import { steady } from '../signal.mjs'; import { steady } from '../signal.mjs';
@ -603,18 +608,18 @@ describe('Pattern', () => {
); );
}); });
}); });
describe('polymeter()', () => { describe('s_polymeter()', () => {
it('Can layer up cycles, stepwise, with lists', () => { it('Can layer up cycles, stepwise, with lists', () => {
expect(polymeterSteps(3, ['d', 'e']).firstCycle()).toStrictEqual( expect(s_polymeterSteps(3, ['d', 'e']).firstCycle()).toStrictEqual(
fastcat(pure('d'), pure('e'), pure('d')).firstCycle(), fastcat(pure('d'), pure('e'), pure('d')).firstCycle(),
); );
expect(polymeter(['a', 'b', 'c'], ['d', 'e']).fast(2).firstCycle()).toStrictEqual( expect(s_polymeter(['a', 'b', 'c'], ['d', 'e']).fast(2).firstCycle()).toStrictEqual(
stack(sequence('a', 'b', 'c', 'a', 'b', 'c'), sequence('d', 'e', 'd', 'e', 'd', 'e')).firstCycle(), stack(sequence('a', 'b', 'c', 'a', 'b', 'c'), sequence('d', 'e', 'd', 'e', 'd', 'e')).firstCycle(),
); );
}); });
it('Can layer up cycles, stepwise, with weighted patterns', () => { it('Can layer up cycles, stepwise, with weighted patterns', () => {
sameFirst(polymeterSteps(3, sequence('a', 'b')).fast(2), sequence('a', 'b', 'a', 'b', 'a', 'b')); sameFirst(s_polymeterSteps(3, sequence('a', 'b')).fast(2), sequence('a', 'b', 'a', 'b', 'a', 'b'));
}); });
}); });
@ -1123,8 +1128,8 @@ describe('Pattern', () => {
it('Is correctly preserved/calculated through transformations', () => { it('Is correctly preserved/calculated through transformations', () => {
expect(sequence(0, 1, 2, 3).linger(4).tactus).toStrictEqual(Fraction(4)); expect(sequence(0, 1, 2, 3).linger(4).tactus).toStrictEqual(Fraction(4));
expect(sequence(0, 1, 2, 3).iter(4).tactus).toStrictEqual(Fraction(4)); expect(sequence(0, 1, 2, 3).iter(4).tactus).toStrictEqual(Fraction(4));
expect(sequence(0, 1, 2, 3).fast(4).tactus).toStrictEqual(Fraction(16)); expect(sequence(0, 1, 2, 3).fast(4).tactus).toStrictEqual(Fraction(4));
expect(sequence(0, 1, 2, 3).hurry(4).tactus).toStrictEqual(Fraction(16)); expect(sequence(0, 1, 2, 3).hurry(4).tactus).toStrictEqual(Fraction(4));
expect(sequence(0, 1, 2, 3).rev().tactus).toStrictEqual(Fraction(4)); expect(sequence(0, 1, 2, 3).rev().tactus).toStrictEqual(Fraction(4));
expect(sequence(1).segment(10).tactus).toStrictEqual(Fraction(10)); expect(sequence(1).segment(10).tactus).toStrictEqual(Fraction(10));
expect(sequence(1, 0, 1).invert().tactus).toStrictEqual(Fraction(3)); expect(sequence(1, 0, 1).invert().tactus).toStrictEqual(Fraction(3));
@ -1136,30 +1141,72 @@ describe('Pattern', () => {
expect(sequence({ s: 'bev' }, { s: 'amenbreak' }).splice(4, sequence(0, 1, 2, 3)).tactus).toStrictEqual( expect(sequence({ s: 'bev' }, { s: 'amenbreak' }).splice(4, sequence(0, 1, 2, 3)).tactus).toStrictEqual(
Fraction(4), Fraction(4),
); );
expect(sequence({ n: 0 }, { n: 1 }, { n: 2 }).chop(4).tactus).toStrictEqual(Fraction(12));
expect(
pure((x) => x + 1)
.setTactus(3)
.appBoth(pure(1).setTactus(2)).tactus,
).toStrictEqual(Fraction(6));
expect(
pure((x) => x + 1)
.setTactus(undefined)
.appBoth(pure(1).setTactus(2)).tactus,
).toStrictEqual(Fraction(2));
expect(
pure((x) => x + 1)
.setTactus(3)
.appBoth(pure(1).setTactus(undefined)).tactus,
).toStrictEqual(Fraction(3));
expect(stack(fastcat(0, 1, 2), fastcat(3, 4)).tactus).toStrictEqual(Fraction(6));
expect(stack(fastcat(0, 1, 2), fastcat(3, 4).setTactus(undefined)).tactus).toStrictEqual(Fraction(3));
expect(stackLeft(fastcat(0, 1, 2, 3), fastcat(3, 4)).tactus).toStrictEqual(Fraction(4));
expect(stackRight(fastcat(0, 1, 2), fastcat(3, 4)).tactus).toStrictEqual(Fraction(3));
// maybe this should double when they are either all even or all odd
expect(stackCentre(fastcat(0, 1, 2), fastcat(3, 4)).tactus).toStrictEqual(Fraction(3));
expect(fastcat(0, 1).ply(3).tactus).toStrictEqual(Fraction(6));
expect(fastcat(0, 1).setTactus(undefined).ply(3).tactus).toStrictEqual(undefined);
expect(fastcat(0, 1).fast(3).tactus).toStrictEqual(Fraction(2));
expect(fastcat(0, 1).setTactus(undefined).fast(3).tactus).toStrictEqual(undefined);
}); });
}); });
describe('steptaper', () => { describe('s_cat', () => {
it('can cat', () => {
expect(sameFirst(s_cat(fastcat(0, 1, 2, 3), fastcat(4, 5)), fastcat(0, 1, 2, 3, 4, 5)));
expect(sameFirst(s_cat(pure(1), pure(2), pure(3)), fastcat(1, 2, 3)));
});
it('calculates undefined tactuses as the average', () => {
expect(sameFirst(s_cat(pure(1), pure(2), pure(3).setTactus(undefined)), fastcat(1, 2, 3)));
});
});
describe('s_taper', () => {
it('can taper', () => { it('can taper', () => {
expect(sameFirst(sequence(0, 1, 2, 3, 4).steptaper(1, 5), sequence(0, 1, 2, 3, 4, 0, 1, 2, 3, 0, 1, 2, 0, 1, 0))); expect(sameFirst(sequence(0, 1, 2, 3, 4).s_taper(1, 5), sequence(0, 1, 2, 3, 4, 0, 1, 2, 3, 0, 1, 2, 0, 1, 0)));
}); });
it('can taper backwards', () => { it('can taper backwards', () => {
expect( expect(sameFirst(sequence(0, 1, 2, 3, 4).s_taper(-1, 5), sequence(0, 0, 1, 0, 1, 2, 0, 1, 2, 3, 0, 1, 2, 3, 4)));
sameFirst(sequence(0, 1, 2, 3, 4).steptaper(-1, 5), sequence(0, 0, 1, 0, 1, 2, 0, 1, 2, 3, 0, 1, 2, 3, 4)),
);
}); });
}); });
describe('wax and wane, left', () => { describe('s_add and s_sub', () => {
it('can wax from the left', () => { it('can add from the left', () => {
expect(sameFirst(sequence(0, 1, 2, 3, 4).stepwax(2), sequence(0, 1))); expect(sameFirst(sequence(0, 1, 2, 3, 4).s_add(2), sequence(0, 1)));
}); });
it('can wane to the left', () => { it('can sub to the left', () => {
expect(sameFirst(sequence(0, 1, 2, 3, 4).stepwane(2), sequence(0, 1, 2))); expect(sameFirst(sequence(0, 1, 2, 3, 4).s_sub(2), sequence(0, 1, 2)));
}); });
it('can wax from the right', () => { it('can add from the right', () => {
expect(sameFirst(sequence(0, 1, 2, 3, 4).stepwax(-2), sequence(3, 4))); expect(sameFirst(sequence(0, 1, 2, 3, 4).s_add(-2), sequence(3, 4)));
}); });
it('can wane to the right', () => { it('can sub to the right', () => {
expect(sameFirst(sequence(0, 1, 2, 3, 4).stepwane(-2), sequence(2, 3, 4))); expect(sameFirst(sequence(0, 1, 2, 3, 4).s_sub(-2), sequence(2, 3, 4)));
});
it('can subtract nothing', () => {
expect(sameFirst(pure('a').s_sub(0), pure('a')));
});
it('can subtract nothing, repeatedly', () => {
expect(sameFirst(pure('a').s_sub(0, 0), fastcat('a', 'a')));
for (var i = 0; i < 100; ++i) {
expect(sameFirst(pure('a').s_sub(...Array(i).fill(0)), fastcat(...Array(i).fill('a'))));
}
}); });
}); });
}); });

37
packages/core/util.mjs
View File

@ -61,6 +61,11 @@ export const valueToMidi = (value, fallbackValue) => {
return fallbackValue; return fallbackValue;
}; };
// used to schedule external event like midi and osc out
export const getEventOffsetMs = (targetTimeSeconds, currentTimeSeconds) => {
return (targetTimeSeconds - currentTimeSeconds) * 1000;
};
/** /**
* @deprecated does not appear to be referenced or invoked anywhere in the codebase * @deprecated does not appear to be referenced or invoked anywhere in the codebase
* @noAutocomplete * @noAutocomplete
@ -231,6 +236,14 @@ export const splitAt = function (index, value) {
export const zipWith = (f, xs, ys) => xs.map((n, i) => f(n, ys[i])); export const zipWith = (f, xs, ys) => xs.map((n, i) => f(n, ys[i]));
export const pairs = function (xs) {
const result = [];
for (let i = 0; i < xs.length - 1; ++i) {
result.push([xs[i], xs[i + 1]]);
}
return result;
};
export const clamp = (num, min, max) => Math.min(Math.max(num, min), max); export const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
/* solmization, not used yet */ /* solmization, not used yet */
@ -289,6 +302,30 @@ export const sol2note = (n, notation = 'letters') => {
return note + oct; return note + oct;
}; };
// Remove duplicates from list
export function uniq(a) {
var seen = {};
return a.filter(function (item) {
return seen.hasOwn(item) ? false : (seen[item] = true);
});
}
// Remove duplicates from list, sorting in the process. Mutates argument!
export function uniqsort(a) {
return a.sort().filter(function (item, pos, ary) {
return !pos || item != ary[pos - 1];
});
}
// rational version
export function uniqsortr(a) {
return a
.sort((x, y) => x.compare(y))
.filter(function (item, pos, ary) {
return !pos || item.ne(ary[pos - 1]);
});
}
// code hashing helpers // code hashing helpers
export function unicodeToBase64(text) { export function unicodeToBase64(text) {

6
packages/csound/index.mjs
View File

@ -23,7 +23,7 @@ export const csound = register('csound', (instrument, pat) => {
instrument = instrument || 'triangle'; instrument = instrument || 'triangle';
init(); // not async to support csound inside other patterns + to be able to call pattern methods after it init(); // not async to support csound inside other patterns + to be able to call pattern methods after it
// TODO: find a alternative way to wait for csound to load (to wait with first time playback) // TODO: find a alternative way to wait for csound to load (to wait with first time playback)
return pat.onTrigger((time, hap) => { return pat.onTrigger((time_deprecate, hap, currentTime, _cps, targetTime) => {
if (!_csound) { if (!_csound) {
logger('[csound] not loaded yet', 'warning'); logger('[csound] not loaded yet', 'warning');
return; return;
@ -38,9 +38,11 @@ export const csound = register('csound', (instrument, pat) => {
.join('/'); .join('/');
// TODO: find out how to send a precise ctx based time // TODO: find out how to send a precise ctx based time
// http://www.csounds.com/manual/html/i.html // http://www.csounds.com/manual/html/i.html
const timeOffset = targetTime - currentTime; // latency ?
//const timeOffset = time_deprecate - getAudioContext().currentTime
const params = [ const params = [
`"${instrument}"`, // p1: instrument name `"${instrument}"`, // p1: instrument name
time - getAudioContext().currentTime, //.toFixed(precision), // p2: starting time in arbitrary unit called beats timeOffset, // p2: starting time in arbitrary unit called beats
hap.duration + 0, // p3: duration in beats hap.duration + 0, // p3: duration in beats
// instrument specific params: // instrument specific params:
freq, //.toFixed(precision), // p4: frequency freq, //.toFixed(precision), // p4: frequency

2
packages/csound/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/csound", "name": "@strudel/csound",
"version": "1.0.1", "version": "1.1.0",
"description": "csound bindings for strudel", "description": "csound bindings for strudel",
"main": "index.mjs", "main": "index.mjs",
"type": "module", "type": "module",

6
packages/desktopbridge/midibridge.mjs
View File

@ -1,5 +1,5 @@
import { Invoke } from './utils.mjs'; import { Invoke } from './utils.mjs';
import { Pattern, noteToMidi } from '@strudel/core'; import { Pattern, getEventOffsetMs, noteToMidi } from '@strudel/core';
const ON_MESSAGE = 0x90; const ON_MESSAGE = 0x90;
const OFF_MESSAGE = 0x80; const OFF_MESSAGE = 0x80;
@ -9,8 +9,8 @@ Pattern.prototype.midi = function (output) {
return this.onTrigger((time_deprecate, hap, currentTime, cps, targetTime) => { return this.onTrigger((time_deprecate, hap, currentTime, cps, targetTime) => {
let { note, nrpnn, nrpv, ccn, ccv, velocity = 0.9, gain = 1 } = hap.value; let { note, nrpnn, nrpv, ccn, ccv, velocity = 0.9, gain = 1 } = hap.value;
//magic number to get audio engine to line up, can probably be calculated somehow //magic number to get audio engine to line up, can probably be calculated somehow
const latency = 0.034; const latencyMs = 34;
const offset = (targetTime - currentTime + latency) * 1000; const offset = getEventOffsetMs(targetTime, currentTime) + latencyMs;
velocity = Math.floor(gain * velocity * 100); velocity = Math.floor(gain * velocity * 100);
const duration = Math.floor((hap.duration.valueOf() / cps) * 1000 - 10); const duration = Math.floor((hap.duration.valueOf() / cps) * 1000 - 10);
const roundedOffset = Math.round(offset); const roundedOffset = Math.round(offset);

6
packages/desktopbridge/oscbridge.mjs
View File

@ -1,8 +1,8 @@
import { parseNumeral, Pattern } from '@strudel/core'; import { parseNumeral, Pattern, getEventOffsetMs } from '@strudel/core';
import { Invoke } from './utils.mjs'; import { Invoke } from './utils.mjs';
Pattern.prototype.osc = function () { Pattern.prototype.osc = function () {
return this.onTrigger(async (time, hap, currentTime, cps = 1) => { return this.onTrigger(async (time, hap, currentTime, cps = 1, targetTime) => {
hap.ensureObjectValue(); hap.ensureObjectValue();
const cycle = hap.wholeOrPart().begin.valueOf(); const cycle = hap.wholeOrPart().begin.valueOf();
const delta = hap.duration.valueOf(); const delta = hap.duration.valueOf();
@ -13,7 +13,7 @@ Pattern.prototype.osc = function () {
const params = []; const params = [];
const timestamp = Math.round(Date.now() + (time - currentTime) * 1000); const timestamp = Math.round(Date.now() + getEventOffsetMs(targetTime, currentTime));
Object.keys(controls).forEach((key) => { Object.keys(controls).forEach((key) => {
const val = controls[key]; const val = controls[key];

47
packages/draw/draw.mjs
View File

@ -36,8 +36,8 @@ function stopAnimationFrame(id) {
delete animationFrames[id]; delete animationFrames[id];
} }
} }
function stopAllAnimations() { function stopAllAnimations(replID) {
Object.keys(animationFrames).forEach((id) => stopAnimationFrame(id)); Object.keys(animationFrames).forEach((id) => (!replID || id.startsWith(replID)) && stopAnimationFrame(id));
} }
let memory = {}; let memory = {};
@ -72,18 +72,25 @@ Pattern.prototype.draw = function (fn, options) {
return this; return this;
}; };
export const cleanupDraw = (clearScreen = true) => { export const cleanupDraw = (clearScreen = true, id) => {
const ctx = getDrawContext(); const ctx = getDrawContext();
clearScreen && ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.width); clearScreen && ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.height);
stopAllAnimations(); stopAllAnimations(id);
if (window.strudelScheduler) {
clearInterval(window.strudelScheduler);
}
}; };
Pattern.prototype.onPaint = function () { Pattern.prototype.onPaint = function (painter) {
console.warn('[draw] onPaint was not overloaded. Some drawings might not work'); return this.withState((state) => {
return this; if (!state.controls.painters) {
state.controls.painters = [];
}
state.controls.painters.push(painter);
});
};
Pattern.prototype.getPainters = function () {
let painters = [];
this.queryArc(0, 0, { painters });
return painters;
}; };
// const round = (x) => Math.round(x * 1000) / 1000; // const round = (x) => Math.round(x * 1000) / 1000;
@ -122,6 +129,7 @@ export class Drawer {
this.visibleHaps = []; this.visibleHaps = [];
this.lastFrame = null; this.lastFrame = null;
this.drawTime = drawTime; this.drawTime = drawTime;
this.painters = [];
this.framer = new Framer( this.framer = new Framer(
() => { () => {
if (!this.scheduler) { if (!this.scheduler) {
@ -146,7 +154,7 @@ export class Drawer {
// add new haps with onset (think right edge bars scrolling in) // add new haps with onset (think right edge bars scrolling in)
.concat(haps.filter((h) => h.hasOnset())); .concat(haps.filter((h) => h.hasOnset()));
const time = phase - lookahead; const time = phase - lookahead;
onDraw(this.visibleHaps, time, this); onDraw(this.visibleHaps, time, this, this.painters);
}, },
(err) => { (err) => {
console.warn('draw error', err); console.warn('draw error', err);
@ -164,11 +172,13 @@ export class Drawer {
t = t ?? scheduler.now(); t = t ?? scheduler.now();
this.scheduler = scheduler; this.scheduler = scheduler;
let [_, lookahead] = this.drawTime; let [_, lookahead] = this.drawTime;
// +0.1 = workaround for weird holes in query..
const [begin, end] = [Math.max(t, 0), t + lookahead + 0.1]; const [begin, end] = [Math.max(t, 0), t + lookahead + 0.1];
// remove all future haps // remove all future haps
this.visibleHaps = this.visibleHaps.filter((h) => h.whole.begin < t); this.visibleHaps = this.visibleHaps.filter((h) => h.whole.begin < t);
this.painters = []; // will get populated by .onPaint calls attached to the pattern
// query future haps // query future haps
const futureHaps = scheduler.pattern.queryArc(begin, end); // +0.1 = workaround for weird holes in query.. const futureHaps = scheduler.pattern.queryArc(begin, end, { painters: this.painters });
// append future haps // append future haps
this.visibleHaps = this.visibleHaps.concat(futureHaps); this.visibleHaps = this.visibleHaps.concat(futureHaps);
} }
@ -191,7 +201,16 @@ export function getComputedPropertyValue(name) {
return getComputedStyle(document.documentElement).getPropertyValue(name); return getComputedStyle(document.documentElement).getPropertyValue(name);
} }
let theme = {}; let theme = {
background: '#222',
foreground: '#75baff',
caret: '#ffcc00',
selection: 'rgba(128, 203, 196, 0.5)',
selectionMatch: '#036dd626',
lineHighlight: '#00000050',
gutterBackground: 'transparent',
gutterForeground: '#8a919966',
};
export function getTheme() { export function getTheme() {
return theme; return theme;
} }

2
packages/draw/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/draw", "name": "@strudel/draw",
"version": "1.0.1", "version": "1.1.0",
"description": "Helpers for drawing with Strudel", "description": "Helpers for drawing with Strudel",
"main": "index.mjs", "main": "index.mjs",
"type": "module", "type": "module",

13
packages/draw/pianoroll.mjs
View File

@ -67,6 +67,7 @@ Pattern.prototype.pianoroll = function (options = {}) {
* Displays a midi-style piano roll * Displays a midi-style piano roll
* *
* @name pianoroll * @name pianoroll
* @synonyms punchcard
* @param {Object} options Object containing all the optional following parameters as key value pairs: * @param {Object} options Object containing all the optional following parameters as key value pairs:
* @param {integer} cycles number of cycles to be displayed at the same time - defaults to 4 * @param {integer} cycles number of cycles to be displayed at the same time - defaults to 4
* @param {number} playhead location of the active notes on the time axis - 0 to 1, defaults to 0.5 * @param {number} playhead location of the active notes on the time axis - 0 to 1, defaults to 0.5
@ -94,7 +95,11 @@ Pattern.prototype.pianoroll = function (options = {}) {
* @param {boolean} autorange automatically calculate the minMidi and maxMidi parameters - 0 by default * @param {boolean} autorange automatically calculate the minMidi and maxMidi parameters - 0 by default
* *
* @example * @example
* note("C2 A2 G2").euclid(5,8).s('piano').clip(1).color('salmon').pianoroll({vertical:1, labels:1}) * note("c2 a2 eb2")
* .euclid(5,8)
* .s('sawtooth')
* .lpenv(4).lpf(300)
* ._pianoroll({ labels: 1 })
*/ */
export function pianoroll({ export function pianoroll({
time, time,
@ -108,12 +113,12 @@ export function pianoroll({
active = getTheme().foreground, active = getTheme().foreground,
background = 'transparent', background = 'transparent',
smear = 0, smear = 0,
playheadColor = 'white', playheadColor = getTheme().foreground,
minMidi = 10, minMidi = 10,
maxMidi = 90, maxMidi = 90,
autorange = 0, autorange = 0,
timeframe: timeframeProp, timeframe: timeframeProp,
fold = 0, fold = 1,
vertical = 0, vertical = 0,
labels = false, labels = false,
fill = 1, fill = 1,
@ -266,7 +271,7 @@ export function getDrawOptions(drawTime, options = {}) {
let [lookbehind, lookahead] = drawTime; let [lookbehind, lookahead] = drawTime;
lookbehind = Math.abs(lookbehind); lookbehind = Math.abs(lookbehind);
const cycles = lookahead + lookbehind; const cycles = lookahead + lookbehind;
const playhead = lookbehind / cycles; const playhead = cycles !== 0 ? lookbehind / cycles : 0;
return { fold: 1, ...options, cycles, playhead }; return { fold: 1, ...options, cycles, playhead };
} }

17
packages/draw/pitchwheel.mjs
View File

@ -113,6 +113,23 @@ export function pitchwheel({
return; return;
} }
/**
* Renders a pitch circle to visualize frequencies within one octave
* @name pitchwheel
* @param {number} hapcircles
* @param {number} circle
* @param {number} edo
* @param {string} root
* @param {number} thickness
* @param {number} hapRadius
* @param {string} mode
* @param {number} margin
* @example
* n("0 .. 12").scale("C:chromatic")
* .s("sawtooth")
* .lpf(500)
* ._pitchwheel()
*/
Pattern.prototype.pitchwheel = function (options = {}) { Pattern.prototype.pitchwheel = function (options = {}) {
let { ctx = getDrawContext(), id = 1 } = options; let { ctx = getDrawContext(), id = 1 } = options;
return this.tag(id).onPaint((_, time, haps) => return this.tag(id).onPaint((_, time, haps) =>

27
packages/draw/spiral.mjs
View File

@ -125,6 +125,33 @@ function drawSpiral(options) {
}); });
} }
/**
* Displays a spiral visual.
*
* @name spiral
* @param {Object} options Object containing all the optional following parameters as key value pairs:
* @param {number} stretch controls the rotations per cycle ratio, where 1 = 1 cycle / 360 degrees
* @param {number} size the diameter of the spiral
* @param {number} thickness line thickness
* @param {string} cap style of line ends: butt (default), round, square
* @param {string} inset number of rotations before spiral starts (default 3)
* @param {string} playheadColor color of playhead, defaults to white
* @param {number} playheadLength length of playhead in rotations, defaults to 0.02
* @param {number} playheadThickness thickness of playheadrotations, defaults to thickness
* @param {number} padding space around spiral
* @param {number} steady steadyness of spiral vs playhead. 1 = spiral doesn't move, playhead does.
* @param {number} activeColor color of active segment. defaults to foreground of theme
* @param {number} inactiveColor color of inactive segments. defaults to gutterForeground of theme
* @param {boolean} colorizeInactive wether or not to colorize inactive segments, defaults to 0
* @param {boolean} fade wether or not past and future should fade out. defaults to 1
* @param {boolean} logSpiral wether or not the spiral should be logarithmic. defaults to 0
* @example
* note("c2 a2 eb2")
* .euclid(5,8)
* .s('sawtooth')
* .lpenv(4).lpf(300)
* ._spiral({ steady: .96 })
*/
Pattern.prototype.spiral = function (options = {}) { Pattern.prototype.spiral = function (options = {}) {
return this.onPaint((ctx, time, haps, drawTime) => drawSpiral({ ctx, time, haps, drawTime, ...options })); return this.onPaint((ctx, time, haps, drawTime) => drawSpiral({ ctx, time, haps, drawTime, ...options }));
}; };

2
packages/embed/package.json
View File

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

2
packages/hs2js/.npmignore Normal file
View File

@ -0,0 +1,2 @@
pnpm-lock.yaml
vite.config.js

661
packages/hs2js/LICENSE Normal file
View File

@ -0,0 +1,661 @@
GNU AFFERO GENERAL PUBLIC LICENSE
Version 3, 19 November 2007
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU Affero General Public License is a free, copyleft license for
software and other kinds of works, specifically designed to ensure
cooperation with the community in the case of network server software.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
our General Public Licenses are intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
Developers that use our General Public Licenses protect your rights
with two steps: (1) assert copyright on the software, and (2) offer
you this License which gives you legal permission to copy, distribute
and/or modify the software.
A secondary benefit of defending all users' freedom is that
improvements made in alternate versions of the program, if they
receive widespread use, become available for other developers to
incorporate. Many developers of free software are heartened and
encouraged by the resulting cooperation. However, in the case of
software used on network servers, this result may fail to come about.
The GNU General Public License permits making a modified version and
letting the public access it on a server without ever releasing its
source code to the public.
The GNU Affero General Public License is designed specifically to
ensure that, in such cases, the modified source code becomes available
to the community. It requires the operator of a network server to
provide the source code of the modified version running there to the
users of that server. Therefore, public use of a modified version, on
a publicly accessible server, gives the public access to the source
code of the modified version.
An older license, called the Affero General Public License and
published by Affero, was designed to accomplish similar goals. This is
a different license, not a version of the Affero GPL, but Affero has
released a new version of the Affero GPL which permits relicensing under
this license.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU Affero General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Remote Network Interaction; Use with the GNU General Public License.
Notwithstanding any other provision of this License, if you modify the
Program, your modified version must prominently offer all users
interacting with it remotely through a computer network (if your version
supports such interaction) an opportunity to receive the Corresponding
Source of your version by providing access to the Corresponding Source
from a network server at no charge, through some standard or customary
means of facilitating copying of software. This Corresponding Source
shall include the Corresponding Source for any work covered by version 3
of the GNU General Public License that is incorporated pursuant to the
following paragraph.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the work with which it is combined will remain governed by version
3 of the GNU General Public License.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU Affero General Public License from time to time. Such new versions
will be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU Affero General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU Affero General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU Affero General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
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/>.
Also add information on how to contact you by electronic and paper mail.
If your software can interact with users remotely through a computer
network, you should also make sure that it provides a way for users to
get its source. For example, if your program is a web application, its
interface could display a "Source" link that leads users to an archive
of the code. There are many ways you could offer source, and different
solutions will be better for different programs; see section 13 for the
specific requirements.
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU AGPL, see
<https://www.gnu.org/licenses/>.

127
packages/hs2js/README.md Normal file
View File

@ -0,0 +1,127 @@
# hs2js
Experimental haskell in javascript interpreter. Many haskell features are not implemented.
This projects mainly exists to be able to write and interpret [Tidal Cycles](https://tidalcycles.org/) code in the browser,
as part of [Strudel](https://github.com/tidalcycles/strudel). This project could only exist thanks to [tree-sitter-haskell](https://github.com/tree-sitter/tree-sitter-haskell).
## Installation
### Via Script Tag
You can load the library directly from a script tag via unpkg:
```html
<script src="https://unpkg.com/hs2js@0.0.3"></script>
<button id="hello">hello</button>
<script>
hs2js.setBase('https://unpkg.com/hs2js@0.0.3/dist/');
hs2js.loadParser().then(()=>{
document.getElementById('hello').addEventListener('click', () => {
hs2js.evaluate('alert "hello from haskell!"');
});
})
</script>
```
### Via npm
You need to add `postinstall` to your `package.json` script to copy the parser to your `public` folder:
```json
{
"scripts": {
"postinstall": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
}
}
```
Depending on your setup, replace `public` with the folder that will serve your assets to `/`. Then install the package:
```sh
npm i hs2js
```
and use it:
```js
import * as hs2js from 'hs2js';
hs2js.loadParser();
document.getElementById('hello').addEventListener('click', () => {
hs2js.evaluate('alert "hello from haskell!"');
});
```
## API
These are all functions exported by the package:
### evaluate
Evaluates a piece of haskell code
- `code`: [valid](https://github.com/tree-sitter/tree-sitter-haskell?tab=readme-ov-file#supported-language-extensions) haskell code
- `scope`: global scope, defaults to globalThis. Allows you to pass an object of your own functions / variables from JS to Haskell.
- `ops`: mapping for custom infix operator
Example:
```js
// simple
hs2js.evaluate(`2 + 2`) // = 4
// passing variables via scope:
hs2js.evaluate(`a + b`, { a: 1, b: 2 }) // = 3
// custom operator
hs2js.evaluate(`2 |* 3`, {}, { '|*': (l, r) => l * r }) // = 6
```
### parse
[Parses](https://github.com/tree-sitter/tree-sitter-haskell) a piece of haskell code, returning its AST representation.
Example:
```js
const ast = hs2js.parse(`2 + 2`)
console.log(ast.toString())
// (haskell declarations: (declarations (top_splice (apply function: (variable) argument: (literal (integer))))))
```
### run
Evaluates `rootNode` of haskell AST (used by evaluate internally).
- `rootNode`: haskell AST root node, as returned by `parse`
- `scope`: see evaluate
- `ops`: see evaluate
Example:
```js
const ast = hs2js.parse(`2 + 3`);
const res = hs2js.run(ast.rootNode);
console.log(res); // = 5
```
### loadParser
Loads and caches the parser by fetching `tree-sitter.wasm` and `tree-sitter-haskell.wasm`.
Make sure to call and await this function before calling `parse` or `evaluate`.
```js
hs2js.loadParser().then(() => hs2js.evaluate('alert "ready"'))
```
### setBase
Sets the base path where the WASM files are expected by `loadParser`. Defaults to `/`.
Expects `tree-sitter.wasm` and `tree-sitter-haskell.wasm` to be present.
Can either be a relative path or a URL.
```js
hs2js.setBase('https://unpkg.com/hs2js@0.0.4/dist/');
hs2js.loadParser();
/* loads
- https://unpkg.com/hs2js@0.0.4/dist/tree-sitter.wasm
- https://unpkg.com/hs2js@0.0.4/dist/tree-sitter-haskell.wasm
*/
```

37
packages/hs2js/package.json Normal file
View File

@ -0,0 +1,37 @@
{
"name": "hs2js",
"version": "0.1.0",
"description": "Experimental Haskell in JavaScript interpreter",
"main": "src/index.mjs",
"type": "module",
"publishConfig": {
"main": "dist/index.js",
"module": "dist/index.mjs"
},
"scripts": {
"build-wasm": "tree-sitter build-wasm node_modules/tree-sitter-haskell && mv tree-sitter-haskell.wasm ./dist/ && cp node_modules/web-tree-sitter/tree-sitter.wasm ./dist/",
"build": "vite build && npm run build-wasm",
"prepublishOnly": "npm run build"
},
"repository": {
"type": "git",
"url": "git+https://github.com/tidalcycles/strudel.git"
},
"keywords": [
"haskell",
"javascript"
],
"author": "Felix Roos <flix91@gmail.com>",
"license": "AGPL-3.0-or-later",
"bugs": {
"url": "https://github.com/tidalcycles/strudel/issues"
},
"homepage": "https://github.com/tidalcycles/strudel",
"dependencies": {
"web-tree-sitter": "^0.20.8"
},
"devDependencies": {
"tree-sitter-haskell": "^0.21.0",
"vite": "^5.0.10"
}
}

520
packages/hs2js/pnpm-lock.yaml generated Normal file
View File

@ -0,0 +1,520 @@
lockfileVersion: '6.0'
settings:
autoInstallPeers: true
excludeLinksFromLockfile: false
dependencies:
web-tree-sitter:
specifier: ^0.20.8
version: 0.20.8
devDependencies:
tree-sitter-haskell:
specifier: ^0.21.0
version: 0.21.0(tree-sitter@0.21.1)
vite:
specifier: ^5.0.10
version: 5.2.11
packages:
/@esbuild/aix-ppc64@0.20.2:
resolution: {integrity: sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==}
engines: {node: '>=12'}
cpu: [ppc64]
os: [aix]
requiresBuild: true
dev: true
optional: true
/@esbuild/android-arm64@0.20.2:
resolution: {integrity: sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==}
engines: {node: '>=12'}
cpu: [arm64]
os: [android]
requiresBuild: true
dev: true
optional: true
/@esbuild/android-arm@0.20.2:
resolution: {integrity: sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==}
engines: {node: '>=12'}
cpu: [arm]
os: [android]
requiresBuild: true
dev: true
optional: true
/@esbuild/android-x64@0.20.2:
resolution: {integrity: sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==}
engines: {node: '>=12'}
cpu: [x64]
os: [android]
requiresBuild: true
dev: true
optional: true
/@esbuild/darwin-arm64@0.20.2:
resolution: {integrity: sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==}
engines: {node: '>=12'}
cpu: [arm64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
/@esbuild/darwin-x64@0.20.2:
resolution: {integrity: sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==}
engines: {node: '>=12'}
cpu: [x64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
/@esbuild/freebsd-arm64@0.20.2:
resolution: {integrity: sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==}
engines: {node: '>=12'}
cpu: [arm64]
os: [freebsd]
requiresBuild: true
dev: true
optional: true
/@esbuild/freebsd-x64@0.20.2:
resolution: {integrity: sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==}
engines: {node: '>=12'}
cpu: [x64]
os: [freebsd]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-arm64@0.20.2:
resolution: {integrity: sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==}
engines: {node: '>=12'}
cpu: [arm64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-arm@0.20.2:
resolution: {integrity: sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==}
engines: {node: '>=12'}
cpu: [arm]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-ia32@0.20.2:
resolution: {integrity: sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==}
engines: {node: '>=12'}
cpu: [ia32]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-loong64@0.20.2:
resolution: {integrity: sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==}
engines: {node: '>=12'}
cpu: [loong64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-mips64el@0.20.2:
resolution: {integrity: sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==}
engines: {node: '>=12'}
cpu: [mips64el]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-ppc64@0.20.2:
resolution: {integrity: sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==}
engines: {node: '>=12'}
cpu: [ppc64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-riscv64@0.20.2:
resolution: {integrity: sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==}
engines: {node: '>=12'}
cpu: [riscv64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-s390x@0.20.2:
resolution: {integrity: sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==}
engines: {node: '>=12'}
cpu: [s390x]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-x64@0.20.2:
resolution: {integrity: sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==}
engines: {node: '>=12'}
cpu: [x64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/netbsd-x64@0.20.2:
resolution: {integrity: sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==}
engines: {node: '>=12'}
cpu: [x64]
os: [netbsd]
requiresBuild: true
dev: true
optional: true
/@esbuild/openbsd-x64@0.20.2:
resolution: {integrity: sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==}
engines: {node: '>=12'}
cpu: [x64]
os: [openbsd]
requiresBuild: true
dev: true
optional: true
/@esbuild/sunos-x64@0.20.2:
resolution: {integrity: sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==}
engines: {node: '>=12'}
cpu: [x64]
os: [sunos]
requiresBuild: true
dev: true
optional: true
/@esbuild/win32-arm64@0.20.2:
resolution: {integrity: sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==}
engines: {node: '>=12'}
cpu: [arm64]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@esbuild/win32-ia32@0.20.2:
resolution: {integrity: sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==}
engines: {node: '>=12'}
cpu: [ia32]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@esbuild/win32-x64@0.20.2:
resolution: {integrity: sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==}
engines: {node: '>=12'}
cpu: [x64]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-android-arm-eabi@4.17.2:
resolution: {integrity: sha512-NM0jFxY8bB8QLkoKxIQeObCaDlJKewVlIEkuyYKm5An1tdVZ966w2+MPQ2l8LBZLjR+SgyV+nRkTIunzOYBMLQ==}
cpu: [arm]
os: [android]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-android-arm64@4.17.2:
resolution: {integrity: sha512-yeX/Usk7daNIVwkq2uGoq2BYJKZY1JfyLTaHO/jaiSwi/lsf8fTFoQW/n6IdAsx5tx+iotu2zCJwz8MxI6D/Bw==}
cpu: [arm64]
os: [android]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-darwin-arm64@4.17.2:
resolution: {integrity: sha512-kcMLpE6uCwls023+kknm71ug7MZOrtXo+y5p/tsg6jltpDtgQY1Eq5sGfHcQfb+lfuKwhBmEURDga9N0ol4YPw==}
cpu: [arm64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-darwin-x64@4.17.2:
resolution: {integrity: sha512-AtKwD0VEx0zWkL0ZjixEkp5tbNLzX+FCqGG1SvOu993HnSz4qDI6S4kGzubrEJAljpVkhRSlg5bzpV//E6ysTQ==}
cpu: [x64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-linux-arm-gnueabihf@4.17.2:
resolution: {integrity: sha512-3reX2fUHqN7sffBNqmEyMQVj/CKhIHZd4y631duy0hZqI8Qoqf6lTtmAKvJFYa6bhU95B1D0WgzHkmTg33In0A==}
cpu: [arm]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-linux-arm-musleabihf@4.17.2:
resolution: {integrity: sha512-uSqpsp91mheRgw96xtyAGP9FW5ChctTFEoXP0r5FAzj/3ZRv3Uxjtc7taRQSaQM/q85KEKjKsZuiZM3GyUivRg==}
cpu: [arm]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-linux-arm64-gnu@4.17.2:
resolution: {integrity: sha512-EMMPHkiCRtE8Wdk3Qhtciq6BndLtstqZIroHiiGzB3C5LDJmIZcSzVtLRbwuXuUft1Cnv+9fxuDtDxz3k3EW2A==}
cpu: [arm64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-linux-arm64-musl@4.17.2:
resolution: {integrity: sha512-NMPylUUZ1i0z/xJUIx6VUhISZDRT+uTWpBcjdv0/zkp7b/bQDF+NfnfdzuTiB1G6HTodgoFa93hp0O1xl+/UbA==}
cpu: [arm64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-linux-powerpc64le-gnu@4.17.2:
resolution: {integrity: sha512-T19My13y8uYXPw/L/k0JYaX1fJKFT/PWdXiHr8mTbXWxjVF1t+8Xl31DgBBvEKclw+1b00Chg0hxE2O7bTG7GQ==}
cpu: [ppc64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-linux-riscv64-gnu@4.17.2:
resolution: {integrity: sha512-BOaNfthf3X3fOWAB+IJ9kxTgPmMqPPH5f5k2DcCsRrBIbWnaJCgX2ll77dV1TdSy9SaXTR5iDXRL8n7AnoP5cg==}
cpu: [riscv64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-linux-s390x-gnu@4.17.2:
resolution: {integrity: sha512-W0UP/x7bnn3xN2eYMql2T/+wpASLE5SjObXILTMPUBDB/Fg/FxC+gX4nvCfPBCbNhz51C+HcqQp2qQ4u25ok6g==}
cpu: [s390x]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-linux-x64-gnu@4.17.2:
resolution: {integrity: sha512-Hy7pLwByUOuyaFC6mAr7m+oMC+V7qyifzs/nW2OJfC8H4hbCzOX07Ov0VFk/zP3kBsELWNFi7rJtgbKYsav9QQ==}
cpu: [x64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-linux-x64-musl@4.17.2:
resolution: {integrity: sha512-h1+yTWeYbRdAyJ/jMiVw0l6fOOm/0D1vNLui9iPuqgRGnXA0u21gAqOyB5iHjlM9MMfNOm9RHCQ7zLIzT0x11Q==}
cpu: [x64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-win32-arm64-msvc@4.17.2:
resolution: {integrity: sha512-tmdtXMfKAjy5+IQsVtDiCfqbynAQE/TQRpWdVataHmhMb9DCoJxp9vLcCBjEQWMiUYxO1QprH/HbY9ragCEFLA==}
cpu: [arm64]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-win32-ia32-msvc@4.17.2:
resolution: {integrity: sha512-7II/QCSTAHuE5vdZaQEwJq2ZACkBpQDOmQsE6D6XUbnBHW8IAhm4eTufL6msLJorzrHDFv3CF8oCA/hSIRuZeQ==}
cpu: [ia32]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@rollup/rollup-win32-x64-msvc@4.17.2:
resolution: {integrity: sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==}
cpu: [x64]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@types/estree@1.0.5:
resolution: {integrity: sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==}
dev: true
/esbuild@0.20.2:
resolution: {integrity: sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==}
engines: {node: '>=12'}
hasBin: true
requiresBuild: true
optionalDependencies:
'@esbuild/aix-ppc64': 0.20.2
'@esbuild/android-arm': 0.20.2
'@esbuild/android-arm64': 0.20.2
'@esbuild/android-x64': 0.20.2
'@esbuild/darwin-arm64': 0.20.2
'@esbuild/darwin-x64': 0.20.2
'@esbuild/freebsd-arm64': 0.20.2
'@esbuild/freebsd-x64': 0.20.2
'@esbuild/linux-arm': 0.20.2
'@esbuild/linux-arm64': 0.20.2
'@esbuild/linux-ia32': 0.20.2
'@esbuild/linux-loong64': 0.20.2
'@esbuild/linux-mips64el': 0.20.2
'@esbuild/linux-ppc64': 0.20.2
'@esbuild/linux-riscv64': 0.20.2
'@esbuild/linux-s390x': 0.20.2
'@esbuild/linux-x64': 0.20.2
'@esbuild/netbsd-x64': 0.20.2
'@esbuild/openbsd-x64': 0.20.2
'@esbuild/sunos-x64': 0.20.2
'@esbuild/win32-arm64': 0.20.2
'@esbuild/win32-ia32': 0.20.2
'@esbuild/win32-x64': 0.20.2
dev: true
/fsevents@2.3.3:
resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
os: [darwin]
requiresBuild: true
dev: true
optional: true
/nanoid@3.3.7:
resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
hasBin: true
dev: true
/node-addon-api@8.0.0:
resolution: {integrity: sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==}
engines: {node: ^18 || ^20 || >= 21}
dev: true
/node-gyp-build@4.8.1:
resolution: {integrity: sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==}
hasBin: true
dev: true
/picocolors@1.0.1:
resolution: {integrity: sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==}
dev: true
/postcss@8.4.38:
resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
engines: {node: ^10 || ^12 || >=14}
dependencies:
nanoid: 3.3.7
picocolors: 1.0.1
source-map-js: 1.2.0
dev: true
/rollup@4.17.2:
resolution: {integrity: sha512-/9ClTJPByC0U4zNLowV1tMBe8yMEAxewtR3cUNX5BoEpGH3dQEWpJLr6CLp0fPdYRF/fzVOgvDb1zXuakwF5kQ==}
engines: {node: '>=18.0.0', npm: '>=8.0.0'}
hasBin: true
dependencies:
'@types/estree': 1.0.5
optionalDependencies:
'@rollup/rollup-android-arm-eabi': 4.17.2
'@rollup/rollup-android-arm64': 4.17.2
'@rollup/rollup-darwin-arm64': 4.17.2
'@rollup/rollup-darwin-x64': 4.17.2
'@rollup/rollup-linux-arm-gnueabihf': 4.17.2
'@rollup/rollup-linux-arm-musleabihf': 4.17.2
'@rollup/rollup-linux-arm64-gnu': 4.17.2
'@rollup/rollup-linux-arm64-musl': 4.17.2
'@rollup/rollup-linux-powerpc64le-gnu': 4.17.2
'@rollup/rollup-linux-riscv64-gnu': 4.17.2
'@rollup/rollup-linux-s390x-gnu': 4.17.2
'@rollup/rollup-linux-x64-gnu': 4.17.2
'@rollup/rollup-linux-x64-musl': 4.17.2
'@rollup/rollup-win32-arm64-msvc': 4.17.2
'@rollup/rollup-win32-ia32-msvc': 4.17.2
'@rollup/rollup-win32-x64-msvc': 4.17.2
fsevents: 2.3.3
dev: true
/source-map-js@1.2.0:
resolution: {integrity: sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==}
engines: {node: '>=0.10.0'}
dev: true
/tree-sitter-haskell@0.21.0(tree-sitter@0.21.1):
resolution: {integrity: sha512-b2RLegPHuYPh7nJ3YKWgkWnFYxmYlQDE8TDJuNH+iuNuBcCMYyaA9JlJlMHfCvf7DmJNPtqqbO9Kh9NXEmbatQ==}
requiresBuild: true
peerDependencies:
tree-sitter: ^0.21.0
tree_sitter: '*'
peerDependenciesMeta:
tree_sitter:
optional: true
dependencies:
node-addon-api: 8.0.0
node-gyp-build: 4.8.1
tree-sitter: 0.21.1
dev: true
/tree-sitter@0.21.1:
resolution: {integrity: sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==}
requiresBuild: true
dependencies:
node-addon-api: 8.0.0
node-gyp-build: 4.8.1
dev: true
/vite@5.2.11:
resolution: {integrity: sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==}
engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true
peerDependencies:
'@types/node': ^18.0.0 || >=20.0.0
less: '*'
lightningcss: ^1.21.0
sass: '*'
stylus: '*'
sugarss: '*'
terser: ^5.4.0
peerDependenciesMeta:
'@types/node':
optional: true
less:
optional: true
lightningcss:
optional: true
sass:
optional: true
stylus:
optional: true
sugarss:
optional: true
terser:
optional: true
dependencies:
esbuild: 0.20.2
postcss: 8.4.38
rollup: 4.17.2
optionalDependencies:
fsevents: 2.3.3
dev: true
/web-tree-sitter@0.20.8:
resolution: {integrity: sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==}
dev: false

136
packages/hs2js/src/hs2js.mjs Normal file
View File

@ -0,0 +1,136 @@
import { parse } from './parser.mjs';
function runApply(node, scope, ops) {
if (node.children.length !== 2)
throw new Error(`expected 2 children for node type apply, got ${node.children.length}`);
const [fn, arg] = node.children.map((child) => run(child, scope, ops));
if (typeof fn !== 'function') {
throw new Error(`${node.children[0].text} is not a function`);
}
// only works if fn is curried!
return fn(arg);
}
function runInfix(left, symbol, right, ops) {
const customOp = ops[symbol];
if (customOp) {
return customOp(left, right);
}
switch (symbol) {
case '+':
return left + right;
case '-':
return left - right;
case '*':
return left * right;
case '/':
return left / right;
case '$':
return left(right);
case '&':
console.log('right', right);
return right(left);
case '.':
return (x) => left(right(x));
default:
throw new Error('unexpected infix operator ' + symbol);
}
}
function curry(patterns, body, scope, ops) {
const [variable, ...rest] = patterns;
return (arg) => {
let _scope = { ...scope, [variable.text]: arg };
if (patterns.length === 1) {
const result = run(body, _scope, ops);
return result;
}
return curry(rest, body, _scope, ops);
};
}
export function run(node, scope, ops = {}) {
let runInScope = (node, scp = scope) => run(node, scp, ops);
//console.log("node", node.type, node.text);
if (ops[node.type]) {
return ops[node.type](node);
}
switch (node.type) {
case 'ERROR':
throw new Error(`invalid syntax: "${node.text}"`);
case 'declarations':
let result;
node.children.forEach((declaration) => {
result = runInScope(declaration);
});
return result;
case 'integer':
return Number(node.text);
case 'float':
return Number(node.text);
case 'string':
const str = node.text.slice(1, -1);
return String(str);
case 'lambda':
const [_, lpatterns, __, lbody] = node.children;
return curry(lpatterns.children, lbody, scope, ops);
case 'function':
const [fvariable, fpatterns, fbody] = node.children;
scope[fvariable.text] = curry(fpatterns.children, fbody, scope, ops);
return scope[fvariable.text];
case 'list': {
return node.children
.filter((_, i) => i % 2 === 1) // elements are at odd indices
.map((node) => runInScope(node));
}
case 'match':
if (node.children[0].text !== '=' || node.children.length !== 2) {
throw new Error('match node so far only support simple assignments');
}
return runInScope(node.children[1]);
case 'bind':
if (node.children.length !== 2) throw new Error('expected 2 children for node type bind');
if (node.children[0].type !== 'variable') throw new Error('expected variable as first child of bind node');
if (node.children[1].type !== 'match') throw new Error('expected match as first child of bind node');
const [bvariable, bmatch] = node.children;
const value = runInScope(bmatch);
scope[bvariable.text] = value;
return value;
case 'variable':
return scope[node.text];
case 'infix': {
const [a, op, b] = node.children;
const symbol = op.text;
const [left, right] = [runInScope(a), runInScope(b)];
return runInfix(left, symbol, right, ops);
}
case 'apply':
return runApply(node, scope, ops);
case 'left_section': {
const [_, b, op] = node.children;
const right = runInScope(b);
return (left) => runInfix(left, op.text, right, ops);
}
case 'right_section': {
const [_, op, b] = node.children;
const right = runInScope(b);
return (left) => runInfix(left, op.text, right, ops);
}
case 'parens':
if (node.children.length !== 3) throw new Error('expected 3 children for node type parens');
return runInScope(node.children[1]);
default:
if (node.children.length === 0) {
throw new Error('unhandled leaf type ' + node.type);
}
if (node.children.length > 1) {
throw new Error('unhandled branch type ' + node.type);
}
return runInScope(node.children[0]);
}
}
export function evaluate(haskellCode, scope = globalThis, ops) {
const ast = parse(haskellCode);
return run(ast.rootNode, scope, ops);
}

2
packages/hs2js/src/index.mjs Normal file
View File

@ -0,0 +1,2 @@
export * from './hs2js.mjs';
export * from './parser.mjs';

37
packages/hs2js/src/parser.mjs Normal file
View File

@ -0,0 +1,37 @@
import Parser from 'web-tree-sitter';
let base = '/';
export function setBase(path) {
base = path;
}
let isReady = false,
parser;
async function _loadParser() {
await Parser.init({
locateFile(scriptName, scriptDirectory) {
return `${base}${scriptName}`;
},
});
parser = new Parser();
const Lang = await Parser.Language.load(`${base}tree-sitter-haskell.wasm`);
parser.setLanguage(Lang);
isReady = true;
return parser;
}
let parserLoaded;
export function loadParser() {
if (!parserLoaded) {
parserLoaded = _loadParser();
}
return parserLoaded;
}
export function parse(code) {
if (!isReady) {
throw new Error('hs2js not ready. await loadParser before calling evaluate or parse functions');
}
// for some reason, the parser doesn't like new lines..
return parser.parse(code.replaceAll('\n\n', '~~~~').replaceAll('\n', ' ').replaceAll('~~~~', ' \n'));
}

20
packages/hs2js/vite.config.js Normal file
View File

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

5
packages/hydra/hydra.mjs
View File

@ -1,5 +1,5 @@
import { getDrawContext } from '@strudel/draw'; import { getDrawContext } from '@strudel/draw';
import { controls } from '@strudel/core'; import { controls, getTime, reify } from '@strudel/core';
let latestOptions; let latestOptions;
let hydra; let hydra;
@ -27,6 +27,7 @@ export async function initHydra(options = {}) {
hydraConfig.canvas = canvas; hydraConfig.canvas = canvas;
await import(/* @vite-ignore */ src); await import(/* @vite-ignore */ src);
/* eslint-disable-next-line */
hydra = new Hydra(hydraConfig); hydra = new Hydra(hydraConfig);
if (feedStrudel) { if (feedStrudel) {
const { canvas } = getDrawContext(); const { canvas } = getDrawContext();
@ -46,4 +47,4 @@ export function clearHydra() {
globalThis.shape = controls.shape; globalThis.shape = controls.shape;
} }
export const H = (p) => () => p.queryArc(getTime(), getTime())[0].value; export const H = (p) => () => reify(p).queryArc(getTime(), getTime())[0].value;

2
packages/hydra/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/hydra", "name": "@strudel/hydra",
"version": "1.0.1", "version": "1.1.0",
"description": "Hydra integration for strudel", "description": "Hydra integration for strudel",
"main": "hydra.mjs", "main": "hydra.mjs",
"type": "module", "type": "module",

7
packages/midi/midi.mjs
View File

@ -5,7 +5,7 @@ This program is free software: you can redistribute it and/or modify it under th
*/ */
import * as _WebMidi from 'webmidi'; import * as _WebMidi from 'webmidi';
import { Pattern, isPattern, logger, ref } from '@strudel/core'; import { Pattern, getEventOffsetMs, isPattern, logger, ref } from '@strudel/core';
import { noteToMidi } from '@strudel/core'; import { noteToMidi } from '@strudel/core';
import { Note } from 'webmidi'; import { Note } from 'webmidi';
// if you use WebMidi from outside of this package, make sure to import that instance: // if you use WebMidi from outside of this package, make sure to import that instance:
@ -120,10 +120,9 @@ Pattern.prototype.midi = function (output) {
const device = getDevice(output, WebMidi.outputs); const device = getDevice(output, WebMidi.outputs);
hap.ensureObjectValue(); hap.ensureObjectValue();
//magic number to get audio engine to line up, can probably be calculated somehow //magic number to get audio engine to line up, can probably be calculated somehow
const latency = 0.034; const latencyMs = 34;
// passing a string with a +num into the webmidi api adds an offset to the current time https://webmidijs.org/api/classes/Output // passing a string with a +num into the webmidi api adds an offset to the current time https://webmidijs.org/api/classes/Output
const timeOffsetString = `+${(targetTime - currentTime + latency) * 1000}`; const timeOffsetString = `+${getEventOffsetMs(targetTime, currentTime) + latencyMs}`;
// destructure value // destructure value
let { note, nrpnn, nrpv, ccn, ccv, midichan = 1, midicmd, gain = 1, velocity = 0.9 } = hap.value; let { note, nrpnn, nrpv, ccn, ccv, midichan = 1, midicmd, gain = 1, velocity = 0.9 } = hap.value;

2
packages/midi/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/midi", "name": "@strudel/midi",
"version": "1.0.1", "version": "1.1.0",
"description": "Midi API for strudel", "description": "Midi API for strudel",
"main": "index.mjs", "main": "index.mjs",
"type": "module", "type": "module",

25
packages/mini/bench/mini.bench.mjs Normal file
View File

@ -0,0 +1,25 @@
import { describe, bench } from 'vitest';
import { calculateTactus } from '../../core/index.mjs';
import { mini } from '../index.mjs';
describe('mini', () => {
calculateTactus(true);
bench(
'+tactus',
() => {
mini('a b c*3 [c d e, f g] <a b [c d?]>').fast(64).firstCycle();
},
{ time: 1000 },
);
calculateTactus(false);
bench(
'-tactus',
() => {
mini('a b c*3 [c d e, f g] <a b [c d?]>').fast(64).firstCycle();
},
{ time: 1000 },
);
calculateTactus(true);
});

9
packages/mini/krill-parser.js
View File

@ -295,7 +295,14 @@ function peg$parse(input, options) {
var peg$f6 = function(a) { return a }; var peg$f6 = function(a) { return a };
var peg$f7 = function(s) { s.arguments_.alignment = 'polymeter_slowcat'; return s; }; var peg$f7 = function(s) { s.arguments_.alignment = 'polymeter_slowcat'; return s; };
var peg$f8 = function(a) { return x => x.options_['weight'] = (x.options_['weight'] ?? 1) + (a ?? 2) - 1 }; var peg$f8 = function(a) { return x => x.options_['weight'] = (x.options_['weight'] ?? 1) + (a ?? 2) - 1 };
var peg$f9 = function(a) { return x => x.options_['reps'] = (x.options_['reps'] ?? 1) + (a ?? 2) - 1 }; var peg$f9 = function(a) { return x => {// A bit fiddly, to support both x!4 and x!!! as equivalent..
const reps = (x.options_['reps'] ?? 1) + (a ?? 2) - 1;
x.options_['reps'] = reps;
x.options_['ops'] = x.options_['ops'].filter(x => x.type_ !== "replicate");
x.options_['ops'].push({ type_: "replicate", arguments_ :{ amount:reps }});
x.options_['weight'] = reps;
}
};
var peg$f10 = function(p, s, r) { return x => x.options_['ops'].push({ type_: "bjorklund", arguments_ :{ pulse: p, step:s, rotation:r }}) }; var peg$f10 = function(p, s, r) { return x => x.options_['ops'].push({ type_: "bjorklund", arguments_ :{ pulse: p, step:s, rotation:r }}) };
var peg$f11 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'slow' }}) }; var peg$f11 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'slow' }}) };
var peg$f12 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'fast' }}) }; var peg$f12 = function(a) { return x => x.options_['ops'].push({ type_: "stretch", arguments_ :{ amount:a, type: 'fast' }}) };

9
packages/mini/krill.pegjs
View File

@ -135,7 +135,14 @@ op_weight = ws ("@" / "_") a:number?
{ return x => x.options_['weight'] = (x.options_['weight'] ?? 1) + (a ?? 2) - 1 } { return x => x.options_['weight'] = (x.options_['weight'] ?? 1) + (a ?? 2) - 1 }
op_replicate = ws "!" a:number? op_replicate = ws "!" a:number?
{ return x => x.options_['reps'] = (x.options_['reps'] ?? 1) + (a ?? 2) - 1 } { return x => {// A bit fiddly, to support both x!4 and x!!! as equivalent..
const reps = (x.options_['reps'] ?? 1) + (a ?? 2) - 1;
x.options_['reps'] = reps;
x.options_['ops'] = x.options_['ops'].filter(x => x.type_ !== "replicate");
x.options_['ops'].push({ type_: "replicate", arguments_ :{ amount:reps }});
x.options_['weight'] = reps;
}
}
op_bjorklund = "(" ws p:slice_with_ops ws comma ws s:slice_with_ops ws comma? ws r:slice_with_ops? ws ")" op_bjorklund = "(" ws p:slice_with_ops ws comma ws s:slice_with_ops ws comma? ws r:slice_with_ops? ws ")"
{ return x => x.options_['ops'].push({ type_: "bjorklund", arguments_ :{ pulse: p, step:s, rotation:r }}) } { return x => x.options_['ops'].push({ type_: "bjorklund", arguments_ :{ pulse: p, step:s, rotation:r }}) }

21
packages/mini/mini.mjs
View File

@ -27,6 +27,12 @@ const applyOptions = (parent, enter) => (pat, i) => {
pat = strudel.reify(pat)[type](enter(amount)); pat = strudel.reify(pat)[type](enter(amount));
break; break;
} }
case 'replicate': {
const { amount } = op.arguments_;
pat = strudel.reify(pat);
pat = pat._repeatCycles(amount)._fast(amount);
break;
}
case 'bjorklund': { case 'bjorklund': {
if (op.arguments_.rotation) { if (op.arguments_.rotation) {
pat = pat.euclidRot(enter(op.arguments_.pulse), enter(op.arguments_.step), enter(op.arguments_.rotation)); pat = pat.euclidRot(enter(op.arguments_.pulse), enter(op.arguments_.step), enter(op.arguments_.rotation));
@ -67,26 +73,13 @@ const applyOptions = (parent, enter) => (pat, i) => {
return pat; return pat;
}; };
function resolveReplications(ast) {
ast.source_ = strudel.flatten(
ast.source_.map((child) => {
const { reps } = child.options_ || {};
if (!reps) {
return [child];
}
delete child.options_.reps;
return Array(reps).fill(child);
}),
);
}
// expects ast from mini2ast + quoted mini string + optional callback when a node is entered // expects ast from mini2ast + quoted mini string + optional callback when a node is entered
export function patternifyAST(ast, code, onEnter, offset = 0) { export function patternifyAST(ast, code, onEnter, offset = 0) {
onEnter?.(ast); onEnter?.(ast);
const enter = (node) => patternifyAST(node, code, onEnter, offset); const enter = (node) => patternifyAST(node, code, onEnter, offset);
switch (ast.type_) { switch (ast.type_) {
case 'pattern': { case 'pattern': {
resolveReplications(ast); // resolveReplications(ast);
const children = ast.source_.map((child) => enter(child)).map(applyOptions(ast, enter)); const children = ast.source_.map((child) => enter(child)).map(applyOptions(ast, enter));
const alignment = ast.arguments_.alignment; const alignment = ast.arguments_.alignment;
const with_tactus = children.filter((child) => child.__tactus_source); const with_tactus = children.filter((child) => child.__tactus_source);

3
packages/mini/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/mini", "name": "@strudel/mini",
"version": "1.0.1", "version": "1.1.0",
"description": "Mini notation for strudel", "description": "Mini notation for strudel",
"main": "index.mjs", "main": "index.mjs",
"type": "module", "type": "module",
@ -9,6 +9,7 @@
}, },
"scripts": { "scripts": {
"test": "vitest run", "test": "vitest run",
"bench": "vitest bench",
"build:parser": "peggy -o krill-parser.js --format es ./krill.pegjs", "build:parser": "peggy -o krill-parser.js --format es ./krill.pegjs",
"build": "vite build", "build": "vite build",
"prepublishOnly": "npm run build" "prepublishOnly": "npm run build"

17
packages/osc/osc.mjs
View File

@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
import OSC from 'osc-js'; import OSC from 'osc-js';
import { logger, parseNumeral, Pattern } from '@strudel/core'; import { logger, parseNumeral, Pattern, getEventOffsetMs, isNote, noteToMidi } from '@strudel/core';
let connection; // Promise<OSC> let connection; // Promise<OSC>
function connect() { function connect() {
@ -44,7 +44,7 @@ function connect() {
* @returns Pattern * @returns Pattern
*/ */
Pattern.prototype.osc = function () { Pattern.prototype.osc = function () {
return this.onTrigger(async (time, hap, currentTime, cps = 1) => { return this.onTrigger(async (time, hap, currentTime, cps = 1, targetTime) => {
hap.ensureObjectValue(); hap.ensureObjectValue();
const osc = await connect(); const osc = await connect();
const cycle = hap.wholeOrPart().begin.valueOf(); const cycle = hap.wholeOrPart().begin.valueOf();
@ -52,11 +52,20 @@ Pattern.prototype.osc = function () {
const controls = Object.assign({}, { cps, cycle, delta }, hap.value); const controls = Object.assign({}, { cps, cycle, delta }, hap.value);
// make sure n and note are numbers // make sure n and note are numbers
controls.n && (controls.n = parseNumeral(controls.n)); controls.n && (controls.n = parseNumeral(controls.n));
controls.note && (controls.note = parseNumeral(controls.note)); if (typeof controls.note !== 'undefined') {
if (isNote(controls.note)) {
controls.midinote = noteToMidi(controls.note, controls.octave || 3);
} else {
controls.note = parseNumeral(controls.note);
}
}
controls.bank && (controls.s = controls.bank + controls.s);
controls.roomsize && (controls.size = parseNumeral(controls.roomsize));
const keyvals = Object.entries(controls).flat(); const keyvals = Object.entries(controls).flat();
// time should be audio time of onset // time should be audio time of onset
// currentTime should be current time of audio context (slightly before time) // currentTime should be current time of audio context (slightly before time)
const offset = (time - currentTime) * 1000; const offset = getEventOffsetMs(targetTime, currentTime);
// timestamp in milliseconds used to trigger the osc bundle at a precise moment // timestamp in milliseconds used to trigger the osc bundle at a precise moment
const ts = Math.floor(Date.now() + offset); const ts = Math.floor(Date.now() + offset);
const message = new OSC.Message('/dirt/play', ...keyvals); const message = new OSC.Message('/dirt/play', ...keyvals);

2
packages/osc/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/osc", "name": "@strudel/osc",
"version": "1.0.1", "version": "1.1.0",
"description": "OSC messaging for strudel", "description": "OSC messaging for strudel",
"main": "osc.mjs", "main": "osc.mjs",
"type": "module", "type": "module",

2
packages/osc/server.js
View File

@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. 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/>.
*/ */
const OSC = require('osc-js'); import OSC from 'osc-js';
const config = { const config = {
receiver: 'ws', // @param {string} Where messages sent via 'send' method will be delivered to, 'ws' for Websocket clients, 'udp' for udp client receiver: 'ws', // @param {string} Where messages sent via 'send' method will be delivered to, 'ws' for Websocket clients, 'udp' for udp client

2
packages/osc/tidal-sniffer.js
View File

@ -4,7 +4,7 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>. 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/>.
*/ */
const OSC = require('osc-js'); import OSC from 'osc-js';
const config = { const config = {
receiver: 'ws', // @param {string} Where messages sent via 'send' method will be delivered to, 'ws' for Websocket clients, 'udp' for udp client receiver: 'ws', // @param {string} Where messages sent via 'send' method will be delivered to, 'ws' for Websocket clients, 'udp' for udp client

2
packages/repl/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/repl", "name": "@strudel/repl",
"version": "1.0.2", "version": "1.1.0",
"description": "Strudel REPL as a Web Component", "description": "Strudel REPL as a Web Component",
"module": "index.mjs", "module": "index.mjs",
"publishConfig": { "publishConfig": {

4
packages/sampler/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/sampler", "name": "@strudel/sampler",
"version": "0.0.9", "version": "0.1.0",
"description": "", "description": "",
"keywords": [ "keywords": [
"tidalcycles", "tidalcycles",
@ -16,4 +16,4 @@
"dependencies": { "dependencies": {
"cowsay": "^1.6.0" "cowsay": "^1.6.0"
} }
} }

17
packages/sampler/sample-server.mjs
View File

@ -4,7 +4,7 @@ import cowsay from 'cowsay';
import { createReadStream } from 'fs'; import { createReadStream } from 'fs';
import { readdir } from 'fs/promises'; import { readdir } from 'fs/promises';
import http from 'http'; import http from 'http';
import { join } from 'path'; import { join, sep } from 'path';
import os from 'os'; import os from 'os';
// eslint-disable-next-line // eslint-disable-next-line
@ -45,15 +45,16 @@ async function getFilesInDirectory(directory) {
} }
async function getBanks(directory) { async function getBanks(directory) {
// const directory = resolve(__dirname, '.');
let files = await getFilesInDirectory(directory); let files = await getFilesInDirectory(directory);
let banks = {}; let banks = {};
files = files.map((url) => { directory = directory.split(sep).join('/');
const [bank] = url.split('/').slice(-2); files = files.map((path) => {
path = path.split(sep).join('/');
const [bank] = path.split('/').slice(-2);
banks[bank] = banks[bank] || []; banks[bank] = banks[bank] || [];
url = url.replace(directory, ''); const relativeUrl = path.replace(directory, '');
banks[bank].push(url); banks[bank].push(relativeUrl);
return url; return relativeUrl;
}); });
banks._base = `http://localhost:5432`; banks._base = `http://localhost:5432`;
return { banks, files }; return { banks, files };
@ -74,7 +75,7 @@ const server = http.createServer(async (req, res) => {
res.end('File not found'); res.end('File not found');
return; return;
} }
const filePath = join(directory, subpath); const filePath = join(directory, subpath.split('/').join(sep));
const readStream = createReadStream(filePath); const readStream = createReadStream(filePath);
readStream.on('error', (err) => { readStream.on('error', (err) => {
res.statusCode = 500; res.statusCode = 500;

2
packages/serial/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/serial", "name": "@strudel/serial",
"version": "1.0.1", "version": "1.1.0",
"description": "Webserial API for strudel", "description": "Webserial API for strudel",
"main": "serial.mjs", "main": "serial.mjs",
"type": "module", "type": "module",

2
packages/soundfonts/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/soundfonts", "name": "@strudel/soundfonts",
"version": "1.0.1", "version": "1.1.0",
"description": "Soundsfont support for strudel", "description": "Soundsfont support for strudel",
"main": "index.mjs", "main": "index.mjs",
"publishConfig": { "publishConfig": {

4
packages/superdough/dspworklet.mjs
View File

@ -74,6 +74,6 @@ export const dough = async (code) => {
worklet.node.connect(ac.destination); worklet.node.connect(ac.destination);
}; };
export function doughTrigger(t, hap, currentTime, duration, cps) { export function doughTrigger(time_deprecate, hap, currentTime, cps, targetTime) {
window.postMessage({ time: t, dough: hap.value, currentTime, duration, cps }); window.postMessage({ time: targetTime, dough: hap.value, currentTime, duration: hap.duration, cps });
} }

29
packages/superdough/helpers.mjs
View File

@ -14,6 +14,15 @@ const getSlope = (y1, y2, x1, x2) => {
} }
return (y2 - y1) / (x2 - x1); return (y2 - y1) / (x2 - x1);
}; };
export function getWorklet(ac, processor, params, config) {
const node = new AudioWorkletNode(ac, processor, config);
Object.entries(params).forEach(([key, value]) => {
node.parameters.get(key).value = value;
});
return node;
}
export const getParamADSR = ( export const getParamADSR = (
param, param,
attack, attack,
@ -103,14 +112,22 @@ export const getADSRValues = (params, curve = 'linear', defaultValues) => {
return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)]; return [Math.max(a ?? 0, envmin), Math.max(d ?? 0, envmin), Math.min(sustain, envmax), Math.max(r ?? 0, releaseMin)];
}; };
export function createFilter(context, type, frequency, Q, att, dec, sus, rel, fenv, start, end, fanchor) { export function createFilter(context, type, frequency, Q, att, dec, sus, rel, fenv, start, end, fanchor, model, drive) {
const curve = 'exponential'; const curve = 'exponential';
const [attack, decay, sustain, release] = getADSRValues([att, dec, sus, rel], curve, [0.005, 0.14, 0, 0.1]); const [attack, decay, sustain, release] = getADSRValues([att, dec, sus, rel], curve, [0.005, 0.14, 0, 0.1]);
const filter = context.createBiquadFilter(); let filter;
let frequencyParam;
if (model === 'ladder') {
filter = getWorklet(context, 'ladder-processor', { frequency, q: Q, drive });
frequencyParam = filter.parameters.get('frequency');
} else {
filter = context.createBiquadFilter();
filter.type = type;
filter.Q.value = Q;
filter.frequency.value = frequency;
frequencyParam = filter.frequency;
}
filter.type = type;
filter.Q.value = Q;
filter.frequency.value = frequency;
// envelope is active when any of these values is set // envelope is active when any of these values is set
const hasEnvelope = att ?? dec ?? sus ?? rel ?? fenv; const hasEnvelope = att ?? dec ?? sus ?? rel ?? fenv;
// Apply ADSR to filter frequency // Apply ADSR to filter frequency
@ -122,7 +139,7 @@ export function createFilter(context, type, frequency, Q, att, dec, sus, rel, fe
let min = clamp(2 ** -offset * frequency, 0, 20000); let min = clamp(2 ** -offset * frequency, 0, 20000);
let max = clamp(2 ** (fenvAbs - offset) * frequency, 0, 20000); let max = clamp(2 ** (fenvAbs - offset) * frequency, 0, 20000);
if (fenv < 0) [min, max] = [max, min]; if (fenv < 0) [min, max] = [max, min];
getParamADSR(filter.frequency, attack, decay, sustain, release, min, max, start, end, curve); getParamADSR(frequencyParam, attack, decay, sustain, release, min, max, start, end, curve);
return filter; return filter;
} }
return filter; return filter;

2
packages/superdough/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "superdough", "name": "superdough",
"version": "1.0.1", "version": "1.1.0",
"description": "simple web audio synth and sampler intended for live coding. inspired by superdirt and webdirt.", "description": "simple web audio synth and sampler intended for live coding. inspired by superdirt and webdirt.",
"main": "index.mjs", "main": "index.mjs",
"type": "module", "type": "module",

190
packages/superdough/superdough.mjs
View File

@ -7,9 +7,9 @@ This program is free software: you can redistribute it and/or modify it under th
import './feedbackdelay.mjs'; import './feedbackdelay.mjs';
import './reverb.mjs'; import './reverb.mjs';
import './vowel.mjs'; import './vowel.mjs';
import { clamp, nanFallback } from './util.mjs'; import { clamp, nanFallback, _mod } from './util.mjs';
import workletsUrl from './worklets.mjs?url'; import workletsUrl from './worklets.mjs?url';
import { createFilter, gainNode, getCompressor } from './helpers.mjs'; import { createFilter, gainNode, getCompressor, getWorklet } from './helpers.mjs';
import { map } from 'nanostores'; import { map } from 'nanostores';
import { logger } from './logger.mjs'; import { logger } from './logger.mjs';
import { loadBuffer } from './sampler.mjs'; import { loadBuffer } from './sampler.mjs';
@ -24,6 +24,52 @@ export function getSound(s) {
return soundMap.get()[s]; return soundMap.get()[s];
} }
const defaultDefaultValues = {
s: 'triangle',
gain: 0.8,
postgain: 1,
density: '.03',
ftype: '12db',
fanchor: 0,
resonance: 1,
hresonance: 1,
bandq: 1,
channels: [1, 2],
phaserdepth: 0.75,
shapevol: 1,
distortvol: 1,
delay: 0,
delayfeedback: 0.5,
delaytime: 0.25,
orbit: 1,
i: 1,
velocity: 1,
fft: 8,
};
let defaultControls = new Map(Object.entries(defaultDefaultValues));
export function setDefaultValue(key, value) {
defaultControls.set(key, value);
}
export function getDefaultValue(key) {
return defaultControls.get(key);
}
export function setDefaultValues(defaultsobj) {
Object.keys(defaultsobj).forEach((key) => {
setDefaultValue(key, defaultsobj[key]);
});
}
export function resetDefaultValues() {
defaultControls = new Map(Object.entries(defaultDefaultValues));
}
export function setVersionDefaults(version) {
resetDefaultValues();
if (version === '1.0') {
setDefaultValue('fanchor', 0.5);
}
}
export const resetLoadedSounds = () => soundMap.set({}); export const resetLoadedSounds = () => soundMap.set({});
let audioContext; let audioContext;
@ -37,50 +83,49 @@ export const getAudioContext = () => {
if (!audioContext) { if (!audioContext) {
return setDefaultAudioContext(); return setDefaultAudioContext();
} }
return audioContext; return audioContext;
}; };
let workletsLoading; let workletsLoading;
function loadWorklets() { function loadWorklets() {
if (workletsLoading) { if (!workletsLoading) {
return workletsLoading; workletsLoading = getAudioContext().audioWorklet.addModule(workletsUrl);
} }
workletsLoading = getAudioContext().audioWorklet.addModule(workletsUrl);
return workletsLoading; return workletsLoading;
} }
export function getWorklet(ac, processor, params, config) {
const node = new AudioWorkletNode(ac, processor, config);
Object.entries(params).forEach(([key, value]) => {
node.parameters.get(key).value = value;
});
return node;
}
// this function should be called on first user interaction (to avoid console warning) // this function should be called on first user interaction (to avoid console warning)
export async function initAudio(options = {}) { export async function initAudio(options = {}) {
const { disableWorklets = false } = options; const { disableWorklets = false } = options;
if (typeof window !== 'undefined') { if (typeof window === 'undefined') {
await getAudioContext().resume(); return;
if (!disableWorklets) {
await loadWorklets().catch((err) => {
console.warn('could not load AudioWorklet effects coarse, crush and shape', err);
});
} else {
console.log('disableWorklets: AudioWorklet effects coarse, crush and shape are skipped!');
}
} }
await getAudioContext().resume();
if (disableWorklets) {
logger('[superdough]: AudioWorklets disabled with disableWorklets');
return;
}
try {
await loadWorklets();
logger('[superdough] AudioWorklets loaded');
} catch (err) {
console.warn('could not load AudioWorklet effects', err);
}
logger('[superdough] ready');
} }
let audioReady;
export async function initAudioOnFirstClick(options) { export async function initAudioOnFirstClick(options) {
return new Promise((resolve) => { if (!audioReady) {
document.addEventListener('click', async function listener() { audioReady = new Promise((resolve) => {
await initAudio(options); document.addEventListener('click', async function listener() {
resolve(); document.removeEventListener('click', listener);
document.removeEventListener('click', listener); await initAudio(options);
resolve();
});
}); });
}); }
return audioReady;
} }
let delays = {}; let delays = {};
@ -144,26 +189,25 @@ function getDelay(orbit, delaytime, delayfeedback, t) {
return delays[orbit]; return delays[orbit];
} }
// each orbit will have its own lfo function getPhaser(time, end, frequency = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
const phaserLFOs = {};
function getPhaser(orbit, t, speed = 1, depth = 0.5, centerFrequency = 1000, sweep = 2000) {
//gain //gain
const ac = getAudioContext(); const ac = getAudioContext();
const lfoGain = ac.createGain(); const lfoGain = ac.createGain();
lfoGain.gain.value = sweep; lfoGain.gain.value = sweep * 2;
// centerFrequency = centerFrequency * 2;
// sweep = sweep * 1.5;
//LFO const lfo = getWorklet(ac, 'lfo-processor', {
if (phaserLFOs[orbit] == null) { frequency,
phaserLFOs[orbit] = ac.createOscillator(); depth: 1,
phaserLFOs[orbit].frequency.value = speed; skew: 0,
phaserLFOs[orbit].type = 'sine'; phaseoffset: 0,
phaserLFOs[orbit].start(); time,
} end,
shape: 1,
phaserLFOs[orbit].connect(lfoGain); dcoffset: -0.5,
if (phaserLFOs[orbit].frequency.value != speed) { });
phaserLFOs[orbit].frequency.setValueAtTime(speed, t); lfo.connect(lfoGain);
}
//filters //filters
const numStages = 2; //num of filters in series const numStages = 2; //num of filters in series
@ -186,10 +230,14 @@ function getPhaser(orbit, t, speed = 1, depth = 0.5, centerFrequency = 1000, swe
return filterChain[filterChain.length - 1]; return filterChain[filterChain.length - 1];
} }
function getFilterType(ftype) {
ftype = ftype ?? 0;
const filterTypes = ['12db', 'ladder', '24db'];
return typeof ftype === 'number' ? filterTypes[Math.floor(_mod(ftype, filterTypes.length))] : ftype;
}
let reverbs = {}; let reverbs = {};
let hasChanged = (now, before) => now !== undefined && now !== before; let hasChanged = (now, before) => now !== undefined && now !== before;
function getReverb(orbit, duration, fade, lp, dim, ir) { function getReverb(orbit, duration, fade, lp, dim, ir) {
// If no reverb has been created for a given orbit, create one // If no reverb has been created for a given orbit, create one
if (!reverbs[orbit]) { if (!reverbs[orbit]) {
@ -281,15 +329,15 @@ export const superdough = async (value, t, hapDuration) => {
} }
// destructure // destructure
let { let {
s = 'triangle', s = getDefaultValue('s'),
bank, bank,
source, source,
gain = 0.8, gain = getDefaultValue('gain'),
postgain = 1, postgain = getDefaultValue('postgain'),
density = 0.03, density = getDefaultValue('density'),
// filters // filters
ftype = '12db', fanchor = getDefaultValue('fanchor'),
fanchor = 0.5, drive = 0.69,
// low pass // low pass
cutoff, cutoff,
lpenv, lpenv,
@ -297,7 +345,7 @@ export const superdough = async (value, t, hapDuration) => {
lpdecay, lpdecay,
lpsustain, lpsustain,
lprelease, lprelease,
resonance = 1, resonance = getDefaultValue('resonance'),
// high pass // high pass
hpenv, hpenv,
hcutoff, hcutoff,
@ -305,7 +353,7 @@ export const superdough = async (value, t, hapDuration) => {
hpdecay, hpdecay,
hpsustain, hpsustain,
hprelease, hprelease,
hresonance = 1, hresonance = getDefaultValue('hresonance'),
// band pass // band pass
bpenv, bpenv,
bandf, bandf,
@ -313,36 +361,36 @@ export const superdough = async (value, t, hapDuration) => {
bpdecay, bpdecay,
bpsustain, bpsustain,
bprelease, bprelease,
bandq = 1, bandq = getDefaultValue('bandq'),
channels = [1, 2], channels = getDefaultValue('channels'),
//phaser //phaser
phaser, phaser,
phaserdepth = 0.75, phaserdepth = getDefaultValue('phaserdepth'),
phasersweep, phasersweep,
phasercenter, phasercenter,
// //
coarse, coarse,
crush, crush,
shape, shape,
shapevol = 1, shapevol = getDefaultValue('shapevol'),
distort, distort,
distortvol = 1, distortvol = getDefaultValue('distortvol'),
pan, pan,
vowel, vowel,
delay = 0, delay = getDefaultValue('delay'),
delayfeedback = 0.5, delayfeedback = getDefaultValue('delayfeedback'),
delaytime = 0.25, delaytime = getDefaultValue('delaytime'),
orbit = 1, orbit = getDefaultValue('orbit'),
room, room,
roomfade, roomfade,
roomlp, roomlp,
roomdim, roomdim,
roomsize, roomsize,
ir, ir,
i = 0, i = getDefaultValue('i'),
velocity = 1, velocity = getDefaultValue('velocity'),
analyze, // analyser wet analyze, // analyser wet
fft = 8, // fftSize 0 - 10 fft = getDefaultValue('fft'), // fftSize 0 - 10
compressor: compressorThreshold, compressor: compressorThreshold,
compressorRatio, compressorRatio,
compressorKnee, compressorKnee,
@ -394,6 +442,8 @@ export const superdough = async (value, t, hapDuration) => {
// gain stage // gain stage
chain.push(gainNode(gain)); chain.push(gainNode(gain));
//filter
const ftype = getFilterType(value.ftype);
if (cutoff !== undefined) { if (cutoff !== undefined) {
let lp = () => let lp = () =>
createFilter( createFilter(
@ -409,6 +459,8 @@ export const superdough = async (value, t, hapDuration) => {
t, t,
t + hapDuration, t + hapDuration,
fanchor, fanchor,
ftype,
drive,
); );
chain.push(lp()); chain.push(lp());
if (ftype === '24db') { if (ftype === '24db') {
@ -484,7 +536,7 @@ export const superdough = async (value, t, hapDuration) => {
} }
// phaser // phaser
if (phaser !== undefined && phaserdepth > 0) { if (phaser !== undefined && phaserdepth > 0) {
const phaserFX = getPhaser(orbit, t, phaser, phaserdepth, phasercenter, phasersweep); const phaserFX = getPhaser(t, t + hapDuration, phaser, phaserdepth, phasercenter, phasersweep);
chain.push(phaserFX); chain.push(phaserFX);
} }

3
packages/superdough/synth.mjs
View File

@ -1,5 +1,5 @@
import { clamp, midiToFreq, noteToMidi } from './util.mjs'; import { clamp, midiToFreq, noteToMidi } from './util.mjs';
import { registerSound, getAudioContext, getWorklet } from './superdough.mjs'; import { registerSound, getAudioContext } from './superdough.mjs';
import { import {
applyFM, applyFM,
gainNode, gainNode,
@ -8,6 +8,7 @@ import {
getPitchEnvelope, getPitchEnvelope,
getVibratoOscillator, getVibratoOscillator,
webAudioTimeout, webAudioTimeout,
getWorklet,
} from './helpers.mjs'; } from './helpers.mjs';
import { getNoiseMix, getNoiseOscillator } from './noise.mjs'; import { getNoiseMix, getNoiseOscillator } from './noise.mjs';

282
packages/superdough/worklets.mjs
View File

@ -1,5 +1,140 @@
// coarse, crush, and shape processors adapted from dktr0's webdirt: https://github.com/dktr0/WebDirt/blob/5ce3d698362c54d6e1b68acc47eb2955ac62c793/dist/AudioWorklets.js // coarse, crush, and shape processors adapted from dktr0's webdirt: https://github.com/dktr0/WebDirt/blob/5ce3d698362c54d6e1b68acc47eb2955ac62c793/dist/AudioWorklets.js
// LICENSE GNU General Public License v3.0 see https://github.com/dktr0/WebDirt/blob/main/LICENSE // LICENSE GNU General Public License v3.0 see https://github.com/dktr0/WebDirt/blob/main/LICENSE
// TOFIX: THIS FILE DOES NOT SUPPORT IMPORTS ON DEPOLYMENT
const clamp = (num, min, max) => Math.min(Math.max(num, min), max);
const _mod = (n, m) => ((n % m) + m) % m;
const blockSize = 128;
// adjust waveshape to remove frequencies above nyquist to prevent aliasing
// referenced from https://www.kvraudio.com/forum/viewtopic.php?t=375517
function polyBlep(phase, dt) {
// 0 <= phase < 1
if (phase < dt) {
phase /= dt;
// 2 * (phase - phase^2/2 - 0.5)
return phase + phase - phase * phase - 1;
}
// -1 < phase < 0
else if (phase > 1 - dt) {
phase = (phase - 1) / dt;
// 2 * (phase^2/2 + phase + 0.5)
return phase * phase + phase + phase + 1;
}
// 0 otherwise
else {
return 0;
}
}
const waveshapes = {
tri(phase, skew = 0.5) {
const x = 1 - skew;
if (phase >= skew) {
return 1 / x - phase / x;
}
return phase / skew;
},
sine(phase) {
return Math.sin(Math.PI * 2 * phase) * 0.5 + 0.5;
},
ramp(phase) {
return phase;
},
saw(phase) {
return 1 - phase;
},
square(phase, skew = 0.5) {
if (phase >= skew) {
return 0;
}
return 1;
},
custom(phase, values = [0, 1]) {
const numParts = values.length - 1;
const currPart = Math.floor(phase * numParts);
const partLength = 1 / numParts;
const startVal = clamp(values[currPart], 0, 1);
const endVal = clamp(values[currPart + 1], 0, 1);
const y2 = endVal;
const y1 = startVal;
const x1 = 0;
const x2 = partLength;
const slope = (y2 - y1) / (x2 - x1);
return slope * (phase - partLength * currPart) + startVal;
},
sawblep(phase, dt) {
const v = 2 * phase - 1;
return v - polyBlep(phase, dt);
},
};
const waveShapeNames = Object.keys(waveshapes);
class LFOProcessor extends AudioWorkletProcessor {
static get parameterDescriptors() {
return [
{ name: 'time', defaultValue: 0 },
{ name: 'end', defaultValue: 0 },
{ name: 'frequency', defaultValue: 0.5 },
{ name: 'skew', defaultValue: 0.5 },
{ name: 'depth', defaultValue: 1 },
{ name: 'phaseoffset', defaultValue: 0 },
{ name: 'shape', defaultValue: 0 },
{ name: 'dcoffset', defaultValue: 0 },
];
}
constructor() {
super();
this.phase;
}
incrementPhase(dt) {
this.phase += dt;
if (this.phase > 1.0) {
this.phase = this.phase - 1;
}
}
process(inputs, outputs, parameters) {
// eslint-disable-next-line no-undef
if (currentTime >= parameters.end[0]) {
return false;
}
const output = outputs[0];
const frequency = parameters['frequency'][0];
const time = parameters['time'][0];
const depth = parameters['depth'][0];
const skew = parameters['skew'][0];
const phaseoffset = parameters['phaseoffset'][0];
const dcoffset = parameters['dcoffset'][0];
const shape = waveShapeNames[parameters['shape'][0]];
const blockSize = output[0].length ?? 0;
if (this.phase == null) {
this.phase = _mod(time * frequency + phaseoffset, 1);
}
// eslint-disable-next-line no-undef
const dt = frequency / sampleRate;
for (let n = 0; n < blockSize; n++) {
for (let i = 0; i < output.length; i++) {
const modval = (waveshapes[shape](this.phase, skew) + dcoffset) * depth;
output[i][n] = modval;
}
this.incrementPhase(dt);
}
return true;
}
}
registerProcessor('lfo-processor', LFOProcessor);
class CoarseProcessor extends AudioWorkletProcessor { class CoarseProcessor extends AudioWorkletProcessor {
static get parameterDescriptors() { static get parameterDescriptors() {
@ -8,19 +143,21 @@ class CoarseProcessor extends AudioWorkletProcessor {
constructor() { constructor() {
super(); super();
this.started = false;
} }
process(inputs, outputs, parameters) { process(inputs, outputs, parameters) {
const input = inputs[0]; const input = inputs[0];
const output = outputs[0]; const output = outputs[0];
const blockSize = 128;
const hasInput = !(input[0] === undefined);
if (this.started && !hasInput) {
return false;
}
this.started = hasInput;
let coarse = parameters.coarse[0] ?? 0; let coarse = parameters.coarse[0] ?? 0;
coarse = Math.max(1, coarse); coarse = Math.max(1, coarse);
if (input[0] == null || output[0] == null) {
return false;
}
for (let n = 0; n < blockSize; n++) { for (let n = 0; n < blockSize; n++) {
for (let i = 0; i < input.length; i++) { for (let i = 0; i < input.length; i++) {
output[i][n] = n % coarse === 0 ? input[i][n] : output[i][n - 1]; output[i][n] = n % coarse === 0 ? input[i][n] : output[i][n - 1];
@ -38,19 +175,22 @@ class CrushProcessor extends AudioWorkletProcessor {
constructor() { constructor() {
super(); super();
this.started = false;
} }
process(inputs, outputs, parameters) { process(inputs, outputs, parameters) {
const input = inputs[0]; const input = inputs[0];
const output = outputs[0]; const output = outputs[0];
const blockSize = 128;
const hasInput = !(input[0] === undefined);
if (this.started && !hasInput) {
return false;
}
this.started = hasInput;
let crush = parameters.crush[0] ?? 8; let crush = parameters.crush[0] ?? 8;
crush = Math.max(1, crush); crush = Math.max(1, crush);
if (input[0] == null || output[0] == null) {
return false;
}
for (let n = 0; n < blockSize; n++) { for (let n = 0; n < blockSize; n++) {
for (let i = 0; i < input.length; i++) { for (let i = 0; i < input.length; i++) {
const x = Math.pow(2, crush - 1); const x = Math.pow(2, crush - 1);
@ -72,21 +212,24 @@ class ShapeProcessor extends AudioWorkletProcessor {
constructor() { constructor() {
super(); super();
this.started = false;
} }
process(inputs, outputs, parameters) { process(inputs, outputs, parameters) {
const input = inputs[0]; const input = inputs[0];
const output = outputs[0]; const output = outputs[0];
const blockSize = 128;
const hasInput = !(input[0] === undefined);
if (this.started && !hasInput) {
return false;
}
this.started = hasInput;
let shape = parameters.shape[0]; let shape = parameters.shape[0];
shape = shape < 1 ? shape : 1.0 - 4e-10; shape = shape < 1 ? shape : 1.0 - 4e-10;
shape = (2.0 * shape) / (1.0 - shape); shape = (2.0 * shape) / (1.0 - shape);
const postgain = Math.max(0.001, Math.min(1, parameters.postgain[0])); const postgain = Math.max(0.001, Math.min(1, parameters.postgain[0]));
if (input[0] == null || output[0] == null) {
return false;
}
for (let n = 0; n < blockSize; n++) { for (let n = 0; n < blockSize; n++) {
for (let i = 0; i < input.length; i++) { for (let i = 0; i < input.length; i++) {
output[i][n] = (((1 + shape) * input[i][n]) / (1 + shape * Math.abs(input[i][n]))) * postgain; output[i][n] = (((1 + shape) * input[i][n]) / (1 + shape * Math.abs(input[i][n]))) * postgain;
@ -97,6 +240,77 @@ class ShapeProcessor extends AudioWorkletProcessor {
} }
registerProcessor('shape-processor', ShapeProcessor); registerProcessor('shape-processor', ShapeProcessor);
function fast_tanh(x) {
const x2 = x * x;
return (x * (27.0 + x2)) / (27.0 + 9.0 * x2);
}
const _PI = 3.14159265359;
//adapted from https://github.com/TheBouteillacBear/webaudioworklet-wasm?tab=MIT-1-ov-file
class LadderProcessor extends AudioWorkletProcessor {
static get parameterDescriptors() {
return [
{ name: 'frequency', defaultValue: 500 },
{ name: 'q', defaultValue: 1 },
{ name: 'drive', defaultValue: 0.69 },
];
}
constructor() {
super();
this.started = false;
this.p0 = [0, 0];
this.p1 = [0, 0];
this.p2 = [0, 0];
this.p3 = [0, 0];
this.p32 = [0, 0];
this.p33 = [0, 0];
this.p34 = [0, 0];
}
process(inputs, outputs, parameters) {
const input = inputs[0];
const output = outputs[0];
const hasInput = !(input[0] === undefined);
if (this.started && !hasInput) {
return false;
}
this.started = hasInput;
const resonance = parameters.q[0];
const drive = clamp(Math.exp(parameters.drive[0]), 0.1, 2000);
let cutoff = parameters.frequency[0];
// eslint-disable-next-line no-undef
cutoff = (cutoff * 2 * _PI) / sampleRate;
cutoff = cutoff > 1 ? 1 : cutoff;
const k = Math.min(8, resonance * 0.4);
// drive makeup * resonance volume loss makeup
let makeupgain = (1 / drive) * Math.min(1.75, 1 + k);
for (let n = 0; n < blockSize; n++) {
for (let i = 0; i < input.length; i++) {
const out = this.p3[i] * 0.360891 + this.p32[i] * 0.41729 + this.p33[i] * 0.177896 + this.p34[i] * 0.0439725;
this.p34[i] = this.p33[i];
this.p33[i] = this.p32[i];
this.p32[i] = this.p3[i];
this.p0[i] += (fast_tanh(input[i][n] * drive - k * out) - fast_tanh(this.p0[i])) * cutoff;
this.p1[i] += (fast_tanh(this.p0[i]) - fast_tanh(this.p1[i])) * cutoff;
this.p2[i] += (fast_tanh(this.p1[i]) - fast_tanh(this.p2[i])) * cutoff;
this.p3[i] += (fast_tanh(this.p2[i]) - fast_tanh(this.p3[i])) * cutoff;
output[i][n] = out * makeupgain;
}
}
return true;
}
}
registerProcessor('ladder-processor', LadderProcessor);
class DistortProcessor extends AudioWorkletProcessor { class DistortProcessor extends AudioWorkletProcessor {
static get parameterDescriptors() { static get parameterDescriptors() {
return [ return [
@ -107,19 +321,22 @@ class DistortProcessor extends AudioWorkletProcessor {
constructor() { constructor() {
super(); super();
this.started = false;
} }
process(inputs, outputs, parameters) { process(inputs, outputs, parameters) {
const input = inputs[0]; const input = inputs[0];
const output = outputs[0]; const output = outputs[0];
const blockSize = 128;
const hasInput = !(input[0] === undefined);
if (this.started && !hasInput) {
return false;
}
this.started = hasInput;
const shape = Math.expm1(parameters.distort[0]); const shape = Math.expm1(parameters.distort[0]);
const postgain = Math.max(0.001, Math.min(1, parameters.postgain[0])); const postgain = Math.max(0.001, Math.min(1, parameters.postgain[0]));
if (input[0] == null || output[0] == null) {
return false;
}
for (let n = 0; n < blockSize; n++) { for (let n = 0; n < blockSize; n++) {
for (let i = 0; i < input.length; i++) { for (let i = 0; i < input.length; i++) {
output[i][n] = (((1 + shape) * input[i][n]) / (1 + shape * Math.abs(input[i][n]))) * postgain; output[i][n] = (((1 + shape) * input[i][n]) / (1 + shape * Math.abs(input[i][n]))) * postgain;
@ -130,34 +347,7 @@ class DistortProcessor extends AudioWorkletProcessor {
} }
registerProcessor('distort-processor', DistortProcessor); registerProcessor('distort-processor', DistortProcessor);
// adjust waveshape to remove frequencies above nyquist to prevent aliasing // SUPERSAW
// referenced from https://www.kvraudio.com/forum/viewtopic.php?t=375517
const polyBlep = (phase, dt) => {
// 0 <= phase < 1
if (phase < dt) {
phase /= dt;
// 2 * (phase - phase^2/2 - 0.5)
return phase + phase - phase * phase - 1;
}
// -1 < phase < 0
else if (phase > 1 - dt) {
phase = (phase - 1) / dt;
// 2 * (phase^2/2 + phase + 0.5)
return phase * phase + phase + phase + 1;
}
// 0 otherwise
else {
return 0;
}
};
const saw = (phase, dt) => {
const v = 2 * phase - 1;
return v - polyBlep(phase, dt);
};
function lerp(a, b, n) { function lerp(a, b, n) {
return n * (b - a) + a; return n * (b - a) + a;
} }
@ -257,7 +447,7 @@ class SuperSawOscillatorProcessor extends AudioWorkletProcessor {
for (let i = 0; i < output[0].length; i++) { for (let i = 0; i < output[0].length; i++) {
this.phase[n] = this.phase[n] ?? Math.random(); this.phase[n] = this.phase[n] ?? Math.random();
const v = saw(this.phase[n], dt); const v = waveshapes.sawblep(this.phase[n], dt);
output[0][i] = output[0][i] + v * gainL; output[0][i] = output[0][i] + v * gainL;
output[1][i] = output[1][i] + v * gainR; output[1][i] = output[1][i] + v * gainR;

28
packages/tidal/package.json Normal file
View File

@ -0,0 +1,28 @@
{
"name": "@strudel/tidal",
"version": "0.1.0",
"description": "Experimental Tidal Code interpreter",
"module": "tidal.mjs",
"repository": {
"type": "git",
"url": "git+https://github.com/felixroos/hs2js.git"
},
"keywords": [
"haskell",
"javascript"
],
"author": "Felix Roos <flix91@gmail.com>",
"license": "AGPL-3.0-or-later",
"bugs": {
"url": "https://github.com/tidalcycles/strudel/issues"
},
"homepage": "https://github.com/tidalcycles/strudel/tree/main/packages/hs2js",
"dependencies": {
"@strudel/core": "workspace:*",
"@strudel/mini": "workspace:*",
"hs2js": "workspace:*"
},
"devDependencies": {
"vite": "^5.0.10"
}
}

73
packages/tidal/tidal.mjs Normal file
View File

@ -0,0 +1,73 @@
import { reify } from '@strudel/core';
import { m } from '@strudel/mini';
import { loadParser, evaluate } from 'hs2js';
function getInfixOperators() {
let operators = {
'>': 'set',
'#': 'set',
'+': 'add',
'-': 'sub',
'*': 'mul',
'/': 'div',
};
let alignments = {
in: (s) => '|' + s,
out: (s) => s + '|',
mix: (s) => '|' + s + '|',
};
let ops = {};
Object.entries(operators).forEach(([o, name]) => {
// operator without alignment
ops[o] = (l, r) => reify(l)[name](reify(r));
Object.entries(alignments).forEach(([a, getSymbol]) => {
// get symbol with alignment
let symbol = getSymbol(o);
ops[symbol] = (l, r) => reify(l)[name][a](reify(r));
});
});
ops['~>'] = (l, r) => reify(l).late(reify(r));
ops['<~'] = (l, r) => reify(l).early(reify(r));
ops['<$>'] = (l, r) => reify(r).fmap(l).outerJoin(); // is this right?
return ops;
}
const ops = getInfixOperators();
export async function initTidal() {
// TODO: implement this in regular land
window.d1 = (pat) => pat.p('d1');
window.d2 = (pat) => pat.p('d2');
window.d3 = (pat) => pat.p('d3');
window.d4 = (pat) => pat.p('d4');
window.d5 = (pat) => pat.p('d5');
window.d6 = (pat) => pat.p('d6');
window.d7 = (pat) => pat.p('d7');
window.d8 = (pat) => pat.p('d8');
window.d9 = (pat) => pat.p('d9');
return loadParser();
}
// offset is expected to be passed in from transpiler
/*
1. acorn parses JS to find location of tidal call
2. haskell-tree-sitter calls "string" function with node (including location)
3. m function sets locations for individual mini notation atom
so the location for a mini notation atom is:
js offset + hs offset + atom offset
*/
export function tidal(code, offset = 0) {
if (Array.isArray(code)) {
code = code.join('');
}
return evaluate(code, window, {
...ops,
string: (node) => {
// parses strings as mini notation and passes location
const str = node.text.slice(1, -1);
const col = node.startIndex + offset;
return m(str, col);
},
});
}

2
packages/tonal/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/tonal", "name": "@strudel/tonal",
"version": "1.0.1", "version": "1.1.0",
"description": "Tonal functions for strudel", "description": "Tonal functions for strudel",
"main": "index.mjs", "main": "index.mjs",
"publishConfig": { "publishConfig": {

115
packages/tonal/tonal.mjs
View File

@ -188,61 +188,66 @@ export const scaleTranspose = register('scaleTranspose', function (offset /* : n
* .s("piano") * .s("piano")
*/ */
export const scale = register('scale', function (scale, pat) { export const scale = register(
// Supports ':' list syntax in mininotation 'scale',
if (Array.isArray(scale)) { function (scale, pat) {
scale = scale.flat().join(' '); // Supports ':' list syntax in mininotation
} if (Array.isArray(scale)) {
return ( scale = scale.flat().join(' ');
pat }
.fmap((value) => { return (
const isObject = typeof value === 'object'; pat
let step = isObject ? value.n : value; .fmap((value) => {
if (isObject) { const isObject = typeof value === 'object';
delete value.n; // remove n so it won't cause trouble let step = isObject ? value.n : value;
} if (isObject) {
if (isNote(step)) { delete value.n; // remove n so it won't cause trouble
// legacy..
return pure(step);
}
let asNumber = Number(step);
let semitones = 0;
if (isNaN(asNumber)) {
step = String(step);
if (!/^[-+]?\d+(#*|b*){1}$/.test(step)) {
logger(
`[tonal] invalid scale step "${step}", expected number or integer with optional # b suffixes`,
'error',
);
return silence;
} }
const isharp = step.indexOf('#'); if (isNote(step)) {
if (isharp >= 0) { // legacy..
asNumber = Number(step.substring(0, isharp)); return pure(step);
semitones = step.length - isharp;
} else {
const iflat = step.indexOf('b');
asNumber = Number(step.substring(0, iflat));
semitones = iflat - step.length;
} }
} let asNumber = Number(step);
try { let semitones = 0;
let note; if (isNaN(asNumber)) {
if (isObject && value.anchor) { step = String(step);
note = stepInNamedScale(asNumber, scale, value.anchor); if (!/^[-+]?\d+(#*|b*){1}$/.test(step)) {
} else { logger(
note = scaleStep(asNumber, scale); `[tonal] invalid scale step "${step}", expected number or integer with optional # b suffixes`,
'error',
);
return silence;
}
const isharp = step.indexOf('#');
if (isharp >= 0) {
asNumber = Number(step.substring(0, isharp));
semitones = step.length - isharp;
} else {
const iflat = step.indexOf('b');
asNumber = Number(step.substring(0, iflat));
semitones = iflat - step.length;
}
} }
if (semitones != 0) note = Note.transpose(note, Interval.fromSemitones(semitones)); try {
value = pure(isObject ? { ...value, note } : note); let note;
} catch (err) { if (isObject && value.anchor) {
logger(`[tonal] ${err.message}`, 'error'); note = stepInNamedScale(asNumber, scale, value.anchor);
value = silence; } else {
} note = scaleStep(asNumber, scale);
return value; }
}) if (semitones != 0) note = Note.transpose(note, Interval.fromSemitones(semitones));
.outerJoin() value = pure(isObject ? { ...value, note } : note);
// legacy: } catch (err) {
.withHap((hap) => hap.setContext({ ...hap.context, scale })) logger(`[tonal] ${err.message}`, 'error');
); value = silence;
}); }
return value;
})
.outerJoin()
// legacy:
.withHap((hap) => hap.setContext({ ...hap.context, scale }))
);
},
true,
true, // preserve tactus
);

2
packages/transpiler/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/transpiler", "name": "@strudel/transpiler",
"version": "1.0.1", "version": "1.1.0",
"description": "Transpiler for strudel user code. Converts syntactically correct but semantically meaningless JS into evaluatable strudel code.", "description": "Transpiler for strudel user code. Converts syntactically correct but semantically meaningless JS into evaluatable strudel code.",
"main": "index.mjs", "main": "index.mjs",
"type": "module", "type": "module",

57
packages/transpiler/transpiler.mjs
View File

@ -26,6 +26,16 @@ export function transpiler(input, options = {}) {
walk(ast, { walk(ast, {
enter(node, parent /* , prop, index */) { enter(node, parent /* , prop, index */) {
if (isTidalTeplateLiteral(node)) {
const raw = node.quasi.quasis[0].value.raw;
const offset = node.quasi.start + 1;
if (emitMiniLocations) {
const stringLocs = collectHaskellMiniLocations(raw, offset);
miniLocations = miniLocations.concat(stringLocs);
}
this.skip();
return this.replace(tidalWithLocation(raw, offset));
}
if (isBackTickString(node, parent)) { if (isBackTickString(node, parent)) {
const { quasis } = node; const { quasis } = node;
const { raw } = quasis[0].value; const { raw } = quasis[0].value;
@ -59,6 +69,7 @@ export function transpiler(input, options = {}) {
to: node.end, to: node.end,
index, index,
type, type,
id: options.id,
}; };
emitWidgets && widgets.push(widgetConfig); emitWidgets && widgets.push(widgetConfig);
return this.replace(widgetWithLocation(node, widgetConfig)); return this.replace(widgetWithLocation(node, widgetConfig));
@ -152,7 +163,7 @@ export function getWidgetID(widgetConfig) {
// that means, if we use the index index of line position as id, less garbage is generated // that means, if we use the index index of line position as id, less garbage is generated
// return `widget_${widgetConfig.to}`; // more gargabe // return `widget_${widgetConfig.to}`; // more gargabe
//return `widget_${widgetConfig.index}_${widgetConfig.to}`; // also more garbage //return `widget_${widgetConfig.index}_${widgetConfig.to}`; // also more garbage
return `widget_${widgetConfig.type}_${widgetConfig.index}`; // less garbage return `${widgetConfig.id || ''}_widget_${widgetConfig.type}_${widgetConfig.index}`; // less garbage
} }
function widgetWithLocation(node, widgetConfig) { function widgetWithLocation(node, widgetConfig) {
@ -207,3 +218,47 @@ function labelToP(node) {
}, },
}; };
} }
// tidal highlighting
// this feels kind of stupid, when we also know the location inside the string op (tidal.mjs)
// but maybe it's the only way
function isTidalTeplateLiteral(node) {
return node.type === 'TaggedTemplateExpression' && node.tag.name === 'tidal';
}
function collectHaskellMiniLocations(haskellCode, offset) {
return haskellCode
.split('')
.reduce((acc, char, i) => {
if (char !== '"') {
return acc;
}
if (!acc.length || acc[acc.length - 1].length > 1) {
acc.push([i + 1]);
} else {
acc[acc.length - 1].push(i);
}
return acc;
}, [])
.map(([start, end]) => {
const miniString = haskellCode.slice(start, end);
return getLeafLocations(`"${miniString}"`, offset + start - 1);
})
.flat();
}
function tidalWithLocation(value, offset) {
return {
type: 'CallExpression',
callee: {
type: 'Identifier',
name: 'tidal',
},
arguments: [
{ type: 'Literal', value },
{ type: 'Literal', value: offset },
],
optional: false,
};
}

8
packages/web/README.md
View File

@ -72,7 +72,13 @@ document.getElementById('play').addEventListener('stop',
There is a tiny difference between the [Strudel REPL](https://strudel.cc/) and `@strudel/web`. There is a tiny difference between the [Strudel REPL](https://strudel.cc/) and `@strudel/web`.
In the REPL you can use 'single quotes' for regular JS strings and "double quotes" for mini notation patterns. In the REPL you can use 'single quotes' for regular JS strings and "double quotes" for mini notation patterns.
In `@strudel/web`, it does not matter which types of quotes you're using. In `@strudel/web`, it does not matter which types of quotes you're using.
There will probably be an escapte hatch for that in the future.
This difference means that you cannot call pattern methods on raw strings, for example `"1 2 3".slow(2)`.
To make it work you can either:
1. Use the `evaluate` function, which behaves exactly like the Strudel REPL, interpreting double quoted strings as mini notation.
2. wrap the string with `m`: `m("1 2 3").slow(2)`
3. wrap the string in a control function: `n("1 2 3").slow(2)` depending on your context.
## More Examples ## More Examples

6
packages/web/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/web", "name": "@strudel/web",
"version": "1.0.3", "version": "1.1.0",
"description": "Easy to setup, opiniated bundle of Strudel for the browser.", "description": "Easy to setup, opiniated bundle of Strudel for the browser.",
"module": "web.mjs", "module": "web.mjs",
"publishConfig": { "publishConfig": {
@ -40,7 +40,7 @@
"@strudel/webaudio": "workspace:*" "@strudel/webaudio": "workspace:*"
}, },
"devDependencies": { "devDependencies": {
"vite": "^5.0.10", "@rollup/plugin-replace": "^5.0.5",
"@rollup/plugin-replace": "^5.0.5" "vite": "^5.0.10"
} }
} }

29
packages/web/web.mjs
View File

@ -5,10 +5,10 @@ export * from '@strudel/transpiler';
export * from '@strudel/mini'; export * from '@strudel/mini';
export * from '@strudel/tonal'; export * from '@strudel/tonal';
export * from '@strudel/webaudio'; export * from '@strudel/webaudio';
import { Pattern, evalScope } from '@strudel/core'; import { Pattern, evalScope, setTime } from '@strudel/core';
import { initAudioOnFirstClick, registerSynthSounds, webaudioScheduler } from '@strudel/webaudio'; import { initAudioOnFirstClick, registerSynthSounds, webaudioRepl } from '@strudel/webaudio';
// import { registerSoundfonts } from '@strudel/soundfonts'; // import { registerSoundfonts } from '@strudel/soundfonts';
import { evaluate as _evaluate } from '@strudel/transpiler'; import { evaluate as _evaluate, transpiler } from '@strudel/transpiler';
import { miniAllStrings } from '@strudel/mini'; import { miniAllStrings } from '@strudel/mini';
// init logic // init logic
@ -27,39 +27,40 @@ export async function defaultPrebake() {
// when this function finishes, everything is initialized // when this function finishes, everything is initialized
let initDone; let initDone;
let scheduler; let repl;
export function initStrudel(options = {}) { export function initStrudel(options = {}) {
initAudioOnFirstClick(); initAudioOnFirstClick();
miniAllStrings(); options.miniAllStrings !== false && miniAllStrings();
const { prebake, ...schedulerOptions } = options; const { prebake, ...replOptions } = options;
repl = webaudioRepl({ ...replOptions, transpiler });
initDone = (async () => { initDone = (async () => {
await defaultPrebake(); await defaultPrebake();
await prebake?.(); await prebake?.();
return repl;
})(); })();
scheduler = webaudioScheduler(schedulerOptions); setTime(() => repl.scheduler.now());
return initDone;
} }
window.initStrudel = initStrudel; window.initStrudel = initStrudel;
// this method will play the pattern on the default scheduler // this method will play the pattern on the default scheduler
Pattern.prototype.play = function () { Pattern.prototype.play = function () {
if (!scheduler) { if (!repl) {
throw new Error('.play: no scheduler found. Have you called init?'); throw new Error('.play: no repl found. Have you called initStrudel?');
} }
initDone.then(() => { initDone.then(() => {
scheduler.setPattern(this, true); repl.setPattern(this, true);
}); });
return this; return this;
}; };
// stop playback // stop playback
export function hush() { export function hush() {
scheduler.stop(); repl.stop();
} }
// evaluate and play the given code using the transpiler // evaluate and play the given code using the transpiler
export async function evaluate(code, autoplay = true) { export async function evaluate(code, autoplay = true) {
const { pattern } = await _evaluate(code); return repl.evaluate(code, autoplay);
autoplay && pattern.play();
} }

2
packages/webaudio/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/webaudio", "name": "@strudel/webaudio",
"version": "1.0.1", "version": "1.1.0",
"description": "Web Audio helpers for Strudel", "description": "Web Audio helpers for Strudel",
"main": "index.mjs", "main": "index.mjs",
"type": "module", "type": "module",

2
packages/webaudio/scope.mjs
View File

@ -130,7 +130,7 @@ Pattern.prototype.fscope = function (config = {}) {
* @param {number} pos y-position relative to screen height. 0 = top, 1 = bottom of screen * @param {number} pos y-position relative to screen height. 0 = top, 1 = bottom of screen
* @param {number} trigger amplitude value that is used to align the scope. defaults to 0. * @param {number} trigger amplitude value that is used to align the scope. defaults to 0.
* @example * @example
* s("sawtooth").scope() * s("sawtooth")._scope()
*/ */
let latestColor = {}; let latestColor = {};
Pattern.prototype.tscope = function (config = {}) { Pattern.prototype.tscope = function (config = {}) {

10
packages/webaudio/webaudio.mjs
View File

@ -6,7 +6,7 @@ This program is free software: you can redistribute it and/or modify it under th
import * as strudel from '@strudel/core'; import * as strudel from '@strudel/core';
import { superdough, getAudioContext, setLogger, doughTrigger } from 'superdough'; import { superdough, getAudioContext, setLogger, doughTrigger } from 'superdough';
const { Pattern, logger } = strudel; const { Pattern, logger, repl } = strudel;
setLogger(logger); setLogger(logger);
@ -24,17 +24,13 @@ Pattern.prototype.webaudio = function () {
return this.onTrigger(webaudioOutputTrigger); return this.onTrigger(webaudioOutputTrigger);
}; };
export function webaudioScheduler(options = {}) { export function webaudioRepl(options = {}) {
options = { options = {
getTime: () => getAudioContext().currentTime, getTime: () => getAudioContext().currentTime,
defaultOutput: webaudioOutput, defaultOutput: webaudioOutput,
...options, ...options,
}; };
const { defaultOutput, getTime } = options; return repl(options);
return new strudel.Cyclist({
...options,
onTrigger: strudel.getTrigger({ defaultOutput, getTime }),
});
} }
Pattern.prototype.dough = function () { Pattern.prototype.dough = function () {

2
packages/xen/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@strudel/xen", "name": "@strudel/xen",
"version": "1.0.1", "version": "1.1.0",
"description": "Xenharmonic API for strudel", "description": "Xenharmonic API for strudel",
"main": "index.mjs", "main": "index.mjs",
"type": "module", "type": "module",

94
pnpm-lock.yaml generated
View File

@ -78,6 +78,9 @@ importers:
'@strudel/core': '@strudel/core':
specifier: workspace:* specifier: workspace:*
version: link:../../packages/core version: link:../../packages/core
'@strudel/draw':
specifier: workspace:*
version: link:../../packages/draw
'@strudel/mini': '@strudel/mini':
specifier: workspace:* specifier: workspace:*
version: link:../../packages/mini version: link:../../packages/mini
@ -140,6 +143,19 @@ importers:
specifier: ^5.0.10 specifier: ^5.0.10
version: 5.0.10 version: 5.0.10
examples/tidal-repl:
dependencies:
'@strudel/web':
specifier: workspace:*
version: link:../../packages/web
hs2js:
specifier: workspace:*
version: link:../../packages/hs2js
devDependencies:
vite:
specifier: ^5.0.8
version: 5.2.2(@types/node@20.10.6)
packages/codemirror: packages/codemirror:
dependencies: dependencies:
'@codemirror/autocomplete': '@codemirror/autocomplete':
@ -251,6 +267,19 @@ importers:
packages/embed: {} packages/embed: {}
packages/hs2js:
dependencies:
web-tree-sitter:
specifier: ^0.20.8
version: 0.20.8
devDependencies:
tree-sitter-haskell:
specifier: ^0.21.0
version: 0.21.0(tree-sitter@0.21.1)
vite:
specifier: ^5.0.10
version: 5.2.2(@types/node@20.10.6)
packages/hydra: packages/hydra:
dependencies: dependencies:
'@strudel/core': '@strudel/core':
@ -409,6 +438,22 @@ importers:
specifier: ^5.0.10 specifier: ^5.0.10
version: 5.0.10 version: 5.0.10
packages/tidal:
dependencies:
'@strudel/core':
specifier: workspace:*
version: link:../core
'@strudel/mini':
specifier: workspace:*
version: link:../mini
hs2js:
specifier: workspace:*
version: link:../hs2js
devDependencies:
vite:
specifier: ^5.0.10
version: 5.2.2(@types/node@20.10.6)
packages/tonal: packages/tonal:
dependencies: dependencies:
'@strudel/core': '@strudel/core':
@ -587,6 +632,9 @@ importers:
'@strudel/soundfonts': '@strudel/soundfonts':
specifier: workspace:* specifier: workspace:*
version: link:../packages/soundfonts version: link:../packages/soundfonts
'@strudel/tidal':
specifier: workspace:*
version: link:../packages/tidal
'@strudel/tonal': '@strudel/tonal':
specifier: workspace:* specifier: workspace:*
version: link:../packages/tonal version: link:../packages/tonal
@ -629,6 +677,9 @@ importers:
date-fns: date-fns:
specifier: ^3.2.0 specifier: ^3.2.0
version: 3.2.0 version: 3.2.0
hs2js:
specifier: 0.0.8
version: 0.0.8
nanoid: nanoid:
specifier: ^5.0.4 specifier: ^5.0.4
version: 5.0.4 version: 5.0.4
@ -8474,6 +8525,12 @@ packages:
lru-cache: 10.1.0 lru-cache: 10.1.0
dev: true dev: true
/hs2js@0.0.8:
resolution: {integrity: sha512-wFSenhY2MB1ACuwaJq0QyDk6yZiYwha/yOgAa2scsLvqEJTdHY2KXhsy8uZw+G2oVxQGyXs0OPf5gXN7HkP9mA==}
dependencies:
web-tree-sitter: 0.20.8
dev: false
/html-escaper@3.0.3: /html-escaper@3.0.3:
resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==} resolution: {integrity: sha512-RuMffC89BOWQoY0WKGpIhn5gX3iI54O6nRA0yC124NYVtzjmFWBIiFd8M0x+ZdX0P9R4lADg1mgP8C7PxGOWuQ==}
@ -10637,6 +10694,11 @@ packages:
semver: 7.5.4 semver: 7.5.4
dev: true dev: true
/node-addon-api@8.0.0:
resolution: {integrity: sha512-ipO7rsHEBqa9STO5C5T10fj732ml+5kLN1cAG8/jdHd56ldQeGj3Q7+scUS+VHK/qy1zLEwC4wMK5+yM0btPvw==}
engines: {node: ^18 || ^20 || >= 21}
dev: true
/node-domexception@1.0.0: /node-domexception@1.0.0:
resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==} resolution: {integrity: sha512-/jKZoMpw0F8GRwl4/eLROPA3cfcXtLApP0QzLmUT/HuPCZWyB7IY9ZrMeKw2O/nFIqPQB3PVM9aYm0F312AXDQ==}
engines: {node: '>=10.5.0'} engines: {node: '>=10.5.0'}
@ -10680,6 +10742,11 @@ packages:
engines: {node: '>= 0.6.0'} engines: {node: '>= 0.6.0'}
dev: false dev: false
/node-gyp-build@4.8.1:
resolution: {integrity: sha512-OSs33Z9yWr148JZcbZd5WiAXhh/n9z8TxQcdMhIOlpN9AhWpLfvVFO73+m77bBABQMaY9XSvIa+qk0jlI7Gcaw==}
hasBin: true
dev: true
/node-gyp@10.0.1: /node-gyp@10.0.1:
resolution: {integrity: sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==} resolution: {integrity: sha512-gg3/bHehQfZivQVfqIyy8wTdSymF9yTyP4CJifK73imyNMU8AIGQE2pUa7dNWfmMeG9cDVF2eehiRMv0LC1iAg==}
engines: {node: ^16.14.0 || >=18.0.0} engines: {node: ^16.14.0 || >=18.0.0}
@ -13392,6 +13459,29 @@ packages:
punycode: 2.3.1 punycode: 2.3.1
dev: true dev: true
/tree-sitter-haskell@0.21.0(tree-sitter@0.21.1):
resolution: {integrity: sha512-b2RLegPHuYPh7nJ3YKWgkWnFYxmYlQDE8TDJuNH+iuNuBcCMYyaA9JlJlMHfCvf7DmJNPtqqbO9Kh9NXEmbatQ==}
requiresBuild: true
peerDependencies:
tree-sitter: ^0.21.0
tree_sitter: '*'
peerDependenciesMeta:
tree_sitter:
optional: true
dependencies:
node-addon-api: 8.0.0
node-gyp-build: 4.8.1
tree-sitter: 0.21.1
dev: true
/tree-sitter@0.21.1:
resolution: {integrity: sha512-7dxoA6kYvtgWw80265MyqJlkRl4yawIjO7S5MigytjELkX43fV2WsAXzsNfO7sBpPPCF5Gp0+XzHk0DwLCq3xQ==}
requiresBuild: true
dependencies:
node-addon-api: 8.0.0
node-gyp-build: 4.8.1
dev: true
/trim-lines@3.0.1: /trim-lines@3.0.1:
resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==} resolution: {integrity: sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==}
@ -14186,6 +14276,10 @@ packages:
engines: {node: '>= 8'} engines: {node: '>= 8'}
dev: true dev: true
/web-tree-sitter@0.20.8:
resolution: {integrity: sha512-weOVgZ3aAARgdnb220GqYuh7+rZU0Ka9k9yfKtGAzEYMa6GgiCzW9JjQRJyCJakvibQW+dfjJdihjInKuuCAUQ==}
dev: false
/webidl-conversions@3.0.1: /webidl-conversions@3.0.1:
resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==} resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}

236
src-tauri/src/oscbridge.rs
View File

@ -1,22 +1,22 @@
use rosc::{ encoder, OscTime }; use rosc::{encoder, OscTime};
use rosc::{ OscMessage, OscPacket, OscType, OscBundle }; use rosc::{OscBundle, OscMessage, OscPacket, OscType};
use std::net::UdpSocket; use std::net::UdpSocket;
use std::time::Duration;
use std::sync::Arc;
use tokio::sync::{ mpsc, Mutex };
use serde::Deserialize; use serde::Deserialize;
use std::sync::Arc;
use std::thread::sleep; use std::thread::sleep;
use std::time::Duration;
use tokio::sync::{mpsc, Mutex};
use crate::loggerbridge::Logger; use crate::loggerbridge::Logger;
pub struct OscMsg { pub struct OscMsg {
pub msg_buf: Vec<u8>, pub msg_buf: Vec<u8>,
pub timestamp: u64, pub timestamp: u64,
} }
pub struct AsyncInputTransmit { pub struct AsyncInputTransmit {
pub inner: Mutex<mpsc::Sender<Vec<OscMsg>>>, pub inner: Mutex<mpsc::Sender<Vec<OscMsg>>>,
} }
const UNIX_OFFSET: u64 = 2_208_988_800; // 70 years in seconds const UNIX_OFFSET: u64 = 2_208_988_800; // 70 years in seconds
@ -25,133 +25,141 @@ const NANOS_PER_SECOND: f64 = 1.0e9;
const SECONDS_PER_NANO: f64 = 1.0 / NANOS_PER_SECOND; const SECONDS_PER_NANO: f64 = 1.0 / NANOS_PER_SECOND;
pub fn init( pub fn init(
logger: Logger, logger: Logger,
async_input_receiver: mpsc::Receiver<Vec<OscMsg>>, async_input_receiver: mpsc::Receiver<Vec<OscMsg>>,
mut async_output_receiver: mpsc::Receiver<Vec<OscMsg>>, mut async_output_receiver: mpsc::Receiver<Vec<OscMsg>>,
async_output_transmitter: mpsc::Sender<Vec<OscMsg>> async_output_transmitter: mpsc::Sender<Vec<OscMsg>>,
) { ) {
tauri::async_runtime::spawn(async move { async_process_model(async_input_receiver, async_output_transmitter).await }); tauri::async_runtime::spawn(async move {
let message_queue: Arc<Mutex<Vec<OscMsg>>> = Arc::new(Mutex::new(Vec::new())); async_process_model(async_input_receiver, async_output_transmitter).await
/* ........................................................... });
Listen For incoming messages and add to queue let message_queue: Arc<Mutex<Vec<OscMsg>>> = Arc::new(Mutex::new(Vec::new()));
............................................................*/
let message_queue_clone = Arc::clone(&message_queue);
tauri::async_runtime::spawn(async move {
loop {
if let Some(package) = async_output_receiver.recv().await {
let mut message_queue = message_queue_clone.lock().await;
let messages = package;
for message in messages {
(*message_queue).push(message);
}
}
}
});
let message_queue_clone = Arc::clone(&message_queue);
tauri::async_runtime::spawn(async move {
/* ........................................................... /* ...........................................................
Open OSC Ports Listen For incoming messages and add to queue
............................................................*/ ............................................................*/
let sock = UdpSocket::bind("127.0.0.1:57122").unwrap(); let message_queue_clone = Arc::clone(&message_queue);
let to_addr = String::from("127.0.0.1:57120"); tauri::async_runtime::spawn(async move {
sock.set_nonblocking(true).unwrap(); loop {
sock.connect(to_addr).expect("could not connect to OSC address"); if let Some(package) = async_output_receiver.recv().await {
let mut message_queue = message_queue_clone.lock().await;
/* ........................................................... let messages = package;
Process queued messages for message in messages {
............................................................*/ (*message_queue).push(message);
}
loop { }
let mut message_queue = message_queue_clone.lock().await;
message_queue.retain(|message| {
let result = sock.send(&message.msg_buf);
if result.is_err() {
logger.log(
format!("OSC Message failed to send, the server might no longer be available"),
"error".to_string()
);
} }
return false; });
});
sleep(Duration::from_millis(1)); let message_queue_clone = Arc::clone(&message_queue);
} tauri::async_runtime::spawn(async move {
}); /* ...........................................................
Open OSC Ports
............................................................*/
let sock = UdpSocket::bind("127.0.0.1:57122").unwrap();
let to_addr = String::from("127.0.0.1:57120");
sock.set_nonblocking(true).unwrap();
sock.connect(to_addr)
.expect("could not connect to OSC address");
/* ...........................................................
Process queued messages
............................................................*/
loop {
let mut message_queue = message_queue_clone.lock().await;
message_queue.retain(|message| {
let result = sock.send(&message.msg_buf);
if result.is_err() {
logger.log(
format!(
"OSC Message failed to send, the server might no longer be available"
),
"error".to_string(),
);
}
return false;
});
sleep(Duration::from_millis(1));
}
});
} }
pub async fn async_process_model( pub async fn async_process_model(
mut input_reciever: mpsc::Receiver<Vec<OscMsg>>, mut input_reciever: mpsc::Receiver<Vec<OscMsg>>,
output_transmitter: mpsc::Sender<Vec<OscMsg>> output_transmitter: mpsc::Sender<Vec<OscMsg>>,
) -> Result<(), Box<dyn std::error::Error + Send + Sync>> { ) -> Result<(), Box<dyn std::error::Error + Send + Sync>> {
while let Some(input) = input_reciever.recv().await { while let Some(input) = input_reciever.recv().await {
let output = input; let output = input;
output_transmitter.send(output).await?; output_transmitter.send(output).await?;
} }
Ok(()) Ok(())
} }
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct Param { pub struct Param {
name: String, name: String,
value: String, value: String,
valueisnumber: bool, valueisnumber: bool,
} }
#[derive(Deserialize)] #[derive(Deserialize)]
pub struct MessageFromJS { pub struct MessageFromJS {
params: Vec<Param>, params: Vec<Param>,
timestamp: u64, timestamp: u64,
target: String, target: String,
} }
// Called from JS // Called from JS
#[tauri::command] #[tauri::command]
pub async fn sendosc( pub async fn sendosc(
messagesfromjs: Vec<MessageFromJS>, messagesfromjs: Vec<MessageFromJS>,
state: tauri::State<'_, AsyncInputTransmit> state: tauri::State<'_, AsyncInputTransmit>,
) -> Result<(), String> { ) -> Result<(), String> {
let async_proc_input_tx = state.inner.lock().await; let async_proc_input_tx = state.inner.lock().await;
let mut messages_to_process: Vec<OscMsg> = Vec::new(); let mut messages_to_process: Vec<OscMsg> = Vec::new();
for m in messagesfromjs { for m in messagesfromjs {
let mut args = Vec::new(); let mut args = Vec::new();
for p in m.params { for p in m.params {
args.push(OscType::String(p.name)); args.push(OscType::String(p.name));
if p.valueisnumber { if p.valueisnumber {
args.push(OscType::Float(p.value.parse().unwrap())); args.push(OscType::Float(p.value.parse().unwrap()));
} else { } else {
args.push(OscType::String(p.value)); args.push(OscType::String(p.value));
} }
}
let duration_since_epoch =
Duration::from_millis(m.timestamp) + Duration::new(UNIX_OFFSET, 0);
let seconds = u32::try_from(duration_since_epoch.as_secs())
.map_err(|_| "bit conversion failed for osc message timetag")?;
let nanos = duration_since_epoch.subsec_nanos() as f64;
let fractional = (nanos * SECONDS_PER_NANO * TWO_POW_32).round() as u32;
let timetag = OscTime::from((seconds, fractional));
let packet = OscPacket::Message(OscMessage {
addr: m.target,
args,
});
let bundle = OscBundle {
content: vec![packet],
timetag,
};
let msg_buf = encoder::encode(&OscPacket::Bundle(bundle)).unwrap();
let message_to_process = OscMsg {
msg_buf,
timestamp: m.timestamp,
};
messages_to_process.push(message_to_process);
} }
let duration_since_epoch = Duration::from_millis(m.timestamp) + Duration::new(UNIX_OFFSET, 0); async_proc_input_tx
.send(messages_to_process)
let seconds = u32 .await
::try_from(duration_since_epoch.as_secs()) .map_err(|e| e.to_string())
.map_err(|_| "bit conversion failed for osc message timetag")?;
let nanos = duration_since_epoch.subsec_nanos() as f64;
let fractional = (nanos * SECONDS_PER_NANO * TWO_POW_32).round() as u32;
let timetag = OscTime::from((seconds, fractional));
let packet = OscPacket::Message(OscMessage {
addr: m.target,
args,
});
let bundle = OscBundle {
content: vec![packet],
timetag,
};
let msg_buf = encoder::encode(&OscPacket::Bundle(bundle)).unwrap();
let message_to_process = OscMsg {
msg_buf,
timestamp: m.timestamp,
};
messages_to_process.push(message_to_process);
}
async_proc_input_tx.send(messages_to_process).await.map_err(|e| e.to_string())
} }

1316
test/__snapshots__/examples.test.mjs.snap
View File

File diff suppressed because it is too large Load Diff

6928
test/__snapshots__/shared.test.mjs.snap
View File

File diff suppressed because it is too large Load Diff

14
test/runtime.mjs
View File

@ -122,6 +122,19 @@ strudel.Pattern.prototype.midi = function () {
return this; return this;
}; };
strudel.Pattern.prototype._scope = function () {
return this;
};
strudel.Pattern.prototype._spiral = function () {
return this;
};
strudel.Pattern.prototype._pitchwheel = function () {
return this;
};
strudel.Pattern.prototype._pianoroll = function () {
return this;
};
const uiHelpersMocked = { const uiHelpersMocked = {
backgroundImage: id, backgroundImage: id,
}; };
@ -178,6 +191,7 @@ evalScope(
}, },
); );
// TBD: use transpiler to support labeled statements
export const queryCode = async (code, cycles = 1) => { export const queryCode = async (code, cycles = 1) => {
const { pattern } = await evaluate(code); const { pattern } = await evaluate(code);
const haps = pattern.sortHapsByPart().queryArc(0, cycles); const haps = pattern.sortHapsByPart().queryArc(0, cycles);

2
undocumented.json
View File

@ -649,7 +649,7 @@
"/packages/webaudio/webaudio.mjs": [ "/packages/webaudio/webaudio.mjs": [
"webaudioOutputTrigger", "webaudioOutputTrigger",
"webaudioOutput", "webaudioOutput",
"webaudioScheduler" "webaudioRepl"
], ],
"/packages/webaudio/scope.mjs": [ "/packages/webaudio/scope.mjs": [
"drawTimeScope", "drawTimeScope",

3
website/.gitignore vendored
View File

@ -17,3 +17,6 @@ pnpm-debug.log*
# macOS-specific files # macOS-specific files
.DS_Store .DS_Store
public/tree-sitter.wasm
public/tree-sitter-haskell.wasm

5
website/package.json
View File

@ -9,7 +9,8 @@
"check": "astro check && tsc", "check": "astro check && tsc",
"build": "astro build", "build": "astro build",
"preview": "astro preview --port 3009 --host 0.0.0.0", "preview": "astro preview --port 3009 --host 0.0.0.0",
"astro": "astro" "astro": "astro",
"postinstall": "cp node_modules/hs2js/dist/tree-sitter.wasm public && cp node_modules/hs2js/dist/tree-sitter-haskell.wasm public"
}, },
"dependencies": { "dependencies": {
"@algolia/client-search": "^4.22.0", "@algolia/client-search": "^4.22.0",
@ -39,6 +40,7 @@
"@strudel/transpiler": "workspace:*", "@strudel/transpiler": "workspace:*",
"@strudel/webaudio": "workspace:*", "@strudel/webaudio": "workspace:*",
"@strudel/xen": "workspace:*", "@strudel/xen": "workspace:*",
"@strudel/tidal": "workspace:*",
"@supabase/supabase-js": "^2.39.1", "@supabase/supabase-js": "^2.39.1",
"@tailwindcss/forms": "^0.5.7", "@tailwindcss/forms": "^0.5.7",
"@tailwindcss/typography": "^0.5.10", "@tailwindcss/typography": "^0.5.10",
@ -49,6 +51,7 @@
"astro": "^4.0.8", "astro": "^4.0.8",
"claviature": "^0.1.0", "claviature": "^0.1.0",
"date-fns": "^3.2.0", "date-fns": "^3.2.0",
"hs2js": "0.0.8",
"nanoid": "^5.0.4", "nanoid": "^5.0.4",
"nanostores": "^0.9.5", "nanostores": "^0.9.5",
"react": "^18.2.0", "react": "^18.2.0",

1
website/src/config.ts
View File

@ -78,6 +78,7 @@ export const SIDEBAR: Sidebar = {
More: [ More: [
{ text: 'Recipes', link: 'recipes/recipes' }, { text: 'Recipes', link: 'recipes/recipes' },
{ text: 'Mini-Notation', link: 'learn/mini-notation' }, { text: 'Mini-Notation', link: 'learn/mini-notation' },
{ text: 'Visual Feedback', link: 'learn/visual-feedback' },
{ text: 'Offline', link: 'learn/pwa' }, { text: 'Offline', link: 'learn/pwa' },
{ text: 'Patterns', link: 'technical-manual/patterns' }, { text: 'Patterns', link: 'technical-manual/patterns' },
{ text: 'Music metadata', link: 'learn/metadata' }, { text: 'Music metadata', link: 'learn/metadata' },

41
website/src/docs/MiniRepl.jsx
View File

@ -1,20 +1,21 @@
import { useState, useRef, useCallback, useMemo, useEffect } from 'react'; import { useState, useRef, useCallback, useMemo, useEffect } from 'react';
import { Icon } from './Icon'; import { Icon } from './Icon';
import { silence, noteToMidi, _mod } from '@strudel/core'; import { silence, noteToMidi, _mod } from '@strudel/core';
import { getPunchcardPainter } from '@strudel/draw'; import { clearHydra } from '@strudel/hydra';
import { getDrawContext, getPunchcardPainter } from '@strudel/draw';
import { transpiler } from '@strudel/transpiler'; import { transpiler } from '@strudel/transpiler';
import { getAudioContext, webaudioOutput, initAudioOnFirstClick } from '@strudel/webaudio'; import { getAudioContext, webaudioOutput, initAudioOnFirstClick } from '@strudel/webaudio';
import { StrudelMirror } from '@strudel/codemirror'; import { StrudelMirror } from '@strudel/codemirror';
import { prebake } from '../repl/prebake.mjs'; import { prebake } from '../repl/prebake.mjs';
import { loadModules } from '../repl/util.mjs'; import { loadModules, setVersionDefaultsFrom } from '../repl/util.mjs';
import Claviature from '@components/Claviature'; import Claviature from '@components/Claviature';
import useClient from '@src/useClient.mjs'; import useClient from '@src/useClient.mjs';
let prebaked, modulesLoading, audioLoading; let prebaked, modulesLoading, audioReady;
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
prebaked = prebake(); prebaked = prebake();
modulesLoading = loadModules(); modulesLoading = loadModules();
audioLoading = initAudioOnFirstClick(); audioReady = initAudioOnFirstClick();
} }
export function MiniRepl({ export function MiniRepl({
@ -28,24 +29,29 @@ export function MiniRepl({
claviature, claviature,
claviatureLabels, claviatureLabels,
maxHeight, maxHeight,
autodraw,
drawTime,
}) { }) {
const code = tunes ? tunes[0] : tune; const code = tunes ? tunes[0] : tune;
const id = useMemo(() => s4(), []); const id = useMemo(() => s4(), []);
const canvasId = useMemo(() => `canvas-${id}`, [id]);
const shouldDraw = !!punchcard || !!claviature;
const shouldShowCanvas = !!punchcard; const shouldShowCanvas = !!punchcard;
const drawTime = punchcard ? [0, 4] : [0, 0]; const canvasId = shouldShowCanvas ? useMemo(() => `canvas-${id}`, [id]) : null;
autodraw = !!punchcard || !!claviature || !!autodraw;
drawTime = drawTime ?? punchcard ? [0, 4] : [-2, 2];
if (claviature) {
drawTime = [0, 0];
}
const [activeNotes, setActiveNotes] = useState([]); const [activeNotes, setActiveNotes] = useState([]);
const init = useCallback(({ code, shouldDraw }) => { const init = useCallback(({ code, autodraw }) => {
const drawContext = shouldDraw ? document.querySelector('#' + canvasId)?.getContext('2d') : null; const drawContext = canvasId ? document.querySelector('#' + canvasId)?.getContext('2d') : getDrawContext();
const editor = new StrudelMirror({ const editor = new StrudelMirror({
id, id,
defaultOutput: webaudioOutput, defaultOutput: webaudioOutput,
getTime: () => getAudioContext().currentTime, getTime: () => getAudioContext().currentTime,
transpiler, transpiler,
autodraw: !!shouldDraw, autodraw,
root: containerRef.current, root: containerRef.current,
initialCode: '// LOADING', initialCode: '// LOADING',
pattern: silence, pattern: silence,
@ -56,7 +62,7 @@ export function MiniRepl({
pat = pat.onTrigger(onTrigger, false); pat = pat.onTrigger(onTrigger, false);
} }
if (claviature) { if (claviature) {
editor?.painters.push((ctx, time, haps, drawTime) => { pat = pat.onPaint((ctx, time, haps, drawTime) => {
const active = haps const active = haps
.map((hap) => hap.value.note) .map((hap) => hap.value.note)
.filter(Boolean) .filter(Boolean)
@ -65,14 +71,21 @@ export function MiniRepl({
}); });
} }
if (punchcard) { if (punchcard) {
editor?.painters.push(getPunchcardPainter({ labels: !!punchcardLabels })); pat = pat.punchcard({ labels: !!punchcardLabels });
} }
return pat; return pat;
}, },
prebake: async () => Promise.all([modulesLoading, prebaked, audioLoading]), prebake: async () => Promise.all([modulesLoading, prebaked]),
onUpdateState: (state) => { onUpdateState: (state) => {
setReplState({ ...state }); setReplState({ ...state });
}, },
onToggle: (playing) => {
if (!playing) {
// clearHydra(); // TBD: doesn't work with multiple MiniRepl's on a page
}
},
beforeStart: () => audioReady,
afterEval: ({ code }) => setVersionDefaultsFrom(code),
}); });
// init settings // init settings
editor.setCode(code); editor.setCode(code);
@ -150,7 +163,7 @@ export function MiniRepl({
ref={(el) => { ref={(el) => {
if (!editorRef.current) { if (!editorRef.current) {
containerRef.current = el; containerRef.current = el;
init({ code, shouldDraw }); init({ code, autodraw });
} }
}} }}
></div> ></div>

5
website/src/examples.mjs
View File

@ -1,5 +1,6 @@
export const examples = [ export const examples = [
`// "coastline" @by eddyflux `// "coastline" @by eddyflux
// @version 1.0
samples('github:eddyflux/crate') samples('github:eddyflux/crate')
setcps(.75) setcps(.75)
let chords = chord("<Bbm9 Fm9>/4").dict('ireal') let chords = chord("<Bbm9 Fm9>/4").dict('ireal')
@ -18,7 +19,7 @@ stack(
n("<0!3 1*2>").set(chords).mode("root:g2") n("<0!3 1*2>").set(chords).mode("root:g2")
.voicing().s("gm_acoustic_bass"), .voicing().s("gm_acoustic_bass"),
chords.n("[0 <4 3 <2 5>>*2](<3 5>,8)") chords.n("[0 <4 3 <2 5>>*2](<3 5>,8)")
.set(x).anchor("D5").voicing() .anchor("D5").voicing()
.segment(4).clip(rand.range(.4,.8)) .segment(4).clip(rand.range(.4,.8))
.room(.75).shape(.3).delay(.25) .room(.75).shape(.3).delay(.25)
.fm(sine.range(3,8).slow(8)) .fm(sine.range(3,8).slow(8))
@ -29,6 +30,7 @@ stack(
) )
.late("[0 .01]*4").late("[0 .01]*2").size(4)`, .late("[0 .01]*4").late("[0 .01]*2").size(4)`,
`// "broken cut 1" @by froos `// "broken cut 1" @by froos
// @version 1.0
samples('github:tidalcycles/dirt-samples') samples('github:tidalcycles/dirt-samples')
samples({ samples({
@ -56,6 +58,7 @@ note("[c2 ~](3,8)*2,eb,g,bb,d").s("sawtooth")
s("<whirl attack>?").delay(".8:.1:.8").room(2).slow(8).cut(2), s("<whirl attack>?").delay(".8:.1:.8").room(2).slow(8).cut(2),
).reset("<x@30 [x*[8 [8 [16 32]]]]@2>".late(2))`, ).reset("<x@30 [x*[8 [8 [16 32]]]]@2>".late(2))`,
`// "acidic tooth" @by eddyflux `// "acidic tooth" @by eddyflux
// @version 1.0
setcps(1) setcps(1)
stack( stack(
note("[<g1 f1>/8](<3 5>,8)") note("[<g1 f1>/8](<3 5>,8)")

2
website/src/pages/de/workshop/pattern-effects.mdx
View File

@ -147,7 +147,7 @@ Probier `ply` mit einem pattern zu automatisieren, z.b. `"<1 2 1 3>"`
.off(1/8, x=>x.add(4)) .off(1/8, x=>x.add(4))
//.off(1/4, x=>x.add(7)) //.off(1/4, x=>x.add(7))
).scale("<C5:minor Db5:mixolydian>/4") ).scale("<C5:minor Db5:mixolydian>/4")
.s("triangle").room(.5).ds(".1:0").delay(.5)`} .s("triangle").room(.5).dec(.1).delay(.5)`}
punchcard punchcard
/> />

Some files were not shown because too many files have changed in this diff Show More