@stackpress/inquire-mysql2 0.4.6 → 0.5.1

package/{dist → cjs}/Connection.d.ts

@@ -1,5 +1,5 @@
 import type { ResultSetHeader } from 'mysql2/promise';
-import type { Dialect, Connection, QueryObject, Transaction } from '@stackpress/inquire/dist/types';
+import type { Dialect, Connection, QueryObject, Transaction } from '@stackpress/inquire/types';
 import type { Connector, Resource, Results } from './types';
 export default class Mysql2Connection implements Connection<Resource> {
     readonly dialect: Dialect;
@@ -9,7 +9,7 @@ export default class Mysql2Connection implements Connection<Resource> {
     constructor(resource: Connector);
     format(request: QueryObject): {
         query: string;
-        values: import("@stackpress/inquire/dist/types").Value[];
+        values: import("@stackpress/inquire/types").Value[];
     };
     query<R = unknown>(request: QueryObject): Promise<R[]>;
     raw<R = unknown>(request: QueryObject): Promise<[ResultSetHeader, undefined] | Results<R>>;

package/{dist → cjs}/Connection.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Mysql_1 = __importDefault(require("@stackpress/inquire/dist/dialect/Mysql"));
+const Mysql_1 = __importDefault(require("@stackpress/inquire/Mysql"));
 class Mysql2Connection {
     get lastId() {
         return this._lastId;

package/{dist → cjs}/helpers.d.ts

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

package/{dist → cjs}/helpers.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.connect = connect;
-const Engine_1 = __importDefault(require("@stackpress/inquire/dist/Engine"));
+const Engine_1 = __importDefault(require("@stackpress/inquire/Engine"));
 const Connection_1 = __importDefault(require("./Connection"));
 function connect(resource) {
     const connection = new Connection_1.default(resource);

package/cjs/package.json

@@ -0,0 +1 @@
+{"type": "commonjs"}

package/esm/Connection.d.ts

@@ -0,0 +1,19 @@
+import type { ResultSetHeader } from 'mysql2/promise';
+import type { Dialect, Connection, QueryObject, Transaction } from '@stackpress/inquire/types';
+import type { Connector, Resource, Results } from './types';
+export default class Mysql2Connection implements Connection<Resource> {
+    readonly dialect: Dialect;
+    protected _lastId?: number | string;
+    protected _resource: Connector;
+    get lastId(): string | number | undefined;
+    constructor(resource: Connector);
+    format(request: QueryObject): {
+        query: string;
+        values: import("@stackpress/inquire/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/esm/Connection.js

@@ -0,0 +1,67 @@
+import Mysql from '@stackpress/inquire/Mysql';
+export default class Mysql2Connection {
+    dialect = Mysql;
+    _lastId;
+    _resource;
+    get lastId() {
+        return this._lastId;
+    }
+    constructor(resource) {
+        this._resource = resource;
+    }
+    format(request) {
+        let { query, values = [] } = request;
+        for (let i = 0; i < values.length; i++) {
+            const value = values[i];
+            if (value instanceof Date) {
+                values[i] = value.toISOString();
+            }
+            else if (Array.isArray(value)) {
+                values[i] = JSON.stringify(value);
+            }
+            else if (value && typeof value === 'object') {
+                values[i] = JSON.stringify(value);
+            }
+        }
+        return { query, values };
+    }
+    async query(request) {
+        const results = await this.raw(request);
+        if (!Array.isArray(results[0]) && results[0].insertId) {
+            this._lastId = results[0].insertId;
+        }
+        return Array.isArray(results[0]) ? results[0] : [];
+    }
+    async raw(request) {
+        const formatted = this.format(request);
+        return await this._query(formatted);
+    }
+    async resource() {
+        if (typeof this._resource === 'function') {
+            this._resource = await this._resource();
+        }
+        return this._resource;
+    }
+    async transaction(callback) {
+        const resource = await this.resource();
+        try {
+            await resource.beginTransaction();
+            const results = await callback(this);
+            await resource.commit();
+            return results;
+        }
+        catch (e) {
+            await resource.rollback();
+            throw e;
+        }
+    }
+    async _query(request) {
+        const { query, values = [] } = request;
+        const resource = await this.resource();
+        const results = await resource.execute(query, values);
+        if (Array.isArray(results[0])) {
+            return results;
+        }
+        return results;
+    }
+}

package/esm/helpers.d.ts

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

package/esm/helpers.js

@@ -0,0 +1,6 @@
+import Engine from '@stackpress/inquire/Engine';
+import Connection from './Connection';
+export function connect(resource) {
+    const connection = new Connection(resource);
+    return new Engine(connection);
+}

package/esm/index.d.ts

@@ -0,0 +1,5 @@
+import Mysql2Connection from './Connection';
+import { connect } from './helpers';
+export type * from './types';
+export { Mysql2Connection, connect };
+export default connect;

package/esm/index.js

@@ -0,0 +1,4 @@
+import Mysql2Connection from './Connection';
+import { connect } from './helpers';
+export { Mysql2Connection, connect };
+export default connect;

package/esm/package.json

@@ -0,0 +1 @@
+{"type": "module"}

package/esm/types.d.ts

@@ -0,0 +1,4 @@
+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/esm/types.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,7 @@
 {
+  "type": "module",
   "name": "@stackpress/inquire-mysql2",
-  "version": "0.4.6",
+  "version": "0.5.1",
   "license": "Apache-2.0",
   "description": "Generic typed mysql2",
   "author": "Chris <chris@incept.asia>",
@@ -15,20 +16,53 @@
     "mysql",
     "stackpress"
   ],
-  "main": "index.js",
+  "main": "./cjs/index.js",
+  "module": "./esm/index.js",
+  "types": "./cjs/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./cjs/index.js",
+      "import": "./esm/index.js"
+    },
+    "./helpers": {
+      "require": "./cjs/helpers.js",
+      "import": "./esm/helpers.js"
+    },
+    "./types": {
+      "require": "./cjs/types.js",
+      "import": "./esm/types.js"
+    },
+    "./Connection": {
+      "require": "./cjs/Connection.js",
+      "import": "./esm/Connection.js"
+    }
+  },
+  "typesVersions": {
+    "*": {
+      "index": [ "./cjs/index.d.ts"],
+      "helpers": [ "./cjs/helpers.d.ts" ],
+      "types": [ "./cjs/types.d.ts" ],
+      "Connection": [ "./cjs/Connection.d.ts" ]
+    }
+  },
   "files": [
-    "dist",
-    "index.js",
-    "index.d.ts",
+    "cjs",
+    "esm",
     "LICENSE",
     "README.md"
   ],
   "scripts": {
-    "build": "tsc",
-    "test": "ts-mocha tests/*.test.ts"
+    "build": "yarn build:tsc && yarn build:pkg",
+    "build:pkg": "yarn build:pkg:cjs && yarn build:pkg:esm",
+    "build:pkg:cjs": "echo '{\"type\": \"commonjs\"}' > cjs/package.json",
+    "build:pkg:esm": "echo '{\"type\": \"module\"}' > esm/package.json",
+    "build:tsc": "yarn build:tsc:cjs && yarn build:tsc:esm",
+    "build:tsc:cjs": "tsc -p ./tsconfig.cjs.json",
+    "build:tsc:esm": "tsc -p ./tsconfig.esm.json",
+    "test": "DATABASE_URL=test ts-mocha -p ./tsconfig.cjs.json tests/*.test.ts"
   },
   "dependencies": {
-    "@stackpress/inquire": "0.4.6"
+    "@stackpress/inquire": "0.5.1"
   },
   "peerDependencies": {
     "mysql2": "^3.11.5"

package/index.d.ts

@@ -1,3 +0,0 @@
-import connect from './dist';
-export * from './dist';
-export default connect;

package/index.js

@@ -1 +0,0 @@
-module.exports = require('./dist');