unmarshall arrayValue. (#24)

* unmarshall array values. * unmarshall array values. * add changeset.
sst · Apr 29, 2023 · d5d5e5a · d5d5e5a
1 parent e8162ce
commit d5d5e5a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 13 deletions.
diff --git a/.changeset/tame-pants-impress.md b/.changeset/tame-pants-impress.md
@@ -0,0 +1,5 @@
+---
+"kysely-data-api": patch
+---
+
+arrayValue fields will now be unmarshalled so consumers will get JS arrays.
diff --git a/src/data-api-driver.ts b/src/data-api-driver.ts
@@ -1,4 +1,4 @@
-import { RDSData, SqlParameter } from "@aws-sdk/client-rds-data";
+import { ArrayValue, RDSData, SqlParameter } from "@aws-sdk/client-rds-data";
 import { CompiledQuery, DatabaseConnection, Driver, QueryResult } from "kysely";
 
 export type DataApiDriverConfig = {
@@ -109,19 +109,21 @@ class DataApiConnection implements DatabaseConnection {
     }
     const rows = r.records
       ?.filter((r) => r.length !== 0)
-      .map(
-        (rec) =>
-          Object.fromEntries(
-            rec.map((val, i) => [
-              r.columnMetadata![i].label || r.columnMetadata![i].name,
-              val.stringValue ??
-                val.blobValue ??
-                val.longValue ??
-                val.arrayValue ??
+      .map((rec) =>
+        Object.fromEntries(
+          rec.map((val, i) => [
+            r.columnMetadata![i].label || r.columnMetadata![i].name,
+            val.isNull
+              ? null
+              : val.stringValue ??
                 val.doubleValue ??
-                (val.isNull ? null : val.booleanValue),
-            ])
-          ) as unknown as O
+                val.longValue ??
+                val.booleanValue ??
+                this.#unmarshallArrayValue(val.arrayValue) ??
+                val.blobValue ??
+                null, // FIXME: should throw an error here?
+          ])
+        )
       );
     const result: QueryResult<O> = {
       rows: rows || [],
@@ -135,4 +137,18 @@ class DataApiConnection implements DatabaseConnection {
   ): AsyncIterableIterator<QueryResult<O>> {
     throw new Error("Data API does not support streaming");
   }
+
+  #unmarshallArrayValue(arrayValue: ArrayValue | undefined): unknown {
+    if (!arrayValue) {
+      return undefined;
+    }
+
+    return (
+      arrayValue.stringValues ??
+      arrayValue.doubleValues ??
+      arrayValue.longValues ??
+      arrayValue.booleanValues ??
+      arrayValue.arrayValues?.map(this.#unmarshallArrayValue)
+    );
+  }
 }