fix: project should work with non-existing columns

fatmatto · Sep 27, 2023 · 243de56 · 243de56
1 parent 01bed3a
commit 243de56
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/src/lib/timeframe.spec.ts b/src/lib/timeframe.spec.ts
@@ -393,6 +393,11 @@ test("TimeFrame.project() should correctly aggregate columns", (t) => {
   t.is(tf.columns().length, 2);
   t.is(projected.columns().length, 1);
   t.is(projected.metadata.hello, "world");
+
+
+  const projected2 = tf.project({ columns: ['energy1', 'nonexisting'], skipMissingColumns: true })
+
+  t.is(projected2.columns().length, 1);
 });
 
 test("TimeFrame.mul() should correctly multiply values", (t) => {

diff --git a/src/lib/timeframe.ts b/src/lib/timeframe.ts
@@ -349,14 +349,19 @@ export class TimeFrame {
    * Returns a new timeframe with a subset of columns.
    */
   project(config: ProjectionOptions): TimeFrame {
-    const nonExisting = config.columns.filter(
-      (name: string) => !this.columnNames.includes(name),
-    );
-    if (nonExisting.length > 0 && config.skipMissingColumns === false) {
-      throw new Error(`Non existing columns ${nonExisting.join(",")}`);
+    if (config.skipMissingColumns === false) {
+      const nonExisting = config.columns.filter(
+        (name: string) => !this.columnNames.includes(name),
+      );
+      if (nonExisting.length > 0) {
+        throw new Error(`Non existing columns ${nonExisting.join(",")}`);
+      }
     }
+    const existingColumns = config.columns.filter(
+      (name: string) => this.columnNames.includes(name),
+    );
     const tf = TimeFrame.fromTimeseries(
-      config.columns.map((columnName: string) => this.column(columnName)),
+      existingColumns.map((columnName: string) => this.column(columnName)),
     );
     tf.metadata = this.metadata;
     return tf;