@univerjs-pro/engine-formula 1.0.4 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -69,6 +69,7 @@ export declare class DependencyEngine {
69
69
  private _tarjanEpoch;
70
70
  private readonly _propQueue;
71
71
  private readonly _dirtyList;
72
+ private _calculationGraphNodeMask;
72
73
  private _activeNodeCount;
73
74
  private _dirtyNodeCount;
74
75
  private _directPointIndex;
@@ -237,7 +238,10 @@ export declare class DependencyEngine {
237
238
  */
238
239
  getCalculationOrder(options?: {
239
240
  detectCycles?: boolean;
241
+ circularOnly?: boolean;
240
242
  }): ICalculationOrderResult;
243
+ markIterationSettingsChanged(unitIds: string[]): void;
244
+ private _getNodeUnitId;
241
245
  clearCalculatedDirty(indices: CalcNodeIndex[]): void;
242
246
  private _compactDirtyList;
243
247
  clearAllDirty(): void;
@@ -37,13 +37,13 @@ export declare class FormulaDependencyProGenerator extends FormulaDependencyGene
37
37
  clearCachedCalculationNodeData(): void;
38
38
  clearCachedCalculationTree(): void;
39
39
  getCachedCalculationNodeData(nodeIndex: number): IFormulaCalculationNodeData | undefined;
40
- getCalculationOrder(): import("./dependency-engine/types").ICalculationOrderResult;
40
+ getCalculationOrder(circularOnly?: boolean): import("./dependency-engine/types").ICalculationOrderResult;
41
41
  getSharedFormulaCompressionMetrics(): ISharedFormulaCompressionMetrics;
42
42
  hasDynamicDepsByIndex(nodeIndex: number): boolean;
43
43
  refreshDynamicDepsByIndex(nodeIndex: number, resolver: IDynamicResolver): boolean;
44
44
  hasUncalculatedDirtyPrecedentByIndex(nodeIndex: number, calculatedNodeIndices: ReadonlySet<number>): boolean;
45
45
  getAllDependencyJson(): Promise<IFormulaDependencyTreeJson[]>;
46
- generatePro(isCalculateTreeModel?: boolean): Promise<{
46
+ generatePro(isCalculateTreeModel?: boolean, circularOnly?: boolean): Promise<{
47
47
  calculationOrderResult: import("./dependency-engine/types").ICalculationOrderResult;
48
48
  dependencyTree: Map<number, IFormulaCalculationTree>;
49
49
  }>;
@@ -14,6 +14,8 @@ export type { IFormulaLastValue } from './models/formula-last-value';
14
14
  export { HOST_EXTERNAL_REFERENCE_SCHEMA_VERSION, HostExternalReferenceModel, normalizeHostExternalReferenceQualifier, UNIVER_EXTERNAL_REFERENCE_PLUGIN, } from './models/host-external-reference.model';
15
15
  export type { HostExternalReferenceBindingResult, IHostExternalReference, IHostExternalReferenceResource, } from './models/host-external-reference.model';
16
16
  export { UniverProFormulaEnginePlugin } from './plugin';
17
+ export type { CalculateFormulaProService } from './services/calculate-formula.service';
18
+ export type { DependencyManagerProService } from './services/dependency-manager.service';
17
19
  export { ExternalCacheReferenceDataProvider } from './services/external-cache-reference-data.provider';
18
20
  export { ExternalReferencePrefetchPlanner } from './services/external-reference-prefetch-planner';
19
21
  export { ExternalReferencePrefetchService } from './services/external-reference-prefetch.service';
@@ -7,16 +7,19 @@ export declare class CalculateFormulaProService extends CalculateFormulaService
7
7
  private readonly _externalReferenceDataLoader;
8
8
  private _dynamicRuntimeRanges;
9
9
  private _runtimeExternalDataLoaded;
10
+ private _calculateCircularOnly;
10
11
  constructor(configService: IConfigService, lexer: Lexer, currentConfigService: IFormulaCurrentConfigService, runtimeService: IFormulaRuntimeService, formulaDependencyGenerator: IFormulaDependencyGenerator, interpreter: Interpreter, astTreeBuilder: AstTreeBuilder, _externalReferenceDataLoader: IFormulaExternalReferenceDataLoader);
11
12
  execute(formulaDatasetConfig: IFormulaDatasetConfig): Promise<void>;
12
- protected _executeStep(cycleReferenceCount?: number): Promise<true | undefined>;
13
- protected _apply(isArrayFormulaState?: boolean, cycleReferenceCount?: number): Promise<import("@univerjs/engine-formula").IAllRuntimeData | undefined>;
13
+ /** Discover base-revision dependencies and cached cycles without executing a circular iteration. */
14
+ initializeChangesetDependencies(config: IFormulaDatasetConfig): Promise<IFormulaCalculationTree[]>;
15
+ protected _executeStep(): Promise<true | undefined>;
16
+ protected _apply(isArrayFormulaState?: boolean): Promise<import("@univerjs/engine-formula").IAllRuntimeData | undefined>;
17
+ private _clearPlannedCircularReferenceCells;
14
18
  private _setFormulaExecuteStage;
15
19
  private _setTotalFormulasToCalculate;
16
20
  private _shouldRescheduleAfterDynamicChange;
17
- 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>;
18
- private _calculationPlanHasSelfReference;
19
- protected _getCalculationPlanTreeCount(calculationOrderResult: Pick<ICalculationOrderResult, 'calculationForest'>, dependencyTree: Map<CalcNodeIndex, IFormulaCalculationTree>, cycleReferenceCount: number): number;
21
+ protected _forEachCalculationPlanTree(calculationOrderResult: Pick<ICalculationOrderResult, 'calculationForest'>, dependencyTree: Map<CalcNodeIndex, IFormulaCalculationTree>, visitor: (tree: IFormulaCalculationTree, nodeIndex: CalcNodeIndex, cycleIndex?: number, shouldPreserveCycleTree?: boolean) => Promise<boolean | void>): Promise<void>;
22
+ protected _getCalculationPlanTreeCount(calculationOrderResult: Pick<ICalculationOrderResult, 'calculationForest'>, dependencyTree: Map<CalcNodeIndex, IFormulaCalculationTree>): number;
20
23
  protected _getDynamicResolver(): IDynamicResolver | undefined;
21
24
  private _refreshDynamicDepsAfterCalculate;
22
25
  private _collectAddressFunctionRuntimeReferences;
@@ -31,6 +31,7 @@ export declare class DependencyManagerProService extends DependencyManagerBaseSe
31
31
  markIndicesChanged(indices: number[], options?: {
32
32
  onlySelf?: boolean;
33
33
  }): void;
34
+ markIterationSettingsChanged(unitIds: string[]): void;
34
35
  markRangesChanged(ranges: IUnitRange[], options?: {
35
36
  includeFormulaCells?: boolean;
36
37
  coalesce?: boolean;
@@ -40,6 +41,8 @@ export declare class DependencyManagerProService extends DependencyManagerBaseSe
40
41
  markDirtySheetNames(dirtyNameMap: IDirtyUnitSheetNameMap): void;
41
42
  markAllDirty(): void;
42
43
  clearCalculatedDirty(indices: number[]): void;
44
+ clearAllDirty(): void;
45
+ invalidateFormulaCell(unitId: string, sheetId: string, row: number, column: number): void;
43
46
  hasDynamicDeps(node: ICalcNodeRef): boolean;
44
47
  hasDynamicDepsByIndex(nodeIndex: number): boolean;
45
48
  refreshDynamicDeps(node: ICalcNodeRef, resolver: IDynamicResolver): boolean;
@@ -50,5 +53,6 @@ export declare class DependencyManagerProService extends DependencyManagerBaseSe
50
53
  prepareDynamicDependencies(resolver: IDynamicResolver): boolean;
51
54
  getCalculationOrder(options?: {
52
55
  detectCycles?: boolean;
56
+ circularOnly?: boolean;
53
57
  }): import("../engine/dependency-engine/types").ICalculationOrderResult;
54
58
  }
package/lib/umd/facade.js CHANGED
@@ -1 +1 @@
1
- function _0x1435(){var _0x337b04=['buildFormulaReference','RemoveHostExternalReferenceCommand','extend','FEnum','42886692HUTnAX','@univerjs-pro/engine-formula','amd','SHEET_RANGE','object','@univerjs/core','upsertExternalReference','exports','FormulaReferenceType','70734qXUhNz','UniverCore','UniverProEngineFormulaFacade','UpsertHostExternalReferenceCommand','removeExternalReference','buildReference','formulaQualifier','14814vgHabH','unitId','Formula\x20reference\x20authoring\x20requires\x20stable\x20Host\x20and\x20Source\x20Unit\x20IDs.','Module','26BHiXKx','Failed\x20to\x20bind\x20external\x20formula\x20reference\x20\x22','kind','syncExecuteCommand','UNIVER_BASE','toStringTag','UNIVER_SHEET','5068UeqBuS','FFormula','_commandService','UniverInstanceType','1254383FzfDoc','@univerjs/core/facade','UniverCoreFacade','defineProperty','6576176dYqDSb','UniverProEngineFormula','9038510HwsLIX','7476392KutNcL'];_0x1435=function(){return _0x337b04;};return _0x1435();}function _0x394e(_0x1dd7db,_0x43d95f){_0x1dd7db=_0x1dd7db-0xb9;var _0x143559=_0x1435();var _0x394ea5=_0x143559[_0x1dd7db];return _0x394ea5;}(function(_0x924cc,_0x4b437f){var _0x40093b=_0x394e,_0x1818ae=_0x924cc();while(!![]){try{var _0x3968e6=-parseInt(_0x40093b(0xd8))/0x1+-parseInt(_0x40093b(0xcd))/0x2*(-parseInt(_0x40093b(0xc2))/0x3)+parseInt(_0x40093b(0xdc))/0x4+-parseInt(_0x40093b(0xde))/0x5+-parseInt(_0x40093b(0xc9))/0x6*(parseInt(_0x40093b(0xd4))/0x7)+-parseInt(_0x40093b(0xdf))/0x8+parseInt(_0x40093b(0xb9))/0x9;if(_0x3968e6===_0x4b437f)break;else _0x1818ae['push'](_0x1818ae['shift']());}catch(_0xe2869f){_0x1818ae['push'](_0x1818ae['shift']());}}}(_0x1435,0xe36e4),function(_0x17e93b,_0x2d34c6){var _0x48d6d3=_0x394e;typeof exports==_0x48d6d3(0xbd)&&typeof module<'u'?_0x2d34c6(exports,require('@univerjs/engine-formula/facade'),require('@univerjs-pro/engine-formula'),require('@univerjs/core/facade'),require('@univerjs/core')):typeof define=='function'&&define[_0x48d6d3(0xbb)]?define([_0x48d6d3(0xc0),'@univerjs/engine-formula/facade',_0x48d6d3(0xba),_0x48d6d3(0xd9),_0x48d6d3(0xbe)],_0x2d34c6):(_0x17e93b=typeof globalThis<'u'?globalThis:_0x17e93b||self,_0x2d34c6(_0x17e93b[_0x48d6d3(0xc4)]={},_0x17e93b['UniverEngineFormulaFacade'],_0x17e93b[_0x48d6d3(0xdd)],_0x17e93b[_0x48d6d3(0xda)],_0x17e93b[_0x48d6d3(0xc3)]));}(this,function(_0x37458b,_0x476de3,_0x3b26c6,_0x3b64f3,_0x27f46b){var _0x1f8503=_0x394e;Object[_0x1f8503(0xdb)](_0x37458b,Symbol[_0x1f8503(0xd2)],{'value':_0x1f8503(0xcc)});var _0x17800f=class extends _0x3b64f3[_0x1f8503(0xe3)]{get[_0x1f8503(0xc1)](){var _0x24c781=_0x1f8503;return _0x3b26c6[_0x24c781(0xc1)];}};_0x3b64f3[_0x1f8503(0xe3)]['extend'](_0x17800f);var _0x59a977=class extends _0x476de3['FFormula']{[_0x1f8503(0xc7)](_0x3647f5){var _0x5f2360=_0x1f8503;let {hostUnitId:_0x464a10,unit:_0x527a66,target:_0x577e28}=_0x3647f5;if(!_0x464a10||!_0x527a66['unitId'])throw Error(_0x5f2360(0xcb));if(_0x527a66[_0x5f2360(0xca)]!==_0x464a10&&!this['_commandService']['syncExecuteCommand'](_0x3b26c6[_0x5f2360(0xc5)]['id'],{'unitId':_0x464a10,'qualifier':_0x527a66[_0x5f2360(0xc8)],'sourceUnitId':_0x527a66[_0x5f2360(0xca)],'sourceUnitType':_0x577e28[_0x5f2360(0xcf)]===_0x3b26c6[_0x5f2360(0xc1)][_0x5f2360(0xbc)]?_0x27f46b[_0x5f2360(0xd7)][_0x5f2360(0xd3)]:_0x27f46b[_0x5f2360(0xd7)][_0x5f2360(0xd1)]}))throw Error(_0x5f2360(0xce)+_0x527a66['formulaQualifier']+'\x22.');return(0x0,_0x3b26c6[_0x5f2360(0xe0)])(_0x3647f5);}[_0x1f8503(0xbf)](_0x2a60fe){var _0x1ba111=_0x1f8503;return this['_commandService'][_0x1ba111(0xd0)](_0x3b26c6[_0x1ba111(0xc5)]['id'],_0x2a60fe);}[_0x1f8503(0xc6)](_0x4b4193){var _0x516397=_0x1f8503;return this[_0x516397(0xd6)][_0x516397(0xd0)](_0x3b26c6[_0x516397(0xe1)]['id'],_0x4b4193);}};_0x476de3[_0x1f8503(0xd5)][_0x1f8503(0xe2)](_0x59a977),Object[_0x1f8503(0xdb)](_0x37458b,_0x1f8503(0xd5),{'enumerable':!0x0,'get':function(){var _0xc5a3ec=_0x1f8503;return _0x476de3[_0xc5a3ec(0xd5)];}});}));
1
+ function _0xf43f(_0x259056,_0x4d076e){_0x259056=_0x259056-0x1ee;var _0x14831f=_0x1483();var _0xf43f3c=_0x14831f[_0x259056];return _0xf43f3c;}function _0x1483(){var _0x2e6ea9=['amd','8myegkE','UniverCoreFacade','971760kSwwnt','FFormula','10852CAaxfh','object','87179txoCmd','SHEET_RANGE','unitId','defineProperty','UniverProEngineFormulaFacade','buildFormulaReference','UNIVER_BASE','extend','3342409rmegtn','@univerjs/core/facade','exports','toStringTag','_commandService','@univerjs/core','Formula\x20reference\x20authoring\x20requires\x20stable\x20Host\x20and\x20Source\x20Unit\x20IDs.','UNIVER_SHEET','Failed\x20to\x20bind\x20external\x20formula\x20reference\x20\x22','function','UniverEngineFormulaFacade','buildReference','Module','@univerjs-pro/engine-formula','2585664OCFnAu','formulaQualifier','626769MxJTXG','upsertExternalReference','UniverCore','kind','RemoveHostExternalReferenceCommand','16723850xIeyuW','705HOOrmV','2jaxtvs','UpsertHostExternalReferenceCommand','UniverProEngineFormula','FormulaReferenceType','removeExternalReference','syncExecuteCommand','UniverInstanceType'];_0x1483=function(){return _0x2e6ea9;};return _0x1483();}(function(_0x2927c3,_0x19e298){var _0x2b01dd=_0xf43f,_0x4565a9=_0x2927c3();while(!![]){try{var _0x53ef41=-parseInt(_0x2b01dd(0x20e))/0x1*(-parseInt(_0x2b01dd(0x200))/0x2)+-parseInt(_0x2b01dd(0x1f9))/0x3+parseInt(_0x2b01dd(0x20c))/0x4*(-parseInt(_0x2b01dd(0x1ff))/0x5)+-parseInt(_0x2b01dd(0x20a))/0x6+-parseInt(_0x2b01dd(0x216))/0x7*(parseInt(_0x2b01dd(0x208))/0x8)+-parseInt(_0x2b01dd(0x1f7))/0x9+parseInt(_0x2b01dd(0x1fe))/0xa;if(_0x53ef41===_0x19e298)break;else _0x4565a9['push'](_0x4565a9['shift']());}catch(_0x185c64){_0x4565a9['push'](_0x4565a9['shift']());}}}(_0x1483,0x3aed5),function(_0x2e8e5a,_0x31db37){var _0x32382e=_0xf43f;typeof exports==_0x32382e(0x20d)&&typeof module<'u'?_0x31db37(exports,require('@univerjs/engine-formula/facade'),require('@univerjs-pro/engine-formula'),require('@univerjs/core/facade'),require('@univerjs/core')):typeof define==_0x32382e(0x1f2)&&define[_0x32382e(0x207)]?define([_0x32382e(0x218),'@univerjs/engine-formula/facade',_0x32382e(0x1f6),_0x32382e(0x217),_0x32382e(0x1ee)],_0x31db37):(_0x2e8e5a=typeof globalThis<'u'?globalThis:_0x2e8e5a||self,_0x31db37(_0x2e8e5a[_0x32382e(0x212)]={},_0x2e8e5a[_0x32382e(0x1f3)],_0x2e8e5a[_0x32382e(0x202)],_0x2e8e5a[_0x32382e(0x209)],_0x2e8e5a[_0x32382e(0x1fb)]));}(this,function(_0x5aa364,_0x55ea6b,_0x2895cd,_0x2ac452,_0x3577d1){var _0x33206f=_0xf43f;Object[_0x33206f(0x211)](_0x5aa364,Symbol[_0x33206f(0x219)],{'value':_0x33206f(0x1f5)});var _0x3a6321=class extends _0x2ac452['FEnum']{get[_0x33206f(0x203)](){var _0x787ce4=_0x33206f;return _0x2895cd[_0x787ce4(0x203)];}};_0x2ac452['FEnum'][_0x33206f(0x215)](_0x3a6321);var _0x5aa196=class extends _0x55ea6b[_0x33206f(0x20b)]{[_0x33206f(0x1f4)](_0x54c2ed){var _0x4a8688=_0x33206f;let {hostUnitId:_0x198e8f,unit:_0xe42217,target:_0x6a7a9f}=_0x54c2ed;if(!_0x198e8f||!_0xe42217[_0x4a8688(0x210)])throw Error(_0x4a8688(0x1ef));if(_0xe42217[_0x4a8688(0x210)]!==_0x198e8f&&!this[_0x4a8688(0x21a)]['syncExecuteCommand'](_0x2895cd[_0x4a8688(0x201)]['id'],{'unitId':_0x198e8f,'qualifier':_0xe42217[_0x4a8688(0x1f8)],'sourceUnitId':_0xe42217[_0x4a8688(0x210)],'sourceUnitType':_0x6a7a9f[_0x4a8688(0x1fc)]===_0x2895cd[_0x4a8688(0x203)][_0x4a8688(0x20f)]?_0x3577d1[_0x4a8688(0x206)][_0x4a8688(0x1f0)]:_0x3577d1['UniverInstanceType'][_0x4a8688(0x214)]}))throw Error(_0x4a8688(0x1f1)+_0xe42217['formulaQualifier']+'\x22.');return(0x0,_0x2895cd[_0x4a8688(0x213)])(_0x54c2ed);}[_0x33206f(0x1fa)](_0x25a969){var _0x5ed14d=_0x33206f;return this[_0x5ed14d(0x21a)][_0x5ed14d(0x205)](_0x2895cd[_0x5ed14d(0x201)]['id'],_0x25a969);}[_0x33206f(0x204)](_0x3199b9){var _0x1f3bd4=_0x33206f;return this[_0x1f3bd4(0x21a)][_0x1f3bd4(0x205)](_0x2895cd[_0x1f3bd4(0x1fd)]['id'],_0x3199b9);}};_0x55ea6b[_0x33206f(0x20b)][_0x33206f(0x215)](_0x5aa196),Object[_0x33206f(0x211)](_0x5aa364,_0x33206f(0x20b),{'enumerable':!0x0,'get':function(){return _0x55ea6b['FFormula'];}});}));