@univerjs/core 0.2.4 → 0.2.6

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

@@ -15,6 +15,7 @@
  */
 export declare const DOCS_NORMAL_EDITOR_UNIT_ID_KEY = "__INTERNAL_EDITOR__DOCS_NORMAL";
 export declare const DOCS_FORMULA_BAR_EDITOR_UNIT_ID_KEY = "__INTERNAL_EDITOR__DOCS_FORMULA_BAR";
+export declare const DOCS_ZEN_EDITOR_UNIT_ID_KEY = "__defaultDocumentZenEditorSpecialUnitId_20231218__";
 export declare const DEFAULT_EMPTY_DOCUMENT_VALUE = "\r\n";
 export declare function createInternalEditorID(id: string): string;
 export declare function isInternalEditorID(id: string): boolean;

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/json.d.ts

@@ -0,0 +1,18 @@
+/**
+ * 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 type Serializable = {
+    [property: string]: Serializable;
+} | readonly Serializable[] | string | number | boolean | null;

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

@@ -41,7 +41,10 @@ export declare class DocumentDataModel extends DocumentDataModelSimple {
     private _unitId;
     headerModelMap: Map<string, DocumentDataModel>;
     footerModelMap: Map<string, DocumentDataModel>;
+    private _name$;
+    readonly name$: import('rxjs').Observable<string>;
     constructor(snapshot: Partial<IDocumentData>);
+    setName(name: string): void;
     dispose(): void;
     getDrawings(): IDrawings | undefined;
     getDrawingsOrder(): string[] | undefined;

package/lib/types/index.d.ts

@@ -13,6 +13,7 @@
  * 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';
@@ -22,7 +23,7 @@ export { isNumeric, isSafeNumeric } from './common/number';
 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, createInternalEditorID, isInternalEditorID, } from './common/const';
+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 { throttle } from './common/function';
 export { MemoryCursor } from './common/memory-cursor';
 export { requestImmediateMacroTask } from './common/request-immediate-macro-task';
@@ -37,7 +38,7 @@ 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 } from './observer/observable';
+export { type IEventObserver, EventState, EventSubject, fromEventSubject } from './observer/observable';
 export { Plugin } from './services/plugin/plugin';
 export { PluginService, DependentOn } from './services/plugin/plugin.service';
 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';
@@ -110,3 +111,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/observer/observable.d.ts

@@ -1,4 +1,4 @@
-import { Observer as RxObserver, Subscription, Subject } from 'rxjs';
+import { Observer as RxObserver, Subscription, Observable, Subject } from 'rxjs';
 
 /**
  * A class serves as a medium between the observable and its observers
@@ -44,4 +44,5 @@ export declare class EventSubject<T> extends Subject<[T, EventState]> {
     clearObservers(): void;
     emitEvent(event: T): INotifyObserversReturn;
 }
+export declare function fromEventSubject<T>(subject$: EventSubject<T>): Observable<T>;
 export {};

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/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';
 
@@ -15,7 +15,7 @@ export declare abstract class Plugin extends Disposable {
     static pluginName: string;
     static type: UniverInstanceType;
     protected abstract _injector: Injector;
-    onStarting(injector: Injector): void;
+    onStarting(_injector?: Injector): void;
     onReady(): void;
     onRendered(): void;
     onSteady(): void;

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';
@@ -49,6 +49,7 @@ export declare class PluginHolder extends Disposable {
     protected readonly _lifecycleInitializerService: LifecycleInitializerService;
     protected _started: boolean;
     get started(): boolean;
+    private _warnedAboutOnStartingDeprecation;
     /** Plugin constructors waiting to be initialized. */
     protected readonly _pluginRegistry: PluginRegistry;
     /** Stores initialized plugin instances. */

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/snapshot/snapshot-utils.d.ts

@@ -13,8 +13,8 @@ export declare const textDecoder: TextDecoder;
 export declare function encodeWorksheetOtherMetas(worksheet: Partial<IWorksheetData>): Uint8Array;
 export declare function encodeWorkbookOtherMetas(workbook: IWorkbookData): Uint8Array;
 export declare function encodeDocOriginalMeta(document: IDocumentData): Uint8Array;
-export declare function decodeWorksheetOtherMetas(buffer: Uint8Array): Partial<IWorksheetData>;
-export declare function decodeWorkbookOtherMetas(buffer: Uint8Array): Partial<IWorkbookData>;
+export declare function decodeWorksheetOtherMetas(buffer: Uint8Array | string): Partial<IWorksheetData>;
+export declare function decodeWorkbookOtherMetas(buffer: Uint8Array | string): Partial<IWorkbookData>;
 export declare function decodePartOfCellData(buffer: Uint8Array | string): IObjectMatrixPrimitiveType<ICellData>;
 export declare function decodeDocOriginalMeta(buffer: Uint8Array | string): Partial<IDocumentData>;
 export declare function splitCellDataToBlocks(cellData: IObjectMatrixPrimitiveType<ICellData>, maxColumn: number): ISheetBlock[];

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/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;

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/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/slides/slide-model.d.ts

@@ -1,8 +1,12 @@
 import { UnitModel, UniverInstanceType } from '../common/unit';
+import { Nullable } from '../shared';
 import { ISlideData, ISlidePage } from '../types/interfaces';
 
 export declare class SlideDataModel extends UnitModel<ISlideData, UniverInstanceType.UNIVER_SLIDE> {
     type: UniverInstanceType.UNIVER_SLIDE;
+    private readonly _activePage$;
+    private get _activePage();
+    readonly activePage$: import('rxjs').Observable<Nullable<ISlidePage>>;
     private _snapshot;
     private _unitId;
     constructor(snapshot: Partial<ISlideData>);
@@ -20,4 +24,7 @@ export declare class SlideDataModel extends UnitModel<ISlideData, UniverInstance
     getElement(pageId: string, elementId: string): import('../types/interfaces').IPageElement | undefined;
     getPageSize(): import('../shared').ISize;
     addPage(): ISlidePage;
+    setActivePage(page: Nullable<ISlidePage>): void;
+    getActivePage(): Nullable<ISlidePage>;
+    updatePage(pageId: string, page: ISlidePage): void;
 }

package/lib/types/types/enum/text-style.d.ts

@@ -49,7 +49,9 @@ export declare enum HorizontalAlign {
     LEFT = 1,//	The text is explicitly aligned to the left of the cell.
     CENTER = 2,//	The text is explicitly aligned to the center of the cell.
     RIGHT = 3,//	The text is explicitly aligned to the right of the cell.
-    JUSTIFIED = 4
+    JUSTIFIED = 4,//	The paragraph is justified.
+    BOTH = 5,//	The paragraph is justified.
+    DISTRIBUTED = 6
 }
 /**
  * An enum that specifies the vertical alignment of text.

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

@@ -143,12 +143,13 @@ export interface IListData {
 /**
  * Contains properties describing the look and feel of a list bullet at a given level of nesting.
  */
-export interface INestingLevel extends IIndentStart {
+export interface INestingLevel {
+    paragraphProperties?: IParagraphProperties;
     bulletAlignment: BulletAlignment;
     glyphFormat: string;
-    textStyle: ITextStyle;
+    textStyle?: ITextStyle;
     startNumber: number;
-    glyphType?: GlyphType | string;
+    glyphType?: GlyphType;
     glyphSymbol?: string;
 }
 /**
@@ -163,14 +164,71 @@ export declare enum FollowNumberWithType {
  * An enumeration of the supported glyph types.
  */
 export declare enum GlyphType {
-    GLYPH_TYPE_UNSPECIFIED = 0,// The glyph type is unspecified or unsupported.
+    BULLET = 0,// The glyph type is unspecified or unsupported.
     NONE = 1,// 	An empty string.
     DECIMAL = 2,// 	A number, like 1, 2, or 3.
-    ZERO_DECIMAL = 3,// 	A number where single digit numbers are prefixed with a zero, like 01, 02, or 03. Numbers with more than one digit are not prefixed with a zero.
-    UPPER_ALPHA = 4,// 	An uppercase letter, like A, B, or C.
-    ALPHA = 5,// 	A lowercase letter, like a, b, or c.
+    DECIMAL_ZERO = 3,// 	A number where single digit numbers are prefixed with a zero, like 01, 02, or 03. Numbers with more than one digit are not prefixed with a zero.
+    UPPER_LETTER = 4,// 	An uppercase letter, like A, B, or C.
+    LOWER_LETTER = 5,// 	A lowercase letter, like a, b, or c.
     UPPER_ROMAN = 6,// An uppercase Roman numeral, like I, II, or III.
-    ROMAN = 7
+    LOWER_ROMAN = 7,// 	A lowercase Roman numeral, like i, ii, or iii.
+    /**
+     * Not yet achieved, aligned with Excel's standards.
+     * 17.18.59 ST_NumberFormat (Numbering Format)
+     */
+    ORDINAL = 8,
+    CARDINAL_TEXT = 9,
+    ORDINAL_TEXT = 10,
+    HEX = 11,
+    CHICAGO = 12,
+    IDEOGRAPH_DIGITAL = 13,
+    JAPANESE_COUNTING = 14,
+    AIUEO = 15,
+    IROHA = 16,
+    DECIMAL_FULL_WIDTH = 17,
+    DECIMAL_HALF_WIDTH = 18,
+    JAPANESE_LEGAL = 19,
+    JAPANESE_DIGITAL_TEN_THOUSAND = 20,
+    DECIMAL_ENCLOSED_CIRCLE = 21,
+    DECIMAL_FULL_WIDTH2 = 22,
+    AIUEO_FULL_WIDTH = 23,
+    IROHA_FULL_WIDTH = 24,
+    GANADA = 25,
+    CHOSUNG = 26,
+    DECIMAL_ENCLOSED_FULLSTOP = 27,
+    DECIMAL_ENCLOSED_PAREN = 28,
+    DECIMAL_ENCLOSED_CIRCLE_CHINESE = 29,
+    IDEOGRAPH_ENCLOSED_CIRCLE = 30,
+    IDEOGRAPH_TRADITIONAL = 31,
+    IDEOGRAPH_ZODIAC = 32,
+    IDEOGRAPH_ZODIAC_TRADITIONAL = 33,
+    TAIWANESE_COUNTING = 34,
+    IDEOGRAPH_LEGAL_TRADITIONAL = 35,
+    TAIWANESE_COUNTING_THOUSAND = 36,
+    TAIWANESE_DIGITAL = 37,
+    CHINESE_COUNTING = 38,
+    CHINESE_LEGAL_SIMPLIFIED = 39,
+    CHINESE_COUNTING_THOUSAND = 40,
+    KOREAN_DIGITAL = 41,
+    KOREAN_COUNTING = 42,
+    KOREAN_LEGAL = 43,
+    KOREAN_DIGITAL2 = 44,
+    VIETNAMESE_COUNTING = 45,
+    RUSSIAN_LOWER = 46,
+    RUSSIAN_UPPER = 47,
+    NUMBER_IN_DASH = 48,
+    HEBREW1 = 49,
+    HEBREW2 = 50,
+    ARABIC_ALPHA = 51,
+    ARABIC_ABJAD = 52,
+    HINDI_VOWELS = 53,
+    HINDI_CONSONANTS = 54,
+    HINDI_NUMBERS = 55,
+    HINDI_COUNTING = 56,
+    THAI_LETTERS = 57,
+    THAI_NUMBERS = 58,
+    THAI_COUNTING = 59,
+    CUSTOM = 60
 }
 /**
  * The types of alignment for a bullet.
@@ -179,7 +237,8 @@ export declare enum BulletAlignment {
     BULLET_ALIGNMENT_UNSPECIFIED = 0,//	The bullet alignment is unspecified.
     START = 1,//	The bullet is aligned to the start of the space allotted for rendering the bullet. Left-aligned for LTR text, right-aligned otherwise.
     CENTER = 2,//	The bullet is aligned to the center of the space allotted for rendering the bullet.
-    END = 3
+    END = 3,//	The bullet is aligned to the end of the space allotted for rendering the bullet. Right-aligned for LTR text, left-aligned otherwise.
+    BOTH = 4
 }
 export interface IMargin {
     marginTop?: number;
@@ -393,7 +452,7 @@ export interface IBullet {
     listType: string;
     listId: string;
     nestingLevel: number;
-    textStyle: ITextStyle;
+    textStyle?: ITextStyle;
 }
 /**
  * Properties of Drawing
@@ -468,11 +527,15 @@ export interface IIndentStart {
     hanging?: INumberUnit;
     indentStart?: INumberUnit;
     tabStops?: ITabStop[];
+    indentEnd?: INumberUnit;
 }
 /**
  * Properties of paragraph style
  */
-export interface IParagraphStyle extends IIndentStart {
+export interface IParagraphStyle extends IParagraphProperties {
+    textStyle?: ITextStyle;
+}
+export interface IParagraphProperties extends IIndentStart {
     headingId?: string;
     namedStyleType?: NamedStyleType;
     horizontalAlign?: HorizontalAlign;
@@ -487,7 +550,6 @@ export interface IParagraphStyle extends IIndentStart {
     borderBottom?: IParagraphBorder;
     borderLeft?: IParagraphBorder;
     borderRight?: IParagraphBorder;
-    indentEnd?: INumberUnit;
     keepLines?: BooleanNumber;
     keepNext?: BooleanNumber;
     wordWrap?: BooleanNumber;

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';