@jxsuite/runtime 5.1.0 → 6.0.0

package/dist/runtime.js

@@ -1548,14 +1548,55 @@ function resolveNestedSelector(scope, key) {
   return resolved.join(", ");
 }
 function resolveOneNestedSelector(scope, key) {
-  if (key.startsWith("&")) {
-    return key.replaceAll("&", scope);
+  const spliced = spliceNestingSelector(key, scope);
+  if (spliced !== null) {
+    return spliced;
   }
   if (key.startsWith("[") || key.startsWith(":") || key.startsWith(".")) {
     return `${scope}${key}`;
   }
   return `${scope} ${key}`;
 }
+function nestingIndexes(member) {
+  const found = [];
+  let quote = null;
+  let brackets = 0;
+  for (let i = 0;i < member.length; i += 1) {
+    const ch = member[i];
+    if (quote) {
+      if (ch === "\\") {
+        i += 1;
+      } else if (ch === quote) {
+        quote = null;
+      }
+      continue;
+    }
+    if (ch === "\\") {
+      i += 1;
+    } else if (ch === '"' || ch === "'") {
+      quote = ch;
+    } else if (ch === "[") {
+      brackets += 1;
+    } else if (ch === "]") {
+      brackets = Math.max(0, brackets - 1);
+    } else if (ch === "&" && brackets === 0) {
+      found.push(i);
+    }
+  }
+  return found;
+}
+function spliceNestingSelector(member, scope) {
+  return nestingIndexes(member).length > 0 ? spliceScope(member, scope) : null;
+}
+function spliceScope(member, scope) {
+  let out = "";
+  let from = 0;
+  for (const at of nestingIndexes(member)) {
+    out += member.slice(from, at) + scope;
+    from = at + 1;
+  }
+  return out + member.slice(from);
+}
 function splitSelectorList(selector) {
   const members = [];
   let depth = 0;
@@ -1679,7 +1720,9 @@ function withoutKeyframes(block) {
   return rest;
 }
 function compoundsOntoScope(key) {
-  const rest = key.startsWith("&") ? key.slice(1) : key;
+  const nesting = nestingIndexes(key);
+  const last = nesting.at(-1);
+  const rest = last === undefined ? key : key.slice(last + 1);
   return rest === "" || rest.startsWith(":") || rest.startsWith(".") || rest.startsWith("[");
 }
 function buildStyleRules(style, options = {}) {
@@ -2814,7 +2857,7 @@ function transposeCanvasUnits(value) {
   if (!_canvasViewportTranspose || !value.includes("v")) {
     return value;
   }
-  return value.replace(VIEWPORT_UNIT_RE, (_m, num, dim) => `${num}${VIEWPORT_UNIT_MAP.get(dim.toLowerCase()) ?? `cq${dim}`}`);
+  return value.replaceAll(VIEWPORT_UNIT_RE, (_m, num, dim) => `${num}${VIEWPORT_UNIT_MAP.get(dim.toLowerCase()) ?? `cq${dim}`}`);
 }
 var _canvasDelinkAnchors = false;
 function setCanvasDelinkAnchors(on) {
@@ -5210,6 +5253,7 @@ export {
   setSkipServerFunctions,
   setStampPropBindings,
   setTemplateErrorHandler,
+  spliceNestingSelector,
   splitSelectorList,
   toCSSText,
   transposeCanvasOverlaySelector,
@@ -5217,5 +5261,5 @@ export {
   transposeCanvasUnits
 };
 
-//# debugId=F9E5ED7079B70E8764756E2164756E21
+//# debugId=938A15203F1CC52664756E2164756E21
 //# sourceMappingURL=runtime.js.map