@univerjs-pro/engine-formula 1.0.0-alpha.2 → 1.0.0-alpha.3

package/lib/types/engine/formula-dependency.d.ts

@@ -1,6 +1,6 @@
 import type { IUnitRange, Nullable } from '@univerjs/core';
 import type { BaseAstNode, IFormulaDataItem, IFormulaDependencyTree, IFormulaDependencyTreeJson, IUnitData } from '@univerjs/engine-formula';
-import type { DynamicResolver } from './dependency-engine';
+import type { DynamicResolver } from './dependency-engine/types';
 import type { ISharedFormulaCompressionMetrics } from './shared-formula-group-analyzer';
 import { FormulaDependencyGenerator, FormulaDependencyTree, FormulaDependencyTreeType } from '@univerjs/engine-formula';
 export interface IFormulaCalculationTree {
@@ -37,14 +37,14 @@ export declare class FormulaDependencyProGenerator extends FormulaDependencyGene
     clearCachedCalculationNodeData(): void;
     clearCachedCalculationTree(): void;
     getCachedCalculationNodeData(nodeIndex: number): IFormulaCalculationNodeData | undefined;
-    getCalculationOrder(): import("./dependency-engine").ICalculationOrderResult;
+    getCalculationOrder(): import("./dependency-engine/types").ICalculationOrderResult;
     getSharedFormulaCompressionMetrics(): ISharedFormulaCompressionMetrics;
     hasDynamicDepsByIndex(nodeIndex: number): boolean;
     refreshDynamicDepsByIndex(nodeIndex: number, resolver: DynamicResolver): boolean;
     hasUncalculatedDirtyPrecedentByIndex(nodeIndex: number, calculatedNodeIndices: ReadonlySet<number>): boolean;
     getAllDependencyJson(): Promise<IFormulaDependencyTreeJson[]>;
     generatePro(isCalculateTreeModel?: boolean): Promise<{
-        calculationOrderResult: import("./dependency-engine").ICalculationOrderResult;
+        calculationOrderResult: import("./dependency-engine/types").ICalculationOrderResult;
         dependencyTree: Map<number, IFormulaCalculationTree>;
     }>;
     /**
@@ -66,9 +66,12 @@ export declare class FormulaDependencyProGenerator extends FormulaDependencyGene
     private _normalizeSharedFormulaRange;
     private _recordCompressedSharedFormulaGroupMetrics;
     private _recordExpandedSharedFormulaGroupMetrics;
+    private _shouldEagerCacheCalculationTrees;
+    private _hasAnyDirtyMapValue;
     private _markDirtyDependenciesPro;
     private _markForcedRecalculationNodesPro;
     private _markDirtyDefinedNameDependenciesPro;
+    private _markDirtySuperTableDependenciesPro;
     private _cacheCalculationTree;
     private _cacheCompressedVirtualCalculationTree;
     private _getOffsetRangeList;
@@ -78,13 +81,36 @@ export declare class FormulaDependencyProGenerator extends FormulaDependencyGene
     private _releaseDependencyTree;
     private _hasDirtyDefinedNames;
     private _syncForcedRecalculationNodeIndex;
-    private _syncCompressedVirtualForcedRecalculationNodeIndex;
+    private _hasForcedRecalculationFunction;
     private _detectForcedRecalculationNodePro;
     private _includeDirtyDefinedNamePro;
+    private _includeDirtySuperTablePro;
     private _ensureTreeInitializedForDependencies;
-    private _ensureTreeNodeForCalculation;
     private _getFeatureFormulaDependencyNodes;
     private _rangesIntersectAny;
     private _initialAstNodeAndRanges;
+    private _initialDependencyRanges;
+    private _tryInitialStaticReferenceRanges;
+    private _replaceDoubleQuotedStrings;
+    private _replaceQuotedSheetNames;
+    private _hasOnlyStaticReferenceSafeIdentifiers;
+    private _looksLikeA1ReferenceAt;
+    private _looksLikeColumnReferencePart;
+    private _isStaticReferenceTokenBoundarySafe;
+    private _tryCreateStaticReferenceRange;
+    private _tryCreateStaticColumnReferenceRange;
+    private _tryExtractStaticOffsetRanges;
+    private _tryCreateStaticOffsetRange;
+    private _tryInferOffsetRowSpan;
+    private _tryInferPositiveInteger;
+    private _tryParseInteger;
+    private _tryParseSingleStaticReference;
+    private _extractFunctionCalls;
+    private _findMatchingParen;
+    private _splitTopLevelArguments;
+    private _getStaticReferenceSheetSize;
+    private _dedupeStaticReferenceRanges;
+    private _columnNameToIndex;
+    private _nextNonSpaceChar;
     protected _createFDtree(unitId: string, sheetId: string, row: number, column: number, unitData: IUnitData, formulaDataItem: IFormulaDataItem): FormulaDependencyTree;
 }

package/lib/types/index.d.ts

@@ -1,5 +1,6 @@
-export { FormulaDependencyProGenerator } from './engine/formula-dependency';
 export { UniverProFormulaEnginePlugin } from './plugin';
-export { CalculateFormulaProService } from './services/calculate-formula.service';
-export { DependencyManagerProService } from './services/dependency-manager.service';
-export * from '@univerjs/engine-formula';
+export { RemoveSuperTableMutation, SetFormulaCalculationResultMutation, SetFormulaCalculationStartMutation, SetSuperTableMutation, } from '@univerjs/engine-formula';
+export type { ISetFormulaCalculationResultMutation, ISetFormulaCalculationStartMutation, ISuperTable, } from '@univerjs/engine-formula';
+export { SetFormulaDataMutation } from '@univerjs/engine-formula';
+export type { IUniverEngineFormulaConfig } from '@univerjs/engine-formula';
+export { FormulaCalculationTriggerService, FormulaDataModel, IActiveDirtyManagerService, ISuperTableService, } from '@univerjs/engine-formula';

package/lib/types/services/calculate-formula.service.d.ts

@@ -1,5 +1,5 @@
 import type { IFormulaDatasetConfig } from '@univerjs/engine-formula';
-import type { CalcNodeIndex, DynamicResolver, ICalculationOrderResult } from '../engine/dependency-engine';
+import type { CalcNodeIndex, DynamicResolver, ICalculationOrderResult } from '../engine/dependency-engine/types';
 import type { IFormulaCalculationTree } from '../engine/formula-dependency';
 import { CalculateFormulaService } from '@univerjs/engine-formula';
 export declare class CalculateFormulaProService extends CalculateFormulaService {
@@ -8,7 +8,8 @@ export declare class CalculateFormulaProService extends CalculateFormulaService
     protected _executeStep(cycleReferenceCount?: number): Promise<true | undefined>;
     protected _apply(isArrayFormulaState?: boolean, cycleReferenceCount?: number): Promise<import("@univerjs/engine-formula").IAllRuntimeData | undefined>;
     private _shouldRescheduleAfterDynamicChange;
-    protected _forEachCalculationPlanTree(calculationOrderResult: Pick<ICalculationOrderResult, 'calculationForest'>, dependencyTree: Map<CalcNodeIndex, IFormulaCalculationTree>, cycleReferenceCount: number, visitor: (tree: IFormulaCalculationTree, nodeIndex: CalcNodeIndex, cycleIndex?: number) => Promise<boolean | void>): Promise<void>;
+    protected _forEachCalculationPlanTree(calculationOrderResult: Pick<ICalculationOrderResult, 'calculationForest'>, dependencyTree: Map<CalcNodeIndex, IFormulaCalculationTree>, cycleReferenceCount: number, visitor: (tree: IFormulaCalculationTree, nodeIndex: CalcNodeIndex, cycleIndex?: number, shouldPreserveCycleTree?: boolean) => Promise<boolean | void>): Promise<void>;
+    private _calculationPlanHasSelfReference;
     protected _getCalculationPlanTreeCount(calculationOrderResult: Pick<ICalculationOrderResult, 'calculationForest'>, dependencyTree: Map<CalcNodeIndex, IFormulaCalculationTree>, cycleReferenceCount: number): number;
     protected _getDynamicResolver(): DynamicResolver | undefined;
     private _refreshDynamicDepsAfterCalculate;
@@ -17,5 +18,9 @@ export declare class CalculateFormulaProService extends CalculateFormulaService
     private _getRangeSignature;
     private _waitForExecutionSlot;
     private _calculateDependencyTree;
+    private _setFunctionRefInfoForTree;
+    private _formulaReferencesTreeCell;
+    private _isReferenceMetadataFunctionArgument;
+    private _parseA1Reference;
     private _getCalculationNodeData;
 }

package/lib/types/services/dependency-manager.service.d.ts

@@ -1,6 +1,6 @@
 import type { IUnitRange } from '@univerjs/core';
 import type { FormulaDependencyTree, IDirtyUnitFeatureMap, IDirtyUnitOtherFormulaMap, IDirtyUnitSheetNameMap, IFormulaDependencyTree } from '@univerjs/engine-formula';
-import type { DynamicResolver, ICalcNodeRef, ICompressedSharedFormulaGroup } from '../engine/dependency-engine';
+import type { DynamicResolver, ICalcNodeRef, ICompressedSharedFormulaGroup } from '../engine/dependency-engine/types';
 import { DependencyManagerBaseService } from '@univerjs/engine-formula';
 export declare class DependencyManagerProService extends DependencyManagerBaseService {
     private _dependencyEngineCache;
@@ -16,8 +16,13 @@ export declare class DependencyManagerProService extends DependencyManagerBaseSe
     clearFeatureFormulaDependency(unitId: string, sheetId?: string): void;
     getFeatureFormulaDependencyPro(unitId: string, sheetId: string, featureId: string): number | undefined;
     getFeatureFormulaDependencyNodePro(unitId: string, sheetId: string, featureId: string): ICalcNodeRef;
+    reserveFormulaDependencyCapacity(minNodeCapacity: number, minRangeCapacity?: number): void;
     addFormulaDependencyPro(unitId: string, sheetId: string, row: number, column: number, dependencyTree: IFormulaDependencyTree, featureNodes?: ICalcNodeRef[], mode?: 'replace' | 'merge'): number;
     addFormulaDependencyNodeOnlyPro(unitId: string, sheetId: string, row: number, column: number): number;
+    addFormulaDependencyNodeOnlyRangePro(unitId: string, sheetId: string, range: IUnitRange['range'], skip?: {
+        row: number;
+        col: number;
+    }): number[];
     registerCompressedSharedFormulaGroup(group: ICompressedSharedFormulaGroup): void;
     clearCompressedSharedFormulaGroups(unitId?: string, sheetId?: string): void;
     removeFormulaDependency(unitId: string, sheetId: string, row: number, column: number): void;
@@ -45,5 +50,5 @@ export declare class DependencyManagerProService extends DependencyManagerBaseSe
     prepareDynamicDependencies(resolver: DynamicResolver): boolean;
     getCalculationOrder(options?: {
         detectCycles?: boolean;
-    }): import("../engine/dependency-engine").ICalculationOrderResult;
+    }): import("../engine/dependency-engine/types").ICalculationOrderResult;
 }

package/lib/umd/facade.js

@@ -1 +1 @@
-function _0xae46(_0xc61b3b,_0x1ab20f){_0xc61b3b=_0xc61b3b-0x14b;var _0x6d171a=_0x6d17();var _0xae4607=_0x6d171a[_0xc61b3b];return _0xae4607;}(function(_0x5c68b1,_0x3aa87b){var _0x191e94=_0xae46,_0x201c42=_0x5c68b1();while(!![]){try{var _0x27ed55=-parseInt(_0x191e94(0x156))/0x1*(-parseInt(_0x191e94(0x14f))/0x2)+parseInt(_0x191e94(0x152))/0x3+parseInt(_0x191e94(0x15b))/0x4+-parseInt(_0x191e94(0x155))/0x5*(parseInt(_0x191e94(0x160))/0x6)+-parseInt(_0x191e94(0x15f))/0x7*(-parseInt(_0x191e94(0x14d))/0x8)+-parseInt(_0x191e94(0x153))/0x9*(-parseInt(_0x191e94(0x14b))/0xa)+-parseInt(_0x191e94(0x158))/0xb;if(_0x27ed55===_0x3aa87b)break;else _0x201c42['push'](_0x201c42['shift']());}catch(_0x278375){_0x201c42['push'](_0x201c42['shift']());}}}(_0x6d17,0x85e2f),function(_0x1b2c38,_0x3152c2){var _0x27aea4=_0xae46;typeof exports==_0x27aea4(0x154)&&typeof module<'u'?_0x3152c2(exports,require('@univerjs/engine-formula/facade')):typeof define==_0x27aea4(0x15a)&&define[_0x27aea4(0x14c)]?define([_0x27aea4(0x14e),_0x27aea4(0x157)],_0x3152c2):(_0x1b2c38=typeof globalThis<'u'?globalThis:_0x1b2c38||self,_0x3152c2(_0x1b2c38[_0x27aea4(0x159)]={},_0x1b2c38[_0x27aea4(0x151)]));}(this,function(_0x46a933,_0x1e51ca){var _0xd43bb1=_0xae46;Object[_0xd43bb1(0x15c)](_0x46a933,Symbol[_0xd43bb1(0x150)],{'value':_0xd43bb1(0x15d)}),Object[_0xd43bb1(0x15c)](_0x46a933,_0xd43bb1(0x15e),{'enumerable':!0x0,'get':function(){var _0x5662e6=_0xd43bb1;return _0x1e51ca[_0x5662e6(0x15e)];}});}));function _0x6d17(){var _0x22ea04=['561406zqfEYm','toStringTag','UniverEngineFormulaFacade','1173423eyILoy','16857qIpbGf','object','15scIOZG','2gNUvgy','@univerjs/engine-formula/facade','17198313BrgCsR','UniverProEngineFormulaFacade','function','3258360QDYMiE','defineProperty','Module','FFormula','4360748GqbHEx','1807602jcgDrf','3340yVmibu','amd','8DrQXMU','exports'];_0x6d17=function(){return _0x22ea04;};return _0x6d17();}
+function _0x4c13(_0x6ab70f,_0x6f80dd){_0x6ab70f=_0x6ab70f-0xcf;var _0x532531=_0x5325();var _0x4c139d=_0x532531[_0x6ab70f];return _0x4c139d;}function _0x5325(){var _0x4675ce=['14216CSIwBJ','exports','object','function','414Yknbbc','UniverEngineFormulaFacade','defineProperty','66VDWCuG','1555449nhuZhk','toStringTag','10077561ztnGVl','FFormula','314heBcbt','4742rHNCIC','31926984RKlZty','288235vKSKrh','90jIQwXP','@univerjs/engine-formula/facade','16vKwOTW','Module','1545247BHFhPa'];_0x5325=function(){return _0x4675ce;};return _0x5325();}(function(_0x325504,_0x3467cf){var _0x44b044=_0x4c13,_0x3e930b=_0x325504();while(!![]){try{var _0x74adb0=-parseInt(_0x44b044(0xe1))/0x1*(-parseInt(_0x44b044(0xe2))/0x2)+-parseInt(_0x44b044(0xd9))/0x3*(-parseInt(_0x44b044(0xd5))/0x4)+-parseInt(_0x44b044(0xcf))/0x5*(parseInt(_0x44b044(0xdc))/0x6)+parseInt(_0x44b044(0xdd))/0x7*(parseInt(_0x44b044(0xd2))/0x8)+parseInt(_0x44b044(0xdf))/0x9+-parseInt(_0x44b044(0xd0))/0xa*(-parseInt(_0x44b044(0xd4))/0xb)+-parseInt(_0x44b044(0xe3))/0xc;if(_0x74adb0===_0x3467cf)break;else _0x3e930b['push'](_0x3e930b['shift']());}catch(_0x201788){_0x3e930b['push'](_0x3e930b['shift']());}}}(_0x5325,0xbbaab),function(_0x2f19de,_0xfa9cd5){var _0x46c9a8=_0x4c13;typeof exports==_0x46c9a8(0xd7)&&typeof module<'u'?_0xfa9cd5(exports,require('@univerjs/engine-formula/facade')):typeof define==_0x46c9a8(0xd8)&&define['amd']?define([_0x46c9a8(0xd6),_0x46c9a8(0xd1)],_0xfa9cd5):(_0x2f19de=typeof globalThis<'u'?globalThis:_0x2f19de||self,_0xfa9cd5(_0x2f19de['UniverProEngineFormulaFacade']={},_0x2f19de[_0x46c9a8(0xda)]));}(this,function(_0x517bca,_0x379bfb){var _0x337f15=_0x4c13;Object[_0x337f15(0xdb)](_0x517bca,Symbol[_0x337f15(0xde)],{'value':_0x337f15(0xd3)}),Object[_0x337f15(0xdb)](_0x517bca,_0x337f15(0xe0),{'enumerable':!0x0,'get':function(){return _0x379bfb['FFormula'];}});}));