@storyteller-platform/align 0.1.53 → 0.1.55

package/dist/align/align.cjs

@@ -108,16 +108,19 @@ async function align(input, output, transcriptionsDir, audiobookDir, options) {
     const epubPath = outFormat === "epub" ? (0, import_node_path.join)(
       (0, import_node_os.tmpdir)(),
       `storyteller-platform-align-${(0, import_node_crypto.randomUUID)()}`,
-      (0, import_posix.basename)(output)
+      (0, import_node_path.basename)(output)
     ) : input;
     const stack = __using(_stack2, new DisposableStack());
     stack.defer(() => {
       if (outFormat === "epub") {
-        (0, import_node_fs.rmSync)((0, import_posix.dirname)(epubPath), { recursive: true, force: true });
+        try {
+          (0, import_node_fs.rmSync)((0, import_node_path.dirname)(epubPath), { recursive: true, force: true });
+        } catch {
+        }
       }
     });
     if (outFormat === "epub") {
-      await (0, import_promises.mkdir)((0, import_posix.dirname)(epubPath), { recursive: true });
+      await (0, import_promises.mkdir)((0, import_node_path.dirname)(epubPath), { recursive: true });
       await (0, import_promises.copyFile)(input, epubPath);
     }
     const audiobookFiles = await (0, import_promises.readdir)(audiobookDir).then(
@@ -157,7 +160,7 @@ async function align(input, output, transcriptionsDir, audiobookDir, options) {
     const timing = await aligner.alignBook(options.onProgress);
     if (outFormat === "epub") {
       await epub.saveAndClose();
-      await (0, import_promises.mkdir)((0, import_posix.dirname)(output), { recursive: true });
+      await (0, import_promises.mkdir)((0, import_node_path.dirname)(output), { recursive: true });
       await (0, import_promises.copyFile)(epubPath, output);
     } else {
       var _stack = [];
@@ -165,7 +168,7 @@ async function align(input, output, transcriptionsDir, audiobookDir, options) {
         const guidedNavigationDocuments = await (0, import_guidedNavigation.generateGuidedNavigationDocuments)(epub);
         const manifest = (0, import_guidedNavigation.generateGuidedNavigationManifest)(
           new import_shared.LocalizedString(
-            await epub.getTitle() ?? (0, import_posix.basename)(input, (0, import_node_path.extname)(input))
+            await epub.getTitle() ?? (0, import_node_path.basename)(input, (0, import_node_path.extname)(input))
           ),
           guidedNavigationDocuments
         );
@@ -358,7 +361,7 @@ class Aligner {
     );
     await Promise.all(
       audiofiles.map(async (audiofile) => {
-        const { name, base } = (0, import_posix.parse)(audiofile);
+        const { name, base } = (0, import_node_path.parse)(audiofile);
         const id = `audio_${name}`;
         const manifest = await this.epub.getManifest();
         if (id in manifest) return;
@@ -430,8 +433,9 @@ class Aligner {
       },
       []
     );
-    const mappedTranscriptionOffset = mapping.invert().map(transcriptionOffset);
-    const mappedEndTranscriptionOffset = mapping.invert().map(endTranscriptionOffset);
+    const cursor = mapping.invert().cursor();
+    const mappedTranscriptionOffset = cursor.map(transcriptionOffset);
+    const mappedEndTranscriptionOffset = cursor.map(endTranscriptionOffset);
     this.report.chapters.push({
       href: chapter.href,
       transcriptionOffset: mappedTranscriptionOffset,

package/dist/align/align.d.cts

@@ -4,7 +4,7 @@ import { Epub } from '@storyteller-platform/epub';
 import { RecognitionResult } from '@storyteller-platform/ghost-story/recognition';
 import { StorytellerTranscription } from './getSentenceRanges.cjs';
 import '@echogarden/text-segmentation';
-import '@storyteller-platform/transliteration';
+import '@storyteller-platform/mapping';
 
 interface AudioFileContext {
     start: number;

package/dist/align/align.d.ts

@@ -4,7 +4,7 @@ import { Epub } from '@storyteller-platform/epub';
 import { RecognitionResult } from '@storyteller-platform/ghost-story/recognition';
 import { StorytellerTranscription } from './getSentenceRanges.js';
 import '@echogarden/text-segmentation';
-import '@storyteller-platform/transliteration';
+import '@storyteller-platform/mapping';
 
 interface AudioFileContext {
     start: number;

package/dist/align/align.js

@@ -14,7 +14,13 @@ import {
   writeFile
 } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { dirname as autoDirname, extname, join as autoJoin } from "node:path";
+import {
+  basename as autoBasename,
+  dirname as autoDirname,
+  extname,
+  join as autoJoin,
+  parse as autoParse
+} from "node:path";
 import { basename, dirname, parse, relative } from "node:path/posix";
 import { LocalizedString } from "@readium/shared";
 import { enumerate, max } from "itertools";
@@ -57,16 +63,19 @@ async function align(input, output, transcriptionsDir, audiobookDir, options) {
     const epubPath = outFormat === "epub" ? autoJoin(
       tmpdir(),
       `storyteller-platform-align-${randomUUID()}`,
-      basename(output)
+      autoBasename(output)
     ) : input;
     const stack = __using(_stack2, new DisposableStack());
     stack.defer(() => {
       if (outFormat === "epub") {
-        rmSync(dirname(epubPath), { recursive: true, force: true });
+        try {
+          rmSync(autoDirname(epubPath), { recursive: true, force: true });
+        } catch {
+        }
       }
     });
     if (outFormat === "epub") {
-      await mkdir(dirname(epubPath), { recursive: true });
+      await mkdir(autoDirname(epubPath), { recursive: true });
       await copyFile(input, epubPath);
     }
     const audiobookFiles = await readdir(audiobookDir).then(
@@ -106,7 +115,7 @@ async function align(input, output, transcriptionsDir, audiobookDir, options) {
     const timing = await aligner.alignBook(options.onProgress);
     if (outFormat === "epub") {
       await epub.saveAndClose();
-      await mkdir(dirname(output), { recursive: true });
+      await mkdir(autoDirname(output), { recursive: true });
       await copyFile(epubPath, output);
     } else {
       var _stack = [];
@@ -114,7 +123,7 @@ async function align(input, output, transcriptionsDir, audiobookDir, options) {
         const guidedNavigationDocuments = await generateGuidedNavigationDocuments(epub);
         const manifest = generateGuidedNavigationManifest(
           new LocalizedString(
-            await epub.getTitle() ?? basename(input, extname(input))
+            await epub.getTitle() ?? autoBasename(input, extname(input))
           ),
           guidedNavigationDocuments
         );
@@ -307,7 +316,7 @@ class Aligner {
     );
     await Promise.all(
       audiofiles.map(async (audiofile) => {
-        const { name, base } = parse(audiofile);
+        const { name, base } = autoParse(audiofile);
         const id = `audio_${name}`;
         const manifest = await this.epub.getManifest();
         if (id in manifest) return;
@@ -379,8 +388,9 @@ class Aligner {
       },
       []
     );
-    const mappedTranscriptionOffset = mapping.invert().map(transcriptionOffset);
-    const mappedEndTranscriptionOffset = mapping.invert().map(endTranscriptionOffset);
+    const cursor = mapping.invert().cursor();
+    const mappedTranscriptionOffset = cursor.map(transcriptionOffset);
+    const mappedEndTranscriptionOffset = cursor.map(endTranscriptionOffset);
     this.report.chapters.push({
       href: chapter.href,
       transcriptionOffset: mappedTranscriptionOffset,

package/dist/align/getSentenceRanges.cjs

@@ -141,10 +141,11 @@ function errorAlignWithNarrowing(refSentences, hyp, narrowStart, narrowEnd) {
   return { alignments, slice: [slice[0] + narrowed[0], slice[0] + narrowed[1]] };
 }
 function mapTranscriptionTimeline(transcription, mapping) {
+  const cursor = mapping.cursor();
   return transcription.timeline.map((entry) => ({
     ...entry,
-    mappedStartOffsetUtf16: mapping.map(entry.startOffsetUtf16 ?? 0, 1),
-    mappedEndOffsetUtf16: mapping.map(entry.endOffsetUtf16 ?? 0, -1)
+    mappedStartOffsetUtf16: cursor.map(entry.startOffsetUtf16 ?? 0, "end"),
+    mappedEndOffsetUtf16: cursor.map(entry.endOffsetUtf16 ?? 0, "start")
   }));
 }
 async function getSentenceRanges(transcriptionText, mappedTimeline, sentences, chapterId, chapterOffset, chapterEndOffset, granularity, locale) {

package/dist/align/getSentenceRanges.d.cts

@@ -1,7 +1,7 @@
 import * as _storyteller_platform_ghost_story from '@storyteller-platform/ghost-story';
 import { TimelineEntry } from '@storyteller-platform/ghost-story';
 import { SegmentationResult } from '@echogarden/text-segmentation';
-import { Mapping } from '@storyteller-platform/transliteration';
+import { Mapping } from '@storyteller-platform/mapping';
 
 type StorytellerTimelineEntry = TimelineEntry & {
     audiofile: string;

package/dist/align/getSentenceRanges.d.ts

@@ -1,7 +1,7 @@
 import * as _storyteller_platform_ghost_story from '@storyteller-platform/ghost-story';
 import { TimelineEntry } from '@storyteller-platform/ghost-story';
 import { SegmentationResult } from '@echogarden/text-segmentation';
-import { Mapping } from '@storyteller-platform/transliteration';
+import { Mapping } from '@storyteller-platform/mapping';
 
 type StorytellerTimelineEntry = TimelineEntry & {
     audiofile: string;

package/dist/align/getSentenceRanges.js

@@ -114,10 +114,11 @@ function errorAlignWithNarrowing(refSentences, hyp, narrowStart, narrowEnd) {
   return { alignments, slice: [slice[0] + narrowed[0], slice[0] + narrowed[1]] };
 }
 function mapTranscriptionTimeline(transcription, mapping) {
+  const cursor = mapping.cursor();
   return transcription.timeline.map((entry) => ({
     ...entry,
-    mappedStartOffsetUtf16: mapping.map(entry.startOffsetUtf16 ?? 0, 1),
-    mappedEndOffsetUtf16: mapping.map(entry.endOffsetUtf16 ?? 0, -1)
+    mappedStartOffsetUtf16: cursor.map(entry.startOffsetUtf16 ?? 0, "end"),
+    mappedEndOffsetUtf16: cursor.map(entry.endOffsetUtf16 ?? 0, "start")
   }));
 }
 async function getSentenceRanges(transcriptionText, mappedTimeline, sentences, chapterId, chapterOffset, chapterEndOffset, granularity, locale) {

package/dist/align/interpolateSentenceRanges.d.cts

@@ -1,7 +1,7 @@
 import { SentenceRange } from './getSentenceRanges.cjs';
 import '@storyteller-platform/ghost-story';
 import '@echogarden/text-segmentation';
-import '@storyteller-platform/transliteration';
+import '@storyteller-platform/mapping';
 
 /** A "slot" is a sentence that needs to be synthesised. */
 type Slot = {

package/dist/align/interpolateSentenceRanges.d.ts

@@ -1,7 +1,7 @@
 import { SentenceRange } from './getSentenceRanges.js';
 import '@storyteller-platform/ghost-story';
 import '@echogarden/text-segmentation';
-import '@storyteller-platform/transliteration';
+import '@storyteller-platform/mapping';
 
 /** A "slot" is a sentence that needs to be synthesised. */
 type Slot = {

package/dist/align/slugify.d.cts

@@ -1,8 +1,8 @@
-import * as _storyteller_platform_transliteration from '@storyteller-platform/transliteration';
+import * as _storyteller_platform_mapping from '@storyteller-platform/mapping';
 
 declare function slugify(text: string, locale: Intl.Locale): Promise<{
     result: string;
-    mapping: _storyteller_platform_transliteration.Mapping;
+    mapping: _storyteller_platform_mapping.Mapping;
 }>;
 
 export { slugify };

package/dist/align/slugify.d.ts

@@ -1,8 +1,8 @@
-import * as _storyteller_platform_transliteration from '@storyteller-platform/transliteration';
+import * as _storyteller_platform_mapping from '@storyteller-platform/mapping';
 
 declare function slugify(text: string, locale: Intl.Locale): Promise<{
     result: string;
-    mapping: _storyteller_platform_transliteration.Mapping;
+    mapping: _storyteller_platform_mapping.Mapping;
 }>;
 
 export { slugify };

package/dist/common/shell.cjs

@@ -22,7 +22,7 @@ __export(shell_exports, {
 });
 module.exports = __toCommonJS(shell_exports);
 function quotePath(path) {
-  return `"${path.replaceAll(/(["\\$`])/g, "\\$1")}"`;
+  return `"${path.replaceAll(/(["$`])/g, "\\$1")}"`;
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/common/shell.js

@@ -1,6 +1,6 @@
 import "../chunk-BIEQXUOY.js";
 function quotePath(path) {
-  return `"${path.replaceAll(/(["\\$`])/g, "\\$1")}"`;
+  return `"${path.replaceAll(/(["$`])/g, "\\$1")}"`;
 }
 export {
   quotePath

package/dist/index.d.cts

@@ -12,4 +12,4 @@ import '@storyteller-platform/epub';
 import '@storyteller-platform/ghost-story/recognition';
 import './align/getSentenceRanges.cjs';
 import '@echogarden/text-segmentation';
-import '@storyteller-platform/transliteration';
+import '@storyteller-platform/mapping';

package/dist/index.d.ts

@@ -12,4 +12,4 @@ import '@storyteller-platform/epub';
 import '@storyteller-platform/ghost-story/recognition';
 import './align/getSentenceRanges.js';
 import '@echogarden/text-segmentation';
-import '@storyteller-platform/transliteration';
+import '@storyteller-platform/mapping';

package/dist/markup/markup.cjs

@@ -128,6 +128,8 @@ async function markupChapter(chapterId, chapterXml, granularity, locale) {
   const original = (0, import_parseDom.parseDom)(import_epub.Epub.getXmlChildren(body));
   const inlined = (0, import_transform.inlineFootnotes)(original);
   const lifted = (0, import_transform.liftText)(inlined.root);
+  const invertedLiftMapping = lifted.mapping.invert();
+  const cursor = invertedLiftMapping.cursor();
   const segmentation = await (0, import_segmentation.segmentChapter)(lifted.result, {
     primaryLocale: locale
   });
@@ -137,26 +139,31 @@ async function markupChapter(chapterId, chapterXml, granularity, locale) {
     let i = 0;
     for (const sentence of segmentation) {
       if (granularity === "word") {
+        const snapshot = cursor.value();
         let j = 0;
         let wordPos = pos;
         for (const word of sentence.words.entries) {
           if (!word.isPunctuation) {
             root = (0, import_transform.addMark)(
               root,
-              lifted.mapping.invert().map(wordPos),
-              lifted.mapping.invert().map(wordPos + word.text.replace(/\n$/, "").length, -1),
+              cursor.map(wordPos, "end"),
+              cursor.map(
+                wordPos + word.text.replace(/\n$/, "").length,
+                "start"
+              ),
               new import_model.Mark("span", { id: `${chapterId}-s${i}-w${j}` })
             );
             j++;
           }
           wordPos += word.text.replace(/\n$/, "").length;
         }
+        cursor.reset(snapshot);
       }
       if (sentence.text.match(/\S/)) {
         root = (0, import_transform.addMark)(
           root,
-          lifted.mapping.invert().map(pos),
-          lifted.mapping.invert().map(pos + sentence.text.replace(/\n$/, "").length, -1),
+          cursor.map(pos, "end"),
+          cursor.map(pos + sentence.text.replace(/\n$/, "").length, "start"),
           new import_model.Mark("span", { id: `${chapterId}-s${i}` })
         );
         i++;

package/dist/markup/markup.js

@@ -71,6 +71,8 @@ async function markupChapter(chapterId, chapterXml, granularity, locale) {
   const original = parseDom(Epub.getXmlChildren(body));
   const inlined = inlineFootnotes(original);
   const lifted = liftText(inlined.root);
+  const invertedLiftMapping = lifted.mapping.invert();
+  const cursor = invertedLiftMapping.cursor();
   const segmentation = await segmentChapter(lifted.result, {
     primaryLocale: locale
   });
@@ -80,26 +82,31 @@ async function markupChapter(chapterId, chapterXml, granularity, locale) {
     let i = 0;
     for (const sentence of segmentation) {
       if (granularity === "word") {
+        const snapshot = cursor.value();
         let j = 0;
         let wordPos = pos;
         for (const word of sentence.words.entries) {
           if (!word.isPunctuation) {
             root = addMark(
               root,
-              lifted.mapping.invert().map(wordPos),
-              lifted.mapping.invert().map(wordPos + word.text.replace(/\n$/, "").length, -1),
+              cursor.map(wordPos, "end"),
+              cursor.map(
+                wordPos + word.text.replace(/\n$/, "").length,
+                "start"
+              ),
               new Mark("span", { id: `${chapterId}-s${i}-w${j}` })
             );
             j++;
           }
           wordPos += word.text.replace(/\n$/, "").length;
         }
+        cursor.reset(snapshot);
       }
       if (sentence.text.match(/\S/)) {
         root = addMark(
           root,
-          lifted.mapping.invert().map(pos),
-          lifted.mapping.invert().map(pos + sentence.text.replace(/\n$/, "").length, -1),
+          cursor.map(pos, "end"),
+          cursor.map(pos + sentence.text.replace(/\n$/, "").length, "start"),
           new Mark("span", { id: `${chapterId}-s${i}` })
         );
         i++;

package/dist/markup/model.cjs

@@ -23,6 +23,9 @@ __export(model_exports, {
   Node: () => Node,
   NoterefNode: () => NoterefNode,
   Root: () => Root,
+  RubyNode: () => RubyNode,
+  RubyParenthesisNode: () => RubyParenthesisNode,
+  RubyTextNode: () => RubyTextNode,
   TextNode: () => TextNode,
   descendants: () => descendants
 });
@@ -235,6 +238,12 @@ class NoterefNode extends Node {
 }
 class FootnoteNode extends Node {
 }
+class RubyParenthesisNode extends Node {
+}
+class RubyTextNode extends Node {
+}
+class RubyNode extends Node {
+}
 class Mark {
   constructor(tagName, attrs = {}) {
     this.tagName = tagName;
@@ -300,6 +309,9 @@ function descendants(node, cb, pos = 0) {
   Node,
   NoterefNode,
   Root,
+  RubyNode,
+  RubyParenthesisNode,
+  RubyTextNode,
   TextNode,
   descendants
 });

package/dist/markup/model.d.cts

@@ -1,2 +1,2 @@
 import '@storyteller-platform/epub';
-export { F as FootnoteNode, M as Mark, N as Node, b as NoterefNode, R as Root, T as TextNode, d as descendants } from '../model-Bv3yPEdd.cjs';
+export { F as FootnoteNode, M as Mark, N as Node, b as NoterefNode, R as Root, e as RubyNode, c as RubyParenthesisNode, d as RubyTextNode, T as TextNode, f as descendants } from '../model-CZ2mMHJO.cjs';

package/dist/markup/model.d.ts

@@ -1,2 +1,2 @@
 import '@storyteller-platform/epub';
-export { F as FootnoteNode, M as Mark, N as Node, b as NoterefNode, R as Root, T as TextNode, d as descendants } from '../model-Bv3yPEdd.js';
+export { F as FootnoteNode, M as Mark, N as Node, b as NoterefNode, R as Root, e as RubyNode, c as RubyParenthesisNode, d as RubyTextNode, T as TextNode, f as descendants } from '../model-CZ2mMHJO.js';

package/dist/markup/model.js

@@ -207,6 +207,12 @@ class NoterefNode extends Node {
 }
 class FootnoteNode extends Node {
 }
+class RubyParenthesisNode extends Node {
+}
+class RubyTextNode extends Node {
+}
+class RubyNode extends Node {
+}
 class Mark {
   constructor(tagName, attrs = {}) {
     this.tagName = tagName;
@@ -271,6 +277,9 @@ export {
   Node,
   NoterefNode,
   Root,
+  RubyNode,
+  RubyParenthesisNode,
+  RubyTextNode,
   TextNode,
   descendants
 };

package/dist/markup/parseDom.cjs

@@ -81,6 +81,15 @@ class Parser {
       );
       return footnoteNode;
     }
+    if (tagName === "ruby") {
+      return new import_model.RubyNode(tagName, attrs, blockChildren, marks);
+    }
+    if (tagName === "rt") {
+      return new import_model.RubyTextNode(tagName, attrs, blockChildren, marks);
+    }
+    if (tagName === "rp") {
+      return new import_model.RubyParenthesisNode(tagName, attrs, blockChildren, marks);
+    }
     if (import_semantics.BLOCKS.includes(tagName)) {
       return new import_model.Node(tagName, attrs, blockChildren, marks);
     }

package/dist/markup/parseDom.d.cts

@@ -1,5 +1,5 @@
 import { ParsedXml } from '@storyteller-platform/epub';
-import { R as Root, N as Node } from '../model-Bv3yPEdd.cjs';
+import { R as Root, N as Node } from '../model-CZ2mMHJO.cjs';
 
 declare function parseDom(xml: ParsedXml): Root;
 declare function findFootnotePairs(root: Root | Node): Map<number, number>;

package/dist/markup/parseDom.d.ts

@@ -1,5 +1,5 @@
 import { ParsedXml } from '@storyteller-platform/epub';
-import { R as Root, N as Node } from '../model-Bv3yPEdd.js';
+import { R as Root, N as Node } from '../model-CZ2mMHJO.js';
 
 declare function parseDom(xml: ParsedXml): Root;
 declare function findFootnotePairs(root: Root | Node): Map<number, number>;

package/dist/markup/parseDom.js

@@ -6,6 +6,9 @@ import {
   Node,
   NoterefNode,
   Root,
+  RubyNode,
+  RubyParenthesisNode,
+  RubyTextNode,
   TextNode,
   descendants
 } from "./model.js";
@@ -66,6 +69,15 @@ class Parser {
       );
       return footnoteNode;
     }
+    if (tagName === "ruby") {
+      return new RubyNode(tagName, attrs, blockChildren, marks);
+    }
+    if (tagName === "rt") {
+      return new RubyTextNode(tagName, attrs, blockChildren, marks);
+    }
+    if (tagName === "rp") {
+      return new RubyParenthesisNode(tagName, attrs, blockChildren, marks);
+    }
     if (BLOCKS.includes(tagName)) {
       return new Node(tagName, attrs, blockChildren, marks);
     }

package/dist/markup/resolvedPos.d.cts

@@ -1,2 +1,2 @@
-export { a as ResolvedPos } from '../model-Bv3yPEdd.cjs';
+export { a as ResolvedPos } from '../model-CZ2mMHJO.cjs';
 import '@storyteller-platform/epub';

package/dist/markup/resolvedPos.d.ts

@@ -1,2 +1,2 @@
-export { a as ResolvedPos } from '../model-Bv3yPEdd.js';
+export { a as ResolvedPos } from '../model-CZ2mMHJO.js';
 import '@storyteller-platform/epub';

package/dist/markup/serializeDom.d.cts

@@ -1,5 +1,5 @@
 import { ParsedXml } from '@storyteller-platform/epub';
-import { R as Root } from '../model-Bv3yPEdd.cjs';
+import { R as Root } from '../model-CZ2mMHJO.cjs';
 
 declare function serializeDom(doc: Root): ParsedXml;
 

package/dist/markup/serializeDom.d.ts

@@ -1,5 +1,5 @@
 import { ParsedXml } from '@storyteller-platform/epub';
-import { R as Root } from '../model-Bv3yPEdd.js';
+import { R as Root } from '../model-CZ2mMHJO.js';
 
 declare function serializeDom(doc: Root): ParsedXml;