typeorm-extensions 2.2.0-rc.1 → 2.2.0-rc.11

package/dist/utils/where.utils.d.ts

@@ -5,6 +5,8 @@ export declare function getValuePlaceholder<T>(value: T, paramName?: string): st
  * Whether `params` is a `{ name: value }` params object (a plain object or a class instance such
  * as a DTO), rather than the value itself (a primitive, an array, a `Date`, a `Buffer`).
  */
+/** The value a condition compares with: the value of a one-key params object, or the params themselves (a Date or a Buffer is a value too). */
+export declare function getComparedValue(params: unknown): unknown;
 export declare function isParamsObject(params: unknown): params is Record<string, unknown>;
 /**
  * Checks whether `conditions` already references a key of `params` as a TypeORM

package/dist/utils/where.utils.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.andWhereNarrowing = exports.attachWhere = exports.hasParamPlaceholder = exports.isParamsObject = exports.getValuePlaceholder = void 0;
+exports.andWhereNarrowing = exports.attachWhere = exports.hasParamPlaceholder = exports.isParamsObject = exports.getComparedValue = exports.getValuePlaceholder = void 0;
 const sql_utils_1 = require("./sql.utils");
 const query_builder_utils_1 = require("./query-builder.utils");
+const parameter_utils_1 = require("./parameter.utils");
+const common_utils_1 = require("./common.utils");
 function getValuePlaceholder(value, paramName) {
     if (value === undefined || value === null || paramName === undefined) {
         return 'NULL';
@@ -13,16 +15,25 @@ function getValuePlaceholder(value, paramName) {
     return `:${paramName}`;
 }
 exports.getValuePlaceholder = getValuePlaceholder;
-const isDate = (value) => Object.prototype.toString.call(value) === '[object Date]';
+/**
+ * A condition that ends with an operator, `=`, `>=`, `LIKE`, `IN`, `@>`: it needs a value after it. A word after
+ * `:` or `.` is a parameter or a column (`ILIKE :like`, `= t.in`), not an operator.
+ */
+const OPERATOR_AT_END = /(?:[=<>!~@&|?]|(?<![\w$:.])(?:LIKE|ILIKE|IN|SIMILAR TO|DISTINCT FROM|BETWEEN|ANY|ALL))\s*$/i;
 /**
  * Objects that are parameter values themselves, not `{ name: value }` params objects:
  * `Date`, and binary data (`Buffer`, typed arrays, `ArrayBuffer`).
  */
-const isValueObject = (value) => isDate(value) || ArrayBuffer.isView(value) || value instanceof ArrayBuffer;
+const isValueObject = (value) => (0, common_utils_1.isDate)(value) || ArrayBuffer.isView(value) || value instanceof ArrayBuffer;
 /**
  * Whether `params` is a `{ name: value }` params object (a plain object or a class instance such
  * as a DTO), rather than the value itself (a primitive, an array, a `Date`, a `Buffer`).
  */
+/** The value a condition compares with: the value of a one-key params object, or the params themselves (a Date or a Buffer is a value too). */
+function getComparedValue(params) {
+    return isParamsObject(params) ? Object.values(params)[0] : params;
+}
+exports.getComparedValue = getComparedValue;
 function isParamsObject(params) {
     return (params !== null &&
         typeof params === 'object' &&
@@ -39,14 +50,7 @@ function hasParamPlaceholder(conditions, params) {
     if (!isParamsObject(params)) {
         return false;
     }
-    const placeholderRegex = /:(?:\.\.\.)?([A-Za-z0-9_.]+)/g;
-    let match;
-    while ((match = placeholderRegex.exec(conditions)) !== null) {
-        if (Object.prototype.hasOwnProperty.call(params, match[1])) {
-            return true;
-        }
-    }
-    return false;
+    return (0, parameter_utils_1.getPlaceholderNames)(conditions).some((name) => Object.prototype.hasOwnProperty.call(params, name));
 }
 exports.hasParamPlaceholder = hasParamPlaceholder;
 /**
@@ -76,15 +80,18 @@ function attachWhere(builder, method, field, conditions, params, options) {
         const hasParams = typeof params !== 'undefined';
         // `addValue` defaults to `true` unless `conditions` already references one of the `params` keys
         addValue = addValue !== null && addValue !== void 0 ? addValue : !hasParamPlaceholder(conditions, params);
+        if (addValue && !hasParams && OPERATOR_AT_END.test(conditions)) {
+            throw new TypeError(`The value after "${fieldName} ${conditions.trim()}" is undefined, which leaves the condition without ` +
+                `an operand. Pass the value, null to compare with NULL, or a condition without one ('IS NULL')`);
+        }
         if (addValue && hasParams) {
             assertSingleValueParams(fieldName, params);
-            // pick first value from params object or pass as is (a Date or a Buffer is a value too)
-            const firstValue = isParamsObject(params) ? Object.values(params)[0] : params;
+            const firstValue = getComparedValue(params);
             // 0, false, '' are valid values like any other
             // null, undefined, NaN and invalid dates are equal to NULL
             const valueIsValid = firstValue !== undefined &&
                 (typeof firstValue === 'number' ? !isNaN(firstValue) : true) &&
-                (isDate(firstValue) ? !isNaN(firstValue.getTime()) : true);
+                ((0, common_utils_1.isDate)(firstValue) ? !isNaN(firstValue.getTime()) : true);
             const paramName = valueIsValid
                 ? (0, sql_utils_1.createUniqueParameterName)(method)
                 : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typeorm-extensions",
-  "version": "2.2.0-rc.1",
+  "version": "2.2.0-rc.11",
   "description": "typeorm commonly used extensions",
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",
@@ -14,7 +14,7 @@
   "scripts": {
     "build": "tsc -p .",
     "lint": "eslint . --ext .ts",
-    "test:types": "tsc -p test/types && tsc -p test/types/tsconfig.loose.json"
+    "test:types": "tsc -p test/types && tsc -p test/types/tsconfig.loose.json && tsc -p test/types/typed-imports && tsc -p test/types/typed-imports/tsconfig.loose.json"
   },
   "keywords": [
     "typeorm",