@teamkeel/functions-runtime 0.225.1 → 0.227.0

package/dist/index.d.ts

@@ -57,12 +57,9 @@ declare module '@teamkeel/functions-runtime/db/query' {
 declare module '@teamkeel/functions-runtime/db/resolver' {
   import { SqlQueryParts } from "@teamkeel/functions-runtime/db/query";
   export interface QueryResolver {
-      runQuery(query: SqlQueryParts): Promise<QueryResult>;
+      runQuery(query: SqlQueryParts): Promise<QueryResultRow[]>;
       runRawQuery(query: string): Promise<QueryResultRow[]>;
   }
-  export interface QueryResult {
-      rows: QueryResultRow[];
-  }
   export interface QueryResultRow {
       [column: string]: any;
   }
@@ -73,7 +70,7 @@ declare module '@teamkeel/functions-runtime/db/resolver' {
           connectionString: string;
       });
       runRawQuery(query: string): Promise<QueryResultRow[]>;
-      runQuery(query: SqlQueryParts): Promise<QueryResult>;
+      runQuery(query: SqlQueryParts): Promise<QueryResultRow[]>;
       private toQuery;
   }
   export class AwsRdsDataClientQueryResolver implements QueryResolver {
@@ -88,7 +85,7 @@ declare module '@teamkeel/functions-runtime/db/resolver' {
           dbName: string;
       });
       runRawQuery(sql: string): Promise<QueryResultRow[]>;
-      runQuery(query: SqlQueryParts): Promise<QueryResult>;
+      runQuery(query: SqlQueryParts): Promise<QueryResultRow[]>;
       private toQuery;
       private toDataApiFormat;
   }

package/dist/index.js

@@ -25970,6 +25970,10 @@ var dateParam = (d) => {
   return d;
 };
 
+// src/util/camelCaser.ts
+var import_change_case2 = __toESM(require_dist15());
+var camelCaser_default = (input) => (0, import_change_case2.camelCase)(input);
+
 // src/query.ts
 var ChainableQuery = class {
   constructor({
@@ -25988,9 +25992,9 @@ var ChainableQuery = class {
         this.conditions,
         this.orderClauses
       );
-      const result = await this.execute(sql);
+      const rows = await this.execute(sql);
       return {
-        collection: result.rows
+        collection: rows
       };
     };
     this.findOne = async () => {
@@ -26000,9 +26004,9 @@ var ChainableQuery = class {
         void 0,
         1
       );
-      const result = await this.execute(sql);
+      const rows = await this.execute(sql);
       return {
-        object: result.rows[0],
+        object: rows[0],
         errors: []
       };
     };
@@ -26011,7 +26015,7 @@ var ChainableQuery = class {
       return this;
     };
     this.execute = async (query) => {
-      return this.queryResolver.runQuery(query);
+      return this.queryResolver.runQuery(query).then(rowsWithObjectKeysCamelCased);
     };
     this.tableName = tableName;
     this.conditions = conditions;
@@ -26034,11 +26038,11 @@ var Query = class {
       };
       const values = { ...inputs, ...builtIns };
       const query = buildCreateStatement(this.tableName, values);
-      const result = await this.execute(query);
+      const rows = await this.execute(query);
       return {
         object: {
           ...inputs,
-          id: result.rows[0].id
+          id: rows[0].id
         },
         errors: []
       };
@@ -26056,16 +26060,16 @@ var Query = class {
     };
     this.delete = async (id) => {
       const query = buildDeleteStatement(this.tableName, id);
-      const result = await this.execute(query);
+      const rows = await this.execute(query);
       return {
-        success: result.rows.length === 1
+        success: rows.length === 1
       };
     };
     this.findOne = async (conditions) => {
       const query = buildSelectStatement(this.tableName, [conditions]);
-      const result = await this.execute(query);
+      const rows = await this.execute(query);
       return {
-        object: result.rows[0],
+        object: rows[0],
         errors: []
       };
     };
@@ -26082,13 +26086,13 @@ var Query = class {
     };
     this.all = async () => {
       const sql = buildSelectStatement(this.tableName, this.conditions);
-      const result = await this.execute(sql);
+      const rows = await this.execute(sql);
       return {
-        collection: result.rows
+        collection: rows
       };
     };
     this.execute = async (query) => {
-      return this.queryResolver.runQuery(query);
+      return this.queryResolver.runQuery(query).then(rowsWithObjectKeysCamelCased);
     };
     this.tableName = tableName;
     this.conditions = [];
@@ -26096,6 +26100,19 @@ var Query = class {
     this.logger = logger;
   }
 };
+var rowsWithObjectKeysCamelCased = (rows) => {
+  return rows.map((row) => {
+    if (row && typeof row === "object") {
+      const camelCasedKeysObject = {};
+      for (let key of Object.keys(row)) {
+        camelCasedKeysObject[camelCaser_default(key)] = row[key];
+      }
+      return camelCasedKeysObject;
+    } else {
+      return row;
+    }
+  });
+};
 
 // src/constraints.ts
 var constraints_exports = {};
@@ -26199,12 +26216,6 @@ var customFunctions_default = handler;
 // src/db/resolver.ts
 var import_pg = __toESM(require_lib2());
 var import_client_rds_data = __toESM(require_dist_cjs47());
-
-// src/util/camelCaser.ts
-var import_change_case2 = __toESM(require_dist15());
-var camelCaser_default = (input) => (0, import_change_case2.camelCase)(input);
-
-// src/db/resolver.ts
 function queryResolverFromEnv(env) {
   const dbConnType = env["DB_CONN_TYPE"];
   switch (dbConnType) {
@@ -26246,25 +26257,11 @@ var PgQueryResolver = class {
     this.pool = new import_pg.default.Pool({ connectionString: config.connectionString });
   }
   async runRawQuery(query) {
-    const result = await this.pool.query(query);
-    return result.rows;
+    return this.runQuery([rawSql(query)]);
   }
   async runQuery(query) {
     const result = await this.pool.query(this.toQuery(query));
-    if (result.rows) {
-      result.rows = result.rows.map((row) => {
-        if (row && typeof row === "object") {
-          const camelCasedKeysObject = {};
-          for (let key of Object.keys(row)) {
-            camelCasedKeysObject[camelCaser_default(key)] = row[key];
-          }
-          return camelCasedKeysObject;
-        } else {
-          return row;
-        }
-      });
-    }
-    return result;
+    return result.rows;
   }
   toQuery(query) {
     let nextInterpolationIndex = 1;
@@ -26289,56 +26286,7 @@ var AwsRdsDataClientQueryResolver = class {
     this.dbName = config.dbName;
   }
   async runRawQuery(sql) {
-    const input = {
-      resourceArn: this.dbClusterResourceArn,
-      secretArn: this.dbCredentialsSecretArn,
-      database: this.dbName,
-      sql,
-      includeResultMetadata: true
-    };
-    const command = new import_client_rds_data.ExecuteStatementCommand(input);
-    const data = await this.client.send(command);
-    const rows = data.records.map((fieldArray) => {
-      const row = {};
-      for (let i = 0; i < fieldArray.length; i++) {
-        const field = fieldArray[i];
-        const column = data.columnMetadata[i].name;
-        const typeName = data.columnMetadata[i].typeName;
-        const value = import_client_rds_data.Field.visit(field, {
-          isNull: function(value2) {
-            return null;
-          },
-          booleanValue: function(value2) {
-            return value2;
-          },
-          longValue: function(value2) {
-            return value2;
-          },
-          doubleValue: function(value2) {
-            return value2;
-          },
-          stringValue: function(value2) {
-            if (typeName === "timestamp") {
-              return new Date(value2);
-            } else {
-              return value2;
-            }
-          },
-          blobValue: function(value2) {
-            return value2;
-          },
-          arrayValue: function(value2) {
-            return value2;
-          },
-          _: function(name, value2) {
-            return value2;
-          }
-        });
-        row[column] = value;
-      }
-      return row;
-    });
-    return rows;
+    return this.runQuery([rawSql(sql)]);
   }
   async runQuery(query) {
     const { sql, params } = this.toQuery(query);
@@ -26353,7 +26301,7 @@ var AwsRdsDataClientQueryResolver = class {
     const command = new import_client_rds_data.ExecuteStatementCommand(input);
     const data = await this.client.send(command);
     if (!data.records) {
-      return { rows: [] };
+      return [];
     }
     const rows = data.records.map((fieldArray) => {
       const row = {};
@@ -26395,18 +26343,7 @@ var AwsRdsDataClientQueryResolver = class {
       }
       return row;
     });
-    const rowsWithObjectKeysCamelCased = rows.map((row) => {
-      if (row && typeof row === "object") {
-        const camelCasedKeysObject = {};
-        for (let key of Object.keys(row)) {
-          camelCasedKeysObject[camelCaser_default(key)] = row[key];
-        }
-        return camelCasedKeysObject;
-      } else {
-        return row;
-      }
-    });
-    return { rows: rowsWithObjectKeysCamelCased };
+    return rows;
   }
   toQuery(query) {
     let nextInterpolationIndex = 1;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamkeel/functions-runtime",
-  "version": "0.225.1",
+  "version": "0.227.0",
   "description": "Internal package used by @teamkeel/sdk",
   "main": "dist/index.js",
   "scripts": {