Enable TableInterpreter to trim whitespace

libs/execution/src/lib/types/value-types/internal-representation-parsing.ts

@@ -18,31 +18,59 @@ import {
 
 export function parseValueToInternalRepresentation<
   I extends InternalValueRepresentation,
->(value: string, valueType: ValueType<I>): I | undefined {
-  const visitor = new InternalRepresentationParserVisitor(value);
+>(
+  value: string,
+  valueType: ValueType<I>,
+  parseOpts?: ParseOpts,
+): I | undefined {
+  const visitor = new InternalRepresentationParserVisitor(
+    value,
+    parseOpts ?? { skipLeadingWhitespace: true, skipTrailingWhitespace: true },
+  );
   const result = valueType.acceptVisitor(visitor);
   if (!valueType.isInternalValueRepresentation(result)) {
     return undefined;
   }
   return result;
 }
 
+export interface ParseOpts {
+  skipLeadingWhitespace: boolean;
+  skipTrailingWhitespace: boolean;
+}
+
 class InternalRepresentationParserVisitor extends ValueTypeVisitor<
   InternalValueRepresentation | undefined
 > {
-  constructor(private value: string) {
+  constructor(private value: string, private parseOpts: ParseOpts) {
     super();
   }
 
+  private trim() {
+    // BUG: https://github.com/jvalue/jayvee/issues/646
+    if (typeof this.value !== 'string') {
+      return;
+    }
+    if (this.parseOpts.skipLeadingWhitespace) {
+      this.value = this.value.trimStart();
+    }
+    if (this.parseOpts.skipTrailingWhitespace) {
+      this.value = this.value.trimEnd();
+    }
+  }
+
   visitBoolean(vt: BooleanValuetype): boolean | undefined {
+    this.trim();
     return vt.fromString(this.value);
   }
 
   visitDecimal(vt: DecimalValuetype): number | undefined {
+    this.trim();
     return vt.fromString(this.value);
   }
 
   visitInteger(vt: IntegerValuetype): number | undefined {
+    this.trim();
     return vt.fromString(this.value);
   }
 

libs/extensions/tabular/exec/src/lib/table-interpreter-executor.ts

@@ -58,6 +58,14 @@ export class TableInterpreterExecutor extends AbstractBlockExecutor<
         context.valueTypeProvider.Primitives.ValuetypeAssignment,
       ),
     );
+    const skipLeadingWhitespace = context.getPropertyValue(
+      'skipLeadingWhitespace',
+      context.valueTypeProvider.Primitives.Boolean,
+    );
+    const skipTrailingWhitespace = context.getPropertyValue(
+      'skipTrailingWhitespace',
+      context.valueTypeProvider.Primitives.Boolean,
+    );
 
     let columnEntries: ColumnDefinitionEntry[];
 
@@ -107,6 +115,8 @@ export class TableInterpreterExecutor extends AbstractBlockExecutor<
       inputSheet,
       header,
       columnEntries,
+      skipLeadingWhitespace,
+      skipTrailingWhitespace,
       context,
     );
     context.logger.logDebug(
@@ -119,6 +129,8 @@ export class TableInterpreterExecutor extends AbstractBlockExecutor<
     sheet: Sheet,
     header: boolean,
     columnEntries: ColumnDefinitionEntry[],
+    skipLeadingWhitespace: boolean,
+    skipTrailingWhitespace: boolean,
     context: ExecutionContext,
   ): Table {
     const table = new Table();
@@ -141,6 +153,8 @@ export class TableInterpreterExecutor extends AbstractBlockExecutor<
         sheetRow,
         sheetRowIndex,
         columnEntries,
+        skipLeadingWhitespace,
+        skipTrailingWhitespace,
         context,
       );
       if (tableRow === undefined) {
@@ -158,6 +172,8 @@ export class TableInterpreterExecutor extends AbstractBlockExecutor<
     sheetRow: string[],
     sheetRowIndex: number,
     columnEntries: ColumnDefinitionEntry[],
+    skipLeadingWhitespace: boolean,
+    skipTrailingWhitespace: boolean,
     context: ExecutionContext,
   ): R.TableRow | undefined {
     let invalidRow = false;
@@ -168,7 +184,13 @@ export class TableInterpreterExecutor extends AbstractBlockExecutor<
       const value = sheetRow[sheetColumnIndex]!;
       const valueType = columnEntry.valueType;
 
-      const parsedValue = this.parseAndValidateValue(value, valueType, context);
+      const parsedValue = this.parseAndValidateValue(
+        value,
+        valueType,
+        skipLeadingWhitespace,
+        skipTrailingWhitespace,
+        context,
+      );
       if (parsedValue === undefined) {
         const currentCellIndex = new CellIndex(sheetColumnIndex, sheetRowIndex);
         context.logger.logDebug(
@@ -192,9 +214,14 @@ export class TableInterpreterExecutor extends AbstractBlockExecutor<
   private parseAndValidateValue(
     value: string,
     valueType: ValueType,
+    skipLeadingWhitespace: boolean,
+    skipTrailingWhitespace: boolean,
     context: ExecutionContext,
   ): InternalValueRepresentation | undefined {
-    const parsedValue = parseValueToInternalRepresentation(value, valueType);
+    const parsedValue = parseValueToInternalRepresentation(value, valueType, {
+      skipLeadingWhitespace,
+      skipTrailingWhitespace,
+    });
     if (parsedValue === undefined) {
       return undefined;
     }

libs/language-server/src/stdlib/builtin-block-types/TableInterpreter.jv

@@ -4,7 +4,7 @@
 
 /**
 * Interprets a `Sheet` as a `Table`. In case a header row is present in the sheet, its names can be matched with the provided column names. Otherwise, the provided column names are assigned in order.
-* 
+*
 * @example Interprets a `Sheet` about cars with a topmost header row and interprets it as a `Table` by assigning a primitive value type to each column. The column names are matched to the header, so the order of the type assignments does not matter.
 * block CarsTableInterpreter oftype TableInterpreter {
 *   header: true;
@@ -14,7 +14,7 @@
 *     "cyl" oftype integer,
 *   ];
 * }
-* 
+*
 * @example Interprets a `Sheet` about cars without a topmost header row and interprets it as a `Table` by sequentially assigning a name and a primitive value type to each column of the sheet. Note that the order of columns matters here. The first column (column `A`) will be named "name", the second column (column `B`) will be named "mpg" etc.
 * block CarsTableInterpreter oftype TableInterpreter {
 *   header: false;
@@ -28,14 +28,24 @@
 publish builtin blocktype TableInterpreter {
 	input default oftype Sheet;
 	output default oftype Table;
-
-  /**
-  * Whether the first row should be interpreted as header row.
+
+	/**
+	* Whether the first row should be interpreted as header row.
+	*/
+	property header oftype boolean: true;
+
+	/**
+	* Collection of value type assignments. Uses column names (potentially matched with the header or by sequence depending on the `header` property) to assign a primitive value type to each column.
 	*/
-  property header oftype boolean: true;
-
-  /**
-  * Collection of value type assignments. Uses column names (potentially matched with the header or by sequence depending on the `header` property) to assign a primitive value type to each column.
+	property columns oftype Collection<ValuetypeAssignment>;
+
+	/**
+	* Whether to ignore whitespace before values. Does not apply to `text` cells
+	*/
+	property skipLeadingWhitespace oftype boolean: true;
+
+	/**
+	* Whether to ignore whitespace after values. Does not apply to `text` cells
 	*/
-  property columns oftype Collection<ValuetypeAssignment>;
-}
+	property skipTrailingWhitespace oftype boolean: true;
+}