@cheetah.js/orm 0.1.46 → 0.1.47

package/dist/SqlBuilder.js

@@ -202,9 +202,14 @@ export class SqlBuilder {
     }
     mapObjectKey(obj, key, parentKey) {
         const fullKey = parentKey ? `${parentKey}.${key}` : key;
-        return this.isNestedObject(obj[key])
-            ? this.objectToStringMap(obj[key], fullKey)
-            : [`${this.columnManager.discoverAlias(fullKey, true)} ${obj[key]}`];
+        if (this.isNestedObject(obj[key])) {
+            return this.objectToStringMap(obj[key], fullKey);
+        }
+        if (parentKey) {
+            return [`${this.columnManager.discoverAlias(fullKey, true)} ${obj[key]}`];
+        }
+        const columnName = ValueProcessor.getColumnName(key, this.entity);
+        return [`${this.columnManager.discoverAlias(columnName, true)} ${obj[key]}`];
     }
     isNestedObject(value) {
         return typeof value === 'object' && value !== null;

package/dist/index.d.ts

@@ -18,3 +18,4 @@ export * from './entry';
 export * from './common/value-object';
 export * from './common/email.vo';
 export * from './common/uuid';
+export * from './repository/Repository';

package/dist/index.js

@@ -18,3 +18,4 @@ export * from './entry';
 export * from './common/value-object';
 export * from './common/email.vo';
 export * from './common/uuid';
+export * from './repository/Repository';

package/dist/repository/Repository.d.ts

@@ -0,0 +1,125 @@
+import { BaseEntity } from '../domain/base-entity';
+import { SqlBuilder } from '../SqlBuilder';
+import { FilterQuery, ValueOrInstance } from '../driver/driver.interface';
+/**
+ * Generic Repository class for database operations.
+ * Provides type-safe methods for CRUD operations.
+ *
+ * @example
+ * ```typescript
+ * @Service()
+ * export class LessonRepository extends Repository<Lesson> {
+ *   constructor() {
+ *     super(Lesson);
+ *   }
+ *
+ *   async findByCourse(courseId: number): Promise<Lesson[]> {
+ *     return this.find({
+ *       where: { courseId },
+ *       order: { orderIndex: 'ASC' }
+ *     });
+ *   }
+ * }
+ * ```
+ */
+export declare abstract class Repository<T extends BaseEntity> {
+    protected readonly entityClass: {
+        new (): T;
+    } & typeof BaseEntity;
+    constructor(entityClass: {
+        new (): T;
+    } & typeof BaseEntity);
+    /**
+     * Creates a new query builder for the entity.
+     */
+    protected createQueryBuilder(): SqlBuilder<T>;
+    /**
+     * Finds entities matching the given criteria.
+     *
+     * @example
+     * ```typescript
+     * const lessons = await repository.find({
+     *   where: { courseId: 1, isPublished: true },
+     *   order: { orderIndex: 'ASC' },
+     *   limit: 10
+     * });
+     * ```
+     */
+    find(options: RepositoryFindOptions<T>): Promise<T[]>;
+    /**
+     * Finds a single entity matching the given criteria.
+     * Returns undefined if not found.
+     */
+    findOne(options: RepositoryFindOneOptions<T>): Promise<T | undefined>;
+    /**
+     * Finds a single entity matching the given criteria.
+     * Throws an error if not found.
+     */
+    findOneOrFail(options: RepositoryFindOneOptions<T>): Promise<T>;
+    /**
+     * Finds all entities with optional filtering.
+     */
+    findAll(options?: Omit<RepositoryFindOptions<T>, 'where'>): Promise<T[]>;
+    /**
+     * Finds an entity by its primary key.
+     */
+    findById(id: number | string): Promise<T | undefined>;
+    /**
+     * Finds an entity by its primary key.
+     * Throws an error if not found.
+     */
+    findByIdOrFail(id: number | string): Promise<T>;
+    /**
+     * Creates a new entity.
+     */
+    create(data: Partial<{
+        [K in keyof T]: ValueOrInstance<T[K]>;
+    }>): Promise<T>;
+    /**
+     * Updates entities matching the criteria.
+     */
+    update(where: FilterQuery<T>, data: Partial<{
+        [K in keyof T]: ValueOrInstance<T[K]>;
+    }>): Promise<void>;
+    /**
+     * Updates an entity by its primary key.
+     */
+    updateById(id: number | string, data: Partial<{
+        [K in keyof T]: ValueOrInstance<T[K]>;
+    }>): Promise<void>;
+    /**
+     * Finds entities for deletion (use with caution).
+     * To delete, call .remove() on returned entities or use SQL directly.
+     */
+    findForDeletion(where: FilterQuery<T>): Promise<T[]>;
+    /**
+     * Counts entities matching the criteria.
+     */
+    count(where?: FilterQuery<T>): Promise<number>;
+    /**
+     * Checks if any entity matches the criteria.
+     */
+    exists(where: FilterQuery<T>): Promise<boolean>;
+}
+/**
+ * Order options for repository queries.
+ */
+export type RepositoryOrderOptions<T> = {
+    [K in keyof T]?: 'ASC' | 'DESC';
+};
+/**
+ * Find options for repository queries.
+ */
+export interface RepositoryFindOptions<T> {
+    where?: FilterQuery<T>;
+    order?: RepositoryOrderOptions<T>;
+    limit?: number;
+    offset?: number;
+    fields?: readonly (keyof T)[];
+    load?: readonly string[];
+    loadStrategy?: 'select' | 'joined';
+}
+/**
+ * Find one options for repository queries.
+ */
+export type RepositoryFindOneOptions<T> = Omit<RepositoryFindOptions<T>, 'limit' | 'offset'>;

package/dist/repository/Repository.js

@@ -0,0 +1,150 @@
+/**
+ * Generic Repository class for database operations.
+ * Provides type-safe methods for CRUD operations.
+ *
+ * @example
+ * ```typescript
+ * @Service()
+ * export class LessonRepository extends Repository<Lesson> {
+ *   constructor() {
+ *     super(Lesson);
+ *   }
+ *
+ *   async findByCourse(courseId: number): Promise<Lesson[]> {
+ *     return this.find({
+ *       where: { courseId },
+ *       order: { orderIndex: 'ASC' }
+ *     });
+ *   }
+ * }
+ * ```
+ */
+export class Repository {
+    constructor(entityClass) {
+        this.entityClass = entityClass;
+    }
+    /**
+     * Creates a new query builder for the entity.
+     */
+    createQueryBuilder() {
+        return this.entityClass.createQueryBuilder();
+    }
+    /**
+     * Finds entities matching the given criteria.
+     *
+     * @example
+     * ```typescript
+     * const lessons = await repository.find({
+     *   where: { courseId: 1, isPublished: true },
+     *   order: { orderIndex: 'ASC' },
+     *   limit: 10
+     * });
+     * ```
+     */
+    async find(options) {
+        const { where, order, limit, offset, fields, load, loadStrategy } = options;
+        return this.entityClass.find(where || {}, {
+            orderBy: order,
+            limit,
+            offset,
+            fields: fields,
+            load: load,
+            loadStrategy,
+        });
+    }
+    /**
+     * Finds a single entity matching the given criteria.
+     * Returns undefined if not found.
+     */
+    async findOne(options) {
+        const { where, order, fields, load, loadStrategy } = options;
+        return this.entityClass.findOne(where || {}, {
+            orderBy: order,
+            fields: fields,
+            load: load,
+            loadStrategy,
+        });
+    }
+    /**
+     * Finds a single entity matching the given criteria.
+     * Throws an error if not found.
+     */
+    async findOneOrFail(options) {
+        const { where, order, fields, load, loadStrategy } = options;
+        return this.entityClass.findOneOrFail(where || {}, {
+            orderBy: order,
+            fields: fields,
+            load: load,
+            loadStrategy,
+        });
+    }
+    /**
+     * Finds all entities with optional filtering.
+     */
+    async findAll(options) {
+        const { order, limit, offset, fields, load, loadStrategy } = options || {};
+        return this.entityClass.findAll({
+            orderBy: order,
+            limit,
+            offset,
+            fields: fields,
+            load: load,
+            loadStrategy,
+        });
+    }
+    /**
+     * Finds an entity by its primary key.
+     */
+    async findById(id) {
+        return this.findOne({ where: { id } });
+    }
+    /**
+     * Finds an entity by its primary key.
+     * Throws an error if not found.
+     */
+    async findByIdOrFail(id) {
+        return this.findOneOrFail({ where: { id } });
+    }
+    /**
+     * Creates a new entity.
+     */
+    async create(data) {
+        return this.entityClass.create(data);
+    }
+    /**
+     * Updates entities matching the criteria.
+     */
+    async update(where, data) {
+        await this.createQueryBuilder()
+            .update(data)
+            .where(where)
+            .execute();
+    }
+    /**
+     * Updates an entity by its primary key.
+     */
+    async updateById(id, data) {
+        await this.update({ id }, data);
+    }
+    /**
+     * Finds entities for deletion (use with caution).
+     * To delete, call .remove() on returned entities or use SQL directly.
+     */
+    async findForDeletion(where) {
+        return this.find({ where });
+    }
+    /**
+     * Counts entities matching the criteria.
+     */
+    async count(where) {
+        const results = await this.find({ where: where || {} });
+        return results.length;
+    }
+    /**
+     * Checks if any entity matches the criteria.
+     */
+    async exists(where) {
+        const count = await this.count(where);
+        return count > 0;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.46",
+  "version": "0.1.47",
   "description": "A simple ORM for Cheetah.js",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -51,5 +51,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "8076f1e35ec2cbabd80d18b26bff8ea99e97f955"
+  "gitHead": "5dad3bf3a30252bf126f64cf998d70c4dd9cdd02"
 }