@jpdutoit/squelchy 0.0.3 → 0.0.5

package/index.js

@@ -20,7 +20,7 @@ import {
   tape_stop_default,
   vca_default,
   waveshaper_default
-} from "./chunk-MEZE4P3U.js";
+} from "./chunk-N7J25N5J.js";
 
 // src/lib-runtime/core.ts
 var pendingSources = {};
@@ -28,7 +28,7 @@ var registrations = /* @__PURE__ */ new WeakMap();
 function preload(ctx, opts) {
   const existing = registrations.get(ctx);
   if (existing) return existing;
-  const sources = opts?.allWorklets ? import("./worklets-inline-DFWINMCS.js").then((m) => m.WORKLET_SOURCES) : Promise.resolve(pendingSources);
+  const sources = opts?.allWorklets ? import("./worklets-inline-EF3OTQ4D.js").then((m) => m.WORKLET_SOURCES) : Promise.resolve(pendingSources);
   const promise = sources.then(
     (map) => Promise.all(Object.entries(map).map(async ([name, src]) => {
       const url = URL.createObjectURL(new Blob([src], { type: "text/javascript" }));
@@ -141,7 +141,7 @@ var Instance = class {
 // src/lib-runtime/time/transport.ts
 var EPS = 1e-9;
 function isRest(v) {
-  return v == null || v === false || v === 0 || v === "." || v === "-";
+  return v == null || v === false;
 }
 function normStep(s) {
   if (isRest(s)) return null;
@@ -180,26 +180,29 @@ function createTransport(ctx, opts = {}) {
     if (at === "now") return now2;
     if (at === "beat") return Math.ceil(now2 - EPS);
     if (at === "bar") return Math.ceil(now2 / beatsPerBar - EPS) * beatsPerBar;
-    if ("bar" in at) return at.bar * beatsPerBar;
+    if ("bar" in at) return at.bar * beatsPerBar + (at.beat ?? 0);
     return at.beat;
   }
   const latency = () => ctx.outputLatency || ctx.baseLatency || 0;
-  function emitTap(hit, local) {
-    if (!local && taps.size === 0) return;
-    const fire = () => {
-      local?.(hit);
-      for (const cb of taps) cb(hit);
-    };
+  function whenAudible(time, fire) {
     if (offline) {
       fire();
-      return;
+      return void 0;
     }
-    const delay = Math.max(0, (hit.time - ctx.currentTime + latency()) * 1e3);
+    const delay = Math.max(0, (time - ctx.currentTime + latency()) * 1e3);
     const id = setTimeout(() => {
       tapTimers.delete(id);
       fire();
     }, delay);
     tapTimers.add(id);
+    return id;
+  }
+  function emitTap(hit, local) {
+    if (!local && taps.size === 0) return;
+    whenAudible(hit.time, () => {
+      local?.(hit);
+      for (const cb of taps) cb(hit);
+    });
   }
   function horizonBeat() {
     if (offline) return beatAt(ctx.length / ctx.sampleRate);
@@ -320,16 +323,20 @@ function createTransport(ctx, opts = {}) {
         }
       };
     },
-    at(when, fn) {
+    at(when, fn, o = {}) {
       const b = typeof when === "number" ? when : resolve(when);
       let fired = false;
+      let audibleTimer;
       const job = {
         nextBeat: () => b,
         run(until) {
           if (fired) return false;
           if (b < until) {
             fired = true;
-            fn(timeAt(b));
+            const time = timeAt(b);
+            fn(time);
+            const onAudible = o.onAudible;
+            if (onAudible) audibleTimer = whenAudible(time, () => onAudible(time));
             return false;
           }
           return true;
@@ -340,6 +347,10 @@ function createTransport(ctx, opts = {}) {
       return () => {
         fired = true;
         jobs.delete(job);
+        if (audibleTimer !== void 0) {
+          clearTimeout(audibleTimer);
+          tapTimers.delete(audibleTimer);
+        }
       };
     },
     onHit(cb) {
@@ -356,8 +367,13 @@ function createTransport(ctx, opts = {}) {
   };
   return t;
 }
-function steps(s) {
-  return [...s.replace(/[\s|]/g, "")].map((c) => c === "x" || c === "X");
+function steps(s, levels = {}) {
+  const velocity = { X: levels.accent ?? 1, x: levels.normal ?? 0.75, o: levels.ghost ?? 0.4 };
+  return [...s.replace(/[\s|]/g, "")].map((c) => {
+    if (c === "." || c === "-") return null;
+    if (!(c in velocity)) throw new Error(`steps(): unknown character "${c}" in "${s}" (X accent, x hit, o ghost, . or - rest)`);
+    return { value: true, velocity: velocity[c] };
+  });
 }
 var NOTE_RE = /^([A-Ga-g])([#b]?)(-?\d+)$/;
 var PC = { c: 0, d: 2, e: 4, f: 5, g: 7, a: 9, b: 11 };
@@ -526,16 +542,28 @@ var asPitch = (n) => n;
 
 // src/lib/dsp/pulse.ts
 var PULSE_S = 1e-3;
-function pulse(target, when) {
-  const ctx = target.context;
-  const at = Math.max(when ?? 0, ctx.currentTime);
-  const src = ctx.createConstantSource();
-  src.offset.value = 1;
+var pulseBuffers = /* @__PURE__ */ new WeakMap();
+function filled(ctx, samples, level) {
+  const buf = ctx.createBuffer(1, samples, ctx.sampleRate);
+  buf.getChannelData(0).fill(level);
+  return buf;
+}
+function play(ctx, buf, target, when) {
+  const src = ctx.createBufferSource();
+  src.buffer = buf;
   src.connect(target);
-  src.start(at);
-  src.stop(at + PULSE_S);
+  src.start(Math.max(0, when ?? 0));
   src.onended = () => src.disconnect();
 }
+function pulse(target, when) {
+  const ctx = target.context;
+  let buf = pulseBuffers.get(ctx);
+  if (!buf) {
+    buf = filled(ctx, Math.max(1, Math.ceil(ctx.sampleRate * PULSE_S)), 1);
+    pulseBuffers.set(ctx, buf);
+  }
+  play(ctx, buf, target, when);
+}
 
 // src/lib/samples/types.ts
 var VOICE_KEYS = [
@@ -585,23 +613,31 @@ async function loadSampleSet(ctx, set, opts = {}) {
   };
 }
 var SampleVoice = {
-  create(ctx, kit, key) {
+  create(ctx, kit, key, opts = {}) {
     const out = ctx.createGain();
-    const buf = kit.buffer(key);
+    const root = opts.root ?? 60;
+    let current = kit;
+    let buf = kit.buffer(key);
     const trigger = (when, h) => {
       if (!buf) return;
       const src = ctx.createBufferSource();
       const g = ctx.createGain();
       src.buffer = buf;
-      if (typeof h?.value === "number") src.playbackRate.value = 2 ** (h.value / 12);
+      if (typeof h?.value === "number") src.playbackRate.value = 2 ** ((h.value - root) / 12);
       g.gain.value = Math.max(0, Math.min(1, h?.velocity ?? 1));
       src.connect(g).connect(out);
       src.start(when);
-      if (h?.duration) src.stop(when + h.duration);
     };
     return {
       output: out,
       trigger,
+      get kit() {
+        return current;
+      },
+      setKit(next) {
+        current = next;
+        buf = next.buffer(key);
+      },
       connect: (d) => {
         out.connect(d);
         return d;
@@ -846,7 +882,7 @@ var params = {
   resonance: { unit: "factor", default: 8, min: 0, max: 15, scale: "sqrt" },
   envMod: { unit: "factor", default: 0.7, min: 0, max: 1 },
   accent: { unit: "factor", default: 0.5, min: 0, max: 1 },
-  decay: { node: "envSmoother", field: "decay", unit: "s", default: 0.2, min: 0.05, max: 1, scale: "log" }
+  decay: { node: "envSmoother", field: "decay", unit: "s", default: 0.92, min: 0.2, max: 5, scale: "log" }
 };
 var filter303Descriptor = /* @__PURE__ */ defineDescriptor({
   type: "303-filter",
@@ -858,7 +894,7 @@ var filter303Descriptor = /* @__PURE__ */ defineDescriptor({
     "modFreq": { type: "modulation", signal: "modulation", node: "_cutoffVoct" }
   },
   createModule(id, position) {
-    return { id, type: "303-filter", position, ...paramDefaults(params) };
+    return { id, type: "303-filter", position, timeUnit: "t60", ...paramDefaults(params) };
   },
   createNodes(ctx, module) {
     const input = ctx.createGain();
@@ -3283,7 +3319,8 @@ function tankEnergyGain500(rt60, size = 1) {
   let g2 = 0;
   for (const ms2 of COMB_TIMES_MS) g2 += Math.pow(10, -6 * (ms2 / 1e3) * size / Math.max(rt60, 0.05));
   g2 /= COMB_TIMES_MS.length;
-  return Math.max(0.05, 0.8006 / (1 - g2) - 0.531);
+  const loss = 1 - g2;
+  return Math.max(0.05, 0.6422 / loss - 0.2406 - 11e-4 * loss);
 }
 function createFdnTank(ctx, opts) {
   const input = ctx.createGain();
@@ -3658,14 +3695,47 @@ var saturatorDescriptor = /* @__PURE__ */ defineDescriptor({
 // src/lib-runtime/generated/modules/saturator.wrapper.ts
 var Saturator = /* @__PURE__ */ defineModule(saturatorDescriptor);
 
-// src/lib-runtime/generated/modules/shimmer.tsx
+// src/lib/dsp/shimmerRegen.ts
 var REGEN_HP_HZ = 300;
 var REGEN_HP_Q_DB = 20 * Math.log10(Math.SQRT1_2);
 var HP_AT_500 = 1 / Math.sqrt(1 + Math.pow(REGEN_HP_HZ / 500, 4));
 var SHIFTER_ENERGY = 0.75;
-function shimmerRegenNorm(decay) {
-  return 1 / (Math.sqrt(tankEnergyGain500(decay)) * HP_AT_500 * Math.sqrt(SHIFTER_ENERGY));
+var REGEN_DELAY_S = 0.02;
+var SHIFTER_SEEDS = [5370206, 739982445];
+var UNISON_FLOOR = [
+  [0.5, 0.68],
+  [1, 0.75],
+  [2, 0.76],
+  [3, 0.8],
+  [5, 0.84],
+  [7, 0.75],
+  [10, 0.6]
+];
+var UNISON_PITCH_SPAN = 0.75;
+function unisonFloor(decay) {
+  const x = Math.log2(Math.max(0.05, decay));
+  const first = UNISON_FLOOR[0], last = UNISON_FLOOR[UNISON_FLOOR.length - 1];
+  if (x <= Math.log2(first[0])) return first[1];
+  if (x >= Math.log2(last[0])) return last[1];
+  for (let i = 1; i < UNISON_FLOOR.length; i++) {
+    const [d1, k1] = UNISON_FLOOR[i];
+    if (x <= Math.log2(d1)) {
+      const [d0, k0] = UNISON_FLOOR[i - 1];
+      const t = (x - Math.log2(d0)) / (Math.log2(d1) - Math.log2(d0));
+      return k0 + (k1 - k0) * t;
+    }
+  }
+  return last[1];
 }
+function unisonCoherence(decay, pitch) {
+  const a = unisonFloor(decay);
+  return Math.min(1, a + (1 - a) * (pitch / UNISON_PITCH_SPAN) ** 2);
+}
+function shimmerRegenNorm(decay, pitch) {
+  return unisonCoherence(decay, pitch) / (Math.sqrt(tankEnergyGain500(decay)) * HP_AT_500 * Math.sqrt(SHIFTER_ENERGY));
+}
+
+// src/lib-runtime/generated/modules/shimmer.tsx
 var params36 = {
   decay: { unit: "s", default: 3, min: 0.5, max: 10, scale: "log" },
   pitch: { unit: "semitone", default: 12, min: -12, max: 24 },
@@ -3699,14 +3769,14 @@ var shimmerDescriptor = /* @__PURE__ */ defineDescriptor({
       const shifter = createPitchShifterNode(ctx, module.pitch, seed);
       return { hp, shifter };
     };
-    const tapL = mkRegenTap(5370206);
-    const tapR = mkRegenTap(739982445);
+    const tapL = mkRegenTap(SHIFTER_SEEDS[0]);
+    const tapR = mkRegenTap(SHIFTER_SEEDS[1]);
     const regenNorm = ctx.createGain();
-    regenNorm.gain.value = shimmerRegenNorm(module.decay);
+    regenNorm.gain.value = shimmerRegenNorm(module.decay, module.pitch);
     const regenGain = ctx.createGain();
     regenGain.gain.value = module.shimmer;
     const regenDelay = ctx.createDelay(0.1);
-    regenDelay.delayTime.value = 0.02;
+    regenDelay.delayTime.value = REGEN_DELAY_S;
     tank.output.connect(splitter);
     splitter.connect(tapL.hp, 0);
     splitter.connect(tapR.hp, 1);
@@ -3753,9 +3823,10 @@ var shimmerDescriptor = /* @__PURE__ */ defineDescriptor({
       for (const key of ["pitchShifterL", "pitchShifterR"]) {
         nodes[key].parameters.get("semitones").setTargetAtTime(value, now2, 0.02);
       }
+      nodes.regenNorm.gain.setTargetAtTime(shimmerRegenNorm(_m.decay, value), now2, 0.02);
     } else if (param === "decay") {
       setTankDecay({ node: nodes.tankNode }, value, now2);
-      nodes.regenNorm.gain.setTargetAtTime(shimmerRegenNorm(value), now2, 0.02);
+      nodes.regenNorm.gain.setTargetAtTime(shimmerRegenNorm(value, _m.pitch), now2, 0.02);
     }
   }
 });