proskomma-core 0.10.1 → 0.10.3

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.1";
+const version = "0.10.3";
 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
@@ -18599,7 +18603,18 @@ const unsuccinctifyItems = (docSet, succinct2, options2, nextToken, openScopes)
   let tokenCount = nextToken || 0;
   const scopes = new Set(openScopes || []);
   while (pos < succinct2.length) {
-    const [item, itemLength] = docSet.unsuccinctifyItem(succinct2, pos, {});
+    const [itemLength, itemType, itemSubtype] = utils.succinct.headerBytes(
+      succinct2,
+      pos
+    );
+    if ([utils.itemDefs.itemEnum.startScope, utils.itemDefs.itemEnum.endScope].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) {
@@ -18613,12 +18628,21 @@ const unsuccinctifyItems = (docSet, succinct2, options2, nextToken, openScopes)
     } else if (item[0] === "scope" && item[1] === "start") {
       scopes.add(item[2]);
       if (Object.keys(options2).length === 0 || options2.scopes) {
-        ret.push(item);
+        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 if (item[0] === "scope" && item[1] === "end") {
       scopes.delete(item[2]);
       if (Object.keys(options2).length === 0 || options2.scopes) {
-        ret.push(item);
+        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
+          ;
       }
     } else if (item[0] === "graft") {
       if (Object.keys(options2).length === 0 || options2.grafts) {
@@ -44135,6 +44159,8 @@ type Block {
     withScriptureCV: String
     """If true, adds scope and nextToken information to each token"""
     includeContext: Boolean
+    """Do not return scopes types in list (eg milestone)"""
+    excludeScopeTypes: [String!]
   ) : [Item!]! 
   """A list of tokens from the c (content) field of the block"""
   tokens(
@@ -44213,6 +44239,7 @@ const blockResolvers = {
         tokens: true,
         scopes: true,
         grafts: true,
+        excludeScopeTypes: args.excludeScopeTypes || [],
         requiredScopes: args.withScopes || [],
         anyScope: args.anyScope || false
       });

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.1";
+const version = "0.10.3";
 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
@@ -18597,7 +18601,18 @@ const unsuccinctifyItems = (docSet, succinct2, options2, nextToken, openScopes)
   let tokenCount = nextToken || 0;
   const scopes = new Set(openScopes || []);
   while (pos < succinct2.length) {
-    const [item, itemLength] = docSet.unsuccinctifyItem(succinct2, pos, {});
+    const [itemLength, itemType, itemSubtype] = utils.succinct.headerBytes(
+      succinct2,
+      pos
+    );
+    if ([utils.itemDefs.itemEnum.startScope, utils.itemDefs.itemEnum.endScope].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,12 +18626,21 @@ const unsuccinctifyItems = (docSet, succinct2, options2, nextToken, openScopes)
     } else if (item[0] === "scope" && item[1] === "start") {
       scopes.add(item[2]);
       if (Object.keys(options2).length === 0 || options2.scopes) {
-        ret.push(item);
+        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 if (item[0] === "scope" && item[1] === "end") {
       scopes.delete(item[2]);
       if (Object.keys(options2).length === 0 || options2.scopes) {
-        ret.push(item);
+        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
+          ;
       }
     } else if (item[0] === "graft") {
       if (Object.keys(options2).length === 0 || options2.grafts) {
@@ -44133,6 +44157,8 @@ type Block {
     withScriptureCV: String
     """If true, adds scope and nextToken information to each token"""
     includeContext: Boolean
+    """Do not return scopes types in list (eg milestone)"""
+    excludeScopeTypes: [String!]
   ) : [Item!]! 
   """A list of tokens from the c (content) field of the block"""
   tokens(
@@ -44211,6 +44237,7 @@ const blockResolvers = {
         tokens: true,
         scopes: true,
         grafts: true,
+        excludeScopeTypes: args.excludeScopeTypes || [],
         requiredScopes: args.withScopes || [],
         anyScope: args.anyScope || false
       });

package/package.json

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