@zuzjs/orm 0.1.2 → 0.1.4

package/dist/bin.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const commander_1 = require("commander");
 const cli_js_1 = require("./core/cli.js");
 const picocolors_1 = __importDefault(require("picocolors"));
-const version = `0.1.2`;
 commander_1.program
     .name("zorm")
     .description("ZuzORM is a lightweight ORM wrapper around TypeORM with support for MySQL.");
@@ -16,7 +15,8 @@ commander_1.program
     .option(`-v, --version`)
     .description("Displays current version of ZuzORM")
     .action(() => {
-    console.log(picocolors_1.default.cyan(`ZuzORM v${version}`));
+    const packageJson = require("../package.json");
+    console.log(picocolors_1.default.cyan(`ZuzORM v${packageJson.version}`));
     process.exit(1);
 });
 commander_1.program

package/dist/core/cli.js

@@ -43,7 +43,7 @@ const picocolors_1 = __importDefault(require("picocolors"));
 const index_js_1 = require("./index.js");
 const mysql_1 = require("../drivers/mysql");
 const buildEntities = (connection, dist) => {
-    dist = dist || path_1.default.join(`.zorm`);
+    dist = dist || path_1.default.join(`src`, `zorm`);
     const _checkDist = (0, index_js_1.checkDirectory)(path_1.default.join(process.cwd(), dist), true);
     if (!_checkDist.access) {
         console.log(picocolors_1.default.red(`○ ${_checkDist.message}`));

package/dist/drivers/mysql/index.js

@@ -148,10 +148,11 @@ class MySqlDriver {
                 `* AutoGenerated by @zuzjs/orm.`,
                 `* @ ${new Date().toString().split(` GMT`)[0].trim()}`,
                 `*/`,
-                `import { Entity, PrimaryColumn, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";\n`,
+                `import { Entity, PrimaryColumn, PrimaryGeneratedColumn, Column, BaseEntity } from "@zuzjs/orm";\n`,
                 `@Entity({ name: "${tableName}" })`,
                 `export class ${(0, index_js_1.toPascalCase)(tableName)} extends BaseEntity {\n`
             ];
+            let hasPrimary = false;
             for (const column of columns) {
                 // const { Field, Type, Key } = column;
                 const { Field, Type, Key, Null, Default, Extra } = column;
@@ -159,6 +160,7 @@ class MySqlDriver {
                 // Handle primary key
                 if (Key === "PRI") {
                     entityCode.push(Extra.includes("auto_increment") ? `\t@PrimaryGeneratedColumn()` : `\t@PrimaryColumn()`);
+                    hasPrimary = true;
                 }
                 else {
                     let columnDecorator = `\t@Column({ type: "${columnType}"`;
@@ -174,12 +176,14 @@ class MySqlDriver {
                 entityCode.push(`\t${Field}!: ${tsType};\n`);
             }
             entityCode.push(`}`);
+            if (!hasPrimary) {
+                console.log(picocolors_1.default.bgRed(picocolors_1.default.whiteBright(` WARNING `)), picocolors_1.default.yellow(`○ "${tableName}" does not have a primary column. Primary column is required.`));
+            }
             // Write entity file
             fs_1.default.writeFileSync(path_1.default.join(this.dist, `${tableName}.ts`), entityCode.join(`\n`));
         }
         await self.pool.end();
         console.log(picocolors_1.default.green(`✓ ${tables.length} Tables Processed.`));
-        process.exit(1);
     }
 }
 exports.MySqlDriver = MySqlDriver;

package/dist/drivers/queryBuilder.d.ts

@@ -28,12 +28,13 @@ 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.
      * @returns The current instance of ZormQueryBuilder.
      */
-    where(condition: FindOptionsWhere<T>): this;
+    where(condition: Partial<Record<keyof T, any>>): this;
     /**
      * Adds an OR condition to the query.
      * @param condition - The condition to be added.

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,13 +87,31 @@ class ZormQueryBuilder extends Promise {
             .select(fields.map(field => `${this.entityAlias}.${String(field)}`));
         return this;
     }
+    applyCondition(qb, condition, type) {
+        Object.entries(condition).forEach(([key, value]) => {
+            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 });
+        });
+    }
     /**
      * Adds a WHERE condition to the query.
      * @param condition - The condition to be added.
      * @returns The current instance of ZormQueryBuilder.
      */
     where(condition) {
-        this.queryBuilder.where(condition);
+        const qb = this.queryBuilder;
+        this.applyCondition(qb, condition, `andWhere`);
         this.whereCount++;
         return this;
     }
@@ -98,7 +121,8 @@ class ZormQueryBuilder extends Promise {
      * @returns The current instance of ZormQueryBuilder.
      */
     or(condition) {
-        this.queryBuilder.orWhere(condition);
+        const qb = this.queryBuilder;
+        this.applyCondition(qb, condition, `orWhere`);
         return this;
     }
     /**
@@ -239,6 +263,13 @@ class ZormQueryBuilder extends Promise {
      * @returns A promise that resolves with the query result.
      */
     async execute() {
+        const removedMethods = {};
+        Object.keys(Object.prototype).forEach((method) => {
+            if (Object.prototype.hasOwnProperty.call(Object.prototype, method)) {
+                removedMethods[method] = Object.prototype[method];
+                delete Object.prototype[method];
+            }
+        });
         try {
             switch (this.action) {
                 case "upsert":
@@ -254,21 +285,33 @@ class ZormQueryBuilder extends Promise {
                     };
                 case "update":
                     this._update();
-                    const _update = await this.queryBuilder.execute();
-                    // console.log(`updated`, _update)
-                    return { updated: true };
+                    const _updateQuery = this.queryBuilder;
+                    const _update = await _updateQuery.execute();
+                    const whereQuery = _updateQuery.getQuery().split("WHERE")[1]?.trim(); // Get the WHERE clause
+                    const _get = this.repository
+                        .createQueryBuilder(this.entityAlias)
+                        .where(whereQuery, _updateQuery.getParameters()); // Use the same parameters
+                    const _updated = await _get.getMany();
+                    return {
+                        updated: _update.affected ? _update.affected > 0 : false,
+                        record: _updated[0],
+                        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();
                     return {
-                        hasRows: true,
+                        hasRows: _select.length > 0,
                         count: _select.length,
-                        row: _select[0],
-                        rows: _select
+                        row: _select.length > 0 ? _select[0] : null,
+                        rows: _select.length > 1 ? _select : []
                     };
             }
         }
@@ -301,6 +344,11 @@ class ZormQueryBuilder extends Promise {
                     return this.usePromise ? Promise.reject(_s) : _s;
             }
         }
+        finally {
+            Object.entries(removedMethods).forEach(([method, fn]) => {
+                Object.prototype[method] = fn;
+            });
+        }
     }
     /**
      * Handles the fulfillment and rejection of the promise.

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 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.
  */
@@ -84,6 +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/dist/index.js

@@ -1,4 +1,18 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -9,6 +23,7 @@ const index_js_1 = require("./core/index.js");
 const picocolors_1 = __importDefault(require("picocolors"));
 const index_js_2 = require("./drivers/mysql/index.js");
 const queryBuilder_js_1 = __importDefault(require("./drivers/queryBuilder.js"));
+require("reflect-metadata");
 /**
  * Zorm is a lightweight ORM wrapper around TypeORM with support for MySQL.
  */
@@ -165,3 +180,4 @@ class Zorm {
     }
 }
 exports.default = Zorm;
+__exportStar(require("./types.js"), exports);

package/dist/types.d.ts

@@ -39,6 +39,8 @@ export type SelectQueryResult = {
 };
 export type UpdateQueryResult = {
     updated: boolean;
+    record?: ObjectLiteral;
+    records?: ObjectLiteral[];
     error?: QueryError;
 };
 export type DeleteQueryResult = {
@@ -46,3 +48,4 @@ export type DeleteQueryResult = {
     count: number;
     error?: QueryError;
 };
+export { Entity, PrimaryColumn, PrimaryGeneratedColumn, Column, BaseEntity } from "typeorm";

package/dist/types.js

@@ -1,2 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.BaseEntity = exports.Column = exports.PrimaryGeneratedColumn = exports.PrimaryColumn = exports.Entity = void 0;
+var typeorm_1 = require("typeorm");
+Object.defineProperty(exports, "Entity", { enumerable: true, get: function () { return typeorm_1.Entity; } });
+Object.defineProperty(exports, "PrimaryColumn", { enumerable: true, get: function () { return typeorm_1.PrimaryColumn; } });
+Object.defineProperty(exports, "PrimaryGeneratedColumn", { enumerable: true, get: function () { return typeorm_1.PrimaryGeneratedColumn; } });
+Object.defineProperty(exports, "Column", { enumerable: true, get: function () { return typeorm_1.Column; } });
+Object.defineProperty(exports, "BaseEntity", { enumerable: true, get: function () { return typeorm_1.BaseEntity; } });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zuzjs/orm",
-    "version": "0.1.2",
+    "version": "0.1.4",
     "keywords": [
         "orm",
         "zuz",
@@ -28,6 +28,7 @@
     "engines": {
         "node": ">=18.17.0"
     },
+    "sideEffects": ["reflect-metadata"],
     "dependencies": {
         "@types/md5": "^2.3.5",
         "commander": "^13.1.0",