@univerjs/core 0.1.0-alpha.2 → 0.1.0-alpha.3

package/lib/types/basics/plugin-holder.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { Injector } from '@wendellhu/redi';
+import type { Plugin, PluginCtor } from '../plugin/plugin';
+import { LifecycleStages } from '../services/lifecycle/lifecycle';
+import type { LifecycleInitializerService, LifecycleService } from '../services/lifecycle/lifecycle.service';
+import { Disposable } from '../shared/lifecycle';
+export declare abstract class PluginHolder extends Disposable {
+    protected abstract get _lifecycleService(): LifecycleService;
+    protected abstract get _lifecycleInitializerService(): LifecycleInitializerService;
+    protected abstract get _injector(): Injector;
+    protected _started: boolean;
+    addPlugins(plugins: Array<[PluginCtor<any>, any]>): void;
+    protected _takePluginsThroughLifecycle(plugins: Plugin[], skipStarting?: boolean): void;
+    protected _pluginsRunLifecycle(plugins: Plugin[], lifecycle: LifecycleStages): void;
+    protected _initPlugin<T extends Plugin>(plugin: PluginCtor<T>, options: any): Plugin;
+}

package/lib/types/basics/univer-doc.d.ts

@@ -15,20 +15,16 @@
  */
 import { Injector } from '@wendellhu/redi';
 import { DocumentDataModel } from '../docs/data-model/document-data-model';
-import type { Plugin, PluginCtor } from '../plugin/plugin';
-import { LifecycleInitializerService } from '../services/lifecycle/lifecycle.service';
-import { Disposable } from '../shared/lifecycle';
+import { LifecycleInitializerService, LifecycleService } from '../services/lifecycle/lifecycle.service';
 import type { IDocumentData } from '../types/interfaces/i-document-data';
+import { PluginHolder } from './plugin-holder';
 /**
  * Externally provided UniverDoc root instance
  */
-export declare class UniverDoc extends Disposable {
-    private readonly _injector;
-    private readonly _initService;
-    private readonly _pluginStore;
-    constructor(_injector: Injector, _initService: LifecycleInitializerService);
-    start(): void;
-    ready(): void;
+export declare class UniverDoc extends PluginHolder {
+    protected readonly _injector: Injector;
+    protected readonly _lifecycleService: LifecycleService;
+    protected readonly _lifecycleInitializerService: LifecycleInitializerService;
+    constructor(_injector: Injector, _lifecycleService: LifecycleService, _lifecycleInitializerService: LifecycleInitializerService);
     createDoc(docData: Partial<IDocumentData>): DocumentDataModel;
-    addPlugin<T extends Plugin>(pluginCtor: PluginCtor<T>, options: any): void;
 }

package/lib/types/basics/univer-sheet.d.ts

@@ -15,31 +15,17 @@
  */
 import type { IDisposable } from '@wendellhu/redi';
 import { Injector } from '@wendellhu/redi';
-import type { Plugin, PluginCtor } from '../plugin/plugin';
-import { LifecycleInitializerService } from '../services/lifecycle/lifecycle.service';
-import { Disposable } from '../shared/lifecycle';
+import { LifecycleInitializerService, LifecycleService } from '../services/lifecycle/lifecycle.service';
 import { Workbook } from '../sheets/workbook';
 import type { IWorkbookData } from '../types/interfaces/i-workbook-data';
+import { PluginHolder } from './plugin-holder';
 /**
  * Externally provided UniverSheet root instance
  */
-export declare class UniverSheet extends Disposable implements IDisposable {
-    private readonly _injector;
-    private readonly _initService;
-    private readonly _pluginStore;
-    constructor(_injector: Injector, _initService: LifecycleInitializerService);
-    start(): void;
-    ready(): void;
+export declare class UniverSheet extends PluginHolder implements IDisposable {
+    protected readonly _injector: Injector;
+    protected readonly _lifecycleService: LifecycleService;
+    protected readonly _lifecycleInitializerService: LifecycleInitializerService;
+    constructor(_injector: Injector, _lifecycleService: LifecycleService, _lifecycleInitializerService: LifecycleInitializerService);
     createSheet(workbookConfig: Partial<IWorkbookData>): Workbook;
-    dispose(): void;
-    /**
-     * Add a plugin into UniverSheet. UniverSheet should add dependencies exposed from this plugin to its DI system.
-     *
-     * @param plugin constructor of the plugin class
-     * @param options options to this plugin
-     *
-     * @internal
-     */
-    addPlugin<T extends Plugin>(plugin: PluginCtor<T>, options: any): void;
-    private _initDependencies;
 }

package/lib/types/basics/univer-slide.d.ts

@@ -14,30 +14,17 @@
  * limitations under the License.
  */
 import { Injector } from '@wendellhu/redi';
-import type { Plugin, PluginCtor } from '../plugin/plugin';
 import { LifecycleInitializerService, LifecycleService } from '../services/lifecycle/lifecycle.service';
-import { Disposable } from '../shared/lifecycle';
 import { Slide } from '../slides/domain/slide-model';
 import type { ISlideData } from '../types/interfaces/i-slide-data';
+import { PluginHolder } from './plugin-holder';
 /**
  * Externally provided UniverSlide root instance
  */
-export declare class UniverSlide extends Disposable {
-    private readonly _injector;
-    private readonly _lifecycleService;
-    private readonly _initializerService;
-    private readonly _pluginStore;
-    constructor(_injector: Injector, _lifecycleService: LifecycleService, _initializerService: LifecycleInitializerService);
-    start(): void;
-    ready(): void;
+export declare class UniverSlide extends PluginHolder {
+    protected readonly _injector: Injector;
+    protected readonly _lifecycleService: LifecycleService;
+    protected readonly _lifecycleInitializerService: LifecycleInitializerService;
+    constructor(_injector: Injector, _lifecycleService: LifecycleService, _lifecycleInitializerService: LifecycleInitializerService);
     createSlide(data: Partial<ISlideData>): Slide;
-    /**
-     * Add a plugin into UniverSlide. UniverSlide should add dependencies exposed from this plugin to its DI system.
-     *
-     * @param plugin constructor of the plugin class
-     * @param options options to this plugin
-     *
-     * @internal
-     */
-    addPlugin<T extends Plugin>(plugin: PluginCtor<T>, options: any): void;
 }

package/lib/types/basics/univer.d.ts

@@ -16,26 +16,25 @@
 import { Injector } from '@wendellhu/redi';
 import type { DocumentDataModel } from '../docs/data-model/document-data-model';
 import type { Plugin, PluginCtor } from '../plugin/plugin';
+import { LifecycleInitializerService, LifecycleService } from '../services/lifecycle/lifecycle.service';
 import type { Workbook } from '../sheets/workbook';
 import type { Slide } from '../slides/domain/slide-model';
 import type { LocaleType } from '../types/enum/locale-type';
 import type { IDocumentData, ISlideData, IUniverData, IWorkbookData } from '../types/interfaces';
-/**
- * Univer.
- */
-export declare class Univer {
-    private readonly _rootInjector;
+import { PluginHolder } from './plugin-holder';
+export declare class Univer extends PluginHolder {
+    protected readonly _injector: Injector;
     private readonly _univerPluginStore;
     private readonly _univerPluginRegistry;
     private _univerSheet;
     private _univerDoc;
     private _univerSlide;
     private get _univerInstanceService();
+    protected get _lifecycleService(): LifecycleService;
+    protected get _lifecycleInitializerService(): LifecycleInitializerService;
     constructor(univerData?: Partial<IUniverData>);
     __getInjector(): Injector;
     dispose(): void;
-    /** Register a plugin into univer. */
-    registerPlugin<T extends Plugin>(plugin: PluginCtor<T>, configs?: any): void;
     setLocale(locale: LocaleType): void;
     /**
      * Create a univer sheet instance with internal dependency injection.
@@ -44,12 +43,18 @@ export declare class Univer {
     createUniverDoc(config: Partial<IDocumentData>): DocumentDataModel;
     createUniverSlide(config: Partial<ISlideData>): Slide;
     private _initDependencies;
-    private _tryStart;
+    /**
+     * Initialize modules provided by Univer-type plugins.
+     */
+    private _tryProgressToStart;
     private _tryProgressToReady;
+    /** Register a plugin into univer. */
+    registerPlugin<T extends Plugin>(plugin: PluginCtor<T>, config?: any): void;
+    private _initLazyPluginsTimer?;
+    private _scheduleInitPluginAfterStarted;
+    private _flushLazyPlugins;
     private _registerUniverPlugin;
-    private _registerUniverSheets;
-    private _registerUniverDocs;
-    private _registerUniverSlides;
-    private _initializePluginsForDoc;
-    private _initializePluginsForSlide;
+    private _registerSheetsPlugin;
+    private _registerDocsPlugin;
+    private _registerSlidesPlugin;
 }

package/lib/types/common/memory-cursor.d.ts

@@ -17,4 +17,5 @@ export declare class MemoryCursor {
     cursor: number;
     reset(): this;
     moveCursor(pos: number): void;
+    moveCursorTo(pos: number): void;
 }

package/lib/types/common/shims.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+export declare function installShims(): void;

package/lib/types/docs/data-model/index.d.ts

@@ -14,4 +14,5 @@
  * limitations under the License.
  */
 export * from './document-data-model';
+export * from './preset-list-type';
 export * from './types';

package/lib/types/docs/data-model/preset-list-type.d.ts

@@ -0,0 +1,50 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { BulletAlignment, GlyphType } from '../../types/interfaces/i-document-data';
+export declare enum PresetListType {
+    BULLET_LIST = "BULLET_LIST",
+    ORDER_LIST = "ORDER_LIST"
+}
+export declare const PRESET_LIST_TYPE: {
+    BULLET_LIST: {
+        listType: PresetListType;
+        nestingLevel: {
+            bulletAlignment: BulletAlignment;
+            glyphFormat: string;
+            textStyle: {
+                fs: number;
+            };
+            startNumber: number;
+            glyphSymbol: string;
+            hanging: number;
+            indentStart: number;
+        }[];
+    };
+    ORDER_LIST: {
+        listType: PresetListType;
+        nestingLevel: {
+            bulletAlignment: BulletAlignment;
+            glyphFormat: string;
+            textStyle: {
+                fs: number;
+            };
+            startNumber: number;
+            glyphType: GlyphType;
+            hanging: number;
+            indentStart: number;
+        }[];
+    };
+};

package/lib/types/index.d.ts

@@ -45,6 +45,7 @@ export { type IUndoRedoCommandInfos, type IUndoRedoItem, IUndoRedoService, type
 export * from './shared';
 export type { IComposeInterceptors, IInterceptor, InterceptorHandler } from './common/interceptor';
 export { composeInterceptors, createInterceptorKey, InterceptorManager } from './common/interceptor';
+export type { PluginCtor } from './plugin/plugin';
 export { Range } from './sheets/range';
 export { deserializeRangeWithSheet, getAbsoluteRefTypeWithSingleString, getAbsoluteRefTypeWitString, serializeRange, serializeRangeToRefString, serializeRangeWithSheet, serializeRangeWithSpreadsheet, } from './sheets/reference';
 export { Styles } from './sheets/styles';

package/lib/types/plugin/plugin.d.ts

@@ -40,14 +40,14 @@ export declare abstract class Plugin {
     getPluginName(): string;
 }
 interface IPluginRegistryItem {
-    plugin: typeof Plugin;
+    plugin: PluginCtor<Plugin>;
     options: any;
 }
 /**
  * Store plugin instances.
  */
 export declare class PluginStore {
-    private readonly plugins;
+    private readonly _plugins;
     addPlugin(plugin: Plugin): void;
     removePlugins(): Plugin[];
     forEachPlugin(callback: (plugin: Plugin) => void): void;
@@ -56,8 +56,9 @@ export declare class PluginStore {
  * Store plugin registry items.
  */
 export declare class PluginRegistry {
-    private readonly pluginsRegisteredByBusiness;
+    private readonly _pluginsRegisteredByBusiness;
     registerPlugin(pluginCtor: PluginCtor<any>, options: any): void;
     getRegisterPlugins(type: PluginType): [IPluginRegistryItem];
+    clearPluginsOfType(type: PluginType): void;
 }
 export {};

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

@@ -95,9 +95,9 @@ export interface IOperationInfo<T extends object = object> {
     params: T;
 }
 export interface IExecutionOptions {
-    /** This mutation should only be executed on the local machine. */
-    local?: boolean;
-    /** From collaboration peers. */
+    /** This mutation should only be executed on the local machine, and not synced to replicas. */
+    onlyLocal?: boolean;
+    /** This command is from collaboration peers. */
     fromCollab?: boolean;
     [key: PropertyKey]: string | number | boolean | undefined;
 }

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

@@ -20,17 +20,19 @@ export declare enum LogLevel {
     WARN = 2,
     VERBOSE = 3
 }
+type ArgsType = any[];
 export interface ILogService {
-    log(...args: any[]): void;
-    warn(...args: any[]): void;
-    error(...args: any[]): void;
+    log(...args: ArgsType): void;
+    warn(...args: ArgsType): void;
+    error(...args: ArgsType): void;
     setLogLevel(enabled: LogLevel): void;
 }
 export declare const ILogService: import("@wendellhu/redi").IdentifierDecorator<ILogService>;
 export declare class DesktopLogService extends Disposable implements ILogService {
     private _logLevel;
-    log(...args: any[]): void;
-    warn(...args: any[]): void;
-    error(...args: any[]): void;
+    log(...args: ArgsType): void;
+    warn(...args: ArgsType): void;
+    error(...args: ArgsType): void;
     setLogLevel(logLevel: LogLevel): void;
 }
+export {};

package/lib/types/shared/color/color-kit.d.ts

@@ -0,0 +1,64 @@
+/**
+ * Copyright 2023-present DreamNum Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+interface IRgbColor {
+    b: number;
+    g: number;
+    r: number;
+    a?: number;
+}
+interface IHslColor {
+    h: number;
+    l: number;
+    s: number;
+    a?: number;
+}
+interface IHsvColor {
+    h: number;
+    s: number;
+    v: number;
+    a?: number;
+}
+type Color = IRgbColor | IHslColor | IHsvColor;
+export declare const RGB_PAREN = "rgb(";
+export declare const RGBA_PAREN = "rgba(";
+export declare const COLORS: {
+    [key: string]: number[];
+};
+export declare class ColorKit {
+    private _color;
+    private _rgbColor;
+    private _isValid;
+    static mix(color1: string | Color | ColorKit, color2: string | Color | ColorKit, amount: number): ColorKit;
+    static getContrastRatio(foreground: string | Color | ColorKit, background: string | Color | ColorKit): number;
+    constructor(color: string | Color | ColorKit | undefined);
+    get isValid(): boolean;
+    toRgb(): IRgbColor;
+    toRgbString(): string;
+    toString(): string;
+    toHexString(allowShort?: boolean): string;
+    toHsv(): IHsvColor;
+    toHsl(): IHslColor;
+    lighten(amount?: number): ColorKit;
+    darken(amount?: number): ColorKit;
+    setAlpha(value: number): ColorKit;
+    getLuminance(): number;
+    getBrightness(): number;
+    getAlpha(): number;
+    isDark(): boolean;
+    isLight(): boolean;
+    private _setNullColor;
+}
+export {};

package/lib/types/shared/color/color.d.ts

@@ -14,9 +14,23 @@
  * limitations under the License.
  */
 import type { Nullable } from '../../common/type-utils';
-import type { ThemeColors, ThemeColorType } from '../../types/enum';
-import { ColorType } from '../../types/enum';
-import { ColorBuilder } from './color-builder';
+import { ColorType, ThemeColors, ThemeColorType } from '../../types/enum';
+export declare class ColorBuilder {
+    private _themeValue;
+    private _themeColors;
+    private _themeTint;
+    private _rgbValue;
+    private _colorType;
+    constructor();
+    asRgbColor(): RgbColor;
+    asThemeColor(): ThemeColor;
+    build(): Nullable<Color>;
+    setRgbColor(cssString: string): ColorBuilder;
+    setThemeColors(value: ThemeColors): void;
+    setThemeTint(value: number): void;
+    setThemeColor(theme: ThemeColorType): ColorBuilder;
+    getColorType(): ColorType;
+}
 export declare class Color {
     protected _builder: ColorBuilder;
     constructor(builder: ColorBuilder);

package/lib/types/shared/common.d.ts

@@ -25,9 +25,6 @@ export declare function isEmptyCell(cell: Nullable<ICellData>): boolean;
 export declare function getColorStyle(color: Nullable<IColorStyle>): Nullable<string>;
 export declare function isFormulaString(value: any): boolean;
 export declare function isFormulaId(value: any): boolean;
-/**
- * move to Styles.getStyleByCell
- */
 /**
  * Convert rich text json to DOM
  * @param p
@@ -41,3 +38,4 @@ export declare function handleJsonToDom(p: IDocumentData): string;
 export declare function handleStyleToString(style: IStyleData, isCell?: boolean): string;
 export declare function getBorderStyleType(type: string): number;
 export declare function getDocsUpdateBody(model: IDocumentData, segmentId?: string): import("../types/interfaces").IDocumentBody | undefined;
+export declare function isValidRange(range: IRange): boolean;

package/lib/types/shared/index.d.ts

@@ -16,7 +16,7 @@
 export * from './array-search';
 export * from './blob';
 export * from './color/color';
-export * from './color/color-builder';
+export { ColorKit, COLORS, RGB_PAREN, RGBA_PAREN } from './color/color-kit';
 export * from './command-enum';
 export * from './common';
 export * from './compare';
@@ -27,7 +27,6 @@ export * from './hash-algorithm';
 export * from './lifecycle';
 export * from './locale';
 export * from './lru/index';
-export * from './object-array';
 export * from './object-matrix';
 export * from './permission';
 export * from './rectangle';

package/lib/types/shared/locale.d.ts

@@ -14,10 +14,7 @@
  * limitations under the License.
  */
 export interface ILanguagePack {
-    [key: string]: string | Array<{
-        name: string;
-        value: string;
-    }> | ILanguagePack;
+    [key: string]: string | ILanguagePack | ILanguagePack[];
 }
 export interface ILocales {
     [key: string]: ILanguagePack;

package/lib/types/shared/object-matrix.d.ts

@@ -14,38 +14,41 @@
  * limitations under the License.
  */
 import type { IRange } from '../types/interfaces/i-range';
-import type { PredicateFunction } from './object-array';
-import { ObjectArray } from './object-array';
 import type { Nullable } from './types';
 /**
  * Object Matrix Primitive Type
  */
-export interface ObjectMatrixPrimitiveType<T> {
-    [key: number]: {
-        [key: number]: T;
-    };
+export interface IObjectMatrixPrimitiveType<T> {
+    [key: number]: IObjectArrayPrimitiveType<T>;
 }
+export interface IObjectArrayPrimitiveType<T> {
+    [key: number]: T;
+}
+export declare function getArrayLength<T>(o: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>): number;
+export declare function insertMatrixArray<T>(index: number, value: T, o: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>): void;
+export declare function concatMatrixArray<T>(source: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>, target: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>): IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>;
+export declare function sliceMatrixArray<T>(start: number, end: number, matrixArray: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>): IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>;
+export declare function moveMatrixArray<T>(fromIndex: number, count: number, toIndex: number, o: IObjectArrayPrimitiveType<T> | IObjectMatrixPrimitiveType<T>): void;
 /**
  * A two-dimensional array represented by a two-level deep object and provides an array-like API
  *
  * @beta
  */
 export declare class ObjectMatrix<T> {
-    private _option;
     private _matrix;
-    constructor(matrix?: ObjectMatrixPrimitiveType<T>);
+    constructor(matrix?: IObjectMatrixPrimitiveType<T>);
     static MakeObjectMatrixSize<T>(size: number): ObjectMatrix<T>;
-    getMatrix(): ObjectMatrixPrimitiveType<T>;
-    forEach(callback: PredicateFunction<ObjectArray<T>>): ObjectMatrix<T>;
-    forRow(callback: (row: number, cols: number[]) => Nullable<boolean>): void;
+    getMatrix(): IObjectMatrixPrimitiveType<T>;
+    forEach(callback: (row: number, objectArray: IObjectArrayPrimitiveType<T>) => Nullable<boolean>): ObjectMatrix<T>;
+    forRow(callback: (row: number, cols: number[]) => Nullable<boolean>): ObjectMatrix<T>;
     forValue(callback: (row: number, col: number, value: T) => Nullable<boolean>): ObjectMatrix<T>;
     swapRow(src: number, target: number): void;
-    getRow(rowIndex: number): Nullable<ObjectArray<T>>;
-    getRowOrCreate(rowIndex: number): ObjectArray<T>;
+    getRow(rowIndex: number): Nullable<IObjectArrayPrimitiveType<T>>;
+    getRowOrCreate(rowIndex: number): IObjectArrayPrimitiveType<T>;
     reset(): void;
     hasValue(): boolean;
-    getValue(row: number, column: number): Nullable<T>;
-    setValue(row: number, column: number, value: Nullable<T>): void;
+    getValue(row: number, column: number): T;
+    setValue(row: number, column: number, value: T): void;
     /**
      * ！！
      * Please +1 ‘！’, who fell into this pit.
@@ -53,18 +56,9 @@ export declare class ObjectMatrix<T> {
      */
     deleteValue(row: number, column: number): void;
     realDeleteValue(row: number, column: number): void;
-    spliceRows(start: number, count: number): ObjectMatrix<T>;
-    sliceRows(start: number, count: number): ObjectMatrix<T>;
-    pushRow(row: ObjectArray<T>): void;
+    setRow(rowNumber: number, row: IObjectArrayPrimitiveType<T>): void;
     moveRows(start: number, count: number, target: number): void;
     moveColumns(start: number, count: number, target: number): void;
-    insertRow(rowIndex: number, row: ObjectArray<T>): void;
-    insertRowCount(rowIndex: number, rowCount: number): void;
-    insertRows(rowIndex: number, matrix: ObjectMatrix<T>): void;
-    spliceColumns(start: number, count: number): ObjectMatrix<T>;
-    sliceColumns(start: number, count: number): ObjectMatrix<T>;
-    insertColumns(columnIndex: number, columnData: ObjectMatrix<T>): void;
-    insertColumnCount(columnIndex: number, columnCount: number): void;
     /**
      * Return a fragment of the original data matrix. Note that the returned matrix's row matrix would start from
      * 0 not `startRow`. Neither does its column matrix. If you want to get the original matrix, use `getSlice`.
@@ -93,9 +87,16 @@ export declare class ObjectMatrix<T> {
     getRange(): IRange;
     toNativeArray(): T[];
     toArray(): T[][];
-    toJSON(): ObjectMatrixPrimitiveType<T>;
-    getData(): ObjectMatrixPrimitiveType<T>;
-    getArrayData(): ObjectMatrixPrimitiveType<T>;
+    /**
+     * @deprecated Use getMatrix as a substitute.
+     */
+    toJSON(): IObjectMatrixPrimitiveType<T>;
+    clone(): IObjectMatrixPrimitiveType<T>;
+    /**
+     * @deprecated Use clone as a substitute.
+     */
+    getData(): IObjectMatrixPrimitiveType<T>;
+    getArrayData(): IObjectMatrixPrimitiveType<T>;
     getDataRange(): IRange;
     getDiscreteRanges(): IRange[];
     merge(newObject: ObjectMatrix<T>): void;

package/lib/types/shared/rectangle.d.ts

@@ -31,4 +31,5 @@ export declare class Rectangle {
     static moveHorizontal: (range: IRange, step?: number, length?: number) => IRange;
     static moveVertical: (range: IRange, step?: number, length?: number) => IRange;
     static moveOffset: (range: IRange, offsetX: number, offsetY: number) => IRange;
+    static subtract(range1: IRange, range2: IRange): IRange[];
 }

package/lib/types/shared/sort-rules.d.ts

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare function sortRules(oa: any, ob: any): 1 | -1 | 0;
-export declare function sortRulesByDesc(oa: any, ob: any): 1 | -1 | 0;
+export declare function sortRules(oa: any, ob: any): 1 | 0 | -1;
+export declare function sortRulesByDesc(oa: any, ob: any): 1 | 0 | -1;
 /**
  *
  * @param key compare key

package/lib/types/shared/tools.d.ts

@@ -13,9 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ObjectArrayPrimitiveType } from './object-array';
-import { ObjectArray } from './object-array';
-import type { ObjectMatrixPrimitiveType } from './object-matrix';
 import type { Class, IKeyValue } from './types';
 /**
  * Universal tool library
@@ -79,7 +76,6 @@ export declare class Tools {
      * @param value value to be set
      * @returns
      */
-    static fillObjectMatrix<T>(rows: number, columns: number, value: T): ObjectMatrixPrimitiveType<T>;
     static numToWord(x: number): string;
     /**
      *
@@ -112,6 +108,5 @@ export declare class Tools {
     static commonExtend<T>(originJson: IKeyValue, extendJson: IKeyValue): T;
     static commonExtend1<T>(originJson: IKeyValue, extendJson: IKeyValue): T;
     static arrayToObject(array: IKeyValue[][]): IKeyValue;
-    static createObjectArray<T>(array: ObjectArrayPrimitiveType<T> | ObjectArray<T>): ObjectArray<T>;
     static hasIntersectionBetweenTwoRanges(range1Start: number, range1End: number, range2Start: number, range2End: number): boolean;
 }