hacklab/strudel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

codeformat

Browse source
This commit is contained in:
Felix Roos 2023-12-30 23:21:34 +01:00
parent 7db684e308
commit 94fcea1040
27 changed files with 72 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/buildless/headless-simple.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<button id="play">play</button> <button id="play">play</button>
<button id="stop">stop</button> <button id="stop">stop</button>
<script type="module"> <script type="module">

2
examples/buildless/headless-with-samples.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<button id="a">A</button> <button id="a">A</button>
<button id="b">B</button> <button id="b">B</button>
<button id="c">C</button> <button id="c">C</button>

2
examples/buildless/minimal-repl.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />

2
examples/codemirror-repl/index.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />

2
examples/headless-repl/index.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />

2
examples/minimal-repl/index.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />

2
examples/superdough/index.html
View file

@ -1,4 +1,4 @@
<!DOCTYPE html> <!doctype html>
<html> <html>
<head> <head>
<title>Superdough Example</title> <title>Superdough Example</title>

2
packages/codemirror/vite.config.js
View file

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

44
packages/core/test/pattern.test.mjs
View file

@ -183,13 +183,17 @@ describe('Pattern', () => {
}); });
it('can Trig() structure', () => { it('can Trig() structure', () => {
sameFirst( sameFirst(
slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trig(20, 30).early(2), slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
.add.trig(20, 30)
.early(2),
sequence(26, 27, 36, 37), sequence(26, 27, 36, 37),
); );
}); });
it('can Trigzero() structure', () => { it('can Trigzero() structure', () => {
sameFirst( sameFirst(
slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).add.trigzero(20, 30).early(2), slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
.add.trigzero(20, 30)
.early(2),
sequence(21, 22, 31, 32), sequence(21, 22, 31, 32),
); );
}); });
@ -231,13 +235,17 @@ describe('Pattern', () => {
}); });
it('can Trig() structure', () => { it('can Trig() structure', () => {
sameFirst( sameFirst(
slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trig(20, 30).early(2), slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
.keep.trig(20, 30)
.early(2),
sequence(6, 7, 6, 7), sequence(6, 7, 6, 7),
); );
}); });
it('can Trigzero() structure', () => { it('can Trigzero() structure', () => {
sameFirst( sameFirst(
slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keep.trigzero(20, 30).early(2), slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
.keep.trigzero(20, 30)
.early(2),
sequence(1, 2, 1, 2), sequence(1, 2, 1, 2),
); );
}); });
@ -273,13 +281,17 @@ describe('Pattern', () => {
}); });
it('can Trig() structure', () => { it('can Trig() structure', () => {
sameFirst( sameFirst(
slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trig(false, true).early(2), slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
.keepif.trig(false, true)
.early(2),
sequence(silence, silence, 6, 7), sequence(silence, silence, 6, 7),
); );
}); });
it('can Trigzero() structure', () => { it('can Trigzero() structure', () => {
sameFirst( sameFirst(
slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10).keepif.trigzero(false, true).early(2), slowcat(sequence(1, 2, 3, 4), 5, sequence(6, 7, 8, 9), 10)
.keepif.trigzero(false, true)
.early(2),
sequence(silence, silence, 1, 2), sequence(silence, silence, 1, 2),
); );
}); });
@ -651,7 +663,11 @@ describe('Pattern', () => {
}); });
describe('struct()', () => { describe('struct()', () => {
it('Can restructure a discrete pattern', () => { it('Can restructure a discrete pattern', () => {
expect(sequence('a', 'b').struct(sequence(true, true, true)).firstCycle()).toStrictEqual([ expect(
sequence('a', 'b')
.struct(sequence(true, true, true))
.firstCycle(),
).toStrictEqual([
hap(ts(0, third), ts(0, third), 'a'), hap(ts(0, third), ts(0, third), 'a'),
hap(ts(third, twothirds), ts(third, 0.5), 'a'), hap(ts(third, twothirds), ts(third, 0.5), 'a'),
hap(ts(third, twothirds), ts(0.5, twothirds), 'b'), hap(ts(third, twothirds), ts(0.5, twothirds), 'b'),
@ -682,7 +698,11 @@ describe('Pattern', () => {
}); });
describe('mask()', () => { describe('mask()', () => {
it('Can fragment a pattern', () => { it('Can fragment a pattern', () => {
expect(sequence('a', 'b').mask(sequence(true, true, true)).firstCycle()).toStrictEqual([ expect(
sequence('a', 'b')
.mask(sequence(true, true, true))
.firstCycle(),
).toStrictEqual([
hap(ts(0, 0.5), ts(0, third), 'a'), hap(ts(0, 0.5), ts(0, third), 'a'),
hap(ts(0, 0.5), ts(third, 0.5), 'a'), hap(ts(0, 0.5), ts(third, 0.5), 'a'),
hap(ts(0.5, 1), ts(0.5, twothirds), 'b'), hap(ts(0.5, 1), ts(0.5, twothirds), 'b'),
@ -951,9 +971,11 @@ describe('Pattern', () => {
expect(stack(pure('a').mask(1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(1); expect(stack(pure('a').mask(1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(1);
}); });
it('Doesnt merge two overlapping haps', () => { it('Doesnt merge two overlapping haps', () => {
expect(stack(pure('a').mask(1, 1, 0), pure('a').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual( expect(
2, stack(pure('a').mask(1, 1, 0), pure('a').mask(0, 1))
); .defragmentHaps()
.firstCycle().length,
).toStrictEqual(2);
}); });
it('Doesnt merge two touching haps with different values', () => { it('Doesnt merge two touching haps with different values', () => {
expect(stack(pure('a').mask(1, 0), pure('b').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(2); expect(stack(pure('a').mask(1, 0), pure('b').mask(0, 1)).defragmentHaps().firstCycle().length).toStrictEqual(2);

16
packages/core/util.mjs
View file

@ -262,14 +262,14 @@ export const sol2note = (n, notation = 'letters') => {
notation === 'solfeggio' notation === 'solfeggio'
? solfeggio /*check if its is any of the following*/ ? solfeggio /*check if its is any of the following*/
: notation === 'indian' : notation === 'indian'
? indian ? indian
: notation === 'german' : notation === 'german'
? german ? german
: notation === 'byzantine' : notation === 'byzantine'
? byzantine ? byzantine
: notation === 'japanese' : notation === 'japanese'
? japanese ? japanese
: english; /*if not use standard version*/ : english; /*if not use standard version*/
const note = pc[n % 12]; /*calculating the midi value to the note*/ const note = pc[n % 12]; /*calculating the midi value to the note*/
const oct = Math.floor(n / 12) - 1; const oct = Math.floor(n / 12) - 1;
return note + oct; return note + oct;

2
packages/core/vite.config.js
View file

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

2
packages/csound/vite.config.js
View file

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

2
packages/hydra/vite.config.js
View file

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

2
packages/midi/vite.config.js
View file

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

2
packages/mini/mini.mjs
View file

@ -42,7 +42,7 @@ const applyOptions = (parent, enter) => (pat, i) => {
} }
case 'tail': { case 'tail': {
const friend = enter(op.arguments_.element); const friend = enter(op.arguments_.element);
pat = pat.fmap((a) => (b) => Array.isArray(a) ? [...a, b] : [a, b]).appLeft(friend); pat = pat.fmap((a) => (b) => (Array.isArray(a) ? [...a, b] : [a, b])).appLeft(friend);
break; break;
} }
case 'range': { case 'range': {

2
packages/mini/vite.config.js
View file

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

2
packages/osc/vite.config.js
View file

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

2
packages/repl/vite.config.js
View file

@ -12,7 +12,7 @@ export default defineConfig({
entry: resolve(__dirname, 'index.mjs'), entry: resolve(__dirname, 'index.mjs'),
name: 'strudel', name: 'strudel',
formats: ['es', 'iife'], formats: ['es', 'iife'],
fileName: (ext) => ({ es: 'index.mjs', iife: 'index.js' }[ext]), fileName: (ext) => ({ es: 'index.mjs', iife: 'index.js' })[ext],
}, },
rollupOptions: { rollupOptions: {
// external: [...Object.keys(dependencies)], // external: [...Object.keys(dependencies)],

2
packages/serial/vite.config.js
View file

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

2
packages/soundfonts/vite.config.js
View file

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

2
packages/superdough/vite.config.js
View file

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

14
packages/superdough/zzfx_fork.mjs
View file

@ -78,13 +78,13 @@ export function buildSamples(
(i < attack (i < attack
? i / attack // attack ? i / attack // attack
: i < attack + decay // decay : i < attack + decay // decay
? 1 - ((i - attack) / decay) * (1 - sustainVolume) // decay falloff ? 1 - ((i - attack) / decay) * (1 - sustainVolume) // decay falloff
: i < attack + decay + sustain // sustain : i < attack + decay + sustain // sustain
? sustainVolume // sustain volume ? sustainVolume // sustain volume
: i < length - delay // release : i < length - delay // release
? ((length - i - delay) / release) * // release falloff ? ((length - i - delay) / release) * // release falloff
sustainVolume // release volume sustainVolume // release volume
: 0); // post release : 0); // post release
s = delay s = delay
? s / 2 + ? s / 2 +

2
packages/tonal/vite.config.js
View file

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

2
packages/transpiler/vite.config.js
View file

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

2
packages/web/vite.config.js
View file

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

2
packages/webaudio/vite.config.js
View file

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

2
packages/xen/vite.config.js
View file

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