Revert "refactor(table): rename value parser getter (#667)"

This reverts commit 13357b9.
c4spar · Apr 7, 2024 · fb75b6c · fb75b6c
1 parent da56395
commit fb75b6c
Show file tree

Hide file tree

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

diff --git a/table/cell.ts b/table/cell.ts
@@ -31,7 +31,8 @@ export interface CellOptions<TValue extends CellValue> {
   rowSpan?: number;
   /** Cell cell alignment direction. */
   align?: Direction;
-  value?: ValueParser<TValue>;
+  // value?: ValueParser<TValue>;
+  value?(value: TValue): ValueParserResult;
   /**
    * 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. */
-  getValueParser(): ValueParser<TValue> | undefined {
+  getCellValueParser(): 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 getValueParser(): ValueParser<GetCellValue<TCell>> | undefined {
+  public getCellValueParser(): 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 getValueParser():
+  public getCellValueParser():
     | ValueParser<GetRowInnerValue<TRow>>
     | undefined {
     return this.options.value;