proskomma-core 0.10.4 → 0.10.6

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.4";
+const version = "0.10.6";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -16001,10 +16001,10 @@ const exports$1 = {
 };
 const scripts = {
   build: "rm -fr dist && vite build",
-  test: 'export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
-  "win:test": 'set PKSRC=dist&& bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
-  rawTest: 'export PKSRC=dist && bash -c "tape -r @babel/register test/code/*.cjs"',
-  oneTest: 'bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
+  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 && 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);
       }
     }
@@ -44694,15 +44706,19 @@ const do_chapter_cv = (root, context, mainSequence, chapterN, includeContext) =>
   const ci = root.chapterIndex(chapterN);
   if (ci) {
     const block2 = mainSequence.blocks[ci.startBlock];
-    return [
-      [
-        updatedOpenScopes(
-          context.docSet.unsuccinctifyScopes(block2.os).map((s) => s[2]),
-          context.docSet.unsuccinctifyItems(block2.c, {}, 0, []).slice(0, ci.startItem + 1).filter((i) => i[0] === "scope")
-        ),
-        context.docSet.itemsByIndex(mainSequence, ci, includeContext || false).reduce((a, b) => a.concat([["token", "lineSpace", " "]].concat(b)))
-      ]
-    ];
+    if (block2) {
+      return [
+        [
+          updatedOpenScopes(
+            context.docSet.unsuccinctifyScopes(block2.os).map((s) => s[2]),
+            context.docSet.unsuccinctifyItems(block2.c, {}, 0, []).slice(0, ci.startItem + 1).filter((i) => i[0] === "scope")
+          ),
+          context.docSet.itemsByIndex(mainSequence, ci, includeContext || false).reduce((a, b) => a.concat([["token", "lineSpace", " "]].concat(b)))
+        ]
+      ];
+    } else {
+      return [];
+    }
   } else {
     return [];
   }
@@ -44771,8 +44787,8 @@ const do_chapter_verse_array = (root, context, mainSequence, chapterN, verses, i
   for (const [chapter, verse] of chapterVerses) {
     if (cvis[chapter]) {
       let retItems = [];
-      let firstStartBlock;
-      let firstStartItem;
+      let firstStartBlock = 0;
+      let firstStartItem = 0;
       if (cvis[chapter][verse]) {
         for (const ve of cvis[chapter][verse]) {
           if (!firstStartBlock) {
@@ -44786,13 +44802,13 @@ const do_chapter_verse_array = (root, context, mainSequence, chapterN, verses, i
           );
         }
         const block2 = documentMainSequence.blocks[firstStartBlock];
-        retItemGroups.push([
+        retItemGroups.push(block2 ? [
           updatedOpenScopes(
             docSet.unsuccinctifyScopes(block2.os).map((s) => s[2]),
             docSet.unsuccinctifyItems(block2.c, {}, 0, []).slice(0, firstStartItem + 1).filter((i) => i[0] === "scope")
           ),
           retItems
-        ]);
+        ] : []);
       }
     }
   }

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.4";
+const version = "0.10.6";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -15999,10 +15999,10 @@ const exports = {
 };
 const scripts = {
   build: "rm -fr dist && vite build",
-  test: 'export PKSRC=dist && bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
-  "win:test": 'set PKSRC=dist&& bash -c "tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js"',
-  rawTest: 'export PKSRC=dist && bash -c "tape -r @babel/register test/code/*.cjs"',
-  oneTest: 'bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
+  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 && 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);
       }
     }
@@ -44692,15 +44704,19 @@ const do_chapter_cv = (root, context, mainSequence, chapterN, includeContext) =>
   const ci = root.chapterIndex(chapterN);
   if (ci) {
     const block2 = mainSequence.blocks[ci.startBlock];
-    return [
-      [
-        updatedOpenScopes(
-          context.docSet.unsuccinctifyScopes(block2.os).map((s) => s[2]),
-          context.docSet.unsuccinctifyItems(block2.c, {}, 0, []).slice(0, ci.startItem + 1).filter((i) => i[0] === "scope")
-        ),
-        context.docSet.itemsByIndex(mainSequence, ci, includeContext || false).reduce((a, b) => a.concat([["token", "lineSpace", " "]].concat(b)))
-      ]
-    ];
+    if (block2) {
+      return [
+        [
+          updatedOpenScopes(
+            context.docSet.unsuccinctifyScopes(block2.os).map((s) => s[2]),
+            context.docSet.unsuccinctifyItems(block2.c, {}, 0, []).slice(0, ci.startItem + 1).filter((i) => i[0] === "scope")
+          ),
+          context.docSet.itemsByIndex(mainSequence, ci, includeContext || false).reduce((a, b) => a.concat([["token", "lineSpace", " "]].concat(b)))
+        ]
+      ];
+    } else {
+      return [];
+    }
   } else {
     return [];
   }
@@ -44769,8 +44785,8 @@ const do_chapter_verse_array = (root, context, mainSequence, chapterN, verses, i
   for (const [chapter, verse] of chapterVerses) {
     if (cvis[chapter]) {
       let retItems = [];
-      let firstStartBlock;
-      let firstStartItem;
+      let firstStartBlock = 0;
+      let firstStartItem = 0;
       if (cvis[chapter][verse]) {
         for (const ve of cvis[chapter][verse]) {
           if (!firstStartBlock) {
@@ -44784,13 +44800,13 @@ const do_chapter_verse_array = (root, context, mainSequence, chapterN, verses, i
           );
         }
         const block2 = documentMainSequence.blocks[firstStartBlock];
-        retItemGroups.push([
+        retItemGroups.push(block2 ? [
           updatedOpenScopes(
             docSet.unsuccinctifyScopes(block2.os).map((s) => s[2]),
             docSet.unsuccinctifyItems(block2.c, {}, 0, []).slice(0, firstStartItem + 1).filter((i) => i[0] === "scope")
           ),
           retItems
-        ]);
+        ] : []);
       }
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "proskomma-core",
-  "version": "0.10.4",
+  "version": "0.10.6",
   "description": "A Scripture Runtime Engine",
   "files": [
     "dist"
@@ -15,10 +15,10 @@
   },
   "scripts": {
     "build": "rm -fr dist && vite build",
-    "test": "export PKSRC=dist && bash -c \"tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js\"",
-    "win:test": "set PKSRC=dist&& bash -c \"tape -r @babel/register test/code/**/*.cjs | node_modules/tap-summary/bin/cmd.js\"",
-    "rawTest": "export PKSRC=dist && bash -c \"tape -r @babel/register test/code/*.cjs\"",
-    "oneTest": "bash -c \"tape -r @babel/register test/code/$TESTSCRIPT.cjs\"",
+    "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 && 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"
   }