@univerjs/core 0.2.13 → 0.2.15

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

@@ -3,10 +3,19 @@ import { Observable } from 'rxjs';
 import { Disposable } from '../shared';
 export { UniverType as UniverInstanceType } from '@univerjs/protocol';
 export type UnitType = UniverType | number;
+/**
+ * The base class for all units.
+ */
 export declare abstract class UnitModel<D = object, T extends UnitType = UnitType> extends Disposable {
     abstract readonly type: T;
     abstract getUnitId(): string;
     abstract name$: Observable<string>;
     abstract setName(name: string): void;
     abstract getSnapshot(): D;
+    /** Get revision of the unit's snapshot. Note that revision should start from 1. */
+    abstract getRev(): number;
+    /** Increment the current revision. */
+    abstract incrementRev(): void;
+    /** Set revision of the current snapshot. */
+    abstract setRev(rev: number): void;
 }

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

@@ -1,9 +1,9 @@
 import { BehaviorSubject } from 'rxjs';
+import { UnitModel, UniverInstanceType } from '../../common/unit';
+import { SliceBodyType } from './text-x/utils';
 import { Nullable } from '../../shared';
 import { IDocumentBody, IDocumentData, IDocumentRenderConfig, IDocumentStyle, IDrawings, IListData } from '../../types/interfaces/i-document-data';
 import { IPaddingData } from '../../types/interfaces/i-style-data';
-import { UnitModel, UniverInstanceType } from '../../common/unit';
-import { SliceBodyType } from './text-x/utils';
 import { JSONXActions } from './json-x/json-x';
 export declare const DEFAULT_DOC: {
     id: string;
@@ -22,6 +22,9 @@ declare class DocumentDataModelSimple extends UnitModel<IDocumentData, UniverIns
     name$: import('rxjs').Observable<string>;
     protected snapshot: IDocumentData;
     constructor(snapshot: Partial<IDocumentData>);
+    getRev(): number;
+    incrementRev(): void;
+    setRev(rev: number): void;
     setName(name: string): void;
     get drawings(): IDrawings | undefined;
     get documentStyle(): IDocumentStyle;
@@ -49,8 +52,6 @@ export declare class DocumentDataModel extends DocumentDataModelSimple {
     getDrawingsOrder(): string[] | undefined;
     getCustomRanges(): import('../..').ICustomRange<Record<string, any>>[] | undefined;
     getCustomDecorations(): import('../..').ICustomDecoration[] | undefined;
-    getRev(): number;
-    incrementRev(): void;
     getSettings(): import('../..').IDocumentSettings | undefined;
     reset(snapshot: Partial<IDocumentData>): void;
     getSelfOrHeaderFooterModel(segmentId?: string): DocumentDataModel;

package/lib/types/{shared/lru/index.d.ts → docs/data-model/text-x/build-utils/__test__/selection.spec.d.ts}

@@ -13,5 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export * from './lru-helper';
-export * from './lru-map';
+export {};

package/lib/types/docs/data-model/text-x/build-utils/index.d.ts

@@ -1,5 +1,5 @@
 import { copyCustomRange, getCustomRangesInterestsWithRange, isIntersecting, shouldDeleteCustomRange } from './custom-range';
-import { getDeleteSelection, getInsertSelection, getRetainAndDeleteFromReplace, getSelectionWithNoSymbolSide, getSelectionWithSymbolMax, isSegmentIntersects, makeSelection, normalizeSelection } from './selection';
+import { getDeleteSelection, getInsertSelection, getRetainAndDeleteFromReplace, isSegmentIntersects, makeSelection, normalizeSelection } from './selection';
 import { addCustomRangeTextX, deleteCustomRangeTextX, getRetainAndDeleteAndExcludeLineBreak } from './text-x-utils';
 export declare class BuildTextUtils {
     static customRange: {
@@ -14,8 +14,6 @@ export declare class BuildTextUtils {
         replace: (params: import('./text-x-utils').IReplaceSelectionTextXParams) => false | import('../text-x').TextX;
         makeSelection: typeof makeSelection;
         normalizeSelection: typeof normalizeSelection;
-        getSelectionWithSymbolMax: typeof getSelectionWithSymbolMax;
-        getSelectionWithNoSymbolSide: typeof getSelectionWithNoSymbolSide;
         getDeleteSelection: typeof getDeleteSelection;
         getInsertSelection: typeof getInsertSelection;
         getDeleteActions: typeof getRetainAndDeleteFromReplace;
@@ -24,5 +22,9 @@ export declare class BuildTextUtils {
     static range: {
         isIntersects: typeof isSegmentIntersects;
     };
+    static transform: {
+        getPlainText: (dataStream: string) => string;
+        fromPlainText: (text: string) => import('../../../..').IDocumentBody;
+    };
 }
 export type { IAddCustomRangeTextXParam, IDeleteCustomRangeParam, IReplaceSelectionTextXParams } from './text-x-utils';

package/lib/types/docs/data-model/text-x/build-utils/parse.d.ts

@@ -0,0 +1,3 @@
+import { IDocumentBody } from '../../../../types/interfaces';
+export declare const getPlainText: (dataStream: string) => string;
+export declare const fromPlainText: (text: string) => IDocumentBody;

package/lib/types/index.d.ts

@@ -13,99 +13,100 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export type { Serializable } from './common/json';
-export { DEFAULT_DOCUMENT_SUB_COMPONENT_ID } from './docs/data-model/subdocument';
-export { type UnitType, UnitModel, UniverInstanceType } from './common/unit';
-export { Registry, RegistryAsMap } from './common/registry';
-export { CustomCommandExecutionError } from './common/error';
-export { Univer } from './univer';
-export { shallowEqual } from './common/equal';
-export { isNumeric, isSafeNumeric } from './common/number';
+export { dedupe, groupBy, makeArray, remove, rotate } from './common/array';
 export { isBooleanString } from './common/boolean';
-export { dedupe, remove, rotate, groupBy, makeArray } from './common/array';
-export { mergeSets } from './common/set';
-export { DEFAULT_EMPTY_DOCUMENT_VALUE, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DOCS_ZEN_EDITOR_UNIT_ID_KEY, createInternalEditorID, isInternalEditorID, } from './common/const';
+export { createInternalEditorID, DEFAULT_EMPTY_DOCUMENT_VALUE, DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY, DOCS_NORMAL_EDITOR_UNIT_ID_KEY, DOCS_ZEN_EDITOR_UNIT_ID_KEY, isInternalEditorID, } from './common/const';
+export * from './common/di';
+export { shallowEqual } from './common/equal';
+export { CustomCommandExecutionError } from './common/error';
 export { throttle } from './common/function';
+export type { IComposeInterceptors, IInterceptor, InterceptorHandler } from './common/interceptor';
+export { composeInterceptors, createInterceptorKey, InterceptorManager } from './common/interceptor';
+export type { Serializable } from './common/json';
 export { MemoryCursor } from './common/memory-cursor';
+export { mixinClass } from './common/mixin';
+export { isNumeric, isSafeNumeric } from './common/number';
+export { Registry, RegistryAsMap } from './common/registry';
 export { requestImmediateMacroTask } from './common/request-immediate-macro-task';
 export { type ISequenceExecuteResult, sequence, sequenceAsync } from './common/sequence';
+export { mergeSets } from './common/set';
+export { UnitModel, type UnitType, UniverInstanceType } from './common/unit';
 export * from './docs/data-model';
-export { TextXActionType, type TextXAction, type IDeleteAction, type IInsertAction, type IRetainAction, } from './docs/data-model/text-x/action-types';
-export { DataValidationRenderMode } from './types/enum/data-validation-render-mode';
+export { JSON1, JSONX } from './docs/data-model/json-x/json-x';
+export type { JSONXActions, JSONXPath } from './docs/data-model/json-x/json-x';
+export { replaceInDocumentBody } from './docs/data-model/replacement';
+export { DEFAULT_DOCUMENT_SUB_COMPONENT_ID } from './docs/data-model/subdocument';
 export { ActionIterator } from './docs/data-model/text-x/action-iterator';
-export { getBodySlice, composeBody, SliceBodyType } from './docs/data-model/text-x/utils';
+export { type IDeleteAction, type IInsertAction, type IRetainAction, type TextXAction, TextXActionType, } from './docs/data-model/text-x/action-types';
+export { normalizeTextRuns } from './docs/data-model/text-x/apply-utils/common';
+export { updateAttributeByDelete } from './docs/data-model/text-x/apply-utils/delete-apply';
+export { updateAttributeByInsert } from './docs/data-model/text-x/apply-utils/insert-apply';
 export { TextX } from './docs/data-model/text-x/text-x';
 export type { TPriority } from './docs/data-model/text-x/text-x';
-export { JSONX, JSON1 } from './docs/data-model/json-x/json-x';
-export type { JSONXActions, JSONXPath } from './docs/data-model/json-x/json-x';
-export { replaceInDocumentBody } from './docs/data-model/replacement';
-export { type IEventObserver, EventState, EventSubject, fromEventSubject } from './observer/observable';
-export { Plugin } from './services/plugin/plugin';
-export { PluginService, DependentOn } from './services/plugin/plugin.service';
+export { composeBody, getBodySlice, SliceBodyType } from './docs/data-model/text-x/utils';
+export { getCustomDecorationSlice, getCustomRangeSlice, normalizeBody } from './docs/data-model/text-x/utils';
+export { EventState, EventSubject, fromEventSubject, type IEventObserver } from './observer/observable';
+export { AuthzIoLocalService } from './services/authz-io/authz-io-local.service';
+export { IAuthzIoService } from './services/authz-io/type';
 export { type CommandListener, CommandService, CommandType, type ICommand, type ICommandInfo, ICommandService, type IExecutionOptions, type IMultiCommand, type IMutation, type IMutationCommonParams, type IMutationInfo, type IOperation, type IOperationInfo, NilCommand, sequenceExecute, sequenceExecuteAsync, } from './services/command/command.service';
 export { IConfigService } from './services/config/config.service';
+export { ConfigService } from './services/config/config.service';
 export * from './services/context/context';
 export { ContextService, IContextService } from './services/context/context.service';
 export { ErrorService, type IError } from './services/error/error.service';
 export { IUniverInstanceService } from './services/instance/instance.service';
+export { UniverInstanceService } from './services/instance/instance.service';
 export { LifecycleStages, OnLifecycle, runOnLifecycle } from './services/lifecycle/lifecycle';
 export { LifecycleService } from './services/lifecycle/lifecycle.service';
+export { LifecycleInitializerService } from './services/lifecycle/lifecycle.service';
 export { ILocalStorageService } from './services/local-storage/local-storage.service';
 export { LocaleService } from './services/locale/locale.service';
 export { DesktopLogService, ILogService, LogLevel } from './services/log/log.service';
+export { PermissionService } from './services/permission/permission.service';
 export { IPermissionService, PermissionStatus, } from './services/permission/type';
 export type { IPermissionParam } from './services/permission/type';
 export type { IPermissionPoint } from './services/permission/type';
+export type { IPermissionTypes, RangePermissionPointConstructor, WorkbookPermissionPointConstructor, WorkSheetPermissionPointConstructor } from './services/permission/type';
+export { Plugin } from './services/plugin/plugin';
+export type { PluginCtor } from './services/plugin/plugin';
+export { DependentOn, PluginService } from './services/plugin/plugin.service';
+export { type DependencyOverride, mergeOverrideWithDependencies } from './services/plugin/plugin-override';
 export { IResourceLoaderService } from './services/resource-loader/type';
 export { ResourceManagerService } from './services/resource-manager/resource-manager.service';
 export type { IResourceHook } from './services/resource-manager/type';
 export { IResourceManagerService } from './services/resource-manager/type';
 export { type IStyleSheet, ThemeService } from './services/theme/theme.service';
-export { type IUndoRedoCommandInfos, type IUndoRedoCommandInfosByInterceptor, type IUndoRedoItem, IUndoRedoService, type IUndoRedoStatus, LocalUndoRedoService, RedoCommand, UndoCommand, RedoCommandId, UndoCommandId, } from './services/undoredo/undoredo.service';
+export { type IUndoRedoCommandInfos, type IUndoRedoCommandInfosByInterceptor, type IUndoRedoItem, IUndoRedoService, type IUndoRedoStatus, LocalUndoRedoService, RedoCommand, RedoCommandId, UndoCommand, UndoCommandId, } from './services/undoredo/undoredo.service';
+export { createDefaultUser } from './services/user-manager/const';
+export { type IUser, UserManagerService } from './services/user-manager/user-manager.service';
 export * from './shared';
+export { isBlackColor, isWhiteColor } from './shared/color/color-kit';
+export { cellToRange } from './shared/common';
+export { nameCharacterCheck } from './shared/name';
 export { fromCallback, takeAfter } from './shared/rxjs';
-export { UserManagerService, type IUser } from './services/user-manager/user-manager.service';
-export type { IComposeInterceptors, IInterceptor, InterceptorHandler } from './common/interceptor';
-export { composeInterceptors, createInterceptorKey, InterceptorManager } from './common/interceptor';
-export { normalizeTextRuns } from './docs/data-model/text-x/apply-utils/common';
-export type { PluginCtor } from './services/plugin/plugin';
-export { type DependencyOverride, mergeOverrideWithDependencies } from './services/plugin/plugin-override';
-export * from './types/const';
-export * from './types/enum';
-export * from './types/interfaces';
-export { UniverInstanceService } from './services/instance/instance.service';
-export { LifecycleInitializerService } from './services/lifecycle/lifecycle.service';
-export { ConfigService } from './services/config/config.service';
-export { isRangesEqual, isUnitRangesEqual } from './sheets/util';
+export { awaitTime } from './shared/timer';
 export { Range } from './sheets/range';
+export { DEFAULT_WORKSHEET_COLUMN_COUNT, DEFAULT_WORKSHEET_COLUMN_COUNT_KEY, DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT, DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT_KEY, DEFAULT_WORKSHEET_COLUMN_WIDTH, DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY, DEFAULT_WORKSHEET_ROW_COUNT, DEFAULT_WORKSHEET_ROW_COUNT_KEY, DEFAULT_WORKSHEET_ROW_HEIGHT, DEFAULT_WORKSHEET_ROW_HEIGHT_KEY, DEFAULT_WORKSHEET_ROW_TITLE_WIDTH, DEFAULT_WORKSHEET_ROW_TITLE_WIDTH_KEY, mergeWorksheetSnapshotWithDefault, } from './sheets/sheet-snapshot-utils';
 export { Styles } from './sheets/styles';
-export { DEFAULT_WORKSHEET_COLUMN_COUNT, DEFAULT_WORKSHEET_COLUMN_COUNT_KEY, DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT_KEY, DEFAULT_WORKSHEET_COLUMN_WIDTH_KEY, DEFAULT_WORKSHEET_ROW_COUNT_KEY, DEFAULT_WORKSHEET_ROW_HEIGHT_KEY, DEFAULT_WORKSHEET_ROW_TITLE_WIDTH_KEY, DEFAULT_WORKSHEET_COLUMN_TITLE_HEIGHT, DEFAULT_WORKSHEET_COLUMN_WIDTH, DEFAULT_WORKSHEET_ROW_COUNT, DEFAULT_WORKSHEET_ROW_HEIGHT, DEFAULT_WORKSHEET_ROW_TITLE_WIDTH, mergeWorksheetSnapshotWithDefault, } from './sheets/sheet-snapshot-utils';
-export { SheetViewModel } from './sheets/view-model';
 export * from './sheets/typedef';
+export { isRangesEqual, isUnitRangesEqual } from './sheets/util';
+export { SheetViewModel } from './sheets/view-model';
 export { getWorksheetUID, Workbook } from './sheets/workbook';
-export { Worksheet, extractPureTextFromCell } from './sheets/worksheet';
+export { extractPureTextFromCell, getOriginCellValue, Worksheet } from './sheets/worksheet';
 export { SlideDataModel } from './slides/slide-model';
 export * from './types/const';
+export * from './types/const';
+export { skipParseTagNames } from './types/const/clipboard';
+export * from './types/enum';
 export * from './types/enum';
-export * from './types/interfaces';
-export { isBlackColor, isWhiteColor } from './shared/color/color-kit';
-export { cellToRange } from './shared/common';
-export type { IDataValidationRule, IDataValidationRuleBase, IDataValidationRuleInfo, IDataValidationRuleOptions, ISheetDataValidationRule } from './types/interfaces/i-data-validation';
-export type { ICellCustomRender, ICellRenderContext } from './types/interfaces/i-cell-custom-render';
 export { DataValidationErrorStyle } from './types/enum/data-validation-error-style';
 export { DataValidationImeMode } from './types/enum/data-validation-ime-mode';
 export { DataValidationOperator } from './types/enum/data-validation-operator';
-export { DataValidationType } from './types/enum/data-validation-type';
+export { DataValidationRenderMode } from './types/enum/data-validation-render-mode';
 export { DataValidationStatus } from './types/enum/data-validation-status';
-export type { IPermissionTypes, WorkbookPermissionPointConstructor, WorkSheetPermissionPointConstructor, RangePermissionPointConstructor } from './services/permission/type';
-export { PermissionService } from './services/permission/permission.service';
-export { AuthzIoLocalService } from './services/authz-io/authz-io-local.service';
-export { IAuthzIoService } from './services/authz-io/type';
-export { createDefaultUser } from './services/user-manager/const';
-export { skipParseTagNames } from './types/const/clipboard';
-export { normalizeBody, getCustomRangeSlice, getCustomDecorationSlice } from './docs/data-model/text-x/utils';
-export { updateAttributeByDelete } from './docs/data-model/text-x/apply-utils/delete-apply';
-export { updateAttributeByInsert } from './docs/data-model/text-x/apply-utils/insert-apply';
-export { nameCharacterCheck } from './shared/name';
-export { mixinClass } from './common/mixin';
-export * from './common/di';
+export { DataValidationType } from './types/enum/data-validation-type';
+export * from './types/interfaces';
+export * from './types/interfaces';
+export type { ICellCustomRender, ICellRenderContext } from './types/interfaces/i-cell-custom-render';
+export type { IDataValidationRule, IDataValidationRuleBase, IDataValidationRuleInfo, IDataValidationRuleOptions, ISheetDataValidationRule } from './types/interfaces/i-data-validation';
+export { Univer } from './univer';

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

@@ -1,11 +1,11 @@
 import { Observable } from 'rxjs';
-import { IDisposable, Injector } from '../../common/di';
+import { Injector, IDisposable } from '../../common/di';
+import { UniverInstanceType, UnitModel, UnitType } from '../../common/unit';
 import { DocumentDataModel } from '../../docs/data-model/document-data-model';
-import { Nullable } from '../../shared';
 import { Disposable } from '../../shared/lifecycle';
 import { Workbook } from '../../sheets/workbook';
 import { IContextService } from '../context/context.service';
-import { UnitModel, UnitType, UniverInstanceType } from '../../common/unit';
+import { Nullable } from '../../shared';
 export type UnitCtor = new (...args: any[]) => UnitModel;
 export interface ICreateUnitOptions {
     /**

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

@@ -13,32 +13,32 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export { checkIfMove, MOVE_BUFFER_VALUE, ROTATE_BUFFER_VALUE } from './check-if-move';
+export { afterInitApply } from './after-init-apply';
 export * from './array-search';
 export * from './blob';
+export { checkIfMove, MOVE_BUFFER_VALUE, ROTATE_BUFFER_VALUE } from './check-if-move';
+export * from './clipboard';
 export * from './color/color';
-export { ColorKit, COLORS, RGB_PAREN, RGBA_PAREN, type IRgbColor } from './color/color-kit';
+export { ColorKit, COLORS, type IRgbColor, RGB_PAREN, RGBA_PAREN } from './color/color-kit';
 export * from './command-enum';
 export * from './common';
 export * from './compare';
+export * from './debounce';
 export * from './doc-tool';
 export * from './generate';
 export * from './hash-algorithm';
 export * from './lifecycle';
 export * from './locale';
-export * from './lru/index';
+export { LRUHelper, LRUMap } from './lru/lru-map';
+export { numfmt } from './numfmt';
 export * from './object-matrix';
+export { queryObjectMatrix } from './object-matrix-query';
+export { moveRangeByOffset } from './range';
 export * from './rectangle';
 export { RefAlias } from './ref-alias';
 export * from './row-col-iter';
 export * from './sequence';
-export * from './sort-rules';
 export * from './shape';
+export * from './sort-rules';
 export * from './tools';
 export * from './types';
-export * from './debounce';
-export * from './clipboard';
-export { numfmt } from './numfmt';
-export { queryObjectMatrix } from './object-matrix-query';
-export { moveRangeByOffset } from './range';
-export { afterInitApply } from './after-init-apply';

package/lib/types/shared/lru/{lru-helper.d.ts → __tests__/lru-map.spec.d.ts}

@@ -13,10 +13,4 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare class LRUHelper {
-    static hasLength(array: unknown[], size: number): boolean;
-    static getValueType(value: any): string;
-    static isObject<T = object>(value?: any): value is T;
-    static isIterable<T>(value?: any): value is Iterable<T>;
-    static isNumber(value?: any): value is number;
-}
+export {};

package/lib/types/shared/lru/lru-map.d.ts

@@ -62,4 +62,11 @@ export declare class LRUMap<K, V> {
     }>;
     toString(): string;
 }
+export declare class LRUHelper {
+    static hasLength(array: unknown[], size: number): boolean;
+    static getValueType(value: any): string;
+    static isObject<T = object>(value?: any): value is T;
+    static isIterable<T>(value?: any): value is Iterable<T>;
+    static isNumber(value?: any): value is number;
+}
 export {};

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

@@ -1,3 +1,4 @@
-import { IRange } from '../sheets/typedef';
 import { ObjectMatrix } from './object-matrix';
+import { IRange } from '../sheets/typedef';
 export declare function queryObjectMatrix<T>(matrix: ObjectMatrix<T>, match: (value: T) => boolean): IRange[];
+export declare function multiSubtractMultiRanges(ranges1: IRange[], ranges2: IRange[]): IRange[];

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

@@ -1,2 +1,27 @@
 import { IRange } from '../sheets/typedef';
 export declare function moveRangeByOffset(range: IRange, refOffsetX: number, refOffsetY: number, ignoreAbsolute?: boolean): IRange;
+/**
+ * Split ranges into aligned smaller ranges
+ * @param ranges no overlap ranges
+ * @returns aligned smaller ranges
+ */
+export declare function splitIntoGrid(ranges: IRange[]): IRange[];
+/**
+ * Horizontal Merging
+ * @param ranges no overlap ranges
+ * @returns merged ranges
+ */
+export declare function mergeHorizontalRanges(ranges: IRange[]): IRange[];
+/**
+ * Vertical Merging
+ * @param ranges no overlap ranges
+ * @returns merged ranges
+ */
+export declare function mergeVerticalRanges(ranges: IRange[]): IRange[];
+/**
+ * Merge no overlap ranges
+ * @param ranges no overlap ranges
+ * @returns ranges
+ */
+export declare function mergeRanges(ranges: IRange[]): IRange[];
+export declare function multiSubtractSingleRange(ranges: IRange[], toDelete: IRange): IRange[];

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

@@ -18,6 +18,13 @@ export declare class Rectangle {
     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[];
+    /**
+     * Combine smaller rectangles into larger ones
+     * @param ranges
+     * @returns
+     */
+    static mergeRanges(ranges: IRange[]): IRange[];
+    static subtractMulti(ranges1: IRange[], ranges2: IRange[]): IRange[];
     static hasIntersectionBetweenTwoRect(rect1: IRectLTRB, rect2: IRectLTRB): boolean;
     static getIntersectionBetweenTwoRect(rect1: IRectLTRB, rect2: IRectLTRB): Required<IRectLTRB> | null;
 }

package/lib/types/shared/timer.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 awaitTime(ms: number): Promise<void>;

package/lib/types/sheets/__tests__/span-mode.spec.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 {};

package/lib/types/sheets/span-model.d.ts

@@ -0,0 +1,55 @@
+import { Disposable } from '../shared/lifecycle';
+import { IRange } from './typedef';
+export declare class SpanModel extends Disposable {
+    /**
+     * @property Cache for RANGE_TYPE.NORMAL
+     */
+    private _cellCache;
+    /**
+     * @property Cache for RANGE_TYPE.ROW
+     */
+    private _rowCache;
+    /**
+     * @property Cache for RANGE_TYPE.COLUMN
+     */
+    private _columnCache;
+    /**
+     * @property Whether has RANGE_TYPE.ALL
+     */
+    private _hasAll;
+    /**
+     * @property Index for RANGE_TYPE.ALL
+     */
+    private _allIndex;
+    /**
+     * @property the original merge data
+     */
+    private _mergeData;
+    private _rangeMap;
+    private _skeletonCache;
+    constructor(mergeData: IRange[]);
+    private _init;
+    private _clearCache;
+    private _createCache;
+    /**
+     * Rebuild the merge data cache when the merge data is changed.
+     * @param {IRange[]} mergeData
+     */
+    rebuild(mergeData: IRange[]): void;
+    private _createRowCache;
+    private _createColumnCache;
+    private _createCellAllCache;
+    private _createCellCache;
+    add(range: IRange): void;
+    remove(row: number, column: number): void;
+    getMergedCell(row: number, column: number): IRange | null;
+    isRowContainsMergedCell(row: number): boolean;
+    isColumnContainsMergedCell(column: number): boolean;
+    getMergedCellRange(startRow: number, startColumn: number, endRow: number, endColumn: number): IRange[];
+    getMergedCellRangeForSkeleton(startRow: number, startColumn: number, endRow: number, endColumn: number): IRange[];
+    private _getRangeFromCache;
+    private _getSkeletonRangeFromCache;
+    private _getMergeDataIndex;
+    getMergeDataSnapshot(): IRange[];
+    dispose(): void;
+}

package/lib/types/sheets/typedef.d.ts

@@ -466,6 +466,7 @@ export interface ITextRangeParam extends ITextRange {
 }
 /**
  * Determines whether the cell(row, column) is within the range of the merged cells.
+ * @deprecated please use worksheet.getCellInfoInMergeData instead
  */
 export declare function getCellInfoInMergeData(row: number, column: number, mergeData?: IRange[]): ISelectionCell;
 export {};

package/lib/types/sheets/workbook.d.ts

@@ -1,9 +1,9 @@
 import { Observable } from 'rxjs';
-import { ILogService } from '../services/log/log.service';
-import { Nullable } from '../shared';
 import { UnitModel, UniverInstanceType } from '../common/unit';
+import { ILogService } from '../services/log/log.service';
 import { Styles } from './styles';
 import { Worksheet } from './worksheet';
+import { Nullable } from '../shared';
 import { IRangeType, IWorkbookData, IWorksheetData } from './typedef';
 export declare function getWorksheetUID(workbook: Workbook, worksheet: Worksheet): string;
 /**
@@ -61,6 +61,7 @@ export declare class Workbook extends UnitModel<IWorkbookData, UniverInstanceTyp
     getUnitId(): string;
     getRev(): number;
     incrementRev(): void;
+    setRev(rev: number): void;
     /**
      * Add a Worksheet into Workbook.
      */

package/lib/types/sheets/worksheet.d.ts

@@ -3,9 +3,10 @@ import { BooleanNumber } from '../types/enum';
 import { ColumnManager } from './column-manager';
 import { Range } from './range';
 import { RowManager } from './row-manager';
+import { SpanModel } from './span-model';
 import { SheetViewModel } from './view-model';
 import { Styles } from './styles';
-import { ICellData, ICellDataForSheetInterceptor, IFreeze, IRange, IWorksheetData } from './typedef';
+import { ICellData, ICellDataForSheetInterceptor, IFreeze, IRange, ISelectionCell, IWorksheetData } from './typedef';
 /**
  * The model of a Worksheet.
  */
@@ -18,6 +19,7 @@ export declare class Worksheet {
     protected _rowManager: RowManager;
     protected _columnManager: ColumnManager;
     protected readonly _viewModel: SheetViewModel;
+    protected _spanModel: SpanModel;
     constructor(unitId: string, snapshot: Partial<IWorksheetData>, _styles: Styles);
     /**
      * @internal
@@ -25,6 +27,12 @@ export declare class Worksheet {
      */
     __interceptViewModel(callback: (viewModel: SheetViewModel) => void): void;
     getSnapshot(): IWorksheetData;
+    /**
+     * Set the merge data of the sheet, all the merged cells will be rebuilt.
+     * @param mergeData
+     */
+    setMergeData(mergeData: IRange[]): void;
+    getSpanModel(): SpanModel;
     /**
      * Returns WorkSheet Cell Data Matrix
      * @returns
@@ -70,8 +78,55 @@ export declare class Worksheet {
      * @deprecated
      */
     clone(): Worksheet;
+    /**
+     * Get the merged cell list of the sheet.
+     * @returns {IRange[]} merged cell list
+     */
     getMergeData(): IRange[];
+    /**
+     * Get the merged cell Range of the sheet cell.
+     * @param {number} row The row index of test cell
+     * @param {number} col The column index of test cell
+     * @returns {Nullable<IRange>} The merged cell range of the cell, if the cell is not in a merged cell, return null
+     */
     getMergedCell(row: number, col: number): Nullable<IRange>;
+    /**
+     *  Get the merged cell info list which has intersection with the given range.
+     * @param {number} startRow The start row index of the range
+     * @param {number} startColumn The start column index of the range
+     * @param {number} endRow The end row index of the range
+     * @param {number} endColumn The end column index of the range
+     * @returns {IRange} The merged cell info list which has intersection with the given range or empty array if no merged cell in the range
+     */
+    getMergedCellRange(startRow: number, startColumn: number, endRow: number, endColumn: number): IRange[];
+    /**
+     * Get if the row contains merged cell
+     * @param {number} row The row index
+     * @returns {boolean} Is merge cell across row
+     */
+    isRowContainsMergedCell(row: number): boolean;
+    /**
+     * Get if the column contains merged cell
+     * @param {number} column The column index
+     * @returns {boolean} Is merge cell across column
+     */
+    isColumnContainsMergedCell(column: number): boolean;
+    /**
+     * Get cell info with merge data
+     * @param {number} row - The row index of the cell.
+     * @param {number} column - The column index of the cell.
+     * @type {selectionCell}
+     * @property {number} actualRow - The actual row index of the cell
+     * @property {number} actualColumn - The actual column index of the cell
+     * @property {boolean} isMergedMainCell - Whether the cell is the main cell of the merged cell, only the upper left cell in the merged cell returns true here
+     * @property {boolean} isMerged - Whether the cell is in a merged cell, the upper left cell in the merged cell returns false here
+     * @property {number} endRow - The end row index of the merged cell
+     * @property {number} endColumn - The end column index of the merged cell
+     * @property {number} startRow - The start row index of the merged cell
+     * @property {number} startColumn - The start column index of the merged cell
+     * @returns  {selectionCell} - The cell info with merge data
+     */
+    getCellInfoInMergeData(row: number, column: number): ISelectionCell;
     /**
      * Get cellData, includes cellData, customRender, markers, dataValidate, etc.
      *
@@ -242,3 +297,4 @@ export interface ICell {
  * @returns pure text in this cell
  */
 export declare function extractPureTextFromCell(cell: Nullable<ICellData>): string;
+export declare function getOriginCellValue(cell: Nullable<ICellData>): Nullable<import('./typedef').CellValue>;

package/lib/types/slides/slide-model.d.ts

@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs';
 import { UnitModel, UniverInstanceType } from '../common/unit';
+import { PageType, ISlideData, ISlidePage } from '../types/interfaces';
 import { Nullable } from '../shared';
-import { ISlideData, ISlidePage, PageType } from '../types/interfaces';
 export declare class SlideDataModel extends UnitModel<ISlideData, UniverInstanceType.UNIVER_SLIDE> {
     type: UniverInstanceType.UNIVER_SLIDE;
     private readonly _activePage$;
@@ -13,6 +13,9 @@ export declare class SlideDataModel extends UnitModel<ISlideData, UniverInstance
     private _unitId;
     constructor(snapshot: Partial<ISlideData>);
     setName(name: string): void;
+    getRev(): number;
+    incrementRev(): void;
+    setRev(_rev: number): void;
     getSnapshot(): ISlideData;
     getUnitId(): string;
     getPages(): {