@technicity/data-service-generator 0.8.3 → 0.9.0

package/dist/index.d.ts

@@ -1,3 +1,4 @@
 export { generate } from "./generation/generate";
 export { SDKNotFoundError } from "./runtime/lib/SDKNotFoundError";
+export { SDKBadWhereError } from "./runtime/lib/SDKBadWhereError";
 export { traverseFieldArgs } from "./traverseFieldArgs";

package/dist/index.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.traverseFieldArgs = exports.SDKNotFoundError = exports.generate = void 0;
+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");
 Object.defineProperty(exports, "SDKNotFoundError", { enumerable: true, get: function () { return SDKNotFoundError_1.SDKNotFoundError; } });
+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; } });

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

@@ -0,0 +1,4 @@
+import { CustomError } from "../../lib/CustomError";
+export declare class SDKBadWhereError extends CustomError {
+    constructor(message?: string);
+}

package/dist/runtime/lib/SDKBadWhereError.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SDKBadWhereError = void 0;
+const CustomError_1 = require("../../lib/CustomError");
+class SDKBadWhereError extends CustomError_1.CustomError {
+    constructor(message) {
+        super(message || "Invalid $where");
+    }
+}
+exports.SDKBadWhereError = SDKBadWhereError;

package/dist/runtime/lib/shared.js

@@ -19,6 +19,7 @@ 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");
 const stringifyWhere_1 = require("./stringifyWhere");
 const getOrderBy_1 = require("./getOrderBy");
 async function resolve(input, dbCall, formatQuery, beginTransaction, dialect, middlewareHandler, context) {
@@ -776,7 +777,14 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
                         v,
                     ])).then((xs) => xs[0]?.[mappedField.referencedKey])));
                     if (newVal.some((x) => x == null)) {
-                        throw new SDKNotFoundError_1.SDKNotFoundError();
+                        const index = newVal.findIndex((x) => x == null);
+                        if (index === -1) {
+                            throw new SDKBadWhereError_1.SDKBadWhereError();
+                        }
+                        else {
+                            const v = where[index];
+                            throw new SDKBadWhereError_1.SDKBadWhereError(getPrepareWhereNotFoundMessage(mappedField, v));
+                        }
                     }
                     out = _.set(newPath, newVal, out);
                 }
@@ -788,7 +796,7 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
                         where,
                     ])).then((xs) => xs[0]?.[mappedField.referencedKey]);
                     if (newVal == null) {
-                        throw new SDKNotFoundError_1.SDKNotFoundError();
+                        throw new SDKBadWhereError_1.SDKBadWhereError(getPrepareWhereNotFoundMessage(mappedField, where));
                     }
                     out = _.set(newPath, newVal, out);
                 }
@@ -811,7 +819,14 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
                         v,
                     ])).then((xs) => xs[0]?.[mappedField.referencedKey])));
                     if (newVal.some((x) => x == null)) {
-                        throw new SDKNotFoundError_1.SDKNotFoundError();
+                        const index = newVal.findIndex((x) => x == null);
+                        if (index === -1) {
+                            throw new SDKBadWhereError_1.SDKBadWhereError();
+                        }
+                        else {
+                            const v = where[index];
+                            throw new SDKBadWhereError_1.SDKBadWhereError(getPrepareWhereNotFoundMessage(mappedField, v));
+                        }
                     }
                     out = _.set(newPath, newVal, out);
                 }
@@ -823,7 +838,7 @@ async function _prepareWhere(artifacts, table, data, dbCall, formatQuery) {
                         where,
                     ])).then((xs) => xs[0]?.[mappedField.referencedKey]);
                     if (newVal == null) {
-                        throw new SDKNotFoundError_1.SDKNotFoundError();
+                        throw new SDKBadWhereError_1.SDKBadWhereError(getPrepareWhereNotFoundMessage(mappedField, where));
                     }
                     out = _.set(newPath, newVal, out);
                 }
@@ -837,6 +852,9 @@ 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}\`.`;
+}
 const ops = [
     "$eq",
     "$neq",

package/dist/runtime/lib/stringifyWhere.js

@@ -19,7 +19,10 @@ function stringifyWhere(input) {
         rowWithMatchingCursor,
     });
     if (paginationWhere) {
-        result = result + " AND " + paginationWhere;
+        result =
+            result.length === 0
+                ? paginationWhere
+                : result + " AND " + paginationWhere;
     }
     return result;
 }
@@ -162,7 +165,7 @@ function getOperatorNeq(value) {
 //   return { k, v };
 // }
 function stringifyPaginationWhere(input) {
-    const { table, args, orderBy, escapeId, escape, rowWithMatchingCursor, } = input;
+    const { table, args, orderBy, escapeId, escape, rowWithMatchingCursor } = input;
     if (args?.$paginate?.after == null && args?.$paginate?.before == null) {
         return "";
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@technicity/data-service-generator",
-  "version": "0.8.3",
+  "version": "0.9.0",
   "main": "./dist/index.js",
   "files": [
     "dist"
@@ -40,6 +40,6 @@
     "env-cmd": "^10.1.0",
     "mocha": "9.1.3",
     "sinon": "12.0.1",
-    "typescript": "^4.0.5"
+    "typescript": "4.6.4"
   }
 }