@ricsam/excel-to-formula-engine 0.2.1 → 0.2.2

package/dist/index.mjs

@@ -216,6 +216,11 @@ function parseWorksheet(pkg, partPath, sharedStrings) {
 function parseCells(worksheet, sharedStrings, result) {
   const sheetData = worksheet["sheetData"];
   const shared = new Map;
+  const columnStyles = asArray(worksheet["cols"]?.["col"]).map((col) => ({
+    min: numAttr(col, "min"),
+    max: numAttr(col, "max"),
+    style: numAttr(col, "style")
+  })).filter((col) => col.min !== undefined && col.max !== undefined && col.style !== undefined);
   for (const rawRow of asArray(sheetData?.["row"])) {
     const row = rawRow;
     const rowNumber = numAttr(row, "r");
@@ -233,11 +238,14 @@ function parseCells(worksheet, sharedStrings, result) {
       if (!address) {
         continue;
       }
-      const styleIndex = numAttr(cell, "s");
+      const explicitStyle = numAttr(cell, "s");
+      const rowStyle = boolAttr(row, "customFormat") ? numAttr(row, "s") : undefined;
+      const columnStyle = columnStyles.findLast((col) => address.colIndex + 1 >= col.min && address.colIndex + 1 <= col.max)?.style;
+      const styleIndex = explicitStyle ?? rowStyle ?? columnStyle ?? 0;
       const type = attr(cell, "t") ?? "n";
       const formula = readFormula(cell, address, shared);
       const { kind, value } = readValue(cell, type, sharedStrings);
-      if (kind === "empty" && formula === undefined && styleIndex === undefined) {
+      if (kind === "empty" && formula === undefined && explicitStyle === undefined && rowStyle === undefined && columnStyle === undefined) {
         continue;
       }
       result.cells.push({
@@ -627,14 +635,19 @@ function parseStyles(pkg) {
   const fills = asArray(styleSheet["fills"]?.["fill"]);
   const borders = asArray(styleSheet["borders"]?.["border"]);
   const cellXfs = asArray(styleSheet["cellXfs"]?.["xf"]);
+  const styleXfs = asArray(styleSheet["cellStyleXfs"]?.["xf"]);
   const formats = cellXfs.map((rawXf) => {
     const xf = rawXf;
     const style = {};
-    if (boolAttr(xf, "applyFont", true)) {
-      const font = fonts[numAttr(xf, "fontId") ?? -1];
-      if (font) {
-        applyFont(style, font, theme, indexedColors);
-      }
+    const baseXf = styleXfs[numAttr(xf, "xfId") ?? -1];
+    const baseFontId = boolAttr(baseXf, "applyFont", true) ? numAttr(baseXf, "fontId") ?? 0 : 0;
+    const fontId = boolAttr(xf, "applyFont", true) ? numAttr(xf, "fontId") ?? baseFontId : baseFontId;
+    const font = fonts[fontId];
+    if (font) {
+      style.bold = false;
+      style.italic = false;
+      style.underline = false;
+      applyFont(style, font, theme, indexedColors);
     }
     if (boolAttr(xf, "applyFill", true)) {
       const fill = fills[numAttr(xf, "fillId") ?? -1];
@@ -679,14 +692,18 @@ function parseStyles(pkg) {
   return { formats, differentialFormats };
 }
 function applyFont(style, font, theme, indexedColors) {
-  if (font["b"] !== undefined && isOn(font["b"])) {
-    style.bold = true;
+  const fontFamily = attr(font["name"], "val");
+  if (fontFamily) {
+    style.fontFamily = fontFamily;
+  }
+  if (font["b"] !== undefined) {
+    style.bold = isOn(font["b"]);
   }
-  if (font["i"] !== undefined && isOn(font["i"])) {
-    style.italic = true;
+  if (font["i"] !== undefined) {
+    style.italic = isOn(font["i"]);
   }
-  if (font["u"] !== undefined && isOn(font["u"])) {
-    style.underline = true;
+  if (font["u"] !== undefined) {
+    style.underline = attr(font["u"], "val") !== "none";
   }
   const size = numAttr(font["sz"], "val");
   if (size !== undefined) {
@@ -1379,6 +1396,7 @@ async function convertWorkbook(source, options = {}) {
     cellStyles: cellStyles.length > 0 ? cellStyles : undefined,
     conditionalStyles: conditionalStyles.length > 0 ? conditionalStyles : undefined,
     workbookMetadata: {
+      defaultCellStyle: importStyles ? styleTable.formats[0]?.style : undefined,
       fileName: options.fileName,
       sheetOrder: sheetEntries.map((entry) => entry.name),
       diagnostics: diagnostics.length > 0 ? diagnostics : undefined
@@ -1860,4 +1878,4 @@ export {
   translateFormula
 };
 
-//# debugId=261D0E01F4A42BBA64756E2164756E21
+//# debugId=1D4DFA6797056BB064756E2164756E21