@univerjs-pro/engine-formula 1.0.4 → 1.1.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 _0x555e(_0x45fef6,_0x220e6c){_0x45fef6=_0x45fef6-0x7c;var _0x13a56b=_0x13a5();var _0x555eab=_0x13a56b[_0x45fef6];return _0x555eab;}(function(_0x516222,_0x48dfe2){var _0x5c80b0=_0x555e,_0x52b475=_0x516222();while(!![]){try{var _0x586b0b=-parseInt(_0x5c80b0(0x7f))/0x1*(-parseInt(_0x5c80b0(0x84))/0x2)+parseInt(_0x5c80b0(0x99))/0x3*(-parseInt(_0x5c80b0(0x9f))/0x4)+parseInt(_0x5c80b0(0x95))/0x5*(parseInt(_0x5c80b0(0x7d))/0x6)+parseInt(_0x5c80b0(0x89))/0x7+-parseInt(_0x5c80b0(0x85))/0x8+-parseInt(_0x5c80b0(0x9d))/0x9*(parseInt(_0x5c80b0(0x8f))/0xa)+-parseInt(_0x5c80b0(0x8e))/0xb;if(_0x586b0b===_0x48dfe2)break;else _0x52b475['push'](_0x52b475['shift']());}catch(_0x4ad536){_0x52b475['push'](_0x52b475['shift']());}}}(_0x13a5,0x918c9),function(_0x2d3c0e,_0xbd2d26){var _0x860358=_0x555e;typeof exports==_0x860358(0x8d)&&typeof module<'u'?_0xbd2d26(exports,require('@univerjs/engine-formula/facade'),require('@univerjs-pro/engine-formula'),require('@univerjs/core/facade'),require('@univerjs/core')):typeof define==_0x860358(0x91)&&define['amd']?define([_0x860358(0x9c),'@univerjs/engine-formula/facade',_0x860358(0x82),'@univerjs/core/facade',_0x860358(0x83)],_0xbd2d26):(_0x2d3c0e=typeof globalThis<'u'?globalThis:_0x2d3c0e||self,_0xbd2d26(_0x2d3c0e[_0x860358(0x92)]={},_0x2d3c0e[_0x860358(0x96)],_0x2d3c0e[_0x860358(0x94)],_0x2d3c0e[_0x860358(0xa2)],_0x2d3c0e[_0x860358(0x86)]));}(this,function(_0x23db3a,_0x265fd2,_0x3d9745,_0x273100,_0xe0a3e2){var _0x56376c=_0x555e;Object[_0x56376c(0x9b)](_0x23db3a,Symbol['toStringTag'],{'value':_0x56376c(0x9e)});var _0x573fa5=class extends _0x273100[_0x56376c(0x90)]{get[_0x56376c(0xa0)](){var _0x303859=_0x56376c;return _0x3d9745[_0x303859(0xa0)];}};_0x273100[_0x56376c(0x90)][_0x56376c(0x93)](_0x573fa5);var _0x202f42=class extends _0x265fd2[_0x56376c(0x97)]{[_0x56376c(0x8b)](_0x240101){var _0x3ff7ed=_0x56376c;let {hostUnitId:_0x51a464,unit:_0xa6d2f3,target:_0x13334a}=_0x240101;if(!_0x51a464||!_0xa6d2f3['unitId'])throw Error('Formula\x20reference\x20authoring\x20requires\x20stable\x20Host\x20and\x20Source\x20Unit\x20IDs.');if(_0xa6d2f3[_0x3ff7ed(0x9a)]!==_0x51a464&&!this['_commandService']['syncExecuteCommand'](_0x3d9745['UpsertHostExternalReferenceCommand']['id'],{'unitId':_0x51a464,'qualifier':_0xa6d2f3[_0x3ff7ed(0x80)],'sourceUnitId':_0xa6d2f3[_0x3ff7ed(0x9a)],'sourceUnitType':_0x13334a[_0x3ff7ed(0x98)]===_0x3d9745['FormulaReferenceType']['SHEET_RANGE']?_0xe0a3e2[_0x3ff7ed(0x8c)][_0x3ff7ed(0x87)]:_0xe0a3e2[_0x3ff7ed(0x8c)][_0x3ff7ed(0x81)]}))throw Error(_0x3ff7ed(0x7e)+_0xa6d2f3[_0x3ff7ed(0x80)]+'\x22.');return(0x0,_0x3d9745['buildFormulaReference'])(_0x240101);}[_0x56376c(0x8a)](_0x6f9caa){var _0x56939d=_0x56376c;return this['_commandService']['syncExecuteCommand'](_0x3d9745[_0x56939d(0x7c)]['id'],_0x6f9caa);}['removeExternalReference'](_0x2bf828){var _0x3cd4e1=_0x56376c;return this[_0x3cd4e1(0xa1)][_0x3cd4e1(0x88)](_0x3d9745[_0x3cd4e1(0xa3)]['id'],_0x2bf828);}};_0x265fd2['FFormula'][_0x56376c(0x93)](_0x202f42),Object[_0x56376c(0x9b)](_0x23db3a,_0x56376c(0x97),{'enumerable':!0x0,'get':function(){var _0x239bf5=_0x56376c;return _0x265fd2[_0x239bf5(0x97)];}});}));function _0x13a5(){var _0x35ebdb=['1112297jJpcUn','formulaQualifier','UNIVER_BASE','@univerjs-pro/engine-formula','@univerjs/core','2EyiZYp','3213792ZvMQWc','UniverCore','UNIVER_SHEET','syncExecuteCommand','1012081yYYTIW','upsertExternalReference','buildReference','UniverInstanceType','object','1939014lxzzLh','10dNRsHG','FEnum','function','UniverProEngineFormulaFacade','extend','UniverProEngineFormula','10mtSHEJ','UniverEngineFormulaFacade','FFormula','kind','6PidEdL','unitId','defineProperty','exports','4181283oanwnT','Module','102464YrheGw','FormulaReferenceType','_commandService','UniverCoreFacade','RemoveHostExternalReferenceCommand','UpsertHostExternalReferenceCommand','1299318dbectg','Failed\x20to\x20bind\x20external\x20formula\x20reference\x20\x22'];_0x13a5=function(){return _0x35ebdb;};return _0x13a5();}