@univerjs/core 0.22.1 → 0.23.0

package/lib/cjs/index.js

@@ -481,16 +481,17 @@ function createInterceptorKey(key) {
 const composeInterceptors = (interceptors) => function(initialValue, context) {
 	let index = -1;
 	let value = initialValue;
-	for (let i = 0; i <= interceptors.length; i++) {
+	let nextCalled = false;
+	const next = (nextValue) => {
+		nextCalled = true;
+		return nextValue;
+	};
+	for (let i = 0; i < interceptors.length; i++) {
 		if (i <= index) throw new Error("[SheetInterceptorService]: next() called multiple times!");
 		index = i;
-		if (i === interceptors.length) return value;
 		const interceptor = interceptors[i];
-		let nextCalled = false;
-		value = interceptor.handler(value, context, (nextValue) => {
-			nextCalled = true;
-			return nextValue;
-		});
+		nextCalled = false;
+		value = interceptor.handler(value, context, next);
 		if (!nextCalled) break;
 	}
 	return value;
@@ -3337,6 +3338,9 @@ let CommandService = class CommandService extends Disposable {
 	disposed() {
 		return this._disposed;
 	}
+	_warnCommandSkippedAfterDisposed(id) {
+		this._logService.warn("[CommandService]", `command "${id}" skipped because CommandService is disposed.`);
+	}
 	hasCommand(commandId) {
 		return this._commandRegistry.hasCommand(commandId);
 	}
@@ -3382,6 +3386,10 @@ let CommandService = class CommandService extends Disposable {
 		throw new Error("[CommandService]: could not add a collab mutation listener twice.");
 	}
 	async executeCommand(id, params, options) {
+		if (this._disposed) {
+			this._warnCommandSkippedAfterDisposed(id);
+			return false;
+		}
 		try {
 			const item = this._commandRegistry.getCommand(id);
 			if (item) {
@@ -3394,6 +3402,11 @@ let CommandService = class CommandService extends Disposable {
 				const stackItemDisposable = this._pushCommandExecutionStack(commandInfo);
 				const _options = options !== null && options !== void 0 ? options : {};
 				this._beforeCommandExecutionListeners.forEach((listener) => listener(commandInfo, _options));
+				if (this._disposed) {
+					stackItemDisposable.dispose();
+					this._warnCommandSkippedAfterDisposed(id);
+					return false;
+				}
 				const result = await this._execute(command, params, _options);
 				if (_options.syncOnly) {
 					if (command.type === 2) this._collabMutationListeners.forEach((listener) => listener(commandInfo, _options));
@@ -3411,6 +3424,10 @@ let CommandService = class CommandService extends Disposable {
 		}
 	}
 	syncExecuteCommand(id, params, options) {
+		if (this._disposed) {
+			this._warnCommandSkippedAfterDisposed(id);
+			return false;
+		}
 		try {
 			const item = this._commandRegistry.getCommand(id);
 			if (item) {
@@ -3431,6 +3448,11 @@ let CommandService = class CommandService extends Disposable {
 				const stackItemDisposable = this._pushCommandExecutionStack(commandInfo);
 				const _options = options !== null && options !== void 0 ? options : {};
 				this._beforeCommandExecutionListeners.forEach((listener) => listener(commandInfo, _options));
+				if (this._disposed) {
+					stackItemDisposable.dispose();
+					this._warnCommandSkippedAfterDisposed(id);
+					return false;
+				}
 				const result = this._syncExecute(command, params, _options);
 				if (_options.syncOnly) {
 					if (command.type === 2) this._collabMutationListeners.forEach((listener) => listener(commandInfo, _options));
@@ -3602,7 +3624,12 @@ function afterTime(ms) {
 }
 function convertObservableToBehaviorSubject(observable, initValue) {
 	const subject = new rxjs.BehaviorSubject(initValue);
-	observable.subscribe(subject);
+	const subscription = observable.subscribe(subject);
+	const originalComplete = subject.complete.bind(subject);
+	subject.complete = () => {
+		subscription.unsubscribe();
+		originalComplete();
+	};
 	return subject;
 }
 
@@ -14758,7 +14785,7 @@ const IURLImageService = (0, _wendellhu_redi.createIdentifier)("core.url-image.s
 //#endregion
 //#region package.json
 var name = "@univerjs/core";
-var version = "0.22.1";
+var version = "0.23.0";
 
 //#endregion
 //#region src/sheets/empty-snapshot.ts
@@ -17641,6 +17668,8 @@ var LocaleService = class extends Disposable {
 		super();
 		_defineProperty(this, "_currentLocale$", new rxjs.BehaviorSubject("zhCN"));
 		_defineProperty(this, "currentLocale$", this._currentLocale$.asObservable());
+		_defineProperty(this, "_direction$", new rxjs.BehaviorSubject("ltr"));
+		_defineProperty(this, "direction$", this._direction$.asObservable());
 		_defineProperty(this, "_locales", null);
 		_defineProperty(this, "localeChanged$", new rxjs.Subject());
 		_defineProperty(
@@ -17687,6 +17716,7 @@ var LocaleService = class extends Disposable {
 		this.disposeWithMe(toDisposable(() => {
 			this._locales = null;
 			this._currentLocale$.complete();
+			this._direction$.complete();
 			this.localeChanged$.complete();
 		}));
 	}
@@ -17710,6 +17740,12 @@ var LocaleService = class extends Disposable {
 	getCurrentLocale() {
 		return this._currentLocale;
 	}
+	setDirection(direction) {
+		this._direction$.next(direction);
+	}
+	getDirection() {
+		return this._direction$.value;
+	}
 	resolveKeyPath(obj, keys) {
 		const currentKey = keys.shift();
 		if (currentKey && obj && currentKey in obj) {
@@ -19891,11 +19927,12 @@ var Univer = class {
 		_defineProperty(this, "_injector", void 0);
 		_defineProperty(this, "_disposingCallbacks", new DisposableCollection());
 		const injector = this._injector = createUniverInjector(parentInjector, config === null || config === void 0 ? void 0 : config.override);
-		const { theme, darkMode, locale, locales, logLevel, logCommandExecution } = config;
+		const { theme, darkMode, locale, locales, direction, logLevel, logCommandExecution } = config;
 		if (theme) this._injector.get(ThemeService).setTheme(theme);
 		if (darkMode) this._injector.get(ThemeService).setDarkMode(darkMode);
 		if (locales) this._injector.get(LocaleService).load(locales);
 		if (locale) this._injector.get(LocaleService).setLocale(locale);
+		if (direction) this._injector.get(LocaleService).setDirection(direction);
 		if (logLevel) this._injector.get(ILogService).setLogLevel(logLevel);
 		if (logCommandExecution !== void 0) this._injector.get(IConfigService).setConfig(COMMAND_LOG_EXECUTION_CONFIG_KEY, logCommandExecution);
 		this._init(injector);

package/lib/es/index.js

@@ -447,16 +447,17 @@ function createInterceptorKey(key) {
 const composeInterceptors = (interceptors) => function(initialValue, context) {
 	let index = -1;
 	let value = initialValue;
-	for (let i = 0; i <= interceptors.length; i++) {
+	let nextCalled = false;
+	const next = (nextValue) => {
+		nextCalled = true;
+		return nextValue;
+	};
+	for (let i = 0; i < interceptors.length; i++) {
 		if (i <= index) throw new Error("[SheetInterceptorService]: next() called multiple times!");
 		index = i;
-		if (i === interceptors.length) return value;
 		const interceptor = interceptors[i];
-		let nextCalled = false;
-		value = interceptor.handler(value, context, (nextValue) => {
-			nextCalled = true;
-			return nextValue;
-		});
+		nextCalled = false;
+		value = interceptor.handler(value, context, next);
 		if (!nextCalled) break;
 	}
 	return value;
@@ -3303,6 +3304,9 @@ let CommandService = class CommandService extends Disposable {
 	disposed() {
 		return this._disposed;
 	}
+	_warnCommandSkippedAfterDisposed(id) {
+		this._logService.warn("[CommandService]", `command "${id}" skipped because CommandService is disposed.`);
+	}
 	hasCommand(commandId) {
 		return this._commandRegistry.hasCommand(commandId);
 	}
@@ -3348,6 +3352,10 @@ let CommandService = class CommandService extends Disposable {
 		throw new Error("[CommandService]: could not add a collab mutation listener twice.");
 	}
 	async executeCommand(id, params, options) {
+		if (this._disposed) {
+			this._warnCommandSkippedAfterDisposed(id);
+			return false;
+		}
 		try {
 			const item = this._commandRegistry.getCommand(id);
 			if (item) {
@@ -3360,6 +3368,11 @@ let CommandService = class CommandService extends Disposable {
 				const stackItemDisposable = this._pushCommandExecutionStack(commandInfo);
 				const _options = options !== null && options !== void 0 ? options : {};
 				this._beforeCommandExecutionListeners.forEach((listener) => listener(commandInfo, _options));
+				if (this._disposed) {
+					stackItemDisposable.dispose();
+					this._warnCommandSkippedAfterDisposed(id);
+					return false;
+				}
 				const result = await this._execute(command, params, _options);
 				if (_options.syncOnly) {
 					if (command.type === 2) this._collabMutationListeners.forEach((listener) => listener(commandInfo, _options));
@@ -3377,6 +3390,10 @@ let CommandService = class CommandService extends Disposable {
 		}
 	}
 	syncExecuteCommand(id, params, options) {
+		if (this._disposed) {
+			this._warnCommandSkippedAfterDisposed(id);
+			return false;
+		}
 		try {
 			const item = this._commandRegistry.getCommand(id);
 			if (item) {
@@ -3397,6 +3414,11 @@ let CommandService = class CommandService extends Disposable {
 				const stackItemDisposable = this._pushCommandExecutionStack(commandInfo);
 				const _options = options !== null && options !== void 0 ? options : {};
 				this._beforeCommandExecutionListeners.forEach((listener) => listener(commandInfo, _options));
+				if (this._disposed) {
+					stackItemDisposable.dispose();
+					this._warnCommandSkippedAfterDisposed(id);
+					return false;
+				}
 				const result = this._syncExecute(command, params, _options);
 				if (_options.syncOnly) {
 					if (command.type === 2) this._collabMutationListeners.forEach((listener) => listener(commandInfo, _options));
@@ -3568,7 +3590,12 @@ function afterTime(ms) {
 }
 function convertObservableToBehaviorSubject(observable, initValue) {
 	const subject = new BehaviorSubject(initValue);
-	observable.subscribe(subject);
+	const subscription = observable.subscribe(subject);
+	const originalComplete = subject.complete.bind(subject);
+	subject.complete = () => {
+		subscription.unsubscribe();
+		originalComplete();
+	};
 	return subject;
 }
 
@@ -14724,7 +14751,7 @@ const IURLImageService = createIdentifier("core.url-image.service");
 //#endregion
 //#region package.json
 var name = "@univerjs/core";
-var version = "0.22.1";
+var version = "0.23.0";
 
 //#endregion
 //#region src/sheets/empty-snapshot.ts
@@ -17607,6 +17634,8 @@ var LocaleService = class extends Disposable {
 		super();
 		_defineProperty(this, "_currentLocale$", new BehaviorSubject("zhCN"));
 		_defineProperty(this, "currentLocale$", this._currentLocale$.asObservable());
+		_defineProperty(this, "_direction$", new BehaviorSubject("ltr"));
+		_defineProperty(this, "direction$", this._direction$.asObservable());
 		_defineProperty(this, "_locales", null);
 		_defineProperty(this, "localeChanged$", new Subject());
 		_defineProperty(
@@ -17653,6 +17682,7 @@ var LocaleService = class extends Disposable {
 		this.disposeWithMe(toDisposable(() => {
 			this._locales = null;
 			this._currentLocale$.complete();
+			this._direction$.complete();
 			this.localeChanged$.complete();
 		}));
 	}
@@ -17676,6 +17706,12 @@ var LocaleService = class extends Disposable {
 	getCurrentLocale() {
 		return this._currentLocale;
 	}
+	setDirection(direction) {
+		this._direction$.next(direction);
+	}
+	getDirection() {
+		return this._direction$.value;
+	}
 	resolveKeyPath(obj, keys) {
 		const currentKey = keys.shift();
 		if (currentKey && obj && currentKey in obj) {
@@ -19857,11 +19893,12 @@ var Univer = class {
 		_defineProperty(this, "_injector", void 0);
 		_defineProperty(this, "_disposingCallbacks", new DisposableCollection());
 		const injector = this._injector = createUniverInjector(parentInjector, config === null || config === void 0 ? void 0 : config.override);
-		const { theme, darkMode, locale, locales, logLevel, logCommandExecution } = config;
+		const { theme, darkMode, locale, locales, direction, logLevel, logCommandExecution } = config;
 		if (theme) this._injector.get(ThemeService).setTheme(theme);
 		if (darkMode) this._injector.get(ThemeService).setDarkMode(darkMode);
 		if (locales) this._injector.get(LocaleService).load(locales);
 		if (locale) this._injector.get(LocaleService).setLocale(locale);
+		if (direction) this._injector.get(LocaleService).setDirection(direction);
 		if (logLevel) this._injector.get(ILogService).setLogLevel(logLevel);
 		if (logCommandExecution !== void 0) this._injector.get(IConfigService).setConfig(COMMAND_LOG_EXECUTION_CONFIG_KEY, logCommandExecution);
 		this._init(injector);

package/lib/index.js

@@ -447,16 +447,17 @@ function createInterceptorKey(key) {
 const composeInterceptors = (interceptors) => function(initialValue, context) {
 	let index = -1;
 	let value = initialValue;
-	for (let i = 0; i <= interceptors.length; i++) {
+	let nextCalled = false;
+	const next = (nextValue) => {
+		nextCalled = true;
+		return nextValue;
+	};
+	for (let i = 0; i < interceptors.length; i++) {
 		if (i <= index) throw new Error("[SheetInterceptorService]: next() called multiple times!");
 		index = i;
-		if (i === interceptors.length) return value;
 		const interceptor = interceptors[i];
-		let nextCalled = false;
-		value = interceptor.handler(value, context, (nextValue) => {
-			nextCalled = true;
-			return nextValue;
-		});
+		nextCalled = false;
+		value = interceptor.handler(value, context, next);
 		if (!nextCalled) break;
 	}
 	return value;
@@ -3303,6 +3304,9 @@ let CommandService = class CommandService extends Disposable {
 	disposed() {
 		return this._disposed;
 	}
+	_warnCommandSkippedAfterDisposed(id) {
+		this._logService.warn("[CommandService]", `command "${id}" skipped because CommandService is disposed.`);
+	}
 	hasCommand(commandId) {
 		return this._commandRegistry.hasCommand(commandId);
 	}
@@ -3348,6 +3352,10 @@ let CommandService = class CommandService extends Disposable {
 		throw new Error("[CommandService]: could not add a collab mutation listener twice.");
 	}
 	async executeCommand(id, params, options) {
+		if (this._disposed) {
+			this._warnCommandSkippedAfterDisposed(id);
+			return false;
+		}
 		try {
 			const item = this._commandRegistry.getCommand(id);
 			if (item) {
@@ -3360,6 +3368,11 @@ let CommandService = class CommandService extends Disposable {
 				const stackItemDisposable = this._pushCommandExecutionStack(commandInfo);
 				const _options = options !== null && options !== void 0 ? options : {};
 				this._beforeCommandExecutionListeners.forEach((listener) => listener(commandInfo, _options));
+				if (this._disposed) {
+					stackItemDisposable.dispose();
+					this._warnCommandSkippedAfterDisposed(id);
+					return false;
+				}
 				const result = await this._execute(command, params, _options);
 				if (_options.syncOnly) {
 					if (command.type === 2) this._collabMutationListeners.forEach((listener) => listener(commandInfo, _options));
@@ -3377,6 +3390,10 @@ let CommandService = class CommandService extends Disposable {
 		}
 	}
 	syncExecuteCommand(id, params, options) {
+		if (this._disposed) {
+			this._warnCommandSkippedAfterDisposed(id);
+			return false;
+		}
 		try {
 			const item = this._commandRegistry.getCommand(id);
 			if (item) {
@@ -3397,6 +3414,11 @@ let CommandService = class CommandService extends Disposable {
 				const stackItemDisposable = this._pushCommandExecutionStack(commandInfo);
 				const _options = options !== null && options !== void 0 ? options : {};
 				this._beforeCommandExecutionListeners.forEach((listener) => listener(commandInfo, _options));
+				if (this._disposed) {
+					stackItemDisposable.dispose();
+					this._warnCommandSkippedAfterDisposed(id);
+					return false;
+				}
 				const result = this._syncExecute(command, params, _options);
 				if (_options.syncOnly) {
 					if (command.type === 2) this._collabMutationListeners.forEach((listener) => listener(commandInfo, _options));
@@ -3568,7 +3590,12 @@ function afterTime(ms) {
 }
 function convertObservableToBehaviorSubject(observable, initValue) {
 	const subject = new BehaviorSubject(initValue);
-	observable.subscribe(subject);
+	const subscription = observable.subscribe(subject);
+	const originalComplete = subject.complete.bind(subject);
+	subject.complete = () => {
+		subscription.unsubscribe();
+		originalComplete();
+	};
 	return subject;
 }
 
@@ -14724,7 +14751,7 @@ const IURLImageService = createIdentifier("core.url-image.service");
 //#endregion
 //#region package.json
 var name = "@univerjs/core";
-var version = "0.22.1";
+var version = "0.23.0";
 
 //#endregion
 //#region src/sheets/empty-snapshot.ts
@@ -17607,6 +17634,8 @@ var LocaleService = class extends Disposable {
 		super();
 		_defineProperty(this, "_currentLocale$", new BehaviorSubject("zhCN"));
 		_defineProperty(this, "currentLocale$", this._currentLocale$.asObservable());
+		_defineProperty(this, "_direction$", new BehaviorSubject("ltr"));
+		_defineProperty(this, "direction$", this._direction$.asObservable());
 		_defineProperty(this, "_locales", null);
 		_defineProperty(this, "localeChanged$", new Subject());
 		_defineProperty(
@@ -17653,6 +17682,7 @@ var LocaleService = class extends Disposable {
 		this.disposeWithMe(toDisposable(() => {
 			this._locales = null;
 			this._currentLocale$.complete();
+			this._direction$.complete();
 			this.localeChanged$.complete();
 		}));
 	}
@@ -17676,6 +17706,12 @@ var LocaleService = class extends Disposable {
 	getCurrentLocale() {
 		return this._currentLocale;
 	}
+	setDirection(direction) {
+		this._direction$.next(direction);
+	}
+	getDirection() {
+		return this._direction$.value;
+	}
 	resolveKeyPath(obj, keys) {
 		const currentKey = keys.shift();
 		if (currentKey && obj && currentKey in obj) {
@@ -19857,11 +19893,12 @@ var Univer = class {
 		_defineProperty(this, "_injector", void 0);
 		_defineProperty(this, "_disposingCallbacks", new DisposableCollection());
 		const injector = this._injector = createUniverInjector(parentInjector, config === null || config === void 0 ? void 0 : config.override);
-		const { theme, darkMode, locale, locales, logLevel, logCommandExecution } = config;
+		const { theme, darkMode, locale, locales, direction, logLevel, logCommandExecution } = config;
 		if (theme) this._injector.get(ThemeService).setTheme(theme);
 		if (darkMode) this._injector.get(ThemeService).setDarkMode(darkMode);
 		if (locales) this._injector.get(LocaleService).load(locales);
 		if (locale) this._injector.get(LocaleService).setLocale(locale);
+		if (direction) this._injector.get(LocaleService).setDirection(direction);
 		if (logLevel) this._injector.get(ILogService).setLogLevel(logLevel);
 		if (logCommandExecution !== void 0) this._injector.get(IConfigService).setConfig(COMMAND_LOG_EXECUTION_CONFIG_KEY, logCommandExecution);
 		this._init(injector);

package/lib/types/services/command/command.service.d.ts

@@ -271,6 +271,7 @@ export declare class CommandService extends Disposable implements ICommandServic
     constructor(_injector: Injector, _logService: ILogService, _configService: IConfigService);
     dispose(): void;
     disposed(): boolean;
+    private _warnCommandSkippedAfterDisposed;
     hasCommand(commandId: string): boolean;
     registerCommand(command: ICommand): IDisposable;
     unregisterCommand(commandId: string): void;

package/lib/types/services/locale/locale.service.d.ts

@@ -24,6 +24,8 @@ export declare class LocaleService extends Disposable {
     private _currentLocale$;
     readonly currentLocale$: import("rxjs").Observable<LocaleType>;
     private get _currentLocale();
+    private _direction$;
+    readonly direction$: import("rxjs").Observable<"ltr" | "rtl">;
     private _locales;
     localeChanged$: Subject<void>;
     constructor();
@@ -62,5 +64,7 @@ export declare class LocaleService extends Disposable {
     setLocale(locale: LocaleType): void;
     getLocales(): ILanguagePack | undefined;
     getCurrentLocale(): LocaleType;
+    setDirection(direction: 'ltr' | 'rtl'): void;
+    getDirection(): "ltr" | "rtl";
     resolveKeyPath(obj: ILanguagePack, keys: string[]): LanguageValue | null;
 }

package/lib/types/univer.d.ts

@@ -37,6 +37,11 @@ export interface IUniverConfig {
      * The locale of the Univer instance.
      */
     locale?: LocaleType;
+    /**
+     * The direction of the Univer instance.
+     * @default 'ltr'
+     */
+    direction?: 'ltr' | 'rtl';
     /**
      * The locales to be used
      */