@stackpress/inquire-mysql2 0.3.27 → 0.3.28

package/dist/Connection.d.ts

@@ -1,18 +1,19 @@
-import type { ResultSetHeader, Connection as Database } from 'mysql2/promise';
+import type { ResultSetHeader } from 'mysql2/promise';
 import type { Dialect, Connection, QueryObject, Transaction } from '@stackpress/inquire/dist/types';
-import type { Results } from './types';
-export default class Mysql2Connection implements Connection {
+import type { Connector, Resource, Results } from './types';
+export default class Mysql2Connection implements Connection<Resource> {
     readonly dialect: Dialect;
-    readonly resource: Database;
     protected _lastId?: number | string;
+    protected _resource: Connector;
     get lastId(): string | number | undefined;
-    constructor(resource: Database);
+    constructor(resource: Connector);
     format(request: QueryObject): {
         query: string;
         values: import("@stackpress/inquire/dist/types").Value[];
     };
     query<R = unknown>(request: QueryObject): Promise<R[]>;
     raw<R = unknown>(request: QueryObject): Promise<[ResultSetHeader, undefined] | Results<R>>;
+    resource(): Promise<import("mysql2/promise").Connection>;
     transaction<R = unknown>(callback: Transaction<R>): Promise<R>;
     protected _query<R = unknown>(request: QueryObject): Promise<Results<R> | [ResultSetHeader, undefined]>;
 }

package/dist/Connection.js

@@ -19,7 +19,7 @@ class Mysql2Connection {
     }
     constructor(resource) {
         this.dialect = Mysql_1.default;
-        this.resource = resource;
+        this._resource = resource;
     }
     format(request) {
         let { query, values = [] } = request;
@@ -52,16 +52,25 @@ class Mysql2Connection {
             return yield this._query(formatted);
         });
     }
+    resource() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof this._resource === 'function') {
+                this._resource = yield this._resource();
+            }
+            return this._resource;
+        });
+    }
     transaction(callback) {
         return __awaiter(this, void 0, void 0, function* () {
+            const resource = yield this.resource();
             try {
-                yield this.resource.beginTransaction();
+                yield resource.beginTransaction();
                 const results = yield callback(this);
-                yield this.resource.commit();
+                yield resource.commit();
                 return results;
             }
             catch (e) {
-                yield this.resource.rollback();
+                yield resource.rollback();
                 throw e;
             }
         });
@@ -69,7 +78,8 @@ class Mysql2Connection {
     _query(request) {
         return __awaiter(this, void 0, void 0, function* () {
             const { query, values = [] } = request;
-            const results = yield this.resource.execute(query, values);
+            const resource = yield this.resource();
+            const results = yield resource.execute(query, values);
             if (Array.isArray(results[0])) {
                 return results;
             }

package/dist/helpers.d.ts

@@ -1,3 +1,3 @@
-import type { Connection as Database } from 'mysql2/promise';
 import Engine from '@stackpress/inquire/dist/Engine';
-export declare function connect(resource: Database): Engine;
+import type { Connector } from './types';
+export declare function connect(resource: Connector): Engine<import("mysql2/promise").Connection>;

package/dist/types.d.ts

@@ -1,2 +1,4 @@
-import type { FieldPacket } from 'mysql2/promise';
+import type { Connection, FieldPacket } from 'mysql2/promise';
 export type Results<R = unknown> = [R[], FieldPacket[]];
+export type Resource = Connection;
+export type Connector = Resource | (() => Promise<Resource>);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stackpress/inquire-mysql2",
-  "version": "0.3.27",
+  "version": "0.3.28",
   "license": "Apache-2.0",
   "description": "Generic typed mysql2",
   "author": "Chris <chris@incept.asia>",
@@ -28,7 +28,7 @@
     "test": "ts-mocha tests/*.test.ts"
   },
   "dependencies": {
-    "@stackpress/inquire": "0.3.27"
+    "@stackpress/inquire": "0.3.28"
   },
   "peerDependencies": {
     "mysql2": "^3.11.5"