@hraness/dawg 0.5.0 → 0.6.1

package/core/sections.ts

@@ -13,8 +13,12 @@
  */
 import { DRUM_VOICES, isDrumInstrument } from "./drums.ts";
 import { FX_LANES } from "./fx.ts";
+import { resolveString } from "./strings.ts";
+import { modalSettings, windSettings } from "./resonators.ts";
+import { slicePedals } from "./expression.ts";
 import {
   SCORE_LIMITS,
+  withNoteCap,
   ScoreValidationError,
   TrackScore,
   isSamplerInstrument,
@@ -121,8 +125,12 @@ export function sliceSongTime(
  * Later repetitions get `~p2`, `~p3` ids. Without timed tracks, or without
  * sections, the score comes back unchanged.
  */
-export function bakeTrackTime(score: TrackScore): TrackScore {
-  if (score.sections.length === 0 || !hasTrackTime(score)) return score;
+export function bakeTrackTime(
+  score: TrackScore,
+  options: { always?: boolean } = {},
+): TrackScore {
+  if (!hasTrackTime(score)) return score;
+  if (score.sections.length === 0 && !options.always) return score;
   const seen = new Map<string, number>();
   const notes = performedNotes(score).map((note) => {
     const count = (seen.get(note.id) ?? 0) + 1;
@@ -134,13 +142,24 @@ export function bakeTrackTime(score: TrackScore): TrackScore {
       durationTicks: Math.max(1, Math.round(note.durationTicks)),
     };
   });
-  return new TrackScore({
-    ...score.toJSON(),
-    tracks: score.tracks.map(({ time: _time, ...track }) => track),
-    notes,
-  });
+  return withNoteCap(
+    BAKED_NOTE_CAP,
+    () =>
+      new TrackScore({
+        ...score.toJSON(),
+        tracks: score.tracks.map(({ time: _time, ...track }) => track),
+        notes,
+      }),
+  );
 }
 
+/**
+ * Most notes a baked or arranged score may hold while it renders: a cycled
+ * or phasing track repeats its notes across the song, past the stored
+ * score's limit.
+ */
+export const BAKED_NOTE_CAP = SCORE_LIMITS.maxNotes * 64;
+
 /** Conventional section names, offered first by `nextSectionName`. */
 export const SECTION_KINDS = Object.freeze([
   "intro",
@@ -414,7 +433,10 @@ export function sectionScore(score: TrackScore, section: Section): TrackScore {
     time: timed.time ?? null,
     bars: section.bars,
     tracks: score.tracks.map((track) =>
-      mapAutomation(track, (points) => cropPoints(points, from, to)),
+      slicePedals(
+        mapAutomation(track, (points) => cropPoints(points, from, to)),
+        [{ from, to, offset: 0 }],
+      ),
     ),
     notes,
     sections: [],
@@ -1233,7 +1255,9 @@ export function arrangedSlice(
     tempoBpm: timed.tempoBpm,
     time: timed.time ?? null,
     bars,
-    tracks: score.tracks.map((track) => sliceLanes(track, pieces)),
+    tracks: score.tracks.map((track) =>
+      slicePedals(sliceLanes(track, pieces), pieces),
+    ),
     notes: arrangedNotes(score, fromBar, fromBar + noteBars).map((note) => ({
       ...note,
       startTick: note.startTick - shift,
@@ -1302,12 +1326,22 @@ function laneFallback(track: Track, lane: string): number | undefined {
   }
   const spec = FX_LANES.find((candidate) => candidate.lane === lane);
   if (!spec) return undefined;
+  if (spec.effect === "string") {
+    const value = resolveString(track.string)[spec.param];
+    return typeof value === "number" ? value : spec.spec.default;
+  }
   const source = (
     spec.effect === "reverb"
       ? track.reverb
       : spec.effect === "synth"
         ? track.synth
-        : (track.fx as Record<string, unknown> | undefined)?.[spec.effect]
+        : spec.effect === "keys"
+          ? track.keys
+          : spec.effect === "modal"
+            ? track.modal && modalSettings(track.modal)
+            : spec.effect === "wind"
+              ? track.wind && windSettings(track.wind)
+              : (track.fx as Record<string, unknown> | undefined)?.[spec.effect]
   ) as Record<string, unknown> | undefined;
   const stored = source?.[spec.param];
   return typeof stored === "number" ? stored : spec.spec.default;