@cj-tech-master/excelts 6.0.0-beta.2 → 6.0.0-beta.3

package/dist/browser/modules/excel/column.d.ts

@@ -121,7 +121,7 @@ declare class Column {
     get fill(): Fill | undefined;
     set fill(value: Fill | undefined);
     static toModel(columns: Column[]): ColumnModel[] | undefined;
-    static fromModel(cols: ColumnModel[]): Column[] | null;
-    static fromModel(worksheet: Worksheet, cols: ColumnModel[]): Column[] | null;
+    static fromModel(cols: ColumnModel[]): Column[];
+    static fromModel(worksheet: Worksheet, cols: ColumnModel[]): Column[];
 }
 export { Column };

package/dist/browser/modules/excel/column.js

@@ -304,32 +304,30 @@ class Column {
         // Convert array of Column into compressed list cols
         const cols = [];
         let col = null;
-        if (columns) {
-            columns.forEach((column, index) => {
-                if (column.isDefault) {
-                    if (col) {
-                        col = null;
-                    }
+        columns.forEach((column, index) => {
+            if (column.isDefault) {
+                if (col) {
+                    col = null;
                 }
-                else if (!col || !column.equivalentToModel(col)) {
-                    col = {
-                        min: index + 1,
-                        max: index + 1,
-                        width: column.width !== undefined ? column.width : DEFAULT_COLUMN_WIDTH,
-                        style: column.style,
-                        isCustomWidth: column.isCustomWidth,
-                        hidden: column.hidden,
-                        outlineLevel: column.outlineLevel,
-                        collapsed: column.collapsed,
-                        bestFit: column.bestFit
-                    };
-                    cols.push(col);
-                }
-                else {
-                    col.max = index + 1;
-                }
-            });
-        }
+            }
+            else if (!col || !column.equivalentToModel(col)) {
+                col = {
+                    min: index + 1,
+                    max: index + 1,
+                    width: column.width !== undefined ? column.width : DEFAULT_COLUMN_WIDTH,
+                    style: column.style,
+                    isCustomWidth: column.isCustomWidth,
+                    hidden: column.hidden,
+                    outlineLevel: column.outlineLevel,
+                    collapsed: column.collapsed,
+                    bestFit: column.bestFit
+                };
+                cols.push(col);
+            }
+            else {
+                col.max = index + 1;
+            }
+        });
         return cols.length ? cols : undefined;
     }
     static fromModel(worksheetOrCols, colsMaybe) {
@@ -360,7 +358,7 @@ class Column {
                 columns.push(new Column(worksheet, count++, col));
             }
         }
-        return columns.length ? columns : null;
+        return columns;
     }
 }
 export { Column };

package/dist/browser/modules/excel/stream/worksheet-reader.d.ts

@@ -48,7 +48,7 @@ declare class WorksheetReader extends EventEmitter {
     constructor({ workbook, id, iterator, options }: WorksheetReaderOptions);
     destroy(): void;
     get dimensions(): Dimensions;
-    get columns(): Column[] | null;
+    get columns(): Column[];
     getColumn(c: string | number): Column;
     getColumnKey(key: string): Column | undefined;
     setColumnKey(key: string, value: Column): void;

package/dist/browser/modules/excel/stream/worksheet-reader.js

@@ -22,7 +22,7 @@ class WorksheetReader extends EventEmitter {
         // and a name
         this.name = `Sheet${this.id}`;
         // column definitions
-        this._columns = null;
+        this._columns = [];
         this._keys = Object.create(null);
         // keep a record of dimensions
         this._dimensions = new Dimensions();
@@ -54,9 +54,6 @@ class WorksheetReader extends EventEmitter {
             // otherwise, assume letter
             c = colCache.l2n(c);
         }
-        if (!this._columns) {
-            this._columns = [];
-        }
         if (c > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= c) {

package/dist/browser/modules/excel/stream/worksheet-writer.d.ts

@@ -77,7 +77,7 @@ declare class WorksheetWriter {
     commit(): void;
     get dimensions(): Dimensions;
     get views(): Partial<WorksheetView>[];
-    get columns(): Column[] | null;
+    get columns(): Column[];
     set columns(value: Partial<Column>[]);
     getColumnKey(key: string): Column | undefined;
     setColumnKey(key: string, value: Column): void;

package/dist/browser/modules/excel/stream/worksheet-writer.js

@@ -71,7 +71,7 @@ class WorksheetWriter {
         // when they are committed, they will be deleted.
         this._rows = [];
         // column definitions
-        this._columns = null;
+        this._columns = [];
         // column keys (addRow convenience): key ==> this._columns index
         this._keys = {};
         // keep a record of all row and column pageBreaks
@@ -266,9 +266,6 @@ class WorksheetWriter {
             // otherwise, assume letter
             c = colCache.l2n(c);
         }
-        if (!this._columns) {
-            this._columns = [];
-        }
         if (c > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= c) {

package/dist/browser/modules/excel/utils/sheet-utils.js

@@ -510,8 +510,8 @@ export function bookAppendSheet(workbook, worksheet, name) {
         });
     });
     // Copy column properties
-    worksheet.columns?.forEach((col, idx) => {
-        if (col && newWs.columns?.[idx]) {
+    worksheet.columns.forEach((col, idx) => {
+        if (col && newWs.columns[idx]) {
             if (col.width) {
                 newWs.getColumn(idx + 1).width = col.width;
             }

package/dist/browser/modules/excel/worksheet.d.ts

@@ -162,7 +162,7 @@ declare class Worksheet {
     /**
      * Get the current columns array
      */
-    get columns(): Column[] | null;
+    get columns(): Column[];
     /**
      * Add column headers and define column keys and widths.
      *

package/dist/browser/modules/excel/worksheet.js

@@ -33,7 +33,7 @@ class Worksheet {
         // Note: _rows is zero based. Must subtract 1 to go from cell.row to index
         this._rows = [];
         // column definitions
-        this._columns = null;
+        this._columns = [];
         // column keys (addRow convenience): key ==> this._collumns index
         this._keys = {};
         // keep record of all merges
@@ -224,9 +224,6 @@ class Worksheet {
         else {
             colNum = c;
         }
-        if (!this._columns) {
-            this._columns = [];
-        }
         if (colNum > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= colNum) {
@@ -281,7 +278,7 @@ class Worksheet {
         // splice column definitions
         const nExpand = inserts.length - count;
         const nKeep = start + count;
-        const nEnd = this._columns ? this._columns.length : 0;
+        const nEnd = this._columns.length;
         if (nExpand < 0) {
             for (let i = start + inserts.length; i <= nEnd; i++) {
                 this.getColumn(i).defn = this.getColumn(i - nExpand).defn;
@@ -1128,7 +1125,7 @@ class Worksheet {
         };
         // =================================================
         // columns
-        model.cols = Column.toModel(this.columns ?? []);
+        model.cols = Column.toModel(this.columns);
         // ==========================================================
         // Rows
         const rows = (model.rows = []);

package/dist/cjs/modules/excel/column.js

@@ -307,32 +307,30 @@ class Column {
         // Convert array of Column into compressed list cols
         const cols = [];
         let col = null;
-        if (columns) {
-            columns.forEach((column, index) => {
-                if (column.isDefault) {
-                    if (col) {
-                        col = null;
-                    }
+        columns.forEach((column, index) => {
+            if (column.isDefault) {
+                if (col) {
+                    col = null;
                 }
-                else if (!col || !column.equivalentToModel(col)) {
-                    col = {
-                        min: index + 1,
-                        max: index + 1,
-                        width: column.width !== undefined ? column.width : DEFAULT_COLUMN_WIDTH,
-                        style: column.style,
-                        isCustomWidth: column.isCustomWidth,
-                        hidden: column.hidden,
-                        outlineLevel: column.outlineLevel,
-                        collapsed: column.collapsed,
-                        bestFit: column.bestFit
-                    };
-                    cols.push(col);
-                }
-                else {
-                    col.max = index + 1;
-                }
-            });
-        }
+            }
+            else if (!col || !column.equivalentToModel(col)) {
+                col = {
+                    min: index + 1,
+                    max: index + 1,
+                    width: column.width !== undefined ? column.width : DEFAULT_COLUMN_WIDTH,
+                    style: column.style,
+                    isCustomWidth: column.isCustomWidth,
+                    hidden: column.hidden,
+                    outlineLevel: column.outlineLevel,
+                    collapsed: column.collapsed,
+                    bestFit: column.bestFit
+                };
+                cols.push(col);
+            }
+            else {
+                col.max = index + 1;
+            }
+        });
         return cols.length ? cols : undefined;
     }
     static fromModel(worksheetOrCols, colsMaybe) {
@@ -363,7 +361,7 @@ class Column {
                 columns.push(new Column(worksheet, count++, col));
             }
         }
-        return columns.length ? columns : null;
+        return columns;
     }
 }
 exports.Column = Column;

package/dist/cjs/modules/excel/stream/worksheet-reader.js

@@ -25,7 +25,7 @@ class WorksheetReader extends event_emitter_1.EventEmitter {
         // and a name
         this.name = `Sheet${this.id}`;
         // column definitions
-        this._columns = null;
+        this._columns = [];
         this._keys = Object.create(null);
         // keep a record of dimensions
         this._dimensions = new range_1.Dimensions();
@@ -57,9 +57,6 @@ class WorksheetReader extends event_emitter_1.EventEmitter {
             // otherwise, assume letter
             c = col_cache_1.colCache.l2n(c);
         }
-        if (!this._columns) {
-            this._columns = [];
-        }
         if (c > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= c) {

package/dist/cjs/modules/excel/stream/worksheet-writer.js

@@ -74,7 +74,7 @@ class WorksheetWriter {
         // when they are committed, they will be deleted.
         this._rows = [];
         // column definitions
-        this._columns = null;
+        this._columns = [];
         // column keys (addRow convenience): key ==> this._columns index
         this._keys = {};
         // keep a record of all row and column pageBreaks
@@ -269,9 +269,6 @@ class WorksheetWriter {
             // otherwise, assume letter
             c = col_cache_1.colCache.l2n(c);
         }
-        if (!this._columns) {
-            this._columns = [];
-        }
         if (c > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= c) {

package/dist/cjs/modules/excel/utils/sheet-utils.js

@@ -528,8 +528,8 @@ function bookAppendSheet(workbook, worksheet, name) {
         });
     });
     // Copy column properties
-    worksheet.columns?.forEach((col, idx) => {
-        if (col && newWs.columns?.[idx]) {
+    worksheet.columns.forEach((col, idx) => {
+        if (col && newWs.columns[idx]) {
             if (col.width) {
                 newWs.getColumn(idx + 1).width = col.width;
             }

package/dist/cjs/modules/excel/worksheet.js

@@ -36,7 +36,7 @@ class Worksheet {
         // Note: _rows is zero based. Must subtract 1 to go from cell.row to index
         this._rows = [];
         // column definitions
-        this._columns = null;
+        this._columns = [];
         // column keys (addRow convenience): key ==> this._collumns index
         this._keys = {};
         // keep record of all merges
@@ -227,9 +227,6 @@ class Worksheet {
         else {
             colNum = c;
         }
-        if (!this._columns) {
-            this._columns = [];
-        }
         if (colNum > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= colNum) {
@@ -284,7 +281,7 @@ class Worksheet {
         // splice column definitions
         const nExpand = inserts.length - count;
         const nKeep = start + count;
-        const nEnd = this._columns ? this._columns.length : 0;
+        const nEnd = this._columns.length;
         if (nExpand < 0) {
             for (let i = start + inserts.length; i <= nEnd; i++) {
                 this.getColumn(i).defn = this.getColumn(i - nExpand).defn;
@@ -1131,7 +1128,7 @@ class Worksheet {
         };
         // =================================================
         // columns
-        model.cols = column_1.Column.toModel(this.columns ?? []);
+        model.cols = column_1.Column.toModel(this.columns);
         // ==========================================================
         // Rows
         const rows = (model.rows = []);

package/dist/esm/modules/excel/column.js

@@ -304,32 +304,30 @@ class Column {
         // Convert array of Column into compressed list cols
         const cols = [];
         let col = null;
-        if (columns) {
-            columns.forEach((column, index) => {
-                if (column.isDefault) {
-                    if (col) {
-                        col = null;
-                    }
+        columns.forEach((column, index) => {
+            if (column.isDefault) {
+                if (col) {
+                    col = null;
                 }
-                else if (!col || !column.equivalentToModel(col)) {
-                    col = {
-                        min: index + 1,
-                        max: index + 1,
-                        width: column.width !== undefined ? column.width : DEFAULT_COLUMN_WIDTH,
-                        style: column.style,
-                        isCustomWidth: column.isCustomWidth,
-                        hidden: column.hidden,
-                        outlineLevel: column.outlineLevel,
-                        collapsed: column.collapsed,
-                        bestFit: column.bestFit
-                    };
-                    cols.push(col);
-                }
-                else {
-                    col.max = index + 1;
-                }
-            });
-        }
+            }
+            else if (!col || !column.equivalentToModel(col)) {
+                col = {
+                    min: index + 1,
+                    max: index + 1,
+                    width: column.width !== undefined ? column.width : DEFAULT_COLUMN_WIDTH,
+                    style: column.style,
+                    isCustomWidth: column.isCustomWidth,
+                    hidden: column.hidden,
+                    outlineLevel: column.outlineLevel,
+                    collapsed: column.collapsed,
+                    bestFit: column.bestFit
+                };
+                cols.push(col);
+            }
+            else {
+                col.max = index + 1;
+            }
+        });
         return cols.length ? cols : undefined;
     }
     static fromModel(worksheetOrCols, colsMaybe) {
@@ -360,7 +358,7 @@ class Column {
                 columns.push(new Column(worksheet, count++, col));
             }
         }
-        return columns.length ? columns : null;
+        return columns;
     }
 }
 export { Column };

package/dist/esm/modules/excel/stream/worksheet-reader.js

@@ -22,7 +22,7 @@ class WorksheetReader extends EventEmitter {
         // and a name
         this.name = `Sheet${this.id}`;
         // column definitions
-        this._columns = null;
+        this._columns = [];
         this._keys = Object.create(null);
         // keep a record of dimensions
         this._dimensions = new Dimensions();
@@ -54,9 +54,6 @@ class WorksheetReader extends EventEmitter {
             // otherwise, assume letter
             c = colCache.l2n(c);
         }
-        if (!this._columns) {
-            this._columns = [];
-        }
         if (c > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= c) {

package/dist/esm/modules/excel/stream/worksheet-writer.js

@@ -71,7 +71,7 @@ class WorksheetWriter {
         // when they are committed, they will be deleted.
         this._rows = [];
         // column definitions
-        this._columns = null;
+        this._columns = [];
         // column keys (addRow convenience): key ==> this._columns index
         this._keys = {};
         // keep a record of all row and column pageBreaks
@@ -266,9 +266,6 @@ class WorksheetWriter {
             // otherwise, assume letter
             c = colCache.l2n(c);
         }
-        if (!this._columns) {
-            this._columns = [];
-        }
         if (c > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= c) {

package/dist/esm/modules/excel/utils/sheet-utils.js

@@ -510,8 +510,8 @@ export function bookAppendSheet(workbook, worksheet, name) {
         });
     });
     // Copy column properties
-    worksheet.columns?.forEach((col, idx) => {
-        if (col && newWs.columns?.[idx]) {
+    worksheet.columns.forEach((col, idx) => {
+        if (col && newWs.columns[idx]) {
             if (col.width) {
                 newWs.getColumn(idx + 1).width = col.width;
             }

package/dist/esm/modules/excel/worksheet.js

@@ -33,7 +33,7 @@ class Worksheet {
         // Note: _rows is zero based. Must subtract 1 to go from cell.row to index
         this._rows = [];
         // column definitions
-        this._columns = null;
+        this._columns = [];
         // column keys (addRow convenience): key ==> this._collumns index
         this._keys = {};
         // keep record of all merges
@@ -224,9 +224,6 @@ class Worksheet {
         else {
             colNum = c;
         }
-        if (!this._columns) {
-            this._columns = [];
-        }
         if (colNum > this._columns.length) {
             let n = this._columns.length + 1;
             while (n <= colNum) {
@@ -281,7 +278,7 @@ class Worksheet {
         // splice column definitions
         const nExpand = inserts.length - count;
         const nKeep = start + count;
-        const nEnd = this._columns ? this._columns.length : 0;
+        const nEnd = this._columns.length;
         if (nExpand < 0) {
             for (let i = start + inserts.length; i <= nEnd; i++) {
                 this.getColumn(i).defn = this.getColumn(i - nExpand).defn;
@@ -1128,7 +1125,7 @@ class Worksheet {
         };
         // =================================================
         // columns
-        model.cols = Column.toModel(this.columns ?? []);
+        model.cols = Column.toModel(this.columns);
         // ==========================================================
         // Rows
         const rows = (model.rows = []);

package/dist/iife/excelts.iife.js

@@ -1,5 +1,5 @@
 /*!
-* @cj-tech-master/excelts v6.0.0-beta.2
+* @cj-tech-master/excelts v6.0.0-beta.3
 * TypeScript Excel Workbook Manager - Read and Write xlsx and csv Files.
 * (c) 2026 cjnoname
 * Released under the MIT License
@@ -2437,7 +2437,7 @@ var ExcelTS = (function(exports) {
 		static toModel(columns) {
 			const cols = [];
 			let col = null;
-			if (columns) columns.forEach((column, index) => {
+			columns.forEach((column, index) => {
 				if (column.isDefault) {
 					if (col) col = null;
 				} else if (!col || !column.equivalentToModel(col)) {
@@ -2476,7 +2476,7 @@ var ExcelTS = (function(exports) {
 				while (count < col.min) columns.push(new Column(worksheet, count++));
 				while (count <= col.max) columns.push(new Column(worksheet, count++, col));
 			}
-			return columns.length ? columns : null;
+			return columns;
 		}
 	};
 	//#endregion
@@ -4323,7 +4323,7 @@ var ExcelTS = (function(exports) {
 			this.name = options.name || `sheet${this.id}`;
 			this.state = options.state ?? "visible";
 			this._rows = [];
-			this._columns = null;
+			this._columns = [];
 			this._keys = {};
 			this._merges = {};
 			this.rowBreaks = [];
@@ -4470,7 +4470,6 @@ var ExcelTS = (function(exports) {
 				if (col) return col;
 				colNum = colCache.l2n(c);
 			} else colNum = c;
-			if (!this._columns) this._columns = [];
 			if (colNum > this._columns.length) {
 				let n = this._columns.length + 1;
 				while (n <= colNum) this._columns.push(new Column(this, n++));
@@ -4503,7 +4502,7 @@ var ExcelTS = (function(exports) {
 			});
 			const nExpand = inserts.length - count;
 			const nKeep = start + count;
-			const nEnd = this._columns ? this._columns.length : 0;
+			const nEnd = this._columns.length;
 			if (nExpand < 0) for (let i = start + inserts.length; i <= nEnd; i++) this.getColumn(i).defn = this.getColumn(i - nExpand).defn;
 			else if (nExpand > 0) for (let i = nEnd; i >= nKeep; i--) this.getColumn(i + nExpand).defn = this.getColumn(i).defn;
 			for (let i = start; i < start + inserts.length; i++) this.getColumn(i).defn = void 0;
@@ -5083,7 +5082,7 @@ var ExcelTS = (function(exports) {
 				formControls: this.formControls.map((fc) => fc.model),
 				drawing: this._drawing
 			};
-			model.cols = Column.toModel(this.columns ?? []);
+			model.cols = Column.toModel(this.columns);
 			const rows = model.rows = [];
 			const dimensions = model.dimensions = new Range();
 			this._rows.forEach((row) => {
@@ -29167,7 +29166,7 @@ self.onmessage = async function(event) {
 			this.name = options.name || `Sheet${this.id}`;
 			this.state = options.state ?? "visible";
 			this._rows = [];
-			this._columns = null;
+			this._columns = [];
 			this._keys = {};
 			this._merges = [];
 			this._merges.add = function() {};
@@ -29315,7 +29314,6 @@ self.onmessage = async function(event) {
 				if (col) return col;
 				c = colCache.l2n(c);
 			}
-			if (!this._columns) this._columns = [];
 			if (c > this._columns.length) {
 				let n = this._columns.length + 1;
 				while (n <= c) this._columns.push(new Column(this, n++));
@@ -31229,7 +31227,7 @@ onmessage = async (ev) => {
 			this.iterator = iterator;
 			this.options = options || {};
 			this.name = `Sheet${this.id}`;
-			this._columns = null;
+			this._columns = [];
 			this._keys = Object.create(null);
 			this._dimensions = new Range();
 		}
@@ -31248,7 +31246,6 @@ onmessage = async (ev) => {
 				if (col) return col;
 				c = colCache.l2n(c);
 			}
-			if (!this._columns) this._columns = [];
 			if (c > this._columns.length) {
 				let n = this._columns.length + 1;
 				while (n <= c) this._columns.push(new Column(this, n++));
@@ -37054,8 +37051,8 @@ onmessage = async (ev) => {
 				if (cell.style) newCell.style = cell.style;
 			});
 		});
-		worksheet.columns?.forEach((col, idx) => {
-			if (col && newWs.columns?.[idx]) {
+		worksheet.columns.forEach((col, idx) => {
+			if (col && newWs.columns[idx]) {
 				if (col.width) newWs.getColumn(idx + 1).width = col.width;
 			}
 		});