@technicity/data-service-generator 0.11.3 → 0.11.5

package/dist/runtime/Cache.js

@@ -42,7 +42,15 @@ class Cache {
             });
         }
         this.client = client;
-        client.connect();
+        // call connect() if not already connected or in the process of connecting
+        if (client.status !== "connect" &&
+            client.status !== "connecting" &&
+            client.status !== "reconnecting") {
+            client.connect();
+        }
+        else {
+            loglevel_1.default.info("DB SDK client status is currently: " + client.status);
+        }
         client.on("connect", () => {
             loglevel_1.default.info(`DB SDK connected to redis server at ${host}:${port}`);
             if (this.waiting)

package/dist/runtime/IRuntime.d.ts

@@ -5,6 +5,9 @@ export interface IRuntime {
     $whereNeedsProcessing(where: any): boolean;
     $prepareWhere(artifacts: IArtifacts, table: string, data: any): Promise<any>;
     $shutdown(): Promise<void>;
+    $startTransaction(input?: {
+        isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE";
+    }): Promise<TBeginTransactionResult>;
 }
 export declare type TResolveParams = {
     resource: string;
@@ -15,6 +18,7 @@ export declare type TResolveParams = {
     fields?: IField[] | undefined;
     context?: TContext | undefined;
     skipCache?: boolean;
+    dbCall?: TDbCall;
 };
 export declare type TContext = {
     [k: string]: any;
@@ -23,10 +27,12 @@ export declare type TMiddleware = (params: TResolveParams, next: (params: TResol
 export declare type IDialect = "mysql" | "mssql" | "ksql";
 export declare type TDbCall = (q: string) => Promise<any>;
 export declare type TFormatQuery = (q: string, values: any[]) => string;
-export declare type TBeginTransaction = () => Promise<{
+export declare type TBeginTransaction = () => Promise<TBeginTransactionResult>;
+declare type TBeginTransactionResult = {
     dbCall: (q: string) => Promise<any>;
     commit: () => Promise<void>;
-}>;
+    rollback: () => Promise<void>;
+};
 export declare type ISupplementClientOpts = boolean;
 export declare type IOrderBy = {
     column: string;

package/dist/runtime/RuntimeKSQL.d.ts

@@ -15,5 +15,12 @@ export declare class RuntimeKSQL implements IRuntime {
     $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<{
+        dbCall: (q: string) => Promise<string>;
+        commit: () => Promise<void>;
+        rollback: () => Promise<void>;
+    }>;
 }
 export {};

package/dist/runtime/RuntimeKSQL.js

@@ -60,6 +60,14 @@ class RuntimeKSQL {
     async $shutdown() {
         // Nothing to do here, I think
     }
+    async $startTransaction(input) {
+        throw new Error("Not implemented.");
+        return {
+            dbCall: async (q) => "",
+            commit: async () => { },
+            rollback: async () => { }
+        };
+    }
 }
 exports.RuntimeKSQL = RuntimeKSQL;
 _RuntimeKSQL_ksql = new WeakMap(), _RuntimeKSQL_middlewareHandler = new WeakMap(), _RuntimeKSQL_dbCall = new WeakMap(), _RuntimeKSQL_formatQuery = new WeakMap(), _RuntimeKSQL_getBaseTableName = new WeakMap(), _RuntimeKSQL_getMaterializedViewName = new WeakMap(), _RuntimeKSQL_doNotUseMaterializedViews = new WeakMap();
@@ -151,8 +159,7 @@ async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName,
     let where = undefined;
     if (args?.$where != null) {
         let argsMapped = args;
-        if (typeof argsMapped.$where === "object" &&
-            argsMapped.$where[table] != null) {
+        if (typeof argsMapped.$where === "object" && argsMapped.$where[table] != null) {
             argsMapped = _.cloneDeep(argsMapped);
             argsMapped.$where = argsMapped.$where[table];
         }
@@ -160,7 +167,7 @@ async function _getData(input, grabMany, dbCall, formatQuery, getBaseTableName,
             where: argsMapped.$where,
             table: escapeId(getTableName(table)),
             dialect: "mysql",
-            args: argsMapped,
+            args: argsMapped
         });
         if (whereResult) {
             where = whereResult;
@@ -288,10 +295,10 @@ async function resolveDependentFields(table, parentData, mappedFields, relationF
             mappedField.name,
             getBaseTableName(mappedField.referencedTable),
             mappedField.referencedKey,
-            parentData?.[mappedField.foreignKey],
+            parentData?.[mappedField.foreignKey]
         ]);
         return dbCall(s).then((xs) => ({
-            [x]: xs?.[0]?.[mappedField.name] ?? null,
+            [x]: xs?.[0]?.[mappedField.name] ?? null
         }));
     }))
         .concat(relationFields.map((x) => {
@@ -316,8 +323,8 @@ async function resolveDependentFields(table, parentData, mappedFields, relationF
             whereJunction = {
                 $and: [
                     { [relationField.relations[0].foreignKey]: junctionKeyValue },
-                    whereJunction,
-                ],
+                    whereJunction
+                ]
             };
             const key = relationField.relations[1].foreignKey;
             const s = formatQuery(`SELECT ?? FROM ?? WHERE ${(0, stringifyWhere_1.stringifyWhere)({
@@ -325,20 +332,20 @@ async function resolveDependentFields(table, parentData, mappedFields, relationF
                 table: escapeId(getBaseTableName(relationField.junctionTable)),
                 dialect: "mysql",
                 // Since we're paginating, empty is fine
-                args: {},
+                args: {}
             })};`, [key, getBaseTableName(relationField.junctionTable)]);
             return dbCall(s)
                 .then((xs) => xs.map((x) => x?.[key]))
                 .then((keys) => {
                 const whereDest = {
-                    [relationField.relations[1].referencedKey]: { $in: keys },
+                    [relationField.relations[1].referencedKey]: { $in: keys }
                 };
                 const argsMapped = x.args == null ? {} : _.cloneDeep(x.args);
                 if (typeof argsMapped?.$where === "object" &&
                     argsMapped.$where != null &&
                     argsMapped.$where[relationField.table] != null) {
                     argsMapped.$where = {
-                        $and: [whereDest, argsMapped.$where[relationField.table]],
+                        $and: [whereDest, argsMapped.$where[relationField.table]]
                     };
                 }
                 else if (argsMapped.$where != null) {
@@ -352,7 +359,7 @@ async function resolveDependentFields(table, parentData, mappedFields, relationF
                     args: argsMapped,
                     fields: x.fields,
                     artifacts,
-                    action: relationField.grabMany ? "findMany" : "findUnique",
+                    action: relationField.grabMany ? "findMany" : "findUnique"
                 }, relationField.grabMany, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews).then((xx) => ({ [x.as ?? x.name]: xx }));
             });
         }
@@ -375,7 +382,7 @@ async function resolveDependentFields(table, parentData, mappedFields, relationF
                 args: argsMapped,
                 fields: x.fields,
                 artifacts,
-                action: relationField.grabMany ? "findMany" : "findUnique",
+                action: relationField.grabMany ? "findMany" : "findUnique"
             }, relationField.grabMany, dbCall, formatQuery, getBaseTableName, getMaterializedViewName, doNotUseMaterializedViews).then((xx) => ({ [x.as ?? x.name]: xx }));
         }
         throw new Error(`Invalid relationField.type`);
@@ -396,7 +403,7 @@ function paginate(data, args, primaryKey, action) {
             data = data.slice(offset, offset + limit);
             return {
                 results: data,
-                paginationInfo: { totalCount },
+                paginationInfo: { totalCount }
             };
         }
         if (typeof args?.$paginate?.first === "number" ||
@@ -427,8 +434,8 @@ function paginate(data, args, primaryKey, action) {
                     ...connection.pageInfo,
                     startCursor,
                     endCursor,
-                    totalCount,
-                },
+                    totalCount
+                }
             };
         }
     }

package/dist/runtime/RuntimeMSSQL.d.ts

@@ -13,7 +13,13 @@ export declare class RuntimeMSSQL implements IRuntime {
     $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<{
+        commit: () => Promise<void>;
+        rollback: () => Promise<void>;
+        dbCall: (q: string) => Promise<any>;
+    }>;
     private dbCall;
     private formatQuery;
-    private beginTransaction;
 }

package/dist/runtime/RuntimeMSSQL.js

@@ -27,7 +27,7 @@ class RuntimeMSSQL {
         __classPrivateFieldSet(this, _RuntimeMSSQL_middlewareHandler, new shared_1.MiddlewareHandler(), "f");
     }
     async resolve(input) {
-        return (0, shared_1.resolve)(input, this.dbCall.bind(this), this.formatQuery.bind(this), this.beginTransaction.bind(this), __classPrivateFieldGet(this, _RuntimeMSSQL_dialect, "f"), __classPrivateFieldGet(this, _RuntimeMSSQL_middlewareHandler, "f"), input.context ?? {});
+        return (0, shared_1.resolve)(input, input.dbCall ?? this.dbCall.bind(this), this.formatQuery.bind(this), this.$startTransaction.bind(this), __classPrivateFieldGet(this, _RuntimeMSSQL_dialect, "f"), __classPrivateFieldGet(this, _RuntimeMSSQL_middlewareHandler, "f"), input.context ?? {});
     }
     async $queryRaw(sql, values) {
         return this.dbCall(this.formatQuery(sql, values ?? []));
@@ -44,15 +44,15 @@ class RuntimeMSSQL {
     async $shutdown() {
         await __classPrivateFieldGet(this, _RuntimeMSSQL_mssqlClient, "f").closePool();
     }
+    async $startTransaction(input) {
+        return __classPrivateFieldGet(this, _RuntimeMSSQL_mssqlClient, "f").beginTransaction(input?.isolationLevel);
+    }
     async dbCall(q) {
         return __classPrivateFieldGet(this, _RuntimeMSSQL_mssqlClient, "f").dbCall(q);
     }
     formatQuery(q, values) {
         return __classPrivateFieldGet(this, _RuntimeMSSQL_mssqlClient, "f").formatQuery(q, values);
     }
-    beginTransaction() {
-        return __classPrivateFieldGet(this, _RuntimeMSSQL_mssqlClient, "f").beginTransaction();
-    }
 }
 exports.RuntimeMSSQL = RuntimeMSSQL;
 _RuntimeMSSQL_dialect = new WeakMap(), _RuntimeMSSQL_mssqlClient = new WeakMap(), _RuntimeMSSQL_middlewareHandler = new WeakMap();

package/dist/runtime/RuntimeMySQL.d.ts

@@ -14,7 +14,9 @@ export declare class RuntimeMySQL implements IRuntime {
     $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>;
     private dbCall;
     private formatQuery;
-    private beginTransaction;
 }

package/dist/runtime/RuntimeMySQL.js

@@ -70,7 +70,7 @@ class RuntimeMySQL {
         __classPrivateFieldSet(this, _RuntimeMySQL_mysqlClient, new MySQL_1.MySQL(clientOpts), "f");
     }
     async resolve(input) {
-        return (0, shared_1.resolve)(input, this.dbCall.bind(this), this.formatQuery.bind(this), this.beginTransaction.bind(this), __classPrivateFieldGet(this, _RuntimeMySQL_dialect, "f"), __classPrivateFieldGet(this, _RuntimeMySQL_middlewareHandler, "f"), input.context ?? {}, __classPrivateFieldGet(this, _RuntimeMySQL_clientCache, "f"));
+        return (0, shared_1.resolve)(input, input.dbCall ?? this.dbCall.bind(this), this.formatQuery.bind(this), this.$startTransaction.bind(this), __classPrivateFieldGet(this, _RuntimeMySQL_dialect, "f"), __classPrivateFieldGet(this, _RuntimeMySQL_middlewareHandler, "f"), input.context ?? {}, __classPrivateFieldGet(this, _RuntimeMySQL_clientCache, "f"));
     }
     async $queryRaw(sql, values) {
         return this.dbCall(this.formatQuery(sql, values ?? []));
@@ -90,15 +90,15 @@ class RuntimeMySQL {
         }
         await __classPrivateFieldGet(this, _RuntimeMySQL_mysqlClient, "f").endPool();
     }
+    async $startTransaction(input) {
+        return __classPrivateFieldGet(this, _RuntimeMySQL_mysqlClient, "f").beginTransaction(input?.isolationLevel);
+    }
     dbCall(q) {
         return __classPrivateFieldGet(this, _RuntimeMySQL_mysqlClient, "f").query(q);
     }
     formatQuery(q, values) {
         return SqlString.format(q, values);
     }
-    beginTransaction() {
-        return __classPrivateFieldGet(this, _RuntimeMySQL_mysqlClient, "f").beginTransaction();
-    }
 }
 exports.RuntimeMySQL = RuntimeMySQL;
 _RuntimeMySQL_dialect = new WeakMap(), _RuntimeMySQL_mysqlClient = new WeakMap(), _RuntimeMySQL_clientCache = new WeakMap(), _RuntimeMySQL_middlewareHandler = new WeakMap();

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

@@ -5,8 +5,9 @@ export declare class MSSQL {
     dbCall(q: string): Promise<any>;
     private mapResult;
     formatQuery(q: string, values: any[]): any;
-    beginTransaction(): Promise<{
+    beginTransaction(isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE"): Promise<{
         commit: () => Promise<void>;
+        rollback: () => Promise<void>;
         dbCall: (q: string) => Promise<any>;
     }>;
     closePool(): Promise<void>;

package/dist/runtime/lib/MSSQL.js

@@ -42,7 +42,7 @@ class MSSQL {
     formatQuery(q, values) {
         return TSqlString.format(q, values);
     }
-    async beginTransaction() {
+    async beginTransaction(isolationLevel) {
         const transaction = new mssql.Transaction(__classPrivateFieldGet(this, _MSSQL_pool, "f"));
         let rolledBack = false;
         transaction.on("rollback", (aborted) => {
@@ -56,13 +56,18 @@ class MSSQL {
             throw err;
         }
         const mapResult = this.mapResult.bind(this);
-        await transaction.begin();
+        let isolationLevelNumber;
+        if (isolationLevel) {
+            isolationLevelNumber = mssql.ISOLATION_LEVEL[isolationLevel.replace(" ", "_")];
+            if (isolationLevelNumber == null) {
+                throw new Error(`Invalid isolationLevel: ${isolationLevel}`);
+            }
+        }
+        await transaction.begin(isolationLevelNumber);
         return {
             commit: () => transaction.commit().catch(handleError),
-            dbCall: (q) => new mssql.Request(transaction)
-                .query(q)
-                .then(mapResult)
-                .catch(handleError),
+            rollback: () => transaction.rollback(),
+            dbCall: (q) => new mssql.Request(transaction).query(q).then(mapResult).catch(handleError)
         };
     }
     async closePool() {

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

@@ -2,7 +2,7 @@ export declare class MySQL {
     pool: any;
     constructor(opts: any);
     query(...args: any[]): any;
-    beginTransaction(): Promise<any>;
+    beginTransaction(isolationLevel?: "READ UNCOMMITTED" | "READ COMMITTED" | "REPEATABLE READ" | "SERIALIZABLE"): Promise<any>;
     getConnection(): Promise<any>;
     endPool(): Promise<void>;
 }

package/dist/runtime/lib/MySQL.js

@@ -13,16 +13,29 @@ class MySQL {
     query(...args) {
         return P.using(this.getConnection(), (connection) => connection.queryAsync(...args));
     }
-    async beginTransaction() {
+    async beginTransaction(isolationLevel) {
         return P.using(this.getConnection(), async (connection) => {
             async function handleError(err) {
                 await connection.rollbackAsync();
                 throw err;
             }
+            // 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.queryAsync(`SET TRANSACTION ISOLATION LEVEL ${isolationLevel};`);
+            }
             await connection.beginTransactionAsync();
             return {
                 commit: () => connection.commitAsync().catch(handleError),
-                dbCall: (q) => connection.queryAsync(q).catch(handleError),
+                rollback: () => connection.rollbackAsync(),
+                dbCall: (q) => connection.queryAsync(q).catch(handleError)
             };
         });
     }

package/dist/runtime/lib/stringifyWhere.js

@@ -96,7 +96,7 @@ function _stringifyWhere(where, table, escapeId, escape, result) {
             }
             const operator = keys[0];
             const operand = v[operator];
-            if (operator === "$ne") {
+            if (operator === "$neq") {
                 return `${table}.${escapeId(k)} ${getOperatorNeq(v)} ${printValue(operand)}`;
             }
             if (operator === "$gt") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "main": "./dist/index.js",
   "files": [
     "dist"