@univerjs/core 0.1.0-alpha.2 → 0.1.0-beta.0

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

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

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

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

package/lib/types/sheets/column-manager.d.ts

@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { Nullable } from '../shared';
-import type { ObjectArrayType } from '../shared/object-array';
-import { ObjectArray } from '../shared/object-array';
+import type { Nullable } from '../common/type-utils';
+import type { IObjectArrayPrimitiveType } from '../shared/object-matrix';
 import type { IColumnData, IRange, IWorksheetData } from '../types/interfaces';
 /**
  * Manage configuration information of all columns, get column width, column length, set column width, etc.
@@ -23,15 +22,15 @@ import type { IColumnData, IRange, IWorksheetData } from '../types/interfaces';
 export declare class ColumnManager {
     private readonly _config;
     private _columnData;
-    constructor(_config: IWorksheetData, data: ObjectArrayType<Partial<IColumnData>>);
+    constructor(_config: IWorksheetData, data: IObjectArrayPrimitiveType<Partial<IColumnData>>);
     /**
      * Get width and hidden status of columns in the sheet
      * @returns
      */
-    getColumnData(): ObjectArray<IColumnData>;
+    getColumnData(): IObjectArrayPrimitiveType<Partial<IColumnData>>;
     getColVisible(colPos: number): boolean;
     getHiddenCols(start?: number, end?: number): IRange[];
-    getColumnDatas(columnPos: number, numColumns: number): ObjectArray<IColumnData>;
+    getColumnDatas(columnPos: number, numColumns: number): IObjectArrayPrimitiveType<Partial<IColumnData>>;
     /**
      * Get count of column in the sheet
      * @returns
@@ -48,11 +47,11 @@ export declare class ColumnManager {
      * @param columnPos column index
      * @returns
      */
-    getColumn(columnPos: number): Nullable<IColumnData>;
+    getColumn(columnPos: number): Nullable<Partial<IColumnData>>;
     /**
      * get given column data or create a column data when it's null
      * @param columnPos column index
      * @returns
      */
-    getColumnOrCreate(columnPos: number): IColumnData;
+    getColumnOrCreate(columnPos: number): Partial<IColumnData>;
 }

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { Nullable, ObjectMatrixPrimitiveType } from '../shared';
+import type { IObjectMatrixPrimitiveType, Nullable } from '../shared';
 import { ObjectMatrix } from '../shared';
 import type { HorizontalAlign, VerticalAlign, WrapStrategy } from '../types/enum';
 import { BooleanNumber, FontItalic, FontWeight } from '../types/enum';
@@ -79,7 +79,7 @@ export declare class Range {
      *
      * @returns range matrix
      */
-    getMatrix(): ObjectMatrix<ICellData>;
+    getMatrix(): ObjectMatrix<Nullable<ICellData>>;
     /**
      * get range matrix object
      *
@@ -121,14 +121,14 @@ export declare class Range {
     /**
      * Returns the data of the object structure, and can set whether to bring styles
      */
-    getObjectValue(options?: IValueOptionsType): ICellData;
+    getObjectValue(options?: IValueOptionsType): Nullable<ICellData>;
     /**
      * Returns the data of the object structure, and can set whether to bring styles
      *
      * @param options set whether to include style
      * @returns Returns a value in object format
      */
-    getObjectValues(options?: IValueOptionsType): ObjectMatrixPrimitiveType<ICellData>;
+    getObjectValues(options?: IValueOptionsType): IObjectMatrixPrimitiveType<Nullable<ICellData>>;
     /**
      * Returns the font color of the cell in the top-left corner of the range, in CSS notation
      */

package/lib/types/sheets/row-manager.d.ts

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { Nullable, ObjectArrayType } from '../shared';
-import { ObjectArray } from '../shared';
+import { type IObjectArrayPrimitiveType } from '../shared/object-matrix';
+import type { Nullable } from '../shared/types';
 import type { IRange, IRowData, IWorksheetData } from '../types/interfaces';
 /**
  * Manage configuration information of all rows, get row height, row length, set row height, etc.
@@ -24,13 +24,13 @@ import type { IRange, IRowData, IWorksheetData } from '../types/interfaces';
 export declare class RowManager {
     private readonly _config;
     private _rowData;
-    constructor(_config: IWorksheetData, data: ObjectArrayType<Partial<IRowData>>);
+    constructor(_config: IWorksheetData, data: IObjectArrayPrimitiveType<Partial<IRowData>>);
     /**
      * Get height and hidden status of columns in the sheet
      * @returns
      */
-    getRowData(): ObjectArray<IRowData>;
-    getRowDatas(rowPos: number, numRows: number): ObjectArray<IRowData>;
+    getRowData(): IObjectArrayPrimitiveType<Partial<IRowData>>;
+    getRowDatas(rowPos: number, numRows: number): IObjectArrayPrimitiveType<Partial<IRowData>>;
     getRowHeight(rowPos: number): number;
     getRowHeight(rowPos: number, count: number): number;
     /**
@@ -38,13 +38,13 @@ export declare class RowManager {
      * @param rowPos row index
      * @returns
      */
-    getRow(rowPos: number): Nullable<IRowData>;
+    getRow(rowPos: number): Nullable<Partial<IRowData>>;
     /**
      * Get given row data or create a row data when it's null
      * @param rowPos row index
      * @returns
      */
-    getRowOrCreate(rowPos: number): IRowData;
+    getRowOrCreate(rowPos: number): Partial<IRowData>;
     getHiddenRows(start?: number, end?: number): IRange[];
     getRowVisible(rowPos: number): boolean;
     /**

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

@@ -18,20 +18,18 @@ import type { ICellDataForSheetInterceptor, IStyleData } from '../types/interfac
 /**
  * Styles in a workbook, cells locate styles based on style IDs
  *
- * TODO@Dushusir: Cachemap needs to follow style to clear cleared following styles
  */
 export declare class Styles {
     private _styles;
     private _cacheMap;
-    private _maxCacheSize;
-    constructor(styles?: IKeyType<Nullable<IStyleData>>, maxCacheSize?: number);
+    constructor(styles?: IKeyType<Nullable<IStyleData>>);
     each(callback: (value: [string, Nullable<IStyleData>], index: number, array: Array<[string, Nullable<IStyleData>]>) => void): this;
-    search(data: IStyleData): string;
+    search(data: IStyleData, styleObject: string): string;
     get(id: string | Nullable<IStyleData>): Nullable<IStyleData>;
-    add(data: IStyleData): string;
+    add(data: IStyleData, styleObject: string): string;
     setValue(data: Nullable<IStyleData>): Nullable<string>;
     toJSON(): IKeyType<Nullable<IStyleData>>;
     getStyleByCell(cell: Nullable<ICellDataForSheetInterceptor>): Nullable<IStyleData>;
     private _generateCacheMap;
-    private getExistingStyleId;
+    private _getExistingStyleId;
 }

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

@@ -13,9 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Injector } from '@wendellhu/redi';
+import { ILogService } from '../services/log/log.service';
 import type { Nullable } from '../shared';
-import { GenName } from '../shared';
 import { Disposable } from '../shared/lifecycle';
 import type { IGridRange, IRangeType, IWorkbookData, IWorksheetData } from '../types/interfaces';
 import { Styles } from './styles';
@@ -25,12 +24,13 @@ export declare function getWorksheetUID(workbook: Workbook, worksheet: Worksheet
  * Access and create Univer Sheets files
  */
 export declare class Workbook extends Disposable {
-    private readonly _genName;
-    readonly _injector: Injector;
+    private readonly _log;
     private readonly _sheetCreated$;
     readonly sheetCreated$: import("rxjs").Observable<Worksheet>;
     private readonly _sheetDisposed$;
     readonly sheetDisposed$: import("rxjs").Observable<Worksheet>;
+    private readonly _activeSheet$;
+    readonly activeSheet$: import("rxjs").Observable<Nullable<Worksheet>>;
     /**
      * sheets list
      * @private
@@ -47,7 +47,8 @@ export declare class Workbook extends Disposable {
      */
     private _snapshot;
     private _unitId;
-    constructor(workbookData: Partial<IWorkbookData> | undefined, _genName: GenName, _injector: Injector);
+    private _count;
+    constructor(workbookData: Partial<IWorkbookData> | undefined, _log: ILogService);
     dispose(): void;
     save(): IWorkbookData;
     static isIRangeType(range: IRangeType | IRangeType[]): Boolean;
@@ -69,6 +70,7 @@ export declare class Workbook extends Disposable {
     getIndexBySheetId(sheetId: string): number;
     getRawActiveSheet(): Nullable<string>;
     getActiveSheet(): Worksheet;
+    __setActiveSheet(worksheet: Worksheet): void;
     getActiveSheetIndex(): number;
     getSheetSize(): number;
     /**
@@ -78,14 +80,12 @@ export declare class Workbook extends Disposable {
      */
     flush(): void;
     getSheets(): Worksheet[];
+    getSheetsName(): string[];
     getSheetIndex(sheet: Worksheet): number;
     getSheetBySheetName(name: string): Nullable<Worksheet>;
     getSheetBySheetId(sheetId: string): Nullable<Worksheet>;
     getSheetByIndex(index: number): Nullable<Worksheet>;
     getHiddenWorksheets(): string[];
-    /**
-     * Creates a builder for a conditional formatting rule.
-     */
     /**
      * transform any range type to range data
      *
@@ -126,21 +126,17 @@ export declare class Workbook extends Disposable {
      */
     transformRangeType(range: IRangeType | IRangeType[]): IGridRange;
     load(config: IWorkbookData): void;
+    checkSheetName(name: string): boolean;
+    uniqueSheetName(name?: string): string;
     /**
      * Get the range array based on the range string and sheet id
      *
-     * @privateRemarks
-     * zh: 根据范围字符串和sheet id取得范围数组
-     *
      * @param txt - range string
      * @returns
-     *
-     * @internal
      */
     private _getCellRange;
     /**
      * Get Default Sheet
-     * @private
      */
     private _getDefaultWorkSheet;
 }

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

@@ -46,7 +46,7 @@ export declare class Worksheet {
      * Returns WorkSheet Cell Data Matrix
      * @returns
      */
-    getCellMatrix(): ObjectMatrix<ICellData>;
+    getCellMatrix(): ObjectMatrix<Nullable<ICellData>>;
     /**
      * Returns Row Manager
      * @returns Row Manager

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

@@ -39,5 +39,10 @@ export declare enum BorderType {
     OUTSIDE = "outside",
     INSIDE = "inside",
     HORIZONTAL = "horizontal",
-    VERTICAL = "vertical"
+    VERTICAL = "vertical",
+    TLBR = "tlbr",
+    TLBC_TLMR = "tlbc_tlmr",
+    TLBR_TLBC_TLMR = "tlbr_tlbc_tlmr",
+    BLTR = "bl_tr",
+    MLTR_BCTR = "mltr_bctr"
 }

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

@@ -108,9 +108,9 @@ export declare enum FontWeight {
     BOLD = 1
 }
 export declare enum BaselineOffset {
-    NORMAL = 0,
-    SUBSCRIPT = 1,
-    SUPERSCRIPT = 2
+    NORMAL = 1,
+    SUBSCRIPT = 2,
+    SUPERSCRIPT = 3
 }
 /**
  * General Boolean Enum

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

@@ -56,7 +56,7 @@ export interface IFooters {
  * Set of lists
  */
 export interface ILists {
-    [listId: string]: IListData;
+    [listType: string]: IListData;
 }
 /**
  * Set of Drawings
@@ -136,7 +136,7 @@ export interface IHeaderData {
  * The properties of a list which describe the look and feel of bullets belonging to paragraphs associated with a list.
  */
 export interface IListData {
-    listId: string;
+    listType: string;
     nestingLevel: INestingLevel[];
 }
 /**
@@ -360,6 +360,7 @@ export declare enum ParagraphElementType {
  * Properties of list
  */
 export interface IBullet {
+    listType: string;
     listId: string;
     nestingLevel: number;
     textStyle: ITextStyle;

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

@@ -31,6 +31,18 @@ export declare enum AbsoluteRefType {
     COLUMN = 2,
     ALL = 3
 }
+export interface IRowRange {
+    /**
+     * The start row (inclusive) of the range
+     * startRow
+     */
+    startRow: number;
+    /**
+     * The end row (exclusive) of the range
+     * endRow
+     */
+    endRow: number;
+}
 /**
  * Range data structure
  *
@@ -46,22 +58,12 @@ export declare enum AbsoluteRefType {
  *
  * means "A1:B2"
  */
-export interface IRange {
-    /**
-     * The start row (inclusive) of the range
-     * startRow
-     */
-    startRow: number;
+export interface IRange extends IRowRange {
     /**
      * The start column (inclusive) of the range
      * startColumn
      */
     startColumn: number;
-    /**
-     * The end row (exclusive) of the range
-     * endRow
-     */
-    endRow: number;
     /**
      * The end column (exclusive) of the range
      * endColumn

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

@@ -50,12 +50,29 @@ export interface IBorderStyleData {
 }
 /**
  * Style properties of top, bottom, left and right border
+ *
+ * TLBR = 'tlbr', //START_TOP_LEFT_END_BOTTOM_RIGHT
+ * TLBC = 'tlbc', // START_TOP_LEFT_END_BOTTOM_CENTER
+
+ * TLMR = 'tlmr', // START_TOP_LEFT_END_MIDDLE_RIGHT
+
+ * BLTR = 'bltr', // START_BOTTOM_LEFT_END_TOP_RIGHT
+
+ * MLTR = 'mltr', // START_MIDDLE_LEFT_END_TOP_RIGHT
+
+ * BCTR = 'bctr', // START_BOTTOM_CENTER_END_TOP_RIGHT
  */
 export interface IBorderData {
     t?: Nullable<IBorderStyleData>;
     r?: Nullable<IBorderStyleData>;
     b?: Nullable<IBorderStyleData>;
     l?: Nullable<IBorderStyleData>;
+    tl_br?: Nullable<IBorderStyleData>;
+    tl_bc?: Nullable<IBorderStyleData>;
+    tl_mr?: Nullable<IBorderStyleData>;
+    bl_tr?: Nullable<IBorderStyleData>;
+    ml_tr?: Nullable<IBorderStyleData>;
+    bc_tr?: Nullable<IBorderStyleData>;
 }
 export interface ITextRotation {
     /**

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

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { ObjectArrayType } from '../../shared/object-array';
-import type { ObjectMatrixPrimitiveType } from '../../shared/object-matrix';
+import type { IObjectArrayPrimitiveType, IObjectMatrixPrimitiveType } from '../../shared/object-matrix';
 import type { IKeyValue } from '../../shared/types';
 import type { BooleanNumber, SheetTypes } from '../enum';
 import type { ICellData } from './i-cell-data';
@@ -62,9 +61,9 @@ export interface IWorksheetData {
      * @deprecated this should be removed
      */
     status: BooleanNumber;
-    cellData: ObjectMatrixPrimitiveType<ICellData>;
-    rowData: ObjectArrayType<Partial<IRowData>>;
-    columnData: ObjectArrayType<Partial<IColumnData>>;
+    cellData: IObjectMatrixPrimitiveType<ICellData>;
+    rowData: IObjectArrayPrimitiveType<Partial<IRowData>>;
+    columnData: IObjectArrayPrimitiveType<Partial<IColumnData>>;
     showGridlines: BooleanNumber;
     rowHeader: {
         width: number;