@technicity/data-service-generator 0.16.0 → 0.17.0

package/dist/runtime/RuntimeMySQL.d.ts

@@ -1,22 +1,25 @@
 import { RedisConfig } from "./Cache";
 import type { IRuntime, TMiddleware, TResolveParams, IArtifacts, ISupplementClientOpts } from "./IRuntime";
+import { MySQL } from "./lib/MySQL";
 export declare class RuntimeMySQL implements IRuntime {
     #private;
-    constructor(clientOpts: {
-        [k: string]: any;
-    }, otherOpts: {
+    constructor(clientOpts: ConstructorParameters<typeof MySQL>[0], otherOpts: {
         supplementClientOpts?: ISupplementClientOpts;
         redis?: RedisConfig;
     }, artifacts: IArtifacts);
     resolve(input: TResolveParams): Promise<any>;
-    $queryRaw(sql: string, values?: any[]): Promise<any>;
+    $queryRaw(sql: 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]>;
     $use(middleware: TMiddleware): Promise<void>;
     $whereNeedsProcessing(where: any): boolean;
     $prepareWhere(artifacts: IArtifacts, table: string, data: any): Promise<{}>;
     $shutdown(): Promise<void>;
     $startTransaction(input?: {
         isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE";
-    }): Promise<any>;
+    }): Promise<{
+        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]>;
+    }>;
     private dbCall;
     private formatQuery;
 }

package/dist/runtime/RuntimeMySQL.js

@@ -64,13 +64,11 @@ class RuntimeMySQL {
                     // if (field.type === "DATE") {
                     //   return field.string();
                     // }
-                    // if (
-                    //   field.type === "TIMESTAMP" ||
-                    //   field.type === "DATE" ||
-                    //   field.type === "DATETIME"
-                    // ) {
-                    //   return new Date(field.string()).toISOString();
-                    // }
+                    if (field.type === "TIMESTAMP" ||
+                        field.type === "DATE" ||
+                        field.type === "DATETIME") {
+                        return new Date(field.string()).toISOString();
+                    }
                     if (field.type === "VAR_STRING" || field.type === "STRING") {
                         return field.string();
                     }

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

@@ -1,8 +1,12 @@
+import * as mysql from "mysql2/promise";
 export declare class MySQL {
-    pool: any;
-    constructor(opts: any);
-    query(...args: any[]): any;
-    beginTransaction(isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE"): Promise<any>;
-    getConnection(): Promise<any>;
+    pool: mysql.Pool;
+    constructor(opts: Parameters<typeof mysql.createPool>[0]);
+    query(...args: any[]): Promise<mysql.OkPacket | mysql.ResultSetHeader | mysql.ResultSetHeader[] | mysql.RowDataPacket[] | mysql.RowDataPacket[][] | mysql.OkPacket[] | [mysql.RowDataPacket[], mysql.ResultSetHeader]>;
+    beginTransaction(isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE"): Promise<{
+        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]>;
+    }>;
     endPool(): Promise<void>;
 }

package/dist/runtime/lib/MySQL.js

@@ -1,52 +1,99 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MySQL = void 0;
-const mysql = require("mysql");
-const P = require("bluebird");
-P.promisifyAll(require("mysql/lib/Connection").prototype);
-P.promisifyAll(require("mysql/lib/Pool").prototype);
+const mysql = __importStar(require("mysql2/promise"));
 class MySQL {
     constructor(opts) {
         this.pool = mysql.createPool(opts);
+        if (opts.debug) {
+            this.pool.on("acquire", (connection) => {
+                console.log("Connection %d acquired", connection.threadId);
+            });
+            this.pool.on("connection", (connection) => {
+                console.log("Connection %d connected", connection.threadId);
+            });
+            this.pool.on("enqueue", () => {
+                console.log("Waiting for available connection slot");
+            });
+            this.pool.on("release", (connection) => {
+                console.log("Connection %d released", connection.threadId);
+            });
+        }
     }
-    // http://bluebirdjs.com/docs/api/promise.using.html
     query(...args) {
-        return P.using(this.getConnection(), (connection) => connection.queryAsync(...args));
+        return this.pool
+            .query(
+        // @ts-expect-error
+        ...args)
+            .then(([rows]) => rows);
     }
     async beginTransaction(isolationLevel) {
-        return P.using(this.getConnection(), async (connection) => {
-            async function handleError(err) {
-                await connection.rollbackAsync();
-                throw err;
+        const connection = await this.pool.getConnection();
+        // https://dev.mysql.com/doc/refman/8.0/en/set-transaction.html#set-transaction-isolation-level
+        // Without any SESSION or GLOBAL keyword:
+        // The statement applies only to the next single transaction performed within the session.
+        if (isolationLevel != null) {
+            if (isolationLevel !== "READ UNCOMMITTED" &&
+                isolationLevel !== "READ COMMITTED" &&
+                isolationLevel !== "REPEATABLE READ" &&
+                isolationLevel !== "SERIALIZABLE") {
+                throw new Error(`Invalid isolationLevel: ${isolationLevel}`);
             }
-            // https://dev.mysql.com/doc/refman/8.0/en/set-transaction.html#set-transaction-isolation-level
-            // Without any SESSION or GLOBAL keyword:
-            // The statement applies only to the next single transaction performed within the session.
-            if (isolationLevel != null) {
-                if (isolationLevel !== "READ UNCOMMITTED" &&
-                    isolationLevel !== "READ COMMITTED" &&
-                    isolationLevel !== "REPEATABLE READ" &&
-                    isolationLevel !== "SERIALIZABLE") {
-                    throw new Error(`Invalid isolationLevel: ${isolationLevel}`);
+            await connection.query(`SET TRANSACTION ISOLATION LEVEL ${isolationLevel};`);
+        }
+        await connection.beginTransaction();
+        return {
+            commit: () => connection
+                .commit()
+                .catch(async (err) => {
+                await connection.rollback();
+                throw err;
+            })
+                .finally(() => {
+                connection.release();
+            }),
+            rollback: () => connection.rollback().finally(() => {
+                connection.release();
+            }),
+            dbCall: (q) => connection
+                .query(q)
+                .then(([rows]) => rows)
+                .catch(async (err) => {
+                try {
+                    await connection.rollback();
                 }
-                await connection.queryAsync(`SET TRANSACTION ISOLATION LEVEL ${isolationLevel};`);
-            }
-            await connection.beginTransactionAsync();
-            return {
-                commit: () => connection.commitAsync().catch(handleError),
-                rollback: () => connection.rollbackAsync(),
-                dbCall: (q) => connection.queryAsync(q).catch(handleError)
-            };
-        });
-    }
-    // http://bluebirdjs.com/docs/api/disposer.html
-    async getConnection() {
-        return this.pool
-            .getConnectionAsync()
-            .disposer((connection) => connection.release());
+                finally {
+                    connection.release();
+                }
+                throw err;
+            })
+        };
     }
     async endPool() {
-        await this.pool.endAsync();
+        await this.pool.end();
     }
 }
 exports.MySQL = MySQL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -15,7 +15,6 @@
   "dependencies": {
     "@types/better-sqlite3": "^7.6.3",
     "better-sqlite3": "^8.1.0",
-    "bluebird": "^3.7.2",
     "change-case": "^4.1.1",
     "fs-extra": "10.0.0",
     "graphql": "15.8.0",
@@ -26,7 +25,7 @@
     "lodash": "^4.17.20",
     "loglevel": "^1.8.1",
     "mssql": "^6.3.1",
-    "mysql": "^2.18.1",
+    "mysql2": "^3.10.1",
     "prettier": "^2.1.2",
     "sqlstring": "^2.3.2",
     "sqlstring-sqlite": "^0.1.1",