@univerjs-pro/engine-formula-rust 1.0.0-insiders.20260809-70eefdd → 1.0.0

package/lib/types/index.d.ts

@@ -1,6 +1,6 @@
 import { Buffer } from "node:buffer";
-import { FormulaDataModel, IAllRuntimeData, ICalculateFormulaService, IExecutionInProgressParams, IFeatureCalculationManagerService, IFeatureDirtyRangeType, IFormulaCurrentConfigService, IFormulaDatasetConfig, IFormulaDependencyGenerator, IFormulaDependencyTreeJson, IFormulaExecuteResultMap, IFormulaRuntimeService, IFormulaStringMap, IOtherFormulaManagerService, IRuntimeUnitDataType, ISetArrayFormulaDataMutationParams, ISetFormulaCalculationResultMutation, ISuperTableService, IUnitRowData, IUniverEngineFormulaConfig } from "@univerjs/engine-formula";
-import { Dependency, Disposable, ICommandService, IConfigService, IUnitRange as IUnitRange$1, IWorkbookData, Injector, Nullable } from "@univerjs/core";
+import { FormulaDataModel, IAllRuntimeData, ICalculateFormulaService, IDefinedNamesService, IExecutionInProgressParams, IFeatureCalculationManagerService, IFeatureDirtyRangeType, IFormulaCurrentConfigService, IFormulaDatasetConfig, IFormulaDependencyGenerator, IFormulaDependencyTreeJson, IFormulaExecuteResultMap, IFormulaRuntimeService, IFormulaStringMap, IOtherFormulaManagerService, IRuntimeUnitDataType, ISetArrayFormulaDataMutationParams, ISetFormulaCalculationResultMutation, ISuperTableService, IUnitRowData, IUniverEngineFormulaConfig } from "@univerjs/engine-formula";
+import { BooleanNumber, Dependency, Disposable, FormulaType, ICellData, ICommandService, IConfigService, IUnitRange as IUnitRange$1, IWorkbookData, Injector, Nullable } from "@univerjs/core";
 import { ExternalReferenceModel, IFormulaReferenceDataService, UniverProFormulaEnginePlugin } from "@univerjs-pro/engine-formula";
 import { Subject } from "rxjs";
 import { ISheetBlock, ISnapshot } from "@univerjs/protocol";
@@ -100,8 +100,10 @@ interface IFormulaExecutionInput {
   unitData: Record<string, Record<string, ISheetData>>;
   dirtyRanges: IUnitRange[];
   definedNames: Record<string, IDefinedName>;
+  queryFormulas?: Record<string, Record<string, Record<number, Record<number, string[]>>>>;
 }
 interface ISheetData {
+  name?: string;
   cellData: Record<number, Record<number, ICellValue>>;
   rowCount: number;
   columnCount: number;
@@ -111,11 +113,14 @@ interface ICellValue {
   t?: number;
   p?: unknown;
   f?: string;
+  ft?: FormulaType;
+  fd?: BooleanNumber;
   si?: string;
   ref?: string;
   dynamicArrayRef?: string;
   xf?: string;
   s?: unknown;
+  numberFormat?: string;
   displayPrecision?: number;
 }
 interface IUnitRange {
@@ -130,11 +135,17 @@ interface IRange {
   endColumn: number;
 }
 interface IDefinedName {
+  unitId?: string;
+  localSheetId?: string;
   name: string;
   formula?: string;
   range?: IRange;
 }
 interface IFormulaExecutionOutput {
+  queryResults?: Record<string, Record<string, Record<number, Record<number, Array<{
+    formula: string;
+    value: unknown;
+  }>>>>>;
   runtimeData: Record<string, Record<string, Record<number, Record<number, unknown>>>>;
   arrayFormulaRange: Record<string, Record<string, Record<number, Record<number, IRange>>>>;
   cycleDependencies: ICycleDependencyInfo[];
@@ -159,6 +170,7 @@ interface IRustEngineSnapshot {
 interface IRustWorkbookSnapshot {
   unitId: string;
   name?: string;
+  dateSystem?: 'date1900' | 'date1904';
   sheets: IRustSheetSnapshot[];
   calculation?: IRustWorkbookCalculationSnapshot;
   resources?: Record<string, IRustResourceSnapshot>;
@@ -513,6 +525,9 @@ interface IRustProjectionWorkbookInput {
   snapshot: IWorkbookData;
   unitId?: string;
   definedNames?: Record<string, IRustDefinedNameSnapshot>;
+  styleResolver?: {
+    getStyleByCell(cell: ICellData): unknown;
+  };
 }
 interface IFormulaCalculationError {
   code: string;
@@ -587,12 +602,14 @@ declare class RustEngineSyncController extends Disposable {
   private _nativeReady;
   private _snapshotLoaded;
   private _projectionLoadPromise;
+  private _projectionDeltaBarrier;
   private readonly _pendingMutations;
   private readonly _projectionManagedTableUnits;
   constructor(_commandService: ICommandService);
   private _initialize;
   loadProjection(workbooks: readonly IRustProjectionWorkbookInput[]): Promise<void>;
   waitForProjectionLoad(): Promise<void>;
+  setProjectionDeltaBarrier(barrier: Promise<void>): void;
   private _loadProjection;
   applyProjectionMutation(mutation: IRustEngineMutation): void;
   upsertProjectionWorkbook(workbook: IRustProjectionWorkbookInput): void;
@@ -818,6 +835,7 @@ declare class RustCalculateFormulaService extends Disposable implements IRustCal
   private readonly _formulaReferenceDataService;
   private readonly _excelExternalReferenceModel;
   private readonly _superTableService;
+  private readonly _definedNamesService;
   protected readonly _executionInProgressListener$: Subject<IExecutionInProgressParams>;
   readonly executionInProgressListener$: import("rxjs").Observable<IExecutionInProgressParams>;
   protected readonly _executionCompleteListener$: Subject<IAllRuntimeData>;
@@ -832,7 +850,7 @@ declare class RustCalculateFormulaService extends Disposable implements IRustCal
   private _externalRequestGeneration;
   private readonly _externalInflight;
   private readonly _externalCompleted;
-  constructor(_configService: IConfigService, _currentConfigService: IFormulaCurrentConfigService, _runtimeService: IFormulaRuntimeService, _formulaDependencyGenerator: IFormulaDependencyGenerator, _featureCalculationManagerService: IFeatureCalculationManagerService, _otherFormulaManagerService: IOtherFormulaManagerService, _commandService: ICommandService, _rustEngineSyncController: RustEngineSyncController, _formulaDataModel: FormulaDataModel, _formulaReferenceDataService: IFormulaReferenceDataService, _excelExternalReferenceModel: ExternalReferenceModel, _superTableService: ISuperTableService);
+  constructor(_configService: IConfigService, _currentConfigService: IFormulaCurrentConfigService, _runtimeService: IFormulaRuntimeService, _formulaDependencyGenerator: IFormulaDependencyGenerator, _featureCalculationManagerService: IFeatureCalculationManagerService, _otherFormulaManagerService: IOtherFormulaManagerService, _commandService: ICommandService, _rustEngineSyncController: RustEngineSyncController, _formulaDataModel: FormulaDataModel, _formulaReferenceDataService: IFormulaReferenceDataService, _excelExternalReferenceModel: ExternalReferenceModel, _superTableService: ISuperTableService, _definedNamesService: IDefinedNamesService);
   dispose(): void;
   stopFormulaExecution(): void;
   setRuntimeFeatureCellData(featureId: string, featureData: IRuntimeUnitDataType): void;
@@ -860,6 +878,7 @@ declare class RustCalculateFormulaService extends Disposable implements IRustCal
   private _serializeCellData;
   private _applyRustOutput;
   private _applyRustDependencyOutput;
+  private _mergeRuntimeUnitData;
   calculate(formulaString: string): Promise<{} | null>;
   executeFormulas(formulas: IFormulaStringMap, rowData?: IUnitRowData): Promise<IFormulaExecuteResultMap>;
   getAllDependencyJson(_rowData?: IUnitRowData): Promise<IFormulaDependencyTreeJson[]>;
@@ -886,7 +905,7 @@ declare class RustCalculateFormulaService extends Disposable implements IRustCal
     dependents: IFormulaDependencyTreeJson[];
     inRanges: IFormulaDependencyTreeJson[];
   }>;
-  private _formulaStringMapToFormulaData;
+  private _formulaStringMapToQueryData;
   private _formulaExecutionOutputToResultMap;
   private _getRustDependencyGraph;
   private _getRustInspectGraph;

package/package.json

@@ -1,49 +1,38 @@
 {
-    "author": "DreamNum Co., Ltd. <developer@univer.ai>",
-    "dependencies": {
-        "@univerjs-pro/engine-formula": "1.0.0-insiders.20260809-70eefdd",
-        "@univerjs-pro/engine-formula-rust-binding": "1.0.0-insiders.20260805-b15e7f3",
-        "@univerjs/core": "1.0.0-insiders.20260809-70eefdd",
-        "@univerjs/engine-formula": "1.0.0-insiders.20260809-70eefdd",
-        "@univerjs/protocol": "1.0.0-insiders.20260809-70eefdd"
-    },
-    "description": "Rust-backed formula engine plugin for Univer",
-    "files": [
-        "lib"
-    ],
-    "name": "@univerjs-pro/engine-formula-rust",
-    "peerDependencies": {
-        "rxjs": ">=7.0.0"
-    },
-    "repository": {
-        "type": "git",
-        "url": "https://github.com/dream-num/univer-rs"
-    },
-    "type": "module",
-    "version": "1.0.0-insiders.20260809-70eefdd",
-    "main": "./lib/cjs/index.cjs",
-    "module": "./lib/es/index.js",
-    "types": "./lib/types/index.d.ts",
-    "exports": {
-        ".": {
-            "types": "./lib/types/index.d.ts",
-            "import": "./lib/es/index.js",
-            "require": "./lib/cjs/index.cjs",
-            "default": "./lib/es/index.js"
-        }
-    },
-    "publishConfig": {
-        "main": "./lib/cjs/index.cjs",
-        "module": "./lib/es/index.js",
-        "types": "./lib/types/index.d.ts",
-        "exports": {
-            ".": {
-                "types": "./lib/types/index.d.ts",
-                "import": "./lib/es/index.js",
-                "require": "./lib/cjs/index.cjs",
-                "default": "./lib/es/index.js"
-            }
-        },
-        "access": "public"
+  "author": "DreamNum Co., Ltd. <developer@univer.ai>",
+  "dependencies": {
+    "@univerjs-pro/engine-formula": "1.0.0",
+    "@univerjs-pro/engine-formula-rust-binding": "1.0.0",
+    "@univerjs/core": "1.0.0",
+    "@univerjs/engine-formula": "1.0.0",
+    "@univerjs/protocol": "1.0.0"
+  },
+  "description": "Rust-backed formula engine plugin for Univer",
+  "files": [
+    "lib"
+  ],
+  "name": "@univerjs-pro/engine-formula-rust",
+  "peerDependencies": {
+    "rxjs": ">=7.0.0"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dream-num/univer-rs"
+  },
+  "type": "module",
+  "version": "1.0.0",
+  "main": "./lib/cjs/index.cjs",
+  "module": "./lib/es/index.js",
+  "types": "./lib/types/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/types/index.d.ts",
+      "import": "./lib/es/index.js",
+      "require": "./lib/cjs/index.cjs",
+      "default": "./lib/es/index.js"
     }
-}
+  },
+  "publishConfig": {
+    "access": "public"
+  }
+}