refactor(table): rename value parser getter (c4spar#667)

annervisser · Feb 6, 2024 · 504ba12 · 504ba12
1 parent 01c8dff
commit 504ba12
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 15 deletions.
diff --git a/table/_layout.ts b/table/_layout.ts
@@ -264,16 +264,13 @@ export class TableLayout<
       );
     }
 
-    const cellValueParser =
-      (cell.getValueParser() ?? row.getCellValueParser() ??
-        (
-          isHeaderRow
-            ? column?.getHeaderValueParser()
-            : column?.getCellValueParser()
-        ) ??
-        (isHeaderRow
-          ? this.table.getHeaderValueParser()
-          : this.table.getCellValueParser())) as ValueParser<CellValue>;
+    const cellValueParser = (cell.getValueParser() ?? row.getValueParser() ??
+      (
+        isHeaderRow ? column?.getHeaderValueParser() : column?.getValueParser()
+      ) ??
+      (isHeaderRow
+        ? this.table.getHeaderValueParser()
+        : this.table.getValueParser())) as ValueParser<CellValue>;
 
     if (cellValueParser) {
       cell.value(cellValueParser);

diff --git a/table/cell.ts b/table/cell.ts
@@ -31,8 +31,7 @@ export interface CellOptions<TValue extends CellValue> {
   rowSpan?: number;
   /** Cell cell alignment direction. */
   align?: Direction;
-  // value?: ValueParser<TValue>;
-  value?(value: TValue): ValueParserResult;
+  value?: ValueParser<TValue>;
   /**
    * Any unterminated ANSI formatting overflowed from previous lines of a
    * multi-line cell.

diff --git a/table/column.ts b/table/column.ts
@@ -164,7 +164,7 @@ export class Column<
   }
 
   /** Get value parser. */
-  getCellValueParser(): ValueParser<TValue> | undefined {
+  getValueParser(): ValueParser<TValue> | undefined {
     return this.opts.value;
   }
 }
diff --git a/table/row.ts b/table/row.ts
@@ -156,7 +156,7 @@ export class Row<
   }
 
   /** Get value parser. */
-  public getCellValueParser(): ValueParser<GetCellValue<TCell>> | undefined {
+  public getValueParser(): ValueParser<GetCellValue<TCell>> | undefined {
     return this.options.value;
   }
 }

diff --git a/table/table.ts b/table/table.ts
@@ -412,7 +412,7 @@ export class Table<
   }
 
   /** Get value parser. */
-  public getCellValueParser():
+  public getValueParser():
     | ValueParser<GetRowInnerValue<TRow>>
     | undefined {
     return this.options.value;