proskomma-core 0.10.6 → 0.10.9

package/dist/index.js

@@ -15986,7 +15986,7 @@ var bitset = {
 })(bitset, bitsetExports);
 const BitSet = /* @__PURE__ */ getDefaultExportFromCjs(bitsetExports);
 const name = "proskomma-core";
-const version = "0.10.6";
+const version = "0.10.9";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -34022,19 +34022,19 @@ const lexingRegexes = [
     XRegExp('([ \\t]*\\|?[ \\t]*([A-Za-z0-9\\-]+)="([^"]*)"[ \\t]?)')
   ],
   ["attribute", "defaultAttribute", XRegExp("([ \\t]*\\|[ \\t]*([^\\|\\\\]*))")],
-  ["milestone", "emptyMilestone", XRegExp("(\\\\([a-z1-9]+)\\\\[*])")],
+  ["milestone", "emptyMilestone", XRegExp('(\\\\([a-z1-9]+)([ \\t]*\\|[ \\t]*[a-z1-9]+="[^\\|\\\\"]*")*\\\\[*])')],
   ["milestone", "startMilestoneTag", XRegExp("(\\\\([a-z1-9]+)-([se]))")],
   ["milestone", "endMilestoneMarker", XRegExp("(\\\\([*]))")],
   ["tag", "endTag", XRegExp("(\\\\([+]?[a-z\\-]+)([1-9]?(-([1-9]))?)[*])")],
   ["tag", "startTag", XRegExp("(\\\\([+]?[a-z\\-]+)([1-9]?(-([1-9]))?)[ \\t]?)")],
   ["bad", "bareSlash", XRegExp("(\\\\)")],
   ["printable", "eol", XRegExp("([ \\t]*[\\r\\n]+[ \\t]*)")],
-  ["break", "noBreakSpace", XRegExp("~")],
+  // ['break', 'noBreakSpace', xre('~')],
   ["break", "softLineBreak", XRegExp("//")],
   [
     "printable",
     "wordLike",
-    XRegExp("([\\p{Letter}\\p{Number}\\p{Mark}\\u2060]{1,127})")
+    XRegExp("([\\p{Letter}\\p{Number}\\p{Mark}\\u2060~]{1,127})")
   ],
   ["printable", "lineSpace", XRegExp("([\\p{Separator}	]{1,127})")],
   [
@@ -34049,7 +34049,7 @@ const lexingRegexes = [
 const mainRegex = XRegExp.union(lexingRegexes.map((x) => x[2]));
 const makePrintable = (subclass, matchedBits) => ({
   subclass,
-  printValue: matchedBits[0]
+  printValue: matchedBits[0].replace(/~/g, " ")
 });
 const makeChapter = (subclass, matchedBits) => ({
   subclass,
@@ -34111,6 +34111,12 @@ const makeMilestone = (subclass, matchedBits) => {
     ret.tagName = matchedBits[2];
     if (subclass === "emptyMilestone") {
       ret.printValue = `\\${ret.tagName}\\*`;
+      ret.attributes = matchedBits[1] ? matchedBits[1].split("|").slice(1).map((a) => a.split("=")).map(
+        (aa) => [
+          aa[0],
+          aa[1].replace(/"/g, "").replace(/[\\*]/g, "")
+        ]
+      ) : [];
     } else {
       ret.printValue = `\\${ret.tagName}`;
       ret.sOrE = matchedBits[3];
@@ -39491,7 +39497,9 @@ const specs = (pt) => [
     // EMPTY MILESTONE - add open and close scope
     contexts: [["emptyMilestone"]],
     parser: {
-      during: (parser, pt2) => parser.addEmptyMilestone(labelForScope$2("milestone", [pt2.tagName]))
+      during: (parser, pt2) => {
+        parser.addEmptyMilestone(labelForScope$2("milestone", [pt2.tagName]));
+      }
     }
   },
   {
@@ -50476,11 +50484,11 @@ class Proskomma {
     this.docSets[docSetId].docIds.push(doc.id);
     this.docSets[docSetId].buildEnumIndexes();
   }
-  loadSuccinctDocSet(succinctOb) {
+  loadSuccinctDocSet(succinctOb, bookCodes2) {
     const succinctId = succinctOb.id;
-    if (succinctId in this.docSets) {
+    if (succinctId in this.docSets && !bookCodes2) {
       throw new Error(
-        `Attempting to succinct load docSet ${succinctId} which is already loaded`
+        `Attempting to succinct load docSet ${succinctId} which is already loaded, without bookCodes argument`
       );
     }
     const docSet = new DocSet(this, null, null, succinctOb);
@@ -50503,13 +50511,31 @@ class Proskomma {
     }
     docSet.buildPreEnums();
     const docs = [];
-    for (const docId of Object.keys(succinctOb.docs)) {
+    const selectDocs = (dId) => !bookCodes2 || bookCodes2.includes(succinctOb.docs[dId].headers.bookCode);
+    for (const docId of Object.keys(succinctOb.docs).filter(selectDocs)) {
       let doc = this.newDocumentFromSuccinct(docId, succinctOb);
       docs.push(doc);
     }
     docSet.preEnums = {};
     return docs;
   }
+  augmentSuccinctDocSet(succinctOb, bookCodes2) {
+    if (!bookCodes2 || bookCodes2.length === 0) {
+      throw new Error("bookCodes argument must be present and contain at least one element in augmentSuccinctDocSet");
+    }
+    const selectDocs = (dId) => {
+      const doc = succinctOb.docs[dId];
+      return bookCodes2.includes(doc.headers.bookCode);
+    };
+    if (!this.docSets[succinctOb.id]) {
+      throw new Error(`docSet id '${succinctOb.id}' not found in Proskomma when using augmentSuccinctDocSet. Load it first with optional bookCodes argument`);
+    }
+    for (const docId of Object.keys(succinctOb.docs).filter(selectDocs)) {
+      if (!this.documents[docId]) {
+        this.newDocumentFromSuccinct(docId, succinctOb);
+      }
+    }
+  }
   newDocumentFromSuccinct(docId, succinctOb) {
     const doc = new Document(this, succinctOb.id);
     doc.id = docId;

package/dist/index.mjs

@@ -15984,7 +15984,7 @@ var bitset = {
 })(bitset, bitsetExports);
 const BitSet = /* @__PURE__ */ getDefaultExportFromCjs(bitsetExports);
 const name = "proskomma-core";
-const version = "0.10.6";
+const version = "0.10.9";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -34020,19 +34020,19 @@ const lexingRegexes = [
     XRegExp('([ \\t]*\\|?[ \\t]*([A-Za-z0-9\\-]+)="([^"]*)"[ \\t]?)')
   ],
   ["attribute", "defaultAttribute", XRegExp("([ \\t]*\\|[ \\t]*([^\\|\\\\]*))")],
-  ["milestone", "emptyMilestone", XRegExp("(\\\\([a-z1-9]+)\\\\[*])")],
+  ["milestone", "emptyMilestone", XRegExp('(\\\\([a-z1-9]+)([ \\t]*\\|[ \\t]*[a-z1-9]+="[^\\|\\\\"]*")*\\\\[*])')],
   ["milestone", "startMilestoneTag", XRegExp("(\\\\([a-z1-9]+)-([se]))")],
   ["milestone", "endMilestoneMarker", XRegExp("(\\\\([*]))")],
   ["tag", "endTag", XRegExp("(\\\\([+]?[a-z\\-]+)([1-9]?(-([1-9]))?)[*])")],
   ["tag", "startTag", XRegExp("(\\\\([+]?[a-z\\-]+)([1-9]?(-([1-9]))?)[ \\t]?)")],
   ["bad", "bareSlash", XRegExp("(\\\\)")],
   ["printable", "eol", XRegExp("([ \\t]*[\\r\\n]+[ \\t]*)")],
-  ["break", "noBreakSpace", XRegExp("~")],
+  // ['break', 'noBreakSpace', xre('~')],
   ["break", "softLineBreak", XRegExp("//")],
   [
     "printable",
     "wordLike",
-    XRegExp("([\\p{Letter}\\p{Number}\\p{Mark}\\u2060]{1,127})")
+    XRegExp("([\\p{Letter}\\p{Number}\\p{Mark}\\u2060~]{1,127})")
   ],
   ["printable", "lineSpace", XRegExp("([\\p{Separator}	]{1,127})")],
   [
@@ -34047,7 +34047,7 @@ const lexingRegexes = [
 const mainRegex = XRegExp.union(lexingRegexes.map((x) => x[2]));
 const makePrintable = (subclass, matchedBits) => ({
   subclass,
-  printValue: matchedBits[0]
+  printValue: matchedBits[0].replace(/~/g, " ")
 });
 const makeChapter = (subclass, matchedBits) => ({
   subclass,
@@ -34109,6 +34109,12 @@ const makeMilestone = (subclass, matchedBits) => {
     ret.tagName = matchedBits[2];
     if (subclass === "emptyMilestone") {
       ret.printValue = `\\${ret.tagName}\\*`;
+      ret.attributes = matchedBits[1] ? matchedBits[1].split("|").slice(1).map((a) => a.split("=")).map(
+        (aa) => [
+          aa[0],
+          aa[1].replace(/"/g, "").replace(/[\\*]/g, "")
+        ]
+      ) : [];
     } else {
       ret.printValue = `\\${ret.tagName}`;
       ret.sOrE = matchedBits[3];
@@ -39489,7 +39495,9 @@ const specs = (pt) => [
     // EMPTY MILESTONE - add open and close scope
     contexts: [["emptyMilestone"]],
     parser: {
-      during: (parser, pt2) => parser.addEmptyMilestone(labelForScope$2("milestone", [pt2.tagName]))
+      during: (parser, pt2) => {
+        parser.addEmptyMilestone(labelForScope$2("milestone", [pt2.tagName]));
+      }
     }
   },
   {
@@ -50474,11 +50482,11 @@ class Proskomma {
     this.docSets[docSetId].docIds.push(doc.id);
     this.docSets[docSetId].buildEnumIndexes();
   }
-  loadSuccinctDocSet(succinctOb) {
+  loadSuccinctDocSet(succinctOb, bookCodes2) {
     const succinctId = succinctOb.id;
-    if (succinctId in this.docSets) {
+    if (succinctId in this.docSets && !bookCodes2) {
       throw new Error(
-        `Attempting to succinct load docSet ${succinctId} which is already loaded`
+        `Attempting to succinct load docSet ${succinctId} which is already loaded, without bookCodes argument`
       );
     }
     const docSet = new DocSet(this, null, null, succinctOb);
@@ -50501,13 +50509,31 @@ class Proskomma {
     }
     docSet.buildPreEnums();
     const docs = [];
-    for (const docId of Object.keys(succinctOb.docs)) {
+    const selectDocs = (dId) => !bookCodes2 || bookCodes2.includes(succinctOb.docs[dId].headers.bookCode);
+    for (const docId of Object.keys(succinctOb.docs).filter(selectDocs)) {
       let doc = this.newDocumentFromSuccinct(docId, succinctOb);
       docs.push(doc);
     }
     docSet.preEnums = {};
     return docs;
   }
+  augmentSuccinctDocSet(succinctOb, bookCodes2) {
+    if (!bookCodes2 || bookCodes2.length === 0) {
+      throw new Error("bookCodes argument must be present and contain at least one element in augmentSuccinctDocSet");
+    }
+    const selectDocs = (dId) => {
+      const doc = succinctOb.docs[dId];
+      return bookCodes2.includes(doc.headers.bookCode);
+    };
+    if (!this.docSets[succinctOb.id]) {
+      throw new Error(`docSet id '${succinctOb.id}' not found in Proskomma when using augmentSuccinctDocSet. Load it first with optional bookCodes argument`);
+    }
+    for (const docId of Object.keys(succinctOb.docs).filter(selectDocs)) {
+      if (!this.documents[docId]) {
+        this.newDocumentFromSuccinct(docId, succinctOb);
+      }
+    }
+  }
   newDocumentFromSuccinct(docId, succinctOb) {
     const doc = new Document(this, succinctOb.id);
     doc.id = docId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proskomma-core",
-  "version": "0.10.6",
+  "version": "0.10.9",
   "description": "A Scripture Runtime Engine",
   "files": [
     "dist"