@zuzjs/orm 0.1.3 → 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";
@@ -28,6 +28,7 @@ declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends
      * @returns The current instance of ZormQueryBuilder.
      */
     select(fields: (keyof T)[]): this;
+    private applyCondition;
     /**
      * Adds a WHERE condition to the query.
      * @param condition - The condition to be added.
@@ -39,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

@@ -57,7 +57,12 @@ class ZormQueryBuilder extends Promise {
         return this;
     }
     _delete() {
-        this.queryBuilder = this.queryBuilder.delete();
+        if (this.whereCount > 0) {
+            this.queryBuilder = this.queryBuilder.delete();
+        }
+        else {
+            throw (0, core_1.stackTrace)(`○ Delete must have at least one WHERE condition. You forgot to call .where({ condition: value })`);
+        }
         return this;
     }
     _getRawQuery() {
@@ -82,6 +87,24 @@ class ZormQueryBuilder extends Promise {
             .select(fields.map(field => `${this.entityAlias}.${String(field)}`));
         return this;
     }
+    applyCondition(qb, condition, type) {
+        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 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} = :${paramKey}`, { [paramKey]: value });
+            this.whereCount++;
+        });
+    }
     /**
      * Adds a WHERE condition to the query.
      * @param condition - The condition to be added.
@@ -89,32 +112,17 @@ class ZormQueryBuilder extends Promise {
      */
     where(condition) {
         const qb = this.queryBuilder;
-        Object.entries(condition).forEach(([key, value]) => {
-            if (typeof value === "string" && value.startsWith("!")) {
-                qb.andWhere(`${this.entityAlias}.${key} != :${key}`, { [key]: value.slice(1) });
-            }
-            else if (typeof value === "boolean" || typeof value === "number") {
-                qb.andWhere(`${this.entityAlias}.${key} = :${key}`, { [key]: value });
-            }
-            else {
-                qb.andWhere(`${this.entityAlias}.${key} = :${key}`, { [key]: value });
-            }
-        });
-        this.whereCount++;
+        this.applyCondition(qb, condition, `andWhere`);
         return this;
     }
-    // where(condition: FindOptionsWhere<T>): this {
-    //     (this.queryBuilder as  SelectQueryBuilder<T> | UpdateQueryBuilder<T>).where(condition);
-    //     this.whereCount++
-    //     return this;
-    // }
     /**
      * Adds an OR condition to the query.
      * @param condition - The condition to be added.
      * @returns The current instance of ZormQueryBuilder.
      */
     or(condition) {
-        this.queryBuilder.orWhere(condition);
+        const qb = this.queryBuilder;
+        this.applyCondition(qb, condition, `orWhere`);
         return this;
     }
     /**
@@ -285,14 +293,17 @@ class ZormQueryBuilder extends Promise {
                         .where(whereQuery, _updateQuery.getParameters()); // Use the same parameters
                     const _updated = await _get.getMany();
                     return {
-                        updated: true,
+                        updated: _update.affected ? _update.affected > 0 : false,
                         record: _updated[0],
-                        records: _updated.length > 1 ? _updated : null
+                        records: _updated.length > 1 ? _updated : []
                     };
                 case "delete":
                     this._delete();
                     const _delete = await this.queryBuilder.execute();
-                    return { deleted: true, count: _delete.affected || 0 };
+                    return {
+                        deleted: _delete.affected ? _delete.affected > 0 : false,
+                        count: _delete.affected || 0
+                    };
                 case "select":
                 default:
                     const _select = await this.queryBuilder.getMany();
@@ -300,7 +311,7 @@ class ZormQueryBuilder extends Promise {
                         hasRows: _select.length > 0,
                         count: _select.length,
                         row: _select.length > 0 ? _select[0] : null,
-                        rows: _select
+                        rows: _select.length > 1 ? _select : []
                     };
             }
         }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 import { EntitySchema, EntityTarget, MixedList, ObjectLiteral, Repository } from "typeorm";
 import ZormQueryBuilder from "./drivers/queryBuilder.js";
-import { InsertQueryResult, SelectQueryResult, UpdateQueryResult } from "./types.js";
+import { DeleteQueryResult, InsertQueryResult, SelectQueryResult, UpdateQueryResult } from "./types.js";
 import "reflect-metadata";
 /**
  * Zorm is a lightweight ORM wrapper around TypeORM with support for MySQL.
@@ -85,7 +85,7 @@ declare class Zorm {
      * @param {EntityTarget<T>} entity - The entity target.
      * @returns {ZormQueryBuilder<T, DeleteQueryResult>} The query builder instance.
      */
-    delete<T extends ObjectLiteral>(entity: EntityTarget<T>): ZormQueryBuilder<T, UpdateQueryResult>;
+    delete<T extends ObjectLiteral>(entity: EntityTarget<T>): ZormQueryBuilder<T, DeleteQueryResult>;
 }
 export default Zorm;
 export * from "./types.js";

package/package.json

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