@cj-tech-master/excelts 9.5.5 → 9.5.6

package/dist/types/modules/excel/worksheet.d.ts

@@ -339,6 +339,17 @@ declare class Worksheet {
      */
     private _spliceMerges;
     get hasMerges(): boolean;
+    /**
+     * Read-only enumeration of every merged region on this sheet
+     * (1-based, inclusive). Consumed by the formula engine's snapshot
+     * builder to detect `#SPILL!` conflicts. See issue #162 follow-up.
+     */
+    get mergedRegions(): ReadonlyArray<{
+        readonly top: number;
+        readonly left: number;
+        readonly bottom: number;
+        readonly right: number;
+    }>;
     /**
      * Scan the range and if any cell is part of a merge, un-merge the group.
      * Note this function can affect multiple merges and merge-blocks are

package/dist/types/modules/formula/integration/workbook-snapshot.d.ts

@@ -121,6 +121,18 @@ export interface WorksheetSnapshot {
     readonly hiddenRows: ReadonlySet<number>;
     /** Tables defined in this worksheet. */
     readonly tables: readonly TableSnapshot[];
+    /**
+     * Merged regions on this worksheet, as 1-based inclusive rectangles.
+     * Consulted by the writeback planner to reject `#SPILL!` conflicts;
+     * the evaluator does not need this since merge slaves are already
+     * filtered out of `cells`.
+     */
+    readonly mergedRegions: readonly {
+        readonly top: number;
+        readonly left: number;
+        readonly bottom: number;
+        readonly right: number;
+    }[];
 }
 /**
  * Column definition within a table.

package/dist/types/modules/formula/materialize/types.d.ts

@@ -23,18 +23,28 @@ export interface CellErrorValueLike {
  */
 export type FormulaResultLike = number | string | boolean | Date | CellErrorValueLike | undefined;
 /**
- * Numeric cell-type tag exposed by host cells. The engine only compares
- * against `Null` and `Formula`; any other value is treated as a scalar
- * literal.
+ * Numeric cell-type tag exposed by host cells. The engine compares
+ * against `Null`, `Merge`, and `Formula`; any other value is treated as
+ * a scalar literal.
+ *
+ * `Merge` identifies a non-master cell inside a merged region. The
+ * host's in-memory model may proxy `cell.value` from slaves to the
+ * master (see `MergeValue` in `@excel/cell`), so the snapshot builder
+ * must filter merge slaves out — otherwise range aggregates count the
+ * master's value once per slave. See issue #162.
  *
  * Kept as inline numeric literals (not an enum) so this file stays free
  * of runtime dependencies. The `const` object and `type` alias share a
  * name via TypeScript's declaration merging — the value form
  * (`CellValueTypeLike.Null`, `CellValueTypeLike.Formula`) is used at
  * comparison sites, the type form annotates `CellLike.type`.
+ *
+ * The numeric values must stay in sync with `ValueType` in
+ * `@excel/enums`, which is what `@excel/cell` writes into `cell.type`.
  */
 export declare const CellValueTypeLike: {
     readonly Null: 0;
+    readonly Merge: 1;
     readonly Formula: 6;
 };
 export type CellValueTypeLike = number;
@@ -118,6 +128,12 @@ export interface WorksheetLike {
     findCell(row: number, col: number): CellLike | undefined;
     getCell(row: number, col: number): CellLike;
     getTables?(): TableRefLike[];
+    /**
+     * Read-only enumeration of the worksheet's merged regions (1-based,
+     * inclusive). Optional for hosts that don't model merge state — the
+     * snapshot builder treats absence as "no merges".
+     */
+    readonly mergedRegions?: readonly DimensionsLike[];
 }
 /**
  * A complete defined name entry with all details.

package/dist/types/modules/pdf/font/system-fonts.d.ts

@@ -11,23 +11,43 @@
  * .ttc (TrueType Collection) files are supported — parseTtf() extracts
  * the first font from the collection automatically.
  *
- * Results are cached: the filesystem search runs only once per process.
+ * Discovery is exposed both as a generator
+ * ({@link iterateSystemFontCandidates}) for early-exit callers and as
+ * an array snapshot ({@link discoverSystemFontCandidates}) for tests
+ * and full enumeration. Once the full snapshot has been produced it is
+ * cached and replayed on subsequent calls; partial iterations rely on
+ * the OS page cache to make repeat reads of the same font files cheap.
  */
+/**
+ * Lazily yield discoverable system font candidates, in preference order.
+ *
+ * Each entry is the raw font file bytes of a `.ttf` or `.ttc` file.
+ * The caller decides which candidate to use (e.g. by checking cmap coverage).
+ *
+ * Iterating one candidate at a time lets callers `break` as soon as
+ * they find a match, avoiding the cost of recursively reading every
+ * font in every system font directory just to discard them.
+ */
+export declare function iterateSystemFontCandidates(): Generator<Uint8Array, void, void>;
 /**
  * Return all discoverable system font candidates, ordered by preference.
  *
  * Each entry is the raw font file bytes of a `.ttf` or `.ttc` file.
  * The caller decides which candidate to use (e.g. by checking cmap coverage).
  *
- * Results are cached — the filesystem scan runs only once per process.
+ * The full snapshot is cached: once produced, repeated calls return the
+ * same array without touching the filesystem.
+ *
+ * Prefer {@link iterateSystemFontCandidates} when you only need the
+ * first candidate that satisfies a predicate: it avoids reading every
+ * font in every system directory just to discard them.
  */
 export declare function discoverSystemFontCandidates(): Uint8Array[];
 /**
  * Search for a system font suitable for Unicode rendering.
  *
  * Returns the raw font file bytes of the highest-priority candidate,
- * or `null` if no font was found. This is a convenience wrapper around
- * {@link discoverSystemFontCandidates}.
+ * or `null` if no font was found.
  */
 export declare function discoverSystemFont(): Uint8Array | null;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cj-tech-master/excelts",
-  "version": "9.5.5",
+  "version": "9.5.6",
   "description": "Zero-dependency TypeScript toolkit — Excel (XLSX), PDF, CSV, Markdown, XML, ZIP/TAR, and streaming.",
   "keywords": [
     "archive",