@storyteller-platform/align 0.1.18 → 0.1.20

package/dist/markup/serializeDom.js

@@ -1,63 +1,91 @@
 import "../chunk-BIEQXUOY.js";
 import { Epub } from "@storyteller-platform/epub";
 import { TextNode } from "./model.js";
-function serializeDom(doc) {
-  return doc.children.map((child) => serializeDomNode(child));
-}
-function serializeDomNode(node) {
-  if (node instanceof TextNode) {
-    return Epub.createXmlTextNode(node.text);
+class Serializer {
+  constructor(doc) {
+    this.doc = doc;
   }
-  return Epub.createXmlElement(
-    node.tagName,
-    node.attrs,
-    serializeDomNodes(node.children)
-  );
-}
-function serializeDomNodes(nodes) {
-  const partitioned = nodes.reduce((acc, child) => {
-    const lastPartition = acc.at(-1);
-    if (!lastPartition) {
-      return [[child]];
-    }
-    const lastChild = lastPartition.at(-1);
-    if (!lastChild) {
-      return [...acc.slice(0, acc.length), [child]];
+  serializedIds = /* @__PURE__ */ new Set();
+  serialize() {
+    return this.doc.children.map((child) => this.serializeDomNode(child));
+  }
+  serializeDomNode(node) {
+    if (node instanceof TextNode) {
+      return Epub.createXmlTextNode(node.text);
     }
-    const childFirstMark = child.marks[0];
-    const lastChildFirstMark = lastChild.marks[0];
-    if (childFirstMark === lastChildFirstMark || childFirstMark?.eq(lastChildFirstMark)) {
-      return [
-        ...acc.slice(0, acc.length - 1),
-        [...lastPartition.slice(0, lastPartition.length), child]
-      ];
+    let attrs = node.attrs;
+    const id = node.attrs["id"];
+    if (id) {
+      if (this.serializedIds.has(id)) {
+        const { id: _id, ...remaining } = node.attrs;
+        attrs = remaining;
+      } else {
+        this.serializedIds.add(id);
+      }
     }
-    return [...acc, [child]];
-  }, []);
-  const xmlChildren = [];
-  for (const partition of partitioned) {
-    xmlChildren.push(...serializePartition(partition));
+    return Epub.createXmlElement(
+      node.tagName,
+      attrs,
+      this.serializeDomNodes(node.children)
+    );
   }
-  return xmlChildren;
-}
-function serializePartition(nodes) {
-  const firstChild = nodes[0];
-  if (!firstChild) return [];
-  const firstMark = firstChild.marks[0];
-  if (!firstMark) {
-    return nodes.map((child) => serializeDomNode(child));
+  serializeDomNodes(nodes) {
+    const partitioned = nodes.reduce((acc, child) => {
+      const lastPartition = acc.at(-1);
+      if (!lastPartition) {
+        return [[child]];
+      }
+      const lastChild = lastPartition.at(-1);
+      if (!lastChild) {
+        return [...acc.slice(0, acc.length), [child]];
+      }
+      const childFirstMark = child.marks[0];
+      const lastChildFirstMark = lastChild.marks[0];
+      if (childFirstMark === lastChildFirstMark || childFirstMark?.eq(lastChildFirstMark)) {
+        return [
+          ...acc.slice(0, acc.length - 1),
+          [...lastPartition.slice(0, lastPartition.length), child]
+        ];
+      }
+      return [...acc, [child]];
+    }, []);
+    const xmlChildren = [];
+    for (const partition of partitioned) {
+      xmlChildren.push(...this.serializePartition(partition));
+    }
+    return xmlChildren;
   }
-  return [
-    Epub.createXmlElement(
-      firstMark.tagName,
-      firstMark.attrs,
-      serializeDomNodes(
-        nodes.map((node) => node.copy({ marks: node.marks.slice(1) }))
+  serializePartition(nodes) {
+    const firstChild = nodes[0];
+    if (!firstChild) return [];
+    const firstMark = firstChild.marks[0];
+    if (!firstMark) {
+      return nodes.map((child) => this.serializeDomNode(child));
+    }
+    let attrs = firstMark.attrs;
+    const id = firstMark.attrs["id"];
+    if (id) {
+      if (this.serializedIds.has(id)) {
+        const { id: _id, ...remaining } = firstMark.attrs;
+        attrs = remaining;
+      } else {
+        this.serializedIds.add(id);
+      }
+    }
+    return [
+      Epub.createXmlElement(
+        firstMark.tagName,
+        attrs,
+        this.serializeDomNodes(
+          nodes.map((node) => node.copy({ marks: node.marks.slice(1) }))
+        )
       )
-    )
-  ];
+    ];
+  }
+}
+function serializeDom(doc) {
+  return new Serializer(doc).serialize();
 }
 export {
-  serializeDom,
-  serializeDomNode
+  serializeDom
 };

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@storyteller-platform/align",
-  "version": "0.1.18",
+  "version": "0.1.20",
   "description": "A library and CLI for automatically aligning audiobooks and EPUBs to produce Media Overlays",
   "author": "Shane Friedman",
   "license": "MIT",
@@ -61,8 +61,8 @@
     "@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/transliteration": "^3.1.1",
+    "@storyteller-platform/ghost-story": "^0.1.7",
+    "@storyteller-platform/transliteration": "^3.1.2",
     "chalk": "^5.4.1",
     "cli-progress": "^3.12.0",
     "esbuild": "^0.27.3",