@ai-matrx/office 0.8.19 → 0.8.21

package/dist/collab-sheets-transform.d.cts

@@ -45,7 +45,7 @@ interface SheetRange {
  * column width, worksheet name. C5b: formula text in cells (`f`, array `ref`) and defined names. Shared
  * formulas (`si`) stay barriers (see transform.ts cellBarrier); ranged resources are C5c.
  */
-type SheetFamily = "cell" | "structure" | "merge" | "size" | "name" | "defname";
+type SheetFamily = "cell" | "structure" | "merge" | "size" | "name" | "defname" | "numfmt" | "count" | "sheet";
 interface CoveredEntry {
     readonly kind: "covered";
     readonly family: SheetFamily;
@@ -103,7 +103,7 @@ declare function mapIndex(op: AxisOp, i: number): number | null;
  */
 declare function transformAxis(x: AxisOp, y: AxisOp, side: Side): AxisOp[] | null;
 
-declare const SHEET_TRANSFORMER_VERSION = "c5b-1";
+declare const SHEET_TRANSFORMER_VERSION = "c5c-1";
 /**
  * Pairs the fuzz proved divergent (or that have no transform yet), as unordered mutation-id pairs, with the
  * failing seed. Each returns a Barrier until it has its own correct transform under a new proto.
@@ -125,6 +125,24 @@ declare function mergeThrough(s: Structural, m: SheetRange): {
     range: SheetRange | null;
     fixup: boolean;
 };
+/**
+ * The merge fixups a structural mutation is owed but Univer's command did not make (C5c). The transform's model
+ * (`mergeThrough`) is "every merge the change cuts through is moved by the command"; Univer 1.0.4 only fixes the
+ * merges that intersect the COMMAND's range on the other axis (a `-by-range` call with a partial range, an API
+ * call) and only when its ref-range registration is current (it is refreshed on sheet activation, add-merge and
+ * structural mutations, never after a content load or a remove-merge). A cut merge it skipped stays where it was on
+ * the sender, while every transform moves it: chains of such ops diverged by a column (the session fuzz's
+ * column -1 vs 0). Capture therefore completes the command: right BEFORE the structural mutation it removes the
+ * cut merges still on the sheet (`remove`, exact, at their pre-change positions), and right AFTER it adds their
+ * model positions (`add`). The same shape as Univer's own remove/move fixups, so every transform rule applies.
+ * `mergesBefore` = the sheet's merges right before the mutation runs (after the command's own pre-removals).
+ */
+declare function mergeFixupsOwed(m: SheetMutation, mergesBefore: readonly SheetRange[]): {
+    remove: SheetRange[];
+    add: SheetRange[];
+} | null;
+/** True for the six row/column structural mutation ids. */
+declare const isStructuralMutation: (m: SheetMutation) => boolean;
 /**
  * Rewrites every remove-merge in a group to name the exact merges it removes. Univer removes every merge a
  * range intersects, and the unmerge command sends the SELECTION; a selection does not move the way the
@@ -142,7 +160,7 @@ declare const CONTENT_KEYS: readonly ["v", "t", "p", "f", "si", "custom", "ref",
  */
 declare function completeCellContent(entry: Cell, post: Record<string, unknown> | null | undefined): Cell;
 /** Params that travel for the transformer only; `forApply` strips them before Univer sees the mutation. */
-declare const SIDE_CAR_PARAMS: readonly ["refSheets", "previousName", "derived"];
+declare const SIDE_CAR_PARAMS: readonly ["refSheets", "previousName", "derived", "sheetIndex", "sheetsLeft"];
 declare function forApply(m: SheetMutation): SheetMutation;
 /**
  * Capture-time annotation (C6 calls it per group, like completeCellContent): every op whose formula text
@@ -152,6 +170,16 @@ declare function forApply(m: SheetMutation): SheetMutation;
  * `definedNames` defined-name id → name, both read right before the command ran.
  */
 declare function annotateFormulas(group: SheetGroup, sheets: Readonly<Record<string, string>>, definedNames: Readonly<Record<string, string>>): SheetMutation[];
+/** Where a span [lo, hi] of one axis lands after an axis op: the pieces that survive, merged. */
+declare function spanThrough(op: AxisOp, lo: number, hi: number): Array<[number, number]>;
+/**
+ * Capture-time annotation for sheet ops (the port calls it per group, like annotateFormulas): a remove-sheet gets
+ * `sheetIndex` (the removed sheet's index right before it) and `sheetsLeft` (sheets after it), an insert-sheet without `index` gets its append index.
+ * `sheetOrder` = the workbook's sheet order right before the command.
+ */
+declare function annotateSheetOps(group: SheetGroup, sheetOrder: readonly string[]): SheetMutation[];
+/** Style ids inside a sheet's data replaced by their objects (style ids are seat-local, C0 surprise 4). */
+declare function inlineSheetStyles(sheet: Record<string, unknown>, styleOf: (id: string) => unknown): Record<string, unknown>;
 /** x over y for single mutations. */
 declare function transformMutation(x: SheetMutation, y: SheetMutation, side: Side): TransformResult;
 /** Command group x rewritten to apply after command group y. One Barrier makes the whole group a barrier. */
@@ -214,4 +242,4 @@ declare function refSheetsAfter(refSheets: RefSheets | undefined, change: RefCha
 /** `refSheets` for the given formula texts: every sheet name they qualify a reference with, resolved now. */
 declare function refSheetsFor(texts: Iterable<string>, sheets: Readonly<Record<string, string>>): RefSheets | undefined;
 
-export { type Axis, type AxisOp, type Barrier, type BarrierEntry, CONTENT_KEYS, type CoveredEntry, type FormulaCtx, type NeverEntry, PAIR_BARRIERS, REF_ERROR, type RefChange, type RefSheets, type RegistryEntry, type Rewritten, SHEET_MUTATIONS, SHEET_TRANSFORMER_VERSION, SIDE_CAR_PARAMS, type SheetFamily, type SheetGroup, type SheetMutation, type SheetRange, type Side, type TransformResult, type Transformed, allowParams, annotateFormulas, cellRef, completeCellContent, exactMergeRemovals, forApply, formulaBarrier, isBarrier, isFormulaText, mapIndex, mergeThrough, refSheetsAfter, refSheetsFor, rewriteFormula, sheetTransformer, transformAxis, transformGroup, transformMutation };
+export { type Axis, type AxisOp, type Barrier, type BarrierEntry, CONTENT_KEYS, type CoveredEntry, type FormulaCtx, type NeverEntry, PAIR_BARRIERS, REF_ERROR, type RefChange, type RefSheets, type RegistryEntry, type Rewritten, SHEET_MUTATIONS, SHEET_TRANSFORMER_VERSION, SIDE_CAR_PARAMS, type SheetFamily, type SheetGroup, type SheetMutation, type SheetRange, type Side, type TransformResult, type Transformed, allowParams, annotateFormulas, annotateSheetOps, cellRef, completeCellContent, exactMergeRemovals, forApply, formulaBarrier, inlineSheetStyles, isBarrier, isFormulaText, isStructuralMutation, mapIndex, mergeFixupsOwed, mergeThrough, refSheetsAfter, refSheetsFor, rewriteFormula, sheetTransformer, spanThrough, transformAxis, transformGroup, transformMutation };

package/dist/collab-sheets-transform.d.ts

@@ -45,7 +45,7 @@ interface SheetRange {
  * column width, worksheet name. C5b: formula text in cells (`f`, array `ref`) and defined names. Shared
  * formulas (`si`) stay barriers (see transform.ts cellBarrier); ranged resources are C5c.
  */
-type SheetFamily = "cell" | "structure" | "merge" | "size" | "name" | "defname";
+type SheetFamily = "cell" | "structure" | "merge" | "size" | "name" | "defname" | "numfmt" | "count" | "sheet";
 interface CoveredEntry {
     readonly kind: "covered";
     readonly family: SheetFamily;
@@ -103,7 +103,7 @@ declare function mapIndex(op: AxisOp, i: number): number | null;
  */
 declare function transformAxis(x: AxisOp, y: AxisOp, side: Side): AxisOp[] | null;
 
-declare const SHEET_TRANSFORMER_VERSION = "c5b-1";
+declare const SHEET_TRANSFORMER_VERSION = "c5c-1";
 /**
  * Pairs the fuzz proved divergent (or that have no transform yet), as unordered mutation-id pairs, with the
  * failing seed. Each returns a Barrier until it has its own correct transform under a new proto.
@@ -125,6 +125,24 @@ declare function mergeThrough(s: Structural, m: SheetRange): {
     range: SheetRange | null;
     fixup: boolean;
 };
+/**
+ * The merge fixups a structural mutation is owed but Univer's command did not make (C5c). The transform's model
+ * (`mergeThrough`) is "every merge the change cuts through is moved by the command"; Univer 1.0.4 only fixes the
+ * merges that intersect the COMMAND's range on the other axis (a `-by-range` call with a partial range, an API
+ * call) and only when its ref-range registration is current (it is refreshed on sheet activation, add-merge and
+ * structural mutations, never after a content load or a remove-merge). A cut merge it skipped stays where it was on
+ * the sender, while every transform moves it: chains of such ops diverged by a column (the session fuzz's
+ * column -1 vs 0). Capture therefore completes the command: right BEFORE the structural mutation it removes the
+ * cut merges still on the sheet (`remove`, exact, at their pre-change positions), and right AFTER it adds their
+ * model positions (`add`). The same shape as Univer's own remove/move fixups, so every transform rule applies.
+ * `mergesBefore` = the sheet's merges right before the mutation runs (after the command's own pre-removals).
+ */
+declare function mergeFixupsOwed(m: SheetMutation, mergesBefore: readonly SheetRange[]): {
+    remove: SheetRange[];
+    add: SheetRange[];
+} | null;
+/** True for the six row/column structural mutation ids. */
+declare const isStructuralMutation: (m: SheetMutation) => boolean;
 /**
  * Rewrites every remove-merge in a group to name the exact merges it removes. Univer removes every merge a
  * range intersects, and the unmerge command sends the SELECTION; a selection does not move the way the
@@ -142,7 +160,7 @@ declare const CONTENT_KEYS: readonly ["v", "t", "p", "f", "si", "custom", "ref",
  */
 declare function completeCellContent(entry: Cell, post: Record<string, unknown> | null | undefined): Cell;
 /** Params that travel for the transformer only; `forApply` strips them before Univer sees the mutation. */
-declare const SIDE_CAR_PARAMS: readonly ["refSheets", "previousName", "derived"];
+declare const SIDE_CAR_PARAMS: readonly ["refSheets", "previousName", "derived", "sheetIndex", "sheetsLeft"];
 declare function forApply(m: SheetMutation): SheetMutation;
 /**
  * Capture-time annotation (C6 calls it per group, like completeCellContent): every op whose formula text
@@ -152,6 +170,16 @@ declare function forApply(m: SheetMutation): SheetMutation;
  * `definedNames` defined-name id → name, both read right before the command ran.
  */
 declare function annotateFormulas(group: SheetGroup, sheets: Readonly<Record<string, string>>, definedNames: Readonly<Record<string, string>>): SheetMutation[];
+/** Where a span [lo, hi] of one axis lands after an axis op: the pieces that survive, merged. */
+declare function spanThrough(op: AxisOp, lo: number, hi: number): Array<[number, number]>;
+/**
+ * Capture-time annotation for sheet ops (the port calls it per group, like annotateFormulas): a remove-sheet gets
+ * `sheetIndex` (the removed sheet's index right before it) and `sheetsLeft` (sheets after it), an insert-sheet without `index` gets its append index.
+ * `sheetOrder` = the workbook's sheet order right before the command.
+ */
+declare function annotateSheetOps(group: SheetGroup, sheetOrder: readonly string[]): SheetMutation[];
+/** Style ids inside a sheet's data replaced by their objects (style ids are seat-local, C0 surprise 4). */
+declare function inlineSheetStyles(sheet: Record<string, unknown>, styleOf: (id: string) => unknown): Record<string, unknown>;
 /** x over y for single mutations. */
 declare function transformMutation(x: SheetMutation, y: SheetMutation, side: Side): TransformResult;
 /** Command group x rewritten to apply after command group y. One Barrier makes the whole group a barrier. */
@@ -214,4 +242,4 @@ declare function refSheetsAfter(refSheets: RefSheets | undefined, change: RefCha
 /** `refSheets` for the given formula texts: every sheet name they qualify a reference with, resolved now. */
 declare function refSheetsFor(texts: Iterable<string>, sheets: Readonly<Record<string, string>>): RefSheets | undefined;
 
-export { type Axis, type AxisOp, type Barrier, type BarrierEntry, CONTENT_KEYS, type CoveredEntry, type FormulaCtx, type NeverEntry, PAIR_BARRIERS, REF_ERROR, type RefChange, type RefSheets, type RegistryEntry, type Rewritten, SHEET_MUTATIONS, SHEET_TRANSFORMER_VERSION, SIDE_CAR_PARAMS, type SheetFamily, type SheetGroup, type SheetMutation, type SheetRange, type Side, type TransformResult, type Transformed, allowParams, annotateFormulas, cellRef, completeCellContent, exactMergeRemovals, forApply, formulaBarrier, isBarrier, isFormulaText, mapIndex, mergeThrough, refSheetsAfter, refSheetsFor, rewriteFormula, sheetTransformer, transformAxis, transformGroup, transformMutation };
+export { type Axis, type AxisOp, type Barrier, type BarrierEntry, CONTENT_KEYS, type CoveredEntry, type FormulaCtx, type NeverEntry, PAIR_BARRIERS, REF_ERROR, type RefChange, type RefSheets, type RegistryEntry, type Rewritten, SHEET_MUTATIONS, SHEET_TRANSFORMER_VERSION, SIDE_CAR_PARAMS, type SheetFamily, type SheetGroup, type SheetMutation, type SheetRange, type Side, type TransformResult, type Transformed, allowParams, annotateFormulas, annotateSheetOps, cellRef, completeCellContent, exactMergeRemovals, forApply, formulaBarrier, inlineSheetStyles, isBarrier, isFormulaText, isStructuralMutation, mapIndex, mergeFixupsOwed, mergeThrough, refSheetsAfter, refSheetsFor, rewriteFormula, sheetTransformer, spanThrough, transformAxis, transformGroup, transformMutation };