more readable tune test + longer snaps

repl/src/runtime.mjs

@@ -141,3 +141,33 @@ export const queryCode = async (code, cycles = 1) => {
   const haps = pattern.queryArc(0, cycles);
   return haps.map((h) => h.showWhole());
 };
+
+export const testCycles = {
+  timeCatMini: 16,
+  timeCat: 8,
+  shapeShifted: 16,
+  tetrisMini: 16,
+  whirlyStrudel: 16,
+  swimming: 51,
+  giantSteps: 20,
+  giantStepsReggae: 25,
+  transposedChordsHacked: 8,
+  scaleTranspose: 16,
+  struct: 4,
+  magicSofa: 8,
+  confusedPhone: 8,
+  zeldasRescue: 48,
+  technoDrums: 4,
+  caverave: 60,
+  callcenterhero: 22,
+  primalEnemy: 4,
+  synthDrums: 4,
+  sampleDrums: 4,
+  xylophoneCalling: 60,
+  sowhatelse: 60,
+  barryHarris: 64,
+  wavyKalimba: 64,
+  jemblung: 12,
+  risingEnemy: 12,
+  festivalOfFingers: 16,
+};

repl/src/shoot.mjs

@@ -2,10 +2,10 @@
 // it is intended to be written to tunes.snapshot.mjs using `npm run snapshot`
 
 import * as tunes from './tunes.mjs';
-import { queryCode } from './runtime.mjs';
+import { queryCode, testCycles } from './runtime.mjs';
 
 Object.entries(tunes).forEach(([key, code]) => {
-  queryCode(code).then((haps) => {
+  queryCode(code, testCycles[key] || 1).then((haps) => {
-    console.log(`export const ${key} = ${JSON.stringify(haps, null, 1)}`);
+    console.log(`export const ${key} = ${JSON.stringify(haps)}`);
   });
 });

repl/src/test/tunes.test.mjs

@@ -1,14 +1,18 @@
-import { queryCode } from '../runtime.mjs';
+import { queryCode, testCycles } from '../runtime.mjs';
 import * as snaps from '../tunes.snapshot.mjs';
 import * as tunes from '../tunes.mjs';
 import { strict as assert } from 'assert';
 
-describe('tunes', () => {
+async function testTune(key) {
-  it('renders tunes correctly', async () => {
+  // console.log('test tune', key);
-    async function testTune(key) {
+  const haps = await queryCode(tunes[key], testCycles[key] || 1);
-      const haps = await queryCode(tunes[key]);
+  assert.deepStrictEqual(haps, snaps[key]);
-      assert.deepStrictEqual(haps, snaps[key]);
+}
-    }
+
-    await Promise.all(Object.keys(tunes).map(testTune));
+describe('renders tunes', () => {
+  Object.keys(tunes).forEach((key) => {
+    it(`tune: ${key}`, async () => {
+      await testTune(key);
+    });
   });
 });

repl/src/tunes.mjs

@@ -63,7 +63,7 @@ export const shapeShifted = `stack(
   )
 ).slow(16)`; */
 
-export const tetris = `stack(
+/* export const tetris = `stack(
   seq(
     "e5 [b4 c5] d5 [c5 b4]",
     "a4 [a4 c5] e5 [d5 c5]",
@@ -85,7 +85,7 @@ export const tetris = `stack(
     "a1 a2 a1 a2 a1 a2 a1 a2",
   )
 ).slow(16)`;
-
+ */
 export const tetrisMini = `\`[[e5 [b4 c5] d5 [c5 b4]]
 [a4 [a4 c5] e5 [d5 c5]]
 [b4 [~ c5] d5 e5]
@@ -226,13 +226,13 @@ export const transposedChordsHacked = `stack(
   "c2 eb2 g2",
   "Cm7".voicings(['g2','c4']).slow(2)
 ).transpose(
-  cat(1, 2, 3, 2).slow(2)
+  "<1 2 3 2>".slow(2)
 ).transpose(5)`;
 
-export const scaleTranspose = `stack(f2, f3, c4, ab4)
+export const scaleTranspose = `"f2,f3,c4,ab4"
 .scale(seq('F minor', 'F harmonic minor').slow(4))
-.scaleTranspose(seq(0, -1, -2, -3).slow(4))
+.scaleTranspose("<0 -1 -2 -3>")
-.transpose(seq(0, 1).slow(16))`;
+.transpose("0 1".slow(16))`;
 
 export const struct = `stack(
   "c2 g2 a2 [e2@2 eb2] d2 a2 g2 [d2 ~ db2]",
@@ -245,7 +245,7 @@ export const magicSofa = `stack(
    .every(2, fast(2))
    .voicings(),
   "<c2 f2 g2> <d2 g2 a2 e2>"
-).slow(1).transpose(cat(0, 2, 3, 4))`;
+).transpose("<0 2 3 4>")`;
 // below doesn't work anymore due to constructor cleanup
 // ).slow(1).transpose.cat(0, 2, 3, 4)`;
 
@@ -258,7 +258,7 @@ export const confusedPhone = `"[g2 ~@1.3] [c3 ~@1.3]"
   transpose(24).late(0.4)
 )
 .scale(cat('C dorian', 'C mixolydian'))
-.scaleTranspose(cat(0,1,2,1))
+.scaleTranspose("<0 1 2 1>")
 .slow(2)`;
 
 export const zeldasRescue = `stack(
@@ -290,29 +290,6 @@ export const technoDrums = `stack(
   "[~ c4]*2".tone(new MetalSynth().set({envelope:{decay:0.06,sustain:0}}).chain(new Gain(0.5),getDestination()))
 )`;
 
-export const loungerave = `const delay = new FeedbackDelay(1/8, .2).chain(vol(0.5), out());
-const kick = new MembraneSynth().chain(vol(.8), out());
-const snare = new NoiseSynth().chain(vol(.8), out());
-const hihat = new MetalSynth().set(adsr(0, .08, 0, .1)).chain(vol(.3).connect(delay),out());
-const bass = new Synth().set({ ...osc('sawtooth'), ...adsr(0, .1, .4) }).chain(lowpass(900), vol(.5), out());
-const keys = new PolySynth().set({ ...osc('sawtooth'), ...adsr(0, .5, .2, .7) }).chain(lowpass(1200), vol(.5), out());
-
-const drums = stack(
-  "c1*2".tone(kick).mask("<x@7 ~>/8"),
-  "~ <x!7 [x@3 x]>".tone(snare).mask("<x@7 ~>/4"),
-  "[~ c4]*2".tone(hihat)
-);
-
-const thru = (x) => x.transpose("<0 1>/8").transpose(1);
-const synths = stack(
-  "<C2 Bb1 Ab1 [G1 [G2 G1]]>/2".struct("[x [~ x] <[~ [~ x]]!3 [x x]>@2]/2").edit(thru).tone(bass),
-  "<Cm7 Bb7 Fm7 G7b9>/2".struct("~ [x@0.1 ~]").voicings().edit(thru).every(2, early(1/4)).tone(keys).mask("<x@7 ~>/8".early(1/4))
-)
-stack(
-  drums, 
-  synths
-)`;
-
 export const caverave = `const delay = new FeedbackDelay(1/8, .4).chain(vol(0.5), out());
 const kick = new MembraneSynth().chain(vol(.8), out());
 const snare = new NoiseSynth().chain(vol(.8), out());