Skip to content

Build your own AI office with Univer Office SDK. Bring editing, calculation, collaboration, and file processing into your product for people and AI agents. Built on an extensible open-source core.

fix(uniscript): export module for pro (#2293)

Dushusire7ad8d5c3e1d
diff --git a/packages/uniscript/src/index.ts b/packages/uniscript/src/index.ts
index ff1db05ae5..68eccca63e 100644
--- a/packages/uniscript/src/index.ts
+++ b/packages/uniscript/src/index.ts
@@ -17,3 +17,4 @@
export { enUS, zhCN, ruRU } from './locale';
export { UniverUniscriptPlugin } from './plugin';
export { ScriptEditorService } from './services/script-editor.service';
+export { IUniscriptExecutionService } from './services/script-execution.service';
diff --git a/packages/uniscript/src/plugin.ts b/packages/uniscript/src/plugin.ts
index 79b5c8d9ee..8c6766b0a0 100644
--- a/packages/uniscript/src/plugin.ts
+++ b/packages/uniscript/src/plugin.ts
@@ -22,7 +22,7 @@ import type { IUniverUniscriptConfig } from './controllers/uniscript.controller'
import { DefaultUniscriptConfig, UniscriptController } from './controllers/uniscript.controller';
import { zhCN } from './locale';
import { ScriptEditorService } from './services/script-editor.service';
-import { UniscriptExecutionService } from './services/script-execution.service';
+import { IUniscriptExecutionService, UniscriptExecutionService } from './services/script-execution.service';
import { ScriptPanelService } from './services/script-panel.service';
const PLUGIN_NAME = 'uniscript';
@@ -48,11 +48,19 @@ export class UniverUniscriptPlugin extends Plugin {
// services
[ScriptEditorService, { useFactory: () => injector.createInstance(ScriptEditorService, this._config) }],
[ScriptPanelService],
- [UniscriptExecutionService],
];
dependencies.forEach((d) => injector.add(d));
+ this.registerExecution();
+
this._localeService.load({ zhCN });
}
+
+ /**
+ * Allows being overridden, replacing with a new UniscriptExecutionService.
+ */
+ registerExecution(): void {
+ this._injector.add([IUniscriptExecutionService, { useClass: UniscriptExecutionService }]);
+ }
}
diff --git a/packages/uniscript/src/services/script-execution.service.ts b/packages/uniscript/src/services/script-execution.service.ts
index 768adfb845..198c4372ed 100644
--- a/packages/uniscript/src/services/script-execution.service.ts
+++ b/packages/uniscript/src/services/script-execution.service.ts
@@ -16,12 +16,17 @@
import { Disposable, ILogService } from '@univerjs/core';
import { FUniver } from '@univerjs/facade';
-import { Inject, Injector } from '@wendellhu/redi';
+import { createIdentifier, Inject, Injector } from '@wendellhu/redi';
+export const IUniscriptExecutionService = createIdentifier<IUniscriptExecutionService>('univer.uniscript.execution-service');
+
+export interface IUniscriptExecutionService {
+ execute(code: string): Promise<boolean>;
+}
/**
- * This service is to
+ * This service is to execute Uniscript code.
*/
-export class UniscriptExecutionService extends Disposable {
+export class UniscriptExecutionService extends Disposable implements IUniscriptExecutionService {
constructor(
@ILogService private readonly _logService: ILogService,
@Inject(Injector) private readonly _injector: Injector
diff --git a/packages/uniscript/src/views/components/ScriptEditorPanel.tsx b/packages/uniscript/src/views/components/ScriptEditorPanel.tsx
index 86936ddfc0..175a66c9fa 100644
--- a/packages/uniscript/src/views/components/ScriptEditorPanel.tsx
+++ b/packages/uniscript/src/views/components/ScriptEditorPanel.tsx
@@ -24,7 +24,7 @@ import { editor } from 'monaco-editor';
import React, { useCallback, useEffect, useRef } from 'react';
import { ScriptEditorService } from '../../services/script-editor.service';
-import { UniscriptExecutionService } from '../../services/script-execution.service';
+import { IUniscriptExecutionService } from '../../services/script-execution.service';
import styles from './index.module.less';
export function ScriptEditorPanel() {
@@ -106,7 +106,7 @@ export function ScriptEditorPanel() {
}
function useExecution(monacoEditorRef: React.MutableRefObject<Nullable<editor.IStandaloneCodeEditor>>) {
- const scriptService = useDependency(UniscriptExecutionService);
+ const scriptService = useDependency(IUniscriptExecutionService);
const messageService = useDependency(IMessageService);
const localeService = useDependency(LocaleService);