@univerjs/sheets-formula 1.4.0 → 1.5.1

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.
package/README.md CHANGED
@@ -8,9 +8,9 @@
8
8
 
9
9
  ## Package Overview
10
10
 
11
- | Package | UMD global | CSS | Locales | Facade entry |
12
- | --- | --- | :---: | :---: | :---: |
13
- | `@univerjs/sheets-formula` | `UniverSheetsFormula` | No | Yes | Yes |
11
+ | Package | UMD global | CSS | Locales | Facade entry | Worker entry |
12
+ | --- | --- | :---: | :---: | :---: | :---: |
13
+ | `@univerjs/sheets-formula` | `UniverSheetsFormula` | No | Yes | Yes | Yes |
14
14
 
15
15
  ## Installation
16
16
 
@@ -20,10 +20,10 @@ pnpm add @univerjs/sheets-formula
20
20
  npm install @univerjs/sheets-formula
21
21
  ```
22
22
 
23
- Keep all `@univerjs/*` packages on the same version.
24
-
25
23
  ## Usage
26
24
 
25
+ Start with the [integration setup](https://docs.univer.ai/) for your document type, including its required plugins, styles, and locale resources. The snippet below assumes that setup is complete.
26
+
27
27
  ```ts
28
28
  import EnUS from '@univerjs/sheets-formula/locale/en-US';
29
29
  import { UniverSheetsFormulaPlugin } from '@univerjs/sheets-formula';
@@ -33,14 +33,26 @@ univer.registerPlugin(UniverSheetsFormulaPlugin);
33
33
  // Merge EnUS into your Univer locale map when this package contributes UI text.
34
34
  ```
35
35
 
36
- Exported plugin classes:
36
+ Main-thread plugin classes:
37
37
 
38
38
  - `UniverSheetsFormulaPlugin`
39
- - `UniverRemoteSheetsFormulaPlugin`
39
+
40
+ ### Worker usage
41
+
42
+ On the main thread, import `UniverSheetsFormulaPlugin` from `@univerjs/sheets-formula`. Set `notExecuteFormula: true` to delegate calculation to the worker.
43
+
44
+ In the worker entry, import `UniverRemoteSheetsFormulaPlugin` from `@univerjs/sheets-formula/worker`:
45
+
46
+ ```ts
47
+ import { UniverRemoteSheetsFormulaPlugin } from '@univerjs/sheets-formula/worker';
48
+
49
+ univer.registerPlugin(UniverRemoteSheetsFormulaPlugin);
50
+ ```
40
51
 
41
52
  ## Integration Notes
42
53
 
43
54
  Register this package with `@univerjs/engine-formula` and `@univerjs/sheets` before adding formula UI packages.
55
+ - Import `@univerjs/sheets-formula/facade` when using this package through Univer Facade APIs.
44
56
 
45
57
  ## Resources
46
58
 
package/lib/cjs/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
2
- const require_worker = require("./worker-Ds9TzMsD.js");
2
+ const require_remote_register_function_service = require("./remote-register-function.service-DiergAxp.js");
3
3
  let _univerjs_core = require("@univerjs/core");
4
4
  let _univerjs_sheets = require("@univerjs/sheets");
5
5
  let _univerjs_engine_formula = require("@univerjs/engine-formula");
@@ -105,7 +105,7 @@ let FormulaAutoFillController = class FormulaAutoFillController extends _univerj
105
105
  return applyData;
106
106
  }
107
107
  };
108
- FormulaAutoFillController = require_worker.__decorate([require_worker.__decorateParam(0, _univerjs_sheets.IAutoFillService), require_worker.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder))], FormulaAutoFillController);
108
+ FormulaAutoFillController = require_remote_register_function_service.__decorate([require_remote_register_function_service.__decorateParam(0, _univerjs_sheets.IAutoFillService), require_remote_register_function_service.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder))], FormulaAutoFillController);
109
109
  function directionToOffset(step, len, direction, location, sourceIndex) {
110
110
  const { source, target } = location;
111
111
  const { rows: targetRows } = target;
@@ -211,11 +211,11 @@ let FormulaReorderController = class FormulaReorderController extends _univerjs_
211
211
  };
212
212
  }
213
213
  };
214
- FormulaReorderController = require_worker.__decorate([
215
- require_worker.__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
216
- require_worker.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.IUniverInstanceService)),
217
- require_worker.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
218
- require_worker.__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder))
214
+ FormulaReorderController = require_remote_register_function_service.__decorate([
215
+ require_remote_register_function_service.__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
216
+ require_remote_register_function_service.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.IUniverInstanceService)),
217
+ require_remote_register_function_service.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
218
+ require_remote_register_function_service.__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder))
219
219
  ], FormulaReorderController);
220
220
 
221
221
  // src/controllers/image-formula-cell-interceptor.controller.ts
@@ -225,11 +225,11 @@ let ImageFormulaCellInterceptorController = class ImageFormulaCellInterceptorCon
225
225
  this._commandService = _commandService;
226
226
  this._sheetInterceptorService = _sheetInterceptorService;
227
227
  this._formulaDataModel = _formulaDataModel;
228
- require_worker._defineProperty(this, "_errorValueCell", {
228
+ require_remote_register_function_service._defineProperty(this, "_errorValueCell", {
229
229
  v: _univerjs_engine_formula.ErrorType.VALUE,
230
230
  t: _univerjs_core.CellValueType.STRING
231
231
  });
232
- require_worker._defineProperty(this, "_refreshRender", void 0);
232
+ require_remote_register_function_service._defineProperty(this, "_refreshRender", void 0);
233
233
  this._initialize();
234
234
  }
235
235
  _initialize() {
@@ -355,10 +355,10 @@ let ImageFormulaCellInterceptorController = class ImageFormulaCellInterceptorCon
355
355
  this._refreshRender = refreshRender;
356
356
  }
357
357
  };
358
- ImageFormulaCellInterceptorController = require_worker.__decorate([
359
- require_worker.__decorateParam(0, _univerjs_core.ICommandService),
360
- require_worker.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
361
- require_worker.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel))
358
+ ImageFormulaCellInterceptorController = require_remote_register_function_service.__decorate([
359
+ require_remote_register_function_service.__decorateParam(0, _univerjs_core.ICommandService),
360
+ require_remote_register_function_service.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
361
+ require_remote_register_function_service.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel))
362
362
  ], ImageFormulaCellInterceptorController);
363
363
 
364
364
  // src/controllers/trigger-calculation.controller.ts
@@ -408,12 +408,12 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
408
408
  this._configService = _configService;
409
409
  this._formulaDataModel = _formulaDataModel;
410
410
  this._localeService = _localeService;
411
- require_worker._defineProperty(this, "_startExecutionTime", 0);
412
- require_worker._defineProperty(this, "_totalCalculationTaskCount", 0);
413
- require_worker._defineProperty(this, "_doneCalculationTaskCount", 0);
414
- require_worker._defineProperty(this, "_executionInProgressParams", null);
415
- require_worker._defineProperty(this, "_progress$", new rxjs.BehaviorSubject(NilProgress));
416
- require_worker._defineProperty(this, "progress$", this._progress$.asObservable());
411
+ require_remote_register_function_service._defineProperty(this, "_startExecutionTime", 0);
412
+ require_remote_register_function_service._defineProperty(this, "_totalCalculationTaskCount", 0);
413
+ require_remote_register_function_service._defineProperty(this, "_doneCalculationTaskCount", 0);
414
+ require_remote_register_function_service._defineProperty(this, "_executionInProgressParams", null);
415
+ require_remote_register_function_service._defineProperty(this, "_progress$", new rxjs.BehaviorSubject(NilProgress));
416
+ require_remote_register_function_service._defineProperty(this, "progress$", this._progress$.asObservable());
417
417
  this._commandExecutedListener();
418
418
  this._initialExecuteFormulaProcessListener();
419
419
  this._initialExecuteFormula();
@@ -427,7 +427,7 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
427
427
  this._progress$.complete();
428
428
  }
429
429
  _getCalculationMode() {
430
- const config = this._configService.getConfig(require_worker.PLUGIN_CONFIG_KEY_BASE);
430
+ const config = this._configService.getConfig(require_remote_register_function_service.PLUGIN_CONFIG_KEY_BASE);
431
431
  return (config === null || config === void 0 ? void 0 : config.initialFormulaComputing) ?? 1;
432
432
  }
433
433
  _commandExecutedListener() {
@@ -443,6 +443,12 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
443
443
  _initialExecuteFormulaProcessListener() {
444
444
  let startDependencyTimer = null;
445
445
  let calculationProcessCount = 0;
446
+ this.disposeWithMe(() => {
447
+ if (startDependencyTimer !== null) {
448
+ clearTimeout(startDependencyTimer);
449
+ startDependencyTimer = null;
450
+ }
451
+ });
446
452
  this.disposeWithMe(this._commandService.onCommandExecuted((command) => {
447
453
  if (command.id === _univerjs_engine_formula.SetFormulaCalculationStopMutation.id) this.clearProgress();
448
454
  if (command.id !== _univerjs_engine_formula.SetFormulaCalculationNotificationMutation.id) return;
@@ -461,43 +467,11 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
461
467
  startDependencyTimer = null;
462
468
  this._startProgress();
463
469
  }, 1e3);
464
- } else if (stage === _univerjs_engine_formula.FormulaExecuteStageType.CURRENTLY_CALCULATING) {
465
- this._executionInProgressParams = params.stageInfo;
466
- if (startDependencyTimer === null) {
467
- const calculating = this._localeService.t("sheets-formula.progress.calculating");
468
- this._calculateProgress(calculating);
469
- }
470
- } else if (stage === _univerjs_engine_formula.FormulaExecuteStageType.START_DEPENDENCY_ARRAY_FORMULA) {
471
- this._executionInProgressParams = params.stageInfo;
472
- if (startDependencyTimer === null) {
473
- const arrayAnalysis = this._localeService.t("sheets-formula.progress.array-analysis");
474
- this._calculateProgress(arrayAnalysis);
475
- }
476
- } else if (stage === _univerjs_engine_formula.FormulaExecuteStageType.CURRENTLY_CALCULATING_ARRAY_FORMULA) {
477
- this._executionInProgressParams = params.stageInfo;
478
- if (startDependencyTimer === null) {
479
- const arrayCalculation = this._localeService.t("sheets-formula.progress.array-calculation");
480
- this._calculateProgress(arrayCalculation);
481
- }
482
- }
470
+ } else this._updateCalculationProgress(params.stageInfo, startDependencyTimer === null);
483
471
  } else {
484
472
  const state = params.functionsExecutedState;
485
- let result = "";
486
- calculationProcessCount--;
487
- switch (state) {
488
- case _univerjs_engine_formula.FormulaExecutedStateType.NOT_EXECUTED:
489
- result = "No tasks are being executed anymore";
490
- break;
491
- case _univerjs_engine_formula.FormulaExecutedStateType.STOP_EXECUTION:
492
- result = "The execution of the formula has been stopped";
493
- calculationProcessCount = 0;
494
- break;
495
- case _univerjs_engine_formula.FormulaExecutedStateType.SUCCESS:
496
- result = "Formula calculation succeeded";
497
- if (calculationProcessCount === 0 || calculationProcessCount === -1) result += `. Total time consumed: ${performance.now() - this._startExecutionTime} ms`;
498
- break;
499
- case _univerjs_engine_formula.FormulaExecutedStateType.INITIAL: result = "Waiting for calculation";
500
- }
473
+ calculationProcessCount = state === _univerjs_engine_formula.FormulaExecutedStateType.STOP_EXECUTION ? 0 : calculationProcessCount - 1;
474
+ const result = this._getCalculationResultMessage(state, calculationProcessCount);
501
475
  if (calculationProcessCount === 0 || calculationProcessCount === -1) {
502
476
  if (startDependencyTimer) {
503
477
  clearTimeout(startDependencyTimer);
@@ -513,6 +487,34 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
513
487
  }
514
488
  }));
515
489
  }
490
+ _updateCalculationProgress(stageInfo, showProgress) {
491
+ let label;
492
+ switch (stageInfo.stage) {
493
+ case _univerjs_engine_formula.FormulaExecuteStageType.CURRENTLY_CALCULATING:
494
+ label = "sheets-formula.progress.calculating";
495
+ break;
496
+ case _univerjs_engine_formula.FormulaExecuteStageType.START_DEPENDENCY_ARRAY_FORMULA:
497
+ label = "sheets-formula.progress.array-analysis";
498
+ break;
499
+ case _univerjs_engine_formula.FormulaExecuteStageType.CURRENTLY_CALCULATING_ARRAY_FORMULA:
500
+ label = "sheets-formula.progress.array-calculation";
501
+ break;
502
+ default: return;
503
+ }
504
+ this._executionInProgressParams = stageInfo;
505
+ if (showProgress) this._calculateProgress(this._localeService.t(label));
506
+ }
507
+ _getCalculationResultMessage(state, calculationProcessCount) {
508
+ switch (state) {
509
+ case _univerjs_engine_formula.FormulaExecutedStateType.NOT_EXECUTED: return "No tasks are being executed anymore";
510
+ case _univerjs_engine_formula.FormulaExecutedStateType.STOP_EXECUTION: return "The execution of the formula has been stopped";
511
+ case _univerjs_engine_formula.FormulaExecutedStateType.SUCCESS:
512
+ if (calculationProcessCount === 0 || calculationProcessCount === -1) return `Formula calculation succeeded. Total time consumed: ${performance.now() - this._startExecutionTime} ms`;
513
+ return "Formula calculation succeeded";
514
+ case _univerjs_engine_formula.FormulaExecutedStateType.INITIAL: return "Waiting for calculation";
515
+ default: return "";
516
+ }
517
+ }
516
518
  _initialExecuteFormula() {
517
519
  const calculationMode = this._getCalculationMode();
518
520
  if (calculationMode !== 2) {
@@ -533,13 +535,13 @@ let TriggerCalculationController = class TriggerCalculationController extends _u
533
535
  };
534
536
  }
535
537
  };
536
- TriggerCalculationController = require_worker.__decorate([
537
- require_worker.__decorateParam(0, _univerjs_core.ICommandService),
538
- require_worker.__decorateParam(1, _univerjs_core.IUniverInstanceService),
539
- require_worker.__decorateParam(2, _univerjs_core.ILogService),
540
- require_worker.__decorateParam(3, _univerjs_core.IConfigService),
541
- require_worker.__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
542
- require_worker.__decorateParam(5, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService))
538
+ TriggerCalculationController = require_remote_register_function_service.__decorate([
539
+ require_remote_register_function_service.__decorateParam(0, _univerjs_core.ICommandService),
540
+ require_remote_register_function_service.__decorateParam(1, _univerjs_core.IUniverInstanceService),
541
+ require_remote_register_function_service.__decorateParam(2, _univerjs_core.ILogService),
542
+ require_remote_register_function_service.__decorateParam(3, _univerjs_core.IConfigService),
543
+ require_remote_register_function_service.__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
544
+ require_remote_register_function_service.__decorateParam(5, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService))
543
545
  ], TriggerCalculationController);
544
546
 
545
547
  // src/controllers/unit-qualifier-rename.controller.ts
@@ -567,7 +569,7 @@ let UnitQualifierRenameController = class UnitQualifierRenameController extends
567
569
  this._undoRedoService = _undoRedoService;
568
570
  this._univerInstanceService = _univerInstanceService;
569
571
  this._definedNamesService = _definedNamesService;
570
- require_worker._defineProperty(this, "_names", /* @__PURE__ */ new Map());
572
+ require_remote_register_function_service._defineProperty(this, "_names", /* @__PURE__ */ new Map());
571
573
  this._univerInstanceService.getAllUnitsForType(_univerjs_core.UniverInstanceType.UNIVER_BASE).forEach((unit) => this._watch(unit));
572
574
  this.disposeWithMe(this._univerInstanceService.getTypeOfUnitAdded$(_univerjs_core.UniverInstanceType.UNIVER_BASE).subscribe(({ unit }) => this._watch(unit)));
573
575
  this.disposeWithMe(this._univerInstanceService.getTypeOfUnitDisposed$(_univerjs_core.UniverInstanceType.UNIVER_BASE).subscribe((unit) => this._names.delete(unit.getUnitId())));
@@ -634,11 +636,11 @@ let UnitQualifierRenameController = class UnitQualifierRenameController extends
634
636
  });
635
637
  }
636
638
  };
637
- UnitQualifierRenameController = require_worker.__decorate([
638
- require_worker.__decorateParam(0, _univerjs_core.ICommandService),
639
- require_worker.__decorateParam(1, _univerjs_core.IUndoRedoService),
640
- require_worker.__decorateParam(2, _univerjs_core.IUniverInstanceService),
641
- require_worker.__decorateParam(3, _univerjs_engine_formula.IDefinedNamesService)
639
+ UnitQualifierRenameController = require_remote_register_function_service.__decorate([
640
+ require_remote_register_function_service.__decorateParam(0, _univerjs_core.ICommandService),
641
+ require_remote_register_function_service.__decorateParam(1, _univerjs_core.IUndoRedoService),
642
+ require_remote_register_function_service.__decorateParam(2, _univerjs_core.IUniverInstanceService),
643
+ require_remote_register_function_service.__decorateParam(3, _univerjs_engine_formula.IDefinedNamesService)
642
644
  ], UnitQualifierRenameController);
643
645
 
644
646
  // src/controllers/utils/offset-formula-data.ts
@@ -1952,11 +1954,11 @@ let UpdateDefinedNameController = class UpdateDefinedNameController extends _uni
1952
1954
  return null;
1953
1955
  }
1954
1956
  };
1955
- UpdateDefinedNameController = require_worker.__decorate([
1956
- require_worker.__decorateParam(0, _univerjs_engine_formula.IDefinedNamesService),
1957
- require_worker.__decorateParam(1, _univerjs_core.IUniverInstanceService),
1958
- require_worker.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
1959
- require_worker.__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder))
1957
+ UpdateDefinedNameController = require_remote_register_function_service.__decorate([
1958
+ require_remote_register_function_service.__decorateParam(0, _univerjs_engine_formula.IDefinedNamesService),
1959
+ require_remote_register_function_service.__decorateParam(1, _univerjs_core.IUniverInstanceService),
1960
+ require_remote_register_function_service.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
1961
+ require_remote_register_function_service.__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder))
1960
1962
  ], UpdateDefinedNameController);
1961
1963
 
1962
1964
  // src/controllers/update-formula.controller.ts
@@ -2079,7 +2081,7 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
2079
2081
  newFormulaData[unitId][sheetId] = (_currentSheetData$uni = currentSheetData[unitId]) === null || _currentSheetData$uni === void 0 ? void 0 : _currentSheetData$uni[sheetId];
2080
2082
  });
2081
2083
  this._commandService.executeCommand(_univerjs_engine_formula.SetFormulaDataMutation.id, { formulaData: newFormulaData }, { onlyLocal: true });
2082
- const config = this._configService.getConfig(require_worker.PLUGIN_CONFIG_KEY_BASE);
2084
+ const config = this._configService.getConfig(require_remote_register_function_service.PLUGIN_CONFIG_KEY_BASE);
2083
2085
  const calculationMode = (config === null || config === void 0 ? void 0 : config.initialFormulaComputing) ?? 1;
2084
2086
  if (calculationMode === 2) return;
2085
2087
  const params = this._getDirtyDataByCalculationMode(calculationMode);
@@ -2128,12 +2130,15 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
2128
2130
  if (formulaDataKeys.length === 0) return { newFormulaData: {} };
2129
2131
  const newFormulaData = Object.create(null);
2130
2132
  const inCrossSheetCutRangeNewFormulas = [];
2133
+ const { type, unitId: affectedUnitId, sheetId: affectedSheetId } = formulaReferenceMoveParam;
2134
+ const isRemovingSheet = type === 13;
2131
2135
  for (const unitId of formulaDataKeys) {
2132
2136
  const sheetData = formulaData[unitId];
2133
2137
  if (sheetData == null) continue;
2134
2138
  const sheetDataKeys = Object.keys(sheetData);
2135
2139
  if (!_univerjs_core.Tools.isDefine(newFormulaData[unitId])) newFormulaData[unitId] = Object.create(null);
2136
2140
  for (const sheetId of sheetDataKeys) {
2141
+ if (isRemovingSheet && unitId === affectedUnitId && sheetId === affectedSheetId) continue;
2137
2142
  const matrixData = new _univerjs_core.ObjectMatrix(sheetData[sheetId] || {});
2138
2143
  const newFormulaDataItem = new _univerjs_core.ObjectMatrix();
2139
2144
  const context = {
@@ -2236,15 +2241,15 @@ let UpdateFormulaController = class UpdateFormulaController extends _univerjs_co
2236
2241
  return type === 14 ? definedName : _univerjs_engine_formula.ErrorType.REF;
2237
2242
  }
2238
2243
  };
2239
- UpdateFormulaController = require_worker.__decorate([
2240
- require_worker.__decorateParam(0, _univerjs_core.IUniverInstanceService),
2241
- require_worker.__decorateParam(1, _univerjs_core.ICommandService),
2242
- require_worker.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder)),
2243
- require_worker.__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
2244
- require_worker.__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
2245
- require_worker.__decorateParam(5, _univerjs_engine_formula.IDefinedNamesService),
2246
- require_worker.__decorateParam(6, _univerjs_core.IConfigService),
2247
- require_worker.__decorateParam(7, (0, _univerjs_core.Inject)(_univerjs_core.Injector))
2244
+ UpdateFormulaController = require_remote_register_function_service.__decorate([
2245
+ require_remote_register_function_service.__decorateParam(0, _univerjs_core.IUniverInstanceService),
2246
+ require_remote_register_function_service.__decorateParam(1, _univerjs_core.ICommandService),
2247
+ require_remote_register_function_service.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder)),
2248
+ require_remote_register_function_service.__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel)),
2249
+ require_remote_register_function_service.__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
2250
+ require_remote_register_function_service.__decorateParam(5, _univerjs_engine_formula.IDefinedNamesService),
2251
+ require_remote_register_function_service.__decorateParam(6, _univerjs_core.IConfigService),
2252
+ require_remote_register_function_service.__decorateParam(7, (0, _univerjs_core.Inject)(_univerjs_core.Injector))
2248
2253
  ], UpdateFormulaController);
2249
2254
  function getReferenceWithOffset(token, item, context) {
2250
2255
  var _unitSheetNameMap$map;
@@ -2731,10 +2736,10 @@ let ActiveDirtyController = class ActiveDirtyController extends _univerjs_core.D
2731
2736
  return dirtyRanges;
2732
2737
  }
2733
2738
  };
2734
- ActiveDirtyController = require_worker.__decorate([
2735
- require_worker.__decorateParam(0, _univerjs_engine_formula.IActiveDirtyManagerService),
2736
- require_worker.__decorateParam(1, _univerjs_core.IUniverInstanceService),
2737
- require_worker.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel))
2739
+ ActiveDirtyController = require_remote_register_function_service.__decorate([
2740
+ require_remote_register_function_service.__decorateParam(0, _univerjs_engine_formula.IActiveDirtyManagerService),
2741
+ require_remote_register_function_service.__decorateParam(1, _univerjs_core.IUniverInstanceService),
2742
+ require_remote_register_function_service.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel))
2738
2743
  ], ActiveDirtyController);
2739
2744
 
2740
2745
  // src/controllers/array-formula-cell-interceptor.controller.ts
@@ -2790,10 +2795,10 @@ let ArrayFormulaCellInterceptorController = class ArrayFormulaCellInterceptorCon
2790
2795
  }));
2791
2796
  }
2792
2797
  };
2793
- ArrayFormulaCellInterceptorController = require_worker.__decorate([
2794
- require_worker.__decorateParam(0, _univerjs_core.ICommandService),
2795
- require_worker.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
2796
- require_worker.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel))
2798
+ ArrayFormulaCellInterceptorController = require_remote_register_function_service.__decorate([
2799
+ require_remote_register_function_service.__decorateParam(0, _univerjs_core.ICommandService),
2800
+ require_remote_register_function_service.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetInterceptorService)),
2801
+ require_remote_register_function_service.__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaDataModel))
2797
2802
  ], ArrayFormulaCellInterceptorController);
2798
2803
 
2799
2804
  // src/controllers/defined-name.controller.ts
@@ -2804,7 +2809,7 @@ let DefinedNameController = class DefinedNameController extends _univerjs_core.D
2804
2809
  this._definedNamesService = _definedNamesService;
2805
2810
  this._univerInstanceService = _univerInstanceService;
2806
2811
  this._commandService = _commandService;
2807
- require_worker._defineProperty(this, "_preUnitId", null);
2812
+ require_remote_register_function_service._defineProperty(this, "_preUnitId", null);
2808
2813
  this._initialize();
2809
2814
  }
2810
2815
  _initialize() {
@@ -2931,11 +2936,11 @@ let DefinedNameController = class DefinedNameController extends _univerjs_core.D
2931
2936
  this._descriptionService.unregisterDescriptions(functionList);
2932
2937
  }
2933
2938
  };
2934
- DefinedNameController = require_worker.__decorate([
2935
- require_worker.__decorateParam(0, _univerjs_engine_formula.IDescriptionService),
2936
- require_worker.__decorateParam(1, _univerjs_engine_formula.IDefinedNamesService),
2937
- require_worker.__decorateParam(2, _univerjs_core.IUniverInstanceService),
2938
- require_worker.__decorateParam(3, _univerjs_core.ICommandService)
2939
+ DefinedNameController = require_remote_register_function_service.__decorate([
2940
+ require_remote_register_function_service.__decorateParam(0, _univerjs_engine_formula.IDescriptionService),
2941
+ require_remote_register_function_service.__decorateParam(1, _univerjs_engine_formula.IDefinedNamesService),
2942
+ require_remote_register_function_service.__decorateParam(2, _univerjs_core.IUniverInstanceService),
2943
+ require_remote_register_function_service.__decorateParam(3, _univerjs_core.ICommandService)
2939
2944
  ], DefinedNameController);
2940
2945
 
2941
2946
  // src/controllers/formula.controller.ts
@@ -2961,7 +2966,7 @@ let FormulaController = class FormulaController extends _univerjs_core.Disposabl
2961
2966
  this._commandService.registerCommand(InsertFunctionCommand);
2962
2967
  }
2963
2968
  };
2964
- FormulaController = require_worker.__decorate([require_worker.__decorateParam(0, _univerjs_core.ICommandService)], FormulaController);
2969
+ FormulaController = require_remote_register_function_service.__decorate([require_remote_register_function_service.__decorateParam(0, _univerjs_core.ICommandService)], FormulaController);
2965
2970
 
2966
2971
  // src/controllers/sheet-formula-calculation-result-apply.controller.ts
2967
2972
  /**
@@ -2989,7 +2994,7 @@ let SheetFormulaCalculationResultApplyController = class SheetFormulaCalculation
2989
2994
  }));
2990
2995
  }
2991
2996
  };
2992
- SheetFormulaCalculationResultApplyController = require_worker.__decorate([require_worker.__decorateParam(0, _univerjs_core.ICommandService), require_worker.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaCalculationSessionService))], SheetFormulaCalculationResultApplyController);
2997
+ SheetFormulaCalculationResultApplyController = require_remote_register_function_service.__decorate([require_remote_register_function_service.__decorateParam(0, _univerjs_core.ICommandService), require_remote_register_function_service.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_engine_formula.FormulaCalculationSessionService))], SheetFormulaCalculationResultApplyController);
2993
2998
 
2994
2999
  // src/controllers/super-table.controller.ts
2995
3000
  let SuperTableController = class SuperTableController extends _univerjs_core.Disposable {
@@ -2999,7 +3004,7 @@ let SuperTableController = class SuperTableController extends _univerjs_core.Dis
2999
3004
  this._univerInstanceService = _univerInstanceService;
3000
3005
  this._commandService = _commandService;
3001
3006
  this._superTableService = _superTableService;
3002
- require_worker._defineProperty(this, "_preUnitId", null);
3007
+ require_remote_register_function_service._defineProperty(this, "_preUnitId", null);
3003
3008
  this._initialize();
3004
3009
  }
3005
3010
  _initialize() {
@@ -3112,14 +3117,46 @@ let SuperTableController = class SuperTableController extends _univerjs_core.Dis
3112
3117
  this._descriptionService.unregisterDescriptions(functionList);
3113
3118
  }
3114
3119
  };
3115
- SuperTableController = require_worker.__decorate([
3116
- require_worker.__decorateParam(0, _univerjs_engine_formula.IDescriptionService),
3117
- require_worker.__decorateParam(1, _univerjs_core.IUniverInstanceService),
3118
- require_worker.__decorateParam(2, _univerjs_core.ICommandService),
3119
- require_worker.__decorateParam(3, _univerjs_engine_formula.ISuperTableService)
3120
+ SuperTableController = require_remote_register_function_service.__decorate([
3121
+ require_remote_register_function_service.__decorateParam(0, _univerjs_engine_formula.IDescriptionService),
3122
+ require_remote_register_function_service.__decorateParam(1, _univerjs_core.IUniverInstanceService),
3123
+ require_remote_register_function_service.__decorateParam(2, _univerjs_core.ICommandService),
3124
+ require_remote_register_function_service.__decorateParam(3, _univerjs_engine_formula.ISuperTableService)
3120
3125
  ], SuperTableController);
3121
3126
 
3122
3127
  // src/services/formula-ref-range.service.ts
3128
+ /**
3129
+ * An inserted row or column that lands inside a registered range stays part of that range, the
3130
+ * same way {@link handleCommonDefaultRangeChangeWithEffectRefCommands} expands a range when the
3131
+ * insertion happens inside it. `registerRangeFormula` splits a range into the segments that are
3132
+ * affected by a command, and an inserted block is not part of any segment, so it has to be
3133
+ * collected separately, otherwise the inserted cells would silently drop out of the range.
3134
+ */
3135
+ function getInsertedBlocks(command, ranges) {
3136
+ const params = command.params;
3137
+ if (!(params === null || params === void 0 ? void 0 : params.range)) return [];
3138
+ switch (command.id) {
3139
+ case _univerjs_sheets.EffectRefRangId.InsertRowCommandId: {
3140
+ const { startRow, endRow } = params.range;
3141
+ return ranges.filter((range) => startRow > range.startRow && startRow <= range.endRow).map((range) => ({
3142
+ startRow,
3143
+ endRow,
3144
+ startColumn: range.startColumn,
3145
+ endColumn: range.endColumn
3146
+ }));
3147
+ }
3148
+ case _univerjs_sheets.EffectRefRangId.InsertColCommandId: {
3149
+ const { startColumn, endColumn } = params.range;
3150
+ return ranges.filter((range) => startColumn > range.startColumn && startColumn <= range.endColumn).map((range) => ({
3151
+ startRow: range.startRow,
3152
+ endRow: range.endRow,
3153
+ startColumn,
3154
+ endColumn
3155
+ }));
3156
+ }
3157
+ default: return [];
3158
+ }
3159
+ }
3123
3160
  function getFormulaKeyOffset(lexerTreeBuilder, formulaString, refOffsetX, refOffsetY) {
3124
3161
  const sequenceNodes = lexerTreeBuilder.sequenceNodesBuilder(formulaString);
3125
3162
  if (sequenceNodes == null) return formulaString;
@@ -3268,6 +3305,8 @@ let FormulaRefRangeService = class FormulaRefRangeService extends _univerjs_core
3268
3305
  const disposableCollection = new _univerjs_core.DisposableCollection();
3269
3306
  const formulaDeps = formulas.map((formula) => this._getFormulaDependcy(unitId, subUnitId, formula, oldRanges));
3270
3307
  const handleRangeChange = (commandInfo) => {
3308
+ const wholeRangeResult = this._transformWholeRangeFormulas(unitId, subUnitId, oldRanges, formulas, commandInfo);
3309
+ if (wholeRangeResult) return callback(wholeRangeResult);
3271
3310
  const effectedRanges = (0, _univerjs_sheets.getSeparateEffectedRangesOnCommand)(this._injector, commandInfo);
3272
3311
  if (!effectedRanges) return {
3273
3312
  undos: [],
@@ -3359,6 +3398,7 @@ let FormulaRefRangeService = class FormulaRefRangeService extends _univerjs_core
3359
3398
  if (keyMap.has(item.key)) keyMap.get(item.key).push(item);
3360
3399
  else keyMap.set(item.key, [item]);
3361
3400
  }
3401
+ this._appendInsertedBlockItems(keyMap, commandInfo, oldRanges, formulas, oldRanges[0], originKey);
3362
3402
  const res = [];
3363
3403
  const keys = Array.from(keyMap.keys());
3364
3404
  for (let i = keys.length - 1; i >= 0; i--) {
@@ -3392,23 +3432,57 @@ let FormulaRefRangeService = class FormulaRefRangeService extends _univerjs_core
3392
3432
  });
3393
3433
  return disposableCollection;
3394
3434
  }
3435
+ /**
3436
+ * A whole column/row/sheet range keeps its anchor, so it is adjusted as a single range:
3437
+ * segmenting it would both split the rule and drop the range type.
3438
+ *
3439
+ * @returns the single rule range to apply, or `undefined` when the regular segmentation applies
3440
+ */
3441
+ _transformWholeRangeFormulas(unitId, subUnitId, oldRanges, formulas, commandInfo) {
3442
+ var _oldRanges$;
3443
+ const ruleRangeType = ((_oldRanges$ = oldRanges[0]) === null || _oldRanges$ === void 0 ? void 0 : _oldRanges$.rangeType) ?? _univerjs_core.RANGE_TYPE.NORMAL;
3444
+ if (ruleRangeType === _univerjs_core.RANGE_TYPE.NORMAL || !oldRanges.every((range) => range.rangeType === ruleRangeType)) return;
3445
+ const ranges = (0, _univerjs_sheets.handleCommonDefaultRangeChangeWithEffectRefCommands)(oldRanges[0], commandInfo);
3446
+ if (!ranges.length) return [];
3447
+ return [{
3448
+ formulas: formulas.map((formula) => (0, _univerjs_core.isFormulaString)(formula) ? this.transformFormulaByEffectCommand(unitId, subUnitId, formula, commandInfo) : formula),
3449
+ ranges
3450
+ }];
3451
+ }
3452
+ _appendInsertedBlockItems(keyMap, commandInfo, oldRanges, formulas, origin, originKey) {
3453
+ for (const block of getInsertedBlocks(commandInfo, oldRanges)) {
3454
+ const offsetRow = block.startRow - origin.startRow;
3455
+ const offsetColumn = block.startColumn - origin.startColumn;
3456
+ const item = {
3457
+ formulas: formulas.map((formula) => ({
3458
+ newFormula: (0, _univerjs_core.isFormulaString)(formula) ? this._lexerTreeBuilder.moveFormulaRefOffset(formula, offsetColumn, offsetRow) : formula,
3459
+ orginFormula: formula
3460
+ })),
3461
+ ranges: [block],
3462
+ key: originKey
3463
+ };
3464
+ const items = keyMap.get(item.key);
3465
+ if (items) items.push(item);
3466
+ else keyMap.set(item.key, [item]);
3467
+ }
3468
+ }
3395
3469
  };
3396
- FormulaRefRangeService = require_worker.__decorate([
3397
- require_worker.__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_sheets.RefRangeService)),
3398
- require_worker.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder)),
3399
- require_worker.__decorateParam(2, _univerjs_core.IUniverInstanceService),
3400
- require_worker.__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_core.Injector))
3470
+ FormulaRefRangeService = require_remote_register_function_service.__decorate([
3471
+ require_remote_register_function_service.__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_sheets.RefRangeService)),
3472
+ require_remote_register_function_service.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_engine_formula.LexerTreeBuilder)),
3473
+ require_remote_register_function_service.__decorateParam(2, _univerjs_core.IUniverInstanceService),
3474
+ require_remote_register_function_service.__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_core.Injector))
3401
3475
  ], FormulaRefRangeService);
3402
3476
 
3403
3477
  // src/plugin.ts
3404
3478
  let UniverSheetsFormulaPlugin = class UniverSheetsFormulaPlugin extends _univerjs_core.Plugin {
3405
- constructor(_config = require_worker.defaultPluginBaseConfig, _injector, _configService) {
3479
+ constructor(_config = require_remote_register_function_service.defaultPluginBaseConfig, _injector, _configService) {
3406
3480
  super();
3407
3481
  this._config = _config;
3408
3482
  this._injector = _injector;
3409
3483
  this._configService = _configService;
3410
- const { ...rest } = (0, _univerjs_core.merge)({}, require_worker.defaultPluginBaseConfig, this._config);
3411
- this._configService.setConfig(require_worker.PLUGIN_CONFIG_KEY_BASE, rest, { merge: true });
3484
+ const { ...rest } = (0, _univerjs_core.merge)({}, require_remote_register_function_service.defaultPluginBaseConfig, this._config);
3485
+ this._configService.setConfig(require_remote_register_function_service.PLUGIN_CONFIG_KEY_BASE, rest, { merge: true });
3412
3486
  }
3413
3487
  onStarting() {
3414
3488
  var _this$_config$descrip;
@@ -3431,8 +3505,8 @@ let UniverSheetsFormulaPlugin = class UniverSheetsFormulaPlugin extends _univerj
3431
3505
  ];
3432
3506
  if (this._config.notExecuteFormula) {
3433
3507
  const rpcChannelService = j.get(_univerjs_rpc.IRPCChannelService);
3434
- dependencies.push([require_worker.IRemoteRegisterFunctionService, { useFactory: function createChannelService() {
3435
- return (0, _univerjs_rpc.toModule)(rpcChannelService.requestChannel(require_worker.RemoteRegisterFunctionServiceName));
3508
+ dependencies.push([require_remote_register_function_service.IRemoteRegisterFunctionService, { useFactory: function createChannelService() {
3509
+ return (0, _univerjs_rpc.toModule)(rpcChannelService.requestChannel(require_remote_register_function_service.RemoteRegisterFunctionServiceName));
3436
3510
  } }]);
3437
3511
  }
3438
3512
  dependencies.forEach((dependency) => j.add(dependency));
@@ -3458,14 +3532,14 @@ let UniverSheetsFormulaPlugin = class UniverSheetsFormulaPlugin extends _univerj
3458
3532
  if (!(0, _univerjs_core.isNodeEnv)()) (0, _univerjs_core.touchDependencies)(this._injector, [[TriggerCalculationController]]);
3459
3533
  }
3460
3534
  };
3461
- require_worker._defineProperty(UniverSheetsFormulaPlugin, "pluginName", SHEETS_FORMULA_PLUGIN_NAME);
3462
- require_worker._defineProperty(UniverSheetsFormulaPlugin, "packageName", require_worker.name);
3463
- require_worker._defineProperty(UniverSheetsFormulaPlugin, "version", require_worker.version);
3464
- require_worker._defineProperty(UniverSheetsFormulaPlugin, "type", _univerjs_core.UniverInstanceType.UNIVER_SHEET);
3465
- UniverSheetsFormulaPlugin = require_worker.__decorate([
3535
+ require_remote_register_function_service._defineProperty(UniverSheetsFormulaPlugin, "pluginName", SHEETS_FORMULA_PLUGIN_NAME);
3536
+ require_remote_register_function_service._defineProperty(UniverSheetsFormulaPlugin, "packageName", require_remote_register_function_service.name);
3537
+ require_remote_register_function_service._defineProperty(UniverSheetsFormulaPlugin, "version", require_remote_register_function_service.version);
3538
+ require_remote_register_function_service._defineProperty(UniverSheetsFormulaPlugin, "type", _univerjs_core.UniverInstanceType.UNIVER_SHEET);
3539
+ UniverSheetsFormulaPlugin = require_remote_register_function_service.__decorate([
3466
3540
  (0, _univerjs_core.DependentOn)(_univerjs_engine_formula.UniverFormulaEnginePlugin, _univerjs_sheets.UniverSheetsPlugin),
3467
- require_worker.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
3468
- require_worker.__decorateParam(2, _univerjs_core.IConfigService)
3541
+ require_remote_register_function_service.__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
3542
+ require_remote_register_function_service.__decorateParam(2, _univerjs_core.IConfigService)
3469
3543
  ], UniverSheetsFormulaPlugin);
3470
3544
 
3471
3545
  // src/util/calculate.ts
@@ -3493,7 +3567,7 @@ function calculateFormula(inject, formulaString, unitId, sheetData) {
3493
3567
  return (0, _univerjs_engine_formula.getObjectValue)(result);
3494
3568
  }
3495
3569
 
3496
- exports.CalculationMode = require_worker.CalculationMode;
3570
+ exports.CalculationMode = require_remote_register_function_service.CalculationMode;
3497
3571
  Object.defineProperty(exports, "FormulaAutoFillController", {
3498
3572
  enumerable: true,
3499
3573
  get: function () {
@@ -3512,7 +3586,7 @@ Object.defineProperty(exports, "FormulaReorderController", {
3512
3586
  return FormulaReorderController;
3513
3587
  }
3514
3588
  });
3515
- exports.IRemoteRegisterFunctionService = require_worker.IRemoteRegisterFunctionService;
3589
+ exports.IRemoteRegisterFunctionService = require_remote_register_function_service.IRemoteRegisterFunctionService;
3516
3590
  Object.defineProperty(exports, "ImageFormulaCellInterceptorController", {
3517
3591
  enumerable: true,
3518
3592
  get: function () {
@@ -3520,11 +3594,11 @@ Object.defineProperty(exports, "ImageFormulaCellInterceptorController", {
3520
3594
  }
3521
3595
  });
3522
3596
  exports.InsertFunctionCommand = InsertFunctionCommand;
3523
- exports.PLUGIN_CONFIG_KEY_BASE = require_worker.PLUGIN_CONFIG_KEY_BASE;
3597
+ exports.PLUGIN_CONFIG_KEY_BASE = require_remote_register_function_service.PLUGIN_CONFIG_KEY_BASE;
3524
3598
  Object.defineProperty(exports, "RemoteRegisterFunctionService", {
3525
3599
  enumerable: true,
3526
3600
  get: function () {
3527
- return require_worker.RemoteRegisterFunctionService;
3601
+ return require_remote_register_function_service.RemoteRegisterFunctionService;
3528
3602
  }
3529
3603
  });
3530
3604
  Object.defineProperty(exports, "TriggerCalculationController", {
@@ -3539,12 +3613,6 @@ Object.defineProperty(exports, "UnitQualifierRenameController", {
3539
3613
  return UnitQualifierRenameController;
3540
3614
  }
3541
3615
  });
3542
- Object.defineProperty(exports, "UniverRemoteSheetsFormulaPlugin", {
3543
- enumerable: true,
3544
- get: function () {
3545
- return require_worker.UniverRemoteSheetsFormulaPlugin;
3546
- }
3547
- });
3548
3616
  Object.defineProperty(exports, "UniverSheetsFormulaPlugin", {
3549
3617
  enumerable: true,
3550
3618
  get: function () {