@extend-ai/react-xlsx 0.12.1 → 0.12.3

package/dist/xlsx-worker.js

@@ -3100,6 +3100,85 @@ function sheetColumnWidthToPixels(width, columnCharacterWidthPx = DEFAULT_COLUMN
   const pixels = width < 1 ? Math.floor(width * (digitWidth + 5) + 0.5) : Math.floor((256 * width + Math.floor(128 / digitWidth)) / 256 * digitWidth);
   return Math.max(MIN_COL_WIDTH_PX, pixels);
 }
+function resolveWorksheetDefaultColumnWidthPixels(worksheet, columnCharacterWidthPx = DEFAULT_COLUMN_CHARACTER_WIDTH_PX, fallbackPx = sheetColumnWidthToPixels(8.43, columnCharacterWidthPx)) {
+  const width = typeof worksheet.defaultColumnWidth === "number" ? worksheet.defaultColumnWidth : Number.NaN;
+  return Number.isFinite(width) && width > 0 ? sheetColumnWidthToPixels(width, columnCharacterWidthPx) : fallbackPx;
+}
+function resolveWorksheetDefaultRowHeightPixels(worksheet, fallbackPx = Math.max(MIN_ROW_HEIGHT_PX, Math.round(15 * 1.33))) {
+  const height = typeof worksheet.defaultRowHeight === "number" ? worksheet.defaultRowHeight : Number.NaN;
+  return Number.isFinite(height) && height > 0 ? Math.max(MIN_ROW_HEIGHT_PX, Math.round(height * 1.33)) : fallbackPx;
+}
+function resolveWorksheetHiddenRows(worksheet, maxRow) {
+  if (!Number.isFinite(maxRow) || maxRow < 0 || typeof worksheet.isRowHidden !== "function") {
+    return [];
+  }
+  const hiddenRows = [];
+  for (let row = 0; row <= maxRow; row += 1) {
+    if (worksheet.isRowHidden(row)) {
+      hiddenRows.push(row);
+    }
+  }
+  return hiddenRows;
+}
+function resolveWorksheetHiddenCols(worksheet, maxCol) {
+  if (!Number.isFinite(maxCol) || maxCol < 0 || typeof worksheet.isColumnHidden !== "function") {
+    return [];
+  }
+  const hiddenCols = [];
+  for (let col = 0; col <= maxCol; col += 1) {
+    if (worksheet.isColumnHidden(col)) {
+      hiddenCols.push(col);
+    }
+  }
+  return hiddenCols;
+}
+function resolveWorksheetMergeMetadata(worksheet) {
+  const mergeMetadata = {
+    hasHorizontalMerges: false,
+    hasVerticalMerges: false,
+    maxHorizontalMergeEndCol: -1,
+    maxVerticalMergeEndRow: -1
+  };
+  const mergedRegions = Array.isArray(worksheet.mergedRegions) ? worksheet.mergedRegions : [];
+  for (const rawRegion of mergedRegions) {
+    let range = null;
+    if (typeof rawRegion === "string") {
+      range = parseA1RangeReference(rawRegion);
+    } else if (rawRegion && typeof rawRegion === "object") {
+      const region = rawRegion;
+      const startRow = typeof region.startRow === "number" ? region.startRow : Number.NaN;
+      const startCol = typeof region.startCol === "number" ? region.startCol : Number.NaN;
+      const endRow = typeof region.endRow === "number" ? region.endRow : Number.NaN;
+      const endCol = typeof region.endCol === "number" ? region.endCol : Number.NaN;
+      if ([startRow, startCol, endRow, endCol].every((value) => Number.isFinite(value) && value >= 0)) {
+        range = {
+          end: {
+            col: Math.max(startCol, endCol),
+            row: Math.max(startRow, endRow)
+          },
+          start: {
+            col: Math.min(startCol, endCol),
+            row: Math.min(startRow, endRow)
+          }
+        };
+      } else if (typeof region.range === "string") {
+        range = parseA1RangeReference(region.range);
+      }
+    }
+    if (!range) {
+      continue;
+    }
+    if (range.end.col > range.start.col) {
+      mergeMetadata.hasHorizontalMerges = true;
+      mergeMetadata.maxHorizontalMergeEndCol = Math.max(mergeMetadata.maxHorizontalMergeEndCol, range.end.col);
+    }
+    if (range.end.row > range.start.row) {
+      mergeMetadata.hasVerticalMerges = true;
+      mergeMetadata.maxVerticalMergeEndRow = Math.max(mergeMetadata.maxVerticalMergeEndRow, range.end.row);
+    }
+  }
+  return mergeMetadata;
+}
 function buildThemePalette(theme) {
   const themeOrder = ["lt1", "dk1", "lt2", "dk2", "accent1", "accent2", "accent3", "accent4", "accent5", "accent6", "hlink", "folHlink"];
   const colorsByIndex = {};
@@ -3782,67 +3861,6 @@ function parseWorkbookStyles(archive) {
     tableStyleByName
   };
 }
-function parseWorkbookTableMetadata(archive, workbookSheets) {
-  return workbookSheets.map((sheet) => {
-    const sheetRelationships = parseRelationships(archive, relsPathForDocument(sheet.path), sheet.path);
-    const sheetXml = readArchiveText2(archive, sheet.path);
-    if (!sheetXml) {
-      return [];
-    }
-    const sheetDocument = parseXml2(sheetXml);
-    if (!sheetDocument) {
-      return [];
-    }
-    return getLocalElements(sheetDocument, "tablePart").flatMap((tablePartNode) => {
-      const relationshipId = getRelationshipId(tablePartNode);
-      if (!relationshipId) {
-        return [];
-      }
-      const relationship = sheetRelationships.get(relationshipId);
-      if (!relationship) {
-        return [];
-      }
-      const tableXml = readArchiveText2(archive, relationship.target);
-      if (!tableXml) {
-        return [];
-      }
-      const tableDocument = parseXml2(tableXml);
-      const tableNode = tableDocument?.documentElement;
-      if (!tableNode || tableNode.localName !== "table") {
-        return [];
-      }
-      return [{
-        displayName: tableNode.getAttribute("displayName") ?? void 0,
-        headerRowCount: parseWorkbookTableCount(tableNode.getAttribute("headerRowCount"), 1),
-        headerRowCellStyle: tableNode.getAttribute("headerRowCellStyle") ?? void 0,
-        name: tableNode.getAttribute("name") ?? void 0,
-        reference: tableNode.getAttribute("ref") ?? void 0,
-        totalsRowCount: parseWorkbookTableCount(tableNode.getAttribute("totalsRowCount"), 0),
-        totalsRowShown: parseWorkbookTableBoolean(tableNode.getAttribute("totalsRowShown"), false)
-      }];
-    });
-  });
-}
-function parseWorkbookTableCount(value, fallback) {
-  if (value === null) {
-    return fallback;
-  }
-  const parsed = Number.parseInt(value, 10);
-  return Number.isFinite(parsed) && parsed >= 0 ? parsed : fallback;
-}
-function parseWorkbookTableBoolean(value, fallback) {
-  if (value === null) {
-    return fallback;
-  }
-  const normalized = value.trim().toLowerCase();
-  if (normalized === "0" || normalized === "false" || normalized === "") {
-    return false;
-  }
-  if (normalized === "1" || normalized === "true") {
-    return true;
-  }
-  return fallback;
-}
 function parseSqrefRanges(sqref) {
   if (!sqref) {
     return [];
@@ -4114,12 +4132,6 @@ function parseSheetState(archive, path, options) {
   const colWidthOverridesPx = {};
   const rowStyleIds = {};
   const colStyleIds = {};
-  const hiddenRows = /* @__PURE__ */ new Set();
-  const hiddenCols = /* @__PURE__ */ new Set();
-  let hasHorizontalMerges = false;
-  let hasVerticalMerges = false;
-  let maxHorizontalMergeEndCol = -1;
-  let maxVerticalMergeEndRow = -1;
   let minContentCol = Number.POSITIVE_INFINITY;
   let minContentRow = Number.POSITIVE_INFINITY;
   let maxContentCol = -1;
@@ -4160,16 +4172,12 @@ function parseSheetState(archive, path, options) {
     const rowIndex = Number(rowNode.getAttribute("r") ?? 0) - 1;
     const height = Number(rowNode.getAttribute("ht") ?? Number.NaN);
     const styleId = Number(rowNode.getAttribute("s") ?? Number.NaN);
-    const isHidden = (rowNode.getAttribute("hidden") ?? "0") === "1";
     if (rowIndex >= 0 && Number.isFinite(height)) {
       rowHeightOverridesPx[rowIndex] = Math.max(MIN_ROW_HEIGHT_PX, Math.round(height * 1.33));
     }
     if (rowIndex >= 0 && Number.isFinite(styleId)) {
       rowStyleIds[rowIndex] = styleId;
     }
-    if (rowIndex >= 0 && isHidden) {
-      hiddenRows.add(rowIndex);
-    }
     getChildElements(rowNode, "c").forEach((cellNode) => {
       const cellRef = cellNode.getAttribute("r");
       if (isMeaningfulCellNode(cellNode)) {
@@ -4184,28 +4192,12 @@ function parseSheetState(archive, path, options) {
       }
     });
   });
-  getLocalElements(document2, "mergeCell").forEach((mergeNode) => {
-    const reference = mergeNode.getAttribute("ref");
-    const range = reference ? parseA1RangeReference(reference) : null;
-    if (!range) {
-      return;
-    }
-    if (range.end.col > range.start.col) {
-      hasHorizontalMerges = true;
-      maxHorizontalMergeEndCol = Math.max(maxHorizontalMergeEndCol, range.end.col);
-    }
-    if (range.end.row > range.start.row) {
-      hasVerticalMerges = true;
-      maxVerticalMergeEndRow = Math.max(maxVerticalMergeEndRow, range.end.row);
-    }
-  });
-  const maxMetadataCol = Math.max(maxContentCol, maxHorizontalMergeEndCol, 0) + 256;
+  const maxMetadataCol = Math.max(maxContentCol, 0) + 256;
   getLocalElements(document2, "col").forEach((colNode) => {
     const min = Number(colNode.getAttribute("min") ?? 0) - 1;
     const max = Number(colNode.getAttribute("max") ?? 0) - 1;
     const width = Number(colNode.getAttribute("width") ?? Number.NaN);
     const styleId = Number(colNode.getAttribute("style") ?? Number.NaN);
-    const isHidden = (colNode.getAttribute("hidden") ?? "0") === "1";
     if (!Number.isFinite(width)) {
       if (!Number.isFinite(styleId)) {
         return;
@@ -4220,9 +4212,6 @@ function parseSheetState(archive, path, options) {
         if (Number.isFinite(styleId)) {
           colStyleIds[col] = styleId;
         }
-        if (isHidden) {
-          hiddenCols.add(col);
-        }
       }
     }
   });
@@ -4234,16 +4223,16 @@ function parseSheetState(archive, path, options) {
     conditionalFormatRules,
     defaultColWidthPx: sheetColumnWidthToPixels(defaultColWidth, columnWidthCharacterWidthPx),
     defaultRowHeightPx: Math.max(MIN_ROW_HEIGHT_PX, Math.round(defaultRowHeight * 1.33)),
-    hasHorizontalMerges,
-    hasVerticalMerges,
-    maxHorizontalMergeEndCol,
-    maxVerticalMergeEndRow,
+    hasHorizontalMerges: false,
+    hasVerticalMerges: false,
+    maxHorizontalMergeEndCol: -1,
+    maxVerticalMergeEndRow: -1,
     maxContentCol,
     maxContentRow,
     minContentCol: Number.isFinite(minContentCol) ? minContentCol : -1,
     minContentRow: Number.isFinite(minContentRow) ? minContentRow : -1,
-    hiddenCols: [...hiddenCols].sort((left, right) => left - right),
-    hiddenRows: [...hiddenRows].sort((left, right) => left - right),
+    hiddenCols: [],
+    hiddenRows: [],
     rowHeightOverridesPx,
     rowStyleIds,
     showGridLines: (sheetViewNode?.getAttribute("showGridLines") ?? "1") !== "0",
@@ -4267,7 +4256,6 @@ function parseWorkbookStructureAssetsFromArchive(archive, options) {
   const theme = parseWorkbookTheme(archive);
   const themePalette = buildThemePalette(theme);
   const { defaultFont, namedCellStyleByName, styleById, tableStyleByName } = parseWorkbookStyles(archive);
-  const tableMetadataByWorkbookSheetIndex = parseWorkbookTableMetadata(archive, workbookSheets);
   return {
     contentTypes,
     namedCellStyleByName,
@@ -4277,7 +4265,7 @@ function parseWorkbookStructureAssetsFromArchive(archive, options) {
       themePalette
     })),
     styleById,
-    tableMetadataByWorkbookSheetIndex,
+    tableMetadataByWorkbookSheetIndex: workbookSheets.map(() => []),
     tableStyleByName,
     theme,
     themePalette,
@@ -4584,16 +4572,20 @@ function resolveWorksheetZoomScale(worksheet, sheetState) {
 }
 function resolveSheetDisplayUsedRange(usedRange, sheetState) {
   const [minRow, minCol, maxRow, maxCol] = usedRange;
-  const maxMeaningfulRow = Math.max(sheetState?.maxContentRow ?? -1, sheetState?.maxVerticalMergeEndRow ?? -1);
-  const maxMeaningfulCol = Math.max(sheetState?.maxContentCol ?? -1, sheetState?.maxHorizontalMergeEndCol ?? -1);
+  const maxContentRow = sheetState?.maxContentRow ?? -1;
+  const maxContentCol = sheetState?.maxContentCol ?? -1;
+  const maxVerticalMergeEndRow = sheetState?.maxVerticalMergeEndRow ?? -1;
+  const maxHorizontalMergeEndCol = sheetState?.maxHorizontalMergeEndCol ?? -1;
+  const maxMeaningfulRow = Math.max(maxContentRow, maxVerticalMergeEndRow);
+  const maxMeaningfulCol = Math.max(maxContentCol, maxHorizontalMergeEndCol);
   if (maxMeaningfulRow < 0 && maxMeaningfulCol < 0) {
     return usedRange;
   }
   return [
     sheetState?.minContentRow !== void 0 && sheetState.minContentRow >= 0 ? Math.min(minRow, sheetState.minContentRow) : minRow,
     sheetState?.minContentCol !== void 0 && sheetState.minContentCol >= 0 ? Math.min(minCol, sheetState.minContentCol) : minCol,
-    maxMeaningfulRow >= 0 ? Math.min(maxRow, maxMeaningfulRow) : maxRow,
-    maxMeaningfulCol >= 0 ? Math.min(maxCol, maxMeaningfulCol) : maxCol
+    maxMeaningfulRow >= 0 ? maxContentRow >= 0 ? Math.min(maxRow, maxMeaningfulRow) : Math.max(maxRow, maxMeaningfulRow) : maxRow,
+    maxMeaningfulCol >= 0 ? maxContentCol >= 0 ? Math.min(maxCol, maxMeaningfulCol) : Math.max(maxCol, maxMeaningfulCol) : maxCol
   ];
 }
 function buildSheetList(nextWorkbook, structureAssets, showHiddenSheets = false) {
@@ -4601,6 +4593,20 @@ function buildSheetList(nextWorkbook, structureAssets, showHiddenSheets = false)
   for (let index = 0; index < nextWorkbook.sheetCount; index += 1) {
     const worksheet = nextWorkbook.getSheet(index);
     const sheetState = structureAssets?.sheetStatesByWorkbookSheetIndex[index] ?? null;
+    const mergeMetadata = resolveWorksheetMergeMetadata(worksheet);
+    const effectiveSheetState = {
+      ...sheetState,
+      ...mergeMetadata
+    };
+    const defaultColWidthPx = resolveWorksheetDefaultColumnWidthPixels(
+      worksheet,
+      sheetState?.columnWidthCharacterWidthPx,
+      sheetState?.defaultColWidthPx ?? DEFAULT_COL_WIDTH
+    );
+    const defaultRowHeightPx = resolveWorksheetDefaultRowHeightPixels(
+      worksheet,
+      sheetState?.defaultRowHeightPx ?? DEFAULT_ROW_HEIGHT
+    );
     const visibility = normalizeWorksheetVisibility2(worksheet.visibility);
     if (!showHiddenSheets && visibility !== "visible") {
       continue;
@@ -4610,14 +4616,14 @@ function buildSheetList(nextWorkbook, structureAssets, showHiddenSheets = false)
       if (width !== void 0 && width !== null) {
         return resolveSheetColumnWidthPixels(width, sheetState?.columnWidthCharacterWidthPx);
       }
-      return sheetState?.colWidthOverridesPx?.[col] ?? sheetState?.defaultColWidthPx ?? DEFAULT_COL_WIDTH;
+      return sheetState?.colWidthOverridesPx?.[col] ?? defaultColWidthPx;
     };
     const resolveRowHeightPx = (row) => {
       const height = worksheet.getRowHeight(row);
       if (height !== void 0 && height !== null) {
         return Math.max(Math.round(height * 1.33), 16);
       }
-      return sheetState?.rowHeightOverridesPx?.[row] ?? sheetState?.defaultRowHeightPx ?? DEFAULT_ROW_HEIGHT;
+      return sheetState?.rowHeightOverridesPx?.[row] ?? defaultRowHeightPx;
     };
     const usedRange = worksheet.usedRange();
     if (!usedRange) {
@@ -4630,13 +4636,13 @@ function buildSheetList(nextWorkbook, structureAssets, showHiddenSheets = false)
         colWidths: [],
         conditionalFormatRules: sheetState?.conditionalFormatRules ?? [],
         dataValidations: parseWorksheetDataValidations(worksheet),
-        defaultColWidthPx: sheetState?.defaultColWidthPx ?? DEFAULT_COL_WIDTH,
-        defaultRowHeightPx: sheetState?.defaultRowHeightPx ?? DEFAULT_ROW_HEIGHT,
+        defaultColWidthPx,
+        defaultRowHeightPx,
         freezePanes: parseWorksheetFreezePanes(worksheet),
-        hasHorizontalMerges: sheetState?.hasHorizontalMerges ?? false,
-        hasVerticalMerges: sheetState?.hasVerticalMerges ?? false,
-        maxHorizontalMergeEndCol: sheetState?.maxHorizontalMergeEndCol ?? -1,
-        maxVerticalMergeEndRow: sheetState?.maxVerticalMergeEndRow ?? -1,
+        hasHorizontalMerges: mergeMetadata.hasHorizontalMerges,
+        hasVerticalMerges: mergeMetadata.hasVerticalMerges,
+        maxHorizontalMergeEndCol: mergeMetadata.maxHorizontalMergeEndCol,
+        maxVerticalMergeEndRow: mergeMetadata.maxVerticalMergeEndRow,
         hiddenCols: sheetState?.hiddenCols ?? [],
         hiddenRows: sheetState?.hiddenRows ?? [],
         minUsedCol: -1,
@@ -4662,9 +4668,9 @@ function buildSheetList(nextWorkbook, structureAssets, showHiddenSheets = false)
       });
       continue;
     }
-    const [minRow, minCol, maxRow, maxCol] = resolveSheetDisplayUsedRange(usedRange, sheetState);
-    const hiddenRows = (sheetState?.hiddenRows ?? []).filter((row) => row >= 0 && row <= maxRow);
-    const hiddenCols = (sheetState?.hiddenCols ?? []).filter((col) => col >= 0 && col <= maxCol);
+    const [minRow, minCol, maxRow, maxCol] = resolveSheetDisplayUsedRange(usedRange, effectiveSheetState);
+    const hiddenRows = resolveWorksheetHiddenRows(worksheet, maxRow);
+    const hiddenCols = resolveWorksheetHiddenCols(worksheet, maxCol);
     sheetsByWorkbookSheetIndex.push({
       cachedFormulaValues: sheetState?.cachedFormulaValues ?? {},
       columnWidthCharacterWidthPx: sheetState?.columnWidthCharacterWidthPx,
@@ -4674,13 +4680,13 @@ function buildSheetList(nextWorkbook, structureAssets, showHiddenSheets = false)
       colWidths: [],
       conditionalFormatRules: sheetState?.conditionalFormatRules ?? [],
       dataValidations: parseWorksheetDataValidations(worksheet),
-      defaultColWidthPx: sheetState?.defaultColWidthPx ?? DEFAULT_COL_WIDTH,
-      defaultRowHeightPx: sheetState?.defaultRowHeightPx ?? DEFAULT_ROW_HEIGHT,
+      defaultColWidthPx,
+      defaultRowHeightPx,
       freezePanes: parseWorksheetFreezePanes(worksheet),
-      hasHorizontalMerges: sheetState?.hasHorizontalMerges ?? false,
-      hasVerticalMerges: sheetState?.hasVerticalMerges ?? false,
-      maxHorizontalMergeEndCol: sheetState?.maxHorizontalMergeEndCol ?? -1,
-      maxVerticalMergeEndRow: sheetState?.maxVerticalMergeEndRow ?? -1,
+      hasHorizontalMerges: mergeMetadata.hasHorizontalMerges,
+      hasVerticalMerges: mergeMetadata.hasVerticalMerges,
+      maxHorizontalMergeEndCol: mergeMetadata.maxHorizontalMergeEndCol,
+      maxVerticalMergeEndRow: mergeMetadata.maxVerticalMergeEndRow,
       hiddenCols,
       hiddenRows,
       minUsedCol: minCol,
@@ -4707,17 +4713,14 @@ function buildSheetList(nextWorkbook, structureAssets, showHiddenSheets = false)
   }
   return sheetsByWorkbookSheetIndex;
 }
-function mapWorksheetTables(worksheet, metadataForSheet) {
+function mapWorksheetTables(worksheet) {
   const rawTables = worksheet?.tables ?? [];
   return rawTables.flatMap((table, index) => {
     const rawColumns = Array.isArray(table.columns) ? table.columns : [];
     const rawName = typeof table.name === "string" ? table.name : `Table${index + 1}`;
     const rawDisplayName = typeof table.displayName === "string" ? table.displayName : typeof table.name === "string" ? table.name : `Table ${index + 1}`;
-    const metadata = metadataForSheet?.find(
-      (entry) => entry.name && entry.name === rawName || entry.displayName && entry.displayName === rawDisplayName || entry.reference && entry.reference === table.reference
-    );
     const rawReference = typeof table.reference === "string" ? table.reference : "";
-    const reference = metadata?.reference ?? rawReference;
+    const reference = rawReference;
     const parsedRange = parseA1RangeReference2(reference);
     if (!parsedRange) {
       return [];
@@ -4730,14 +4733,14 @@ function mapWorksheetTables(worksheet, metadataForSheet) {
       })),
       displayName: rawDisplayName,
       end: parsedRange.end,
-      headerRowCount: metadata?.headerRowCount ?? resolveWorkbookTableCount(table.headerRowCount, 1),
-      headerRowCellStyle: metadata?.headerRowCellStyle,
+      headerRowCount: resolveWorkbookTableCount(table.headerRowCount, 1),
+      headerRowCellStyle: typeof table.headerRowCellStyle === "string" ? table.headerRowCellStyle : void 0,
       name: rawName,
       reference,
       start: parsedRange.start,
       styleInfo: table.styleInfo,
-      totalsRowCount: metadata?.totalsRowCount ?? resolveWorkbookTableCount(table.totalsRowCount, 0),
-      totalsRowShown: metadata?.totalsRowShown ?? resolveWorkbookTableBoolean(table.totalsRowShown)
+      totalsRowCount: resolveWorkbookTableCount(table.totalsRowCount, 0),
+      totalsRowShown: resolveWorkbookTableBoolean(table.totalsRowShown)
     }];
   });
 }
@@ -4827,10 +4830,7 @@ async function loadWorkbook(buffer, skipXmlParsing = false, showHiddenSheets = f
   sheets = buildSheetList(nextWorkbook, structureAssets, showHiddenSheets);
   tablesByWorkbookSheetIndex = Array.from(
     { length: nextWorkbook.sheetCount },
-    (_, workbookSheetIndex) => mapWorksheetTables(
-      nextWorkbook.getSheet(workbookSheetIndex),
-      structureAssets?.tableMetadataByWorkbookSheetIndex[workbookSheetIndex] ?? null
-    )
+    (_, workbookSheetIndex) => mapWorksheetTables(nextWorkbook.getSheet(workbookSheetIndex))
   );
   const visibleSheetIndexByWorkbookSheetIndex = new Map(sheets.map((sheet, index) => [sheet.workbookSheetIndex, index]));
   const hasCharts = Array.from({ length: nextWorkbook.sheetCount }, (_, workbookSheetIndex) => {