@technicity/data-service-generator 0.15.0 → 0.16.1-next.0

package/dist/generation/generate.d.ts

@@ -1,7 +1,7 @@
 import type { IDialect, ISupplementClientOpts } from "../runtime/IRuntime";
-declare type ISpecialCaseUuidColumn = boolean;
-declare type IIncludeMappedFields = boolean;
-declare type IGenerateInput = {
+type ISpecialCaseUuidColumn = boolean;
+type IIncludeMappedFields = boolean;
+type IGenerateInput = {
     dialect: IDialect;
     database: string;
     user: string;

package/dist/generation/generate.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generate = void 0;
+exports.generate = generate;
 const path = __importStar(require("node:path"));
 const fs = __importStar(require("node:fs"));
 const os = __importStar(require("node:os"));
@@ -202,7 +202,6 @@ async function generate(input) {
     fse.copySync(tmpBuildOutputPath, sdkOutputPath);
     fse.removeSync(tmpDirPath);
 }
-exports.generate = generate;
 function init(input) {
     const { database, user, password, host, port, server } = input;
     if (dialect === "mysql") {

package/dist/lib/capitalizeFirstLetter.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalizeFirstLetter = void 0;
+exports.capitalizeFirstLetter = capitalizeFirstLetter;
 function capitalizeFirstLetter(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
 }
-exports.capitalizeFirstLetter = capitalizeFirstLetter;

package/dist/lib/getDuplicates.js

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDuplicates = void 0;
+exports.getDuplicates = getDuplicates;
 function getDuplicates(arr) {
     return arr.reduce((agg, col) => {
         agg.filter[col] = agg.filter[col] ? agg.dup.push(col) : 2;
         return agg;
     }, { filter: {}, dup: [] }).dup;
 }
-exports.getDuplicates = getDuplicates;

package/dist/lib/isNotNullOrUndefined.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNotNullOrUndefined = void 0;
+exports.isNotNullOrUndefined = isNotNullOrUndefined;
 // https://github.com/Microsoft/TypeScript/issues/16069
 function isNotNullOrUndefined(input) {
     return input != null;
 }
-exports.isNotNullOrUndefined = isNotNullOrUndefined;

package/dist/runtime/Cache.d.ts

@@ -1,7 +1,7 @@
 import Redis, { Cluster } from "ioredis";
 import { TResolveParams } from "./IRuntime";
 import Stats from "./Stats";
-export declare type RedisConfig = {
+export type RedisConfig = {
     host: string;
     port: number;
     tls?: boolean;

package/dist/runtime/IRuntime.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { AsyncLocalStorage } from "node:async_hooks";
 export interface IRuntime {
     resolve(input: TResolveParams): Promise<any>;
@@ -11,8 +10,8 @@ export interface IRuntime {
         isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE";
     }): Promise<TBeginTransactionResult>;
 }
-export declare type TAction = "findUnique" | "findMany" | "findManyPaginated" | "create" | "update" | "updateMany" | "delete" | "deleteMany";
-export declare type TResolveParams = {
+export type TAction = "findUnique" | "findMany" | "findManyPaginated" | "create" | "update" | "updateMany" | "delete" | "deleteMany";
+export type TResolveParams = {
     resource: string;
     action: TAction;
     args?: IArgs;
@@ -30,60 +29,60 @@ export declare type TResolveParams = {
     }>;
     sdk?: unknown;
 };
-export declare type TOnHandler = (sdk: unknown, input: unknown, output: unknown) => Promise<void>;
+export type TOnHandler = (sdk: unknown, input: unknown, output: unknown) => Promise<void>;
 export declare class EventOnHandlerError<T> extends Event {
     error: T;
     constructor(message: string, data: ConstructorParameters<typeof Event>[1] & {
         error: T;
     });
 }
-export declare type TContext = {
+export type TContext = {
     [k: string]: any;
 };
-export declare type TMiddleware = (params: TResolveParams, next: (params: TResolveParams) => Promise<any>) => Promise<any>;
-export declare type IDialect = "mysql" | "mssql" | "sqlite";
-export declare type TDbCall = (q: string) => Promise<any>;
-export declare type TFormatQuery = (q: string, values: any[]) => string;
-export declare type TBeginTransaction = () => Promise<TBeginTransactionResult>;
-declare type TBeginTransactionResult = {
+export type TMiddleware = (params: TResolveParams, next: (params: TResolveParams) => Promise<any>) => Promise<any>;
+export type IDialect = "mysql" | "mssql" | "sqlite";
+export type TDbCall = (q: string) => Promise<any>;
+export type TFormatQuery = (q: string, values: any[]) => string;
+export type TBeginTransaction = () => Promise<TBeginTransactionResult>;
+type TBeginTransactionResult = {
     dbCall: (q: string) => Promise<any>;
     commit: () => Promise<void>;
     rollback: () => Promise<void>;
 };
-export declare type ISupplementClientOpts = boolean;
-export declare type IOrderBy = {
+export type ISupplementClientOpts = boolean;
+export type IOrderBy = {
     column: string;
     direction: any;
 }[];
-export declare type IArgs = {
+export type IArgs = {
     [k: string]: any;
 };
-export declare type TSelect = {
+export type TSelect = {
     [k: string]: boolean | {
         $fields?: TSelect;
     };
 };
-declare type IWhere = (table: string, args: IArgs) => string | undefined;
-declare type IASTChildColumn = {
+type IWhere = (table: string, args: IArgs) => string | undefined;
+type IASTChildColumn = {
     type: "column";
     name: string;
     fieldName: string;
     as: string;
     fromOtherTable?: string;
 };
-declare type IASTChildComposite = {
+type IASTChildComposite = {
     type: "composite";
     name: string[];
     fieldName: string;
     as: string;
     fromOtherTable?: string;
 };
-declare type ISqlJoin = (t1: string, t2: string, args: IArgs) => string;
-declare type ISqlBatch = {
+type ISqlJoin = (t1: string, t2: string, args: IArgs) => string;
+type ISqlBatch = {
     thisKey: IASTChildColumn;
     parentKey: IASTChildColumn;
 };
-declare type IJunction = {
+type IJunction = {
     sqlTable: string;
     as: string;
     uniqueKey: string | string[];
@@ -99,7 +98,7 @@ declare type IJunction = {
     where?: IWhere;
     sqlJoins: ISqlJoin[];
 };
-export declare type IGetSQLASTInput = {
+export type IGetSQLASTInput = {
     table: string;
     fieldName: string;
     fields: TSelect;
@@ -116,17 +115,17 @@ export declare type IGetSQLASTInput = {
     dialect: IDialect;
     firstChild?: IASTChildColumn | IASTChildComposite;
 };
-export declare type IRelation = {
+export type IRelation = {
     table: string;
     foreignKey: string;
     referencedTable: string;
     referencedKey: string;
     nullable: boolean;
 };
-declare type IOneToManyOrManyToOne = "one-to-many__many-to-one";
-declare type IManyToMany = "many-to-many";
-declare type IRelationKind = "one-to-many" | "many-to-one";
-export declare type IRelationOneToManyOrManyToOne = {
+type IOneToManyOrManyToOne = "one-to-many__many-to-one";
+type IManyToMany = "many-to-many";
+type IRelationKind = "one-to-many" | "many-to-one";
+export type IRelationOneToManyOrManyToOne = {
     type: IOneToManyOrManyToOne;
     kind: IRelationKind;
     grabMany: boolean;
@@ -135,7 +134,7 @@ export declare type IRelationOneToManyOrManyToOne = {
     relation: IRelation;
     nullable: boolean;
 };
-export declare type IRelationManyToMany = {
+export type IRelationManyToMany = {
     type: IManyToMany;
     grabMany: boolean;
     table: string;
@@ -143,8 +142,8 @@ export declare type IRelationManyToMany = {
     name: string;
     relations: IRelation[];
 };
-export declare type IRelationField = IRelationOneToManyOrManyToOne | IRelationManyToMany;
-export declare type IMappedField = {
+export type IRelationField = IRelationOneToManyOrManyToOne | IRelationManyToMany;
+export type IMappedField = {
     name: string;
     as: string;
     type: string;
@@ -154,7 +153,7 @@ export declare type IMappedField = {
     referencedTable: string;
     referencedKey: string;
 };
-export declare type IArtifacts = {
+export type IArtifacts = {
     [k: string]: {
         table: string;
         primaryKey: string;
@@ -180,8 +179,8 @@ export declare type IArtifacts = {
         } | null;
     };
 };
-export declare type TFieldType = "string" | "boolean" | "number" | "integer";
-export declare type TField = {
+export type TFieldType = "string" | "boolean" | "number" | "integer";
+export type TField = {
     kind: "scalar";
     type: TFieldType;
     name: string;

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/RuntimeSQLite.d.ts

@@ -1,7 +1,7 @@
 import Database from "better-sqlite3";
 import type { IRuntime, TMiddleware, TResolveParams, IArtifacts, ISupplementClientOpts } from "./IRuntime";
 import { MiddlewareHandler } from "./lib/shared";
-declare type TClientOpts = {
+type TClientOpts = {
     filename: string;
 } & Parameters<typeof Database>[1];
 export declare class RuntimeSQLite implements IRuntime {

package/dist/runtime/Stats.d.ts

@@ -4,9 +4,5 @@ declare class Stats {
     constructor(client: Redis | Cluster);
     updateStats: (ms: number, category: string) => Promise<void>;
 }
-declare namespace timer {
-    type Callback = (time: number, ...params: any[]) => void;
-    type Params<T> = T extends (ms: number, ...params: infer U) => any ? U : never;
-}
 export declare function timer(): <T extends timer.Callback>(callback: T, ...args: timer.Params<T>) => void;
 export default Stats;

package/dist/runtime/Stats.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.timer = void 0;
+exports.timer = timer;
 const perf_hooks_1 = require("perf_hooks");
 class Stats {
     constructor(client) {
@@ -28,5 +28,4 @@ function timer() {
         callback(perf_hooks_1.performance.now() - start, ...args);
     };
 }
-exports.timer = timer;
 exports.default = Stats;

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/dist/runtime/lib/addNullFallbacks.js

@@ -2,7 +2,7 @@
 // If a many-to-one relation's ID field is null, we want the
 // relation field to be null as well, not undefined.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.addNullFallbacks = void 0;
+exports.addNullFallbacks = addNullFallbacks;
 function addNullFallbacks(sqlAST, data) {
     if (data == null) {
         return;
@@ -30,4 +30,3 @@ function addNullFallbacks(sqlAST, data) {
         }
     }
 }
-exports.addNullFallbacks = addNullFallbacks;

package/dist/runtime/lib/cursor.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decodeCursor = exports.encodeCursor = void 0;
+exports.encodeCursor = encodeCursor;
+exports.decodeCursor = decodeCursor;
 function encodeCursor(cursor) {
     return Buffer.from(JSON.stringify(cursor)).toString("base64");
 }
-exports.encodeCursor = encodeCursor;
 function decodeCursor(cursor) {
     return JSON.parse(Buffer.from(cursor, "base64").toString("utf8"));
 }
-exports.decodeCursor = decodeCursor;

package/dist/runtime/lib/getDateTimeStringMySQL.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDateTimeStringMySQL = void 0;
+exports.getDateTimeStringMySQL = getDateTimeStringMySQL;
 // Assumes input uses zero offset
 function getDateTimeStringMySQL(dateTimeString) {
     return dateTimeString.replace("T", " ").slice(0, 19);
 }
-exports.getDateTimeStringMySQL = getDateTimeStringMySQL;

package/dist/runtime/lib/getOrderBy.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOrderBy = void 0;
+exports.getOrderBy = getOrderBy;
 // https://gist.github.com/pcattori/2bb645d587e45c9fdbcabf5cef7a7106
 function getOrderBy(args, primaryKey) {
     let out = undefined;
@@ -41,7 +41,6 @@ function getOrderBy(args, primaryKey) {
     }
     return { orderBy: out, flip };
 }
-exports.getOrderBy = getOrderBy;
 function getFlip(args) {
     return args?.$paginate?.last != null;
 }

package/dist/runtime/lib/getSqlAst.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSqlAst = void 0;
+exports.getSqlAst = getSqlAst;
 const SqlString = __importStar(require("sqlstring"));
 // @ts-ignore
 const TSqlString = __importStar(require("tsqlstring"));
@@ -220,7 +220,6 @@ function getSqlAst(input) {
         }))
     };
 }
-exports.getSqlAst = getSqlAst;
 function keyToASTChild(key, namespace, fromOtherTable) {
     if (Array.isArray(key)) {
         const clumsyName = toClumsyName(key);

package/dist/runtime/lib/getWhere.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWhere = void 0;
+exports.getWhere = getWhere;
 const stringifyWhere_1 = require("./stringifyWhere");
 function getWhere(
 // Note: `table` is not escaped in getWhere, so it should be escaped beforehand.
@@ -18,4 +18,3 @@ table, args, dialect, orderBy, rowWithMatchingCursor) {
         rowWithMatchingCursor,
     }) || null);
 }
-exports.getWhere = getWhere;

package/dist/runtime/lib/shared.js

@@ -26,7 +26,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports._prepareWhere = exports.whereNeedsProcessing = exports.postProcess = exports.MiddlewareHandler = exports.resolve = void 0;
+exports.MiddlewareHandler = void 0;
+exports.resolve = resolve;
+exports.postProcess = postProcess;
+exports.whereNeedsProcessing = whereNeedsProcessing;
+exports._prepareWhere = _prepareWhere;
 // @ts-ignore
 // import * as queryAST from "join-monster/dist/query-ast-to-sql-ast";
 // @ts-ignore
@@ -95,7 +99,6 @@ async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, mi
     }
     return p;
 }
-exports.resolve = resolve;
 function _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache) {
     switch (input.action) {
         case "findMany":
@@ -871,7 +874,6 @@ function postProcess(data, fields, shouldRemoveExtraKeys) {
         removeExtraKeys(data, fields);
     }
 }
-exports.postProcess = postProcess;
 function removeExtraKeys(data, fields) {
     if (data == null || (Array.isArray(data) && data[0] == null)) {
         return;
@@ -967,7 +969,6 @@ function typeCastSqlite(data, fields, table, artifacts) {
 function whereNeedsProcessing(where) {
     return JSON.stringify(where).includes("Uuid");
 }
-exports.whereNeedsProcessing = whereNeedsProcessing;
 async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
     const mappedFields = artifacts[table].mappedFields;
     let out = {};
@@ -1063,7 +1064,6 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
     });
     return out;
 }
-exports._prepareWhere = _prepareWhere;
 function getPrepareWhereNotFoundMessage(mappedField, value) {
     return `Not found: unable to map \`${mappedField.referencedTable}\`.\`${mappedField.name}\` to \`${mappedField.referencedTable}\`.\`${mappedField.referencedKey}\` for the value \`${value}\`.`;
 }

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

@@ -1,8 +1,8 @@
 import type { IOrderBy, IDialect } from "../IRuntime";
-declare type IWhere = {
+type IWhere = {
     [k: string]: any;
 };
-declare type IArgs = {
+type IArgs = {
     [k: string]: any;
 };
 export declare function stringifyWhere(input: {

package/dist/runtime/lib/stringifyWhere.js

@@ -23,7 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEscape = exports.getEscapeId = exports.stringifyWhere = void 0;
+exports.stringifyWhere = stringifyWhere;
+exports.getEscapeId = getEscapeId;
+exports.getEscape = getEscape;
 const _ = __importStar(require("lodash/fp"));
 const MySqlString = __importStar(require("sqlstring"));
 // @ts-expect-error
@@ -49,7 +51,6 @@ function stringifyWhere(input) {
     }
     return result;
 }
-exports.stringifyWhere = stringifyWhere;
 function _stringifyWhere(where, table, escapeId, escape, result) {
     if (Object.prototype.hasOwnProperty.call(where, "$and")) {
         if (Object.keys(where).length !== 1) {
@@ -239,7 +240,6 @@ function getEscapeId(dialect) {
     }
     throw new Error("Unsupported dialect: " + dialect);
 }
-exports.getEscapeId = getEscapeId;
 function getEscape(dialect) {
     if (dialect === "mysql") {
         return MySqlString.escape.bind(MySqlString);
@@ -252,4 +252,3 @@ function getEscape(dialect) {
     }
     throw new Error("Unsupported dialect: " + dialect);
 }
-exports.getEscape = getEscape;

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

@@ -1,3 +1,3 @@
-declare type TValueCast = (value: any) => any;
+type TValueCast = (value: any) => any;
 export declare function typeCastMSSQL(customTypeCast?: (meta: any, mssql: any) => TValueCast): (result: any, meta: any) => any;
 export {};

package/dist/runtime/lib/typeCastMSSQL.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typeCastMSSQL = void 0;
+exports.typeCastMSSQL = typeCastMSSQL;
 const mssql = __importStar(require("mssql"));
 // TODO: see https://github.com/tediousjs/node-mssql/pull/1171
 function typeCastMSSQL(customTypeCast) {
@@ -60,4 +60,3 @@ function typeCastMSSQL(customTypeCast) {
         });
     };
 }
-exports.typeCastMSSQL = typeCastMSSQL;

package/dist/runtime/lib/utility.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.flatten = exports.mapAsync = void 0;
+exports.mapAsync = mapAsync;
+exports.flatten = flatten;
 /**
  * Eagerly resolve and map input values then concatinate.
  */
@@ -8,8 +9,6 @@ async function mapAsync(source, mapFunction) {
     const output = (await source).map(mapFunction);
     return Promise.all(flatten(output)).then(flatten);
 }
-exports.mapAsync = mapAsync;
 function flatten(array) {
     return [].concat(...array);
 }
-exports.flatten = flatten;

package/dist/traverseFieldArgs.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traverseFieldArgs = void 0;
+exports.traverseFieldArgs = traverseFieldArgs;
 function traverseFieldArgs(fields, cb) {
     const values = Object.values(fields);
     for (let x of values) {
@@ -15,4 +15,3 @@ function traverseFieldArgs(fields, cb) {
         traverseFieldArgs(fields, cb);
     }
 }
-exports.traverseFieldArgs = traverseFieldArgs;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.15.0",
+  "version": "0.16.1-next.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",
@@ -47,7 +46,7 @@
     "jest": "^29.4.3",
     "sinon": "12.0.1",
     "testcontainers": "^9.1.3",
-    "typescript": "4.6.4"
+    "typescript": "5.5.2"
   },
   "resolutions": {
     "xml2js": "0.5.0",