proskomma-core 0.11.3 → 0.11.4

package/dist/index.js

@@ -15992,7 +15992,7 @@ var bitset = { exports: {} };
 var bitsetExports = bitset.exports;
 const BitSet = /* @__PURE__ */ getDefaultExportFromCjs(bitsetExports);
 const name = "proskomma-core";
-const version = "0.11.3";
+const version = "0.11.4";
 const description$h = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -43696,31 +43696,30 @@ const Block = class {
       }
     }
     for (const swaStart of swaStarts) {
+      const spanLabel = this.items[swaStart - 1].payload;
+      const attPrefix = `attribute/${spanLabel}/`;
       let pos = swaStart;
-      let tokens2 = [];
+      let others = [];
       let scopes = [];
-      while (true) {
-        if (pos >= this.items.length) {
-          break;
-        }
+      while (pos < this.items.length) {
         const item = this.items[pos];
-        if (item.type === "token") {
-          tokens2.push(item);
-        } else if (item.subType === "start" && item.payload.startsWith("attribute/spanWithAtts")) {
+        if (item.type === "scope" && item.payload === spanLabel) {
+          break;
+        } else if (item.subType === "start" && item.payload.startsWith(attPrefix)) {
           scopes.push(item);
         } else {
-          break;
+          others.push(item);
         }
         pos++;
       }
-      if (tokens2.length !== 0 && scopes.length !== 0) {
+      if (others.length !== 0 && scopes.length !== 0) {
         let pos2 = swaStart;
         for (const s of scopes) {
           this.items[pos2] = s;
           pos2++;
         }
-        for (const t of tokens2) {
-          this.items[pos2] = t;
+        for (const o of others) {
+          this.items[pos2] = o;
           pos2++;
         }
       }
@@ -44563,7 +44562,7 @@ const specs = (pt) => [
   {
     // END MILESTONE - close scope, clear attribute context
     contexts: [["endMilestoneMarker"]],
-    parser: { during: (parser) => parser.clearAttributeContext() }
+    parser: { during: (parser) => parser.clearAttributeContext("milestone") }
   },
   {
     // ATTRIBUTE - open scope based on attribute context
@@ -44721,7 +44720,9 @@ const Parser2 = class {
       parentSequence: null,
       baseSequenceType: "main",
       inlineSequenceType: null,
-      attributeContext: null
+      attributeContext: null,
+      spanAttributeContext: null,
+      milestoneAttributeContext: null
     };
   }
   parseItem(lexedItem) {
@@ -45130,11 +45131,20 @@ const Parser2 = class {
       payload: label
     });
   }
+  // Milestones may sit inside spans with attributes (eg \w ... \zx-s |a="b"\* ... \zx-e\* |lemma="c"\w*),
+  // so keep separate contexts for each, with the milestone context taking priority while it is open
   setAttributeContext(label) {
-    this.current.attributeContext = label;
+    const contextKey = label.startsWith("milestone") ? "milestoneAttributeContext" : "spanAttributeContext";
+    this.current[contextKey] = label;
+    this.updateAttributeContext();
+  }
+  clearAttributeContext(scopeType) {
+    const contextKey = scopeType === "milestone" ? "milestoneAttributeContext" : "spanAttributeContext";
+    this.current[contextKey] = null;
+    this.updateAttributeContext();
   }
-  clearAttributeContext() {
-    this.current.attributeContext = null;
+  updateAttributeContext() {
+    this.current.attributeContext = this.current.milestoneAttributeContext || this.current.spanAttributeContext || null;
   }
 };
 const ByteArray$2 = utils.ByteArray;

package/dist/index.mjs

@@ -15990,7 +15990,7 @@ var bitset = { exports: {} };
 var bitsetExports = bitset.exports;
 const BitSet = /* @__PURE__ */ getDefaultExportFromCjs(bitsetExports);
 const name = "proskomma-core";
-const version = "0.11.3";
+const version = "0.11.4";
 const description$h = "A Scripture Runtime Engine";
 const files = [
   "dist"
@@ -43694,31 +43694,30 @@ const Block = class {
       }
     }
     for (const swaStart of swaStarts) {
+      const spanLabel = this.items[swaStart - 1].payload;
+      const attPrefix = `attribute/${spanLabel}/`;
       let pos = swaStart;
-      let tokens2 = [];
+      let others = [];
       let scopes = [];
-      while (true) {
-        if (pos >= this.items.length) {
-          break;
-        }
+      while (pos < this.items.length) {
         const item = this.items[pos];
-        if (item.type === "token") {
-          tokens2.push(item);
-        } else if (item.subType === "start" && item.payload.startsWith("attribute/spanWithAtts")) {
+        if (item.type === "scope" && item.payload === spanLabel) {
+          break;
+        } else if (item.subType === "start" && item.payload.startsWith(attPrefix)) {
           scopes.push(item);
         } else {
-          break;
+          others.push(item);
         }
         pos++;
       }
-      if (tokens2.length !== 0 && scopes.length !== 0) {
+      if (others.length !== 0 && scopes.length !== 0) {
         let pos2 = swaStart;
         for (const s of scopes) {
           this.items[pos2] = s;
           pos2++;
         }
-        for (const t of tokens2) {
-          this.items[pos2] = t;
+        for (const o of others) {
+          this.items[pos2] = o;
           pos2++;
         }
       }
@@ -44561,7 +44560,7 @@ const specs = (pt) => [
   {
     // END MILESTONE - close scope, clear attribute context
     contexts: [["endMilestoneMarker"]],
-    parser: { during: (parser) => parser.clearAttributeContext() }
+    parser: { during: (parser) => parser.clearAttributeContext("milestone") }
   },
   {
     // ATTRIBUTE - open scope based on attribute context
@@ -44719,7 +44718,9 @@ const Parser2 = class {
       parentSequence: null,
       baseSequenceType: "main",
       inlineSequenceType: null,
-      attributeContext: null
+      attributeContext: null,
+      spanAttributeContext: null,
+      milestoneAttributeContext: null
     };
   }
   parseItem(lexedItem) {
@@ -45128,11 +45129,20 @@ const Parser2 = class {
       payload: label
     });
   }
+  // Milestones may sit inside spans with attributes (eg \w ... \zx-s |a="b"\* ... \zx-e\* |lemma="c"\w*),
+  // so keep separate contexts for each, with the milestone context taking priority while it is open
   setAttributeContext(label) {
-    this.current.attributeContext = label;
+    const contextKey = label.startsWith("milestone") ? "milestoneAttributeContext" : "spanAttributeContext";
+    this.current[contextKey] = label;
+    this.updateAttributeContext();
+  }
+  clearAttributeContext(scopeType) {
+    const contextKey = scopeType === "milestone" ? "milestoneAttributeContext" : "spanAttributeContext";
+    this.current[contextKey] = null;
+    this.updateAttributeContext();
   }
-  clearAttributeContext() {
-    this.current.attributeContext = null;
+  updateAttributeContext() {
+    this.current.attributeContext = this.current.milestoneAttributeContext || this.current.spanAttributeContext || null;
   }
 };
 const ByteArray$2 = utils.ByteArray;

package/package.json

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