@particle-academy/holy-sheet 2.1.0 → 2.2.0

package/dist/index.cjs

@@ -511,16 +511,6 @@ var Normalizer = class {
   }
   normalizeSheet(sheet) {
     const name = String(sheet.name);
-    if (sheet.cells != null) {
-      return new Sheet(
-        name,
-        this.normalizeCellMap(sheet.cells),
-        this.normalizeMerges(sheet.mergedRegions ?? []),
-        this.normalizeColumnWidths(sheet.columnWidths ?? {}),
-        toInt(sheet.frozenRows ?? 0),
-        toInt(sheet.frozenCols ?? 0)
-      );
-    }
     const cells = /* @__PURE__ */ new Map();
     const columns = sheet.columns ?? [];
     const rows = sheet.rows ?? [];
@@ -572,6 +562,22 @@ var Normalizer = class {
         cells.set(address, new Cell(address, null, `${excelFunc}(${rangeStart}:${rangeEnd})`, combined));
       }
     }
+    if (sheet.cells != null) {
+      for (const [address, cell] of this.normalizeCellMap(sheet.cells)) {
+        const beneath = cells.get(address);
+        cells.set(
+          address,
+          beneath?.format ? new Cell(
+            cell.address,
+            cell.value,
+            cell.formula,
+            beneath.format.mergeWith(cell.format),
+            cell.comment,
+            cell.cachedValue
+          ) : cell
+        );
+      }
+    }
     return new Sheet(
       name,
       cells,
@@ -584,12 +590,20 @@ var Normalizer = class {
   normalizeCellMap(map) {
     const cells = /* @__PURE__ */ new Map();
     for (const [address, cellData] of Object.entries(map)) {
-      const format = cellData && isPlainObject(cellData.format) ? CellFormat.fromInput(cellData.format) : null;
-      const comment = cellData && isPlainObject(cellData.comment) ? new CellComment(
+      if (!isPlainObject(cellData)) {
+        const [bare, formula] = promoteFormula(cellData);
+        cells.set(
+          address,
+          new Cell(address, formula !== null ? null : this.coerceValue(bare, null), formula)
+        );
+        continue;
+      }
+      const format = isPlainObject(cellData.format) ? CellFormat.fromInput(cellData.format) : null;
+      const comment = isPlainObject(cellData.comment) ? new CellComment(
         String(cellData.comment.text ?? ""),
         cellData.comment.author ?? null,
         cellData.comment.color ?? null
-      ) : null;
+      ) : typeof cellData.comment === "string" ? new CellComment(cellData.comment) : null;
       const rawValue = cellData?.value ?? null;
       cells.set(
         address,
@@ -662,7 +676,13 @@ var Normalizer = class {
         value.computedValue ?? null
       );
     }
-    return new Cell(address, this.coerceValue(value, columnFormat), null, columnFormat);
+    const [bare, formula] = promoteFormula(value);
+    return new Cell(
+      address,
+      formula !== null ? null : this.coerceValue(bare, columnFormat),
+      formula,
+      columnFormat
+    );
   }
   coerceValue(value, format) {
     if (value === null || value === void 0) return null;
@@ -684,6 +704,12 @@ var Normalizer = class {
     return value;
   }
 };
+function promoteFormula(value) {
+  if (typeof value === "string" && value.length > 1 && value[0] === "=") {
+    return [null, value.slice(1)];
+  }
+  return [value, null];
+}
 function toInt(v) {
   const n = Math.trunc(Number(v));
   return Number.isFinite(n) ? n : 0;