Merge pull request #1092 from exceljs/f/typings-fix

alubbe · web-flow · commit b35e9de8400e · 2020-02-06T11:53:23.000+01:00
Fix index.d.ts
diff --git a/index.d.ts b/index.d.ts
@@ -386,7 +386,7 @@ export interface CellModel {
 	text?: string;
 	hyperlink?: string;
 	value?: CellValue;
-	master: Cell;
+	master: string;
 	formula?: string;
 	sharedFormula?: string;
 	result?: string | number | any;
@@ -405,7 +405,7 @@ export interface Cell extends Style, Address {
 	readonly text: string;
 	readonly fullAddress: {
 		sheetName: string;
-		address: Address;
+		address: string;
 		row: Row;
 		col: Column;
 	};
@@ -612,9 +612,22 @@ export interface Column {
 	 * Column letter key
 	 */
 	readonly letter: string;
-}
+	readonly number: number;
+	readonly worksheet: Worksheet;
+	readonly isCustomWidth: boolean;
+	readonly headers: string[];
+	readonly isDefault: boolean;
+	readonly headerCount: number;
+	border: Partial<Borders>;
+	fill: Fill;
+	numFmt: string
+	font: Partial<Font>;
+	alignment: Partial<Alignment>;
+	protection: Partial<Protection>;
+
+	toString(): string
+	equivalentTo(other: Column): boolean
 
-export interface ColumnExtension extends Partial<Style> {
 	/**
 	 * indicate the collapsed state based on outlineLevel
 	 */
@@ -629,8 +642,9 @@ export interface ColumnExtension extends Partial<Style> {
 	 * Iterate over all current cells in this column including empty cells
 	 */
 	eachCell(opt: { includeEmpty: boolean }, callback: (cell: Cell, rowNumber: number) => void): void;
-}
 
+	defn: any; //todo
+}
 export interface PageSetup {
 	/**
 	 * Whitespace on the borders of the page. Units are inches.
@@ -1014,7 +1028,7 @@ export interface Worksheet {
 	/**
 	 * Access an individual columns by key, letter and 1-based column number
 	 */
-	getColumn(indexOrKey: number | string): Partial<Column> & ColumnExtension;
+	getColumn(indexOrKey: number | string): Partial<Column>;
 
 	/**
 	 * Cut one or more columns (columns to the right are shifted left)
