@univerjs/core 0.2.15 → 0.3.0-alpha.1

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

@@ -1,9 +1,16 @@
 import { Nullable } from '../shared/types';
 export type InterceptorHandler<M = unknown, C = unknown> = (value: Nullable<M>, context: C, next: (value: Nullable<M>) => Nullable<M>) => Nullable<M>;
+export declare enum InterceptorEffectEnum {
+    Style = 1,// 1<< 0
+    Value = 2
+}
 export interface IInterceptor<M, C> {
     priority?: number;
     handler: InterceptorHandler<M, C>;
 }
+export interface ICellInterceptor<M, C> extends IInterceptor<M, C> {
+    effect?: InterceptorEffectEnum;
+}
 export declare function createInterceptorKey<T, C>(key: string): IInterceptor<T, C>;
 export type IComposeInterceptors<T = any, C = any> = (interceptors: Array<IInterceptor<T, C>>) => (initValue: Nullable<T>, initContext: C) => Nullable<T>;
 /**

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

@@ -15,5 +15,5 @@
  */
 export * from './document-data-model';
 export * from './preset-list-type';
-export * from './types';
 export * from './text-x/build-utils';
+export * from './types';

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

@@ -1,8 +1,8 @@
-import { DeleteDirection } from '../../../../types/enum';
 import { Nullable } from '../../../../shared';
 import { ITextRange } from '../../../../sheets/typedef';
 import { IDocumentBody } from '../../../../types/interfaces';
 import { IDeleteAction, IRetainAction } from '../action-types';
+import { DeleteDirection } from '../../../../types/enum';
 export declare function makeSelection(startOffset: number, endOffset?: number): ITextRange;
 export declare function normalizeSelection(selection: ITextRange): ITextRange;
 export declare function getSelectionWithSymbolMax(selection: ITextRange, body: IDocumentBody): {

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 { debounce, get, merge, mergeWith, set } from 'lodash-es';
 export { dedupe, groupBy, makeArray, remove, rotate } from './common/array';
 export { isBooleanString } from './common/boolean';
 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';
@@ -20,8 +21,8 @@ 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 { ICellInterceptor, IComposeInterceptors, IInterceptor, InterceptorHandler } from './common/interceptor';
+export { composeInterceptors, createInterceptorKey, InterceptorEffectEnum, InterceptorManager } from './common/interceptor';
 export type { Serializable } from './common/json';
 export { MemoryCursor } from './common/memory-cursor';
 export { mixinClass } from './common/mixin';
@@ -73,7 +74,7 @@ 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 type { IResourceHook, IResources } 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, RedoCommandId, UndoCommand, UndoCommandId, } from './services/undoredo/undoredo.service';

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

@@ -1,7 +1,7 @@
 import { Subject } from 'rxjs';
 import { Disposable } from '../../shared/lifecycle';
-import { ILanguagePack, ILocales, LanguageValue } from '../../shared/locale';
 import { LocaleType } from '../../types/enum/locale-type';
+import { ILanguagePack, ILocales, LanguageValue } from '../../shared/locale';
 /**
  * This service provides i18n and timezone / location features to other modules.
  */

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

@@ -8,6 +8,6 @@ export declare class ResourceLoaderService extends Disposable implements IResour
     constructor(_resourceManagerService: IResourceManagerService, _univerInstanceService: IUniverInstanceService);
     private _init;
     saveUnit<T = object>(unitId: string): ({
-        resources: import('../resource-manager/type').IResources;
+        resources: import('../..').IResources;
     } & T) | null;
 }

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

@@ -13,7 +13,7 @@ export interface IResourceHook<T = any> {
     businesses: UniverInstanceType[];
     onLoad: (unitID: string, resource: T) => void;
     onUnLoad: (unitID: string) => void;
-    toJson: (unitID: string) => string;
+    toJson: (unitID: string, model?: T) => string;
     parseJson: (bytes: string) => T;
 }
 export interface IResourceManagerService {

package/lib/types/shared/array-search.d.ts

@@ -15,4 +15,11 @@
  */
 export declare function binarySearchArray(arr: number[], pos: number): number;
 export declare function orderSearchArray(arr: number[], pos: number): number;
+/**
+ * return the first index which arr[index] > num
+ * ex: searchArray([1, 3, 5, 7, 9], 7) = 4
+ * @param arr
+ * @param num
+ * @returns {number} index
+ */
 export declare function searchArray(arr: number[], num: number): number;

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

@@ -23,7 +23,6 @@ export { ColorKit, COLORS, type IRgbColor, RGB_PAREN, RGBA_PAREN } from './color
 export * from './command-enum';
 export * from './common';
 export * from './compare';
-export * from './debounce';
 export * from './doc-tool';
 export * from './generate';
 export * from './hash-algorithm';
@@ -33,7 +32,7 @@ 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 { moveRangeByOffset, splitIntoGrid } from './range';
 export * from './rectangle';
 export { RefAlias } from './ref-alias';
 export * from './row-col-iter';

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

@@ -1,4 +1,7 @@
 import { ObjectMatrix } from './object-matrix';
 import { IRange } from '../sheets/typedef';
+/**
+ * @deprecated this function could cause memory out of use in large range.
+ */
 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/object-matrix.d.ts

@@ -36,7 +36,7 @@ export declare class ObjectMatrix<T> {
     getRowOrCreate(rowIndex: number): IObjectArrayPrimitiveType<T>;
     reset(): void;
     hasValue(): boolean;
-    getValue(row: number, column: number): T;
+    getValue(row: number, column: number): Nullable<T>;
     setValue(row: number, column: number, value: T): void;
     /**
      * ！！

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

@@ -6,6 +6,14 @@ import { Nullable } from './types';
 export declare class Rectangle {
     static clone(src: IRange): IRange;
     static equals(src: IRange, target: IRange): boolean;
+    /**
+     * Check intersects of normal range(RANGE_TYPE.NORMAL)
+     * For other types of ranges, please consider using the intersects method.
+     * @param rangeA
+     * @param rangeB
+     * @returns boolean
+     */
+    static simpleRangesIntersect(rangeA: IRange, rangeB: IRange): boolean;
     static intersects(src: IRange, target: IRange): boolean;
     static getIntersects(src: IRange, target: IRange): Nullable<IRange>;
     static contains(src: IRange, target: IRange): boolean;
@@ -17,6 +25,12 @@ 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;
+    /**
+     * Subtract range2 from range1, the result is is horizontal first then vertical
+     * @param {IRange} range1 The source range
+     * @param {IRange} range2 The range to be subtracted
+     * @returns {IRange[]} Returns the array of ranges, which are the result not intersected with range1
+     */
     static subtract(range1: IRange, range2: IRange): IRange[];
     /**
      * Combine smaller rectangles into larger ones

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

@@ -102,24 +102,7 @@ export declare class Tools {
     static hasIntersectionBetweenTwoRanges(range1Start: number, range1End: number, range2Start: number, range2End: number): boolean;
     static isStartValidPosition(name: string): boolean;
     static isValidParameter(name: string): boolean;
-    /**
-     * As lodash set, via a path string to set value to deep property
-     * set(obj, 'xx.yy', val)
-     * @param data
-     * @param propertyPath
-     * @param value
-     */
-    static set(data: Record<string, any>, propertyPath: string, value: any): void;
     static clamp(value: number, min: number, max: number): number;
     static now(): number;
-    /**
-     * @static
-     * @param {unknown} object Modify the property while leaving the reference unchanged.
-     * @param {unknown} source The source  being merged in object.
-     * @param {(value: unknown, originValue: unknown, key: string, object: unknown, source: unknown, stack: string[]) => {}} [customizer]
-     * @return {*}
-     * @memberof Tools
-     */
-    static mergeWith(object: unknown, source: unknown, customizer?: (value: unknown, originValue: unknown, key: string, object: unknown, source: unknown, stack: string[]) => {}): any;
 }
 export declare function generateRandomId(n?: number, alphabet?: string): string;

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

@@ -1,5 +1,5 @@
-import { IObjectMatrixPrimitiveType, Nullable, ObjectMatrix } from '../shared';
-import { HorizontalAlign, VerticalAlign, BooleanNumber, FontItalic, FontWeight, WrapStrategy } from '../types/enum';
+import { ObjectMatrix, IObjectMatrixPrimitiveType, Nullable } from '../shared';
+import { BooleanNumber, FontItalic, FontWeight, WrapStrategy, HorizontalAlign, VerticalAlign } from '../types/enum';
 import { IBorderData, IDocumentBody, IDocumentData, IStyleBase, IStyleData, ITextDecoration, ITextRotation } from '../types/interfaces';
 import { Styles } from './styles';
 import { ICellData, IRange } from './typedef';

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

@@ -1,5 +1,5 @@
-import { Disposable } from '../shared/lifecycle';
 import { IRange } from './typedef';
+import { Disposable } from '../shared/lifecycle';
 export declare class SpanModel extends Disposable {
     /**
      * @property Cache for RANGE_TYPE.NORMAL
@@ -46,6 +46,13 @@ export declare class SpanModel extends Disposable {
     isRowContainsMergedCell(row: number): boolean;
     isColumnContainsMergedCell(column: number): boolean;
     getMergedCellRange(startRow: number, startColumn: number, endRow: number, endColumn: number): IRange[];
+    /**
+     * @deprecated sigificant performance impact, use _getCellMergeInfo instead.
+     * @param startRow
+     * @param startColumn
+     * @param endRow
+     * @param endColumn
+     */
     getMergedCellRangeForSkeleton(startRow: number, startColumn: number, endRow: number, endColumn: number): IRange[];
     private _getRangeFromCache;
     private _getSkeletonRangeFromCache;

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

@@ -1,3 +1,4 @@
+import { InterceptorEffectEnum } from '../common/interceptor';
 import { Disposable } from '../shared/lifecycle';
 import { IDisposable } from '../common/di';
 import { Nullable } from '../shared/types';
@@ -6,7 +7,7 @@ import { ICellData, ICellDataForSheetInterceptor } from './typedef';
  * @internal
  */
 export interface ICellContentInterceptor {
-    getCell: (row: number, col: number) => Nullable<ICellDataForSheetInterceptor>;
+    getCell: (row: number, col: number, effect: InterceptorEffectEnum) => Nullable<ICellDataForSheetInterceptor>;
 }
 export interface IRowFilteredInterceptor {
 }
@@ -37,6 +38,8 @@ export declare class SheetViewModel extends Disposable {
     constructor(getRawCell: (row: number, col: number) => Nullable<ICellData>);
     dispose(): void;
     getCell(row: number, col: number): Nullable<ICellDataForSheetInterceptor>;
+    getCellValueOnly(row: number, col: number): Nullable<ICellDataForSheetInterceptor>;
+    getCellStyleOnly(row: number, col: number): Nullable<ICellDataForSheetInterceptor>;
     getRowFiltered(row: number): boolean;
     registerCellContentInterceptor(interceptor: ICellContentInterceptor): IDisposable;
     registerRowFilteredInterceptor(interceptor: IRowFilteredInterceptor): IDisposable;

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

@@ -138,6 +138,20 @@ export declare class Worksheet {
      * @returns ICellDataForSheetInterceptor
      */
     getCell(row: number, col: number): Nullable<ICellDataForSheetInterceptor>;
+    /**
+     * Get cellData only use effect on value interceptor
+     * @param {number} number row The row index of the cell.
+     * @param {number} number col The column index of the cell.
+     * @returns {Nullable<ICellDataForSheetInterceptor>} The cell data only use effect on value interceptor
+     */
+    getCellValueOnly(row: number, col: number): Nullable<ICellDataForSheetInterceptor>;
+    /**
+     * Get cellData only use effect on style interceptor
+     * @param {number} row The row index of the cell.
+     * @param {number} col The column index of the cell.
+     * @returns {Nullable<ICellDataForSheetInterceptor>} The cell data only use effect on style interceptor
+     */
+    getCellStyleOnly(row: number, col: number): Nullable<ICellDataForSheetInterceptor>;
     getCellRaw(row: number, col: number): Nullable<ICellData>;
     getRowFiltered(row: number): boolean;
     /**

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

@@ -18,6 +18,7 @@ export * from './border-style-types';
 export * from './color-type';
 export * from './common-hide-types';
 export * from './copy-paste-type';
+export * from './delete-direction';
 export * from './developer-metadata-visibility';
 export * from './dimension';
 export * from './direction';
@@ -25,9 +26,8 @@ export * from './format-type';
 export * from './interpolation-point-type';
 export * from './locale-type';
 export * from './protection-type';
+export * from './prst-geom-type';
 export * from './relative-date';
 export * from './sheet-types';
 export * from './text-style';
 export * from './theme-color-type';
-export * from './prst-geom-type';
-export * from './delete-direction';

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

@@ -111,7 +111,7 @@ export declare enum BaselineOffset {
 /**
  * General Boolean Enum
  */
-export declare const enum BooleanNumber {
+export declare enum BooleanNumber {
     FALSE = 0,
     TRUE = 1
 }

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

@@ -16,8 +16,8 @@
 export * from './i-document-data';
 export * from './i-document-data-interceptor';
 export * from './i-image-properties';
+export * from './i-need-check-disposable';
 export * from './i-placeholder';
 export * from './i-shape-properties';
 export * from './i-slide-data';
 export * from './i-style-data';
-export * from './i-need-check-disposable';

package/lib/types/univer.d.ts

@@ -1,16 +1,16 @@
 import { Injector } from './common/di';
 import { DocumentDataModel } from './docs/data-model/document-data-model';
-import { LogLevel } from './services/log/log.service';
-import { IStyleSheet } from './services/theme/theme.service';
 import { Workbook } from './sheets/workbook';
 import { SlideDataModel } from './slides/slide-model';
-import { LocaleType } from './types/enum/locale-type';
-import { IDocumentData, ISlideData } from './types/interfaces';
 import { UnitModel, UnitType } from './common/unit';
+import { LogLevel } from './services/log/log.service';
 import { Plugin, PluginCtor } from './services/plugin/plugin';
 import { DependencyOverride } from './services/plugin/plugin-override';
+import { IStyleSheet } from './services/theme/theme.service';
 import { ILocales } from './shared';
 import { IWorkbookData } from './sheets/typedef';
+import { LocaleType } from './types/enum/locale-type';
+import { IDocumentData, ISlideData } from './types/interfaces';
 export interface IUniverConfig {
     theme: IStyleSheet;
     locale: LocaleType;