@technicity/data-service-generator 0.11.6 → 0.12.0

package/dist/generation/generate.js

@@ -191,6 +191,21 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts)
             .concat(Array.from(set).sort())
             .join(",\n")} } from "./types";`;
     }
+    function getTypeNullResponses() {
+        return `type TNullResponses = { ${Object.entries(_.groupBy((x) => x.table, input))
+            .flatMap(([table, xx]) => {
+            const name = table;
+            return (`${name}: {` +
+                xx
+                    .map(({ kind }) => {
+                    const operation = mapKindToAction(kind);
+                    return `${operation}: (input: { args: { select: Fields${table} | undefined, where: Where${table} | undefined }, model: "${table}", operation: "${operation}" }) => Promise<ReturnBase${table}>`;
+                })
+                    .join(",") +
+                " } ");
+        })
+            .join(",")} }`;
+    }
     const src = `import type { IRuntime, TMiddleware, TContext } from "./IRuntime"
   import { artifacts } from "./artifacts";
 
@@ -198,16 +213,33 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts)
 
   export class SDK {
     runtime: IRuntime;
+    _nullability: TNullResponses | undefined;
   
+    static create(opts: {
+      runtime: any;
+      clientOpts: { [k: string]: any; },
+      otherOpts?: { [k: string]: any; }
+     }) {
+      return new this(opts);
+    }
+
+    static createNull(opts: {
+      runtime: any;
+      query?: TNullResponses
+     }) {
+      return new this({ runtime: opts.runtime, clientOpts: {}, otherOpts: { nullability: opts.query } });
+    }
+
     constructor(opts: {
       runtime: any;
       clientOpts: { [k: string]: any; },
       otherOpts?: { [k: string]: any; }
      }) {
-      opts.otherOpts = opts.otherOpts ?? {}
+      const { nullability, ...otherOpts } = opts.otherOpts ?? {};
       this.runtime = new opts.runtime(opts.clientOpts, ${supplementClientOpts === true
-        ? "{ supplementClientOpts: true, ...opts.otherOpts }"
-        : "opts.otherOpts"}, artifacts);
+        ? "{ supplementClientOpts: true, ...otherOpts }"
+        : "otherOpts"}, artifacts);
+      this._nullability = nullability;
     }
 
     $use(middleware: TMiddleware) {
@@ -307,6 +339,8 @@ async function getSDKSource(input, specialCaseUuidColumn, supplementClientOpts)
         }
     }))).join("\n\n")}
   }
+
+  ${getTypeNullResponses()}
   `;
     return prettier.format(src, { parser: "typescript" });
 }
@@ -333,12 +367,13 @@ function getMethodSourceGetOne(x, findOnes, isTransaction) {
   return ${isTransaction ? "runtime" : "this.runtime"}.resolve(
     {
       resource: "${x.table}",
-      action: "findUnique",
+      action: "${mapKindToAction(x.kind)}",
       args: { $where: param1 },
       fields: param2?.fields,
       artifacts,
       context: param2?.context,
       skipCache: param2?.skipCache,
+      nullability: this._nullability,
       ${isTransaction ? "dbCall" : ""}
     }
   );
@@ -352,12 +387,13 @@ function getMethodSourceGetList(x, isTransaction) {
     return ${isTransaction ? "runtime" : "this.runtime"}.resolve(
       {
         resource: "${x.table}",
-        action: "findMany",
+        action: "${mapKindToAction(x.kind)}",
         args: param1,
         fields: param2?.fields,
         artifacts,
         context: param2?.context,
         skipCache: param2?.skipCache,
+        nullability: this._nullability,
         ${isTransaction ? "dbCall" : ""}
       }
     );
@@ -371,12 +407,13 @@ function getMethodSourceGetListPaginated(x, isTransaction) {
     return ${isTransaction ? "runtime" : "this.runtime"}.resolve(
       {
         resource: "${x.table}",
-        action: "findManyPaginated",
+        action: "${mapKindToAction(x.kind)}",
         args: param1,
         fields: param2?.fields,
         artifacts,
         context: param2?.context,
         skipCache: param2?.skipCache,
+        nullability: this._nullability,
         ${isTransaction ? "dbCall" : ""}
       }
     );
@@ -389,11 +426,12 @@ function getMethodSourcePostOne(x, specialCaseUuidColumn, isTransaction) {
   ): Promise<${x.typeReturnBaseName}> {
   return ${isTransaction ? "runtime" : "this.runtime"}.resolve({
     resource: "${x.table}",
-    action: "create",
+    action: "${mapKindToAction(x.kind)}",
     data,
     artifacts,
     fields: param2?.fields,
     context: {...param2?.context, specialCaseUuidColumn: ${JSON.stringify(specialCaseUuidColumn)}},
+    nullability: this._nullability,
     ${isTransaction ? "dbCall" : ""}
   });
 }`;
@@ -408,12 +446,13 @@ function getMethodSourcePatchOne(x, findOnes, isTransaction) {
 ): Promise<${x.typeReturnBaseName}> {
 return ${isTransaction ? "runtime" : "this.runtime"}.resolve({
   resource: "${x.table}",
-  action: "update",
+  action: "${mapKindToAction(x.kind)}",
   args: { $where: param1 },
   data,
   artifacts,
   fields: param2?.fields,
   context: param2?.context,
+  nullability: this._nullability,
   ${isTransaction ? "dbCall" : ""}
 });
 }`;
@@ -426,12 +465,13 @@ function getMethodSourcePatchList(x, isTransaction) {
   ): Promise<Array<${x.typeReturnBaseName}>> {
   return ${isTransaction ? "runtime" : "this.runtime"}.resolve({
     resource: "${x.table}",
-    action: "updateMany",
+    action: "${mapKindToAction(x.kind)}",
     args: param1,
     data,
     artifacts,
     fields: param2?.fields,
     context: param2?.context,
+    nullability: this._nullability,
     ${isTransaction ? "dbCall" : ""}
   });
 }`;
@@ -445,10 +485,11 @@ function getMethodSourceDeleteOne(x, findOnes, isTransaction) {
 ): Promise<void> {
   await ${isTransaction ? "runtime" : "this.runtime"}.resolve({
     resource: "${x.table}",
-    action: "delete",
+    action: "${mapKindToAction(x.kind)}",
     args: { $where: param1 },
     artifacts,
     context: param2?.context,
+    nullability: this._nullability,
     ${isTransaction ? "dbCall" : ""}
   });
 }`;
@@ -460,14 +501,42 @@ function getMethodSourceDeleteList(x, isTransaction) {
   ): Promise<void> {
     await ${isTransaction ? "runtime" : "this.runtime"}.resolve({
       resource: "${x.table}",
-      action: "deleteMany",
+      action: "${mapKindToAction(x.kind)}",
       args: param1,
       artifacts,
       context: param2?.context,
+      nullability: this._nullability,
       ${isTransaction ? "dbCall" : ""}
     });
   }`;
 }
+function mapKindToAction(kind) {
+    if (kind === "getOne") {
+        return "findUnique";
+    }
+    if (kind === "getList") {
+        return "findMany";
+    }
+    if (kind === "getListPaginated") {
+        return "findManyPaginated";
+    }
+    if (kind === "postOne") {
+        return "create";
+    }
+    if (kind === "patchOne") {
+        return "update";
+    }
+    if (kind === "patchList") {
+        return "updateMany";
+    }
+    if (kind === "deleteOne") {
+        return "delete";
+    }
+    if (kind === "deleteList") {
+        return "deleteMany";
+    }
+    throw new Error(`Unhandled kind: ${kind}`);
+}
 function getTypeReturnBaseName(table) {
     return "ReturnBase" + changeCase.pascalCase(table);
 }
@@ -1147,6 +1216,47 @@ async function getArtifactsSource(tables, includeMappedFields, specialCaseUuidCo
             return acc;
         }, {});
         const uniqueFields = await getUniqueColumns(table, specialCaseUuidColumn);
+        let fields = tableMeta.map((t) => {
+            const nullable = t.Null === "YES";
+            const isEnum = t.Type.startsWith("enum");
+            if (isEnum) {
+                const values = getPropertyEnum(t.Type);
+                if (values && nullable) {
+                    values.push(null);
+                }
+                return {
+                    kind: "enum",
+                    values,
+                    name: t.Field,
+                    nullable
+                };
+            }
+            return {
+                kind: "scalar",
+                type: getBaseJSONType(t.Type),
+                name: t.Field,
+                nullable,
+                hasDefaultValue: !!t.Default
+            };
+        });
+        for (let x of _mappedFields) {
+            fields.push({
+                kind: "scalar",
+                type: x.type,
+                name: x.as,
+                nullable: x.nullable,
+                // TODO
+                hasDefaultValue: false
+            });
+        }
+        for (let x of relationInfo) {
+            fields.push({
+                kind: "object",
+                type: x.table,
+                name: x.name,
+                isList: x.grabMany
+            });
+        }
         return {
             table,
             primaryKey,
@@ -1155,7 +1265,8 @@ async function getArtifactsSource(tables, includeMappedFields, specialCaseUuidCo
             mappedFields,
             uniqueFields,
             dateTimeFields,
-            dateTimeFieldsCount: Object.keys(dateTimeFields).length
+            dateTimeFieldsCount: Object.keys(dateTimeFields).length,
+            fields
         };
     }));
     const artifacts = tableMetaList.reduce((acc, x) => {

package/dist/getFakeData.d.ts

@@ -0,0 +1,11 @@
+import { type IArtifacts } from "./runtime/IRuntime";
+export declare function getFakeData(input: {
+    model: string;
+    select?: unknown[];
+    isList: boolean;
+    artifacts: IArtifacts;
+}): {
+    [k: string]: unknown;
+} | {
+    [k: string]: unknown;
+}[];

package/dist/getFakeData.js

@@ -0,0 +1,78 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFakeData = void 0;
+function getFakeData(input) {
+    const { model, select, isList, artifacts } = input;
+    const tableMeta = artifacts[model];
+    if (tableMeta === void 0) {
+        throw new Error(`Model ${model} not found.`);
+    }
+    const { fields } = tableMeta;
+    let data = {};
+    if (select == null) {
+        data = fields.reduce((acc, x) => {
+            if (x.kind === "scalar") {
+                acc[x.name] = getValue(x.type);
+                return acc;
+            }
+            else if (x.kind === "enum") {
+                acc[x.name] = x.values[0];
+                return acc;
+            }
+            return acc;
+        }, data);
+    }
+    else {
+        for (let x of select) {
+            if (!(typeof x === "string" || (typeof x === "object" && x != null))) {
+                throw new Error(`Invalid select: ${x}`);
+            }
+            const name = typeof x === "string" ? x : x.name;
+            const fieldName = x.as ?? name;
+            const field = fields.find((x) => x.name === name);
+            if (field == null) {
+                throw new Error(`Field not found: ${name}`);
+            }
+            if (field.kind === "scalar") {
+                data[fieldName] = getValue(field.type);
+            }
+            else if (field.kind === "enum") {
+                data[fieldName] = field.values[0];
+            }
+            else if (field.kind === "object") {
+                if (!(typeof x === "object" && x != null)) {
+                    throw new Error(`Invalid select: ${x}`);
+                }
+                data[fieldName] = getFakeData({
+                    model: field.type,
+                    select: x.fields,
+                    artifacts,
+                    isList: field.isList
+                });
+            }
+            else {
+                throw new Error(`Unhandled kind: ${field?.kind}`);
+            }
+        }
+    }
+    if (isList) {
+        return [data];
+    }
+    return data;
+}
+exports.getFakeData = getFakeData;
+function getValue(type) {
+    if (type === "boolean") {
+        return true;
+    }
+    if (type === "number") {
+        return 54.9434;
+    }
+    if (type === "integer") {
+        return 4;
+    }
+    if (type === "string") {
+        return "foo";
+    }
+    throw new Error(`Unhandled type: ${type}`);
+}

package/dist/getIsList.d.ts

@@ -0,0 +1 @@
+export declare function getIsList(operation: string): boolean;

package/dist/getIsList.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIsList = void 0;
+function getIsList(operation) {
+    return operation.endsWith("Paginated") || operation.endsWith("Many");
+}
+exports.getIsList = getIsList;

package/dist/index.d.ts

@@ -2,3 +2,5 @@ export { generate } from "./generation/generate";
 export { SDKNotFoundError } from "./runtime/lib/SDKNotFoundError";
 export { SDKBadWhereError } from "./runtime/lib/SDKBadWhereError";
 export { traverseFieldArgs } from "./traverseFieldArgs";
+export { getFakeData } from "./getFakeData";
+export { getIsList } from "./getIsList";

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traverseFieldArgs = exports.SDKBadWhereError = exports.SDKNotFoundError = exports.generate = void 0;
+exports.getIsList = exports.getFakeData = exports.traverseFieldArgs = exports.SDKBadWhereError = exports.SDKNotFoundError = exports.generate = void 0;
 var generate_1 = require("./generation/generate");
 Object.defineProperty(exports, "generate", { enumerable: true, get: function () { return generate_1.generate; } });
 var SDKNotFoundError_1 = require("./runtime/lib/SDKNotFoundError");
@@ -9,3 +9,7 @@ var SDKBadWhereError_1 = require("./runtime/lib/SDKBadWhereError");
 Object.defineProperty(exports, "SDKBadWhereError", { enumerable: true, get: function () { return SDKBadWhereError_1.SDKBadWhereError; } });
 var traverseFieldArgs_1 = require("./traverseFieldArgs");
 Object.defineProperty(exports, "traverseFieldArgs", { enumerable: true, get: function () { return traverseFieldArgs_1.traverseFieldArgs; } });
+var getFakeData_1 = require("./getFakeData");
+Object.defineProperty(exports, "getFakeData", { enumerable: true, get: function () { return getFakeData_1.getFakeData; } });
+var getIsList_1 = require("./getIsList");
+Object.defineProperty(exports, "getIsList", { enumerable: true, get: function () { return getIsList_1.getIsList; } });

package/dist/runtime/IRuntime.d.ts

@@ -9,9 +9,10 @@ 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 = {
     resource: string;
-    action: "findUnique" | "findMany" | "findManyPaginated" | "create" | "update" | "updateMany" | "delete" | "deleteMany";
+    action: TAction;
     args?: IArgs | undefined;
     data?: any;
     artifacts: IArtifacts;
@@ -19,6 +20,7 @@ export declare type TResolveParams = {
     context?: TContext | undefined;
     skipCache?: boolean;
     dbCall?: TDbCall;
+    nullability?: unknown;
 };
 export declare type TContext = {
     [k: string]: any;
@@ -159,6 +161,25 @@ export declare type IArtifacts = {
             [k: string]: boolean;
         };
         dateTimeFieldsCount: number;
+        fields: TField[];
     };
 };
+export declare type TFieldType = "string" | "boolean" | "number" | "integer";
+export declare type TField = {
+    kind: "scalar";
+    type: TFieldType;
+    name: string;
+    nullable: boolean;
+    hasDefaultValue: boolean;
+} | {
+    kind: "enum";
+    values: unknown[];
+    name: string;
+    nullable: boolean;
+} | {
+    kind: "object";
+    type: string;
+    name: string;
+    isList: boolean;
+};
 export {};

package/dist/runtime/lib/shared.js

@@ -39,15 +39,42 @@ async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, mi
         };
         return resource.runInAsyncScope(() => consumer(params));
     }
+    if (input?.nullability) {
+        return _nullResolve(input);
+    }
     return _resolve(input, dbCall, formatQuery, beginTransaction, dialect, context, cache);
 }
 exports.resolve = resolve;
+async function _nullResolve(input) {
+    const { nullability } = input;
+    if (typeof nullability !== "object" || nullability == null) {
+        throw new Error("Invalid nullability");
+    }
+    const table = input.resource;
+    const tableConfig = nullability[table];
+    if (tableConfig == null) {
+        throw new Error(`Response not configured for \`${table}\`.`);
+    }
+    const { action } = input;
+    const responseFn = tableConfig[action];
+    if (responseFn == null) {
+        throw new Error(`Response not configured for \`${action}\`, \`${table}\`.`);
+    }
+    if (typeof responseFn !== "function") {
+        throw new Error(`Invalid configured response for \`${action}\`, \`${table}\`: not a function.`);
+    }
+    return responseFn({
+        operation: action,
+        model: table,
+        args: { select: input.fields, where: input.args?.$where }
+    });
+}
 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);
@@ -116,7 +143,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}`);
@@ -140,9 +167,9 @@ async function getData(input, dbCall, formatQuery, dialect) {
     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)
@@ -160,7 +187,7 @@ async function getData(input, dbCall, formatQuery, dialect) {
         orderBy: orderByListPaginatedRootResult?.orderBy,
         rowWithMatchingCursor,
         dialect,
-        grabMany,
+        grabMany
     });
     const options = { dialect };
     let { sql, shapeDefinition } = await (0, util_1.compileSqlAST)(sqlAST, context, options);
@@ -243,7 +270,7 @@ async function getData(input, dbCall, formatQuery, dialect) {
                 // 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
@@ -353,9 +380,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) {
@@ -366,8 +393,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]);
@@ -508,7 +535,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];
@@ -641,7 +668,9 @@ 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);
@@ -681,7 +710,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();
@@ -691,7 +720,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;
 }
@@ -703,7 +732,9 @@ 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);
@@ -752,7 +783,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();
@@ -766,7 +797,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();
@@ -798,9 +829,7 @@ function removeExtraKeys(data, fields) {
             fieldKeys.push(x.as ?? x.name);
         }
     }
-    const dataKeys = Array.isArray(data)
-        ? Object.keys(data[0])
-        : Object.keys(data);
+    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)) {
@@ -848,7 +877,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);
@@ -867,7 +896,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));
@@ -890,7 +919,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);
@@ -909,7 +938,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));
@@ -941,7 +970,7 @@ const ops = [
     "$like",
     "$nlike",
     "$btwn",
-    "$nbtwn",
+    "$nbtwn"
 ];
 async function traverseWhere(where, cb) {
     return await _traverseWhere(cb, where, "", where);

package/package.json

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