proskomma-core 0.10.2 → 0.10.4

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.2";
+const version = "0.10.4";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -17749,6 +17749,9 @@ const succinctScopeLabel$1 = (enums2, enumIndexes2, succinct2, itemSubtype, pos)
   }
   return `${scopeType}${scopeBits}`;
 };
+const succinctScopeType = (itemSubtype) => {
+  return scopeDefs.scopeEnumLabels[itemSubtype];
+};
 const succinctGraftName$1 = (enums2, enumIndexes2, itemSubtype) => {
   const graftIndex = enumIndexes2.graftTypes[itemSubtype];
   return enums2.graftTypes.countedString(graftIndex);
@@ -17854,6 +17857,7 @@ const succinct = {
   pushSuccinctScopeBytes: pushSuccinctScopeBytes$3,
   succinctTokenChars: succinctTokenChars$1,
   succinctScopeLabel: succinctScopeLabel$1,
+  succinctScopeType,
   succinctGraftName: succinctGraftName$1,
   succinctGraftSeqId: succinctGraftSeqId$1,
   unpackEnum
@@ -18598,8 +18602,34 @@ 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 [item, itemLength] = docSet.unsuccinctifyItem(succinct2, pos, {});
+    const [itemLength, itemType, itemSubtype] = utils.succinct.headerBytes(
+      succinct2,
+      pos
+    );
+    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;
+        continue;
+      }
+    }
+    const item = docSet.unsuccinctifyItem(succinct2, pos, {})[0];
     if (item[0] === "token") {
       if (Object.keys(options2).length === 0 || options2.tokens) {
         if (nextToken !== null) {
@@ -18611,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) {

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.2";
+const version = "0.10.4";
 const description$b = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -17747,6 +17747,9 @@ const succinctScopeLabel$1 = (enums2, enumIndexes2, succinct2, itemSubtype, pos)
   }
   return `${scopeType}${scopeBits}`;
 };
+const succinctScopeType = (itemSubtype) => {
+  return scopeDefs.scopeEnumLabels[itemSubtype];
+};
 const succinctGraftName$1 = (enums2, enumIndexes2, itemSubtype) => {
   const graftIndex = enumIndexes2.graftTypes[itemSubtype];
   return enums2.graftTypes.countedString(graftIndex);
@@ -17852,6 +17855,7 @@ const succinct = {
   pushSuccinctScopeBytes: pushSuccinctScopeBytes$3,
   succinctTokenChars: succinctTokenChars$1,
   succinctScopeLabel: succinctScopeLabel$1,
+  succinctScopeType,
   succinctGraftName: succinctGraftName$1,
   succinctGraftSeqId: succinctGraftSeqId$1,
   unpackEnum
@@ -18596,8 +18600,34 @@ 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 [item, itemLength] = docSet.unsuccinctifyItem(succinct2, pos, {});
+    const [itemLength, itemType, itemSubtype] = utils.succinct.headerBytes(
+      succinct2,
+      pos
+    );
+    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;
+        continue;
+      }
+    }
+    const item = docSet.unsuccinctifyItem(succinct2, pos, {})[0];
     if (item[0] === "token") {
       if (Object.keys(options2).length === 0 || options2.tokens) {
         if (nextToken !== null) {
@@ -18609,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) {

package/package.json

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