proskomma-core 0.10.3 → 0.10.5

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.3";
+const version = "0.10.5";
 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 && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
   prepublishOnly: "npm run build"
 };
 const repository = {
@@ -18602,12 +18602,27 @@ const unsuccinctifyItems = (docSet, succinct2, options2, nextToken, openScopes)
   let pos = 0;
   let tokenCount = nextToken || 0;
   const scopes = new Set(openScopes || []);
+  const scopeEnums = [utils.itemDefs.itemEnum.startScope, utils.itemDefs.itemEnum.endScope];
   while (pos < succinct2.length) {
     const [itemLength, itemType, itemSubtype] = utils.succinct.headerBytes(
       succinct2,
       pos
     );
-    if ([utils.itemDefs.itemEnum.startScope, utils.itemDefs.itemEnum.endScope].includes(itemType)) {
+    if (Object.keys(options2).length > 0) {
+      if (!options2.scopes && scopeEnums.includes(itemType)) {
+        pos += itemLength;
+        continue;
+      }
+      if (!options2.tokens && itemType === utils.itemDefs.itemEnum.token) {
+        pos += itemLength;
+        continue;
+      }
+      if (!options2.grafts && itemType === utils.itemDefs.itemEnum.graft) {
+        pos += itemLength;
+        continue;
+      }
+    }
+    if (scopeEnums.includes(itemType)) {
       const itemTypeName = utils.succinct.succinctScopeType(itemSubtype);
       if (Object.keys(options2).length > 0 && options2.scopes && options2.excludeScopeTypes && options2.excludeScopeTypes.includes(itemTypeName)) {
         pos += itemLength;
@@ -18626,23 +18641,14 @@ const unsuccinctifyItems = (docSet, succinct2, options2, nextToken, openScopes)
         ret.push(item);
       }
     } else if (item[0] === "scope" && item[1] === "start") {
-      scopes.add(item[2]);
       if (Object.keys(options2).length === 0 || options2.scopes) {
-        if (Object.keys(options2).length === 0 || !options2.excludeScopeTypes || options2.excludeScopeTypes.length === 0) {
-          ret.push(item);
-        } else if (!options2.excludeScopeTypes.includes(item[2].split("/")[0])) {
-          ret.push(item);
-        }
+        scopes.add(item[2]);
+        ret.push(item);
       }
     } else if (item[0] === "scope" && item[1] === "end") {
-      scopes.delete(item[2]);
       if (Object.keys(options2).length === 0 || options2.scopes) {
-        if (Object.keys(options2).length === 0 || !options2.excludeScopeTypes || options2.excludeScopeTypes.length === 0) {
-          ret.push(item);
-        } else if (!options2.excludeScopeTypes.includes(item[2].split("/")[0])) {
-          ret.push(item);
-        } else
-          ;
+        scopes.delete(item[2]);
+        ret.push(item);
       }
     } else if (item[0] === "graft") {
       if (Object.keys(options2).length === 0 || options2.grafts) {
@@ -44688,15 +44694,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 [];
   }
@@ -44765,8 +44775,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) {
@@ -44780,13 +44790,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.3";
+const version = "0.10.5";
 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 && bash -c "tape -r @babel/register test/code/$TESTSCRIPT.cjs"',
   prepublishOnly: "npm run build"
 };
 const repository = {
@@ -18600,12 +18600,27 @@ const unsuccinctifyItems = (docSet, succinct2, options2, nextToken, openScopes)
   let pos = 0;
   let tokenCount = nextToken || 0;
   const scopes = new Set(openScopes || []);
+  const scopeEnums = [utils.itemDefs.itemEnum.startScope, utils.itemDefs.itemEnum.endScope];
   while (pos < succinct2.length) {
     const [itemLength, itemType, itemSubtype] = utils.succinct.headerBytes(
       succinct2,
       pos
     );
-    if ([utils.itemDefs.itemEnum.startScope, utils.itemDefs.itemEnum.endScope].includes(itemType)) {
+    if (Object.keys(options2).length > 0) {
+      if (!options2.scopes && scopeEnums.includes(itemType)) {
+        pos += itemLength;
+        continue;
+      }
+      if (!options2.tokens && itemType === utils.itemDefs.itemEnum.token) {
+        pos += itemLength;
+        continue;
+      }
+      if (!options2.grafts && itemType === utils.itemDefs.itemEnum.graft) {
+        pos += itemLength;
+        continue;
+      }
+    }
+    if (scopeEnums.includes(itemType)) {
       const itemTypeName = utils.succinct.succinctScopeType(itemSubtype);
       if (Object.keys(options2).length > 0 && options2.scopes && options2.excludeScopeTypes && options2.excludeScopeTypes.includes(itemTypeName)) {
         pos += itemLength;
@@ -18624,23 +18639,14 @@ const unsuccinctifyItems = (docSet, succinct2, options2, nextToken, openScopes)
         ret.push(item);
       }
     } else if (item[0] === "scope" && item[1] === "start") {
-      scopes.add(item[2]);
       if (Object.keys(options2).length === 0 || options2.scopes) {
-        if (Object.keys(options2).length === 0 || !options2.excludeScopeTypes || options2.excludeScopeTypes.length === 0) {
-          ret.push(item);
-        } else if (!options2.excludeScopeTypes.includes(item[2].split("/")[0])) {
-          ret.push(item);
-        }
+        scopes.add(item[2]);
+        ret.push(item);
       }
     } else if (item[0] === "scope" && item[1] === "end") {
-      scopes.delete(item[2]);
       if (Object.keys(options2).length === 0 || options2.scopes) {
-        if (Object.keys(options2).length === 0 || !options2.excludeScopeTypes || options2.excludeScopeTypes.length === 0) {
-          ret.push(item);
-        } else if (!options2.excludeScopeTypes.includes(item[2].split("/")[0])) {
-          ret.push(item);
-        } else
-          ;
+        scopes.delete(item[2]);
+        ret.push(item);
       }
     } else if (item[0] === "graft") {
       if (Object.keys(options2).length === 0 || options2.grafts) {
@@ -44686,15 +44692,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 [];
   }
@@ -44763,8 +44773,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) {
@@ -44778,13 +44788,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.3",
+  "version": "0.10.5",
   "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 && bash -c \"tape -r @babel/register test/code/$TESTSCRIPT.cjs\"",
     "prepublishOnly": "npm run build"
   },
   "repository": {