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

Merge branch 'main' into default-dict

Browse Source
This commit is contained in:
Felix Roos 2024-03-10 00:54:13 +01:00
commit c5a4184437
51 changed files with 8589 additions and 8232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/codemirror/codemirror.mjs
View File

@ -12,7 +12,8 @@ import {
lineNumbers,
drawSelection,
} from '@codemirror/view';
import { Pattern, Drawer, repl, cleanupDraw } from '@strudel/core';
import { Pattern, repl } from '@strudel/core';
import { Drawer, cleanupDraw } from '@strudel/draw';
import { isAutoCompletionEnabled } from './autocomplete.mjs';
import { isTooltipEnabled } from './tooltip.mjs';
import { flash, isFlashEnabled } from './flash.mjs';

1
packages/codemirror/package.json
View File

@ -45,6 +45,7 @@
"@replit/codemirror-vim": "^6.1.0",
"@replit/codemirror-vscode-keymap": "^6.0.2",
"@strudel/core": "workspace:*",
"@strudel/draw": "workspace:*",
"@uiw/codemirror-themes": "^4.21.21",
"@uiw/codemirror-themes-all": "^4.21.21",
"nanostores": "^0.9.5"

114
packages/core/controls.mjs
View File

@ -7,26 +7,33 @@ This program is free software: you can redistribute it and/or modify it under th
import { Pattern, register, sequence } from './pattern.mjs';
export function createParam(names) {
const name = Array.isArray(names) ? names[0] : names;
let isMulti = Array.isArray(names);
names = !isMulti ? [names] : names;
const name = names[0];
var withVal;
if (Array.isArray(names)) {
withVal = (xs) => {
if (Array.isArray(xs)) {
const result = {};
xs.forEach((x, i) => {
if (i < names.length) {
result[names[i]] = x;
}
});
return result;
} else {
return { [name]: xs };
}
};
} else {
withVal = (x) => ({ [name]: x });
}
const withVal = (xs) => {
let bag;
// check if we have an object with an unnamed control (.value)
if (typeof xs === 'object' && xs.value !== undefined) {
bag = { ...xs }; // grab props that are already there
xs = xs.value; // grab the unnamed control for this one
delete bag.value;
}
if (isMulti && Array.isArray(xs)) {
const result = bag || {};
xs.forEach((x, i) => {
if (i < names.length) {
result[names[i]] = x;
}
});
return result;
} else if (bag) {
bag[name] = xs;
return bag;
} else {
return { [name]: xs };
}
};
const func = (...pats) => sequence(...pats).withValue(withVal);
@ -119,6 +126,16 @@ export const { note } = registerControl(['note', 'n']);
*
*/
export const { accelerate } = registerControl('accelerate');
/**
*
* Sets the velocity from 0 to 1. Is multiplied together with gain.
* @name velocity
* @example
* s("hh*8")
* .gain(".4!2 1 .4!2 1 .4 1")
* .velocity(".4 1")
*/
export const { velocity } = registerControl('velocity');
/**
* Controls the gain by an exponential amount.
*
@ -400,19 +417,6 @@ export const { loopEnd, loope } = registerControl('loopEnd', 'loope');
* s("<bd sd>,hh*3").fast(2).crush("<16 8 7 6 5 4 3 2>")
*
*/
// TODO: currently duplicated with "native" legato
// TODO: superdirt legato will do more: https://youtu.be/dQPmE1WaD1k?t=419
/**
* a pattern of numbers from 0 to 1. Skips the beginning of each sample, e.g. `0.25` to cut off the first quarter from each sample.
*
* @name legato
* @param {number | Pattern} duration between 0 and 1, where 1 is the length of the whole hap time
* @noAutocomplete
* @example
* "c4 eb4 g4 bb4".legato("<0.125 .25 .5 .75 1 2 4>")
*
*/
// ['legato'],
// ['clhatdecay'],
export const { crush } = registerControl('crush');
/**
@ -1170,11 +1174,9 @@ export const { rate } = registerControl('rate');
export const { slide } = registerControl('slide');
// TODO: detune? https://tidalcycles.org/docs/patternlib/tutorials/synthesizers/#supersquare
export const { semitone } = registerControl('semitone');
// TODO: dedup with synth param, see https://tidalcycles.org/docs/reference/synthesizers/#superpiano
// ['velocity'],
// TODO: synth param
export const { voice } = registerControl('voice');
// voicings // https://github.com/tidalcycles/strudel/issues/506
// chord to voice, like C Eb Fm7 G7. the symbols can be defined via addVoicings
export const { chord } = registerControl('chord');
@ -1276,7 +1278,10 @@ export const { roomsize, size, sz, rsize } = registerControl('roomsize', 'size',
// ['sclaves'],
// ['scrash'],
/**
* Wave shaping distortion. CAUTION: it might get loud
* (Deprecated) Wave shaping distortion. WARNING: can suddenly get unpredictably loud.
* Please use distort instead, which has a more predictable response curve
* second option in optional array syntax (ex: ".9:.5") applies a postgain to the output
*
*
* @name shape
* @param {number | Pattern} distortion between 0 and 1
@ -1284,7 +1289,22 @@ export const { roomsize, size, sz, rsize } = registerControl('roomsize', 'size',
* s("bd sd [~ bd] sd,hh*8").shape("<0 .2 .4 .6 .8>")
*
*/
export const { shape } = registerControl('shape');
export const { shape } = registerControl(['shape', 'shapevol']);
/**
* Wave shaping distortion. CAUTION: it can get loud.
* Second option in optional array syntax (ex: ".9:.5") applies a postgain to the output.
* Most useful values are usually between 0 and 10 (depending on source gain). If you are feeling adventurous, you can turn it up to 11 and beyond ;)
*
* @name distort
* @synonyms dist
* @param {number | Pattern} distortion
* @example
* s("bd sd [~ bd] sd,hh*8").distort("<0 2 3 10:.5>")
* @example
* note("d1!8").s("sine").penv(36).pdecay(.12).decay(.23).distort("8:.4")
*
*/
export const { distort, dist } = registerControl(['distort', 'distortvol'], 'dist');
/**
* Dynamics Compressor. The params are `compressor("threshold:ratio:knee:attack:release")`
* More info [here](https://developer.mozilla.org/en-US/docs/Web/API/DynamicsCompressorNode?retiredLocale=de#instance_properties)
@ -1389,8 +1409,6 @@ export const { waveloss } = registerControl('waveloss');
*
*/
export const { density } = registerControl('density');
// TODO: midi effects?
export const { dur } = registerControl('dur');
// ['modwheel'],
export const { expression } = registerControl('expression');
export const { sustainpedal } = registerControl('sustainpedal');
@ -1420,7 +1438,6 @@ export const { octersubsub } = registerControl('octersubsub');
export const { ring } = registerControl('ring');
export const { ringf } = registerControl('ringf');
export const { ringdf } = registerControl('ringdf');
export const { distort } = registerControl('distort');
export const { freeze } = registerControl('freeze');
export const { xsdelay } = registerControl('xsdelay');
export const { tsdelay } = registerControl('tsdelay');
@ -1455,16 +1472,27 @@ export const { val } = registerControl('val');
export const { cps } = registerControl('cps');
/**
* Multiplies the duration with the given number. Also cuts samples off at the end if they exceed the duration.
* In tidal, this would be done with legato, [which has a complicated history in strudel](https://github.com/tidalcycles/strudel/issues/111).
* For now, if you're coming from tidal, just think clip = legato.
*
* @name clip
* @synonyms legato
* @param {number | Pattern} factor >= 0
* @example
* note("c a f e").s("piano").clip("<.5 1 2>")
*
*/
export const { clip } = registerControl('clip');
export const { clip, legato } = registerControl('clip', 'legato');
/**
* Sets the duration of the event in cycles. Similar to clip / legato, it also cuts samples off at the end if they exceed the duration.
*
* @name duration
* @synonyms dur
* @param {number | Pattern} seconds >= 0
* @example
* note("c a f e").s("piano").dur("<.5 1 2>")
*
*/
export const { duration, dur } = registerControl('duration', 'dur');
// ZZFX
export const { zrand } = registerControl('zrand');

8
packages/core/euclid.mjs
View File

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

12
packages/core/hap.mjs
View File

@ -3,6 +3,7 @@ hap.mjs - <short description TODO>
Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/hap.mjs>
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import Fraction from './fraction.mjs';
export class Hap {
/*
@ -32,7 +33,16 @@ export class Hap {
}
get duration() {
return this.whole.end.sub(this.whole.begin).mul(typeof this.value?.clip === 'number' ? this.value?.clip : 1);
let duration;
if (typeof this.value?.duration === 'number') {
duration = Fraction(this.value.duration);
} else {
duration = this.whole.end.sub(this.whole.begin);
}
if (typeof this.value?.clip === 'number') {
return duration.mul(this.value.clip);
}
return duration;
}
get endClipped() {

4
packages/core/index.mjs
View File

@ -22,10 +22,6 @@ export * from './repl.mjs';
export * from './cyclist.mjs';
export * from './logger.mjs';
export * from './time.mjs';
export * from './draw.mjs';
export * from './animate.mjs';
export * from './pianoroll.mjs';
export * from './spiral.mjs';
export * from './ui.mjs';
export { default as drawLine } from './drawLine.mjs';
// below won't work with runtime.mjs (json import fails)

10
packages/core/logger.mjs
View File

@ -1,6 +1,16 @@
export const logKey = 'strudel.log';
let debounce = 1000,
lastMessage,
lastTime;
export function logger(message, type, data = {}) {
let t = performance.now();
if (lastMessage === message && t - lastTime < debounce) {
return;
}
lastMessage = message;
lastTime = t;
console.log(`%c${message}`, 'background-color: black;color:white;border-radius:15px');
if (typeof document !== 'undefined' && typeof CustomEvent !== 'undefined') {
document.dispatchEvent(

51
packages/core/pattern.mjs
View File

@ -896,16 +896,15 @@ addToPrototype('weaveWith', function (t, ...funcs) {
//////////////////////////////////////////////////////////////////////
// compose matrix functions
// TODO - adopt value.mjs fully..
function _nonArrayObject(x) {
return !Array.isArray(x) && typeof x === 'object';
}
function _composeOp(a, b, func) {
function _nonFunctionObject(x) {
return x instanceof Object && !(x instanceof Function);
}
if (_nonFunctionObject(a) || _nonFunctionObject(b)) {
if (!_nonFunctionObject(a)) {
if (_nonArrayObject(a) || _nonArrayObject(b)) {
if (!_nonArrayObject(a)) {
a = { value: a };
}
if (!_nonFunctionObject(b)) {
if (!_nonArrayObject(b)) {
b = { value: b };
}
return unionWithObj(a, b, func);
@ -2064,7 +2063,7 @@ export const { echoWith, echowith, stutWith, stutwith } = register(
* s("bd sd").echo(3, 1/6, .8)
*/
export const echo = register('echo', function (times, time, feedback, pat) {
return pat._echoWith(times, time, (pat, i) => pat.velocity(Math.pow(feedback, i)));
return pat._echoWith(times, time, (pat, i) => pat.gain(Math.pow(feedback, i)));
});
/**
@ -2077,7 +2076,7 @@ export const echo = register('echo', function (times, time, feedback, pat) {
* s("bd sd").stut(3, .8, 1/6)
*/
export const stut = register('stut', function (times, feedback, time, pat) {
return pat._echoWith(times, time, (pat, i) => pat.velocity(Math.pow(feedback, i)));
return pat._echoWith(times, time, (pat, i) => pat.gain(Math.pow(feedback, i)));
});
/**
@ -2203,12 +2202,6 @@ export const bypass = register('bypass', function (on, pat) {
*/
export const ribbon = register('ribbon', (offset, cycles, pat) => pat.early(offset).restart(pure(1).slow(cycles)));
// sets absolute duration of haps
// TODO - fix
export const duration = register('duration', function (value, pat) {
return pat.withHapSpan((span) => new TimeSpan(span.begin, span.begin.add(value)));
});
export const hsla = register('hsla', (h, s, l, a, pat) => {
return pat.color(`hsla(${h}turn,${s * 100}%,${l * 100}%,${a})`);
});
@ -2228,34 +2221,6 @@ export const { color, colour } = register(['color', 'colour'], function (color,
return pat.withContext((context) => ({ ...context, color }));
});
/**
*
* Sets the velocity from 0 to 1. Is multiplied together with gain.
* @name velocity
* @example
* s("hh*8")
* .gain(".4!2 1 .4!2 1 .4 1")
* .velocity(".4 1")
*/
export const velocity = register('velocity', function (velocity, pat) {
return pat.withContext((context) => ({ ...context, velocity: (context.velocity || 1) * velocity }));
});
/**
*
* Multiplies the hap duration with the given factor.
* With samples, `clip` might be a better function to use ([more info](https://github.com/tidalcycles/strudel/pull/598))
* @name legato
* @memberof Pattern
* @example
* note("c3 eb3 g3 c4").legato("<.25 .5 1 2>")
*/
// TODO - fix
export const legato = register('legato', function (value, pat) {
value = Fraction(value);
return pat.withHapSpan((span) => new TimeSpan(span.begin, span.begin.add(span.end.sub(span.begin).mul(value))));
});
//////////////////////////////////////////////////////////////////////
// Control-related functions, i.e. ones that manipulate patterns of
// objects

69
packages/core/signal.mjs
View File

@ -244,9 +244,68 @@ export const pickmodF = register('pickmodF', function (lookup, funcs, pat) {
return pat.apply(pickmod(lookup, funcs));
});
/** * Similar to `pick`, but it applies an outerJoin instead of an innerJoin.
* @param {Pattern} pat
* @param {*} xs
* @returns {Pattern}
*/
export const pickOut = register('pickOut', function (lookup, pat) {
return _pick(lookup, pat, false).outerJoin();
});
/** * The same as `pickOut`, but if you pick a number greater than the size of the list,
* it wraps around, rather than sticking at the maximum value.
* @param {Pattern} pat
* @param {*} xs
* @returns {Pattern}
*/
export const pickmodOut = register('pickmodOut', function (lookup, pat) {
return _pick(lookup, pat, true).outerJoin();
});
/** * Similar to `pick`, but the choosen pattern is restarted when its index is triggered.
* @param {Pattern} pat
* @param {*} xs
* @returns {Pattern}
*/
export const pickRestart = register('pickRestart', function (lookup, pat) {
return _pick(lookup, pat, false).trigzeroJoin();
});
/** * The same as `pickRestart`, but if you pick a number greater than the size of the list,
* it wraps around, rather than sticking at the maximum value.
* @param {Pattern} pat
* @param {*} xs
* @returns {Pattern}
*/
export const pickmodRestart = register('pickmodRestart', function (lookup, pat) {
return _pick(lookup, pat, true).trigzeroJoin();
});
/** * Similar to `pick`, but the choosen pattern is reset when its index is triggered.
* @param {Pattern} pat
* @param {*} xs
* @returns {Pattern}
*/
export const pickReset = register('pickReset', function (lookup, pat) {
return _pick(lookup, pat, false).trigJoin();
});
/** * The same as `pickReset`, but if you pick a number greater than the size of the list,
* it wraps around, rather than sticking at the maximum value.
* @param {Pattern} pat
* @param {*} xs
* @returns {Pattern}
*/
export const pickmodReset = register('pickmodReset', function (lookup, pat) {
return _pick(lookup, pat, true).trigJoin();
});
/**
/** * Picks patterns (or plain values) either from a list (by index) or a lookup table (by name).
* Similar to `pick`, but cycles are squeezed into the target ('inhabited') pattern.
* @name inhabit
* @synonyms pickSqueeze
* @param {Pattern} pat
* @param {*} xs
* @returns {Pattern}
@ -257,21 +316,23 @@ export const pickmodF = register('pickmodF', function (lookup, funcs, pat) {
* @example
* s("a@2 [a b] a".inhabit({a: "bd(3,8)", b: "sd sd"})).slow(4)
*/
export const inhabit = register('inhabit', function (lookup, pat) {
return _pick(lookup, pat, true).squeezeJoin();
export const { inhabit, pickSqueeze } = register(['inhabit', 'pickSqueeze'], function (lookup, pat) {
return _pick(lookup, pat, false).squeezeJoin();
});
/** * The same as `inhabit`, but if you pick a number greater than the size of the list,
* it wraps around, rather than sticking at the maximum value.
* For example, if you pick the fifth pattern of a list of three, you'll get the
* second one.
* @name inhabitmod
* @synonyms pickmodSqueeze
* @param {Pattern} pat
* @param {*} xs
* @returns {Pattern}
*/
export const inhabitmod = register('inhabit', function (lookup, pat) {
return _pick(lookup, pat, false).squeezeJoin();
export const { inhabitmod, pickmodSqueeze } = register(['inhabitmod', 'pickmodSqueeze'], function (lookup, pat) {
return _pick(lookup, pat, true).squeezeJoin();
});
/**

4
packages/core/test/controls.test.mjs
View File

@ -25,4 +25,8 @@ describe('controls', () => {
{ s: 'sd', n: 4, gain: 0.5 },
]);
});
it('should support nested controls', () => {
expect(s(mini('bd').pan(1)).firstCycleValues).toEqual([{ s: 'bd', pan: 1 }]);
expect(s(mini('bd:1').pan(1)).firstCycleValues).toEqual([{ s: 'bd', n: 1, pan: 1 }]);
});
});

4
packages/csound/index.mjs
View File

@ -152,12 +152,14 @@ export const csoundm = register('csoundm', (instrument, pat) => {
const p2 = tidal_time - getAudioContext().currentTime;
const p3 = hap.duration.valueOf() + 0;
const frequency = getFrequency(hap);
let { gain = 1, velocity = 0.9 } = hap.value;
velocity = gain * velocity;
// Translate frequency to MIDI key number _without_ rounding.
const C4 = 261.62558;
let octave = Math.log(frequency / C4) / Math.log(2.0) + 8.0;
const p4 = octave * 12.0 - 36.0;
// We prefer floating point precision, but over the MIDI range [0, 127].
const p5 = 127 * (hap.context?.velocity ?? 0.9);
const p5 = 127 * velocity;
// The Strudel controls as a string.
const p6 = Object.entries({ ...hap.value, frequency })
.flat()

4
packages/desktopbridge/midibridge.mjs
View File

@ -7,9 +7,9 @@ const CC_MESSAGE = 0xb0;
Pattern.prototype.midi = function (output) {
return this.onTrigger((time, hap, currentTime, cps) => {
const { note, nrpnn, nrpv, ccn, ccv } = hap.value;
let { note, nrpnn, nrpv, ccn, ccv, velocity = 0.9, gain = 1 } = hap.value;
const offset = (time - currentTime) * 1000;
const velocity = Math.floor((hap.context?.velocity ?? 0.9) * 100); // TODO: refactor velocity
velocity = Math.floor(gain * velocity * 100);
const duration = Math.floor((hap.duration.valueOf() / cps) * 1000 - 10);
const roundedOffset = Math.round(offset);
const midichan = (hap.value.midichan ?? 1) - 1;

9
packages/draw/README.md Normal file
View File

@ -0,0 +1,9 @@
# @strudel/canvas
Helpers for drawing with the Canvas API and Strudel
## Install
```sh
npm i @strudel/canvas --save
```

7
packages/core/animate.mjs → packages/draw/animate.mjs
View File

@ -1,11 +1,14 @@
import { Pattern, getDrawContext, silence, register, pure, createParams } from './index.mjs';
import { Pattern, silence, register, pure, createParams } from '@strudel/core';
import { getDrawContext } from './draw.mjs';
let clearColor = '#22222210';
Pattern.prototype.animate = function ({ callback, sync = false, smear = 0.5 } = {}) {
window.frame && cancelAnimationFrame(window.frame);
const ctx = getDrawContext();
const { clientWidth: ww, clientHeight: wh } = ctx.canvas;
let { clientWidth: ww, clientHeight: wh } = ctx.canvas;
ww *= window.devicePixelRatio;
wh *= window.devicePixelRatio;
let smearPart = smear === 0 ? '99' : Number((1 - smear) * 100).toFixed(0);
smearPart = smearPart.length === 1 ? `0${smearPart}` : smearPart;
clearColor = `#200010${smearPart}`;

0
packages/core/color.mjs → packages/draw/color.mjs
View File

40
packages/core/draw.mjs → packages/draw/draw.mjs
View File

@ -1,31 +1,32 @@
/*
draw.mjs - <short description TODO>
Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/draw.mjs>
Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/canvas/draw.mjs>
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { Pattern, getTime, State, TimeSpan } from './index.mjs';
import { Pattern, getTime, State, TimeSpan } from '@strudel/core';
export const getDrawContext = (id = 'test-canvas') => {
export const getDrawContext = (id = 'test-canvas', options) => {
let { contextType = '2d', pixelated = false, pixelRatio = window.devicePixelRatio } = options || {};
let canvas = document.querySelector('#' + id);
if (!canvas) {
const scale = 2; // 2 = crisp on retina screens
canvas = document.createElement('canvas');
canvas.id = id;
canvas.width = window.innerWidth * scale;
canvas.height = window.innerHeight * scale;
canvas.width = window.innerWidth * pixelRatio;
canvas.height = window.innerHeight * pixelRatio;
canvas.style = 'pointer-events:none;width:100%;height:100%;position:fixed;top:0;left:0';
pixelated && (canvas.style.imageRendering = 'pixelated');
document.body.prepend(canvas);
let timeout;
window.addEventListener('resize', () => {
timeout && clearTimeout(timeout);
timeout = setTimeout(() => {
canvas.width = window.innerWidth * scale;
canvas.height = window.innerHeight * scale;
canvas.width = window.innerWidth * pixelRatio;
canvas.height = window.innerHeight * pixelRatio;
}, 200);
});
}
return canvas.getContext('2d');
return canvas.getContext(contextType);
};
Pattern.prototype.draw = function (callback, { from, to, onQuery } = {}) {
@ -61,6 +62,25 @@ Pattern.prototype.draw = function (callback, { from, to, onQuery } = {}) {
return this;
};
// this is a more generic helper to get a rendering callback for the currently active haps
// TODO: this misses events that are prolonged with clip or duration (would need state)
Pattern.prototype.onFrame = function (fn, offset = 0) {
if (typeof window === 'undefined') {
return this;
}
if (window.strudelAnimation) {
cancelAnimationFrame(window.strudelAnimation);
}
const animate = () => {
const t = getTime() + offset;
const haps = this.queryArc(t, t);
fn(haps, t, this);
window.strudelAnimation = requestAnimationFrame(animate);
};
requestAnimationFrame(animate);
return this;
};
export const cleanupDraw = (clearScreen = true) => {
const ctx = getDrawContext();
clearScreen && ctx.clearRect(0, 0, ctx.canvas.width, ctx.canvas.width);
@ -134,7 +154,7 @@ export class Drawer {
this.lastFrame = phase;
this.visibleHaps = (this.visibleHaps || [])
// filter out haps that are too far in the past (think left edge of screen for pianoroll)
.filter((h) => h.whole?.end >= phase - lookbehind - lookahead)
.filter((h) => h.endClipped >= phase - lookbehind - lookahead)
// add new haps with onset (think right edge bars scrolling in)
.concat(haps.filter((h) => h.hasOnset()));
const time = phase - lookahead;

5
packages/draw/index.mjs Normal file
View File

@ -0,0 +1,5 @@
export * from './animate.mjs';
export * from './color.mjs';
export * from './draw.mjs';
export * from './pianoroll.mjs';
export * from './spiral.mjs';

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

@ -0,0 +1,37 @@
{
"name": "@strudel/draw",
"version": "1.0.1",
"description": "Helpers for drawing with Strudel",
"main": "index.mjs",
"type": "module",
"publishConfig": {
"main": "dist/index.mjs"
},
"scripts": {
"build": "vite build",
"prepublishOnly": "npm run build"
},
"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/core": "workspace:*"
},
"devDependencies": {
"vite": "^5.0.10"
}
}

7
packages/core/pianoroll.mjs → packages/draw/pianoroll.mjs
View File

@ -1,10 +1,10 @@
/*
pianoroll.mjs - <short description TODO>
Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/core/pianoroll.mjs>
Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/strudel/blob/main/packages/canvas/pianoroll.mjs>
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { Pattern, noteToMidi, getDrawContext, freqToMidi, isNote } from './index.mjs';
import { Pattern, noteToMidi, freqToMidi } from '@strudel/core';
const scale = (normalized, min, max) => normalized * (max - min) + min;
const getValue = (e) => {
@ -187,7 +187,8 @@ export function pianoroll({
color = isActive ? active : inactive;
ctx.fillStyle = fillCurrent ? color : 'transparent';
ctx.strokeStyle = color;
ctx.globalAlpha = event.context.velocity ?? event.value?.gain ?? 1;
const { velocity = 1, gain = 1 } = event.value || {};
ctx.globalAlpha = velocity * gain;
const timeProgress = (event.whole.begin - (flipTime ? to : from)) / timeExtent;
const timePx = scale(timeProgress, ...timeRange);
let durationPx = scale(event.duration / timeExtent, 0, timeAxis);

2
packages/core/spiral.mjs → packages/draw/spiral.mjs
View File

@ -1,4 +1,4 @@
import { Pattern } from './index.mjs';
import { Pattern } from '@strudel/core';
// polar coords -> xy
function fromPolar(angle, radius, cx, cy) {

19
packages/draw/vite.config.js Normal file
View File

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

37
packages/hydra/hydra.mjs
View File

@ -1,15 +1,8 @@
import { getDrawContext } from '@strudel/core';
import { getDrawContext } from '@strudel/draw';
import { controls } from '@strudel/core';
let latestOptions;
function appendCanvas(c) {
const { canvas: testCanvas } = getDrawContext();
c.canvas.id = 'hydra-canvas';
c.canvas.style.position = 'fixed';
c.canvas.style.top = '0px';
testCanvas.after(c.canvas);
return testCanvas;
}
let hydra;
export async function initHydra(options = {}) {
// reset if options have changed since last init
@ -19,22 +12,38 @@ export async function initHydra(options = {}) {
latestOptions = options;
//load and init hydra
if (!document.getElementById('hydra-canvas')) {
console.log('reinit..');
const {
src = 'https://unpkg.com/hydra-synth',
feedStrudel = false,
contextType = 'webgl',
pixelRatio = 1,
pixelated = true,
...hydraConfig
} = { detectAudio: false, ...options };
} = {
detectAudio: false,
...options,
};
const { canvas } = getDrawContext('hydra-canvas', { contextType, pixelRatio, pixelated });
hydraConfig.canvas = canvas;
await import(/* @vite-ignore */ src);
const hydra = new Hydra(hydraConfig);
hydra = new Hydra(hydraConfig);
if (feedStrudel) {
const { canvas } = getDrawContext();
canvas.style.display = 'none';
hydra.synth.s0.init({ src: canvas });
}
appendCanvas(hydra);
}
}
export function clearHydra() {
if (hydra) {
hydra.hush();
}
globalThis.s0?.clear();
document.getElementById('hydra-canvas')?.remove();
globalThis.speed = controls.speed;
globalThis.shape = controls.shape;
}
export const H = (p) => () => p.queryArc(getTime(), getTime())[0].value;

1
packages/hydra/package.json
View File

@ -34,6 +34,7 @@
"homepage": "https://github.com/tidalcycles/strudel#readme",
"dependencies": {
"@strudel/core": "workspace:*",
"@strudel/draw": "workspace:*",
"hydra-synth": "^1.3.29"
},
"devDependencies": {

5
packages/midi/midi.mjs
View File

@ -125,8 +125,9 @@ Pattern.prototype.midi = function (output) {
const timeOffsetString = `+${offset}`;
// destructure value
const { note, nrpnn, nrpv, ccn, ccv, midichan = 1, midicmd } = hap.value;
const velocity = hap.context?.velocity ?? 0.9; // TODO: refactor velocity
let { note, nrpnn, nrpv, ccn, ccv, midichan = 1, midicmd, gain = 1, velocity = 0.9 } = hap.value;
velocity = gain * velocity;
// note off messages will often a few ms arrive late, try to prevent glitching by subtracting from the duration length
const duration = Math.floor((hap.duration.valueOf() / cps) * 1000 - 10);

2
packages/mini/mini.mjs
View File

@ -125,7 +125,7 @@ export function patternifyAST(ast, code, onEnter, offset = 0) {
return enter(ast.source_);
}
case 'atom': {
if (ast.source_ === '~') {
if (ast.source_ === '~' || ast.source_ === '-') {
return strudel.silence;
}
if (!ast.location_) {

3
packages/mini/test/mini.test.mjs
View File

@ -117,6 +117,9 @@ describe('mini', () => {
checkEuclid([11, 24], 'x ~ ~ x ~ x ~ x ~ x ~ x ~ ~ x ~ x ~ x ~ x ~ x ~');
checkEuclid([13, 24], 'x ~ x x ~ x ~ x ~ x ~ x ~ x x ~ x ~ x ~ x ~ x ~');
});
it('supports the - alias for ~', () => {
expect(minS('a - b [- c]')).toEqual(minS('a ~ b [~ c]'));
});
it('supports the ? operator', () => {
expect(
mini('a?')

1
packages/repl/package.json
View File

@ -35,6 +35,7 @@
"dependencies": {
"@strudel/codemirror": "workspace:*",
"@strudel/core": "workspace:*",
"@strudel/draw": "workspace:*",
"@strudel/hydra": "workspace:*",
"@strudel/midi": "workspace:*",
"@strudel/mini": "workspace:*",

1
packages/repl/prebake.mjs
View File

@ -6,6 +6,7 @@ export async function prebake() {
const modulesLoading = evalScope(
// import('@strudel/core'),
core,
import('@strudel/draw'),
import('@strudel/mini'),
import('@strudel/tonal'),
import('@strudel/webaudio'),

3
packages/repl/repl-component.mjs
View File

@ -1,4 +1,5 @@
import { getDrawContext, silence } from '@strudel/core';
import { silence } from '@strudel/core';
import { getDrawContext } from '@strudel/draw';
import { transpiler } from '@strudel/transpiler';
import { getAudioContext, webaudioOutput } from '@strudel/webaudio';
import { StrudelMirror, codemirrorSettings } from '@strudel/codemirror';

2
packages/superdough/README.md
View File

@ -65,7 +65,7 @@ superdough({ s: 'bd', delay: 0.5 }, 0, 1);
- `bandf`: band pass filter cutoff
- `bandq`: band pass filter resonance
- `crush`: amplitude bit crusher using given number of bits
- `shape`: distortion effect from 0 (none) to 1 (full). might get loud!
- `distort`: distortion effect. might get loud!
- `pan`: stereo panning from 0 (left) to 1 (right)
- `phaser`: sets the speed of the modulation
- `phaserdepth`: the amount the signal is affected by the phaser effect.

2
packages/superdough/sampler.mjs
View File

@ -251,7 +251,7 @@ export async function onTriggerSample(t, value, onended, bank, resolveUrl) {
nudge = 0, // TODO: is this in seconds?
cut,
loop,
clip = undefined, // if 1, samples will be cut off when the hap ends
clip = undefined, // if set, samples will be cut off when the hap ends
n = 0,
note,
speed = 1, // sample playback speed

8
packages/superdough/superdough.mjs
View File

@ -316,6 +316,9 @@ export const superdough = async (value, deadline, hapDuration) => {
coarse,
crush,
shape,
shapevol = 1,
distort,
distortvol = 1,
pan,
vowel,
delay = 0,
@ -344,7 +347,7 @@ export const superdough = async (value, deadline, hapDuration) => {
//music programs/audio gear usually increments inputs/outputs from 1, so imitate that behavior
channels = (Array.isArray(channels) ? channels : [channels]).map((ch) => ch - 1);
gain *= velocity; // legacy fix for velocity
gain *= velocity; // velocity currently only multiplies with gain. it might do other things in the future
let toDisconnect = []; // audio nodes that will be disconnected when the source has ended
const onended = () => {
toDisconnect.forEach((n) => n?.disconnect());
@ -457,7 +460,8 @@ export const superdough = async (value, deadline, hapDuration) => {
// effects
coarse !== undefined && chain.push(getWorklet(ac, 'coarse-processor', { coarse }));
crush !== undefined && chain.push(getWorklet(ac, 'crush-processor', { crush }));
shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape }));
shape !== undefined && chain.push(getWorklet(ac, 'shape-processor', { shape, postgain: shapevol }));
distort !== undefined && chain.push(getWorklet(ac, 'distort-processor', { distort, postgain: distortvol }));
compressorThreshold !== undefined &&
chain.push(

125
packages/superdough/worklets.mjs
View File

@ -1,6 +1,5 @@
// 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
// all the credit goes to dktr0's webdirt: https://github.com/dktr0/WebDirt/blob/5ce3d698362c54d6e1b68acc47eb2955ac62c793/dist/AudioWorklets.js
// <3
class CoarseProcessor extends AudioWorkletProcessor {
static get parameterDescriptors() {
@ -9,28 +8,27 @@ class CoarseProcessor extends AudioWorkletProcessor {
constructor() {
super();
this.notStarted = true;
}
process(inputs, outputs, parameters) {
const input = inputs[0];
const output = outputs[0];
const coarse = parameters.coarse;
const blockSize = 128;
const hasInput = !(input[0] === undefined);
if (hasInput) {
this.notStarted = false;
output[0][0] = input[0][0];
for (let n = 1; n < blockSize; n++) {
for (let o = 0; o < output.length; o++) {
output[o][n] = n % coarse == 0 ? input[0][n] : output[o][n - 1];
}
let coarse = parameters.coarse[0] ?? 0;
coarse = Math.max(1, coarse);
if (input[0] == null || output[0] == null) {
return false;
}
for (let n = 0; n < blockSize; n++) {
for (let i = 0; i < input.length; i++) {
output[i][n] = n % coarse === 0 ? input[i][n] : output[i][n - 1];
}
}
return this.notStarted || hasInput;
return true;
}
}
registerProcessor('coarse-processor', CoarseProcessor);
class CrushProcessor extends AudioWorkletProcessor {
@ -40,69 +38,94 @@ class CrushProcessor extends AudioWorkletProcessor {
constructor() {
super();
this.notStarted = true;
}
process(inputs, outputs, parameters) {
const input = inputs[0];
const output = outputs[0];
const crush = parameters.crush;
const blockSize = 128;
const hasInput = !(input[0] === undefined);
if (hasInput) {
this.notStarted = false;
if (crush.length === 1) {
const x = Math.pow(2, crush[0] - 1);
for (let n = 0; n < blockSize; n++) {
const value = Math.round(input[0][n] * x) / x;
for (let o = 0; o < output.length; o++) {
output[o][n] = value;
}
}
} else {
for (let n = 0; n < blockSize; n++) {
let x = Math.pow(2, crush[n] - 1);
const value = Math.round(input[0][n] * x) / x;
for (let o = 0; o < output.length; o++) {
output[o][n] = value;
}
}
let crush = parameters.crush[0] ?? 8;
crush = Math.max(1, crush);
if (input[0] == null || output[0] == null) {
return false;
}
for (let n = 0; n < blockSize; n++) {
for (let i = 0; i < input.length; i++) {
const x = Math.pow(2, crush - 1);
output[i][n] = Math.round(input[i][n] * x) / x;
}
}
return this.notStarted || hasInput;
return true;
}
}
registerProcessor('crush-processor', CrushProcessor);
class ShapeProcessor extends AudioWorkletProcessor {
static get parameterDescriptors() {
return [{ name: 'shape', defaultValue: 0 }];
return [
{ name: 'shape', defaultValue: 0 },
{ name: 'postgain', defaultValue: 1 },
];
}
constructor() {
super();
this.notStarted = true;
}
process(inputs, outputs, parameters) {
const input = inputs[0];
const output = outputs[0];
const shape0 = parameters.shape[0];
const shape1 = shape0 < 1 ? shape0 : 1.0 - 4e-10;
const shape = (2.0 * shape1) / (1.0 - shape1);
const blockSize = 128;
const hasInput = !(input[0] === undefined);
if (hasInput) {
this.notStarted = false;
for (let n = 0; n < blockSize; n++) {
const value = ((1 + shape) * input[0][n]) / (1 + shape * Math.abs(input[0][n]));
for (let o = 0; o < output.length; o++) {
output[o][n] = value;
}
let shape = parameters.shape[0];
shape = shape < 1 ? shape : 1.0 - 4e-10;
shape = (2.0 * shape) / (1.0 - shape);
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 i = 0; i < input.length; i++) {
output[i][n] = (((1 + shape) * input[i][n]) / (1 + shape * Math.abs(input[i][n]))) * postgain;
}
}
return this.notStarted || hasInput;
return true;
}
}
registerProcessor('shape-processor', ShapeProcessor);
class DistortProcessor extends AudioWorkletProcessor {
static get parameterDescriptors() {
return [
{ name: 'distort', defaultValue: 0 },
{ name: 'postgain', defaultValue: 1 },
];
}
constructor() {
super();
}
process(inputs, outputs, parameters) {
const input = inputs[0];
const output = outputs[0];
const blockSize = 128;
const shape = Math.expm1(parameters.distort[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 i = 0; i < input.length; i++) {
output[i][n] = (((1 + shape) * input[i][n]) / (1 + shape * Math.abs(input[i][n]))) * postgain;
}
}
return true;
}
}
registerProcessor('distort-processor', DistortProcessor);

7
packages/tonal/tonal.mjs
View File

@ -103,6 +103,8 @@ export const transpose = register('transpose', function (intervalOrSemitones, pa
const semitones = typeof interval === 'string' ? Interval.semitones(interval) || 0 : interval;
return hap.withValue(() => hap.value + semitones);
}
if (typeof hap.value === 'object')
return hap.withValue(() => ({ ...hap.value, note: Note.simplify(Note.transpose(hap.value.note, interval)) }));
// TODO: move simplify to player to preserve enharmonics
// tone.js doesn't understand multiple sharps flats e.g. F##3 has to be turned into G3
return hap.withValue(() => Note.simplify(Note.transpose(hap.value, interval)));
@ -133,6 +135,11 @@ export const scaleTranspose = register('scaleTranspose', function (offset /* : n
if (!hap.context.scale) {
throw new Error('can only use scaleTranspose after .scale');
}
if (typeof hap.value === 'object')
return hap.withValue(() => ({
...hap.value,
note: scaleOffset(hap.context.scale, Number(offset), hap.value.note),
}));
if (typeof hap.value !== 'string') {
throw new Error('can only use scaleTranspose with notes');
}

1
packages/webaudio/package.json
View File

@ -34,6 +34,7 @@
"homepage": "https://github.com/tidalcycles/strudel#readme",
"dependencies": {
"@strudel/core": "workspace:*",
"@strudel/draw": "workspace:*",
"superdough": "workspace:*"
},
"devDependencies": {

3
packages/webaudio/scope.mjs
View File

@ -1,4 +1,5 @@
import { Pattern, getDrawContext, clamp } from '@strudel/core';
import { Pattern, clamp } from '@strudel/core';
import { getDrawContext } from '../draw/index.mjs';
import { analyser, getAnalyzerData } from 'superdough';
export function drawTimeScope(

3
packages/webaudio/webaudio.mjs
View File

@ -12,10 +12,9 @@ setLogger(logger);
const hap2value = (hap) => {
hap.ensureObjectValue();
return { ...hap.value, velocity: hap.context.velocity };
return hap.value;
};
// TODO: bind logger
export const webaudioOutputTrigger = (t, hap, ct, cps) => superdough(hap2value(hap), t - ct, hap.duration / cps, cps);
export const webaudioOutput = (hap, deadline, hapDuration) => superdough(hap2value(hap), deadline, hapDuration);

102
pnpm-lock.yaml generated
View File

@ -96,7 +96,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
examples/headless-repl:
dependencies:
@ -106,7 +106,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
examples/minimal-repl:
dependencies:
@ -128,7 +128,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
examples/superdough:
dependencies:
@ -138,7 +138,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/codemirror:
dependencies:
@ -181,6 +181,9 @@ importers:
'@strudel/core':
specifier: workspace:*
version: link:../core
'@strudel/draw':
specifier: workspace:*
version: link:../draw
'@uiw/codemirror-themes':
specifier: ^4.21.21
version: 4.21.21(@codemirror/language@6.10.0)(@codemirror/state@6.4.0)(@codemirror/view@6.23.0)
@ -193,7 +196,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/core:
dependencies:
@ -203,7 +206,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
vitest:
specifier: ^1.1.0
version: 1.1.0(@vitest/ui@1.1.0)
@ -222,7 +225,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/desktopbridge:
dependencies:
@ -233,6 +236,16 @@ importers:
specifier: ^1.5.3
version: 1.5.3
packages/draw:
dependencies:
'@strudel/core':
specifier: workspace:*
version: link:../core
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.11(@types/node@20.10.6)
packages/embed: {}
packages/hydra:
@ -240,6 +253,9 @@ importers:
'@strudel/core':
specifier: workspace:*
version: link:../core
'@strudel/draw':
specifier: workspace:*
version: link:../draw
hydra-synth:
specifier: ^1.3.29
version: 1.3.29
@ -249,7 +265,7 @@ importers:
version: 5.8.1
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/midi:
dependencies:
@ -265,7 +281,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/mini:
dependencies:
@ -278,7 +294,7 @@ importers:
version: 3.0.2
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
vitest:
specifier: ^1.1.0
version: 1.1.0(@vitest/ui@1.1.0)
@ -297,7 +313,7 @@ importers:
version: 5.8.1
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/repl:
dependencies:
@ -307,6 +323,9 @@ importers:
'@strudel/core':
specifier: workspace:*
version: link:../core
'@strudel/draw':
specifier: workspace:*
version: link:../draw
'@strudel/hydra':
specifier: workspace:*
version: link:../hydra
@ -337,7 +356,7 @@ importers:
version: 5.12.0
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/serial:
dependencies:
@ -347,7 +366,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/soundfonts:
dependencies:
@ -369,7 +388,7 @@ importers:
version: 3.3.2
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/superdough:
dependencies:
@ -379,7 +398,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/tonal:
dependencies:
@ -398,7 +417,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
vitest:
specifier: ^1.1.0
version: 1.1.0(@vitest/ui@1.1.0)
@ -423,7 +442,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
vitest:
specifier: ^1.1.0
version: 1.1.0(@vitest/ui@1.1.0)
@ -451,20 +470,23 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/webaudio:
dependencies:
'@strudel/core':
specifier: workspace:*
version: link:../core
'@strudel/draw':
specifier: workspace:*
version: link:../draw
superdough:
specifier: workspace:*
version: link:../superdough
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
packages/xen:
dependencies:
@ -474,7 +496,7 @@ importers:
devDependencies:
vite:
specifier: ^5.0.10
version: 5.0.10(@types/node@20.10.6)
version: 5.0.10
vitest:
specifier: ^1.1.0
version: 1.1.0(@vitest/ui@1.1.0)
@ -535,6 +557,9 @@ importers:
'@strudel/desktopbridge':
specifier: workspace:*
version: link:../packages/desktopbridge
'@strudel/draw':
specifier: workspace:*
version: link:../packages/draw
'@strudel/hydra':
specifier: workspace:*
version: link:../packages/hydra
@ -2382,6 +2407,7 @@ packages:
cpu: [arm64]
os: [android]
requiresBuild: true
dev: true
optional: true
/@esbuild/android-arm@0.19.11:
@ -2398,6 +2424,7 @@ packages:
cpu: [arm]
os: [android]
requiresBuild: true
dev: true
optional: true
/@esbuild/android-x64@0.19.11:
@ -2414,6 +2441,7 @@ packages:
cpu: [x64]
os: [android]
requiresBuild: true
dev: true
optional: true
/@esbuild/darwin-arm64@0.19.11:
@ -2430,6 +2458,7 @@ packages:
cpu: [arm64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
/@esbuild/darwin-x64@0.19.11:
@ -2446,6 +2475,7 @@ packages:
cpu: [x64]
os: [darwin]
requiresBuild: true
dev: true
optional: true
/@esbuild/freebsd-arm64@0.19.11:
@ -2462,6 +2492,7 @@ packages:
cpu: [arm64]
os: [freebsd]
requiresBuild: true
dev: true
optional: true
/@esbuild/freebsd-x64@0.19.11:
@ -2478,6 +2509,7 @@ packages:
cpu: [x64]
os: [freebsd]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-arm64@0.19.11:
@ -2494,6 +2526,7 @@ packages:
cpu: [arm64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-arm@0.19.11:
@ -2510,6 +2543,7 @@ packages:
cpu: [arm]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-ia32@0.19.11:
@ -2526,6 +2560,7 @@ packages:
cpu: [ia32]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-loong64@0.19.11:
@ -2542,6 +2577,7 @@ packages:
cpu: [loong64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-mips64el@0.19.11:
@ -2558,6 +2594,7 @@ packages:
cpu: [mips64el]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-ppc64@0.19.11:
@ -2574,6 +2611,7 @@ packages:
cpu: [ppc64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-riscv64@0.19.11:
@ -2590,6 +2628,7 @@ packages:
cpu: [riscv64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-s390x@0.19.11:
@ -2606,6 +2645,7 @@ packages:
cpu: [s390x]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/linux-x64@0.19.11:
@ -2622,6 +2662,7 @@ packages:
cpu: [x64]
os: [linux]
requiresBuild: true
dev: true
optional: true
/@esbuild/netbsd-x64@0.19.11:
@ -2638,6 +2679,7 @@ packages:
cpu: [x64]
os: [netbsd]
requiresBuild: true
dev: true
optional: true
/@esbuild/openbsd-x64@0.19.11:
@ -2654,6 +2696,7 @@ packages:
cpu: [x64]
os: [openbsd]
requiresBuild: true
dev: true
optional: true
/@esbuild/sunos-x64@0.19.11:
@ -2670,6 +2713,7 @@ packages:
cpu: [x64]
os: [sunos]
requiresBuild: true
dev: true
optional: true
/@esbuild/win32-arm64@0.19.11:
@ -2686,6 +2730,7 @@ packages:
cpu: [arm64]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@esbuild/win32-ia32@0.19.11:
@ -2702,6 +2747,7 @@ packages:
cpu: [ia32]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@esbuild/win32-x64@0.19.11:
@ -2718,6 +2764,7 @@ packages:
cpu: [x64]
os: [win32]
requiresBuild: true
dev: true
optional: true
/@eslint-community/eslint-utils@4.4.0(eslint@8.56.0):
@ -5346,8 +5393,8 @@ packages:
tsconfck: 3.0.0(typescript@5.3.3)
unist-util-visit: 5.0.0
vfile: 6.0.1
vite: 5.0.10(@types/node@20.10.6)
vitefu: 0.2.5(vite@5.0.10)
vite: 5.0.11(@types/node@20.10.6)
vitefu: 0.2.5(vite@5.0.11)
which-pm: 2.1.1
yargs-parser: 21.1.1
zod: 3.22.4
@ -6828,6 +6875,7 @@ packages:
'@esbuild/win32-arm64': 0.19.5
'@esbuild/win32-ia32': 0.19.5
'@esbuild/win32-x64': 0.19.5
dev: true
/escalade@3.1.1:
resolution: {integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==}
@ -13565,7 +13613,7 @@ packages:
- supports-color
dev: true
/vite@5.0.10(@types/node@20.10.6):
/vite@5.0.10:
resolution: {integrity: sha512-2P8J7WWgmc355HUMlFrwofacvr98DAjoE52BfdbwQtyLH06XKwaL/FMnmKM2crF0iX4MpmMKoDlNCB1ok7zHCw==}
engines: {node: ^18.0.0 || >=20.0.0}
hasBin: true
@ -13593,12 +13641,12 @@ packages:
terser:
optional: true
dependencies:
'@types/node': 20.10.6
esbuild: 0.19.5
postcss: 8.4.32
rollup: 4.9.2
optionalDependencies:
fsevents: 2.3.3
dev: true
/vite@5.0.11(@types/node@20.10.6):
resolution: {integrity: sha512-XBMnDjZcNAw/G1gEiskiM1v6yzM4GE5aMGvhWTlHAYYhxb7S3/V1s3m2LDHa8Vh6yIWYYB0iJwsEaS523c4oYA==}
@ -13629,13 +13677,13 @@ packages:
optional: true
dependencies:
'@types/node': 20.10.6
esbuild: 0.19.5
esbuild: 0.19.11
postcss: 8.4.32
rollup: 4.9.2
optionalDependencies:
fsevents: 2.3.3
/vitefu@0.2.5(vite@5.0.10):
/vitefu@0.2.5(vite@5.0.11):
resolution: {integrity: sha512-SgHtMLoqaeeGnd2evZ849ZbACbnwQCIwRH57t18FxcXoZop0uQu0uzlIhJBlF/eWVzuce0sHeqPcDo+evVcg8Q==}
peerDependencies:
vite: ^3.0.0 || ^4.0.0 || ^5.0.0
@ -13643,7 +13691,7 @@ packages:
vite:
optional: true
dependencies:
vite: 5.0.10(@types/node@20.10.6)
vite: 5.0.11(@types/node@20.10.6)
/vitest@1.1.0(@vitest/ui@1.1.0):
resolution: {integrity: sha512-oDFiCrw7dd3Jf06HoMtSRARivvyjHJaTxikFxuqJjO76U436PqlVw1uLn7a8OSPrhSfMGVaRakKpA2lePdw79A==}

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

@ -1933,6 +1933,96 @@ exports[`runs examples > example "detune" example index 0 1`] = `
]
`;
exports[`runs examples > example "distort" example index 0 1`] = `
[
"[ 0/1 → 1/8 | s:hh distort:0 ]",
"[ 0/1 → 1/4 | s:bd distort:0 ]",
"[ 1/8 → 1/4 | s:hh distort:0 ]",
"[ 1/4 → 3/8 | s:hh distort:0 ]",
"[ 1/4 → 1/2 | s:sd distort:0 ]",
"[ 3/8 → 1/2 | s:hh distort:0 ]",
"[ 1/2 → 5/8 | s:hh distort:0 ]",
"[ 5/8 → 3/4 | s:bd distort:0 ]",
"[ 5/8 → 3/4 | s:hh distort:0 ]",
"[ 3/4 → 7/8 | s:hh distort:0 ]",
"[ 3/4 → 1/1 | s:sd distort:0 ]",
"[ 7/8 → 1/1 | s:hh distort:0 ]",
"[ 1/1 → 9/8 | s:hh distort:2 ]",
"[ 1/1 → 5/4 | s:bd distort:2 ]",
"[ 9/8 → 5/4 | s:hh distort:2 ]",
"[ 5/4 → 11/8 | s:hh distort:2 ]",
"[ 5/4 → 3/2 | s:sd distort:2 ]",
"[ 11/8 → 3/2 | s:hh distort:2 ]",
"[ 3/2 → 13/8 | s:hh distort:2 ]",
"[ 13/8 → 7/4 | s:bd distort:2 ]",
"[ 13/8 → 7/4 | s:hh distort:2 ]",
"[ 7/4 → 15/8 | s:hh distort:2 ]",
"[ 7/4 → 2/1 | s:sd distort:2 ]",
"[ 15/8 → 2/1 | s:hh distort:2 ]",
"[ 2/1 → 17/8 | s:hh distort:3 ]",
"[ 2/1 → 9/4 | s:bd distort:3 ]",
"[ 17/8 → 9/4 | s:hh distort:3 ]",
"[ 9/4 → 19/8 | s:hh distort:3 ]",
"[ 9/4 → 5/2 | s:sd distort:3 ]",
"[ 19/8 → 5/2 | s:hh distort:3 ]",
"[ 5/2 → 21/8 | s:hh distort:3 ]",
"[ 21/8 → 11/4 | s:bd distort:3 ]",
"[ 21/8 → 11/4 | s:hh distort:3 ]",
"[ 11/4 → 23/8 | s:hh distort:3 ]",
"[ 11/4 → 3/1 | s:sd distort:3 ]",
"[ 23/8 → 3/1 | s:hh distort:3 ]",
"[ 3/1 → 25/8 | s:hh distort:10 distortvol:0.5 ]",
"[ 3/1 → 13/4 | s:bd distort:10 distortvol:0.5 ]",
"[ 25/8 → 13/4 | s:hh distort:10 distortvol:0.5 ]",
"[ 13/4 → 27/8 | s:hh distort:10 distortvol:0.5 ]",
"[ 13/4 → 7/2 | s:sd distort:10 distortvol:0.5 ]",
"[ 27/8 → 7/2 | s:hh distort:10 distortvol:0.5 ]",
"[ 7/2 → 29/8 | s:hh distort:10 distortvol:0.5 ]",
"[ 29/8 → 15/4 | s:bd distort:10 distortvol:0.5 ]",
"[ 29/8 → 15/4 | s:hh distort:10 distortvol:0.5 ]",
"[ 15/4 → 31/8 | s:hh distort:10 distortvol:0.5 ]",
"[ 15/4 → 4/1 | s:sd distort:10 distortvol:0.5 ]",
"[ 31/8 → 4/1 | s:hh distort:10 distortvol:0.5 ]",
]
`;
exports[`runs examples > example "distort" example index 1 1`] = `
[
"[ 0/1 → 1/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 1/8 → 1/4 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 1/4 → 3/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 3/8 → 1/2 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 1/2 → 5/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 5/8 → 3/4 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 3/4 → 7/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 7/8 → 1/1 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 1/1 → 9/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 9/8 → 5/4 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 5/4 → 11/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 11/8 → 3/2 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 3/2 → 13/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 13/8 → 7/4 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 7/4 → 15/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 15/8 → 2/1 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 2/1 → 17/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 17/8 → 9/4 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 9/4 → 19/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 19/8 → 5/2 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 5/2 → 21/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 21/8 → 11/4 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 11/4 → 23/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 23/8 → 3/1 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 3/1 → 25/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 25/8 → 13/4 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 13/4 → 27/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 27/8 → 7/2 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 7/2 → 29/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 29/8 → 15/4 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 15/4 → 31/8 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
"[ 31/8 → 4/1 | note:d1 s:sine penv:36 pdecay:0.12 decay:0.23 distort:8 distortvol:0.4 ]",
]
`;
exports[`runs examples > example "djf" example index 0 1`] = `
[
"[ 0/1 → 1/4 | n:0 s:superzow octave:3 djf:0.5 ]",
@ -2001,6 +2091,27 @@ exports[`runs examples > example "dry" example index 0 1`] = `
]
`;
exports[`runs examples > example "duration" example index 0 1`] = `
[
"[ 0/1 → 1/4 | note:c s:piano duration:0.5 ]",
"[ 1/4 → 1/2 | note:a s:piano duration:0.5 ]",
"[ 1/2 → 3/4 | note:f s:piano duration:0.5 ]",
"[ 3/4 → 1/1 | note:e s:piano duration:0.5 ]",
"[ 1/1 → 5/4 | note:c s:piano duration:1 ]",
"[ 5/4 → 3/2 | note:a s:piano duration:1 ]",
"[ 3/2 → 7/4 | note:f s:piano duration:1 ]",
"[ 7/4 → 2/1 | note:e s:piano duration:1 ]",
"[ 2/1 → 9/4 | note:c s:piano duration:2 ]",
"[ 9/4 → 5/2 | note:a s:piano duration:2 ]",
"[ 5/2 → 11/4 | note:f s:piano duration:2 ]",
"[ 11/4 → 3/1 | note:e s:piano duration:2 ]",
"[ 3/1 → 13/4 | note:c s:piano duration:0.5 ]",
"[ 13/4 → 7/2 | note:a s:piano duration:0.5 ]",
"[ 7/2 → 15/4 | note:f s:piano duration:0.5 ]",
"[ 15/4 → 4/1 | note:e s:piano duration:0.5 ]",
]
`;
exports[`runs examples > example "early" example index 0 1`] = `
[
"[ -1/10 ⇜ (0/1 → 2/5) | s:hh ]",
@ -2020,38 +2131,38 @@ exports[`runs examples > example "early" example index 0 1`] = `
exports[`runs examples > example "echo" example index 0 1`] = `
[
"[ -1/3 ⇜ (0/1 → 1/6) | s:sd ]",
"[ -1/6 ⇜ (0/1 → 1/3) | s:sd ]",
"[ 0/1 → 1/2 | s:bd ]",
"[ 1/6 → 2/3 | s:bd ]",
"[ 1/3 → 5/6 | s:bd ]",
"[ 1/2 → 1/1 | s:sd ]",
"[ (2/3 → 1/1) ⇝ 7/6 | s:sd ]",
"[ (5/6 → 1/1) ⇝ 4/3 | s:sd ]",
"[ 2/3 ⇜ (1/1 → 7/6) | s:sd ]",
"[ 5/6 ⇜ (1/1 → 4/3) | s:sd ]",
"[ 1/1 → 3/2 | s:bd ]",
"[ 7/6 → 5/3 | s:bd ]",
"[ 4/3 → 11/6 | s:bd ]",
"[ 3/2 → 2/1 | s:sd ]",
"[ (5/3 → 2/1) ⇝ 13/6 | s:sd ]",
"[ (11/6 → 2/1) ⇝ 7/3 | s:sd ]",
"[ 5/3 ⇜ (2/1 → 13/6) | s:sd ]",
"[ 11/6 ⇜ (2/1 → 7/3) | s:sd ]",
"[ 2/1 → 5/2 | s:bd ]",
"[ 13/6 → 8/3 | s:bd ]",
"[ 7/3 → 17/6 | s:bd ]",
"[ 5/2 → 3/1 | s:sd ]",
"[ (8/3 → 3/1) ⇝ 19/6 | s:sd ]",
"[ (17/6 → 3/1) ⇝ 10/3 | s:sd ]",
"[ 8/3 ⇜ (3/1 → 19/6) | s:sd ]",
"[ 17/6 ⇜ (3/1 → 10/3) | s:sd ]",
"[ 3/1 → 7/2 | s:bd ]",
"[ 19/6 → 11/3 | s:bd ]",
"[ 10/3 → 23/6 | s:bd ]",
"[ 7/2 → 4/1 | s:sd ]",
"[ (11/3 → 4/1) ⇝ 25/6 | s:sd ]",
"[ (23/6 → 4/1) ⇝ 13/3 | s:sd ]",
"[ -1/3 ⇜ (0/1 → 1/6) | s:sd gain:0.8 ]",
"[ -1/6 ⇜ (0/1 → 1/3) | s:sd gain:0.6400000000000001 ]",
"[ 0/1 → 1/2 | s:bd gain:1 ]",
"[ 1/6 → 2/3 | s:bd gain:0.8 ]",
"[ 1/3 → 5/6 | s:bd gain:0.6400000000000001 ]",
"[ 1/2 → 1/1 | s:sd gain:1 ]",
"[ (2/3 → 1/1) ⇝ 7/6 | s:sd gain:0.8 ]",
"[ (5/6 → 1/1) ⇝ 4/3 | s:sd gain:0.6400000000000001 ]",
"[ 2/3 ⇜ (1/1 → 7/6) | s:sd gain:0.8 ]",
"[ 5/6 ⇜ (1/1 → 4/3) | s:sd gain:0.6400000000000001 ]",
"[ 1/1 → 3/2 | s:bd gain:1 ]",
"[ 7/6 → 5/3 | s:bd gain:0.8 ]",
"[ 4/3 → 11/6 | s:bd gain:0.6400000000000001 ]",
"[ 3/2 → 2/1 | s:sd gain:1 ]",
"[ (5/3 → 2/1) ⇝ 13/6 | s:sd gain:0.8 ]",
"[ (11/6 → 2/1) ⇝ 7/3 | s:sd gain:0.6400000000000001 ]",
"[ 5/3 ⇜ (2/1 → 13/6) | s:sd gain:0.8 ]",
"[ 11/6 ⇜ (2/1 → 7/3) | s:sd gain:0.6400000000000001 ]",
"[ 2/1 → 5/2 | s:bd gain:1 ]",
"[ 13/6 → 8/3 | s:bd gain:0.8 ]",
"[ 7/3 → 17/6 | s:bd gain:0.6400000000000001 ]",
"[ 5/2 → 3/1 | s:sd gain:1 ]",
"[ (8/3 → 3/1) ⇝ 19/6 | s:sd gain:0.8 ]",
"[ (17/6 → 3/1) ⇝ 10/3 | s:sd gain:0.6400000000000001 ]",
"[ 8/3 ⇜ (3/1 → 19/6) | s:sd gain:0.8 ]",
"[ 17/6 ⇜ (3/1 → 10/3) | s:sd gain:0.6400000000000001 ]",
"[ 3/1 → 7/2 | s:bd gain:1 ]",
"[ 19/6 → 11/3 | s:bd gain:0.8 ]",
"[ 10/3 → 23/6 | s:bd gain:0.6400000000000001 ]",
"[ 7/2 → 4/1 | s:sd gain:1 ]",
"[ (11/3 → 4/1) ⇝ 25/6 | s:sd gain:0.8 ]",
"[ (23/6 → 4/1) ⇝ 13/3 | s:sd gain:0.6400000000000001 ]",
]
`;
@ -3521,48 +3632,6 @@ exports[`runs examples > example "layer" example index 0 1`] = `
]
`;
exports[`runs examples > example "legato" example index 0 1`] = `
[
"[ 0/1 → 1/32 | c4 ]",
"[ 1/4 → 9/32 | eb4 ]",
"[ 1/2 → 17/32 | g4 ]",
"[ 3/4 → 25/32 | bb4 ]",
"[ 1/1 → 17/16 | c4 ]",
"[ 5/4 → 21/16 | eb4 ]",
"[ 3/2 → 25/16 | g4 ]",
"[ 7/4 → 29/16 | bb4 ]",
"[ 2/1 → 17/8 | c4 ]",
"[ 9/4 → 19/8 | eb4 ]",
"[ 5/2 → 21/8 | g4 ]",
"[ 11/4 → 23/8 | bb4 ]",
"[ 3/1 → 51/16 | c4 ]",
"[ 13/4 → 55/16 | eb4 ]",
"[ 7/2 → 59/16 | g4 ]",
"[ 15/4 → 63/16 | bb4 ]",
]
`;
exports[`runs examples > example "legato" example index 0 2`] = `
[
"[ 0/1 → 1/16 | note:c3 ]",
"[ 1/4 → 5/16 | note:eb3 ]",
"[ 1/2 → 9/16 | note:g3 ]",
"[ 3/4 → 13/16 | note:c4 ]",
"[ 1/1 → 9/8 | note:c3 ]",
"[ 5/4 → 11/8 | note:eb3 ]",
"[ 3/2 → 13/8 | note:g3 ]",
"[ 7/4 → 15/8 | note:c4 ]",
"[ 2/1 → 9/4 | note:c3 ]",
"[ 9/4 → 5/2 | note:eb3 ]",
"[ 5/2 → 11/4 | note:g3 ]",
"[ 11/4 → 3/1 | note:c4 ]",
"[ 3/1 → 7/2 | note:c3 ]",
"[ 13/4 → 15/4 | note:eb3 ]",
"[ 7/2 → 4/1 | note:g3 ]",
"[ 15/4 → 17/4 | note:c4 ]",
]
`;
exports[`runs examples > example "leslie" example index 0 1`] = `
[
"[ 0/1 → 1/1 | n:0 s:supersquare leslie:0 ]",
@ -6893,38 +6962,38 @@ exports[`runs examples > example "struct" example index 0 1`] = `
exports[`runs examples > example "stut" example index 0 1`] = `
[
"[ -1/3 ⇜ (0/1 → 1/6) | s:sd ]",
"[ -1/6 ⇜ (0/1 → 1/3) | s:sd ]",
"[ 0/1 → 1/2 | s:bd ]",
"[ 1/6 → 2/3 | s:bd ]",
"[ 1/3 → 5/6 | s:bd ]",
"[ 1/2 → 1/1 | s:sd ]",
"[ (2/3 → 1/1) ⇝ 7/6 | s:sd ]",
"[ (5/6 → 1/1) ⇝ 4/3 | s:sd ]",
"[ 2/3 ⇜ (1/1 → 7/6) | s:sd ]",
"[ 5/6 ⇜ (1/1 → 4/3) | s:sd ]",
"[ 1/1 → 3/2 | s:bd ]",
"[ 7/6 → 5/3 | s:bd ]",
"[ 4/3 → 11/6 | s:bd ]",
"[ 3/2 → 2/1 | s:sd ]",
"[ (5/3 → 2/1) ⇝ 13/6 | s:sd ]",
"[ (11/6 → 2/1) ⇝ 7/3 | s:sd ]",
"[ 5/3 ⇜ (2/1 → 13/6) | s:sd ]",
"[ 11/6 ⇜ (2/1 → 7/3) | s:sd ]",
"[ 2/1 → 5/2 | s:bd ]",
"[ 13/6 → 8/3 | s:bd ]",
"[ 7/3 → 17/6 | s:bd ]",
"[ 5/2 → 3/1 | s:sd ]",
"[ (8/3 → 3/1) ⇝ 19/6 | s:sd ]",
"[ (17/6 → 3/1) ⇝ 10/3 | s:sd ]",
"[ 8/3 ⇜ (3/1 → 19/6) | s:sd ]",
"[ 17/6 ⇜ (3/1 → 10/3) | s:sd ]",
"[ 3/1 → 7/2 | s:bd ]",
"[ 19/6 → 11/3 | s:bd ]",
"[ 10/3 → 23/6 | s:bd ]",
"[ 7/2 → 4/1 | s:sd ]",
"[ (11/3 → 4/1) ⇝ 25/6 | s:sd ]",
"[ (23/6 → 4/1) ⇝ 13/3 | s:sd ]",
"[ -1/3 ⇜ (0/1 → 1/6) | s:sd gain:0.8 ]",
"[ -1/6 ⇜ (0/1 → 1/3) | s:sd gain:0.6400000000000001 ]",
"[ 0/1 → 1/2 | s:bd gain:1 ]",
"[ 1/6 → 2/3 | s:bd gain:0.8 ]",
"[ 1/3 → 5/6 | s:bd gain:0.6400000000000001 ]",
"[ 1/2 → 1/1 | s:sd gain:1 ]",
"[ (2/3 → 1/1) ⇝ 7/6 | s:sd gain:0.8 ]",
"[ (5/6 → 1/1) ⇝ 4/3 | s:sd gain:0.6400000000000001 ]",
"[ 2/3 ⇜ (1/1 → 7/6) | s:sd gain:0.8 ]",
"[ 5/6 ⇜ (1/1 → 4/3) | s:sd gain:0.6400000000000001 ]",
"[ 1/1 → 3/2 | s:bd gain:1 ]",
"[ 7/6 → 5/3 | s:bd gain:0.8 ]",
"[ 4/3 → 11/6 | s:bd gain:0.6400000000000001 ]",
"[ 3/2 → 2/1 | s:sd gain:1 ]",
"[ (5/3 → 2/1) ⇝ 13/6 | s:sd gain:0.8 ]",
"[ (11/6 → 2/1) ⇝ 7/3 | s:sd gain:0.6400000000000001 ]",
"[ 5/3 ⇜ (2/1 → 13/6) | s:sd gain:0.8 ]",
"[ 11/6 ⇜ (2/1 → 7/3) | s:sd gain:0.6400000000000001 ]",
"[ 2/1 → 5/2 | s:bd gain:1 ]",
"[ 13/6 → 8/3 | s:bd gain:0.8 ]",
"[ 7/3 → 17/6 | s:bd gain:0.6400000000000001 ]",
"[ 5/2 → 3/1 | s:sd gain:1 ]",
"[ (8/3 → 3/1) ⇝ 19/6 | s:sd gain:0.8 ]",
"[ (17/6 → 3/1) ⇝ 10/3 | s:sd gain:0.6400000000000001 ]",
"[ 8/3 ⇜ (3/1 → 19/6) | s:sd gain:0.8 ]",
"[ 17/6 ⇜ (3/1 → 10/3) | s:sd gain:0.6400000000000001 ]",
"[ 3/1 → 7/2 | s:bd gain:1 ]",
"[ 19/6 → 11/3 | s:bd gain:0.8 ]",
"[ 10/3 → 23/6 | s:bd gain:0.6400000000000001 ]",
"[ 7/2 → 4/1 | s:sd gain:1 ]",
"[ (11/3 → 4/1) ⇝ 25/6 | s:sd gain:0.8 ]",
"[ (23/6 → 4/1) ⇝ 13/3 | s:sd gain:0.6400000000000001 ]",
]
`;
@ -7153,38 +7222,38 @@ exports[`runs examples > example "unit" example index 0 1`] = `
exports[`runs examples > example "velocity" example index 0 1`] = `
[
"[ 0/1 → 1/8 | s:hh gain:0.4 ]",
"[ 1/8 → 1/4 | s:hh gain:0.4 ]",
"[ 1/4 → 3/8 | s:hh gain:1 ]",
"[ 3/8 → 1/2 | s:hh gain:0.4 ]",
"[ 1/2 → 5/8 | s:hh gain:0.4 ]",
"[ 5/8 → 3/4 | s:hh gain:1 ]",
"[ 3/4 → 7/8 | s:hh gain:0.4 ]",
"[ 7/8 → 1/1 | s:hh gain:1 ]",
"[ 1/1 → 9/8 | s:hh gain:0.4 ]",
"[ 9/8 → 5/4 | s:hh gain:0.4 ]",
"[ 5/4 → 11/8 | s:hh gain:1 ]",
"[ 11/8 → 3/2 | s:hh gain:0.4 ]",
"[ 3/2 → 13/8 | s:hh gain:0.4 ]",
"[ 13/8 → 7/4 | s:hh gain:1 ]",
"[ 7/4 → 15/8 | s:hh gain:0.4 ]",
"[ 15/8 → 2/1 | s:hh gain:1 ]",
"[ 2/1 → 17/8 | s:hh gain:0.4 ]",
"[ 17/8 → 9/4 | s:hh gain:0.4 ]",
"[ 9/4 → 19/8 | s:hh gain:1 ]",
"[ 19/8 → 5/2 | s:hh gain:0.4 ]",
"[ 5/2 → 21/8 | s:hh gain:0.4 ]",
"[ 21/8 → 11/4 | s:hh gain:1 ]",
"[ 11/4 → 23/8 | s:hh gain:0.4 ]",
"[ 23/8 → 3/1 | s:hh gain:1 ]",
"[ 3/1 → 25/8 | s:hh gain:0.4 ]",
"[ 25/8 → 13/4 | s:hh gain:0.4 ]",
"[ 13/4 → 27/8 | s:hh gain:1 ]",
"[ 27/8 → 7/2 | s:hh gain:0.4 ]",
"[ 7/2 → 29/8 | s:hh gain:0.4 ]",
"[ 29/8 → 15/4 | s:hh gain:1 ]",
"[ 15/4 → 31/8 | s:hh gain:0.4 ]",
"[ 31/8 → 4/1 | s:hh gain:1 ]",
"[ 0/1 → 1/8 | s:hh gain:0.4 velocity:0.4 ]",
"[ 1/8 → 1/4 | s:hh gain:0.4 velocity:0.4 ]",
"[ 1/4 → 3/8 | s:hh gain:1 velocity:0.4 ]",
"[ 3/8 → 1/2 | s:hh gain:0.4 velocity:0.4 ]",
"[ 1/2 → 5/8 | s:hh gain:0.4 velocity:1 ]",
"[ 5/8 → 3/4 | s:hh gain:1 velocity:1 ]",
"[ 3/4 → 7/8 | s:hh gain:0.4 velocity:1 ]",
"[ 7/8 → 1/1 | s:hh gain:1 velocity:1 ]",
"[ 1/1 → 9/8 | s:hh gain:0.4 velocity:0.4 ]",
"[ 9/8 → 5/4 | s:hh gain:0.4 velocity:0.4 ]",
"[ 5/4 → 11/8 | s:hh gain:1 velocity:0.4 ]",
"[ 11/8 → 3/2 | s:hh gain:0.4 velocity:0.4 ]",
"[ 3/2 → 13/8 | s:hh gain:0.4 velocity:1 ]",
"[ 13/8 → 7/4 | s:hh gain:1 velocity:1 ]",
"[ 7/4 → 15/8 | s:hh gain:0.4 velocity:1 ]",
"[ 15/8 → 2/1 | s:hh gain:1 velocity:1 ]",
"[ 2/1 → 17/8 | s:hh gain:0.4 velocity:0.4 ]",
"[ 17/8 → 9/4 | s:hh gain:0.4 velocity:0.4 ]",
"[ 9/4 → 19/8 | s:hh gain:1 velocity:0.4 ]",
"[ 19/8 → 5/2 | s:hh gain:0.4 velocity:0.4 ]",
"[ 5/2 → 21/8 | s:hh gain:0.4 velocity:1 ]",
"[ 21/8 → 11/4 | s:hh gain:1 velocity:1 ]",
"[ 11/4 → 23/8 | s:hh gain:0.4 velocity:1 ]",
"[ 23/8 → 3/1 | s:hh gain:1 velocity:1 ]",
"[ 3/1 → 25/8 | s:hh gain:0.4 velocity:0.4 ]",
"[ 25/8 → 13/4 | s:hh gain:0.4 velocity:0.4 ]",
"[ 13/4 → 27/8 | s:hh gain:1 velocity:0.4 ]",
"[ 27/8 → 7/2 | s:hh gain:0.4 velocity:0.4 ]",
"[ 7/2 → 29/8 | s:hh gain:0.4 velocity:1 ]",
"[ 29/8 → 15/4 | s:hh gain:1 velocity:1 ]",
"[ 15/4 → 31/8 | s:hh gain:0.4 velocity:1 ]",
"[ 31/8 → 4/1 | s:hh gain:1 velocity:1 ]",
]
`;

15662
test/__snapshots__/tunes.test.mjs.snap
View File

File diff suppressed because it is too large Load Diff

1
website/package.json
View File

@ -26,6 +26,7 @@
"@nanostores/react": "^0.7.1",
"@strudel/codemirror": "workspace:*",
"@strudel/core": "workspace:*",
"@strudel/draw": "workspace:*",
"@strudel/csound": "workspace:*",
"@strudel/desktopbridge": "workspace:*",
"@strudel/hydra": "workspace:*",

3
website/src/docs/Colors.jsx
View File

@ -1,5 +1,4 @@
import { colorMap } from '@strudel/core/color.mjs';
import React from 'react';
import { colorMap } from '@strudel/draw';
const Colors = () => {
return (

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

@ -1,6 +1,7 @@
import { useState, useRef, useCallback, useMemo, useEffect } from 'react';
import { Icon } from './Icon';
import { silence, getPunchcardPainter, noteToMidi, _mod } from '@strudel/core';
import { silence, noteToMidi, _mod } from '@strudel/core';
import { getPunchcardPainter } from '@strudel/draw';
import { transpiler } from '@strudel/transpiler';
import { getAudioContext, webaudioOutput, initAudioOnFirstClick } from '@strudel/webaudio';
import { StrudelMirror } from '@strudel/codemirror';

2
website/src/pages/img/example-[name].png.js
View File

@ -1,5 +1,5 @@
import { createCanvas } from 'canvas';
import { pianoroll } from '@strudel/core';
import { pianoroll } from '@strudel/draw';
import { evaluate } from '@strudel/transpiler';
import '../../../../test/runtime.mjs';
import * as tunes from '../../repl/tunes.mjs';

4
website/src/pages/learn/effects.mdx
View File

@ -238,9 +238,9 @@ Let's break down all pitch envelope controls:
<JsDoc client:idle name="crush" h={0} />
## shape
## distort
<JsDoc client:idle name="shape" h={0} />
<JsDoc client:idle name="distort" h={0} />
# Global Effects

6
website/src/pages/learn/time-modifiers.mdx
View File

@ -34,11 +34,7 @@ Some of these have equivalent operators in the Mini Notation:
<JsDoc client:idle name="Pattern.late" h={0} />
## legato
<JsDoc client:idle name="Pattern.legato" h={0} />
## clip
## clip / legato
<JsDoc client:idle name="clip" h={0} />

2
website/src/pages/swatch/[name].png.js
View File

@ -1,5 +1,5 @@
import { createCanvas } from 'canvas';
import { pianoroll } from '@strudel/core';
import { pianoroll } from '@strudel/draw';
import { evaluate } from '@strudel/transpiler';
import '../../../../test/runtime.mjs';
import { getMyPatterns } from '../../my_patterns';

10
website/src/repl/Repl.jsx
View File

@ -4,7 +4,8 @@ Copyright (C) 2022 Strudel contributors - see <https://github.com/tidalcycles/st
This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { code2hash, getDrawContext, logger, silence } from '@strudel/core';
import { code2hash, logger, silence } from '@strudel/core';
import { getDrawContext } from '@strudel/draw';
import cx from '@src/cx.mjs';
import { transpiler } from '@strudel/transpiler';
import {
@ -17,6 +18,7 @@ import {
import { defaultAudioDeviceName } from '../settings.mjs';
import { getAudioDevices, setAudioDevice } from './util.mjs';
import { StrudelMirror, defaultSettings } from '@strudel/codemirror';
import { clearHydra } from '@strudel/hydra';
import { useCallback, useEffect, useRef, useState } from 'react';
import { settingsMap, useSettings } from '../settings.mjs';
import {
@ -83,6 +85,11 @@ export function Repl({ embedded = false }) {
onUpdateState: (state) => {
setReplState({ ...state });
},
onToggle: (playing) => {
if (!playing) {
clearHydra();
}
},
afterEval: (all) => {
const { code } = all;
setLatestCode(code);
@ -174,6 +181,7 @@ export function Repl({ embedded = false }) {
(await getModule('@strudel/tonal'))?.resetVoicings();
resetGlobalEffects();
clearCanvas();
clearHydra();
resetLoadedSounds();
editorRef.current.repl.setCps(0.5);
await prebake(); // declare default samples

4
website/src/repl/drawings.mjs
View File

@ -24,7 +24,9 @@ angle(saw)
`;
// https://strudel.cc/?C31_NrcMfZEO
export const spiralflower = `const {innerWidth:ww,innerHeight:wh} = window;
export const spiralflower = `let {innerWidth:ww,innerHeight:wh} = window;
ww*=window.devicePixelRatio;
wh*=window.devicePixelRatio;
const ctx = getDrawContext()
const piDiv180 = Math.PI / 180;
function fromPolar(angle, radius, cx, cy) {

62
website/src/repl/tunes.mjs
View File

@ -239,8 +239,10 @@ export const wavyKalimba = `// "Wavy kalimba"
// @license CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
// @by Felix Roos
setcps(1)
samples({
'kalimba': { c5:'https://freesound.org/data/previews/536/536549_11935698-lq.mp3' }
'kalimba': { c5:'https://cdn.freesound.org/previews/536/536549_11935698-lq.mp3' }
})
const scales = "<C:major C:mixolydian F:lydian [F:minor Db:major]>"
@ -271,19 +273,18 @@ export const festivalOfFingers = `// "Festival of fingers"
const chords = "<Cm7 Fm7 G7 F#7>";
stack(
chord(chords).dict('lefthand').voicing().struct("x(3,8,-1)")
.velocity(.5).off(1/7,x=>x.add(note(12)).velocity(.2)),
chord(chords).dict('lefthand').voicing()
.struct("x(3,8,-1)")
.gain(.5).off(1/7,x=>x.add(note(12)).mul(gain(.2))),
chords.rootNotes(2).struct("x(4,8,-2)").note(),
chords.rootNotes(4)
.scale(cat('C minor','F dorian','G dorian','F# mixolydian'))
.struct("x(3,8,-2)".fast(2))
.scaleTranspose("0 4 0 6".early(".125 .5")).layer(scaleTranspose("0,<2 [4,6] [5,7]>/4"))
.scaleTranspose("0 4 0 6".early(".125 .5"))
.layer(scaleTranspose("0,<2 [4,6] [5,7]>/4"))
.note()
).slow(2)
.velocity(sine.struct("x*8").add(3/5).mul(2/5).fast(8))
.mul(gain(sine.struct("x*8").add(3/5).mul(2/5).fast(8)))
.piano()`;
// iter, echo, echoWith
@ -302,14 +303,14 @@ stack(
"[c2 a1 bb1 ~] ~"
.echo(2, 1/16, 1)
.slow(2)
.layer(h)
.note().s('square')
.layer(h)
.clip(.4)
.cutoff(400).decay(.12).sustain(0)
,
"[g2,[c3 eb3]]".iter(4)
.echoWith(4, 1/8, (x,n)=>x.transpose(n*12).velocity(Math.pow(.4,n)))
.layer(h).note()
.echoWith(4, 1/8, (x,n)=>x.transpose(n*12).gain(Math.pow(.4,n)))
.note().layer(h)
.clip(.1)
)
.fast(2/3)
@ -349,11 +350,11 @@ stack(
.n().scale(scale),
n("<0 4>(5,8,-1)").scale(scale).sub(note(12))
)
.velocity(".6 .7".fast(4))
.gain(".6 .7".fast(4))
.add(note(4))
.piano()
.clip(2)
.velocity(.8)
.mul(gain(.8))
.slow(2)
.pianoroll()`;
@ -410,16 +411,16 @@ export const randomBells = `// "Random bells"
// @by Felix Roos
samples({
bell: { c6: 'https://freesound.org/data/previews/411/411089_5121236-lq.mp3' },
bass: { d2: 'https://freesound.org/data/previews/608/608286_13074022-lq.mp3' }
bell: { c6: 'https://cdn.freesound.org/previews/411/411089_5121236-lq.mp3' },
bass: { d2: 'https://cdn.freesound.org/previews/608/608286_13074022-lq.mp3' }
})
stack(
// bells
"0".euclidLegato(3,8)
n("0").euclidLegato(3,8)
.echo(3, 1/16, .5)
.add(rand.range(0,12))
.scale("D:minor:pentatonic").note()
.add(n(rand.range(0,12)))
.scale("D:minor:pentatonic")
.velocity(rand.range(.5,1))
.s('bell').gain(.6).delay(.2).delaytime(1/3).delayfeedback(.8),
// bass
@ -462,7 +463,7 @@ samples({
hh: '561/561241_12517458-lq.mp3',
hh2:'44/44944_236326-lq.mp3',
hh3: '44/44944_236326-lq.mp3',
}, 'https://freesound.org/data/previews/')
}, 'https://cdn.freesound.org/previews/')
stack(
"-7 0 -7 7".struct("x(5,8,1)").fast(2).sub(7)
@ -473,10 +474,9 @@ stack(
.apply(filter1)
.lpa(.1).lpenv(2).ftype('24db')
,
"~@3 [<2 3>,<4 5>]"
n("~@3 [<2 3>,<4 5>]")
.echo(4,1/16,.7)
.scale(scales)
.note()
.s('square').gain(.7)
.attack(0.01).decay(0.1).sustain(0)
.apply(filter1),
@ -484,12 +484,11 @@ stack(
.superimpose(sub("5"))
.fast(1).euclidLegato(3,8)
.mask("<1 0@7>")
.fast(2)
.fast(2).n()
.echo(32, 1/8, .8)
.scale(scales)
.note()
.s("sawtooth")
.gain(sine.range(.1,.4).slow(8))
.mul(gain(sine.range(.1,.4).slow(8)))
.attack(.001).decay(.2).sustain(0)
.apply(filter2)
).stack(
@ -498,13 +497,14 @@ stack(
"~ sn",
"[~ hh3]*2"
).s().fast(2).gain(.7)
).slow(2)
// strudel disable-highlighting`;
).slow(2)`;
export const festivalOfFingers3 = `// "Festival of fingers 3"
// @license CC BY-NC-SA 4.0 https://creativecommons.org/licenses/by-nc-sa/4.0/
// @by Felix Roos
setcps(1)
n("[-7*3],0,2,6,[8 7]")
.echoWith(
4, // echo 4 times
@ -514,7 +514,7 @@ n("[-7*3],0,2,6,[8 7]")
.gain(1/(i+1)) // reduce gain
.clip(1/(i+1))
)
.velocity(perlin.range(.5,.9).slow(8))
.mul(gain(perlin.range(.5,.9).slow(8)))
.stack(n("[22 25]*3")
.clip(sine.range(.5,2).slow(8))
.gain(sine.range(.4,.8).slow(5))
@ -610,15 +610,17 @@ sd: ['sd/rytm-01-classic.wav','sd/rytm-00-hard.wav'],
hh: ['hh27/000_hh27closedhh.wav','hh/000_hh3closedhh.wav'],
}, 'github:tidalcycles/dirt-samples');
note("<8(3,8) <7 7*2> [4 5@3] 8>".sub(1) // sub 1 -> 1-indexed
setcps(1)
"<8(3,8) <7 7*2> [4 5@3] 8>".sub(1) // sub 1 -> 1-indexed
.layer(
x=>x,
x=>x.add(7).color('steelblue')
.off(1/8,x=>x.add("2,4").off(1/8,x=>x.add(5).echo(4,.125,.5)))
.slow(2),
).scale('A1 minor'))
).n().scale('A1 minor')
.s("flbass").n(0)
.gain(.3)
.mul(gain(.3))
.cutoff(sine.slow(7).range(200,4000))
.resonance(10)
//.hcutoff(400)

1
website/src/repl/util.mjs
View File

@ -72,6 +72,7 @@ export async function getRandomTune() {
export function loadModules() {
let modules = [
import('@strudel/core'),
import('@strudel/draw'),
import('@strudel/tonal'),
import('@strudel/mini'),
import('@strudel/xen'),