@technicity/data-service-generator 0.20.0 → 0.22.0

package/README.md

@@ -49,6 +49,8 @@ async function main() {
 
 - `yarn test`
 
+Might need to run `docker pull --platform linux/amd64 mysql:5.7.41` ahead of time.
+
 #### Unit Tests
 
 Comment out `globalSetup` in `jest.config.js`, then:

package/dist/generation/generate.js

@@ -296,11 +296,12 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts,
         | "REPEATABLE READ"
         | "SERIALIZABLE"
     }) {
-      const { dbCall, commit, rollback } = await this.runtime.$startTransaction(input);
+      const { dbCall, queryRaw, commit, rollback } = await this.runtime.$startTransaction(input);
       const runtime = this.runtime;
       const eventTarget = this.eventTarget;
       const onHandlerMap = this.onHandlerMap;
       return {
+        $queryRaw: queryRaw,
         $commit: commit,
         $rollback: rollback,
         ${(await Promise.all(input.flatMap(async (x) => {

package/dist/runtime/IRuntime.d.ts

@@ -48,6 +48,7 @@ type TBeginTransactionResult = {
     dbCall: (q: string) => Promise<any>;
     commit: () => Promise<void>;
     rollback: () => Promise<void>;
+    queryRaw: (q: string, values: any[]) => Promise<any>;
 };
 export type ISupplementClientOpts = boolean;
 export type IOrderBy = {

package/dist/runtime/RuntimeMySQL.d.ts

@@ -19,6 +19,7 @@ export declare class RuntimeMySQL implements IRuntime {
         commit: () => Promise<void>;
         rollback: () => Promise<void>;
         dbCall: (q: string) => Promise<import("mysql2").OkPacket | import("mysql2").ResultSetHeader | import("mysql2").ResultSetHeader[] | import("mysql2").RowDataPacket[] | import("mysql2").RowDataPacket[][] | import("mysql2").OkPacket[] | [import("mysql2").RowDataPacket[], import("mysql2").ResultSetHeader]>;
+        queryRaw: (q: string, values: any[]) => Promise<import("mysql2").OkPacket | import("mysql2").ResultSetHeader | import("mysql2").ResultSetHeader[] | import("mysql2").RowDataPacket[] | import("mysql2").RowDataPacket[][] | import("mysql2").OkPacket[] | [import("mysql2").RowDataPacket[], import("mysql2").ResultSetHeader]>;
     }>;
     private dbCall;
     private formatQuery;

package/dist/runtime/RuntimeSQLite.d.ts

@@ -13,7 +13,7 @@ export declare class RuntimeSQLite implements IRuntime {
         supplementClientOpts?: ISupplementClientOpts;
     }, artifacts: IArtifacts);
     resolve(input: TResolveParams): Promise<any>;
-    $queryRaw(sql: string, values?: any[]): Promise<any[] | {
+    $queryRaw(sql: string, values?: any[]): Promise<unknown[] | {
         insertId: number | bigint;
     }>;
     $use(middleware: TMiddleware): Promise<void>;
@@ -25,13 +25,17 @@ export declare class RuntimeSQLite implements IRuntime {
     }): Promise<{
         commit: () => Promise<void>;
         rollback: () => Promise<void>;
-        dbCall: (q: string) => Promise<any[] | {
+        dbCall: (q: string) => Promise<unknown[] | {
+            insertId: number | bigint;
+        }>;
+        queryRaw: (sql: string, values?: any[] | undefined) => Promise<unknown[] | {
             insertId: number | bigint;
         }>;
     }>;
     private dbCall;
     private formatQuery;
     private dbCallTransaction;
+    private queryRawTransaction;
     private commit;
     private rollback;
 }

package/dist/runtime/RuntimeSQLite.js

@@ -92,7 +92,8 @@ class RuntimeSQLite {
         return {
             commit: this.commit.bind(this),
             rollback: this.rollback.bind(this),
-            dbCall: this.dbCallTransaction.bind(this)
+            dbCall: this.dbCallTransaction.bind(this),
+            queryRaw: this.queryRawTransaction.bind(this)
         };
     }
     async dbCall(q) {
@@ -118,6 +119,15 @@ class RuntimeSQLite {
             throw err;
         }
     }
+    async queryRawTransaction(...args) {
+        try {
+            return await this.$queryRaw(...args);
+        }
+        catch (err) {
+            __classPrivateFieldGet(this, _RuntimeSQLite_db, "f").prepare("ROLLBACK").run();
+            throw err;
+        }
+    }
     async commit() {
         try {
             __classPrivateFieldGet(this, _RuntimeSQLite_db, "f").prepare("COMMIT").run();

package/dist/runtime/lib/MySQL.d.ts

@@ -7,6 +7,7 @@ export declare class MySQL {
         commit: () => Promise<void>;
         rollback: () => Promise<void>;
         dbCall: (q: string) => Promise<mysql.OkPacket | mysql.ResultSetHeader | mysql.ResultSetHeader[] | mysql.RowDataPacket[] | mysql.RowDataPacket[][] | mysql.OkPacket[] | [mysql.RowDataPacket[], mysql.ResultSetHeader]>;
+        queryRaw: (q: string, values: any[]) => Promise<mysql.OkPacket | mysql.ResultSetHeader | mysql.ResultSetHeader[] | mysql.RowDataPacket[] | mysql.RowDataPacket[][] | mysql.OkPacket[] | [mysql.RowDataPacket[], mysql.ResultSetHeader]>;
     }>;
     endPool(): Promise<void>;
 }

package/dist/runtime/lib/MySQL.js

@@ -94,6 +94,18 @@ class MySQL {
                     connection.release();
                 }
                 throw err;
+            }),
+            queryRaw: (q, values) => connection
+                .query(q, values)
+                .then(([rows]) => rows)
+                .catch(async (err) => {
+                try {
+                    await connection.rollback();
+                }
+                finally {
+                    connection.release();
+                }
+                throw err;
             })
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.20.0",
+  "version": "0.22.0",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -13,8 +13,8 @@
     "test:unit": "jest ./src"
   },
   "dependencies": {
-    "@types/better-sqlite3": "^7.6.3",
-    "better-sqlite3": "^8.1.0",
+    "@types/better-sqlite3": "^7.6.12",
+    "better-sqlite3": "^11.9.1",
     "change-case": "^4.1.1",
     "fs-extra": "10.0.0",
     "graphql": "15.8.0",
@@ -34,6 +34,7 @@
     "@jest/globals": "^29.4.3",
     "@swc/core": "^1.3.36",
     "@swc/jest": "^0.2.24",
+    "@testcontainers/mysql": "^10.23.0",
     "@types/fs-extra": "9.0.13",
     "@types/lodash": "4.14.177",
     "@types/node": "^18.14.1",
@@ -42,7 +43,10 @@
     "@types/uuid": "^8.3.1",
     "jest": "^29.4.3",
     "sinon": "12.0.1",
-    "testcontainers": "^9.1.3",
+    "testcontainers": "^10.23.0",
     "typescript": "5.5.2"
+  },
+  "resolutions": {
+    "tar-fs": "2.1.2"
   }
 }