ooxml-core 1.16.0 → 1.17.0

package/dist/xlsx/index.mjs

@@ -11730,15 +11730,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;
@@ -29511,9 +29530,17 @@ function pivotTableXml(source2, cacheId, cache3) {
   }
   return XML_HEADER + buildXml(root);
 }
+function firstFilterTag(xml) {
+  for (let at = xml.indexOf("<filter"); at !== -1; at = xml.indexOf("<filter", at + 1)) {
+    if (!/\s/.test(xml.charAt(at + 7))) continue;
+    const end = xml.indexOf(">", at);
+    return end === -1 ? "" : xml.slice(at, end + 1);
+  }
+  return "";
+}
 function dateFilterXml(pivot, filter2) {
   const x15 = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main";
-  const id = Number(/<filter [^>]*\bid="(\d+)"/.exec(pivot.sourceXml ?? "")?.[1] ?? 1);
+  const id = Number(/\bid="(\d+)"/.exec(firstFilterTag(pivot.sourceXml ?? ""))?.[1] ?? 1);
   return `<filters count="1"><filter${attrs({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id, name: filter2.field })}><autoFilter ref="A1"><filterColumn colId="0"><customFilters and="1"><customFilter operator="greaterThanOrEqual" val="${Math.floor(filter2.start)}"/><customFilter operator="lessThanOrEqual" val="${Math.floor(filter2.end)}"/></customFilters></filterColumn></autoFilter><extLst><ext uri="{0605FD5F-26C8-4aeb-8148-2DB25E43C511}" xmlns:x15="${x15}"><x15:pivotFilter useWholeDay="1"/></ext></extLst></filter></filters>`;
 }
 
@@ -29615,7 +29642,7 @@ var PivotWritePlan = class {
 
 // xlsx/edit/context.ts
 function sheetAt(workbook, index3) {
-  const sheet = Number.isInteger(index3) ? workbook.sheets[index3] : void 0;
+  const sheet = Number.isInteger(index3) && index3 >= 0 ? workbook.sheets.at(index3) : void 0;
   if (!sheet) throw new RangeError(`No sheet at index ${index3}`);
   return sheet;
 }
@@ -34372,18 +34399,18 @@ function addScenario(ctx, s, draft) {
 }
 function editScenario(ctx, s, index3, draft) {
   const sheet = sheetAt(ctx.workbook, s);
-  const existing = scenariosOf(sheet)[index3];
+  const existing = Number.isInteger(index3) ? scenariosOf(sheet)[index3] : void 0;
   if (!existing) throw new ScenarioError("missing");
   if (existing.locked && sheet.protection) throw new ScenarioError("locked");
   const name = checkName(sheet, draft.name, index3);
   const scenario = build(ctx, sheet, draft, name);
   ctx.run("Edit scenario", "view", PARTS(s), () => {
-    sheet.scenarios.list[index3] = scenario;
+    sheet.scenarios.list.splice(index3, 1, scenario);
   });
 }
 function deleteScenario(ctx, s, index3) {
   const sheet = sheetAt(ctx.workbook, s);
-  const existing = scenariosOf(sheet)[index3];
+  const existing = Number.isInteger(index3) ? scenariosOf(sheet)[index3] : void 0;
   if (!existing) throw new ScenarioError("missing");
   if (existing.locked && sheet.protection) throw new ScenarioError("locked");
   ctx.run("Delete scenario", "view", PARTS(s), () => {
@@ -34401,7 +34428,7 @@ function deleteScenario(ctx, s, index3) {
 }
 function showScenario(ctx, s, index3) {
   const sheet = sheetAt(ctx.workbook, s);
-  const scenario = scenariosOf(sheet)[index3];
+  const scenario = Number.isInteger(index3) ? scenariosOf(sheet)[index3] : void 0;
   if (!scenario) throw new ScenarioError("missing");
   const addresses = scenarioAddresses(scenario);
   const ranges = addresses.map((a2) => ({ start: a2, end: a2 }));
@@ -35182,7 +35209,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(
@@ -35720,7 +35750,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/xlsx/load/index.cjs

@@ -3254,15 +3254,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;
@@ -27522,9 +27541,17 @@ function pivotTableXml(source2, cacheId, cache2) {
   }
   return XML_HEADER + buildXml(root);
 }
+function firstFilterTag(xml) {
+  for (let at = xml.indexOf("<filter"); at !== -1; at = xml.indexOf("<filter", at + 1)) {
+    if (!/\s/.test(xml.charAt(at + 7))) continue;
+    const end = xml.indexOf(">", at);
+    return end === -1 ? "" : xml.slice(at, end + 1);
+  }
+  return "";
+}
 function dateFilterXml(pivot, filter2) {
   const x15 = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main";
-  const id = Number(/<filter [^>]*\bid="(\d+)"/.exec(pivot.sourceXml ?? "")?.[1] ?? 1);
+  const id = Number(/\bid="(\d+)"/.exec(firstFilterTag(pivot.sourceXml ?? ""))?.[1] ?? 1);
   return `<filters count="1"><filter${attrs({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id, name: filter2.field })}><autoFilter ref="A1"><filterColumn colId="0"><customFilters and="1"><customFilter operator="greaterThanOrEqual" val="${Math.floor(filter2.start)}"/><customFilter operator="lessThanOrEqual" val="${Math.floor(filter2.end)}"/></customFilters></filterColumn></autoFilter><extLst><ext uri="{0605FD5F-26C8-4aeb-8148-2DB25E43C511}" xmlns:x15="${x15}"><x15:pivotFilter useWholeDay="1"/></ext></extLst></filter></filters>`;
 }
 

package/dist/xlsx/load/index.mjs

@@ -3248,15 +3248,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;
@@ -27516,9 +27535,17 @@ function pivotTableXml(source2, cacheId, cache2) {
   }
   return XML_HEADER + buildXml(root);
 }
+function firstFilterTag(xml) {
+  for (let at = xml.indexOf("<filter"); at !== -1; at = xml.indexOf("<filter", at + 1)) {
+    if (!/\s/.test(xml.charAt(at + 7))) continue;
+    const end = xml.indexOf(">", at);
+    return end === -1 ? "" : xml.slice(at, end + 1);
+  }
+  return "";
+}
 function dateFilterXml(pivot, filter2) {
   const x15 = "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main";
-  const id = Number(/<filter [^>]*\bid="(\d+)"/.exec(pivot.sourceXml ?? "")?.[1] ?? 1);
+  const id = Number(/\bid="(\d+)"/.exec(firstFilterTag(pivot.sourceXml ?? ""))?.[1] ?? 1);
   return `<filters count="1"><filter${attrs({ fld: pivot.fields.indexOf(filter2.field), type: "dateBetween", evalOrder: -1, id, name: filter2.field })}><autoFilter ref="A1"><filterColumn colId="0"><customFilters and="1"><customFilter operator="greaterThanOrEqual" val="${Math.floor(filter2.start)}"/><customFilter operator="lessThanOrEqual" val="${Math.floor(filter2.end)}"/></customFilters></filterColumn></autoFilter><extLst><ext uri="{0605FD5F-26C8-4aeb-8148-2DB25E43C511}" xmlns:x15="${x15}"><x15:pivotFilter useWholeDay="1"/></ext></extLst></filter></filters>`;
 }
 

package/dist/xlsx/ui/dialogs/grid-chart.d.ts

@@ -0,0 +1,25 @@
+import { type CellValue, type ChartObject, type ChartType, type Workbook } from '../../index.js';
+/** The chart types Insert Chart offers, in Office's order, with their English names. */
+export declare const INSERT_CHART_TYPES: ReadonlyArray<readonly [type: ChartType, label: string]>;
+/** The types whose bars can be stacked (Insert Chart shows a Grouping choice for these). */
+export declare const GROUPED_CHART_TYPES: readonly ChartType[];
+/** Largest grid read from pasted text: far beyond a readable chart, small enough to stay cheap. */
+export declare const MAX_GRID_ROWS = 100;
+export declare const MAX_GRID_COLS = 26;
+/**
+ * Rows of cells from text: one row per line, cells split on tabs (or commas when the line has no
+ * tab). Numbers become numbers, empty cells null, and short rows are padded to the widest.
+ */
+export declare function parseChartGrid(text: string): CellValue[][];
+export interface GridChart {
+    workbook: Workbook;
+    chart: ChartObject;
+}
+/** The chart for `rows` (text in the first row names the series, in the first column the categories). */
+export declare function gridChart(rows: readonly (readonly CellValue[])[], type: ChartType, options?: {
+    grouping?: ChartObject['grouping'];
+    title?: string;
+}): GridChart | undefined;
+/** `grid` as a standalone SVG document `width` by `height`; `bare` leaves out the title and legend. */
+export declare function gridChartSvg(grid: GridChart, width: number, height: number, bare?: boolean): string;
+//# sourceMappingURL=grid-chart.d.ts.map

package/dist/xlsx/ui/dialogs/grid-chart.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"grid-chart.d.ts","sourceRoot":"","sources":["../../../../xlsx/ui/dialogs/grid-chart.ts"],"names":[],"mappings":"AAGA,OAAO,EACN,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,SAAS,EACd,KAAK,QAAQ,EAKb,MAAM,aAAa,CAAC;AAGrB,wFAAwF;AACxF,eAAO,MAAM,kBAAkB,EAAE,aAAa,CAAC,SAAS,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CASvF,CAAC;AAEF,4FAA4F;AAC5F,eAAO,MAAM,mBAAmB,EAAE,SAAS,SAAS,EAAsB,CAAC;AAE3E,mGAAmG;AACnG,eAAO,MAAM,aAAa,MAAM,CAAC;AACjC,eAAO,MAAM,aAAa,KAAK,CAAC;AAEhC;;;GAGG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,EAAE,EAAE,CAiB1D;AAED,MAAM,WAAW,SAAS;IACzB,QAAQ,EAAE,QAAQ,CAAC;IACnB,KAAK,EAAE,WAAW,CAAC;CACnB;AAED,yGAAyG;AACzG,wBAAgB,SAAS,CACxB,IAAI,EAAE,SAAS,CAAC,SAAS,SAAS,EAAE,CAAC,EAAE,EACvC,IAAI,EAAE,SAAS,EACf,OAAO,GAAE;IAAE,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAO,GAClE,SAAS,GAAG,SAAS,CAWvB;AAED,uGAAuG;AACvG,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,UAAQ,GAAG,MAAM,CAIjG"}