@storyteller-platform/align 0.1.53 → 0.1.55

package/dist/markup/transform.cjs

@@ -24,7 +24,7 @@ __export(transform_exports, {
   replaceFootnotes: () => replaceFootnotes
 });
 module.exports = __toCommonJS(transform_exports);
-var import_map = require("./map.cjs");
+var import_mapping = require("@storyteller-platform/mapping");
 var import_model = require("./model.cjs");
 var import_parseDom = require("./parseDom.cjs");
 function addMark(root, from, to, mark) {
@@ -53,9 +53,8 @@ function addMarkToNode(node, pos, from, to, mark) {
   return node.copy({ children });
 }
 function liftText(root) {
-  const mapping = new import_map.Mapping();
+  const mapping = new import_mapping.Mapping();
   let text = "";
-  let textLength = 0;
   let lastTextEnd = 0;
   (0, import_model.descendants)(root, (node, pos, parent, index) => {
     if (node instanceof import_model.FootnoteNode) {
@@ -70,89 +69,68 @@ function liftText(root) {
       if (node.isLeaf && parent.isBlock && index === parent.children.length - 1 && !text.endsWith("\n")) {
         text += "\n";
       }
-      return true;
+      return !(node instanceof import_model.RubyTextNode || node instanceof import_model.RubyParenthesisNode);
     }
-    if (mapping.map(pos) - mapping.map(lastTextEnd)) {
-      mapping.appendMap(
-        new import_map.StepMap([
-          mapping.map(lastTextEnd),
-          mapping.map(pos) - mapping.map(lastTextEnd),
-          0
-        ])
-      );
+    if (pos - lastTextEnd) {
+      mapping.insertMap(lastTextEnd, pos - lastTextEnd, 0);
     }
     let result = node.text.replaceAll(/\n/g, " ");
-    if (text.endsWith("\n")) {
+    if (text.endsWith("\n") || text === "") {
       const contentStart = result.match(/\S/u)?.index ?? result.length;
       if (contentStart !== 0) {
         result = result.slice(contentStart);
-        mapping.appendMap(
-          new import_map.StepMap([mapping.map(lastTextEnd), contentStart, 0])
-        );
+        mapping.insertMap(pos, contentStart, 0);
       }
     }
     lastTextEnd = pos + node.nodeSize;
     const hasBlockSiblings = parent.children.some((child) => child.isBlock);
     if (hasBlockSiblings && !result.match(/\S/)) {
       if (result.length) {
-        mapping.appendMap(new import_map.StepMap([textLength, result.length, 0]));
+        mapping.insertMap(pos, result.length, 0);
       }
       result = "";
     }
     if (parent.isBlock && index === parent.children.length - 1 && !(text + result).endsWith("\n")) {
       result += "\n";
-      textLength--;
     }
     text += result;
-    textLength += result.length;
     return true;
   });
   return { result: text, mapping };
 }
 function inlineFootnotes(root) {
   const footnotePairs = (0, import_parseDom.findFootnotePairs)(root);
-  const mapping = new import_map.Mapping();
+  const mapping = new import_mapping.Mapping();
   let transformed = root;
+  let cursor = mapping.cursor();
   for (const [noterefPos, footnotePos] of footnotePairs.entries()) {
     const noteref = root.resolve(noterefPos).nodeAfter;
     const footnote = root.resolve(footnotePos).nodeAfter;
     if (!noteref || !(footnote instanceof import_model.Node)) continue;
-    transformed = transformed.replace(mapping.map(noterefPos), footnote);
-    mapping.appendMap(
-      new import_map.StepMap([
-        mapping.map(noterefPos),
-        noteref.nodeSize,
-        footnote.nodeSize
-      ])
-    );
+    transformed = transformed.replace(cursor.map(noterefPos), footnote);
+    mapping.insertMap(noterefPos, noteref.nodeSize, footnote.nodeSize);
+    cursor = mapping.cursor();
     transformed = transformed.replace(
-      mapping.map(footnotePos),
+      cursor.map(footnotePos),
       new import_model.Node(footnote.tagName)
     );
-    mapping.appendMap(
-      new import_map.StepMap([mapping.map(footnotePos), footnote.nodeSize, 1])
-    );
+    mapping.insertMap(footnotePos, footnote.nodeSize, 1);
   }
   return { root: transformed, footnotePairs, mapping };
 }
 function replaceFootnotes(original, root, footnotePairs, mapping) {
   let transformed = root;
+  let cursor = mapping.cursor();
   for (const [noterefPos, footnotePos] of footnotePairs.entries()) {
     const noteref = original.resolve(noterefPos).nodeAfter;
-    const footnote = transformed.resolve(mapping.map(noterefPos)).nodeAfter;
+    const footnote = transformed.resolve(cursor.map(noterefPos)).nodeAfter;
     if (!(noteref instanceof import_model.Node) || !(footnote instanceof import_model.Node)) continue;
-    transformed = transformed.replace(mapping.map(noterefPos), noteref);
-    mapping.appendMap(
-      new import_map.StepMap([
-        mapping.map(noterefPos),
-        footnote.nodeSize,
-        noteref.nodeSize
-      ])
-    );
-    transformed = transformed.replace(mapping.map(footnotePos), footnote);
-    mapping.appendMap(
-      new import_map.StepMap([mapping.map(footnotePos), 1, footnote.nodeSize])
-    );
+    transformed = transformed.replace(cursor.map(noterefPos), noteref);
+    mapping.insertMap(noterefPos, footnote.nodeSize, noteref.nodeSize);
+    cursor = mapping.cursor();
+    transformed = transformed.replace(cursor.map(footnotePos), footnote);
+    mapping.insertMap(footnotePos, 1, footnote.nodeSize);
+    cursor = mapping.cursor();
   }
   return transformed;
 }

package/dist/markup/transform.d.cts

@@ -1,5 +1,5 @@
-import { Mapping } from './map.cjs';
-import { R as Root, M as Mark } from '../model-Bv3yPEdd.cjs';
+import { Mapping } from '@storyteller-platform/mapping';
+import { R as Root, M as Mark } from '../model-CZ2mMHJO.cjs';
 import '@storyteller-platform/epub';
 
 declare function addMark(root: Root, from: number, to: number, mark: Mark): Root;

package/dist/markup/transform.d.ts

@@ -1,5 +1,5 @@
-import { Mapping } from './map.js';
-import { R as Root, M as Mark } from '../model-Bv3yPEdd.js';
+import { Mapping } from '@storyteller-platform/mapping';
+import { R as Root, M as Mark } from '../model-CZ2mMHJO.js';
 import '@storyteller-platform/epub';
 
 declare function addMark(root: Root, from: number, to: number, mark: Mark): Root;

package/dist/markup/transform.js

@@ -1,8 +1,10 @@
 import "../chunk-BIEQXUOY.js";
-import { Mapping, StepMap } from "./map.js";
+import { Mapping } from "@storyteller-platform/mapping";
 import {
   FootnoteNode,
   Node,
+  RubyParenthesisNode,
+  RubyTextNode,
   TextNode,
   descendants
 } from "./model.js";
@@ -35,7 +37,6 @@ function addMarkToNode(node, pos, from, to, mark) {
 function liftText(root) {
   const mapping = new Mapping();
   let text = "";
-  let textLength = 0;
   let lastTextEnd = 0;
   descendants(root, (node, pos, parent, index) => {
     if (node instanceof FootnoteNode) {
@@ -50,41 +51,31 @@ function liftText(root) {
       if (node.isLeaf && parent.isBlock && index === parent.children.length - 1 && !text.endsWith("\n")) {
         text += "\n";
       }
-      return true;
+      return !(node instanceof RubyTextNode || node instanceof RubyParenthesisNode);
     }
-    if (mapping.map(pos) - mapping.map(lastTextEnd)) {
-      mapping.appendMap(
-        new StepMap([
-          mapping.map(lastTextEnd),
-          mapping.map(pos) - mapping.map(lastTextEnd),
-          0
-        ])
-      );
+    if (pos - lastTextEnd) {
+      mapping.insertMap(lastTextEnd, pos - lastTextEnd, 0);
     }
     let result = node.text.replaceAll(/\n/g, " ");
-    if (text.endsWith("\n")) {
+    if (text.endsWith("\n") || text === "") {
       const contentStart = result.match(/\S/u)?.index ?? result.length;
       if (contentStart !== 0) {
         result = result.slice(contentStart);
-        mapping.appendMap(
-          new StepMap([mapping.map(lastTextEnd), contentStart, 0])
-        );
+        mapping.insertMap(pos, contentStart, 0);
       }
     }
     lastTextEnd = pos + node.nodeSize;
     const hasBlockSiblings = parent.children.some((child) => child.isBlock);
     if (hasBlockSiblings && !result.match(/\S/)) {
       if (result.length) {
-        mapping.appendMap(new StepMap([textLength, result.length, 0]));
+        mapping.insertMap(pos, result.length, 0);
       }
       result = "";
     }
     if (parent.isBlock && index === parent.children.length - 1 && !(text + result).endsWith("\n")) {
       result += "\n";
-      textLength--;
     }
     text += result;
-    textLength += result.length;
     return true;
   });
   return { result: text, mapping };
@@ -93,46 +84,35 @@ function inlineFootnotes(root) {
   const footnotePairs = findFootnotePairs(root);
   const mapping = new Mapping();
   let transformed = root;
+  let cursor = mapping.cursor();
   for (const [noterefPos, footnotePos] of footnotePairs.entries()) {
     const noteref = root.resolve(noterefPos).nodeAfter;
     const footnote = root.resolve(footnotePos).nodeAfter;
     if (!noteref || !(footnote instanceof Node)) continue;
-    transformed = transformed.replace(mapping.map(noterefPos), footnote);
-    mapping.appendMap(
-      new StepMap([
-        mapping.map(noterefPos),
-        noteref.nodeSize,
-        footnote.nodeSize
-      ])
-    );
+    transformed = transformed.replace(cursor.map(noterefPos), footnote);
+    mapping.insertMap(noterefPos, noteref.nodeSize, footnote.nodeSize);
+    cursor = mapping.cursor();
     transformed = transformed.replace(
-      mapping.map(footnotePos),
+      cursor.map(footnotePos),
       new Node(footnote.tagName)
     );
-    mapping.appendMap(
-      new StepMap([mapping.map(footnotePos), footnote.nodeSize, 1])
-    );
+    mapping.insertMap(footnotePos, footnote.nodeSize, 1);
   }
   return { root: transformed, footnotePairs, mapping };
 }
 function replaceFootnotes(original, root, footnotePairs, mapping) {
   let transformed = root;
+  let cursor = mapping.cursor();
   for (const [noterefPos, footnotePos] of footnotePairs.entries()) {
     const noteref = original.resolve(noterefPos).nodeAfter;
-    const footnote = transformed.resolve(mapping.map(noterefPos)).nodeAfter;
+    const footnote = transformed.resolve(cursor.map(noterefPos)).nodeAfter;
     if (!(noteref instanceof Node) || !(footnote instanceof Node)) continue;
-    transformed = transformed.replace(mapping.map(noterefPos), noteref);
-    mapping.appendMap(
-      new StepMap([
-        mapping.map(noterefPos),
-        footnote.nodeSize,
-        noteref.nodeSize
-      ])
-    );
-    transformed = transformed.replace(mapping.map(footnotePos), footnote);
-    mapping.appendMap(
-      new StepMap([mapping.map(footnotePos), 1, footnote.nodeSize])
-    );
+    transformed = transformed.replace(cursor.map(noterefPos), noteref);
+    mapping.insertMap(noterefPos, footnote.nodeSize, noteref.nodeSize);
+    cursor = mapping.cursor();
+    transformed = transformed.replace(cursor.map(footnotePos), footnote);
+    mapping.insertMap(footnotePos, 1, footnote.nodeSize);
+    cursor = mapping.cursor();
   }
   return transformed;
 }

package/dist/{model-Bv3yPEdd.d.cts → model-CZ2mMHJO.d.cts}

@@ -68,6 +68,12 @@ declare class NoterefNode extends Node {
 }
 declare class FootnoteNode extends Node {
 }
+declare class RubyParenthesisNode extends Node {
+}
+declare class RubyTextNode extends Node {
+}
+declare class RubyNode extends Node {
+}
 declare class Mark {
     tagName: ElementName;
     attrs: Record<string, string>;
@@ -93,4 +99,4 @@ declare class TextNode {
 }
 declare function descendants(node: Root | Node, cb: (node: Node | TextNode, pos: number, parent: Node | Root, index: number) => boolean, pos?: number): void;
 
-export { FootnoteNode as F, Mark as M, Node as N, Root as R, TextNode as T, ResolvedPos as a, NoterefNode as b, descendants as d };
+export { FootnoteNode as F, Mark as M, Node as N, Root as R, TextNode as T, ResolvedPos as a, NoterefNode as b, RubyParenthesisNode as c, RubyTextNode as d, RubyNode as e, descendants as f };

package/dist/{model-Bv3yPEdd.d.ts → model-CZ2mMHJO.d.ts}

@@ -68,6 +68,12 @@ declare class NoterefNode extends Node {
 }
 declare class FootnoteNode extends Node {
 }
+declare class RubyParenthesisNode extends Node {
+}
+declare class RubyTextNode extends Node {
+}
+declare class RubyNode extends Node {
+}
 declare class Mark {
     tagName: ElementName;
     attrs: Record<string, string>;
@@ -93,4 +99,4 @@ declare class TextNode {
 }
 declare function descendants(node: Root | Node, cb: (node: Node | TextNode, pos: number, parent: Node | Root, index: number) => boolean, pos?: number): void;
 
-export { FootnoteNode as F, Mark as M, Node as N, Root as R, TextNode as T, ResolvedPos as a, NoterefNode as b, descendants as d };
+export { FootnoteNode as F, Mark as M, Node as N, Root as R, TextNode as T, ResolvedPos as a, NoterefNode as b, RubyParenthesisNode as c, RubyTextNode as d, RubyNode as e, descendants as f };

package/dist/readium/manifest.cjs

@@ -79,7 +79,7 @@ async function generateReadiumManifest(epub, options = {}) {
     })
   );
   const title = await epub.getTitle();
-  const identifier = await epub.getIdentifier();
+  const identifier = await epub.getUniqueIdentifier() || (await epub.getIdentifiers())[0]?.value;
   const subtitle = await epub.getSubtitle();
   const description = await epub.getDescription();
   const published = await epub.getPublicationDate();

package/dist/readium/manifest.js

@@ -62,7 +62,7 @@ async function generateReadiumManifest(epub, options = {}) {
     })
   );
   const title = await epub.getTitle();
-  const identifier = await epub.getIdentifier();
+  const identifier = await epub.getUniqueIdentifier() || (await epub.getIdentifiers())[0]?.value;
   const subtitle = await epub.getSubtitle();
   const description = await epub.getDescription();
   const published = await epub.getPublicationDate();

package/dist/snapshot/snapshot.cjs

@@ -72,6 +72,7 @@ var import_node_path = require("node:path");
 var import_posix = require("node:path/posix");
 var import_epub = require("@storyteller-platform/epub");
 var import_ghost_story = require("@storyteller-platform/ghost-story");
+var import_slugify = require("../align/slugify.cjs");
 var import_parseDom = require("../markup/parseDom.cjs");
 var import_segmentation = require("../markup/segmentation.cjs");
 var import_transform = require("../markup/transform.cjs");
@@ -94,8 +95,9 @@ async function snapshotAlignment(epubPath, transcriptionsPath, outputPath) {
     __callDispose(_stack, _error, _hasError);
   }
 }
-async function createAlignmentSnapshot(epub, transcriptionFilepaths, textRef) {
+async function createAlignmentSnapshot(epub, transcriptionFilepaths, textRef, transliterate) {
   let newSnapshot = "";
+  const locale = await epub.getLanguage() ?? new Intl.Locale("en-US");
   const manifest = await epub.getManifest();
   const mediaOverlayItems = Object.values(manifest).map((item) => item.mediaOverlay).filter((mediaOverlayId) => !!mediaOverlayId).map((id) => manifest[id]);
   const mediaOverlays = [];
@@ -145,14 +147,14 @@ async function createAlignmentSnapshot(epub, transcriptionFilepaths, textRef) {
       );
       if (result === null) continue;
       const { fragment, sentenceId } = result;
-      const textSentence = chapterSentences[sentenceId]?.text;
+      const textSentence = chapterSentences[sentenceId]?.text.replace(/\n/, "");
       if (!textSentence) continue;
       lastChapterSentence = sentenceId;
       if (textRef === "text-fragment") {
         newSnapshot += `${fragment}
 `;
       }
-      newSnapshot += `Text:  ${textSentence.replace(/\n/, "")}
+      newSnapshot += `Text:  ${transliterate ? (await (0, import_slugify.slugify)(textSentence, locale)).result : textSentence}
 `;
       const audioSrc = audio[":@"]?.["@_src"];
       if (!audioSrc) continue;
@@ -188,7 +190,7 @@ async function createAlignmentSnapshot(epub, transcriptionFilepaths, textRef) {
       const transcriptionSentence = transcriptionWords.map(
         (w, idx) => (0, import_ghost_story.startsWithSpacelessScript)(w) || idx === transcriptionWords.length - 1 ? w : `${w} `
       ).join("");
-      newSnapshot += `Audio: ${transcriptionSentence}
+      newSnapshot += `Audio: ${transliterate ? (await (0, import_slugify.slugify)(transcriptionSentence, locale)).result : transcriptionSentence}
 `;
     }
     newSnapshot += `

package/dist/snapshot/snapshot.d.cts

@@ -1,6 +1,6 @@
 import { Epub } from '@storyteller-platform/epub';
 
 declare function snapshotAlignment(epubPath: string, transcriptionsPath: string, outputPath: string): Promise<void>;
-declare function createAlignmentSnapshot(epub: Epub, transcriptionFilepaths: string[], textRef: "id-fragment" | "text-fragment"): Promise<string>;
+declare function createAlignmentSnapshot(epub: Epub, transcriptionFilepaths: string[], textRef: "id-fragment" | "text-fragment", transliterate?: boolean): Promise<string>;
 
 export { createAlignmentSnapshot, snapshotAlignment };

package/dist/snapshot/snapshot.d.ts

@@ -1,6 +1,6 @@
 import { Epub } from '@storyteller-platform/epub';
 
 declare function snapshotAlignment(epubPath: string, transcriptionsPath: string, outputPath: string): Promise<void>;
-declare function createAlignmentSnapshot(epub: Epub, transcriptionFilepaths: string[], textRef: "id-fragment" | "text-fragment"): Promise<string>;
+declare function createAlignmentSnapshot(epub: Epub, transcriptionFilepaths: string[], textRef: "id-fragment" | "text-fragment", transliterate?: boolean): Promise<string>;
 
 export { createAlignmentSnapshot, snapshotAlignment };

package/dist/snapshot/snapshot.js

@@ -14,6 +14,7 @@ import {
 import {
   startsWithSpacelessScript
 } from "@storyteller-platform/ghost-story";
+import { slugify } from "../align/slugify.js";
 import { parseDom } from "../markup/parseDom.js";
 import { segmentChapter } from "../markup/segmentation.js";
 import { inlineFootnotes, liftText } from "../markup/transform.js";
@@ -36,8 +37,9 @@ async function snapshotAlignment(epubPath, transcriptionsPath, outputPath) {
     __callDispose(_stack, _error, _hasError);
   }
 }
-async function createAlignmentSnapshot(epub, transcriptionFilepaths, textRef) {
+async function createAlignmentSnapshot(epub, transcriptionFilepaths, textRef, transliterate) {
   let newSnapshot = "";
+  const locale = await epub.getLanguage() ?? new Intl.Locale("en-US");
   const manifest = await epub.getManifest();
   const mediaOverlayItems = Object.values(manifest).map((item) => item.mediaOverlay).filter((mediaOverlayId) => !!mediaOverlayId).map((id) => manifest[id]);
   const mediaOverlays = [];
@@ -87,14 +89,14 @@ async function createAlignmentSnapshot(epub, transcriptionFilepaths, textRef) {
       );
       if (result === null) continue;
       const { fragment, sentenceId } = result;
-      const textSentence = chapterSentences[sentenceId]?.text;
+      const textSentence = chapterSentences[sentenceId]?.text.replace(/\n/, "");
       if (!textSentence) continue;
       lastChapterSentence = sentenceId;
       if (textRef === "text-fragment") {
         newSnapshot += `${fragment}
 `;
       }
-      newSnapshot += `Text:  ${textSentence.replace(/\n/, "")}
+      newSnapshot += `Text:  ${transliterate ? (await slugify(textSentence, locale)).result : textSentence}
 `;
       const audioSrc = audio[":@"]?.["@_src"];
       if (!audioSrc) continue;
@@ -130,7 +132,7 @@ async function createAlignmentSnapshot(epub, transcriptionFilepaths, textRef) {
       const transcriptionSentence = transcriptionWords.map(
         (w, idx) => startsWithSpacelessScript(w) || idx === transcriptionWords.length - 1 ? w : `${w} `
       ).join("");
-      newSnapshot += `Audio: ${transcriptionSentence}
+      newSnapshot += `Audio: ${transliterate ? (await slugify(transcriptionSentence, locale)).result : transcriptionSentence}
 `;
     }
     newSnapshot += `

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storyteller-platform/align",
-  "version": "0.1.53",
+  "version": "0.1.55",
   "description": "A library and CLI for automatically aligning audiobooks and EPUBs to produce Media Overlays",
   "author": "Shane Friedman",
   "license": "MIT",
@@ -70,10 +70,11 @@
     "@optique/core": "^0.10.7",
     "@optique/run": "^0.10.7",
     "@readium/shared": "^2.2.0",
-    "@storyteller-platform/audiobook": "^0.4.2",
-    "@storyteller-platform/epub": "^0.6.3",
+    "@storyteller-platform/audiobook": "^0.5.0",
+    "@storyteller-platform/epub": "^0.7.0",
     "@storyteller-platform/ghost-story": "^0.1.12",
-    "@storyteller-platform/transliteration": "^3.1.3",
+    "@storyteller-platform/mapping": "0.1.3",
+    "@storyteller-platform/transliteration": "^4.0.6",
     "chalk": "^5.4.1",
     "change-case": "^5.4.4",
     "cli-progress": "^3.12.0",