proskomma-core 0.10.5 → 0.10.7

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.5";
+const version = "0.10.7";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -16003,8 +16003,8 @@ const scripts = {
   build: "rm -fr dist && vite build",
   test: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
   "win:test": 'rm -fr dist && vite build && set PKSRC=dist&& bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
-  rawTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/*.cjs"',
-  oneTest: 'rm -fr dist && vite build && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
+  rawTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs"',
+  oneTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
   prepublishOnly: "npm run build"
 };
 const repository = {
@@ -16052,11 +16052,11 @@ const devDependencies = {
   "@babel/register": "^7.18.9",
   "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
   events: "^3.3.0",
-  parcel: "^2.8.3",
+  parcel: "^2.12.0",
   process: "^0.11.10",
   "stream-browserify": "^3.0.0",
   "tap-summary": "^4.0.0",
-  tape: "^5.6.0",
+  tape: "^5.7.5",
   typescript: "^4.9.5",
   vite: "^4.1.4"
 };
@@ -38478,8 +38478,20 @@ const Sequence = class {
     const canBeEmpty = ["blockTag/b", "blockTag/ib"].concat(customCanBeEmpty);
     const emptyBlocks = [];
     let changed = false;
+    const emptyMilestones = (blockItems) => {
+      const milestoneScopes = blockItems.filter((i) => i.type === "scope" && i.payload.startsWith("milestone"));
+      const startMilestones = /* @__PURE__ */ new Set([]);
+      for (const milestoneScope of milestoneScopes) {
+        if (milestoneScope.subType === "start") {
+          startMilestones.add(milestoneScope.payload);
+        } else if (startMilestones.has(milestoneScope.payload)) {
+          return true;
+        }
+      }
+      return false;
+    };
     for (const blockRecord of this.blocks.entries()) {
-      if (blockRecord[1].tokens().length === 0 && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
+      if (blockRecord[1].tokens().length === 0 && !emptyMilestones(blockRecord[1].items) && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
         emptyBlocks.push(blockRecord);
       }
     }
@@ -50464,11 +50476,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);
@@ -50491,13 +50503,28 @@ 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) => bookCodes2.includes(succinctOb.docs[dId]).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.5";
+const version = "0.10.7";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -16001,8 +16001,8 @@ const scripts = {
   build: "rm -fr dist && vite build",
   test: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
   "win:test": 'rm -fr dist && vite build && set PKSRC=dist&& bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
-  rawTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/*.cjs"',
-  oneTest: 'rm -fr dist && vite build && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
+  rawTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs"',
+  oneTest: 'rm -fr dist && vite build && export PKSRC=dist && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
   prepublishOnly: "npm run build"
 };
 const repository = {
@@ -16050,11 +16050,11 @@ const devDependencies = {
   "@babel/register": "^7.18.9",
   "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
   events: "^3.3.0",
-  parcel: "^2.8.3",
+  parcel: "^2.12.0",
   process: "^0.11.10",
   "stream-browserify": "^3.0.0",
   "tap-summary": "^4.0.0",
-  tape: "^5.6.0",
+  tape: "^5.7.5",
   typescript: "^4.9.5",
   vite: "^4.1.4"
 };
@@ -38476,8 +38476,20 @@ const Sequence = class {
     const canBeEmpty = ["blockTag/b", "blockTag/ib"].concat(customCanBeEmpty);
     const emptyBlocks = [];
     let changed = false;
+    const emptyMilestones = (blockItems) => {
+      const milestoneScopes = blockItems.filter((i) => i.type === "scope" && i.payload.startsWith("milestone"));
+      const startMilestones = /* @__PURE__ */ new Set([]);
+      for (const milestoneScope of milestoneScopes) {
+        if (milestoneScope.subType === "start") {
+          startMilestones.add(milestoneScope.payload);
+        } else if (startMilestones.has(milestoneScope.payload)) {
+          return true;
+        }
+      }
+      return false;
+    };
     for (const blockRecord of this.blocks.entries()) {
-      if (blockRecord[1].tokens().length === 0 && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
+      if (blockRecord[1].tokens().length === 0 && !emptyMilestones(blockRecord[1].items) && !canBeEmpty.includes(blockRecord[1].bs.payload)) {
         emptyBlocks.push(blockRecord);
       }
     }
@@ -50462,11 +50474,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);
@@ -50489,13 +50501,28 @@ 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) => bookCodes2.includes(succinctOb.docs[dId]).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.5",
+  "version": "0.10.7",
   "description": "A Scripture Runtime Engine",
   "files": [
     "dist"
@@ -17,8 +17,8 @@
     "build": "rm -fr dist && vite build",
     "test": "rm -fr dist && vite build && export PKSRC=dist && bash -c \"tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js\"",
     "win:test": "rm -fr dist && vite build && set PKSRC=dist&& bash -c \"tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js\"",
-    "rawTest": "rm -fr dist && vite build && export PKSRC=dist && bash -c \"tape -r @babel/register test/code/*.cjs\"",
-    "oneTest": "rm -fr dist && vite build && bash -c \"tape -r @babel/register test/code/$TESTSCRIPT.cjs\"",
+    "rawTest": "rm -fr dist && vite build && export PKSRC=dist && bash -c \"tape -r @babel/register test/code/**/*.cjs\"",
+    "oneTest": "rm -fr dist && vite build && export PKSRC=dist && bash -c \"tape -r @babel/register test/code/$TESTSCRIPT.cjs\"",
     "prepublishOnly": "npm run build"
   },
   "repository": {
@@ -66,11 +66,11 @@
     "@babel/register": "^7.18.9",
     "@esbuild-plugins/node-globals-polyfill": "^0.2.3",
     "events": "^3.3.0",
-    "parcel": "^2.8.3",
+    "parcel": "^2.12.0",
     "process": "^0.11.10",
     "stream-browserify": "^3.0.0",
     "tap-summary": "^4.0.0",
-    "tape": "^5.6.0",
+    "tape": "^5.7.5",
     "typescript": "^4.9.5",
     "vite": "^4.1.4"
   }