ooxml-core 1.15.0 → 1.16.1

package/dist/chart/index.cjs

@@ -1817,15 +1817,34 @@ var DEFAULT_XML_LIMITS = {
   maxDepth: 512,
   maxNodes: 5e6
 };
-var MARKUP_RE = /<!--[\s\S]*?-->|<!\[CDATA\[[\s\S]*?\]\]>|<\?[\s\S]*?\?>|<(\/?)([^\s\/>]+)(?:\s+[^\s=\/>]+\s*=\s*(?:"[^"]*"|'[^']*'))*\s*(\/?)>/g;
+var TAG_RE = /<(\/?)([^\s\/>]+)(?:\s+[^\s=\/>]+\s*=\s*(?:"[^"]*"|'[^']*'))*\s*(\/?)>/y;
+var MARKUP_SKIPS = [
+  ["<!--", "-->"],
+  ["<![CDATA[", "]]>"],
+  ["<?", "?>"]
+];
 function checkXmlLimits(xml, label, limits = {}) {
   const maxDepth = limits.maxDepth ?? DEFAULT_XML_LIMITS.maxDepth;
   const maxNodes = limits.maxNodes ?? DEFAULT_XML_LIMITS.maxNodes;
   let depth = 0;
   let nodes = 0;
-  for (const match of xml.matchAll(MARKUP_RE)) {
-    const [, closing, name, selfClosing] = match;
-    if (name === void 0) continue;
+  let at = xml.indexOf("<");
+  while (at !== -1) {
+    const skip = MARKUP_SKIPS.find(([open]) => xml.startsWith(open, at));
+    if (skip) {
+      const end = xml.indexOf(skip[1], at + skip[0].length);
+      if (end === -1) return;
+      at = xml.indexOf("<", end + skip[1].length);
+      continue;
+    }
+    TAG_RE.lastIndex = at;
+    const match = TAG_RE.exec(xml);
+    if (!match) {
+      at = xml.indexOf("<", at + 1);
+      continue;
+    }
+    const [, closing, , selfClosing] = match;
+    at = xml.indexOf("<", at + match[0].length);
     if (closing) {
       depth--;
       continue;

package/dist/chart/index.mjs

@@ -1815,15 +1815,34 @@ var DEFAULT_XML_LIMITS = {
   maxDepth: 512,
   maxNodes: 5e6
 };
-var MARKUP_RE = /<!--[\s\S]*?-->|<!\[CDATA\[[\s\S]*?\]\]>|<\?[\s\S]*?\?>|<(\/?)([^\s\/>]+)(?:\s+[^\s=\/>]+\s*=\s*(?:"[^"]*"|'[^']*'))*\s*(\/?)>/g;
+var TAG_RE = /<(\/?)([^\s\/>]+)(?:\s+[^\s=\/>]+\s*=\s*(?:"[^"]*"|'[^']*'))*\s*(\/?)>/y;
+var MARKUP_SKIPS = [
+  ["<!--", "-->"],
+  ["<![CDATA[", "]]>"],
+  ["<?", "?>"]
+];
 function checkXmlLimits(xml, label, limits = {}) {
   const maxDepth = limits.maxDepth ?? DEFAULT_XML_LIMITS.maxDepth;
   const maxNodes = limits.maxNodes ?? DEFAULT_XML_LIMITS.maxNodes;
   let depth = 0;
   let nodes = 0;
-  for (const match of xml.matchAll(MARKUP_RE)) {
-    const [, closing, name, selfClosing] = match;
-    if (name === void 0) continue;
+  let at = xml.indexOf("<");
+  while (at !== -1) {
+    const skip = MARKUP_SKIPS.find(([open]) => xml.startsWith(open, at));
+    if (skip) {
+      const end = xml.indexOf(skip[1], at + skip[0].length);
+      if (end === -1) return;
+      at = xml.indexOf("<", end + skip[1].length);
+      continue;
+    }
+    TAG_RE.lastIndex = at;
+    const match = TAG_RE.exec(xml);
+    if (!match) {
+      at = xml.indexOf("<", at + 1);
+      continue;
+    }
+    const [, closing, , selfClosing] = match;
+    at = xml.indexOf("<", at + match[0].length);
     if (closing) {
       depth--;
       continue;