typeorm-extensions 1.3.4 → 1.3.5

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

@@ -1,6 +1,6 @@
 import type { WhereExpressionBuilder } from 'typeorm';
 import type { WhereMethods } from '../types/extensions/where.types';
 export declare function getValuePlaceholder<T>(value: T, paramName?: string): string;
-export declare function attachWhere<QB extends WhereExpressionBuilder>(builder: QB, method: WhereMethods, field: string, conditions: string, value?: unknown, options?: {
+export declare function attachWhere<QB extends WhereExpressionBuilder>(builder: QB, method: WhereMethods, field: string, conditions: string, params?: unknown, options?: {
     addValue?: boolean;
 }): QB;

package/dist/utils/where.utils.js

@@ -12,28 +12,29 @@ function getValuePlaceholder(value, paramName) {
     return `:${paramName}`;
 }
 exports.getValuePlaceholder = getValuePlaceholder;
-function attachWhere(builder, method, field, conditions, value, options) {
+function attachWhere(builder, method, field, conditions, params, options) {
     const { addValue = true } = options || {};
     if (method && typeof field === 'string' && typeof conditions === 'string') {
         field = (0, sql_utils_1.stringToSQLIdentifier)(field);
-        if (addValue) {
-            // is object (not primitive, null or array)
-            const firstValue = value !== null && typeof value === 'object' && !Array.isArray(value)
-                ? Object.values(value)[0]
-                : value;
+        const hasParams = typeof params !== 'undefined';
+        if (addValue && hasParams) {
+            // pick first value from params object or pass as is
+            const firstValue = params !== null && typeof params === 'object' && !Array.isArray(params)
+                ? Object.values(params)[0]
+                : params;
             // 0, false, '' are valid values like any other
-            // null is a valid value, but undefined and NaN are not
+            // null, undefined and NaN are equal to NULL
             const valueIsValid = firstValue !== undefined &&
                 (typeof firstValue === 'number' ? !isNaN(firstValue) : true);
             const paramName = valueIsValid
                 ? (0, sql_utils_1.createUniqueParameterName)(method)
                 : undefined;
-            const params = paramName && valueIsValid ? { [paramName]: firstValue } : undefined;
+            const queryParams = paramName && valueIsValid ? { [paramName]: firstValue } : undefined;
             const valuePlaceholder = getValuePlaceholder(firstValue, paramName);
-            return builder[method](`${field} ${conditions} ${valuePlaceholder}`, params);
+            return builder[method](`${field} ${conditions} ${valuePlaceholder}`, queryParams);
         }
         else {
-            return builder[method](`${field} ${conditions}`, value);
+            return builder[method](`${field} ${conditions}`, params);
         }
     }
     return builder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typeorm-extensions",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "typeorm commonly used extensions",
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",