@zuzjs/orm 0.1.4 → 0.1.5

package/dist/drivers/queryBuilder.d.ts

@@ -1,4 +1,4 @@
-import { Repository, ObjectLiteral, FindOptionsWhere } from "typeorm";
+import { Repository, ObjectLiteral } from "typeorm";
 import { QueryAction } from "../types";
 import { QueryResult } from "mysql2";
 import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity";
@@ -40,7 +40,7 @@ declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends
      * @param condition - The condition to be added.
      * @returns The current instance of ZormQueryBuilder.
      */
-    or(condition: FindOptionsWhere<T>): this;
+    or(condition: Partial<Record<keyof T, any>>): this;
     /**
      * Adds an ORDER BY clause to the query.
      * @param field - The field to order by.

package/dist/drivers/queryBuilder.js

@@ -88,20 +88,21 @@ class ZormQueryBuilder extends Promise {
         return this;
     }
     applyCondition(qb, condition, type) {
-        Object.entries(condition).forEach(([key, value]) => {
+        Object.entries(condition).forEach(([key, value], index) => {
+            const paramKey = `${key}Param${index}_${this.whereCount}`; // Unique parameter name
             if (typeof value === "string") {
                 const match = value.match(/^(!=|>=|<=|>|<|=)\s*(.+)$/); // Improved regex
                 if (match) {
                     const [, operator, rawValue] = match;
                     const sqlOperator = operator; // Directly use the matched operator
-                    const paramKey = `${key}Param`; // Unique parameter name
                     const parsedValue = !isNaN(Number(rawValue)) ? Number(rawValue) : rawValue.trim(); // Convert to number if possible
                     qb[type](`${qb.alias}.${key} ${sqlOperator} :${paramKey}`, { [paramKey]: parsedValue });
                     return;
                 }
             }
             // Default case (normal equality condition)
-            qb[type](`${this.entityAlias}.${key} = :${key}`, { [key]: value });
+            qb[type](`${this.entityAlias}.${key} = :${paramKey}`, { [paramKey]: value });
+            this.whereCount++;
         });
     }
     /**
@@ -112,7 +113,6 @@ class ZormQueryBuilder extends Promise {
     where(condition) {
         const qb = this.queryBuilder;
         this.applyCondition(qb, condition, `andWhere`);
-        this.whereCount++;
         return this;
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zuzjs/orm",
-    "version": "0.1.4",
+    "version": "0.1.5",
     "keywords": [
         "orm",
         "zuz",