@helloao/cli 0.0.17 → 0.0.19

package/dist/cjs/cli.cjs

@@ -12330,7 +12330,10 @@ var chapterHeadingSchema = external_exports.object({
 });
 var verseSchema = external_exports.object({
   type: external_exports.literal("text"),
-  id: external_exports.string()
+  id: external_exports.string(),
+  bookCode: external_exports.string().optional(),
+  chapter: external_exports.number().optional(),
+  verse: external_exports.number().optional()
 });
 var paratextSchema = external_exports.object({
   type: external_exports.literal("paratext"),
@@ -12389,11 +12392,11 @@ var CodexParser = class {
       }
       chapter.content.push(...content);
     }
-    function addReference(ref, content) {
-      addChapterContent(ref.chapter, [
+    function addReference(ref2, content) {
+      addChapterContent(ref2.chapter, [
         {
           type: "verse",
-          number: ref.verse,
+          number: ref2.verse,
           content
         }
       ]);
@@ -12407,6 +12410,24 @@ var CodexParser = class {
         content: [content]
       };
     }
+    function addLineBreaks(lines2) {
+      return lines2.reduce(
+        (prev, current) => {
+          if (prev.length === 0) return [current];
+          else
+            return [
+              ...prev,
+              {
+                lineBreak: true
+              },
+              current
+            ];
+        },
+        []
+      );
+    }
+    let previousReference = null;
+    let lines = [];
     for (let cell of data.cells) {
       if (cell.languageId === "html" && cell.value) {
         if (!cell.metadata) continue;
@@ -12414,31 +12435,57 @@ var CodexParser = class {
         if (!metadataResult.success) continue;
         const metadata = metadataResult.data;
         if (metadata.type === "text") {
-          const reference = parseVerseReference(metadata.id);
-          if (!reference)
-            throw new Error("Could not find verse reference.");
+          let reference = parseVerseReference(metadata.id);
+          if (!reference) {
+            if (metadata.bookCode && metadata.chapter) {
+              const bookId = getBookId(metadata.bookCode);
+              if (!bookId) {
+                throw new Error(
+                  "Could not find book ID for code: " + metadata.bookCode
+                );
+              }
+              if (metadata.verse) {
+                reference = {
+                  book: bookId,
+                  chapter: metadata.chapter,
+                  verse: metadata.verse
+                };
+              } else if (previousReference?.verse) {
+                if (previousReference.chapter !== metadata.chapter || previousReference.book !== bookId) {
+                  throw new Error(
+                    "Cannot infer verse number for non-consecutive verse reference."
+                  );
+                }
+                reference = {
+                  book: bookId,
+                  chapter: metadata.chapter,
+                  verse: previousReference.verse
+                };
+              } else {
+                throw new Error(
+                  "Could not find verse reference in metadata."
+                );
+              }
+            } else {
+              throw new Error(
+                "Could not find verse reference in metadata."
+              );
+            }
+          }
+          if (previousReference && (reference.book !== previousReference.book || reference.chapter !== previousReference.chapter || reference.verse !== previousReference.verse)) {
+            addReference(previousReference, addLineBreaks(lines));
+            lines = [];
+          }
+          previousReference = reference;
           if (!root.id) root.id = reference.book;
           const content = stripHTML(cell.value);
-          const lines = content.split("\n").reduce(
-            (prev, current) => {
-              if (prev.length === 0) return [current];
-              else
-                return [
-                  ...prev,
-                  {
-                    lineBreak: true
-                  },
-                  current
-                ];
-            },
-            []
-          );
-          addReference(reference, lines);
+          const newLines = content.split("\n");
+          lines.push(...newLines);
         } else if (metadata.type === "paratext") {
           const reference = parseVerseReference(`${metadata.id}:1`);
           if (reference) {
             const content = stripHTML(cell.value);
-            const lines = content.split("\n").reduce((prev, current) => {
+            const lines2 = content.split("\n").reduce((prev, current) => {
               if (prev.length === 0)
                 return [toHeading(current)];
               else
@@ -12450,7 +12497,7 @@ var CodexParser = class {
                   toHeading(current)
                 ];
             }, []);
-            lines.forEach(
+            lines2.forEach(
               (line) => addChapterContent(reference.chapter, [line])
             );
           } else {
@@ -12468,6 +12515,9 @@ var CodexParser = class {
         }
       }
     }
+    if (previousReference) {
+      addReference(previousReference, addLineBreaks(lines));
+    }
     for (let chapter of chapters.values()) {
       root.content.push(chapter);
     }

package/dist/cjs/index.cjs

@@ -11778,7 +11778,10 @@ var chapterHeadingSchema = external_exports.object({
 });
 var verseSchema = external_exports.object({
   type: external_exports.literal("text"),
-  id: external_exports.string()
+  id: external_exports.string(),
+  bookCode: external_exports.string().optional(),
+  chapter: external_exports.number().optional(),
+  verse: external_exports.number().optional()
 });
 var paratextSchema = external_exports.object({
   type: external_exports.literal("paratext"),
@@ -11837,11 +11840,11 @@ var CodexParser = class {
       }
       chapter.content.push(...content);
     }
-    function addReference(ref, content) {
-      addChapterContent(ref.chapter, [
+    function addReference(ref2, content) {
+      addChapterContent(ref2.chapter, [
         {
           type: "verse",
-          number: ref.verse,
+          number: ref2.verse,
           content
         }
       ]);
@@ -11855,6 +11858,24 @@ var CodexParser = class {
         content: [content]
       };
     }
+    function addLineBreaks(lines2) {
+      return lines2.reduce(
+        (prev, current) => {
+          if (prev.length === 0) return [current];
+          else
+            return [
+              ...prev,
+              {
+                lineBreak: true
+              },
+              current
+            ];
+        },
+        []
+      );
+    }
+    let previousReference = null;
+    let lines = [];
     for (let cell of data.cells) {
       if (cell.languageId === "html" && cell.value) {
         if (!cell.metadata) continue;
@@ -11862,31 +11883,57 @@ var CodexParser = class {
         if (!metadataResult.success) continue;
         const metadata = metadataResult.data;
         if (metadata.type === "text") {
-          const reference = parseVerseReference(metadata.id);
-          if (!reference)
-            throw new Error("Could not find verse reference.");
+          let reference = parseVerseReference(metadata.id);
+          if (!reference) {
+            if (metadata.bookCode && metadata.chapter) {
+              const bookId = getBookId(metadata.bookCode);
+              if (!bookId) {
+                throw new Error(
+                  "Could not find book ID for code: " + metadata.bookCode
+                );
+              }
+              if (metadata.verse) {
+                reference = {
+                  book: bookId,
+                  chapter: metadata.chapter,
+                  verse: metadata.verse
+                };
+              } else if (previousReference?.verse) {
+                if (previousReference.chapter !== metadata.chapter || previousReference.book !== bookId) {
+                  throw new Error(
+                    "Cannot infer verse number for non-consecutive verse reference."
+                  );
+                }
+                reference = {
+                  book: bookId,
+                  chapter: metadata.chapter,
+                  verse: previousReference.verse
+                };
+              } else {
+                throw new Error(
+                  "Could not find verse reference in metadata."
+                );
+              }
+            } else {
+              throw new Error(
+                "Could not find verse reference in metadata."
+              );
+            }
+          }
+          if (previousReference && (reference.book !== previousReference.book || reference.chapter !== previousReference.chapter || reference.verse !== previousReference.verse)) {
+            addReference(previousReference, addLineBreaks(lines));
+            lines = [];
+          }
+          previousReference = reference;
           if (!root.id) root.id = reference.book;
           const content = stripHTML(cell.value);
-          const lines = content.split("\n").reduce(
-            (prev, current) => {
-              if (prev.length === 0) return [current];
-              else
-                return [
-                  ...prev,
-                  {
-                    lineBreak: true
-                  },
-                  current
-                ];
-            },
-            []
-          );
-          addReference(reference, lines);
+          const newLines = content.split("\n");
+          lines.push(...newLines);
         } else if (metadata.type === "paratext") {
           const reference = parseVerseReference(`${metadata.id}:1`);
           if (reference) {
             const content = stripHTML(cell.value);
-            const lines = content.split("\n").reduce((prev, current) => {
+            const lines2 = content.split("\n").reduce((prev, current) => {
               if (prev.length === 0)
                 return [toHeading(current)];
               else
@@ -11898,7 +11945,7 @@ var CodexParser = class {
                   toHeading(current)
                 ];
             }, []);
-            lines.forEach(
+            lines2.forEach(
               (line) => addChapterContent(reference.chapter, [line])
             );
           } else {
@@ -11916,6 +11963,9 @@ var CodexParser = class {
         }
       }
     }
+    if (previousReference) {
+      addReference(previousReference, addLineBreaks(lines));
+    }
     for (let chapter of chapters.values()) {
       root.content.push(chapter);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@helloao/cli",
-  "version": "0.0.17",
+  "version": "0.0.19",
   "description": "A CLI and related tools for managing HelloAO's Free Bible API",
   "main": "./dist/cjs/index.cjs",
   "module": "./dist/esm/index.js",
@@ -43,7 +43,7 @@
     "all-iso-language-codes": "1.0.17",
     "papaparse": "5.4.1",
     "luxon": "3.5.0",
-    "@helloao/tools": "0.0.17"
+    "@helloao/tools": "0.0.19"
   },
   "files": [
     "/README.md",