@zuzjs/orm 0.2.3 → 0.2.5

package/dist/drivers/mysql/index.d.ts

@@ -32,6 +32,7 @@ export declare class MySqlDriver implements ModelGenerator {
         tsType: string;
         columnType: string;
         length?: number;
+        enumValues?: string[];
     };
     formatDefault(value: any, tsType: string): string | number;
     generate(): Promise<void>;

package/dist/drivers/mysql/index.js

@@ -117,6 +117,13 @@ class MySqlDriver {
             "time": { tsType: "string", columnType: "time" },
             "json": { tsType: "any", columnType: "json" },
         };
+        const enumMatch = sqlType.match(/^enum\((.*)\)$/i);
+        if (enumMatch) {
+            const enumValues = enumMatch[1]
+                .split(",")
+                .map((val) => val.trim().replace(/^'|'$/g, "")); // Remove single quotes
+            return { tsType: `"${enumValues.join('" | "')}"`, columnType: "enum", enumValues };
+        }
         const match = sqlType.match(/^(\w+)(?:\((\d+)\))?/);
         if (!match)
             return { tsType: "any", columnType: "varchar", length: 255 };
@@ -150,6 +157,7 @@ class MySqlDriver {
             foreignKeys[tableName] = fkResults;
         }
         for (const tableName of tableNames) {
+            const enums = [];
             const imports = [];
             const _imports = [`Entity`, `BaseEntity`];
             // Get table structure
@@ -160,7 +168,13 @@ class MySqlDriver {
             for (const column of columns) {
                 // console.log(tableName, column)
                 const { Field, Type, Key, Null, Default, Extra, Comment } = column;
-                const { tsType, columnType, length } = this.mapColumns(Type);
+                const { tsType, columnType, length, enumValues } = this.mapColumns(Type);
+                let enumName = null;
+                if (columnType === "enum" && enumValues) {
+                    enumName = (0, index_js_1.toPascalCase)(Field);
+                    enums.push(`export enum ${enumName} { ${enumValues.map(v => `${(0, index_js_1.toPascalCase)(v)} = "${v}"`).join(", ")} }`);
+                    // entityCode.push(`\t@Column({ type: "enum", enum: ${enumName} })\n`);
+                }
                 // Handle primary key
                 if (Key === "PRI") {
                     const _priColumn = Extra.includes("auto_increment") ? `PrimaryGeneratedColumn` : `PrimaryColumn`;
@@ -179,6 +193,8 @@ class MySqlDriver {
                         columnDecorator += `, length: ${length}`;
                     if (Null === "YES")
                         columnDecorator += `, nullable: true`;
+                    if (enumName)
+                        columnDecorator += `, enum: ${enumName}`;
                     if (Default !== null)
                         columnDecorator += `, default: ${this.formatDefault(Default, tsType)}`;
                     columnDecorator += ` })`;
@@ -187,7 +203,7 @@ class MySqlDriver {
                 if (Comment && Comment.length > 0) {
                     entityCode.push(`\t/** @comment ${Comment} */`);
                 }
-                entityCode.push(`\t${Field}!: ${Key == `PRI` && numberTypes.includes(Type) ? `number` : numberTypes.includes(Type) ? `number` : tsType};\n`);
+                entityCode.push(`\t${Field}!: ${enumName ? enumName : Key == `PRI` && numberTypes.includes(Type) ? `number` : numberTypes.includes(Type) ? `number` : tsType};\n`);
             }
             // Add foreign key relationships
             if (foreignKeys[tableName]) {
@@ -210,7 +226,8 @@ class MySqlDriver {
                 `*/`,
                 `import { ${_imports.join(`, `)} } from "@zuzjs/orm";`,
                 imports.length > 0 ? imports.join(`\n`) : ``,
-                `${imports.length > 0 ? `\n` : ``}@Entity({ name: "${tableName}" })`,
+                enums.length > 0 ? enums.join(`\n`) : ``,
+                `${enums.length > 0 || imports.length > 0 ? `\n` : ``}@Entity({ name: "${tableName}" })`,
                 `export class ${(0, index_js_1.toPascalCase)(tableName)} extends BaseEntity {\n`,
                 ...entityCode,
                 `}`

package/dist/drivers/queryBuilder.d.ts

@@ -1,7 +1,7 @@
 import { QueryResult } from "mysql2";
 import { ObjectLiteral, Repository } from "typeorm";
 import { QueryDeepPartialEntity } from "typeorm/query-builder/QueryPartialEntity";
-import { QueryAction } from "../types";
+import { PartialConditions, QueryAction } from "../types";
 declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends Promise<R> {
     private repository;
     private queryBuilder;
@@ -44,13 +44,13 @@ declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends
      * @param condition - The condition to be added.
      * @returns The current instance of ZormQueryBuilder.
      */
-    where(condition: Partial<Record<keyof T, any>>): this;
+    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: Partial<Record<keyof T, any>>): this;
+    or(condition: PartialConditions<T>): this;
     /**
      * Adds an ORDER BY clause to the query.
      * @param field - The field to order by.
@@ -124,7 +124,7 @@ declare class ZormQueryBuilder<T extends ObjectLiteral, R = QueryResult> extends
      * @returns The current instance of ZormQueryBuilder.
      */
     distinct(): this;
-    count(): Promise<number>;
+    count(field?: keyof T): Promise<number>;
     sum(field: keyof T): Promise<number>;
     avg(field: keyof T): Promise<number>;
     min(field: keyof T): Promise<number>;

package/dist/drivers/queryBuilder.js

@@ -111,6 +111,7 @@ class ZormQueryBuilder extends Promise {
     applyCondition(qb, condition, type) {
         Object.entries(condition).forEach(([key, value], index) => {
             const paramKey = `${key}Param${index}_${this.whereCount}`; // Unique parameter name
+            let sqlOperator = "="; // Default to "="
             if (typeof value === "string") {
                 const match = value.match(/^(!=|>=|<=|>|<|=)\s*(.+)$/); // Improved regex
                 if (match) {
@@ -121,6 +122,24 @@ class ZormQueryBuilder extends Promise {
                     return;
                 }
             }
+            else if (typeof value === "object" && value !== null) {
+                // Support object-based conditions: { age: { gt: 18, lt: 20 } }
+                const operators = {
+                    gt: ">",
+                    gte: ">=",
+                    lt: "<",
+                    lte: "<=",
+                    ne: "!=",
+                    eq: "="
+                };
+                Object.entries(value).forEach(([opKey, opValue]) => {
+                    if (operators[opKey]) {
+                        const paramKey = `${key}Param_${opKey}_${this.whereCount++}`; // Unique param key
+                        qb[type](`${qb.alias}.${key} ${operators[opKey]} :${paramKey}`, { [paramKey]: opValue });
+                    }
+                });
+                return; // Prevent default equality case for objects
+            }
             // Default case (normal equality condition)
             qb[type](`${this.entityAlias}.${key} = :${paramKey}`, { [paramKey]: value });
             this.whereCount++;
@@ -283,7 +302,10 @@ class ZormQueryBuilder extends Promise {
         this.queryBuilder.distinct(true);
         return this;
     }
-    async count() {
+    async count(field) {
+        if (field) {
+            this.queryBuilder.select(`COUNT(${field})`);
+        }
         return await this.queryBuilder.getCount();
     }
     async sum(field) {

package/dist/types.d.ts

@@ -17,6 +17,58 @@ export type ConnectionDetails = {
 };
 export type QueryAction = "create" | "upsert" | "select" | "update" | "delete";
 export 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).
+ */
+export 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;
+};
+export type PartialConditions<T> = Partial<Record<keyof T, string | number | boolean | WhereOperators<any>>>;
 export type QueryError = {
     code: number | string;
     message: string;

package/package.json

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