@cheetah.js/orm 0.1.83 → 0.1.86

package/dist/repository/Repository.d.ts

@@ -1,6 +1,6 @@
 import { BaseEntity } from '../domain/base-entity';
 import { SqlBuilder } from '../SqlBuilder';
-import { FilterQuery, ValueOrInstance } from '../driver/driver.interface';
+import { FilterQuery, FindOptions, ValueOrInstance } from '../driver/driver.interface';
 /**
  * Generic Repository class for database operations.
  * Provides type-safe methods for CRUD operations.
@@ -45,30 +45,30 @@ export declare abstract class Repository<T extends BaseEntity> {
      * });
      * ```
      */
-    find(options: RepositoryFindOptions<T>): Promise<T[]>;
+    find<Hint extends string = never>(options: RepositoryFindOptions<T, Hint>): Promise<T[]>;
     /**
      * Finds a single entity matching the given criteria.
      * Returns undefined if not found.
      */
-    findOne(options: RepositoryFindOneOptions<T>): Promise<T | undefined>;
+    findOne<Hint extends string = never>(options: RepositoryFindOneOptions<T, Hint>): Promise<T | undefined>;
     /**
      * Finds a single entity matching the given criteria.
      * Throws an error if not found.
      */
-    findOneOrFail(options: RepositoryFindOneOptions<T>): Promise<T>;
+    findOneOrFail<Hint extends string = never>(options: RepositoryFindOneOptions<T, Hint>): Promise<T>;
     /**
      * Finds all entities with optional filtering.
      */
-    findAll(options?: Omit<RepositoryFindOptions<T>, 'where'>): Promise<T[]>;
+    findAll<Hint extends string = never>(options?: Omit<RepositoryFindOptions<T>, 'where'>): Promise<T[]>;
     /**
      * Finds an entity by its primary key.
      */
-    findById(id: number | string): Promise<T | undefined>;
+    findById<Hint extends string = never>(id: number | string, options?: Omit<RepositoryFindOneOptions<T, Hint>, 'where'>): Promise<T | undefined>;
     /**
      * Finds an entity by its primary key.
      * Throws an error if not found.
      */
-    findByIdOrFail(id: number | string): Promise<T>;
+    findByIdOrFail<Hint extends string = never>(id: number | string, options?: Omit<RepositoryFindOneOptions<T, Hint>, 'where'>): Promise<T>;
     /**
      * Creates a new entity.
      */
@@ -109,25 +109,13 @@ export declare abstract class Repository<T extends BaseEntity> {
      */
     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> {
+export type RepositoryFindOptions<T, Hint extends string = never> = FindOptions<T, Hint> & {
     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'>;
+export type RepositoryFindOneOptions<T, Hint extends string = never> = Omit<RepositoryFindOptions<T, Hint>, 'limit' | 'offset'>;

package/dist/repository/Repository.js

@@ -45,9 +45,9 @@ class Repository {
      * ```
      */
     async find(options) {
-        const { where, order, limit, offset, fields, load, loadStrategy } = options;
+        const { where, orderBy, limit, offset, fields, load, loadStrategy } = options;
         return this.entityClass.find(where || {}, {
-            orderBy: order,
+            orderBy: orderBy,
             limit,
             offset,
             fields: fields,
@@ -60,9 +60,9 @@ class Repository {
      * Returns undefined if not found.
      */
     async findOne(options) {
-        const { where, order, fields, load, loadStrategy } = options;
+        const { where, orderBy, fields, load, loadStrategy } = options;
         return this.entityClass.findOne(where || {}, {
-            orderBy: order,
+            orderBy: orderBy,
             fields: fields,
             load: load,
             loadStrategy,
@@ -73,9 +73,9 @@ class Repository {
      * Throws an error if not found.
      */
     async findOneOrFail(options) {
-        const { where, order, fields, load, loadStrategy } = options;
+        const { where, orderBy, fields, load, loadStrategy } = options;
         return this.entityClass.findOneOrFail(where || {}, {
-            orderBy: order,
+            orderBy: orderBy,
             fields: fields,
             load: load,
             loadStrategy,
@@ -85,9 +85,9 @@ class Repository {
      * Finds all entities with optional filtering.
      */
     async findAll(options) {
-        const { order, limit, offset, fields, load, loadStrategy } = options || {};
+        const { orderBy, limit, offset, fields, load, loadStrategy } = options || {};
         return this.entityClass.findAll({
-            orderBy: order,
+            orderBy: orderBy,
             limit,
             offset,
             fields: fields,
@@ -98,15 +98,15 @@ class Repository {
     /**
      * Finds an entity by its primary key.
      */
-    async findById(id) {
-        return this.findOne({ where: { id } });
+    async findById(id, options) {
+        return this.findOne({ where: { id }, ...options });
     }
     /**
      * Finds an entity by its primary key.
      * Throws an error if not found.
      */
-    async findByIdOrFail(id) {
-        return this.findOneOrFail({ where: { id } });
+    async findByIdOrFail(id, options) {
+        return this.findOneOrFail({ where: { id }, ...options });
     }
     /**
      * Creates a new entity.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cheetah.js/orm",
-  "version": "0.1.83",
+  "version": "0.1.86",
   "description": "A simple ORM for Cheetah.js",
   "type": "commonjs",
   "main": "dist/index.js",
@@ -55,5 +55,5 @@
     "bun",
     "value-object"
   ],
-  "gitHead": "68ad3f3b572a4a833cc56bb78db496c600a1d06d"
+  "gitHead": "892dcc7a37c62b283b9bebb810bd2a0ab560e20e"
 }