feat(engine-formula): move register-other-formula-service to engine-formula (#6328)

packages-experimental/uni-formula-ui/package.json

@@ -70,10 +70,10 @@
         "@univerjs/design": "workspace:*",
         "@univerjs/docs": "workspace:*",
         "@univerjs/docs-ui": "workspace:*",
+        "@univerjs/engine-formula": "workspace:*",
         "@univerjs/engine-render": "workspace:*",
         "@univerjs/icons": "^1.0.2",
         "@univerjs/rpc": "workspace:*",
-        "@univerjs/sheets-formula": "workspace:*",
         "@univerjs/sheets-formula-ui": "workspace:*",
         "@univerjs/slides-ui": "workspace:*",
         "@univerjs/ui": "workspace:*",

packages-experimental/uni-formula-ui/src/services/uni-formula.service.ts

@@ -41,9 +41,9 @@ import {
     UniverInstanceType,
 } from '@univerjs/core';
 import { replaceSelectionFactory } from '@univerjs/docs';
+import { OtherFormulaBizType, RegisterOtherFormulaService } from '@univerjs/engine-formula';
 import { RichText } from '@univerjs/engine-render';
 import { DataSyncPrimaryController } from '@univerjs/rpc';
-import { OtherFormulaBizType, RegisterOtherFormulaService } from '@univerjs/sheets-formula';
 import { CanvasView } from '@univerjs/slides-ui';
 import { DumbUniFormulaService, IUniFormulaService } from '@univerjs/uni-formula';
 import { take } from 'rxjs';

packages/engine-formula/src/index.ts

@@ -49,6 +49,7 @@ export { isReferenceString } from './basics/regex';
 export { convertUnitDataToRuntime } from './basics/runtime';
 export { compareToken, matchToken, OPERATOR_TOKEN_SET, operatorToken, prefixToken, SUFFIX_TOKEN_SET } from './basics/token';
 export { DEFAULT_TOKEN_LAMBDA_FUNCTION_NAME, DEFAULT_TOKEN_LET_FUNCTION_NAME, DEFAULT_TOKEN_TYPE_LAMBDA_PARAMETER, DEFAULT_TOKEN_TYPE_PARAMETER, DEFAULT_TOKEN_TYPE_ROOT } from './basics/token-type';
+export { OtherFormulaMarkDirty } from './commands/mutations/formula.mutation';
 export { RegisterFunctionMutation } from './commands/mutations/register-function.mutation';
 export { type ISetArrayFormulaDataMutationParams, SetArrayFormulaDataMutation } from './commands/mutations/set-array-formula-data.mutation';
 export { type ISetDefinedNameMutationParam, type ISetDefinedNameMutationSearchParam, RemoveDefinedNameMutation, SetDefinedNameMutation } from './commands/mutations/set-defined-name.mutation';
@@ -189,12 +190,17 @@ export { DependencyManagerService } from './services/dependency-manager.service'
 export { DependencyManagerBaseService } from './services/dependency-manager.service';
 export { FeatureCalculationManagerService, IFeatureCalculationManagerService } from './services/feature-calculation-manager.service';
 export type { IFeatureCalculationManagerParam } from './services/feature-calculation-manager.service';
+export type { IFormulaInfo, IOtherFormulaResult } from './services/formula-common';
+export { FormulaResultStatus } from './services/formula-common';
 export { FunctionService } from './services/function.service';
 export { IFunctionService } from './services/function.service';
 export { GlobalComputingStatusService } from './services/global-computing-status.service';
 export { HyperlinkEngineFormulaService, IHyperlinkEngineFormulaService } from './services/hyperlink-engine-formula.service';
 export { IOtherFormulaManagerService, OtherFormulaManagerService } from './services/other-formula-manager.service';
+export { OtherFormulaBizType, RegisterOtherFormulaService } from './services/register-other-formula.service';
+
 export { FormulaExecutedStateType, FormulaExecuteStageType, FormulaRuntimeService, type IAllRuntimeData, type IExecutionInProgressParams, IFormulaRuntimeService } from './services/runtime.service';
 export { ISheetRowFilteredService, SheetRowFilteredService } from './services/sheet-row-filtered.service';
 export { ISuperTableService } from './services/super-table.service';
+
 export { SuperTableService } from './services/super-table.service';

packages/engine-formula/src/plugin.ts

@@ -54,6 +54,7 @@ import { FunctionService, IFunctionService } from './services/function.service';
 import { GlobalComputingStatusService } from './services/global-computing-status.service';
 import { HyperlinkEngineFormulaService, IHyperlinkEngineFormulaService } from './services/hyperlink-engine-formula.service';
 import { IOtherFormulaManagerService, OtherFormulaManagerService } from './services/other-formula-manager.service';
+import { RegisterOtherFormulaService } from './services/register-other-formula.service';
 import { FormulaRuntimeService, IFormulaRuntimeService } from './services/runtime.service';
 import { ISheetRowFilteredService, SheetRowFilteredService } from './services/sheet-row-filtered.service';
 import { ISuperTableService, SuperTableService } from './services/super-table.service';
@@ -117,6 +118,7 @@ export class UniverFormulaEnginePlugin extends Plugin {
             [IFunctionService, { useClass: FunctionService }],
             [IDefinedNamesService, { useClass: DefinedNamesService }],
             [IActiveDirtyManagerService, { useClass: ActiveDirtyManagerService }],
+            [RegisterOtherFormulaService],
             [IHyperlinkEngineFormulaService, { useClass: HyperlinkEngineFormulaService }],
             [ISheetRowFilteredService, { useClass: SheetRowFilteredService }],
             [ISuperTableService, { useClass: SuperTableService }],

packages/engine-formula/src/services/register-other-formula.service.ts

@@ -15,13 +15,17 @@
  */
 
 import type { IRange, Nullable } from '@univerjs/core';
-import type { IRemoveOtherFormulaMutationParams, ISetFormulaCalculationResultMutation, ISetOtherFormulaMutationParams } from '@univerjs/engine-formula';
+
 import type { IOtherFormulaMarkDirtyParams } from '../commands/mutations/formula.mutation';
+import type { ISetFormulaCalculationResultMutation } from '../commands/mutations/set-formula-calculation.mutation';
+import type { IRemoveOtherFormulaMutationParams, ISetOtherFormulaMutationParams } from '../commands/mutations/set-other-formula.mutation';
 import type { IOtherFormulaResult } from './formula-common';
 import { Disposable, generateRandomId, ICommandService, Inject, LifecycleService, ObjectMatrix } from '@univerjs/core';
-import { IActiveDirtyManagerService, RemoveOtherFormulaMutation, SetFormulaCalculationResultMutation, SetOtherFormulaMutation } from '@univerjs/engine-formula';
 import { BehaviorSubject, bufferWhen, filter, Subject } from 'rxjs';
 import { OtherFormulaMarkDirty } from '../commands/mutations/formula.mutation';
+import { SetFormulaCalculationResultMutation } from '../commands/mutations/set-formula-calculation.mutation';
+import { RemoveOtherFormulaMutation, SetOtherFormulaMutation } from '../commands/mutations/set-other-formula.mutation';
+import { IActiveDirtyManagerService } from './active-dirty-manager.service';
 import { FormulaResultStatus } from './formula-common';
 
 export enum OtherFormulaBizType {

packages/sheets-conditional-formatting/src/facade/__tests__/create-test-bed.ts

@@ -33,7 +33,7 @@ import {
     UniverInstanceType,
 } from '@univerjs/core';
 import { FUniver } from '@univerjs/core/facade';
-import { ActiveDirtyManagerService, DefinedNamesService, FormulaDataModel, IActiveDirtyManagerService, IDefinedNamesService, ISheetRowFilteredService, LexerTreeBuilder, SheetRowFilteredService } from '@univerjs/engine-formula';
+import { ActiveDirtyManagerService, DefinedNamesService, FormulaDataModel, IActiveDirtyManagerService, IDefinedNamesService, ISheetRowFilteredService, LexerTreeBuilder, RegisterOtherFormulaService, SheetRowFilteredService } from '@univerjs/engine-formula';
 import { Engine, IRenderingEngine, IRenderManagerService, RenderManagerService } from '@univerjs/engine-render';
 import {
     RefRangeService,
@@ -42,7 +42,6 @@ import {
     SheetsSelectionsService,
 } from '@univerjs/sheets';
 import { ConditionalFormattingFormulaService, ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingViewModel } from '@univerjs/sheets-conditional-formatting';
-import { RegisterOtherFormulaService } from '@univerjs/sheets-formula';
 import enUS from '@univerjs/sheets/locale/en-US';
 import zhCN from '@univerjs/sheets/locale/zh-CN';
 

packages/sheets-conditional-formatting/src/models/calculate-unit-v2/__test__/test.util.ts

@@ -16,9 +16,8 @@
 
 import type { Dependency, IWorkbookData } from '@univerjs/core';
 import { ICommandService, Inject, Injector, IUniverInstanceService, LocaleType, Plugin, Univer, UniverInstanceType } from '@univerjs/core';
-import { IActiveDirtyManagerService } from '@univerjs/engine-formula';
+import { IActiveDirtyManagerService, RegisterOtherFormulaService } from '@univerjs/engine-formula';
 import { SheetInterceptorService } from '@univerjs/sheets';
-import { RegisterOtherFormulaService } from '@univerjs/sheets-formula';
 import { AddConditionalRuleMutation } from '../../../commands/mutations/add-conditional-rule.mutation';
 import { DeleteConditionalRuleMutation } from '../../../commands/mutations/delete-conditional-rule.mutation';
 import { MoveConditionalRuleMutation } from '../../../commands/mutations/move-conditional-rule.mutation';

packages/sheets-conditional-formatting/src/models/calculate-unit-v2/color-scale-calculate-unit.ts

@@ -17,12 +17,14 @@
 import type { IColorScale, IConditionFormattingRule } from '../type';
 import type { IContext } from './base-calculate-unit';
 import { CellValueType, ColorKit, ObjectMatrix, Range } from '@univerjs/core';
+import { FormulaResultStatus } from '@univerjs/engine-formula';
 import { isObject } from '@univerjs/engine-render';
-import { FormulaResultStatus } from '@univerjs/sheets-formula';
 import { CFValueType } from '../../base/const';
 import { BaseCalculateUnit, CalculateEmitStatus } from './base-calculate-unit';
 import { filterRange, getColorScaleFromValue, getValueByType, isNullable } from './utils';
 
+;
+
 interface IConfigItem {
     value: number;
     color: ColorKit;

packages/sheets-conditional-formatting/src/models/calculate-unit-v2/data-bar-calculate-unit.ts

@@ -18,12 +18,14 @@ import type { ICellData } from '@univerjs/core';
 import type { IConditionFormattingRule, IDataBar } from '../type';
 import type { IContext } from './base-calculate-unit';
 import { CellValueType, ObjectMatrix, Range } from '@univerjs/core';
-import { FormulaResultStatus } from '@univerjs/sheets-formula';
+import { FormulaResultStatus } from '@univerjs/engine-formula';
 import { CFValueType } from '../../base/const';
 import { defaultDataBarNativeColor, defaultDataBarPositiveColor, defaultPlaceholderColor } from '../../render/data-bar.render';
 import { BaseCalculateUnit, CalculateEmitStatus } from './base-calculate-unit';
 import { filterRange, getValueByType, isNullable } from './utils';
 
+;
+
 const getSafeValue = (v: number) => Math.max(Math.min(100, v), 0);
 
 const getValue = (row: number, col: number, getCell: (row: number, col: number) => ICellData) => {

packages/sheets-conditional-formatting/src/models/calculate-unit-v2/highlight-cell-calculate-unit.ts

@@ -18,13 +18,14 @@ import type { IStyleData, Nullable } from '@univerjs/core';
 import type { IAverageHighlightCell, IFormulaHighlightCell, IHighlightCell, INumberHighlightCell, IRankHighlightCell, ITextHighlightCell, ITimePeriodHighlightCell } from '../type';
 import type { IContext } from './base-calculate-unit';
 import { CellValueType, dayjs, Range, Tools } from '@univerjs/core';
-import { ERROR_TYPE_SET } from '@univerjs/engine-formula';
-import { FormulaResultStatus } from '@univerjs/sheets-formula';
+import { ERROR_TYPE_SET, FormulaResultStatus } from '@univerjs/engine-formula';
 import { CFNumberOperator, CFSubRuleType, CFTextOperator, CFTimePeriodOperator } from '../../base/const';
 import { ConditionalFormattingFormulaService } from '../../services/conditional-formatting-formula.service';
 import { BaseCalculateUnit, CalculateEmitStatus } from './base-calculate-unit';
 import { compareWithNumber, getCellValue, isFloatsEqual, isNullable, serialTimeToTimestamp } from './utils';
 
+;
+
 interface IConfig {
     value: any;
     type: CFSubRuleType;

packages/sheets-conditional-formatting/src/models/calculate-unit-v2/icon-set-calculate-unit.ts

@@ -19,11 +19,13 @@ import type { CFNumberOperator } from '../../base/const';
 import type { IIconSet } from '../type';
 import type { IContext } from './base-calculate-unit';
 import { CellValueType, ObjectMatrix, Range } from '@univerjs/core';
-import { FormulaResultStatus } from '@univerjs/sheets-formula';
+import { FormulaResultStatus } from '@univerjs/engine-formula';
 import { CFValueType } from '../../base/const';
 import { BaseCalculateUnit, CalculateEmitStatus } from './base-calculate-unit';
 import { compareWithNumber, filterRange, getOppositeOperator, getValueByType, isNullable } from './utils';
 
+;
+
 const getValue = (row: number, col: number, getCell: (row: number, col: number) => ICellData) => {
     const cell = getCell(row, col);
     if (cell && cell.t === CellValueType.NUMBER) {

packages/sheets-conditional-formatting/src/models/calculate-unit-v2/utils.ts

@@ -18,12 +18,13 @@ import type { CellValue, ICellData, IObjectMatrixPrimitiveType, IRange, Nullable
 import type { IConditionFormattingRule, IValueConfig } from '../../models/type';
 import type { IContext } from './base-calculate-unit';
 import { BooleanNumber, CellValueType, ColorKit, dayjs, ObjectMatrix, Range } from '@univerjs/core';
-import { BooleanValue } from '@univerjs/engine-formula';
-import { FormulaResultStatus } from '@univerjs/sheets-formula';
+import { BooleanValue, FormulaResultStatus } from '@univerjs/engine-formula';
 import { CFNumberOperator, CFValueType } from '../../base/const';
 import { ConditionalFormattingFormulaService } from '../../services/conditional-formatting-formula.service';
 import { ConditionalFormattingViewModel } from '../conditional-formatting-view-model';
 
+;
+
 export function isFloatsEqual(a: number, b: number) {
     return Math.abs(a - b) < Number.EPSILON;
 }

packages/sheets-conditional-formatting/src/plugin.ts

@@ -16,7 +16,8 @@
 
 import type { Dependency } from '@univerjs/core';
 import type { IUniverSheetsConditionalFormattingConfig } from './controllers/config.schema';
-import { ICommandService, IConfigService, Inject, Injector, merge, Plugin, touchDependencies, UniverInstanceType } from '@univerjs/core';
+import { DependentOn, ICommandService, IConfigService, Inject, Injector, merge, Plugin, touchDependencies, UniverInstanceType } from '@univerjs/core';
+import { UniverFormulaEnginePlugin } from '@univerjs/engine-formula';
 import { SHEET_CONDITIONAL_FORMATTING_PLUGIN } from './base/const';
 import { AddCfCommand } from './commands/commands/add-cf.command';
 import { ClearRangeCfCommand } from './commands/commands/clear-range-cf.command';
@@ -37,6 +38,7 @@ import { ConditionalFormattingViewModel } from './models/conditional-formatting-
 import { ConditionalFormattingFormulaService } from './services/conditional-formatting-formula.service';
 import { ConditionalFormattingService } from './services/conditional-formatting.service';
 
+@DependentOn(UniverFormulaEnginePlugin)
 export class UniverSheetsConditionalFormattingPlugin extends Plugin {
     static override pluginName = SHEET_CONDITIONAL_FORMATTING_PLUGIN;
     static override type = UniverInstanceType.UNIVER_SHEET;

packages/sheets-conditional-formatting/src/services/conditional-formatting-formula.service.ts

@@ -15,10 +15,10 @@
  */
 
 import type { ICellData, IRange, Nullable } from '@univerjs/core';
-import type { IOtherFormulaResult } from '@univerjs/sheets-formula';
+import type { IOtherFormulaResult } from '@univerjs/engine-formula';
 import type { IConditionalFormattingRuleConfig, IConditionFormattingRule } from '../models/type';
 import { BooleanNumber, CellValueType, Disposable, Inject, ObjectMatrix, RefAlias } from '@univerjs/core';
-import { FormulaResultStatus, OtherFormulaBizType, RegisterOtherFormulaService } from '@univerjs/sheets-formula';
+import { FormulaResultStatus, OtherFormulaBizType, RegisterOtherFormulaService } from '@univerjs/engine-formula';
 import { Subject } from 'rxjs';
 
 import { CFRuleType, CFSubRuleType, CFValueType } from '../base/const';

packages/sheets-data-validation/src/facade/__tests__/create-test-bed.ts

@@ -31,7 +31,7 @@ import {
 } from '@univerjs/core';
 import { FUniver } from '@univerjs/core/facade';
 import { UniverDataValidationPlugin } from '@univerjs/data-validation';
-import { ActiveDirtyManagerService, DefinedNamesService, FormulaDataModel, IActiveDirtyManagerService, IDefinedNamesService, ISheetRowFilteredService, LexerTreeBuilder, SheetRowFilteredService } from '@univerjs/engine-formula';
+import { ActiveDirtyManagerService, DefinedNamesService, FormulaDataModel, IActiveDirtyManagerService, IDefinedNamesService, ISheetRowFilteredService, LexerTreeBuilder, RegisterOtherFormulaService, SheetRowFilteredService } from '@univerjs/engine-formula';
 import {
     RefRangeService,
     SheetInterceptorService,
@@ -39,7 +39,6 @@ import {
     SheetsSelectionsService,
 } from '@univerjs/sheets';
 import { DataValidationCacheService, DataValidationCustomFormulaService, DataValidationFormulaService, DataValidationListCacheService, SheetDataValidationModel, SheetsDataValidationValidatorService } from '@univerjs/sheets-data-validation';
-import { RegisterOtherFormulaService } from '@univerjs/sheets-formula';
 import enUS from '@univerjs/sheets/locale/en-US';
 import zhCN from '@univerjs/sheets/locale/zh-CN';
 

packages/sheets-data-validation/src/facade/__tests__/create-worksheet-test-bed.ts

@@ -31,7 +31,7 @@ import {
 } from '@univerjs/core';
 import { FUniver } from '@univerjs/core/facade';
 import { UniverDataValidationPlugin } from '@univerjs/data-validation';
-import { ActiveDirtyManagerService, DefinedNamesService, FormulaDataModel, IActiveDirtyManagerService, IDefinedNamesService, ISheetRowFilteredService, LexerTreeBuilder, SheetRowFilteredService } from '@univerjs/engine-formula';
+import { ActiveDirtyManagerService, DefinedNamesService, FormulaDataModel, IActiveDirtyManagerService, IDefinedNamesService, ISheetRowFilteredService, LexerTreeBuilder, RegisterOtherFormulaService, SheetRowFilteredService } from '@univerjs/engine-formula';
 
 import {
     RefRangeService,
@@ -40,7 +40,6 @@ import {
     SheetsSelectionsService,
 } from '@univerjs/sheets';
 import { DataValidationCacheService, DataValidationCustomFormulaService, DataValidationFormulaService, DataValidationListCacheService, SheetDataValidationModel, SheetsDataValidationValidatorService } from '@univerjs/sheets-data-validation';
-import { RegisterOtherFormulaService } from '@univerjs/sheets-formula';
 import enUS from '@univerjs/sheets/locale/en-US';
 import zhCN from '@univerjs/sheets/locale/zh-CN';
 

packages/sheets-data-validation/src/services/dv-custom-formula.service.ts

@@ -17,7 +17,7 @@
 import type { IRange, ISheetDataValidationRule } from '@univerjs/core';
 import { Disposable, Inject, isFormulaString, IUniverInstanceService, Rectangle, UniverInstanceType } from '@univerjs/core';
 import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
-import { OtherFormulaBizType, RegisterOtherFormulaService } from '@univerjs/sheets-formula';
+import { OtherFormulaBizType, RegisterOtherFormulaService } from '@univerjs/engine-formula';
 import { getFormulaCellData, shouldOffsetFormulaByRange } from '../utils/formula';
 import { DataValidationCacheService } from './dv-cache.service';
 

packages/sheets-data-validation/src/services/dv-formula.service.ts

@@ -15,10 +15,10 @@
  */
 
 import type { ISheetDataValidationRule, Nullable } from '@univerjs/core';
-import type { IFormulaInfo, IOtherFormulaResult } from '@univerjs/sheets-formula';
+import type { IFormulaInfo, IOtherFormulaResult } from '@univerjs/engine-formula';
 import { DataValidationType, Disposable, Inject, isFormulaString, IUniverInstanceService, UniverInstanceType } from '@univerjs/core';
 import { DataValidationModel, DataValidatorRegistryService } from '@univerjs/data-validation';
-import { OtherFormulaBizType, RegisterOtherFormulaService } from '@univerjs/sheets-formula';
+import { OtherFormulaBizType, RegisterOtherFormulaService } from '@univerjs/engine-formula';
 import { shouldOffsetFormulaByRange } from '../utils/formula';
 import { DataValidationCacheService } from './dv-cache.service';
 import { DataValidationListCacheService } from './dv-list-cache.service';

packages/sheets-data-validation/src/services/dv-list-cache.service.ts

@@ -15,7 +15,7 @@
  */
 
 import type { ICellData, IDataValidationRule, Nullable } from '@univerjs/core';
-import type { IOtherFormulaResult } from '@univerjs/sheets-formula';
+import type { IOtherFormulaResult } from '@univerjs/engine-formula';
 import { Disposable, Inject, Injector, isFormulaString, numfmt } from '@univerjs/core';
 import { DataValidationModel } from '@univerjs/data-validation';
 import { isLegalFormulaResult } from '../utils/formula';

packages/sheets-formula/src/controllers/formula.controller.ts

@@ -15,9 +15,9 @@
  */
 
 import { Disposable, ICommandService } from '@univerjs/core';
+import { OtherFormulaMarkDirty } from '@univerjs/engine-formula';
 import { InsertFunctionCommand } from '../commands/commands/insert-function.command';
 import { QuickSumCommand } from '../commands/commands/quick-sum.command';
-import { OtherFormulaMarkDirty } from '../commands/mutations/formula.mutation';
 
 export class FormulaController extends Disposable {
     constructor(

packages/sheets-formula/src/controllers/trigger-calculation.controller.ts

@@ -34,6 +34,7 @@ import {
     FormulaExecutedStateType,
     FormulaExecuteStageType,
     IActiveDirtyManagerService,
+    RegisterOtherFormulaService,
     SetFormulaCalculationNotificationMutation,
     SetFormulaCalculationStartMutation,
     SetFormulaCalculationStopMutation,
@@ -47,7 +48,6 @@ import {
     SetStyleCommand,
 } from '@univerjs/sheets';
 import { BehaviorSubject } from 'rxjs';
-import { RegisterOtherFormulaService } from '../services/register-other-formula.service';
 import { CalculationMode, PLUGIN_CONFIG_KEY_BASE } from './config.schema';
 
 /**

packages/sheets-formula/src/index.ts

@@ -16,7 +16,7 @@
 
 export { type IInsertFunction, type IInsertFunctionCommandParams, InsertFunctionCommand } from './commands/commands/insert-function.command';
 export { QuickSumCommand } from './commands/commands/quick-sum.command';
-export { OtherFormulaMarkDirty } from './commands/mutations/formula.mutation';
+
 export { CalculationMode, PLUGIN_CONFIG_KEY_BASE } from './controllers/config.schema';
 export type { IUniverSheetsFormulaBaseConfig, IUniverSheetsFormulaRemoteConfig } from './controllers/config.schema';
 export { ImageFormulaCellInterceptorController } from './controllers/image-formula-cell-interceptor.controller';
@@ -26,13 +26,11 @@ export { UpdateFormulaController } from './controllers/update-formula.controller
 export { UniverRemoteSheetsFormulaPlugin, UniverSheetsFormulaPlugin } from './plugin';
 export { DescriptionService, IDescriptionService } from './services/description.service';
 export type { ISearchItem, ISearchItemWithType } from './services/description.service';
-export type { IFormulaInfo, IOtherFormulaResult } from './services/formula-common';
-export { FormulaResultStatus } from './services/formula-common';
+
 export { FormulaRefRangeService } from './services/formula-ref-range.service';
 export type { IRegisterAsyncFunction, IRegisterFunction, ISingleFunctionRegisterParams } from './services/register-function.service';
 export type { IRegisterFunctionParams, IUnregisterFunctionParams } from './services/register-function.service';
 export { RegisterFunctionService } from './services/register-function.service';
 export { IRegisterFunctionService } from './services/register-function.service';
-export { OtherFormulaBizType, RegisterOtherFormulaService } from './services/register-other-formula.service';
 export { IRemoteRegisterFunctionService, RemoteRegisterFunctionService } from './services/remote/remote-register-function.service';
 export { calculateFormula } from './util/calculate';

packages/sheets-formula/src/plugin.ts

@@ -39,7 +39,6 @@ import { UpdateFormulaController } from './controllers/update-formula.controller
 import { DescriptionService, IDescriptionService } from './services/description.service';
 import { FormulaRefRangeService } from './services/formula-ref-range.service';
 import { IRegisterFunctionService, RegisterFunctionService } from './services/register-function.service';
-import { RegisterOtherFormulaService } from './services/register-other-formula.service';
 import { IRemoteRegisterFunctionService, RemoteRegisterFunctionService, RemoteRegisterFunctionServiceName } from './services/remote/remote-register-function.service';
 
 @DependentOn(UniverFormulaEnginePlugin)
@@ -100,7 +99,6 @@ export class UniverSheetsFormulaPlugin extends Plugin {
             [IDescriptionService, { useClass: DescriptionService }],
             [FormulaController],
             [FormulaRefRangeService],
-            [RegisterOtherFormulaService],
             [ArrayFormulaCellInterceptorController],
             [ImageFormulaCellInterceptorController],
             [TriggerCalculationController],

pnpm-lock.yaml

@@ -822,6 +822,9 @@ importers:
       '@univerjs/docs-ui':
         specifier: workspace:*
         version: link:../../packages/docs-ui
+      '@univerjs/engine-formula':
+        specifier: workspace:*
+        version: link:../../packages/engine-formula
       '@univerjs/engine-render':
         specifier: workspace:*
         version: link:../../packages/engine-render
@@ -831,9 +834,6 @@ importers:
       '@univerjs/rpc':
         specifier: workspace:*
         version: link:../../packages/rpc
-      '@univerjs/sheets-formula':
-        specifier: workspace:*
-        version: link:../../packages/sheets-formula
       '@univerjs/sheets-formula-ui':
         specifier: workspace:*
         version: link:../../packages/sheets-formula-ui