@zuzjs/orm 0.3.7 → 0.3.8

package/dist/index.d.ts

@@ -1,7 +1,299 @@
-import "reflect-metadata";
-import { EntitySchema, EntityTarget, MixedList, ObjectLiteral, Repository } from "typeorm";
-import ZormQueryBuilder from "./drivers/queryBuilder.js";
-import { DeleteQueryResult, InsertQueryResult, SelectQueryResult, UpdateQueryResult } from "./types.js";
+import { ObjectLiteral, Repository, MixedList, EntitySchema, EntityTarget } from 'typeorm';
+export { BaseEntity, Column, Entity, JoinColumn, ManyToMany, ManyToOne, OneToMany, OneToOne, PrimaryColumn, PrimaryGeneratedColumn } from 'typeorm';
+import { QueryResult as QueryResult$1 } from 'mysql2';
+import { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
+
+type dynamicObject = {
+    [x: string]: any;
+};
+interface ModelGenerator {
+    generate: () => void;
+    connection: () => ConnectionDetails;
+    mapColumns: (sqlType: string) => void;
+}
+type ConnectionDetails = {
+    host: string;
+    port: string | number;
+    user: string;
+    password: string;
+    database: string;
+    params: dynamicObject;
+};
+type QueryAction = "create" | "upsert" | "select" | "update" | "delete";
+type QueryResult = InsertQueryResult | SelectQueryResult | UpdateQueryResult | DeleteQueryResult;
+/**
+ * Defines supported comparison operators for filtering queries.
+ * Enables IntelliSense support in `.where()` conditions.
+ *
+ * @template T The type of the value being compared (e.g., number, string, Date).
+ */
+type WhereOperators<T> = {
+    /**
+     * Greater than (`>`) operator.
+     *
+     * @example
+     * query.where({ age: { gt: 18 } }) // WHERE age > 18
+     */
+    gt?: T;
+    /**
+     * Greater than or equal to (`>=`) operator.
+     *
+     * @example
+     * query.where({ price: { gte: 100 } }) // WHERE price >= 100
+     */
+    gte?: T;
+    /**
+     * Less than (`<`) operator.
+     *
+     * @example
+     * query.where({ age: { lt: 30 } }) // WHERE age < 30
+     */
+    lt?: T;
+    /**
+     * Less than or equal to (`<=`) operator.
+     *
+     * @example
+     * query.where({ date: { lte: '2024-01-01' } }) // WHERE date <= '2024-01-01'
+     */
+    lte?: T;
+    /**
+     * Not equal (`!=`) operator.
+     *
+     * @example
+     * query.where({ status: { ne: 'inactive' } }) // WHERE status != 'inactive'
+     */
+    ne?: T;
+    /**
+     * Equal (`=`) operator.
+     * This is typically unnecessary since `.where({ key: value })` already handles equality.
+     *
+     * @example
+     * query.where({ id: { eq: 1 } }) // WHERE id = 1
+     */
+    eq?: T;
+};
+type PartialConditions<T> = Partial<Record<keyof T, string | number | boolean | WhereOperators<any>>>;
+type QueryError = {
+    code: number | string;
+    message: string;
+    query: string;
+    values: string[];
+};
+type InsertQueryResult = {
+    created: boolean;
+    id?: number;
+    record?: ObjectLiteral;
+    records?: ObjectLiteral[];
+    error?: QueryError;
+};
+type SelectQueryResult = {
+    hasRows: boolean;
+    count?: number;
+    row?: any;
+    rows?: any[];
+    error?: QueryError;
+    save?: () => void;
+};
+type UpdateQueryResult = {
+    updated: boolean;
+    record?: ObjectLiteral;
+    records?: ObjectLiteral[];
+    error?: QueryError;
+};
+type DeleteQueryResult = {
+    deleted: boolean;
+    count: number;
+    error?: QueryError;
+};
+
+declare class ZormExprBuilder<T extends ObjectLiteral> {
+    private _parts;
+    private _params;
+    private _paramIdx;
+    private _alias;
+    private static globalParamIdx;
+    constructor(alias?: string, parent?: {
+        params: Record<string, any>;
+        idx: number;
+    });
+    field(col: keyof T | string): this;
+    equals(value: any): this;
+    append(extra: string): this;
+    wrap(wrapper: (expr: string) => string): this;
+    exists(sub: (q: ZormExprBuilder<T>) => ZormExprBuilder<T>): this;
+    select(expr: string): this;
+    from(table: string, alias: string): this;
+    where(cond: Record<string, any>): this;
+    or(): this;
+    group(): this;
+    fromUnixTime(): this;
+    date(): this;
+    substring(column: keyof T | string, delimiter: string, index: number): this;
+    toExpression(): {
+        expression: string;
+        param: Record<string, any>;
+    };
+    buildExpression(): string;
+    buildParams(): Record<string, any>;
+}
+
+declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult$1> extends Promise<R> {
+    private repository;
+    private queryBuilder;
+    private entityAlias;
+    private action;
+    private queryValues;
+    private usePromise;
+    private whereCount;
+    private isActiveRecord;
+    private activeRecord;
+    private joinedAliases;
+    constructor(repository: Repository<T>, _action: QueryAction, _usePromise?: boolean);
+    _create(): this;
+    upsert(): this;
+    _update(): this;
+    _delete(): this;
+    _getRawQuery(): [string, any[]];
+    active(): this;
+    _saveActiveRecord(activeRecord: T): Promise<T | null>;
+    clone(): ZormQueryBuilder<T, R>;
+    /**
+     * Sets the values for an insert or update query.
+     * @param data - The data to be inserted or updated.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    with(data: QueryDeepPartialEntity<T> | QueryDeepPartialEntity<T[]>): this;
+    /**
+     * Sets the values for an insert or update query.
+     * @param data - The data to be inserted or updated.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    withData(data: QueryDeepPartialEntity<T> | QueryDeepPartialEntity<T[]>): this;
+    /**
+     * Specifies the fields to be selected in a select query.
+     * @param fields - The fields to be selected.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    select(fields: (keyof T)[]): this;
+    private applyCondition;
+    /**
+     * Adds a custom expression-based WHERE clause using a fluent builder.
+     * @param fn - A callback that receives a ZormExprBuilder and returns an expression + param.
+     */
+    expression(exprFn: (q: ZormExprBuilder<T>) => ZormExprBuilder<T>, 
+    /** Add parentheses group to built expression */
+    group?: boolean): this;
+    /**
+     * Adds a WHERE condition to the query.
+     * @param condition - The condition to be added.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    where(condition: PartialConditions<T>): this;
+    /**
+     * Adds an OR condition to the query.
+     * @param condition - The condition to be added.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    or(condition: PartialConditions<T>): this;
+    /**
+     * Adds an ORDER BY clause to the query.
+     * @param field - The field to order by.
+     * @param direction - The direction of the order (ASC or DESC).
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    orderBy(field: keyof T, direction?: "ASC" | "DESC"): this;
+    /**
+     * Adds a LIMIT clause to the query.
+     * @param n - The maximum number of records to return.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    limit(n: number): this;
+    /**
+     * Adds an OFFSET clause to the query.
+     * @param n - The number of records to skip.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    offset(n: number): this;
+    /**
+     * Adds relations to be included in the query.
+     * @param relations - The relations to be included.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    withRelation(rel: string, ...more: string[]): this;
+    /**
+     * Adds an INNER JOIN clause to the query.
+     * @param relation - The relation to join.
+     * @param alias - The alias for the joined relation.
+     * @param condition - Optional condition for the join.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    innerJoin(relation: string, alias: string, condition?: string): this;
+    /**
+     * Adds a LEFT JOIN clause to the query.
+     * @param relation - The relation to join.
+     * @param alias - The alias for the joined relation.
+     * @param condition - Optional condition for the join.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    leftJoin(relation: string, alias: string, condition?: string): this;
+    /**
+     * Adds a GROUP BY clause to the query.
+     * @param field - The field to group by.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    groupBy(field: keyof T): this;
+    /**
+     * Adds a HAVING clause to the query.
+     * @param condition - The condition for the HAVING clause.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    having(condition: string): this;
+    /**
+     * Adds an IN clause to the query.
+     * @param field - The field to check.
+     * @param values - The values for the IN clause.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    in(field: keyof T, values: any[]): this;
+    /**
+     * Adds a LIKE condition to the query, supporting both single and multiple values.
+     * If an array is provided, it uses OR conditions between them.
+     * @param field - The field to apply the LIKE condition on.
+     * @param value - A string or an array of strings to match.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    like(conditions: Partial<Record<keyof T, string | string[]>>, mode: "contains" | "startsWith" | "endsWith" | "exact"): this;
+    /**
+     * Adds a DISTINCT clause to the query.
+     * @returns The current instance of ZormQueryBuilder.
+     */
+    distinct(): this;
+    count(field?: keyof T): Promise<number>;
+    sum(field: keyof T): Promise<number>;
+    avg(field: keyof T): Promise<number>;
+    min(field: keyof T): Promise<number>;
+    max(field: keyof T): Promise<number>;
+    /**
+     * Executes a raw SQL query.
+     * @param sql - The raw SQL query.
+     * @param params - Optional parameters for the query.
+     * @returns A promise that resolves with the query result.
+     */
+    rawQuery(sql: string, params?: any): Promise<any>;
+    /**
+     * Executes the query and returns the result.
+     * @returns A promise that resolves with the query result.
+     */
+    execute(): Promise<R>;
+    /**
+     * Handles the fulfillment and rejection of the promise.
+     * @param onfulfilled - The callback to execute when the promise is fulfilled.
+     * @param onrejected - The callback to execute when the promise is rejected.
+     * @returns A promise that resolves with the result of the callback.
+     */
+    then<TResult1 = R, TResult2 = never>(onfulfilled?: ((value: R) => TResult1 | PromiseLike<TResult1>) | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): Promise<TResult1 | TResult2>;
+}
+
 /**
  * Zorm is a lightweight ORM wrapper around TypeORM with support for MySQL.
  */
@@ -90,5 +382,5 @@ declare class Zorm {
      */
     delete<T extends ObjectLiteral>(entity: EntityTarget<T>): ZormQueryBuilder<T, DeleteQueryResult>;
 }
-export default Zorm;
-export * from "./types.js";
+
+export { type ConnectionDetails, type DeleteQueryResult, type InsertQueryResult, type ModelGenerator, type PartialConditions, type QueryAction, type QueryError, type QueryResult, type SelectQueryResult, type UpdateQueryResult, type WhereOperators, Zorm as default, type dynamicObject };

package/dist/index.js

@@ -1,232 +1 @@
-"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 };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const picocolors_1 = __importDefault(require("picocolors"));
-require("reflect-metadata");
-const typeorm_1 = require("typeorm");
-const index_js_1 = require("./core/index.js");
-const index_js_2 = require("./drivers/mysql/index.js");
-const queryBuilder_js_1 = __importDefault(require("./drivers/queryBuilder.js"));
-/**
- * Zorm is a lightweight ORM wrapper around TypeORM with support for MySQL.
- */
-class Zorm {
-    /**
-     * Singleton instance of Zorm.
-     * @private
-     */
-    static instance;
-    /**
-     * TypeORM DataSource instance.
-     * @private
-     */
-    dataSource;
-    /**
-     * Flag to track if the connection is initialized.
-     * @private
-     */
-    initialized = false;
-    /**
-     * Determines whether to use Promises for queries.
-     * @private
-     */
-    usePromise = false;
-    _init;
-    /**
-     * Private constructor to enforce singleton pattern.
-     * @param {string} connectionString - The database connection string.
-     * @param {string | null} [entitiesPath] - Path to the entities directory.
-     * @param {boolean} [usePromise] - Whether to use Promises for queries.
-     * @private
-     */
-    constructor(connectionString, entities, entitiesPath, usePromise) {
-        const _dist = entitiesPath || path_1.default.join(`src`, `zorm`);
-        const dist = path_1.default.join(process.cwd(), _dist);
-        const _checkDist = (0, index_js_1.checkDirectory)(dist, false);
-        this.usePromise = usePromise || false;
-        if (!_checkDist.access) {
-            console.log(picocolors_1.default.red(`○ ${_checkDist.message}`));
-            return;
-        }
-        if (connectionString.startsWith(`mysql`)) {
-            const driver = new index_js_2.MySqlDriver(decodeURIComponent(connectionString));
-            const conn = driver.connection();
-            this.dataSource = new typeorm_1.DataSource({
-                type: "mysql",
-                username: conn.user,
-                password: conn.password,
-                host: conn.host,
-                port: Number(conn.port),
-                database: conn.database,
-                entities: entities || []
-            });
-            this._init = this.dataSource.initialize.bind(this.dataSource);
-        }
-        else {
-            console.log(`Only MySQL is supported for now`);
-            process.exit(1);
-        }
-    }
-    /**
-     * Returns the singleton instance of Zorm.
-     * @param {string} connectionString - The database connection string.
-     * @param {string | null} [entitiesPath] - Path to the entities directory.
-     * @param {boolean} [usePromise] - Whether to use Promises for queries.
-     * @returns {Zorm} The singleton instance of Zorm.
-     */
-    static get(connectionString, entities, entitiesPath, usePromise) {
-        if (!Zorm.instance) {
-            Zorm.instance = new Zorm(connectionString, entities, entitiesPath, usePromise);
-        }
-        return Zorm.instance;
-    }
-    /**
-     * Connects to the database and initializes entities.
-     * @param {MixedList<string | Function | EntitySchema<any>>} entities - List of entity schemas.
-     * @returns {Promise<void>} Resolves when the connection is initialized.
-     */
-    async connect(entities) {
-        if (!this.initialized) {
-            try {
-                if (entities && !this.dataSource.options.entities?.length) {
-                    this.dataSource.setOptions({ entities });
-                }
-                await this._init();
-                this.initialized = true;
-                console.log(picocolors_1.default.green("○ Zorm is connected"));
-            }
-            catch (e) {
-                console.log(picocolors_1.default.red("○ Error while connecting to your MySQL Server with following error:"), e);
-            }
-        }
-    }
-    whenReady() {
-        if (this.initialized)
-            return this;
-        const handler = {
-            get: (target, prop) => {
-                if (prop === 'then')
-                    return undefined;
-                const value = target[prop];
-                if (typeof value === 'function') {
-                    return (...args) => {
-                        const result = value.apply(target, args);
-                        if (result && result.constructor.name === 'ZormQueryBuilder') {
-                            return this.wrapQueryBuilder(result);
-                        }
-                        this._init().then(() => result);
-                    };
-                }
-                return value;
-            }
-        };
-        return new Proxy(this, handler);
-    }
-    wrapQueryBuilder(qb) {
-        const handler = {
-            get: (target, prop) => {
-                if (prop === 'then')
-                    return undefined;
-                const value = target[prop];
-                if (typeof value === 'function') {
-                    return (...args) => {
-                        const result = value.apply(target, args);
-                        // Chain: if returns new QB, wrap it
-                        if (result && result.constructor.name === 'ZormQueryBuilder') {
-                            return this.wrapQueryBuilder(result);
-                        }
-                        // Final: return Promise
-                        return this._init().then(() => result);
-                    };
-                }
-                return value;
-            }
-        };
-        return new Proxy(qb, handler);
-    }
-    /**
-     * Returns the appropriate QueryBuilder based on the database type.
-     * @param {EntityTarget<T>} entity - The entity target.
-     * @param {QueryAction} action - The query action type.
-     * @returns {ZormQueryBuilder<T, R>} Query builder instance.
-     * @private
-     */
-    getQueryBuilder(entity, action) {
-        const repository = this.getRepository(entity);
-        switch (this.dataSource.options.type) {
-            case "mysql":
-            case "mariadb":
-            case "postgres":
-            case "sqlite":
-            case "mssql":
-            case "oracle":
-                return new queryBuilder_js_1.default(repository, action, this.usePromise);
-            case "mongodb":
-                throw new Error("MongoDB does not support QueryBuilder. Use repository methods instead.");
-            default:
-                throw new Error(`Unsupported database type: ${this.dataSource.options.type}`);
-        }
-    }
-    /**
-     * Retrieves the repository for a given entity.
-     * @param {EntityTarget<T>} entity - The entity target.
-     * @returns {Repository<T>} The repository instance.
-     */
-    getRepository(entity) {
-        return this.dataSource.getRepository(entity);
-    }
-    /**
-     * Creates a new record in the database.
-     * @param {EntityTarget<T>} entity - The entity target.
-     * @returns {ZormQueryBuilder<T, InsertQueryResult>} The query builder instance.
-     */
-    create(entity) {
-        return this.getQueryBuilder(entity, "create");
-    }
-    /**
-     * Finds records in the database.
-     * @param {EntityTarget<T>} entity - The entity target.
-     * @returns {ZormQueryBuilder<T, SelectQueryResult>} The query builder instance.
-     */
-    find(entity) {
-        return this.getQueryBuilder(entity, "select");
-    }
-    // upsert<T extends ObjectLiteral>(entity: EntityTarget<T>): ZormQueryBuilder<T, InsertQueryResult> {
-    //     return this.getQueryBuilder(entity, "upsert");
-    // }
-    /**
-     * Updates records in the database.
-     * @param {EntityTarget<T>} entity - The entity target.
-     * @returns {ZormQueryBuilder<T, UpdateQueryResult>} The query builder instance.
-     */
-    update(entity) {
-        return this.getQueryBuilder(entity, "update");
-    }
-    /**
-     * Deletes records from the database.
-     * @param {EntityTarget<T>} entity - The entity target.
-     * @returns {ZormQueryBuilder<T, DeleteQueryResult>} The query builder instance.
-     */
-    delete(entity) {
-        return this.getQueryBuilder(entity, "delete");
-    }
-}
-exports.default = Zorm;
-__exportStar(require("./types.js"), exports);
+import {b,e,c,d}from'./chunk-3TCXY5YG.js';import S from'path';import Q from'picocolors';import'reflect-metadata';import {DataSource}from'typeorm';export{BaseEntity,Column,Entity,JoinColumn,ManyToMany,ManyToOne,OneToMany,OneToOne,PrimaryColumn,PrimaryGeneratedColumn}from'typeorm';var m=class c{_parts=[];_params={};_paramIdx=0;_alias;static globalParamIdx=0;constructor(e,t){this._alias=e?`${e}.`:"",this._paramIdx=t?t.idx:0,this._params=t?t.params:{};}field(e){return this._parts.push(`${this._alias}${String(e)}`),this}equals(e){let t=`p${this._paramIdx++}`;return this.append(` = :${t}`),this._params[t]=e,this}append(e){if(this._parts.length===0)throw new Error("Cannot append to empty expression");return this._parts[this._parts.length-1]+=e,this}wrap(e){if(this._parts.length===0)throw new Error("Cannot wrap empty expression");return this._parts[this._parts.length-1]=e(this._parts[this._parts.length-1]),this}exists(e){let t=new c(void 0,{params:this._params,idx:this._paramIdx});return e(t),this._parts.push(`EXISTS (${t.buildExpression()})`),this._paramIdx=t._paramIdx,this}select(e){return this._parts.push(`SELECT ${e}`),this}from(e,t){return this._parts.push(`FROM ${e} ${t}`),this._alias=t,this}where(e){let t=[];for(let[r,i]of Object.entries(e)){let s=`p${this._paramIdx++}`;t.push(`${r} = :${s}`),this._params[s]=i;}return this._parts.push(`WHERE ${t.join(" AND ")}`),this}or(){return this._parts.push("OR"),this}group(){return this.wrap(e=>`(${e})`)}fromUnixTime(){return this.wrap(e=>`FROM_UNIXTIME(${e})`),this}date(){return this.wrap(e=>`DATE(${e})`),this}substring(e,t,r){return this._parts=[`SUBSTRING_INDEX(${this._alias}${String(e)}, '${t}', ${r})`],this}toExpression(){return {expression:this._parts.join(" "),param:this._params}}buildExpression(){return this.toExpression().expression}buildParams(){return this.toExpression().param}},$=m;var f=class c$1 extends Promise{repository;queryBuilder;entityAlias;action;queryValues=null;usePromise;whereCount=0;isActiveRecord=false;activeRecord;joinedAliases={};constructor(e,t,r){super(()=>{}),this.repository=e,this.entityAlias=e.metadata.tableName,this.queryBuilder=e.createQueryBuilder(this.entityAlias),this.action=t,this.usePromise=r||false,this.activeRecord=null;}_create(){if(this.queryValues)this.queryBuilder=this.queryBuilder.insert().into(this.entityAlias).values(this.queryValues);else throw c("\u25CB Values are missing. You forgot to call .with({ key: value })");return this}upsert(){if(this.queryValues)this.queryBuilder=this.repository.createQueryBuilder(this.entityAlias).insert().into(this.entityAlias).values(this.queryValues).orUpdate(Object.keys(this.queryValues));else throw c("\u25CB Values are missing. You forgot to call .with({ key: value })");return this}_update(){if(this.queryValues)if(this.whereCount>0)this.queryBuilder=this.queryBuilder.update().set(this.queryValues);else throw c("\u25CB Update must have at least one WHERE condition. You forgot to call .where({ condition: value })");else throw c("\u25CB Values are missing. You forgot to call .with({ key: value })");return this}_delete(){if(this.whereCount>0)this.queryBuilder=this.queryBuilder.delete();else throw c("\u25CB Delete must have at least one WHERE condition. You forgot to call .where({ condition: value })");return this}_getRawQuery(){return this.queryBuilder.getQueryAndParameters()}active(){return this.isActiveRecord=true,this}async _saveActiveRecord(e){return this.repository.save(e)}clone(){let e=new c$1(this.repository,this.action,this.usePromise);return e.queryBuilder=this.queryBuilder.clone(),e.entityAlias=this.entityAlias,e.queryValues=this.queryValues?structuredClone(this.queryValues):null,e.whereCount=this.whereCount,e.isActiveRecord=this.isActiveRecord,e.activeRecord=this.activeRecord,e}with(e){return this.queryValues=e,this}withData(e){return this.queryValues=e,this}select(e){return this.queryBuilder.select(e.map(t=>`${this.entityAlias}.${String(t)}`)),this}applyCondition(e,t,r){Object.entries(t).forEach(([i,s],u)=>{let a=`${i}Param${u}_${this.whereCount}`,l="=";if(typeof s=="string"){let n=s.match(/^(!=|>=|<=|>|<|=)\s*(.+)$/);if(n){let[,o,h]=n;l=o;let y=isNaN(Number(h))?h.trim():Number(h);e[r](`${e.alias}.${i} ${l} :${a}`,{[a]:y});return}}else if(typeof s=="object"&&s!==null){let n={gt:">",gte:">=",lt:"<",lte:"<=",ne:"!=",eq:"="};Object.entries(s).forEach(([o,h])=>{if(n[o]){let y=`${i}Param_${o}_${this.whereCount++}`;e[r](`${e.alias}.${i} ${n[o]} :${y}`,{[y]:h});}});return}e[r](`${this.entityAlias}.${i} = :${a}`,{[a]:s}),this.whereCount++;});}expression(e,t=true){let r=this.queryBuilder,i=e(new $(this.entityAlias)),s=i.buildExpression();return r.andWhere(t?`(${s})`:s,i.buildParams()),this.whereCount++,this}where(e){let t=this.queryBuilder;return this.applyCondition(t,e,"andWhere"),this}or(e){let t=this.queryBuilder;return this.applyCondition(t,e,"orWhere"),this}orderBy(e,t="ASC"){return this.queryBuilder.orderBy(`${this.entityAlias}.${String(e)}`,t),this}limit(e){return this.queryBuilder.limit(e),this}offset(e){return this.queryBuilder.offset(e),this}withRelation(e,...t){return [e,...t].forEach(r=>this.queryBuilder.leftJoinAndSelect(`${this.entityAlias}.${r}`,r)),this}innerJoin(e,t,r){return r?this.queryBuilder.innerJoin(`${this.entityAlias}.${e}`,t,r):this.queryBuilder.innerJoin(`${this.entityAlias}.${e}`,t),this.joinedAliases[t]=e,this}leftJoin(e,t,r){return r?this.queryBuilder.leftJoin(`${this.entityAlias}.${e}`,t,r):this.queryBuilder.leftJoin(`${this.entityAlias}.${e}`,t),this.joinedAliases[t]=e,this}groupBy(e){return this.queryBuilder.groupBy(`${this.entityAlias}.${String(e)}`),this}having(e){return this.queryBuilder.having(e),this}in(e,t){return this.queryBuilder.andWhere(`${this.entityAlias}.${String(e)} IN (:...values)`,{values:t}),this.whereCount++,this}like(e,t){if(!e||Object.keys(e).length===0)return this;let r=this.queryBuilder,i=[],s={};return Object.entries(e).forEach(([u,a])=>{let l=Array.isArray(a)?a:[a],n=[];l.forEach((o,h)=>{let y=`${u}LikeParam${h}_${this.whereCount}`;n.push(`${this.entityAlias}.${String(u)} LIKE :${y}`);let p=o;switch(t||"contains"){case "startsWith":p=`${o}%`;break;case "endsWith":p=`%${o}`;break;case "exact":p=`${o}`;break;default:p=`%${o}%`;}s[y]=p;}),n.length>0&&i.push(`(${n.join(" OR ")})`);}),i.length>0&&(r.andWhere(`(${i.join(" OR ")})`,s),this.whereCount++),this}distinct(){return this.queryBuilder.distinct(true),this}async count(e){return e&&this.queryBuilder.select(`COUNT(${e})`),await this.queryBuilder.getCount()}async sum(e){return (await this.queryBuilder.select(`SUM(${this.entityAlias}.${String(e)})`,"sum").getRawOne()).sum||0}async avg(e){return (await this.queryBuilder.select(`AVG(${this.entityAlias}.${String(e)})`,"avg").getRawOne()).avg||0}async min(e){return (await this.queryBuilder.select(`MIN(${this.entityAlias}.${String(e)})`,"min").getRawOne()).min||0}async max(e){return (await this.queryBuilder.select(`MAX(${this.entityAlias}.${String(e)})`,"max").getRawOne()).max||0}async rawQuery(e,t){return await this.repository.query(e,t)}async execute(){let e={};Object.keys(Object.prototype).forEach(t=>{Object.prototype.hasOwnProperty.call(Object.prototype,t)&&(e[t]=Object.prototype[t],delete Object.prototype[t]);});try{switch(this.action){case "upsert":case "create":this._create();let t=await this.queryBuilder.execute();return {created:!0,id:t.raw.insertId,record:t.generatedMaps[0],records:t.generatedMaps.length>1?t.generatedMaps:null};case "update":this._update();let r=this.queryBuilder,i=await r.execute(),s=r.getQuery().split("WHERE")[1]?.trim(),a=await this.repository.createQueryBuilder(this.entityAlias).where(s,r.getParameters()).getMany();return {updated:i.affected?i.affected>0:!1,record:a[0],records:a.length>1?a:[]};case "delete":this._delete();let l=await this.queryBuilder.execute();return {deleted:l.affected?l.affected>0:!1,count:l.affected||0};default:let n=await this.queryBuilder.getMany(),o={hasRows:n.length>0,count:n.length,row:n.length>0?n[0]:null,rows:n.length==1?[n[0]]:n};return this.isActiveRecord&&(o.save=()=>this._saveActiveRecord(n[0])),o}}catch(t){let r=t,i={code:d[r.code]||r.code,message:r.message,query:r.query,values:r.parameters};switch(this.action){case "upsert":case "create":let s={created:false,id:0,error:i};return this.usePromise?Promise.reject(s):s;case "update":let u={updated:false,error:i};return this.usePromise?Promise.reject(u):u;case "delete":let a={deleted:false,error:i};return this.usePromise?Promise.reject(a):a;default:let l={hasRows:false,count:0,row:null,rows:[],error:i};return this.usePromise?Promise.reject(l):l}}finally{Object.entries(e).forEach(([t,r])=>{Object.prototype[t]=r;});}}then(e,t){return this.execute().then(e,t)}},x=f;var B=class c{static instance;dataSource;initialized=false;usePromise=false;_init;constructor(e$1,t,r,i){let s=r||S.join("src","zorm"),u=S.join(process.cwd(),s),a=b(u,false);if(this.usePromise=i||false,!a.access){console.log(Q.red(`\u25CB ${a.message}`));return}if(e$1.startsWith("mysql")){let n=new e(decodeURIComponent(e$1)).connection();this.dataSource=new DataSource({type:"mysql",username:n.user,password:n.password,host:n.host,port:Number(n.port),database:n.database,entities:t||[]}),this._init=this.dataSource.initialize.bind(this.dataSource);}else console.log("Only MySQL is supported for now"),process.exit(1);}static get(e,t,r,i){return c.instance||(c.instance=new c(e,t,r,i)),c.instance}async connect(e){if(!this.initialized)try{e&&!this.dataSource.options.entities?.length&&this.dataSource.setOptions({entities:e}),await this._init(),this.initialized=!0,console.log(Q.green("\u25CB Zorm is connected"));}catch(t){console.log(Q.red("\u25CB Error while connecting to your MySQL Server with following error:"),t);}}whenReady(){if(this.initialized)return this;let e={get:(t,r)=>{if(r==="then")return;let i=t[r];return typeof i=="function"?(...s)=>{let u=i.apply(t,s);if(u&&u.constructor.name==="ZormQueryBuilder")return this.wrapQueryBuilder(u);this._init().then(()=>u);}:i}};return new Proxy(this,e)}wrapQueryBuilder(e){let t={get:(r,i)=>{if(i==="then")return;let s=r[i];return typeof s=="function"?(...u)=>{let a=s.apply(r,u);return a&&a.constructor.name==="ZormQueryBuilder"?this.wrapQueryBuilder(a):this._init().then(()=>a)}:s}};return new Proxy(e,t)}getQueryBuilder(e,t){let r=this.getRepository(e);switch(this.dataSource.options.type){case "mysql":case "mariadb":case "postgres":case "sqlite":case "mssql":case "oracle":return new x(r,t,this.usePromise);case "mongodb":throw new Error("MongoDB does not support QueryBuilder. Use repository methods instead.");default:throw new Error(`Unsupported database type: ${this.dataSource.options.type}`)}}getRepository(e){return this.dataSource.getRepository(e)}create(e){return this.getQueryBuilder(e,"create")}find(e){return this.getQueryBuilder(e,"select")}update(e){return this.getQueryBuilder(e,"update")}delete(e){return this.getQueryBuilder(e,"delete")}},ae=B;export{ae as default};

package/package.json

@@ -1,51 +1,59 @@
 {
-    "name": "@zuzjs/orm",
-    "version": "0.3.7",
-    "keywords": [
-        "orm",
-        "zuz",
-        "zuz.js",
-        "zuz orm",
-        "zuzjs"
-    ],
-    "description": "ZuzJS ORM Library",
-    "author": "Zuz.js Team <support@zuz.com.pk>",
-    "license": "MIT",
-    "type": "commonjs",
-    "main": "dist/index.js",
-    "bin": {
-        "zorm": "dist/bin.js"
-    },
-    "exports": {
-        ".": "./dist/index.js"
-    },
-    "files": [
-        "dist"
-    ],
-    "scripts": {
-        "dev": "tsc -d -w -p tsconfig.json"
-    },
-    "engines": {
-        "node": ">=18.17.0"
-    },
-    "sideEffects": ["reflect-metadata"],
-    "dependencies": {
-        "@types/md5": "^2.3.5",
-        "commander": "14.0.0",
-        "md5": "^2.3.0",
-        "mysql2": "3.14.1",
-        "nanoid": "5.1.5",
-        "picocolors": "^1.1.1",
-        "reflect-metadata": "^0.2.2",
-        "typeorm": "^0.3.25"
-    },
-    "devDependencies": {
-        "husky": "^9.1.7",
-        "ts-node": "^10.9.2",
-        "typescript": "^5.8.3"
-    },
-    "peerDependencies": {
-        "reflect-metadata": "^0.2.2",
-        "typeorm": "^0.3.25"
+  "name": "@zuzjs/orm",
+  "version": "0.3.8",
+  "description": "ZuzJS ORM Library",
+  "keywords": [
+    "orm",
+    "zuz",
+    "zuz.js",
+    "zuz orm",
+    "zuzjs"
+  ],
+  "homepage": "https://orm.zuz.com.pk",
+  "bugs": {
+    "url": "https://github.com/zuzpk/zorm/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zuzpk/zorm.git"
+  },
+  "author": "Zuz.js Team <support@zuz.com.pk>",
+  "license": "MIT",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "bin": {
+    "zorm": "./dist/bin.cjs"
+  },
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.js",
+      "require": "./dist/index.cjs"
     }
+  },
+  "files": [
+    "dist"
+  ],
+  "engines": {
+    "node": ">=18.17.0"
+  },
+  "sideEffects": [
+    "reflect-metadata"
+  ],
+  "dependencies": {
+    "@types/md5": "^2.3.6",
+    "commander": "14.0.3",
+    "md5": "^2.3.0",
+    "mysql2": "3.17.1",
+    "nanoid": "5.1.6",
+    "picocolors": "^1.1.1",
+    "reflect-metadata": "^0.2.2",
+    "typeorm": "^0.3.28"
+  },
+  "peerDependencies": {
+    "reflect-metadata": "^0.2.2",
+    "typeorm": "^0.3.28"
+  }
 }

package/dist/core/cli.d.ts

@@ -1,5 +0,0 @@
-export declare const buildEntities: (connection: string, dist?: string) => void;
-/**
-* Pull using DATABASE_URL from .env in project directory
-**/
-export declare const Pull: () => void;