@univerjs/core 0.2.3 → 0.2.4-alpha.0

package/lib/types/common/__tests__/url.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/common/di.d.ts

@@ -0,0 +1,17 @@
+/**
+ * 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 * from '@wendellhu/redi';
+export * from '@wendellhu/redi/react-bindings';

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

@@ -14,3 +14,4 @@
  * limitations under the License.
  */
 export declare function isLegalUrl(url: string): boolean;
+export declare function normalizeUrl(urlStr: string): string;

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

@@ -2,6 +2,7 @@ import { Nullable } from '../../shared';
 import { IDocumentBody, IDocumentData, IDocumentRenderConfig, IDocumentStyle, IDrawings } 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: {
@@ -53,7 +54,7 @@ export declare class DocumentDataModel extends DocumentDataModelSimple {
     getSelfOrHeaderFooterModel(segmentId?: string): DocumentDataModel;
     getUnitId(): string;
     apply(actions: JSONXActions): IDocumentData | undefined;
-    sliceBody(startOffset: number, endOffset: number): Nullable<IDocumentBody>;
+    sliceBody(startOffset: number, endOffset: number, type?: SliceBodyType): Nullable<IDocumentBody>;
     private _initializeHeaderFooterModel;
     updateDocumentId(unitId: string): void;
 }

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

@@ -1,36 +1,10 @@
-import { BulletAlignment, GlyphType } from '../../types/interfaces/i-document-data';
+import { IListData } 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;
-        }[];
-    };
+    BULLET_LIST: IListData;
+    ORDER_LIST: IListData;
 };

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

@@ -2,7 +2,11 @@ import { UpdateDocsAttributeType } from '../../../shared/command-enum';
 import { ICustomDecoration, IDocumentBody } from '../../../types/interfaces/i-document-data';
 import { IRetainAction } from './action-types';
 
-export declare function getBodySlice(body: IDocumentBody, startOffset: number, endOffset: number, returnEmptyTextRun?: boolean): IDocumentBody;
+export declare enum SliceBodyType {
+    copy = 0,
+    cut = 1
+}
+export declare function getBodySlice(body: IDocumentBody, startOffset: number, endOffset: number, returnEmptyTextRun?: boolean, type?: SliceBodyType): IDocumentBody;
 export declare function normalizeBody(body: IDocumentBody): IDocumentBody;
 export declare function getCustomRangeSlice(body: IDocumentBody, startOffset: number, endOffset: number): {
     customRanges: {
@@ -10,6 +14,7 @@ export declare function getCustomRangeSlice(body: IDocumentBody, startOffset: nu
         endIndex: number;
         rangeId: string;
         rangeType: import('../../../types/interfaces/i-document-data').CustomRangeType;
+        wholeEntity?: boolean;
     }[];
     leftOffset: number;
     rightOffset: number;

package/lib/types/index.d.ts

@@ -31,7 +31,7 @@ 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 { ActionIterator } from './docs/data-model/text-x/action-iterator';
-export { getBodySlice, composeBody } from './docs/data-model/text-x/utils';
+export { getBodySlice, composeBody, SliceBodyType } from './docs/data-model/text-x/utils';
 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';
@@ -110,3 +110,4 @@ export { normalizeBody, getCustomRangeSlice, getCustomDecorationSlice } from './
 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 * from './common/di';

package/lib/types/services/__tests__/index.d.ts

@@ -1,15 +1,15 @@
 import { ICommandService, Univer } from '@univerjs/core';
-import { Dependency } from '@wendellhu/redi';
+import { Dependency } from '../../common/di';
 
 export declare const createTestBed: (dependencies?: Dependency[]) => {
     univer: Univer;
     get: {
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.MANY, lookUp?: import('@wendellhu/redi').LookUp): T[];
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.OPTIONAL, lookUp?: import('@wendellhu/redi').LookUp): T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity: import("@wendellhu/redi").Quantity.REQUIRED, lookUp?: import('@wendellhu/redi').LookUp): T;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantity?: import('@wendellhu/redi').Quantity, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
-        <T>(id: import('@wendellhu/redi').DependencyIdentifier<T>, quantityOrLookup?: import('@wendellhu/redi').Quantity | import('@wendellhu/redi').LookUp, lookUp?: import('@wendellhu/redi').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.MANY, lookUp?: import('@univerjs/core').LookUp): T[];
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.OPTIONAL, lookUp?: import('@univerjs/core').LookUp): T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity: import("@univerjs/core").Quantity.REQUIRED, lookUp?: import('@univerjs/core').LookUp): T;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantity?: import('@univerjs/core').Quantity, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
+        <T>(id: import('@univerjs/core').DependencyIdentifier<T>, quantityOrLookup?: import('@univerjs/core').Quantity | import('@univerjs/core').LookUp, lookUp?: import('@univerjs/core').LookUp): T[] | T | null;
     };
     workbook: import('@univerjs/core').Workbook;
     unitId: string;

package/lib/types/services/authz-io/authz-io-local.service.d.ts

@@ -11,6 +11,7 @@ export declare class AuthzIoLocalService implements IAuthzIoService {
     private _userManagerService;
     private _permissionMap;
     constructor(_resourceManagerService: IResourceManagerService, _userManagerService: UserManagerService);
+    private _initDefaultUser;
     private _getRole;
     private _initSnapshot;
     create(config: ICreateRequest): Promise<string>;

package/lib/types/services/authz-io/type.d.ts

@@ -17,4 +17,4 @@ export interface IAuthzIoService {
     createCollaborator(config: ICreateCollaboratorRequest, context?: ILogContext): Promise<void>;
     putCollaborators(config: IPutCollaboratorsRequest, context?: ILogContext): Promise<void>;
 }
-export declare const IAuthzIoService: import('@wendellhu/redi').IdentifierDecorator<IAuthzIoService>;
+export declare const IAuthzIoService: import('@univerjs/core').IdentifierDecorator<IAuthzIoService>;

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

@@ -1,4 +1,4 @@
-import { IAccessor, IDisposable, Injector } from '@wendellhu/redi';
+import { IAccessor, IDisposable, Injector } from '../../common/di';
 import { Disposable } from '../../shared/lifecycle';
 import { IContextService } from '../context/context.service';
 import { ILogService } from '../log/log.service';
@@ -111,7 +111,7 @@ export interface ICommandService {
      */
     beforeCommandExecuted(listener: CommandListener): IDisposable;
 }
-export declare const ICommandService: import('@wendellhu/redi').IdentifierDecorator<ICommandService>;
+export declare const ICommandService: import('../../common/di').IdentifierDecorator<ICommandService>;
 /**
  * The registry of commands.
  */

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

@@ -3,7 +3,7 @@ import { Nullable } from '../../shared/types';
 /**
  * IConfig provides universal configuration for the whole application.
  */
-export declare const IConfigService: import('@wendellhu/redi').IdentifierDecorator<IConfigService>;
+export declare const IConfigService: import('../../common/di').IdentifierDecorator<IConfigService>;
 export interface IConfigService {
     getConfig<T>(id: string, defaultValue: T): T;
     getConfig<T>(id: string): Nullable<T>;

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

@@ -9,7 +9,7 @@ export interface IContextService {
     setContextValue(key: string, value: boolean): void;
     subscribeContextValue$(key: string): Observable<boolean>;
 }
-export declare const IContextService: import('@wendellhu/redi').IdentifierDecorator<IContextService>;
+export declare const IContextService: import('../../common/di').IdentifierDecorator<IContextService>;
 export declare class ContextService extends Disposable implements IContextService {
     private _contextChanged$;
     readonly contextChanged$: Observable<{

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

@@ -1,5 +1,5 @@
-import { IDisposable, Injector } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
+import { IDisposable, Injector } from '../../common/di';
 import { DocumentDataModel } from '../../docs/data-model/document-data-model';
 import { Nullable } from '../../shared';
 import { Disposable } from '../../shared/lifecycle';
@@ -47,7 +47,7 @@ export interface IUniverInstanceService {
     /** @deprecated */
     getCurrentUniverDocInstance(): Nullable<DocumentDataModel>;
 }
-export declare const IUniverInstanceService: import('@wendellhu/redi').IdentifierDecorator<IUniverInstanceService>;
+export declare const IUniverInstanceService: import('../../common/di').IdentifierDecorator<IUniverInstanceService>;
 export declare class UniverInstanceService extends Disposable implements IUniverInstanceService {
     private readonly _injector;
     private readonly _contextService;

package/lib/types/services/lifecycle/lifecycle.d.ts

@@ -1,4 +1,4 @@
-import { Ctor, DependencyIdentifier } from '@wendellhu/redi';
+import { Ctor, DependencyIdentifier } from '../../common/di';
 
 /**
  * This enum defines multiple lifecycle stages in Univer SDK.

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

@@ -1,5 +1,5 @@
-import { Injector } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
+import { Injector } from '../../common/di';
 import { Disposable } from '../../shared/lifecycle';
 import { ILogService } from '../log/log.service';
 import { LifecycleStages } from './lifecycle';

package/lib/types/services/local-storage/local-storage.service.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export declare const ILocalStorageService: import('@wendellhu/redi').IdentifierDecorator<ILocalStorageService>;
+export declare const ILocalStorageService: import('../../common/di').IdentifierDecorator<ILocalStorageService>;
 export type LocalStorageValueTypes = string;
 export interface ILocalStorageService {
     getItem<T>(key: string): Promise<T | null>;

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

@@ -15,7 +15,7 @@ export interface ILogService {
     error(...args: ArgsType): void;
     setLogLevel(enabled: LogLevel): void;
 }
-export declare const ILogService: import('@wendellhu/redi').IdentifierDecorator<ILogService>;
+export declare const ILogService: import('../../common/di').IdentifierDecorator<ILogService>;
 export declare class DesktopLogService extends Disposable implements ILogService {
     private _logLevel;
     debug(...args: ArgsType): void;

package/lib/types/services/permission/type.d.ts

@@ -40,4 +40,4 @@ export interface IPermissionService {
     composePermission(permissionId: string[]): IPermissionPoint<unknown>[];
     getAllPermissionPoint(): Map<string, Observable<IPermissionPoint<unknown>>>;
 }
-export declare const IPermissionService: import('@wendellhu/redi').IdentifierDecorator<IPermissionService>;
+export declare const IPermissionService: import('../../common/di').IdentifierDecorator<IPermissionService>;

package/lib/types/services/plugin/plugin-override.d.ts

@@ -1,4 +1,4 @@
-import { Dependency, DependencyIdentifier, DependencyItem } from '@wendellhu/redi';
+import { Dependency, DependencyIdentifier, DependencyItem } from '../../common/di';
 
 export type NullableDependencyPair<T> = [DependencyIdentifier<T>, DependencyItem<T> | null];
 /**

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

@@ -1,4 +1,4 @@
-import { Ctor, Injector } from '@wendellhu/redi';
+import { Ctor, Injector } from '../../common/di';
 import { Disposable } from '../../shared';
 import { UniverInstanceType } from '../../common/unit';
 

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

@@ -1,4 +1,4 @@
-import { IDisposable, Injector } from '@wendellhu/redi';
+import { IDisposable, Injector } from '../../common/di';
 import { Disposable } from '../../shared/lifecycle';
 import { UniverInstanceType } from '../../common/unit';
 import { LifecycleInitializerService, LifecycleService } from '../lifecycle/lifecycle.service';

package/lib/types/services/resource-loader/type.d.ts

@@ -7,4 +7,4 @@ export interface IResourceLoaderService {
     saveWorkbook: (workbook: Workbook) => IWorkbookData;
     saveDoc: (doc: DocumentDataModel) => IDocumentData;
 }
-export declare const IResourceLoaderService: import('@wendellhu/redi').IdentifierDecorator<IResourceLoaderService>;
+export declare const IResourceLoaderService: import('../../common/di').IdentifierDecorator<IResourceLoaderService>;

package/lib/types/services/resource-manager/type.d.ts

@@ -1,6 +1,6 @@
-import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
 import { UniverInstanceType } from '@univerjs/core';
+import { IDisposable } from '../../common/di';
 import { IWorkbookData } from '../../types/interfaces/i-workbook-data';
 
 type IBusinessName = 'SHEET' | 'DOC';
@@ -23,5 +23,5 @@ export interface IResourceManagerService {
     loadResources: (unitId: string, resources: IWorkbookData['resources']) => void;
     unloadResources(unitId: string): void;
 }
-export declare const IResourceManagerService: import('@wendellhu/redi').IdentifierDecorator<IResourceManagerService>;
+export declare const IResourceManagerService: import('@univerjs/core').IdentifierDecorator<IResourceManagerService>;
 export {};

package/lib/types/services/snapshot/snapshot-server.service.d.ts

@@ -6,7 +6,7 @@ import { ILogContext } from '../log/context';
  * or load snapshots. This service should be implemented by the host environment.
  * And it shouldn't contain any business logic.
  */
-export declare const ISnapshotServerService: import('@wendellhu/redi').IdentifierDecorator<ISnapshotServerService>;
+export declare const ISnapshotServerService: import('../../common/di').IdentifierDecorator<ISnapshotServerService>;
 export interface ISnapshotServerService {
     /** Load snapshot from a database. */
     getUnitOnRev: (context: ILogContext, params: IGetUnitOnRevRequest) => Promise<IGetUnitOnRevResponse>;

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

@@ -1,5 +1,5 @@
-import { IAccessor, IDisposable } from '@wendellhu/redi';
 import { Observable, BehaviorSubject } from 'rxjs';
+import { IAccessor, IDisposable } from '../../common/di';
 import { Disposable } from '../../shared/lifecycle';
 import { IMutationInfo, CommandType, ICommandService } from '../command/command.service';
 import { IContextService } from '../context/context.service';
@@ -44,7 +44,7 @@ export interface IUndoRedoCommandInfos {
     undos: IMutationInfo[];
     redos: IMutationInfo[];
 }
-export declare const IUndoRedoService: import('@wendellhu/redi').IdentifierDecorator<IUndoRedoService>;
+export declare const IUndoRedoService: import('../../common/di').IdentifierDecorator<IUndoRedoService>;
 export interface IUndoRedoStatus {
     undos: number;
     redos: number;

package/lib/types/services/user-manager/user-manager.service.d.ts

@@ -39,4 +39,5 @@ export declare class UserManagerService {
     getUser<T extends IUser>(userId: string, callBack?: () => void): T | undefined;
     delete(userId: string): void;
     clear(): void;
+    list(): IUser[];
 }

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

@@ -1,5 +1,5 @@
-import { IDisposable } from '@wendellhu/redi';
 import { Subscription, SubscriptionLike, Subject } from 'rxjs';
+import { IDisposable } from '../common/di';
 
 type DisposableLike = IDisposable | SubscriptionLike | (() => void);
 export declare function toDisposable(disposable: IDisposable): IDisposable;
@@ -26,4 +26,11 @@ export declare class RxDisposable extends Disposable implements IDisposable {
     protected dispose$: Subject<void>;
     dispose(): void;
 }
+export declare class RCDisposable extends Disposable {
+    private readonly _rootDisposable;
+    private _ref;
+    constructor(_rootDisposable: IDisposable);
+    inc(): void;
+    dec(): void;
+}
 export {};

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

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable } from '../../common/di';
 
 declare const NEWER: unique symbol;
 declare const OLDER: unique symbol;

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

@@ -1,5 +1,5 @@
-import { IDisposable } from '@wendellhu/redi';
 import { Observable } from 'rxjs';
+import { IDisposable } from '../common/di';
 
 type CallbackFn<T extends readonly unknown[]> = (cb: (...args: T) => void) => IDisposable;
 /**

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

@@ -9,6 +9,11 @@ export declare class Tools {
     static deleteBlank(value?: string): string | undefined;
     static getSystemType(): string;
     static getBrowserType(): string;
+    /**
+     * Use this method without `Tools`.
+     *
+     * @deprecated
+     */
     static generateRandomId(n?: number, alphabet?: string): string;
     static getClassName(instance: object): string;
     static deepMerge(target: any, ...sources: any[]): any;
@@ -37,6 +42,7 @@ export declare class Tools {
     static isAndroid(): boolean;
     static isIPhone(): boolean;
     static isLegalUrl(url: string): boolean;
+    static normalizeUrl(url: string): string;
     static itCount(count: number): Function;
     static hasLength(target: IArguments | any[] | string, length?: number): boolean;
     static capitalize(str: string): string;
@@ -108,3 +114,4 @@ export declare class Tools {
     static set(data: Record<string, any>, propertyPath: string, value: any): void;
     static clamp(value: number, min: number, max: number): number;
 }
+export declare function generateRandomId(n?: number, alphabet?: string): string;

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

@@ -1,4 +1,4 @@
-import { IDisposable } from '@wendellhu/redi';
+import { IDisposable } from '../common/di';
 import { Nullable } from '../common/type-util';
 import { Disposable } from '../shared/lifecycle';
 import { ICellData, ICellDataForSheetInterceptor } from '../types/interfaces/i-cell-data';

package/lib/types/types/interfaces/i-document-data-interceptor.d.ts

@@ -0,0 +1,10 @@
+import { ICustomDecoration, ICustomRange } from './i-document-data';
+
+export interface ICustomRangeForInterceptor extends ICustomRange {
+    active?: boolean;
+    show?: boolean;
+}
+export interface ICustomDecorationForInterceptor extends ICustomDecoration {
+    active?: boolean;
+    show?: boolean;
+}

package/lib/types/types/interfaces/i-document-data.d.ts

@@ -99,6 +99,11 @@ export interface IDocumentBody {
     tables?: ITable[];
     customRanges?: ICustomRange[];
     customDecorations?: ICustomDecoration[];
+    /**
+     * for copy/paste, data of custom-range and other module
+     * it won't save to disk
+     */
+    payloads?: Record<string, string>;
 }
 export interface IDocStyle {
     name: string;
@@ -202,15 +207,14 @@ export interface ICustomRange {
     endIndex: number;
     rangeId: string;
     rangeType: CustomRangeType;
+    /**
+     * display as a whole-entity
+     */
+    wholeEntity?: boolean;
 }
-export interface ICustomRangeForInterceptor extends ICustomRange {
-    active?: boolean;
-    show?: boolean;
-}
-export interface ICustomDecorationForInterceptor extends ICustomDecoration {
-    active?: boolean;
-    show?: boolean;
-}
+/**
+ * @deprecated
+ */
 export declare enum CustomRangeType {
     HYPERLINK = 0,
     FIELD = 1,// 17.16 Fields and Hyperlinks
@@ -218,7 +222,8 @@ export declare enum CustomRangeType {
     BOOKMARK = 3,
     COMMENT = 4,
     CUSTOM = 5,
-    MENTION = 6
+    MENTION = 6,
+    UNI_FORMULA = 7
 }
 /**
  * Custom Block
@@ -271,9 +276,6 @@ export interface IDocStyleBase extends IMargin {
     renderConfig?: IDocumentRenderConfig;
 }
 export interface IDocumentLayout {
-    charSpace?: number;
-    linePitch?: number;
-    gridType?: GridType;
     defaultTabStop?: number;
     characterSpacingControl?: characterSpacingControlType;
     paragraphLineGapDefault?: number;
@@ -317,6 +319,9 @@ export interface IDocumentRenderConfig {
     isRenderStyle?: BooleanNumber;
 }
 export interface ISectionBreakBase {
+    charSpace?: number;
+    linePitch?: number;
+    gridType?: GridType;
     columnProperties?: ISectionColumnProperties[];
     columnSeparatorType?: ColumnSeparatorType;
     contentDirection?: TextDirection;
@@ -458,9 +463,9 @@ export interface ITextStyle extends IStyleBase {
     sa?: number;
 }
 export interface IIndentStart {
-    indentFirstLine?: INumberUnit | number;
-    hanging?: INumberUnit | number;
-    indentStart?: INumberUnit | number;
+    indentFirstLine?: INumberUnit;
+    hanging?: INumberUnit;
+    indentStart?: INumberUnit;
     tabStops?: ITabStop[];
 }
 /**
@@ -474,14 +479,14 @@ export interface IParagraphStyle extends IIndentStart {
     direction?: TextDirection;
     spacingRule?: SpacingRule;
     snapToGrid?: BooleanNumber;
-    spaceAbove?: INumberUnit | number;
-    spaceBelow?: INumberUnit | number;
+    spaceAbove?: INumberUnit;
+    spaceBelow?: INumberUnit;
     borderBetween?: IParagraphBorder;
     borderTop?: IParagraphBorder;
     borderBottom?: IParagraphBorder;
     borderLeft?: IParagraphBorder;
     borderRight?: IParagraphBorder;
-    indentEnd?: INumberUnit | number;
+    indentEnd?: INumberUnit;
     keepLines?: BooleanNumber;
     keepNext?: BooleanNumber;
     wordWrap?: BooleanNumber;
@@ -639,7 +644,7 @@ export declare enum FontStyleType {
 }
 export interface INumberUnit {
     v: number;
-    u: NumberUnitType;
+    u?: NumberUnitType;
 }
 export interface IObjectPositionH {
     relativeFrom: ObjectRelativeFromH;
@@ -676,14 +681,17 @@ export declare enum ObjectRelativeFromV {
 export declare enum NumberUnitType {
     POINT = 0,
     LINE = 1,
-    CHARACTER = 2
+    CHARACTER = 2,
+    PIXEL = 3
 }
 export declare enum AlignTypeH {
     CENTER = 0,
     INSIDE = 1,
     LEFT = 2,
     OUTSIDE = 3,
-    RIGHT = 4
+    RIGHT = 4,
+    BOTH = 5,
+    DISTRIBUTE = 6
 }
 export declare enum AlignTypeV {
     BOTTOM = 0,

package/lib/types/types/interfaces/i-range.d.ts

@@ -31,7 +31,19 @@ export declare enum AbsoluteRefType {
     COLUMN = 2,
     ALL = 3
 }
-export interface IRowRange {
+interface IRangeLocation {
+    /**
+     * Id of the Workbook the range belongs to.
+     * When this field is not defined, it should be considered as the range in the currently activated worksheet.
+     */
+    unitId?: string;
+    /**
+     * Id of the Worksheet the range belongs to.
+     * When this field is not defined, it should be considered as the range in the currently activated worksheet.
+     */
+    sheetId?: string;
+}
+export interface IRowRange extends IRangeLocation {
     /**
      * The start row (inclusive) of the range
      * startRow
@@ -43,7 +55,7 @@ export interface IRowRange {
      */
     endRow: number;
 }
-export interface IColumnRange {
+export interface IColumnRange extends IRangeLocation {
     /**
      * The start column (inclusive) of the range
      * startColumn
@@ -193,3 +205,4 @@ export interface IRectLTRB {
     width?: number;
     height?: number;
 }
+export {};

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

@@ -16,6 +16,7 @@
 export * from './i-cell-data';
 export * from './i-column-data';
 export * from './i-document-data';
+export * from './i-document-data-interceptor';
 export * from './i-freeze';
 export * from './i-image-properties';
 export * from './i-placeholder';

package/lib/types/univer.d.ts

@@ -1,4 +1,4 @@
-import { Injector } from '@wendellhu/redi';
+import { Injector } from './common/di';
 import { DocumentDataModel } from './docs/data-model/document-data-model';
 import { Workbook } from './sheets/workbook';
 import { SlideDataModel } from './slides/slide-model';