feat: allow dynamic format & static cellStyle definition

ChronicStone · Dec 5, 2023 · f885be2 · f885be2
1 parent 8df4369
commit f885be2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/consumption.xlsx b/consumption.xlsx
diff --git a/example.xlsx b/example.xlsx
diff --git a/src/index.ts b/src/index.ts
@@ -160,7 +160,6 @@ export class ExcelBuilder<UsedSheetKeys extends string = never> {
 
               return column.transform ? (column.transform as ValueTransformer)(value) : value
             },
-            format: column.format,
             _ref: column,
           } satisfies (IColumn & { _ref: Column<any, any, any, any> })
         }),
@@ -212,7 +211,9 @@ export class ExcelBuilder<UsedSheetKeys extends string = never> {
         } satisfies CellStyle
         sheetConfig.content.forEach((row, rowIndex) => {
           const cellRef = getSheetCellKey(index + 1, rowIndex + 2)
-          const style = column._ref.cellStyle?.(row) ?? {}
+          const style = typeof column._ref.cellStyle === 'function'
+            ? column._ref.cellStyle(row)
+            : column._ref.cellStyle ?? {}
 
           if (!workbook.Sheets[sheetName][cellRef])
             workbook.Sheets[sheetName][cellRef] = { v: '', t: 's' } satisfies XLSX.CellObject
@@ -229,7 +230,7 @@ export class ExcelBuilder<UsedSheetKeys extends string = never> {
                     top: { style: 'thin', color: { rgb: '000000' } },
                   }
                 : {},
-              numFmt: column._ref.format,
+              numFmt: typeof column._ref.format === 'function' ? column._ref.format(row) : column._ref.format,
             } satisfies CellStyle,
           )
         })

diff --git a/src/types.ts b/src/types.ts
@@ -45,6 +45,11 @@ export type AllKeysMatch<T extends object, U> = {
   [K in keyof T]: T[K] extends U ? true : false;
 }[keyof T] extends true ? true : false
 
+// https://twitter.com/mattpocockuk/status/1622730173446557697?s=20
+export type Prettify<T> = {
+  [K in keyof T]: T[K]
+} & {}
+
 export type CellValue = string | number | boolean | null | undefined | Date
 
 export type ValueTransformer = (value: any) => CellValue
@@ -78,8 +83,8 @@ export type Column<
   columnKey: ColKey
   key: FieldValue
   default?: CellValue
-  format?: string
-  cellStyle?: (rowData: T) => CellStyle
+  format?: string | ((rowData: T) => string)
+  cellStyle?: CellStyle | ((rowData: T) => CellStyle)
 } & (
   ExtractColumnValue<T, FieldValue> extends CellValue
     ? { transform?: TypedTransformersMap<TransformMap, ExtractColumnValue<T, FieldValue>> | ((value: ExtractColumnValue<T, FieldValue>) => CellValue) }
@@ -138,7 +143,7 @@ export type Sheet<
   data: T[]
   select?: SelectColsMap
   context?: {}
-} & (keyof SelectedContextMap extends never ? {} : { context: SelectedContextMap })
+} & (keyof SelectedContextMap extends never ? {} : { context: Prettify<SelectedContextMap> })
 
 export type ExtractContextMap<
   Schema extends ExcelSchema<any, any, string, any>,