@technicity/data-service-generator 0.14.0 → 0.14.1

package/dist/runtime/lib/shared.js

@@ -1,30 +1,4 @@
 "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;
-};
-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;
 // @ts-ignore
@@ -32,16 +6,17 @@ exports._prepareWhere = exports.whereNeedsProcessing = exports.postProcess = exp
 // @ts-ignore
 // import arrToConnection from "join-monster/dist/array-to-connection";
 // @ts-ignore
-const batch_planner_1 = __importDefault(require("join-monster/dist/batch-planner"));
+const batch_planner_1 = require("join-monster/dist/batch-planner");
 // @ts-ignore
 const util_1 = require("join-monster/dist/util");
 const async_hooks_1 = require("async_hooks");
-const _ = __importStar(require("lodash/fp"));
+const _ = require("lodash/fp");
 const uuid_1 = require("uuid");
 const getSqlAst_1 = require("./getSqlAst");
 const getWhere_1 = require("./getWhere");
 const getDateTimeStringMySQL_1 = require("./getDateTimeStringMySQL");
 const cursor_1 = require("./cursor");
+const runTransforms_1 = require("./runTransforms");
 const addNullFallbacks_1 = require("./addNullFallbacks");
 const SDKNotFoundError_1 = require("./SDKNotFoundError");
 const SDKBadWhereError_1 = require("./SDKBadWhereError");
@@ -70,9 +45,9 @@ exports.resolve = resolve;
 function _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache) {
     switch (input.action) {
         case "findMany":
-            return cache && !input.skipCache
-                ? getCached(input, dbCall, formatQuery, dialect, cache)
-                : getData(input, dbCall, formatQuery, dialect);
+            return cache && !input.skipCache ?
+                getCached(input, dbCall, formatQuery, dialect, cache) :
+                getData(input, dbCall, formatQuery, dialect);
         case "findUnique":
         case "findManyPaginated":
             return getData(input, dbCall, formatQuery, dialect);
@@ -141,7 +116,7 @@ async function getData(input, dbCall, formatQuery, dialect) {
                 rowWithMatchingCursor = await dbCall(formatQuery("SELECT * FROM ?? WHERE ?? = ?", [
                     input.resource,
                     primaryKey,
-                    (0, cursor_1.decodeCursor)(cursor)
+                    (0, cursor_1.decodeCursor)(cursor),
                 ])).then((xs) => xs[0]);
                 if (rowWithMatchingCursor == null) {
                     throw new Error(`Invalid cursor: ${cursor}`);
@@ -159,19 +134,15 @@ async function getData(input, dbCall, formatQuery, dialect) {
     }
     // we need to read the query AST and build a new "SQL AST" from which the SQL and
     // const sqlAST = queryAST.queryASTToSqlAST(resolveInfo, options, context);
-    const fields = input.fields ??
-        getScalarFields(input.resource, input.artifacts).reduce((acc, x) => {
-            acc[x] = true;
-            return acc;
-        }, {});
+    const fields = input.fields ?? getScalarFields(input.resource, input.artifacts);
     const orderByListPaginatedRootResult = 
     // MSSQL's OFFSET and FETCH requires ORDER BY, so we need to provide a fallback
     dialect === "mssql" && paginationType === "limit-offset"
         ? {
             orderBy: (0, getOrderBy_1.getOrderBy)(input.args, primaryKey)?.orderBy ?? [
-                { column: primaryKey, direction: "asc" }
+                { column: primaryKey, direction: "asc" },
             ],
-            flip: false
+            flip: false,
         }
         : action === "findManyPaginated"
             ? (0, getOrderBy_1.getOrderBy)(input.args, primaryKey)
@@ -189,9 +160,9 @@ async function getData(input, dbCall, formatQuery, dialect) {
         orderBy: orderByListPaginatedRootResult?.orderBy,
         rowWithMatchingCursor,
         dialect,
-        grabMany
+        grabMany,
     });
-    const options = { dialect: dialect === "sqlite" ? "mysql" : dialect };
+    const options = { dialect };
     let { sql, shapeDefinition } = await (0, util_1.compileSqlAST)(sqlAST, context, options);
     if (!sql) {
         // return {};
@@ -234,9 +205,6 @@ async function getData(input, dbCall, formatQuery, dialect) {
         // Do later for `listPaginated`, since the `id` is needed for
         // creating the cursor
         postProcess(data, fields, shouldRemoveExtraKeys);
-        if (dialect === "sqlite") {
-            typeCastSqlite(data, fields, input.resource, input.artifacts);
-        }
     }
     // check for batch data
     if (Array.isArray(data)) {
@@ -270,12 +238,12 @@ async function getData(input, dbCall, formatQuery, dialect) {
                 fieldName: "data",
                 args: argsTotalCount,
                 // Because we're going to manually set children anyway
-                fields: {},
+                fields: [],
                 getWhere: getWhere_1.getWhere,
                 // We don't want the where clause to include cursor-related stuff
                 rowWithMatchingCursor: null,
                 dialect,
-                grabMany: true
+                grabMany: true,
             });
             // Because orderBy doesn't matter for total count.
             // getOrderBy adds an element if paginating, so deleting args.$orderBy
@@ -285,16 +253,10 @@ async function getData(input, dbCall, formatQuery, dialect) {
             if (paginationType === "cursor") {
                 data = wrapListPaginationCursor(data, input.args, orderByListPaginatedRootResult.flip, (xs) => {
                     postProcess(xs, fields, shouldRemoveExtraKeys);
-                    if (dialect === "sqlite") {
-                        typeCastSqlite(data, fields, input.resource, input.artifacts);
-                    }
                 }, input.artifacts[input.resource].primaryKey, totalCount);
             }
             else {
                 postProcess(data, fields, shouldRemoveExtraKeys);
-                if (dialect === "sqlite") {
-                    typeCastSqlite(data, fields, input.resource, input.artifacts);
-                }
                 data = wrapListPaginationLimitOffset(data, totalCount);
             }
         }
@@ -343,23 +305,21 @@ async function getCached(input, dbCall, formatQuery, dialect, cache) {
 function ensureUuidSelect(input) {
     const { resource, artifacts } = input;
     const remove = [];
-    ensure(resource, input.fields);
+    ensure(resource, input);
     function ensure(type, input, path = []) {
         const { scalarFields, relationFields } = artifacts[type];
         if (!scalarFields.includes("uuid"))
             return;
-        const fields = input || {};
-        if (!Object.keys(fields).includes("uuid")) {
+        const fields = input.fields || [];
+        if (!fields.includes("uuid")) {
             remove.push(path);
-            fields["uuid"] = true;
+            fields.unshift("uuid");
         }
-        const entries = Object.entries(fields);
-        for (const [k, v] of entries)
-            if (typeof v === "object") {
-                const table = relationFields[k]?.table;
-                if (table != null) {
-                    ensure(table, v.$fields, path.concat(k));
-                }
+        for (const field of fields)
+            if (typeof field == "object") {
+                const { name } = field;
+                const { table } = relationFields[name];
+                ensure(table, field, path.concat(name));
             }
     }
     return remove;
@@ -393,9 +353,9 @@ function wrapListPaginationCursor(data, args, flip, cb, primaryKey, totalCount)
             hasNextPage,
             startCursor,
             endCursor,
-            totalCount
+            totalCount,
         },
-        results: data
+        results: data,
     };
 }
 async function getTotalCount(sqlASTTotalCount, dbCall, context, options) {
@@ -406,8 +366,8 @@ async function getTotalCount(sqlASTTotalCount, dbCall, context, options) {
             type: "expression",
             sqlExpr: () => "COUNT(*)",
             fieldName: fieldNameTotalCount,
-            as: fieldNameTotalCount
-        }
+            as: fieldNameTotalCount,
+        },
     ];
     const { sql: sqlTotalCount } = await (0, util_1.compileSqlAST)(sqlASTTotalCount, context, options);
     const totalCount = await dbCall(sqlTotalCount).then((xs) => xs[0][fieldNameTotalCount]);
@@ -482,21 +442,15 @@ async function create(input, dbCall, formatQuery, beginTransaction, dialect, con
         }
         else {
             data = processCreateData(data, tableArtifacts, dialect, context?.specialCaseUuidColumn);
-            if (dialect === "mssql") {
-                const columns = Object.keys(data);
-                const values = Object.values(data);
-                const inserted = await dbCall(formatQuery(`INSERT INTO ?? (??) VALUES (?) SELECT SCOPE_IDENTITY() AS [SCOPE_IDENTITY]`, [input.resource, columns, values]));
-                return inserted[0]["SCOPE_IDENTITY"];
+            if (dialect === "mysql") {
+                const inserted = await dbCall(formatQuery("INSERT INTO ?? SET ?", [input.resource, data]));
+                return inserted.insertId;
             }
             else {
                 const columns = Object.keys(data);
                 const values = Object.values(data);
-                const inserted = await dbCall(formatQuery(`INSERT INTO ?? (??) VALUES (?)`, [
-                    input.resource,
-                    columns,
-                    values
-                ]));
-                return inserted.insertId;
+                const inserted = await dbCall(formatQuery(`INSERT INTO ?? (??) VALUES (?) SELECT SCOPE_IDENTITY() AS [SCOPE_IDENTITY]`, [input.resource, columns, values]));
+                return inserted[0]["SCOPE_IDENTITY"];
             }
         }
     }
@@ -554,7 +508,7 @@ function getCreateTree(data, table, referencedKey, specialCaseUuidColumn, dialec
         referencedKey,
         columns: [],
         values: [],
-        children: []
+        children: [],
     };
     for (let i = 0; i < data.length; i++) {
         let d = data[i];
@@ -643,19 +597,19 @@ function getUpdateQuery(table, data, where, dialect, formatQuery) {
             const op = _entries?.[0];
             const vv = _entries?.[1];
             if (op === "$prepend") {
-                opsStrs.push(`${escapeId(k)} = CASE WHEN ${escapeId(k)} IS NULL THEN NULL ELSE ${stringifyConcat(escape(vv), escapeId(k), dialect)} END`);
+                opsStrs.push(`${table}.${escapeId(k)} = CASE WHEN ${table}.${escapeId(k)} IS NULL THEN NULL ELSE CONCAT(${escape(vv)}, ${table}.${escapeId(k)}) END`);
                 continue;
             }
             if (op === "$append") {
-                opsStrs.push(`${escapeId(k)} = CASE WHEN ${escapeId(k)} IS NULL THEN NULL ELSE ${stringifyConcat(escapeId(k), escape(vv), dialect)} END`);
+                opsStrs.push(`${table}.${escapeId(k)} = CASE WHEN ${table}.${escapeId(k)} IS NULL THEN NULL ELSE CONCAT(${table}.${escapeId(k)}, ${escape(vv)}) END`);
                 continue;
             }
             if (op === "$increment") {
-                opsStrs.push(`${escapeId(k)} = ${escapeId(k)} + ${escape(vv)}`);
+                opsStrs.push(`${table}.${escapeId(k)} = ${table}.${escapeId(k)} + ${escape(vv)}`);
                 continue;
             }
             if (op === "$decrement") {
-                opsStrs.push(`${escapeId(k)} = ${escapeId(k)} - ${escape(vv)}`);
+                opsStrs.push(`${table}.${escapeId(k)} = ${table}.${escapeId(k)} - ${escape(vv)}`);
                 continue;
             }
             dataRegular[k] = v;
@@ -665,28 +619,18 @@ function getUpdateQuery(table, data, where, dialect, formatQuery) {
     if (opsStrs.length > 0) {
         q += `SET ${opsStrs.join(", ")}`;
     }
-    const columns = Object.keys(dataRegular);
-    if (columns.length > 0) {
+    if (Object.keys(dataRegular).length > 0) {
         if (opsStrs.length > 0) {
-            q += ", ";
+            q += ", ?";
         }
         else {
-            q += "SET ";
-        }
-        q += columns.map((x) => `${escapeId(x)} = ?`).join(", ");
-        for (let k in dataRegular) {
-            values.push(dataRegular[k]);
+            q += "SET ?";
         }
+        values.push(dataRegular);
     }
     q += ` WHERE ${where}`;
     return formatQuery(q, values);
 }
-function stringifyConcat(operand1, operand2, dialect) {
-    if (dialect !== "sqlite") {
-        return `CONCAT(${operand1}, ${operand2})`;
-    }
-    return `(${operand1} || ${operand2})`;
-}
 async function updateMany(input, dbCall, formatQuery, dialect, cache) {
     async function _updateMany() {
         const escapeId = (0, stringifyWhere_1.getEscapeId)(dialect);
@@ -697,9 +641,7 @@ async function updateMany(input, dbCall, formatQuery, dialect, cache) {
         }
         if (cache)
             try {
-                const query = formatQuery(`SELECT uuid FROM ?? WHERE ${where}`, [
-                    input.resource
-                ]);
+                const query = formatQuery(`SELECT uuid FROM ?? WHERE ${where}`, [input.resource]);
                 const matches = await dbCall(query);
                 const uuids = matches.map((x) => x.uuid);
                 cache.purge(...uuids);
@@ -739,7 +681,7 @@ async function deleteOne(input, dbCall, formatQuery, dialect, cache) {
     const current = await dbCall(formatQuery("SELECT * FROM ?? WHERE ?? = ?", [
         input.resource,
         findOne.key,
-        findOne.value
+        findOne.value,
     ])).then((xs) => xs[0]);
     if (current == null) {
         throw new SDKNotFoundError_1.SDKNotFoundError();
@@ -749,7 +691,7 @@ async function deleteOne(input, dbCall, formatQuery, dialect, cache) {
     await dbCall(formatQuery("DELETE FROM ?? WHERE ?? = ?", [
         input.resource,
         findOne.key,
-        findOne.value
+        findOne.value,
     ]));
     return true;
 }
@@ -761,9 +703,7 @@ async function deleteMany(input, dbCall, formatQuery, dialect, cache) {
     }
     if (cache)
         try {
-            const query = formatQuery(`SELECT uuid FROM ?? WHERE ${where}`, [
-                input.resource
-            ]);
+            const query = formatQuery(`SELECT uuid FROM ?? WHERE ${where}`, [input.resource]);
             const matches = await dbCall(query);
             const uuids = matches.map((x) => x.uuid);
             cache.purge(...uuids);
@@ -812,7 +752,7 @@ async function mapMappedFields(artifactsForTable, data, dbCall, formatQuery) {
                     mappedField.referencedKey,
                     mappedField.referencedTable,
                     mappedField.name,
-                    w
+                    w,
                 ])).then((xs) => xs[0]?.[mappedField.referencedKey]);
                 if (result == null) {
                     throw new SDKNotFoundError_1.SDKNotFoundError();
@@ -826,7 +766,7 @@ async function mapMappedFields(artifactsForTable, data, dbCall, formatQuery) {
                 mappedField.referencedKey,
                 mappedField.referencedTable,
                 mappedField.name,
-                v
+                v,
             ])).then((xs) => xs[0]?.[mappedField.referencedKey]);
             if (result == null) {
                 throw new SDKNotFoundError_1.SDKNotFoundError();
@@ -837,18 +777,30 @@ async function mapMappedFields(artifactsForTable, data, dbCall, formatQuery) {
     }
 }
 // 1. Remove additional keys added to data for batches and joins
+// 2. Execute `transform` functions if they exist
 function postProcess(data, fields, shouldRemoveExtraKeys) {
     if (shouldRemoveExtraKeys) {
         removeExtraKeys(data, fields);
     }
+    (0, runTransforms_1.runTransforms)(data, fields);
 }
 exports.postProcess = postProcess;
 function removeExtraKeys(data, fields) {
     if (data == null || (Array.isArray(data) && data[0] == null)) {
         return;
     }
-    let fieldKeys = Object.keys(fields);
-    const dataKeys = Array.isArray(data) ? Object.keys(data[0]) : Object.keys(data);
+    let fieldKeys = [];
+    for (let x of fields) {
+        if (typeof x === "string") {
+            fieldKeys.push(x);
+        }
+        else {
+            fieldKeys.push(x.as ?? x.name);
+        }
+    }
+    const dataKeys = Array.isArray(data)
+        ? Object.keys(data[0])
+        : Object.keys(data);
     const extraDataKeys = _.difference(dataKeys, fieldKeys);
     for (let k of extraDataKeys) {
         if (Array.isArray(data)) {
@@ -860,77 +812,16 @@ function removeExtraKeys(data, fields) {
             delete data[k];
         }
     }
-    const entries = Object.entries(fields);
-    for (let [k, v] of entries) {
-        if (typeof v === "object" && v.$fields != null) {
-            if (Array.isArray(data)) {
-                for (let d of data) {
-                    removeExtraKeys(d[k], v.$fields);
-                }
-            }
-            else {
-                removeExtraKeys(data[k], v.$fields);
-            }
-        }
-    }
-}
-const getTypeCastMap = _.memoize(function getTypeCastMap(artifacts) {
-    const typeCastMap = new Map();
-    for (let table in artifacts) {
-        let booleanColumns = new Set();
-        for (let field of artifacts[table].fields) {
-            if (field.kind === "scalar" && field.type === "boolean") {
-                booleanColumns.add(field.name);
-            }
-        }
-        typeCastMap.set(table, { boolean: booleanColumns });
-    }
-    return typeCastMap;
-});
-function typeCastSqlite(data, fields, table, artifacts) {
-    if (data == null || (Array.isArray(data) && data[0] == null)) {
-        return;
-    }
-    const typeCastMap = getTypeCastMap(artifacts);
-    const booleanColumns = typeCastMap.get(table)?.boolean;
-    if (booleanColumns == null) {
-        throw new Error(`Failed to resolve typeCastMap for table \`${table}\``);
-    }
-    if (booleanColumns.size > 0) {
-        const keys = Object.keys(fields);
-        for (let k of keys) {
-            if (booleanColumns.has(k)) {
-                if (Array.isArray(data)) {
-                    for (let d of data) {
-                        d[k] = !!d[k];
-                    }
-                }
-                else {
-                    data[k] = !!data[k];
-                }
-            }
-        }
-    }
-    const tableArtifacts = artifacts[table];
-    const entries = Object.entries(fields);
-    for (let [k, v] of entries) {
-        if (typeof v === "object") {
-            const relationFields = tableArtifacts.relationFields[k];
-            if (relationFields == null) {
-                throw new Error(`Failed to resolve relationFields for field \`${k}\``);
-            }
-            const fields = v.$fields ??
-                tableArtifacts.scalarFields.reduce((acc, x) => {
-                    acc[x] = true;
-                    return acc;
-                }, {});
+    for (let x of fields) {
+        if (typeof x === "object") {
+            const k = typeof x === "string" ? x : x.as ?? x.name;
             if (Array.isArray(data)) {
                 for (let d of data) {
-                    typeCastSqlite(d[k], fields, relationFields.table, artifacts);
+                    removeExtraKeys(d[k], x.fields);
                 }
             }
             else {
-                typeCastSqlite(data[k], fields, relationFields.table, artifacts);
+                removeExtraKeys(data[k], x.fields);
             }
         }
     }
@@ -957,7 +848,7 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
                         mappedField.referencedKey,
                         mappedField.referencedTable,
                         mappedField.name,
-                        v
+                        v,
                     ])).then((xs) => xs[0]?.[mappedField.referencedKey])));
                     if (newVal.some((x) => x == null)) {
                         const index = newVal.findIndex((x) => x == null);
@@ -976,7 +867,7 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
                         mappedField.referencedKey,
                         mappedField.referencedTable,
                         mappedField.name,
-                        where
+                        where,
                     ])).then((xs) => xs[0]?.[mappedField.referencedKey]);
                     if (newVal == null) {
                         throw new SDKBadWhereError_1.SDKBadWhereError(getPrepareWhereNotFoundMessage(mappedField, where));
@@ -999,7 +890,7 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
                         mappedField.referencedKey,
                         mappedField.referencedTable,
                         mappedField.name,
-                        v
+                        v,
                     ])).then((xs) => xs[0]?.[mappedField.referencedKey])));
                     if (newVal.some((x) => x == null)) {
                         const index = newVal.findIndex((x) => x == null);
@@ -1018,7 +909,7 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
                         mappedField.referencedKey,
                         mappedField.referencedTable,
                         mappedField.name,
-                        where
+                        where,
                     ])).then((xs) => xs[0]?.[mappedField.referencedKey]);
                     if (newVal == null) {
                         throw new SDKBadWhereError_1.SDKBadWhereError(getPrepareWhereNotFoundMessage(mappedField, where));
@@ -1050,7 +941,7 @@ const ops = [
     "$like",
     "$nlike",
     "$btwn",
-    "$nbtwn"
+    "$nbtwn",
 ];
 async function traverseWhere(where, cb) {
     return await _traverseWhere(cb, where, "", where);

package/dist/runtime/lib/stringifyWhere.js

@@ -1,35 +1,10 @@
 "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.getEscape = exports.getEscapeId = exports.stringifyWhere = void 0;
-const _ = __importStar(require("lodash/fp"));
-const MySqlString = __importStar(require("sqlstring"));
-// @ts-expect-error
-const TSqlString = __importStar(require("tsqlstring"));
-// @ts-expect-error
-const SqliteString = __importStar(require("sqlstring-sqlite"));
+const _ = require("lodash/fp");
+const MySqlString = require("sqlstring");
+// @ts-ignore
+const TSqlString = require("tsqlstring");
 function stringifyWhere(input) {
     const { where, table, dialect, args, orderBy, rowWithMatchingCursor } = input;
     const escapeId = getEscapeId(dialect);
@@ -41,11 +16,13 @@ function stringifyWhere(input) {
         orderBy,
         escapeId,
         escape,
-        rowWithMatchingCursor
+        rowWithMatchingCursor,
     });
     if (paginationWhere) {
         result =
-            result.length === 0 ? paginationWhere : result + " AND " + paginationWhere;
+            result.length === 0
+                ? paginationWhere
+                : result + " AND " + paginationWhere;
     }
     return result;
 }
@@ -107,7 +84,9 @@ function _stringifyWhere(where, table, escapeId, escape, result) {
         if (v === null) {
             return `${table}.${escapeId(k)} IS NULL`;
         }
-        if (typeof v === "string" || typeof v === "number" || typeof v === "boolean") {
+        if (typeof v === "string" ||
+            typeof v === "number" ||
+            typeof v === "boolean") {
             return `${table}.${escapeId(k)} = ${printValue(v)}`;
         }
         if (_.isPlainObject(v)) {
@@ -117,7 +96,7 @@ function _stringifyWhere(where, table, escapeId, escape, result) {
             }
             const operator = keys[0];
             const operand = v[operator];
-            if (operator === "$neq") {
+            if (operator === "$ne") {
                 return `${table}.${escapeId(k)} ${getOperatorNeq(v)} ${printValue(operand)}`;
             }
             if (operator === "$gt") {
@@ -234,9 +213,6 @@ function getEscapeId(dialect) {
     if (dialect === "mssql") {
         return TSqlString.escapeId.bind(TSqlString);
     }
-    if (dialect === "sqlite") {
-        return SqliteString.escapeId.bind(SqliteString);
-    }
     throw new Error("Unsupported dialect: " + dialect);
 }
 exports.getEscapeId = getEscapeId;
@@ -247,9 +223,6 @@ function getEscape(dialect) {
     if (dialect === "mssql") {
         return TSqlString.escape.bind(TSqlString);
     }
-    if (dialect === "sqlite") {
-        return SqliteString.escape.bind(SqliteString);
-    }
     throw new Error("Unsupported dialect: " + dialect);
 }
 exports.getEscape = getEscape;

package/dist/runtime/lib/typeCastMSSQL.js

@@ -1,30 +1,7 @@
 "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.typeCastMSSQL = void 0;
-const mssql = __importStar(require("mssql"));
+const mssql = require("mssql");
 // TODO: see https://github.com/tediousjs/node-mssql/pull/1171
 function typeCastMSSQL(customTypeCast) {
     return function (result, meta) {

package/dist/traverseFieldArgs.d.ts

@@ -1,2 +1,2 @@
-import { IArgs, TSelect } from "./runtime/IRuntime";
-export declare function traverseFieldArgs(fields: TSelect, cb: (args: IArgs | undefined) => IArgs): void;
+import { IArgs, IField } from "./runtime/IRuntime";
+export declare function traverseFieldArgs(fields: IField[], cb: (args: IArgs | undefined) => IArgs): void;

package/dist/traverseFieldArgs.js

@@ -2,17 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.traverseFieldArgs = void 0;
 function traverseFieldArgs(fields, cb) {
-    const values = Object.values(fields);
-    for (let x of values) {
+    for (let x of fields) {
         if (typeof x !== "object") {
             continue;
         }
-        const fields = x.$fields;
-        if (fields == null) {
-            continue;
-        }
-        cb(x);
-        traverseFieldArgs(fields, cb);
+        x.args = cb(x.args);
+        traverseFieldArgs(x.fields, cb);
     }
 }
 exports.traverseFieldArgs = traverseFieldArgs;