@storyteller-platform/align 0.1.17 → 0.1.19

package/dist/align/align.cjs

@@ -258,7 +258,8 @@ class Aligner {
         matchedSentence: chapterSentences[endSentence],
         nextSentence: chapterSentences[endSentence + 1] ?? null
       },
-      chapterSentenceCount: sentenceRanges.length,
+      chapterSentenceCount: chapterSentences.length,
+      alignedSentenceCount: sentenceRanges.length,
       audioFiles: sentenceRanges.reduce((acc, range) => {
         const existing = acc.find(
           (context) => context.filepath === range.audiofile
@@ -347,7 +348,6 @@ class Aligner {
     return narrowed;
   }
   async alignBook(onProgress) {
-    var _a, _b, _c, _d, _e, _f;
     const locale = this.languageOverride ?? await this.epub.getLanguage() ?? new Intl.Locale("en-US");
     this.timing.setMetadata("language", locale.toString());
     this.timing.setMetadata("granularity", this.granularity);
@@ -358,13 +358,13 @@ class Aligner {
       locale
     );
     for (let index = 0; index < spine.length; index++) {
-      onProgress == null ? void 0 : onProgress(index / spine.length);
+      onProgress?.(index / spine.length);
       const spineItem = spine[index];
-      (_a = this.logger) == null ? void 0 : _a.info(
+      this.logger?.info(
         `Aligning epub item #${index} : ${(0, import_posix.basename)(spineItem.href)}`
       );
       const chapterId = spineItem.id;
-      if ((_c = (_b = manifest[chapterId]) == null ? void 0 : _b.properties) == null ? void 0 : _c.includes("nav")) {
+      if (manifest[chapterId]?.properties?.includes("nav")) {
         continue;
       }
       const chapterSentences = await this.getChapterSentences(chapterId);
@@ -375,12 +375,12 @@ class Aligner {
         );
       }
       if (chapterSentences.length === 0) {
-        (_d = this.logger) == null ? void 0 : _d.info(`Chapter #${index} has no text; skipping`);
+        this.logger?.info(`Chapter #${index} has no text; skipping`);
         continue;
       }
       if (chapterSentences.length < 2 && // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       chapterSentences[0].split(" ").length < 4) {
-        (_e = this.logger) == null ? void 0 : _e.info(
+        this.logger?.info(
           `Chapter #${index} is fewer than four words; skipping`
         );
         continue;
@@ -390,7 +390,7 @@ class Aligner {
         transcriptionText
       );
       if (!boundaries) {
-        (_f = this.logger) == null ? void 0 : _f.info(
+        this.logger?.info(
           `Could not find chapter #${index} in the transcripton`
         );
         continue;

package/dist/align/align.d.cts

@@ -29,6 +29,7 @@ interface ChapterReport {
         nextSentence: string | null;
     };
     chapterSentenceCount: number;
+    alignedSentenceCount: number;
     audioFiles: AudioFileContext[];
 }
 interface Report {

package/dist/align/align.d.ts

@@ -29,6 +29,7 @@ interface ChapterReport {
         nextSentence: string | null;
     };
     chapterSentenceCount: number;
+    alignedSentenceCount: number;
     audioFiles: AudioFileContext[];
 }
 interface Report {

package/dist/align/align.js

@@ -192,7 +192,8 @@ class Aligner {
         matchedSentence: chapterSentences[endSentence],
         nextSentence: chapterSentences[endSentence + 1] ?? null
       },
-      chapterSentenceCount: sentenceRanges.length,
+      chapterSentenceCount: chapterSentences.length,
+      alignedSentenceCount: sentenceRanges.length,
       audioFiles: sentenceRanges.reduce((acc, range) => {
         const existing = acc.find(
           (context) => context.filepath === range.audiofile
@@ -281,7 +282,6 @@ class Aligner {
     return narrowed;
   }
   async alignBook(onProgress) {
-    var _a, _b, _c, _d, _e, _f;
     const locale = this.languageOverride ?? await this.epub.getLanguage() ?? new Intl.Locale("en-US");
     this.timing.setMetadata("language", locale.toString());
     this.timing.setMetadata("granularity", this.granularity);
@@ -292,13 +292,13 @@ class Aligner {
       locale
     );
     for (let index = 0; index < spine.length; index++) {
-      onProgress == null ? void 0 : onProgress(index / spine.length);
+      onProgress?.(index / spine.length);
       const spineItem = spine[index];
-      (_a = this.logger) == null ? void 0 : _a.info(
+      this.logger?.info(
         `Aligning epub item #${index} : ${basename(spineItem.href)}`
       );
       const chapterId = spineItem.id;
-      if ((_c = (_b = manifest[chapterId]) == null ? void 0 : _b.properties) == null ? void 0 : _c.includes("nav")) {
+      if (manifest[chapterId]?.properties?.includes("nav")) {
         continue;
       }
       const chapterSentences = await this.getChapterSentences(chapterId);
@@ -309,12 +309,12 @@ class Aligner {
         );
       }
       if (chapterSentences.length === 0) {
-        (_d = this.logger) == null ? void 0 : _d.info(`Chapter #${index} has no text; skipping`);
+        this.logger?.info(`Chapter #${index} has no text; skipping`);
         continue;
       }
       if (chapterSentences.length < 2 && // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       chapterSentences[0].split(" ").length < 4) {
-        (_e = this.logger) == null ? void 0 : _e.info(
+        this.logger?.info(
           `Chapter #${index} is fewer than four words; skipping`
         );
         continue;
@@ -324,7 +324,7 @@ class Aligner {
         transcriptionText
       );
       if (!boundaries) {
-        (_f = this.logger) == null ? void 0 : _f.info(
+        this.logger?.info(
           `Could not find chapter #${index} in the transcripton`
         );
         continue;

package/dist/cli/bin.cjs

@@ -137,7 +137,7 @@ async function main() {
     const controller = new AbortController();
     let progressBar;
     function resetProgressBar() {
-      progressBar == null ? void 0 : progressBar.stop();
+      progressBar?.stop();
       progressBar = new import_cli_progress.SingleBar(
         { etaBuffer: 4, hideCursor: null, noTTYOutput: !process.stderr.isTTY },
         import_cli_progress.Presets.shades_classic

package/dist/cli/bin.js

@@ -23,7 +23,7 @@ import { run } from "@optique/run";
 import { path } from "@optique/run/valueparser";
 import { Presets, SingleBar } from "cli-progress";
 import { Epub } from "@storyteller-platform/epub";
-import packageJson from "../../package.json";
+import packageJson from "../../package.json" with { type: "json" };
 import { align } from "../align/align.js";
 import { alignCommand, alignParser } from "../align/parse.js";
 import { createLogger } from "../common/logging.js";
@@ -88,7 +88,7 @@ async function main() {
     const controller = new AbortController();
     let progressBar;
     function resetProgressBar() {
-      progressBar == null ? void 0 : progressBar.stop();
+      progressBar?.stop();
       progressBar = new SingleBar(
         { etaBuffer: 4, hideCursor: null, noTTYOutput: !process.stderr.isTTY },
         Presets.shades_classic

package/dist/common/ffmpeg.cjs

@@ -58,8 +58,8 @@ async function execCmd(command, logger, signal) {
         "stdout maxBuffer length exceeded. This likely means that youre trying to process a very large file, and the ffmpeg process is running out of memory. Maybe check the image size of your cover art."
       );
     }
-    logger == null ? void 0 : logger.error(error);
-    logger == null ? void 0 : logger.info(stdout);
+    logger?.error(error);
+    logger?.info(stdout);
     throw new Error(stderr);
   }
 }
@@ -157,8 +157,8 @@ function commonFfmpegArguments(sourceExtension, destExtension, codec, bitrate) {
 }
 async function splitFile(input, output, start, end, encoding, signal, logger) {
   if (start === end) return false;
-  logger == null ? void 0 : logger.info(
-    `Splitting ${input} start: ${start} end: ${end}${(encoding == null ? void 0 : encoding.codec) ? ` codec: ${encoding.codec}` : ""}`
+  logger?.info(
+    `Splitting ${input} start: ${start} end: ${end}${encoding?.codec ? ` codec: ${encoding.codec}` : ""}`
   );
   const command = "ffmpeg";
   const args = [
@@ -172,8 +172,8 @@ async function splitFile(input, output, start, end, encoding, signal, logger) {
     ...commonFfmpegArguments(
       (0, import_node_path.extname)(input),
       (0, import_node_path.extname)(output),
-      (encoding == null ? void 0 : encoding.codec) ?? null,
-      (encoding == null ? void 0 : encoding.bitrate) ?? null
+      encoding?.codec ?? null,
+      encoding?.bitrate ?? null
     ),
     (0, import_shell.quotePath)(output)
   ];
@@ -189,15 +189,15 @@ async function splitFile(input, output, start, end, encoding, signal, logger) {
   return true;
 }
 async function transcodeFile(input, output, encoding, signal, logger) {
-  if (!(encoding == null ? void 0 : encoding.codec) && (0, import_mime.areSameType)(input, output)) {
-    logger == null ? void 0 : logger.info(
+  if (!encoding?.codec && (0, import_mime.areSameType)(input, output)) {
+    logger?.info(
       `Input and output container and codec are the same, copying ${input} to output directory`
     );
     await (0, import_promises.copyFile)(input, output);
     return;
   }
-  logger == null ? void 0 : logger.info(
-    `Transcoding ${input}${(encoding == null ? void 0 : encoding.codec) ? ` codec: ${encoding.codec}` : ""}`
+  logger?.info(
+    `Transcoding ${input}${encoding?.codec ? ` codec: ${encoding.codec}` : ""}`
   );
   const command = "ffmpeg";
   const args = [
@@ -207,8 +207,8 @@ async function transcodeFile(input, output, encoding, signal, logger) {
     ...commonFfmpegArguments(
       (0, import_node_path.extname)(input),
       (0, import_node_path.extname)(output),
-      (encoding == null ? void 0 : encoding.codec) ?? null,
-      (encoding == null ? void 0 : encoding.bitrate) ?? null
+      encoding?.codec ?? null,
+      encoding?.bitrate ?? null
     ),
     (0, import_shell.quotePath)(output)
   ];

package/dist/common/ffmpeg.js

@@ -23,8 +23,8 @@ async function execCmd(command, logger, signal) {
         "stdout maxBuffer length exceeded. This likely means that youre trying to process a very large file, and the ffmpeg process is running out of memory. Maybe check the image size of your cover art."
       );
     }
-    logger == null ? void 0 : logger.error(error);
-    logger == null ? void 0 : logger.info(stdout);
+    logger?.error(error);
+    logger?.info(stdout);
     throw new Error(stderr);
   }
 }
@@ -122,8 +122,8 @@ function commonFfmpegArguments(sourceExtension, destExtension, codec, bitrate) {
 }
 async function splitFile(input, output, start, end, encoding, signal, logger) {
   if (start === end) return false;
-  logger == null ? void 0 : logger.info(
-    `Splitting ${input} start: ${start} end: ${end}${(encoding == null ? void 0 : encoding.codec) ? ` codec: ${encoding.codec}` : ""}`
+  logger?.info(
+    `Splitting ${input} start: ${start} end: ${end}${encoding?.codec ? ` codec: ${encoding.codec}` : ""}`
   );
   const command = "ffmpeg";
   const args = [
@@ -137,8 +137,8 @@ async function splitFile(input, output, start, end, encoding, signal, logger) {
     ...commonFfmpegArguments(
       extname(input),
       extname(output),
-      (encoding == null ? void 0 : encoding.codec) ?? null,
-      (encoding == null ? void 0 : encoding.bitrate) ?? null
+      encoding?.codec ?? null,
+      encoding?.bitrate ?? null
     ),
     quotePath(output)
   ];
@@ -154,15 +154,15 @@ async function splitFile(input, output, start, end, encoding, signal, logger) {
   return true;
 }
 async function transcodeFile(input, output, encoding, signal, logger) {
-  if (!(encoding == null ? void 0 : encoding.codec) && areSameType(input, output)) {
-    logger == null ? void 0 : logger.info(
+  if (!encoding?.codec && areSameType(input, output)) {
+    logger?.info(
       `Input and output container and codec are the same, copying ${input} to output directory`
     );
     await copyFile(input, output);
     return;
   }
-  logger == null ? void 0 : logger.info(
-    `Transcoding ${input}${(encoding == null ? void 0 : encoding.codec) ? ` codec: ${encoding.codec}` : ""}`
+  logger?.info(
+    `Transcoding ${input}${encoding?.codec ? ` codec: ${encoding.codec}` : ""}`
   );
   const command = "ffmpeg";
   const args = [
@@ -172,8 +172,8 @@ async function transcodeFile(input, output, encoding, signal, logger) {
     ...commonFfmpegArguments(
       extname(input),
       extname(output),
-      (encoding == null ? void 0 : encoding.codec) ?? null,
-      (encoding == null ? void 0 : encoding.bitrate) ?? null
+      encoding?.codec ?? null,
+      encoding?.bitrate ?? null
     ),
     quotePath(output)
   ];

package/dist/errorAlign/backtraceGraph.cjs

@@ -69,15 +69,14 @@ class Node {
 class NodeMap {
   map;
   constructor(entries) {
-    const keyedEntries = entries == null ? void 0 : entries.map(
+    const keyedEntries = entries?.map(
       ([index, node]) => [`${index[0]}-${index[1]}`, { index, node }]
     );
     this.map = new Map(keyedEntries);
   }
   get([hypIndex, refIndex]) {
-    var _a;
     const key = `${hypIndex}-${refIndex}`;
-    return (_a = this.map.get(key)) == null ? void 0 : _a.node;
+    return this.map.get(key)?.node;
   }
   set([hypIndex, refIndex], node) {
     const key = `${hypIndex}-${refIndex}`;
@@ -159,7 +158,7 @@ class BacktraceGraph {
    */
   getPath({ sample } = { sample: false }) {
     let node = this.getNode(0, 0);
-    (0, import_node_assert.default)(node == null ? void 0 : node.isRoot, "The node at (-1, -1) was expected to be a root node.");
+    (0, import_node_assert.default)(node?.isRoot, "The node at (-1, -1) was expected to be a root node.");
     const path = [];
     while (!node.isTerminal) {
       const opType = sample ? choose(Array.from(node.children.keys())) : (
@@ -211,7 +210,6 @@ class BacktraceGraph {
    * @returns A list of index tuples representing the end node of unambiguous span matches.
    */
   getUnambiguousTokenSpanMatches(ref) {
-    var _a;
     ref = "_" + ref;
     const monoMatchEndNodes = /* @__PURE__ */ new Set();
     const refIndexes = new import_utils.Counter();
@@ -226,7 +224,7 @@ class BacktraceGraph {
         if (!this.nodes.has(_index)) {
           break;
         }
-        if (!((_a = this.nodes.get(_index)) == null ? void 0 : _a.parents)) {
+        if (!this.nodes.get(_index)?.parents) {
           break;
         }
         if (ref[_refIndex] === import_utils.END_DELIMITER) {
@@ -272,8 +270,7 @@ class BacktraceGraph {
    * Add parents to the node at the given index based on the backtrace matrix.
    */
   addParentsFromBacktrace(index) {
-    var _a;
-    const node = (_a = this._nodes) == null ? void 0 : _a.get(index);
+    const node = this._nodes?.get(index);
     (0, import_node_assert.default)(
       !!node,
       `Node at index ${index.toString()} does not exist in the graph.`

package/dist/errorAlign/backtraceGraph.js

@@ -42,15 +42,14 @@ class Node {
 class NodeMap {
   map;
   constructor(entries) {
-    const keyedEntries = entries == null ? void 0 : entries.map(
+    const keyedEntries = entries?.map(
       ([index, node]) => [`${index[0]}-${index[1]}`, { index, node }]
     );
     this.map = new Map(keyedEntries);
   }
   get([hypIndex, refIndex]) {
-    var _a;
     const key = `${hypIndex}-${refIndex}`;
-    return (_a = this.map.get(key)) == null ? void 0 : _a.node;
+    return this.map.get(key)?.node;
   }
   set([hypIndex, refIndex], node) {
     const key = `${hypIndex}-${refIndex}`;
@@ -132,7 +131,7 @@ class BacktraceGraph {
    */
   getPath({ sample } = { sample: false }) {
     let node = this.getNode(0, 0);
-    assert(node == null ? void 0 : node.isRoot, "The node at (-1, -1) was expected to be a root node.");
+    assert(node?.isRoot, "The node at (-1, -1) was expected to be a root node.");
     const path = [];
     while (!node.isTerminal) {
       const opType = sample ? choose(Array.from(node.children.keys())) : (
@@ -184,7 +183,6 @@ class BacktraceGraph {
    * @returns A list of index tuples representing the end node of unambiguous span matches.
    */
   getUnambiguousTokenSpanMatches(ref) {
-    var _a;
     ref = "_" + ref;
     const monoMatchEndNodes = /* @__PURE__ */ new Set();
     const refIndexes = new Counter();
@@ -199,7 +197,7 @@ class BacktraceGraph {
         if (!this.nodes.has(_index)) {
           break;
         }
-        if (!((_a = this.nodes.get(_index)) == null ? void 0 : _a.parents)) {
+        if (!this.nodes.get(_index)?.parents) {
           break;
         }
         if (ref[_refIndex] === END_DELIMITER) {
@@ -245,8 +243,7 @@ class BacktraceGraph {
    * Add parents to the node at the given index based on the backtrace matrix.
    */
   addParentsFromBacktrace(index) {
-    var _a;
-    const node = (_a = this._nodes) == null ? void 0 : _a.get(index);
+    const node = this._nodes?.get(index);
     assert(
       !!node,
       `Node at index ${index.toString()} does not exist in the graph.`

package/dist/errorAlign/beamSearch.cjs

@@ -242,7 +242,6 @@ function isSubstitution(hypIndex, refIndex, lastHypIndex, lastRefIndex) {
   return !(refIndex === lastRefIndex || hypIndex === lastHypIndex);
 }
 function errorAlignBeamSearch(src, beamSize = 100) {
-  var _a;
   const startPath = new Path(src);
   let beam = [startPath];
   let pruneMap = {};
@@ -278,7 +277,7 @@ function errorAlignBeamSearch(src, beamSize = 100) {
       return a.normCost - b.normCost;
     });
     beam = newBeamPaths.slice(0, beamSize);
-    if ((_a = beam[0]) == null ? void 0 : _a.atUnambiguousMatchNode) {
+    if (beam[0]?.atUnambiguousMatchNode) {
       beam = beam.slice(0, 1);
       pruneMap = {};
     }

package/dist/errorAlign/beamSearch.js

@@ -209,7 +209,6 @@ function isSubstitution(hypIndex, refIndex, lastHypIndex, lastRefIndex) {
   return !(refIndex === lastRefIndex || hypIndex === lastHypIndex);
 }
 function errorAlignBeamSearch(src, beamSize = 100) {
-  var _a;
   const startPath = new Path(src);
   let beam = [startPath];
   let pruneMap = {};
@@ -245,7 +244,7 @@ function errorAlignBeamSearch(src, beamSize = 100) {
       return a.normCost - b.normCost;
     });
     beam = newBeamPaths.slice(0, beamSize);
-    if ((_a = beam[0]) == null ? void 0 : _a.atUnambiguousMatchNode) {
+    if (beam[0]?.atUnambiguousMatchNode) {
       beam = beam.slice(0, 1);
       pruneMap = {};
     }

package/dist/markup/markup.cjs

@@ -77,7 +77,6 @@ var import_segmentation = require("./segmentation.cjs");
 var import_serializeDom = require("./serializeDom.cjs");
 var import_transform = require("./transform.cjs");
 async function markup(input, output, options) {
-  var _a, _b, _c, _d;
   var _stack = [];
   try {
     const timing = (0, import_ghost_story.createAggregator)();
@@ -88,13 +87,13 @@ async function markup(input, output, options) {
     const spine = await epub.getSpineItems();
     const manifest = await epub.getManifest();
     for (let index = 0; index < spine.length; index++) {
-      (_a = options.onProgress) == null ? void 0 : _a.call(options, index / spine.length);
+      options.onProgress?.(index / spine.length);
       const spineItem = spine[index];
-      (_b = options.logger) == null ? void 0 : _b.info(
+      options.logger?.info(
         `Marking up epub item #${index}: ${(0, import_posix.basename)(spineItem.href)}`
       );
       const chapterId = spineItem.id;
-      if ((_d = (_c = manifest[chapterId]) == null ? void 0 : _c.properties) == null ? void 0 : _d.includes("nav")) {
+      if (manifest[chapterId]?.properties?.includes("nav")) {
         continue;
       }
       const chapterXml = await epub.readXhtmlItemContents(chapterId);

package/dist/markup/markup.js

@@ -15,7 +15,6 @@ import { getXhtmlSegmentation } from "./segmentation.js";
 import { serializeDom } from "./serializeDom.js";
 import { addMark } from "./transform.js";
 async function markup(input, output, options) {
-  var _a, _b, _c, _d;
   var _stack = [];
   try {
     const timing = createAggregator();
@@ -26,13 +25,13 @@ async function markup(input, output, options) {
     const spine = await epub.getSpineItems();
     const manifest = await epub.getManifest();
     for (let index = 0; index < spine.length; index++) {
-      (_a = options.onProgress) == null ? void 0 : _a.call(options, index / spine.length);
+      options.onProgress?.(index / spine.length);
       const spineItem = spine[index];
-      (_b = options.logger) == null ? void 0 : _b.info(
+      options.logger?.info(
         `Marking up epub item #${index}: ${basename(spineItem.href)}`
       );
       const chapterId = spineItem.id;
-      if ((_d = (_c = manifest[chapterId]) == null ? void 0 : _c.properties) == null ? void 0 : _d.includes("nav")) {
+      if (manifest[chapterId]?.properties?.includes("nav")) {
         continue;
       }
       const chapterXml = await epub.readXhtmlItemContents(chapterId);

package/dist/markup/serializeDom.cjs

@@ -49,7 +49,7 @@ function serializeDomNodes(nodes) {
     }
     const childFirstMark = child.marks[0];
     const lastChildFirstMark = lastChild.marks[0];
-    if (childFirstMark === lastChildFirstMark || (childFirstMark == null ? void 0 : childFirstMark.eq(lastChildFirstMark))) {
+    if (childFirstMark === lastChildFirstMark || childFirstMark?.eq(lastChildFirstMark)) {
       return [
         ...acc.slice(0, acc.length - 1),
         [...lastPartition.slice(0, lastPartition.length), child]

package/dist/markup/serializeDom.js

@@ -26,7 +26,7 @@ function serializeDomNodes(nodes) {
     }
     const childFirstMark = child.marks[0];
     const lastChildFirstMark = lastChild.marks[0];
-    if (childFirstMark === lastChildFirstMark || (childFirstMark == null ? void 0 : childFirstMark.eq(lastChildFirstMark))) {
+    if (childFirstMark === lastChildFirstMark || childFirstMark?.eq(lastChildFirstMark)) {
       return [
         ...acc.slice(0, acc.length - 1),
         [...lastPartition.slice(0, lastPartition.length), child]

package/dist/markup/transform.cjs

@@ -58,7 +58,12 @@ function liftText(root) {
     if (node.isBlock) {
       return !!node.textContent.match(/\S/);
     }
-    if (!(node instanceof import_model.TextNode)) return true;
+    if (!(node instanceof import_model.TextNode)) {
+      if (node.isLeaf && parent.isBlock && index === parent.children.length - 1 && !text.endsWith("\n")) {
+        text += "\n";
+      }
+      return true;
+    }
     if (mapping.map(pos) - mapping.map(lastTextEnd)) {
       mapping.appendMap(
         new import_map.StepMap([

package/dist/markup/transform.js

@@ -38,7 +38,12 @@ function liftText(root) {
     if (node.isBlock) {
       return !!node.textContent.match(/\S/);
     }
-    if (!(node instanceof TextNode)) return true;
+    if (!(node instanceof TextNode)) {
+      if (node.isLeaf && parent.isBlock && index === parent.children.length - 1 && !text.endsWith("\n")) {
+        text += "\n";
+      }
+      return true;
+    }
     if (mapping.map(pos) - mapping.map(lastTextEnd)) {
       mapping.appendMap(
         new StepMap([

package/dist/process/processAudiobook.cjs

@@ -75,15 +75,14 @@ var import_ghost_story = require("@storyteller-platform/ghost-story");
 var import_ffmpeg = require("../common/ffmpeg.cjs");
 var import_ranges = require("./ranges.cjs");
 async function processAudiobook(input, output, options) {
-  var _a, _b, _c;
   const timing = (0, import_ghost_story.createAggregator)();
-  timing.setMetadata("codec", ((_a = options.encoding) == null ? void 0 : _a.codec) ?? "unspecified");
-  timing.setMetadata("bitrate", ((_b = options.encoding) == null ? void 0 : _b.bitrate) ?? "unspecified");
+  timing.setMetadata("codec", options.encoding?.codec ?? "unspecified");
+  timing.setMetadata("bitrate", options.encoding?.bitrate ?? "unspecified");
   timing.setMetadata("max-length", `${(options.maxLength ?? 2) * 60} minutes`);
   await (0, import_promises.mkdir)(output, { recursive: true });
   const allFiles = await (0, import_promises.readdir)(input, { recursive: true });
   const filenames = allFiles.filter((f) => (0, import_audiobook.isAudioFile)(f) || (0, import_audiobook.isZipArchive)(f));
-  (_c = options.logger) == null ? void 0 : _c.debug(`Found ${filenames.length} files to process`);
+  options.logger?.debug(`Found ${filenames.length} files to process`);
   const outputFiles = [];
   const controller = new AbortController();
   const signal = AbortSignal.any([
@@ -97,15 +96,14 @@ async function processAudiobook(input, output, options) {
       if (signal.aborted) throw new Error("Aborted");
       const filepath = (0, import_node_path.join)(input, filename);
       function onFileProgress(progress) {
-        var _a2, _b2;
         perFileProgress.set(index, progress);
         const updatedProgress = Array.from(perFileProgress.values()).reduce(
           (acc, p) => acc + p
         );
-        (_a2 = options.logger) == null ? void 0 : _a2.info(
+        options.logger?.info(
           `Progress: ${Math.floor(updatedProgress * 100)}%`
         );
-        (_b2 = options.onProgress) == null ? void 0 : _b2.call(options, updatedProgress);
+        options.onProgress?.(updatedProgress);
       }
       const fileOptions = {
         ...options,
@@ -150,12 +148,11 @@ async function processFile(input, output, prefix, options) {
     );
     await Promise.all(
       ranges.map(async (range, index) => {
-        var _a, _b;
         var _stack2 = [];
         try {
           const outputExtension = determineExtension(
             range.filepath,
-            (_a = options.encoding) == null ? void 0 : _a.codec
+            options.encoding?.codec
           );
           const outputFilename = `${prefix}${(index + 1).toString().padStart(5, "0")}${outputExtension}`;
           const outputFilepath = (0, import_node_path.join)(output, outputFilename);
@@ -164,11 +161,10 @@ async function processFile(input, output, prefix, options) {
             options.lock.release();
           });
           await options.lock.wait();
-          if ((_b = options.signal) == null ? void 0 : _b.aborted) throw new Error("Aborted");
+          if (options.signal?.aborted) throw new Error("Aborted");
           await timing.timeAsync(
             `${range.filepath},${range.start}:${range.end}`,
             async () => {
-              var _a2;
               const wasSplit = await (0, import_ffmpeg.splitFile)(
                 range.filepath,
                 outputFilepath,
@@ -180,7 +176,7 @@ async function processFile(input, output, prefix, options) {
               );
               if (wasSplit) {
                 outputFiles.push(outputFilename);
-                (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, (outputFiles.length + 1) / ranges.length);
+                options.onProgress?.((outputFiles.length + 1) / ranges.length);
               }
             }
           );

package/dist/process/processAudiobook.js

@@ -22,15 +22,14 @@ import {
 import { splitFile } from "../common/ffmpeg.js";
 import { getSafeChapterRanges } from "./ranges.js";
 async function processAudiobook(input, output, options) {
-  var _a, _b, _c;
   const timing = createAggregator();
-  timing.setMetadata("codec", ((_a = options.encoding) == null ? void 0 : _a.codec) ?? "unspecified");
-  timing.setMetadata("bitrate", ((_b = options.encoding) == null ? void 0 : _b.bitrate) ?? "unspecified");
+  timing.setMetadata("codec", options.encoding?.codec ?? "unspecified");
+  timing.setMetadata("bitrate", options.encoding?.bitrate ?? "unspecified");
   timing.setMetadata("max-length", `${(options.maxLength ?? 2) * 60} minutes`);
   await mkdir(output, { recursive: true });
   const allFiles = await readdir(input, { recursive: true });
   const filenames = allFiles.filter((f) => isAudioFile(f) || isZipArchive(f));
-  (_c = options.logger) == null ? void 0 : _c.debug(`Found ${filenames.length} files to process`);
+  options.logger?.debug(`Found ${filenames.length} files to process`);
   const outputFiles = [];
   const controller = new AbortController();
   const signal = AbortSignal.any([
@@ -44,15 +43,14 @@ async function processAudiobook(input, output, options) {
       if (signal.aborted) throw new Error("Aborted");
       const filepath = join(input, filename);
       function onFileProgress(progress) {
-        var _a2, _b2;
         perFileProgress.set(index, progress);
         const updatedProgress = Array.from(perFileProgress.values()).reduce(
           (acc, p) => acc + p
         );
-        (_a2 = options.logger) == null ? void 0 : _a2.info(
+        options.logger?.info(
           `Progress: ${Math.floor(updatedProgress * 100)}%`
         );
-        (_b2 = options.onProgress) == null ? void 0 : _b2.call(options, updatedProgress);
+        options.onProgress?.(updatedProgress);
       }
       const fileOptions = {
         ...options,
@@ -97,12 +95,11 @@ async function processFile(input, output, prefix, options) {
     );
     await Promise.all(
       ranges.map(async (range, index) => {
-        var _a, _b;
         var _stack2 = [];
         try {
           const outputExtension = determineExtension(
             range.filepath,
-            (_a = options.encoding) == null ? void 0 : _a.codec
+            options.encoding?.codec
           );
           const outputFilename = `${prefix}${(index + 1).toString().padStart(5, "0")}${outputExtension}`;
           const outputFilepath = join(output, outputFilename);
@@ -111,11 +108,10 @@ async function processFile(input, output, prefix, options) {
             options.lock.release();
           });
           await options.lock.wait();
-          if ((_b = options.signal) == null ? void 0 : _b.aborted) throw new Error("Aborted");
+          if (options.signal?.aborted) throw new Error("Aborted");
           await timing.timeAsync(
             `${range.filepath},${range.start}:${range.end}`,
             async () => {
-              var _a2;
               const wasSplit = await splitFile(
                 range.filepath,
                 outputFilepath,
@@ -127,7 +123,7 @@ async function processFile(input, output, prefix, options) {
               );
               if (wasSplit) {
                 outputFiles.push(outputFilename);
-                (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, (outputFiles.length + 1) / ranges.length);
+                options.onProgress?.((outputFiles.length + 1) / ranges.length);
               }
             }
           );

package/dist/process/ranges.cjs

@@ -75,7 +75,7 @@ var import_vad = require("@storyteller-platform/ghost-story/vad");
 var import_ffmpeg = require("../common/ffmpeg.cjs");
 async function getSafeChapterRanges(input, duration, chapters, maxSeconds, signal, logger) {
   if (!chapters.length) {
-    logger == null ? void 0 : logger.info(
+    logger?.info(
       `Track is longer than ${maxSeconds / 60} minutes (${duration / 60}m); using VAD to determine safe split points.`
     );
     const ranges2 = await getSafeRanges(input, duration, maxSeconds, 0, signal);
@@ -103,7 +103,7 @@ async function getSafeChapterRanges(input, duration, chapters, maxSeconds, signa
       ranges.push(range);
       continue;
     }
-    logger == null ? void 0 : logger.info(
+    logger?.info(
       `Chapter is longer than ${maxSeconds / 60} minutes (${duration / 60}m); using VAD to determine safe split points.`
     );
     const chapterRanges = await getSafeRanges(
@@ -132,7 +132,7 @@ async function getSafeRanges(input, duration, maxSeconds, start = 0, signal, log
     });
     const ranges = [{ start, end: duration + start }];
     for (let i = 0; i + 1 < duration / maxSeconds; i++) {
-      if (signal == null ? void 0 : signal.aborted) throw new Error("Aborted");
+      if (signal?.aborted) throw new Error("Aborted");
       const tmpFilepath = (0, import_node_path.join)(tmpDir, i.toString(), `${rawFilename}.wav`);
       await (0, import_promises.mkdir)((0, import_node_path.dirname)(tmpFilepath), { recursive: true });
       const approxCutPoint = start + maxSeconds * (i + 1);

package/dist/process/ranges.js

@@ -10,7 +10,7 @@ import { detectVoiceActivity } from "@storyteller-platform/ghost-story/vad";
 import { splitFile } from "../common/ffmpeg.js";
 async function getSafeChapterRanges(input, duration, chapters, maxSeconds, signal, logger) {
   if (!chapters.length) {
-    logger == null ? void 0 : logger.info(
+    logger?.info(
       `Track is longer than ${maxSeconds / 60} minutes (${duration / 60}m); using VAD to determine safe split points.`
     );
     const ranges2 = await getSafeRanges(input, duration, maxSeconds, 0, signal);
@@ -38,7 +38,7 @@ async function getSafeChapterRanges(input, duration, chapters, maxSeconds, signa
       ranges.push(range);
       continue;
     }
-    logger == null ? void 0 : logger.info(
+    logger?.info(
       `Chapter is longer than ${maxSeconds / 60} minutes (${duration / 60}m); using VAD to determine safe split points.`
     );
     const chapterRanges = await getSafeRanges(
@@ -67,7 +67,7 @@ async function getSafeRanges(input, duration, maxSeconds, start = 0, signal, log
     });
     const ranges = [{ start, end: duration + start }];
     for (let i = 0; i + 1 < duration / maxSeconds; i++) {
-      if (signal == null ? void 0 : signal.aborted) throw new Error("Aborted");
+      if (signal?.aborted) throw new Error("Aborted");
       const tmpFilepath = join(tmpDir, i.toString(), `${rawFilename}.wav`);
       await mkdir(dirname(tmpFilepath), { recursive: true });
       const approxCutPoint = start + maxSeconds * (i + 1);

package/dist/transcribe/transcribe.cjs

@@ -84,7 +84,6 @@ var import_async_semaphore = require("@esfx/async-semaphore");
 var import_audiobook = require("@storyteller-platform/audiobook");
 var import_ghost_story = require("@storyteller-platform/ghost-story");
 async function transcribe(input, output, locale, options) {
-  var _a;
   if (process.env["DEBUG_TRANSCRIBE"] === "true") {
     const inspector = await import("node:inspector");
     inspector.open(9231, "0.0.0.0", true);
@@ -109,7 +108,7 @@ async function transcribe(input, output, locale, options) {
     await (0, import_ghost_story.ensureWhisperInstalled)({
       model,
       printOutput: ["debug", "info"].includes(
-        ((_a = options.logger) == null ? void 0 : _a.level) ?? "silent"
+        options.logger?.level ?? "silent"
       ),
       signal
     });
@@ -126,7 +125,6 @@ async function transcribe(input, output, locale, options) {
   timing.setMetadata("threads", options.threads ?? 4);
   await Promise.all(
     filenames.map(async (filename) => {
-      var _a2, _b, _c;
       var _stack = [];
       try {
         if (aborted()) throw new Error("Aborted");
@@ -140,7 +138,7 @@ async function transcribe(input, output, locale, options) {
             encoding: "utf-8",
             signal
           });
-          (_a2 = options.logger) == null ? void 0 : _a2.info(`Found existing transcription for ${filepath}`);
+          options.logger?.info(`Found existing transcription for ${filepath}`);
           transcriptions.push(transcriptionFilepath);
         } catch {
         }
@@ -151,13 +149,12 @@ async function transcribe(input, output, locale, options) {
         });
         await semaphore.wait();
         function onFileProgress(progress) {
-          var _a3, _b2;
           perFileProgress.set(filename, progress);
           const updatedProgress = Array.from(perFileProgress.values()).reduce((acc, p) => acc + p) / filenames.length;
-          (_a3 = options.logger) == null ? void 0 : _a3.info(
+          options.logger?.info(
             `Progress: ${Math.floor(updatedProgress * 100)}%`
           );
-          (_b2 = options.onProgress) == null ? void 0 : _b2.call(options, updatedProgress);
+          options.onProgress?.(updatedProgress);
         }
         const transcription = await transcribeFile(filepath, locale, {
           ...options,
@@ -168,7 +165,7 @@ async function transcribe(input, output, locale, options) {
           threads: options.threads ?? 4,
           onProgress: onFileProgress
         });
-        (_b = options.logger) == null ? void 0 : _b.info(
+        options.logger?.info(
           (0, import_ghost_story.formatSingleReport)(
             transcription.timing,
             `Transcription Timing Report for ${filepath}`
@@ -184,7 +181,7 @@ async function transcribe(input, output, locale, options) {
           { signal }
         );
         transcriptions.push(transcriptionFilepath);
-        (_c = options.onProgress) == null ? void 0 : _c.call(options, (transcriptions.length + 1) / filenames.length);
+        options.onProgress?.((transcriptions.length + 1) / filenames.length);
       } catch (_) {
         var _error = _, _hasError = true;
       } finally {
@@ -200,7 +197,6 @@ async function transcribe(input, output, locale, options) {
   return timing;
 }
 async function transcribeFile(input, locale, options) {
-  var _a, _b;
   const audioFilepath = (0, import_node_path.resolve)(process.cwd(), input);
   const sharedOptions = {
     signal: options.signal,
@@ -215,11 +211,11 @@ async function transcribeFile(input, locale, options) {
         model: options.model,
         variant: fallbackVariant,
         printOutput: ["debug", "info"].includes(
-          ((_a = options.logger) == null ? void 0 : _a.level) ?? "silent"
+          options.logger?.level ?? "silent"
         ),
         signal: options.signal
       });
-      (_b = options.logger) == null ? void 0 : _b.info(`Transcribing audio file ${audioFilepath}`);
+      options.logger?.info(`Transcribing audio file ${audioFilepath}`);
       return (0, import_ghost_story.recognize)(audioFilepath, {
         engine: options.engine,
         options: {
@@ -228,12 +224,11 @@ async function transcribeFile(input, locale, options) {
           processors: options.processors,
           threads: options.threads,
           onProgress: (progress) => {
-            var _a2;
             if (options.onProgress) {
               options.onProgress(progress);
               return;
             }
-            (_a2 = options.logger) == null ? void 0 : _a2.info(
+            options.logger?.info(
               `Transcribing ${audioFilepath} progress: ${Math.floor(progress * 100)}%`
             );
           },

package/dist/transcribe/transcribe.js

@@ -15,7 +15,6 @@ import {
   recognize
 } from "@storyteller-platform/ghost-story";
 async function transcribe(input, output, locale, options) {
-  var _a;
   if (process.env["DEBUG_TRANSCRIBE"] === "true") {
     const inspector = await import("node:inspector");
     inspector.open(9231, "0.0.0.0", true);
@@ -40,7 +39,7 @@ async function transcribe(input, output, locale, options) {
     await ensureWhisperInstalled({
       model,
       printOutput: ["debug", "info"].includes(
-        ((_a = options.logger) == null ? void 0 : _a.level) ?? "silent"
+        options.logger?.level ?? "silent"
       ),
       signal
     });
@@ -57,7 +56,6 @@ async function transcribe(input, output, locale, options) {
   timing.setMetadata("threads", options.threads ?? 4);
   await Promise.all(
     filenames.map(async (filename) => {
-      var _a2, _b, _c;
       var _stack = [];
       try {
         if (aborted()) throw new Error("Aborted");
@@ -71,7 +69,7 @@ async function transcribe(input, output, locale, options) {
             encoding: "utf-8",
             signal
           });
-          (_a2 = options.logger) == null ? void 0 : _a2.info(`Found existing transcription for ${filepath}`);
+          options.logger?.info(`Found existing transcription for ${filepath}`);
           transcriptions.push(transcriptionFilepath);
         } catch {
         }
@@ -82,13 +80,12 @@ async function transcribe(input, output, locale, options) {
         });
         await semaphore.wait();
         function onFileProgress(progress) {
-          var _a3, _b2;
           perFileProgress.set(filename, progress);
           const updatedProgress = Array.from(perFileProgress.values()).reduce((acc, p) => acc + p) / filenames.length;
-          (_a3 = options.logger) == null ? void 0 : _a3.info(
+          options.logger?.info(
             `Progress: ${Math.floor(updatedProgress * 100)}%`
           );
-          (_b2 = options.onProgress) == null ? void 0 : _b2.call(options, updatedProgress);
+          options.onProgress?.(updatedProgress);
         }
         const transcription = await transcribeFile(filepath, locale, {
           ...options,
@@ -99,7 +96,7 @@ async function transcribe(input, output, locale, options) {
           threads: options.threads ?? 4,
           onProgress: onFileProgress
         });
-        (_b = options.logger) == null ? void 0 : _b.info(
+        options.logger?.info(
           formatSingleReport(
             transcription.timing,
             `Transcription Timing Report for ${filepath}`
@@ -115,7 +112,7 @@ async function transcribe(input, output, locale, options) {
           { signal }
         );
         transcriptions.push(transcriptionFilepath);
-        (_c = options.onProgress) == null ? void 0 : _c.call(options, (transcriptions.length + 1) / filenames.length);
+        options.onProgress?.((transcriptions.length + 1) / filenames.length);
       } catch (_) {
         var _error = _, _hasError = true;
       } finally {
@@ -131,7 +128,6 @@ async function transcribe(input, output, locale, options) {
   return timing;
 }
 async function transcribeFile(input, locale, options) {
-  var _a, _b;
   const audioFilepath = resolve(process.cwd(), input);
   const sharedOptions = {
     signal: options.signal,
@@ -146,11 +142,11 @@ async function transcribeFile(input, locale, options) {
         model: options.model,
         variant: fallbackVariant,
         printOutput: ["debug", "info"].includes(
-          ((_a = options.logger) == null ? void 0 : _a.level) ?? "silent"
+          options.logger?.level ?? "silent"
         ),
         signal: options.signal
       });
-      (_b = options.logger) == null ? void 0 : _b.info(`Transcribing audio file ${audioFilepath}`);
+      options.logger?.info(`Transcribing audio file ${audioFilepath}`);
       return recognize(audioFilepath, {
         engine: options.engine,
         options: {
@@ -159,12 +155,11 @@ async function transcribeFile(input, locale, options) {
           processors: options.processors,
           threads: options.threads,
           onProgress: (progress) => {
-            var _a2;
             if (options.onProgress) {
               options.onProgress(progress);
               return;
             }
-            (_a2 = options.logger) == null ? void 0 : _a2.info(
+            options.logger?.info(
               `Transcribing ${audioFilepath} progress: ${Math.floor(progress * 100)}%`
             );
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storyteller-platform/align",
-  "version": "0.1.17",
+  "version": "0.1.19",
   "description": "A library and CLI for automatically aligning audiobooks and EPUBs to produce Media Overlays",
   "author": "Shane Friedman",
   "license": "MIT",
@@ -61,7 +61,7 @@
     "@optique/run": "^0.10.7",
     "@storyteller-platform/audiobook": "^0.3.10",
     "@storyteller-platform/epub": "^0.4.8",
-    "@storyteller-platform/ghost-story": "^0.1.6",
+    "@storyteller-platform/ghost-story": "^0.1.7",
     "@storyteller-platform/transliteration": "^3.1.1",
     "chalk": "^5.4.1",
     "cli-progress": "^3.12.0",