ooxml-core 1.16.0 → 1.16.1

package/dist/xlsx/ui/index.mjs

@@ -11606,15 +11606,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, label2, 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 match2 of xml.matchAll(MARKUP_RE)) {
-    const [, closing, name, selfClosing] = match2;
-    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 match2 = TAG_RE.exec(xml);
+    if (!match2) {
+      at = xml.indexOf("<", at + 1);
+      continue;
+    }
+    const [, closing, , selfClosing] = match2;
+    at = xml.indexOf("<", at + match2[0].length);
     if (closing) {
       depth--;
       continue;
@@ -21079,7 +21098,7 @@ function addScenario(ctx, s, draft) {
 }
 function editScenario(ctx, s, index2, draft) {
   const sheet = sheetAt(ctx.workbook, s);
-  const existing = scenariosOf(sheet)[index2];
+  const existing = Number.isInteger(index2) ? scenariosOf(sheet)[index2] : void 0;
   if (!existing) throw new ScenarioError("missing");
   if (existing.locked && sheet.protection) throw new ScenarioError("locked");
   const name = checkName(sheet, draft.name, index2);
@@ -21090,7 +21109,7 @@ function editScenario(ctx, s, index2, draft) {
 }
 function deleteScenario(ctx, s, index2) {
   const sheet = sheetAt(ctx.workbook, s);
-  const existing = scenariosOf(sheet)[index2];
+  const existing = Number.isInteger(index2) ? scenariosOf(sheet)[index2] : void 0;
   if (!existing) throw new ScenarioError("missing");
   if (existing.locked && sheet.protection) throw new ScenarioError("locked");
   ctx.run("Delete scenario", "view", PARTS(s), () => {
@@ -21868,7 +21887,10 @@ function insertTimeline(ctx, s, ref) {
   const id = Math.max(
     1,
     ...sheet.drawings.flatMap(
-      (d) => "sourceXml" in d && d.sourceXml ? [...d.sourceXml.matchAll(/cNvPr[^>]*\sid="(\d+)"/g)].map((m) => Number(m[1])) : []
+      (d) => "sourceXml" in d && d.sourceXml ? [...d.sourceXml.matchAll(/<[\w:]*cNvPr\b[^>]*>/g)].flatMap((m) => {
+        const id2 = /\sid="(\d+)"/.exec(m[0])?.[1];
+        return id2 ? [Number(id2)] : [];
+      }) : []
     )
   ) + 1;
   ctx.run(
@@ -22406,7 +22428,10 @@ function insertSlicer(ctx, s, ref) {
   const id = Math.max(
     1,
     ...sheet.drawings.flatMap(
-      (d) => "sourceXml" in d && d.sourceXml ? [...d.sourceXml.matchAll(/cNvPr[^>]*\sid="(\d+)"/g)].map((m) => Number(m[1])) : []
+      (d) => "sourceXml" in d && d.sourceXml ? [...d.sourceXml.matchAll(/<[\w:]*cNvPr\b[^>]*>/g)].flatMap((m) => {
+        const id2 = /\sid="(\d+)"/.exec(m[0])?.[1];
+        return id2 ? [Number(id2)] : [];
+      }) : []
     )
   ) + 1;
   ctx.run(

package/dist/xml/index.cjs

@@ -75,15 +75,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/xml/index.mjs

@@ -73,15 +73,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/xml/xml.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"xml.d.ts","sourceRoot":"","sources":["../../xml/xml.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;AACnC,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC;AACjC,MAAM,MAAM,OAAO,GAAG,IAAI,CAAC;AAG3B,MAAM,WAAW,cAAc;IAC9B,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gGAAgG;IAChG,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC5B,gGAAgG;IAChG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,MAAM,CAAC,EAAE,cAAc,CAAC;CACxB;AAED,8FAA8F;AAC9F,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,CAGjE,CAAC;AAQF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,cAAmB,GAAG,IAAI,CAiB5F;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,WAAW,CAsB7E;AAED,eAAO,MAAM,QAAQ,SAAU,OAAO,KAAG,MAC4B,CAAC;AAEtE,eAAO,MAAM,SAAS,SAAU,IAAI,KAAG,IAAI,IAAI,UAAiC,CAAC;AACjF,eAAO,MAAM,QAAQ,WAAY,UAAU,KAAG,UAAU,EACR,CAAC;AACjD,eAAO,MAAM,WAAW,YAAa,UAAU,KAAG,MAAmC,CAAC;AACtF,eAAO,MAAM,MAAM,QAAS,WAAW,MAAM,MAAM,aAAa,MAAM,KAAG,UACtC,CAAC;AAEpC;;;GAGG;AACH,wBAAgB,KAAK,CACpB,OAAO,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,EACtC,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,OAAO,UAAO,GACZ,OAAO,CAGT;AAED,mDAAmD;AACnD,eAAO,MAAM,QAAQ,WACZ,UAAU,SACX,MAAM,MACT,MAAM,wBAER,UAAU,EAA8E,CAAC;AAE5F,4DAA4D;AAC5D,eAAO,MAAM,KAAK,WACT,UAAU,GAAG,IAAI,GAAG,SAAS,SAC9B,MAAM,MACT,MAAM,wBAER,UAAU,GAAG,SAA2E,CAAC;AAE5F,yFAAyF;AACzF,wBAAgB,IAAI,CACnB,OAAO,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,EACtC,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,GACZ,MAAM,GAAG,SAAS,CAIpB;AAED,oFAAoF;AACpF,eAAO,MAAM,OAAO,YAAa,UAAU,GAAG,IAAI,GAAG,SAAS,SAAS,MAAM,uBAC7C,CAAC"}
+{"version":3,"file":"xml.d.ts","sourceRoot":"","sources":["../../xml/xml.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,WAAW,GAAG,QAAQ,CAAC;AACnC,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC;AACjC,MAAM,MAAM,OAAO,GAAG,IAAI,CAAC;AAG3B,MAAM,WAAW,cAAc;IAC9B,6EAA6E;IAC7E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,gGAAgG;IAChG,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,YAAY;IAC5B,gGAAgG;IAChG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4EAA4E;IAC5E,MAAM,CAAC,EAAE,cAAc,CAAC;CACxB;AAED,8FAA8F;AAC9F,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,QAAQ,CAAC,cAAc,CAAC,CAGjE,CAAC;AAYF;;;GAGG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAE,cAAmB,GAAG,IAAI,CA+B5F;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,WAAW,CAsB7E;AAED,eAAO,MAAM,QAAQ,SAAU,OAAO,KAAG,MAC4B,CAAC;AAEtE,eAAO,MAAM,SAAS,SAAU,IAAI,KAAG,IAAI,IAAI,UAAiC,CAAC;AACjF,eAAO,MAAM,QAAQ,WAAY,UAAU,KAAG,UAAU,EACR,CAAC;AACjD,eAAO,MAAM,WAAW,YAAa,UAAU,KAAG,MAAmC,CAAC;AACtF,eAAO,MAAM,MAAM,QAAS,WAAW,MAAM,MAAM,aAAa,MAAM,KAAG,UACtC,CAAC;AAEpC;;;GAGG;AACH,wBAAgB,KAAK,CACpB,OAAO,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,EACtC,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,OAAO,UAAO,GACZ,OAAO,CAGT;AAED,mDAAmD;AACnD,eAAO,MAAM,QAAQ,WACZ,UAAU,SACX,MAAM,MACT,MAAM,wBAER,UAAU,EAA8E,CAAC;AAE5F,4DAA4D;AAC5D,eAAO,MAAM,KAAK,WACT,UAAU,GAAG,IAAI,GAAG,SAAS,SAC9B,MAAM,MACT,MAAM,wBAER,UAAU,GAAG,SAA2E,CAAC;AAE5F,yFAAyF;AACzF,wBAAgB,IAAI,CACnB,OAAO,EAAE,UAAU,GAAG,IAAI,GAAG,SAAS,EACtC,KAAK,EAAE,MAAM,EACb,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,GACZ,MAAM,GAAG,SAAS,CAIpB;AAED,oFAAoF;AACpF,eAAO,MAAM,OAAO,YAAa,UAAU,GAAG,IAAI,GAAG,SAAS,SAAS,MAAM,uBAC7C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ooxml-core",
-	"version": "1.16.0",
+	"version": "1.16.1",
 	"description": "Shared OOXML logic for the Word, PowerPoint and Excel viewers: everything except the UI",
 	"keywords": [
 		"charts",

package/dist/PptxHandler-7POULDRL.mjs

@@ -1,4 +0,0 @@
-export { PptxHandler } from './chunk-OKGQ2X7D.mjs';
-import './chunk-WEFFRYXN.mjs';
-import './chunk-GXHKNSZX.mjs';
-import './chunk-CA7KCNL3.mjs';