fix: fix type definitions about last column, formula values and protection (#2309)

gltjk · web-flow · commit bd317dba105a · 2023-09-20T01:11:31.000+02:00
* fix: fix type definitions about last column, formula values and protection

* fix: add boolean type to formula value result

* add support for dashed `BorderStyle`
diff --git a/index.d.ts b/index.d.ts
@@ -230,7 +230,7 @@ export interface Font {
 }
 
 export type BorderStyle =
-	| 'thin' | 'dotted' | 'hair' | 'medium' | 'double' | 'thick' | 'dashDot'
+	| 'thin' | 'dotted' | 'hair' | 'medium' | 'double' | 'thick' | 'dashed' | 'dashDot'
 	| 'dashDotDot' | 'slantDashDot' | 'mediumDashed' | 'mediumDashDotDot' | 'mediumDashDot';
 
 export interface Color {
@@ -289,6 +289,7 @@ export interface Alignment {
 
 export interface Protection {
 	locked: boolean;
+	hidden: boolean;
 }
 
 export interface Style {
@@ -349,15 +350,15 @@ export interface CellHyperlinkValue {
 
 export interface CellFormulaValue {
 	formula: string;
-	result?: number | string | Date | { error: CellErrorValue };
-	date1904: boolean;
+	result?: number | string | boolean | Date | CellErrorValue;
+	date1904?: boolean;
 }
 
 export interface CellSharedFormulaValue {
 	sharedFormula: string;
 	readonly formula?: string;
-	result?: number | string | Date | { error: CellErrorValue };
-	date1904: boolean;
+	result?: number | string | boolean | Date | CellErrorValue;
+	date1904?: boolean;
 }
 
 export declare enum ValueType {
@@ -1140,7 +1141,7 @@ export interface Worksheet {
 	/**
 	 * Get the last column in a worksheet
 	 */
-	readonly lastColumn: Column;
+	readonly lastColumn: Column | undefined;
 
 	/**
 	 * A count of the number of columns that have values.
@@ -2022,4 +2023,4 @@ export namespace stream {
 			getColumn(c: number): Column;
 		}
 	}
-}
+}
diff --git a/lib/xlsx/xform/style/border-xform.js b/lib/xlsx/xform/style/border-xform.js
@@ -89,6 +89,7 @@ class EdgeXform extends BaseXform {
 
 EdgeXform.validStyleValues = [
   'thin',
+  'dashed',
   'dotted',
   'dashDot',
   'hair',
