Merge pull request ghiscoding#139 from ghiscoding/bugfix/instruction-numbers

fix: ExcelStyleInstruction props can also be numbers

Author: ghiscoding

packages/excel-builder-vanilla-types/dist/index.d.ts

@@ -413,13 +413,13 @@ export interface ExcelSortState {
 export interface ExcelStyleInstruction {
 	id?: number;
 	alignment?: ExcelAlignmentStyle;
-	border?: ExcelBorderStyle;
+	border?: ExcelBorderStyle | number;
 	borderId?: number;
-	fill?: ExcelFillStyle;
+	fill?: ExcelFillStyle | number;
 	fillId?: number;
-	font?: ExcelFontStyle;
+	font?: ExcelFontStyle | number;
 	fontId?: number;
-	format?: string;
+	format?: string | number;
 	height?: number;
 	numFmt?: string;
 	numFmtId?: number;

packages/excel-builder-vanilla/src/Excel/StyleSheet.ts

@@ -107,7 +107,7 @@ export class StyleSheet {
     if (styleInstructions.font && isObject(styleInstructions.font)) {
       style.fontId = this.createFontStyle(styleInstructions.font).id;
     } else if (styleInstructions.font) {
-      if (Number.isNaN(Number.parseInt(styleInstructions.font, 10))) {
+      if (Number.isNaN(Number.parseInt(styleInstructions.font as unknown as string, 10))) {
         throw new Error('Passing a non-numeric font id is not supported');
       }
       style.fontId = styleInstructions.font;
@@ -116,7 +116,7 @@ export class StyleSheet {
     if (styleInstructions.format && isString(styleInstructions.format)) {
       style.numFmtId = this.createNumberFormatter(styleInstructions.format).id;
     } else if (styleInstructions.format) {
-      if (Number.isNaN(Number.parseInt(styleInstructions.format, 10))) {
+      if (Number.isNaN(Number.parseInt(styleInstructions.format as unknown as string, 10))) {
         throw new Error('Invalid number formatter id');
       }
       style.numFmtId = styleInstructions.format;
@@ -125,7 +125,7 @@ export class StyleSheet {
     if (styleInstructions.border && isObject(styleInstructions.border)) {
       style.borderId = this.createBorderFormatter(styleInstructions.border).id;
     } else if (styleInstructions.border) {
-      if (Number.isNaN(Number.parseInt(styleInstructions.border, 10))) {
+      if (Number.isNaN(Number.parseInt(styleInstructions.border as unknown as string, 10))) {
         throw new Error('Passing a non-numeric border id is not supported');
       }
       style.borderId = styleInstructions.border;
@@ -134,7 +134,7 @@ export class StyleSheet {
     if (styleInstructions.fill && isObject(styleInstructions.fill)) {
       style.fillId = this.createFill(styleInstructions.fill).id;
     } else if (styleInstructions.fill) {
-      if (Number.isNaN(Number.parseInt(styleInstructions.fill, 10))) {
+      if (Number.isNaN(Number.parseInt(styleInstructions.fill as unknown as string, 10))) {
         throw new Error('Passing a non-numeric fill id is not supported');
       }
       style.fillId = styleInstructions.fill;

packages/excel-builder-vanilla/src/interfaces.ts

@@ -124,13 +124,13 @@ export interface ExcelSortState {
 export interface ExcelStyleInstruction {
   id?: number;
   alignment?: ExcelAlignmentStyle;
-  border?: ExcelBorderStyle;
+  border?: ExcelBorderStyle | number;
   borderId?: number;
-  fill?: ExcelFillStyle;
+  fill?: ExcelFillStyle | number;
   fillId?: number;
-  font?: ExcelFontStyle;
+  font?: ExcelFontStyle | number;
   fontId?: number;
-  format?: string;
+  format?: string | number;
   height?: number;
   numFmt?: string;
   numFmtId?: number;