proskomma-core 0.10.7 → 0.10.10

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.7";
+const version = "0.10.10";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -18834,19 +18834,37 @@ const unsuccinctifyItemsWithScriptureCV = (docSet, block2, cv, options2) => {
     }
   };
   const ret = [];
-  for (const item of docSet.unsuccinctifyItems(
-    block2.c,
-    {},
-    block2.nt.nByte(0)
-  )) {
-    if (item[0] === "scope" && item[1] === "start") {
-      openScopes.add(item[2]);
-    }
-    if (itemMatchesCV() && itemInOptions(item)) {
-      ret.push(item);
+  if (options2.excludeScopeTypes) {
+    for (const item of docSet.unsuccinctifyItems(
+      block2.c,
+      options2,
+      block2.nt.nByte(0)
+    )) {
+      if (item[0] === "scope" && item[1] === "start") {
+        openScopes.add(item[2]);
+      }
+      if (itemMatchesCV() && itemInOptions(item)) {
+        ret.push(item);
+      }
+      if (item[0] === "scope" && item[1] === "end") {
+        openScopes.delete(item[2]);
+      }
     }
-    if (item[0] === "scope" && item[1] === "end") {
-      openScopes.delete(item[2]);
+  } else {
+    for (const item of docSet.unsuccinctifyItems(
+      block2.c,
+      {},
+      block2.nt.nByte(0)
+    )) {
+      if (item[0] === "scope" && item[1] === "start") {
+        openScopes.add(item[2]);
+      }
+      if (itemMatchesCV() && itemInOptions(item)) {
+        ret.push(item);
+      }
+      if (item[0] === "scope" && item[1] === "end") {
+        openScopes.delete(item[2]);
+      }
     }
   }
   return ret;
@@ -34022,19 +34040,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 +34067,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 +34129,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 +39515,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]));
+      }
     }
   },
   {
@@ -44249,8 +44275,14 @@ const blockResolvers = {
       return context.docSet.unsuccinctifyItemsWithScriptureCV(
         root,
         args.withScriptureCV,
-        {},
-        args.includeContext || false
+        args.excludeScopeTypes ? {
+          tokens: true,
+          scopes: true,
+          grafts: true,
+          excludeScopeTypes: args.excludeScopeTypes || [],
+          anyScope: args.anyScope || false,
+          includeContext: args.includeContext || false
+        } : {}
       );
     } else {
       return context.docSet.unsuccinctifyPrunedItems(root, {
@@ -50515,7 +50547,10 @@ class Proskomma {
     if (!bookCodes2 || bookCodes2.length === 0) {
       throw new Error("bookCodes argument must be present and contain at least one element in augmentSuccinctDocSet");
     }
-    const selectDocs = (dId) => bookCodes2.includes(succinctOb.docs[dId]).headers.bookCode;
+    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`);
     }

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.7";
+const version = "0.10.10";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -18832,19 +18832,37 @@ const unsuccinctifyItemsWithScriptureCV = (docSet, block2, cv, options2) => {
     }
   };
   const ret = [];
-  for (const item of docSet.unsuccinctifyItems(
-    block2.c,
-    {},
-    block2.nt.nByte(0)
-  )) {
-    if (item[0] === "scope" && item[1] === "start") {
-      openScopes.add(item[2]);
-    }
-    if (itemMatchesCV() && itemInOptions(item)) {
-      ret.push(item);
+  if (options2.excludeScopeTypes) {
+    for (const item of docSet.unsuccinctifyItems(
+      block2.c,
+      options2,
+      block2.nt.nByte(0)
+    )) {
+      if (item[0] === "scope" && item[1] === "start") {
+        openScopes.add(item[2]);
+      }
+      if (itemMatchesCV() && itemInOptions(item)) {
+        ret.push(item);
+      }
+      if (item[0] === "scope" && item[1] === "end") {
+        openScopes.delete(item[2]);
+      }
     }
-    if (item[0] === "scope" && item[1] === "end") {
-      openScopes.delete(item[2]);
+  } else {
+    for (const item of docSet.unsuccinctifyItems(
+      block2.c,
+      {},
+      block2.nt.nByte(0)
+    )) {
+      if (item[0] === "scope" && item[1] === "start") {
+        openScopes.add(item[2]);
+      }
+      if (itemMatchesCV() && itemInOptions(item)) {
+        ret.push(item);
+      }
+      if (item[0] === "scope" && item[1] === "end") {
+        openScopes.delete(item[2]);
+      }
     }
   }
   return ret;
@@ -34020,19 +34038,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 +34065,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 +34127,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 +39513,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]));
+      }
     }
   },
   {
@@ -44247,8 +44273,14 @@ const blockResolvers = {
       return context.docSet.unsuccinctifyItemsWithScriptureCV(
         root,
         args.withScriptureCV,
-        {},
-        args.includeContext || false
+        args.excludeScopeTypes ? {
+          tokens: true,
+          scopes: true,
+          grafts: true,
+          excludeScopeTypes: args.excludeScopeTypes || [],
+          anyScope: args.anyScope || false,
+          includeContext: args.includeContext || false
+        } : {}
       );
     } else {
       return context.docSet.unsuccinctifyPrunedItems(root, {
@@ -50513,7 +50545,10 @@ class Proskomma {
     if (!bookCodes2 || bookCodes2.length === 0) {
       throw new Error("bookCodes argument must be present and contain at least one element in augmentSuccinctDocSet");
     }
-    const selectDocs = (dId) => bookCodes2.includes(succinctOb.docs[dId]).headers.bookCode;
+    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`);
     }

package/package.json

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