@hichchi/nest-crud 0.0.1-beta.4 → 0.0.1

package/CHANGELOG.md

@@ -1,56 +1,56 @@
-## 0.0.1-beta.4 (2025-07-18)
-
-### 🚀 Features
-
-- Updated EntityDecorator type to support both BaseEntity and HichchiUserEntity types
-
-### 🧱 Updated Dependencies
-
-- Updated nest-connector to 0.0.1-beta.3
-- Updated nest-core to 0.0.1-beta.4
-- Updated utils to 0.0.1-beta.2
-- 
-## 0.0.1-beta.3 (2025-07-17)
-
-### 🧱 Updated Dependencies
-
-- Updated nest-connector to 0.0.1-beta.2
-- Updated nest-core to 0.0.1-beta.3
-
-## 0.0.1-beta.2 (2025-07-16)
-
-### 🧱 Updated Dependencies
-
-- Updated nest-core to 0.0.1-beta.2
-
-## 0.0.1-beta.1 (2025-07-16)
-
-### 🧱 Updated Dependencies
-
-- Updated nest-connector to 0.0.1-beta.1
-- Updated nest-core to 0.0.1-beta.1
-- Updated utils to 0.0.1-beta.1
-
-## 0.0.1-beta.0 (2025-07-15)
-
-### 🧱 Updated Dependencies
-
-- Updated nest-connector to 0.0.1-beta.0
-- Updated nest-core to 0.0.1-beta.0
-- Updated utils to 0.0.1-beta.0
-
-## 0.0.1-alpha.1 (2025-06-23)
-
-### 🧱 Updated Dependencies
-
-- Updated nest-connector to 0.0.1-alpha.1
-- Updated nest-core to 0.0.1-alpha.1
-- Updated utils to 0.0.1-alpha.1
-
-## 0.0.1-alpha.0 (2025-06-23)
-
-### 🧱 Updated Dependencies
-
-- Updated nest-connector to 0.0.1-alpha.0
-- Updated nest-core to 0.0.1-alpha.0
-- Updated utils to 0.0.1-alpha.0
+## 0.0.1-beta.4 (2025-07-18)
+
+### 🚀 Features
+
+- Updated EntityDecorator type to support both BaseEntity and HichchiUserEntity types
+
+### 🧱 Updated Dependencies
+
+- Updated nest-connector to 0.0.1-beta.3
+- Updated nest-core to 0.0.1-beta.4
+- Updated utils to 0.0.1-beta.2
+- 
+## 0.0.1-beta.3 (2025-07-17)
+
+### 🧱 Updated Dependencies
+
+- Updated nest-connector to 0.0.1-beta.2
+- Updated nest-core to 0.0.1-beta.3
+
+## 0.0.1-beta.2 (2025-07-16)
+
+### 🧱 Updated Dependencies
+
+- Updated nest-core to 0.0.1-beta.2
+
+## 0.0.1-beta.1 (2025-07-16)
+
+### 🧱 Updated Dependencies
+
+- Updated nest-connector to 0.0.1-beta.1
+- Updated nest-core to 0.0.1-beta.1
+- Updated utils to 0.0.1-beta.1
+
+## 0.0.1-beta.0 (2025-07-15)
+
+### 🧱 Updated Dependencies
+
+- Updated nest-connector to 0.0.1-beta.0
+- Updated nest-core to 0.0.1-beta.0
+- Updated utils to 0.0.1-beta.0
+
+## 0.0.1-alpha.1 (2025-06-23)
+
+### 🧱 Updated Dependencies
+
+- Updated nest-connector to 0.0.1-alpha.1
+- Updated nest-core to 0.0.1-alpha.1
+- Updated utils to 0.0.1-alpha.1
+
+## 0.0.1-alpha.0 (2025-06-23)
+
+### 🧱 Updated Dependencies
+
+- Updated nest-connector to 0.0.1-alpha.0
+- Updated nest-core to 0.0.1-alpha.0
+- Updated utils to 0.0.1-alpha.0

package/base/base-entity-extension.js

@@ -1,9 +1,6 @@
-"use strict";
 // noinspection JSUnusedGlobalSymbols
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseEntityExtension = void 0;
-const tslib_1 = require("tslib");
-const typeorm_1 = require("typeorm");
+import { __decorate, __metadata } from "tslib";
+import { PrimaryGeneratedColumn } from "typeorm";
 /**
  * Base entity extension class that provides a minimal entity structure
  *
@@ -41,7 +38,7 @@ const typeorm_1 = require("typeorm");
  * @see {@link HichchiEntityExtension} The decorator required for entity extensions
  * @see {@link HichchiJoinColumn} The decorator required for entity relationships
  */
-class BaseEntityExtension {
+export class BaseEntityExtension {
     /**
      * Unique identifier for the entity extension
      *
@@ -50,9 +47,8 @@ class BaseEntityExtension {
      */
     id;
 }
-exports.BaseEntityExtension = BaseEntityExtension;
-tslib_1.__decorate([
-    (0, typeorm_1.PrimaryGeneratedColumn)("uuid"),
-    tslib_1.__metadata("design:type", String)
+__decorate([
+    PrimaryGeneratedColumn("uuid"),
+    __metadata("design:type", String)
 ], BaseEntityExtension.prototype, "id", void 0);
 //# sourceMappingURL=base-entity-extension.js.map

package/base/base-entity-extension.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-entity-extension.js","sourceRoot":"","sources":["../../../../libs/nest-crud/src/base/base-entity-extension.ts"],"names":[],"mappings":";AAAA,qCAAqC;;;;AAErC,qCAAiD;AAGjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,MAAa,mBAAmB;IAC5B;;;;;OAKG;IAEH,EAAE,CAAW;CAChB;AATD,kDASC;AADG;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;+CAClB"}
+{"version":3,"file":"base-entity-extension.js","sourceRoot":"","sources":["../../../../libs/nest-crud/src/base/base-entity-extension.ts"],"names":[],"mappings":"AAAA,qCAAqC;;AAErC,OAAO,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAGjD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,MAAM,OAAO,mBAAmB;IAC5B;;;;;OAKG;IAEH,EAAE,CAAW;CAChB;AADG;IADC,sBAAsB,CAAC,MAAM,CAAC;;+CAClB"}

package/base/base-entity.d.ts

@@ -137,5 +137,5 @@ export declare class BaseEntity implements Model {
      * @returns {UserInfo} A simplified user object with only essential information
      * @private
      */
-    private _mapUserEntity;
+    protected _mapUserEntity?(user: UserInfo): UserInfo;
 }

package/base/base-entity.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseEntity = exports.BaseEntityTemplateRelations = void 0;
-const tslib_1 = require("tslib");
-const typeorm_1 = require("typeorm");
-const tokens_1 = require("../tokens");
+import { __decorate, __metadata } from "tslib";
+import { AfterLoad, Column, DeleteDateColumn, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
+import { USER_ENTITY_TABLE_NAME } from "../tokens";
 /**
  * List of standard relation properties in the BaseEntity
  *
@@ -17,7 +14,7 @@ const tokens_1 = require("../tokens");
  * @see {@link BaseEntity} The base entity class that uses these relations
  * @see {@link HichchiEntity} The entity decorator that uses this constant
  */
-exports.BaseEntityTemplateRelations = ["createdBy", "updatedBy", "deletedBy"];
+export const BaseEntityTemplateRelations = ["createdBy", "updatedBy", "deletedBy"];
 /**
  * Base entity class that provides common fields and functionality for all entities
  *
@@ -48,7 +45,7 @@ exports.BaseEntityTemplateRelations = ["createdBy", "updatedBy", "deletedBy"];
  * @implements {Model} Interface from @hichchi/nest-connector/crud
  * @see {@link HichchiEntity} Decorator used to define entities
  */
-class BaseEntity {
+export class BaseEntity {
     /**
      * Unique identifier for the entity
      *
@@ -160,54 +157,53 @@ class BaseEntity {
         };
     }
 }
-exports.BaseEntity = BaseEntity;
-tslib_1.__decorate([
-    (0, typeorm_1.PrimaryGeneratedColumn)("uuid"),
-    tslib_1.__metadata("design:type", String)
+__decorate([
+    PrimaryGeneratedColumn("uuid"),
+    __metadata("design:type", String)
 ], BaseEntity.prototype, "id", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.Column)({ nullable: false, default: () => "CURRENT_TIMESTAMP" }),
-    tslib_1.__metadata("design:type", Date)
+__decorate([
+    Column({ nullable: false, default: () => "CURRENT_TIMESTAMP" }),
+    __metadata("design:type", Date)
 ], BaseEntity.prototype, "createdAt", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.Column)({ nullable: false, default: () => "CURRENT_TIMESTAMP" }),
-    tslib_1.__metadata("design:type", Date)
+__decorate([
+    Column({ nullable: false, default: () => "CURRENT_TIMESTAMP" }),
+    __metadata("design:type", Date)
 ], BaseEntity.prototype, "updatedAt", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.DeleteDateColumn)({ type: "timestamp", nullable: true }),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    DeleteDateColumn({ type: "timestamp", nullable: true }),
+    __metadata("design:type", Object)
 ], BaseEntity.prototype, "deletedAt", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    Column({ nullable: true }),
+    __metadata("design:type", Object)
 ], BaseEntity.prototype, "createdById", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.ManyToOne)(tokens_1.USER_ENTITY_TABLE_NAME, { nullable: true, eager: true }),
-    (0, typeorm_1.JoinColumn)(),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    ManyToOne(USER_ENTITY_TABLE_NAME, { nullable: true, eager: true }),
+    JoinColumn(),
+    __metadata("design:type", Object)
 ], BaseEntity.prototype, "createdBy", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    Column({ nullable: true }),
+    __metadata("design:type", Object)
 ], BaseEntity.prototype, "updatedById", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.ManyToOne)(tokens_1.USER_ENTITY_TABLE_NAME, { nullable: true, eager: true }),
-    (0, typeorm_1.JoinColumn)(),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    ManyToOne(USER_ENTITY_TABLE_NAME, { nullable: true, eager: true }),
+    JoinColumn(),
+    __metadata("design:type", Object)
 ], BaseEntity.prototype, "updatedBy", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    Column({ nullable: true }),
+    __metadata("design:type", Object)
 ], BaseEntity.prototype, "deletedById", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.ManyToOne)(tokens_1.USER_ENTITY_TABLE_NAME, { nullable: true, eager: true }),
-    (0, typeorm_1.JoinColumn)(),
-    tslib_1.__metadata("design:type", Object)
+__decorate([
+    ManyToOne(USER_ENTITY_TABLE_NAME, { nullable: true, eager: true }),
+    JoinColumn(),
+    __metadata("design:type", Object)
 ], BaseEntity.prototype, "deletedBy", void 0);
-tslib_1.__decorate([
-    (0, typeorm_1.AfterLoad)(),
-    tslib_1.__metadata("design:type", Function),
-    tslib_1.__metadata("design:paramtypes", []),
-    tslib_1.__metadata("design:returntype", void 0)
+__decorate([
+    AfterLoad(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", void 0)
 ], BaseEntity.prototype, "afterLoad", null);
 //# sourceMappingURL=base-entity.js.map

package/base/base-entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-entity.js","sourceRoot":"","sources":["../../../../libs/nest-crud/src/base/base-entity.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-entity.js","sourceRoot":"","sources":["../../../../libs/nest-crud/src/base/base-entity.ts"],"names":[],"mappings":"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"}

package/base/base-repository.d.ts

@@ -694,18 +694,18 @@ export declare class BaseRepository<Entity extends Model | ModelExtension> exten
      *
      * @template Entity - The entity type this repository manages
      * @param {FindOptionsWhere<Entity>} where - The base where condition
-     * @param {FindOptionsWhere<Entity>} search - The search or negation criteria
+     * @param {FindOptionsWhere<Entity>} or - The search or negation criteria
      * @param {<T>(value: FindOperator<T> | T) => FindOperator<T>} operator - The operator to apply (ILike or Not)
      * @returns {FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[]} The resulting where condition(s)
      *
-     * @see {@link mapWhere} The helper method used to apply operators to conditions
+     * @see {@link mapAndWhere} The helper method used to apply operators to conditions
      * @see {@link generateOptions} Method that uses this to process search and negation conditions
      * @see {@link FindOptionsWhere} TypeORM's type for where conditions
      * @see {@link ILike} TypeORM's case-insensitive LIKE operator
      * @see {@link Not} TypeORM's negation operator
      * @see {@link FindOperator} TypeORM's operator class for query building
      */
-    orWhere(where: FindOptionsWhere<Entity>, search: FindOptionsWhere<Entity>, operator: <T>(value: FindOperator<T> | T) => FindOperator<T>): FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[];
+    orWhere(where: FindOptionsWhere<Entity>, or: QueryDeepPartial<Entity>, operator: <T>(value: FindOperator<T> | T) => FindOperator<T>): FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[];
     /**
      * Type guard to check if a value is a TypeORM FindOperator
      *
@@ -717,7 +717,7 @@ export declare class BaseRepository<Entity extends Model | ModelExtension> exten
      * @returns {boolean} True if the value is a FindOperator instance
      *
      * @see {@link FindOperator} TypeORM's operator class for query building
-     * @see {@link mapWhere} Method that uses this to safely handle values
+     * @see {@link mapAndWhere} Method that uses this to safely handle values
      * @see {@link ILike} Example of a FindOperator
      * @see {@link Not} Example of a FindOperator
      */
@@ -739,7 +739,7 @@ export declare class BaseRepository<Entity extends Model | ModelExtension> exten
      *
      * @template T - The entity type for the where conditions
      * @param {FindOptionsWhere<T>} where - The base where conditions to extend
-     * @param {FindOptionsWhere<T>} data - The new conditions to apply
+     * @param {FindOptionsWhere<T>} and - The new conditions to apply
      * @param {<V>(value: V | FindOperator<V>) => FindOperator<V>} [operator] - Optional operator to apply to values
      * @param {`${string}{}${string}`} [wrap] - Optional template for wrapping string values
      * @returns {FindOptionsWhere<T>} The resulting where conditions
@@ -752,5 +752,5 @@ export declare class BaseRepository<Entity extends Model | ModelExtension> exten
      * @see {@link ILike} Example of an operator that can be applied
      * @see {@link Not} Example of an operator that can be applied
      */
-    mapWhere<T = Entity>(where: FindOptionsWhere<T>, data: FindOptionsWhere<T>, operator?: <V>(value: V | FindOperator<V>) => FindOperator<V>, wrap?: `${string}{}${string}`): FindOptionsWhere<T>;
+    mapAndWhere<T = Entity>(where: FindOptionsWhere<T>, and: QueryDeepPartial<T>, operator?: <V>(value: V | FindOperator<V>) => FindOperator<V>, wrap?: `${string}{}${string}`): FindOptionsWhere<T>;
 }

package/base/base-repository.js

@@ -1,10 +1,6 @@
-"use strict";
 // noinspection JSUnusedGlobalSymbols
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BaseRepository = void 0;
-const typeorm_1 = require("typeorm");
-const repository_utils_1 = require("../utils/repository.utils");
-const bson_typings_1 = require("typeorm/driver/mongodb/bson.typings");
+import { FindOperator, ILike, Not, ObjectId, Repository, } from "typeorm";
+import { toDeepPartial, toFindOptionsWhere } from "../utils/repository.utils";
 /**
  * Base Repository Class that extends TypeORM's Repository with enhanced functionality
  *
@@ -71,7 +67,7 @@ const bson_typings_1 = require("typeorm/driver/mongodb/bson.typings");
  * @see {@link BaseEntity} The base class for entities with full audit tracking
  * @see {@link BaseEntityExtension} The base class for lightweight entity extensions
  */
-class BaseRepository extends typeorm_1.Repository {
+export class BaseRepository extends Repository {
     /**
      * Static property to store the current transaction manager
      * Used to ensure all operations within a transaction use the same manager
@@ -113,8 +109,8 @@ class BaseRepository extends typeorm_1.Repository {
      */
     create(entityLike) {
         return super.create((Array.isArray(entityLike)
-            ? entityLike.map(e => (0, repository_utils_1.toDeepPartial)(e))
-            : (0, repository_utils_1.toDeepPartial)(entityLike)));
+            ? entityLike.map(e => toDeepPartial(e))
+            : toDeepPartial(entityLike)));
     }
     /**
      * Save an entity to the database
@@ -330,7 +326,7 @@ class BaseRepository extends typeorm_1.Repository {
      * @see {@link UpdateResult} TypeORM's result type for update operations
      */
     updateOne(where, partialEntity) {
-        return this.entityRepository.update((0, repository_utils_1.toFindOptionsWhere)(where), partialEntity);
+        return this.entityRepository.update(toFindOptionsWhere(where), partialEntity);
     }
     /**
      * Update multiple entities matching the specified criteria
@@ -359,11 +355,11 @@ class BaseRepository extends typeorm_1.Repository {
      * @see {@link UpdateResult} TypeORM's result type for update operations
      */
     updateMany(where, partialEntity) {
-        return this.entityRepository.update(!(where instanceof bson_typings_1.ObjectId) &&
+        return this.entityRepository.update(!(where instanceof ObjectId) &&
             !(where instanceof Date) &&
             typeof where === "object" &&
             !Array.isArray(where)
-            ? (0, repository_utils_1.toFindOptionsWhere)(where)
+            ? toFindOptionsWhere(where)
             : where, partialEntity);
     }
     /**
@@ -709,13 +705,18 @@ class BaseRepository extends typeorm_1.Repository {
     generateOptions(getOptions) {
         const { options, relations, pagination, sort } = getOptions ?? {};
         const opt = { ...(options || {}) };
-        opt.where = (0, repository_utils_1.toFindOptionsWhere)(getOptions.where || getOptions.filters);
+        opt.where = toFindOptionsWhere(getOptions.where || getOptions.filters);
         const { search, not } = getOptions;
+        // if (not) {
+        //     opt.where = this.orWhere(opt.where as FindOptionsWhere<Entity>, not, Not);
+        // } else if (search) {
+        //     opt.where = this.orWhere(opt.where as FindOptionsWhere<Entity>, search, ILike);
+        // }
         if (not) {
-            opt.where = this.orWhere(opt.where, not, typeorm_1.Not);
+            opt.where = this.mapAndWhere(opt.where, not, Not);
         }
-        else if (search) {
-            opt.where = this.orWhere(opt.where, search, typeorm_1.ILike);
+        if (search) {
+            opt.where = this.mapAndWhere(opt.where, search, ILike);
         }
         if (relations) {
             opt.relations = relations;
@@ -741,25 +742,25 @@ class BaseRepository extends typeorm_1.Repository {
      *
      * @template Entity - The entity type this repository manages
      * @param {FindOptionsWhere<Entity>} where - The base where condition
-     * @param {FindOptionsWhere<Entity>} search - The search or negation criteria
+     * @param {FindOptionsWhere<Entity>} or - The search or negation criteria
      * @param {<T>(value: FindOperator<T> | T) => FindOperator<T>} operator - The operator to apply (ILike or Not)
      * @returns {FindOptionsWhere<Entity> | FindOptionsWhere<Entity>[]} The resulting where condition(s)
      *
-     * @see {@link mapWhere} The helper method used to apply operators to conditions
+     * @see {@link mapAndWhere} The helper method used to apply operators to conditions
      * @see {@link generateOptions} Method that uses this to process search and negation conditions
      * @see {@link FindOptionsWhere} TypeORM's type for where conditions
      * @see {@link ILike} TypeORM's case-insensitive LIKE operator
      * @see {@link Not} TypeORM's negation operator
      * @see {@link FindOperator} TypeORM's operator class for query building
      */
-    orWhere(where, search, operator) {
-        const entries = Object.entries(search);
+    orWhere(where, or, operator) {
+        const entries = Object.entries(or);
         if (entries.length > 1) {
             const whr = [];
-            entries.forEach(([key, value]) => whr.push(this.mapWhere(where, { [key]: value }, operator, "%{}%")));
+            entries.forEach(([key, value]) => whr.push(this.mapAndWhere(where, { [key]: value }, operator, "%{}%")));
             return whr;
         }
-        return this.mapWhere(where, search, operator, "%{}%");
+        return this.mapAndWhere(where, or, operator, "%{}%");
     }
     /**
      * Type guard to check if a value is a TypeORM FindOperator
@@ -772,12 +773,12 @@ class BaseRepository extends typeorm_1.Repository {
      * @returns {boolean} True if the value is a FindOperator instance
      *
      * @see {@link FindOperator} TypeORM's operator class for query building
-     * @see {@link mapWhere} Method that uses this to safely handle values
+     * @see {@link mapAndWhere} Method that uses this to safely handle values
      * @see {@link ILike} Example of a FindOperator
      * @see {@link Not} Example of a FindOperator
      */
     isFindOperator(value) {
-        return value instanceof typeorm_1.FindOperator;
+        return value instanceof FindOperator;
     }
     /**
      * Map and transform where conditions with operators
@@ -796,7 +797,7 @@ class BaseRepository extends typeorm_1.Repository {
      *
      * @template T - The entity type for the where conditions
      * @param {FindOptionsWhere<T>} where - The base where conditions to extend
-     * @param {FindOptionsWhere<T>} data - The new conditions to apply
+     * @param {FindOptionsWhere<T>} and - The new conditions to apply
      * @param {<V>(value: V | FindOperator<V>) => FindOperator<V>} [operator] - Optional operator to apply to values
      * @param {`${string}{}${string}`} [wrap] - Optional template for wrapping string values
      * @returns {FindOptionsWhere<T>} The resulting where conditions
@@ -809,14 +810,14 @@ class BaseRepository extends typeorm_1.Repository {
      * @see {@link ILike} Example of an operator that can be applied
      * @see {@link Not} Example of an operator that can be applied
      */
-    mapWhere(where, data, operator, wrap) {
+    mapAndWhere(where, and, operator, wrap) {
         // Start with a copy of the base where conditions
         const whr = where ? { ...where } : {};
         // Process each key-value pair in the data
-        for (const key in data) {
-            if (!Object.prototype.hasOwnProperty.call(data, key))
+        for (const key in and) {
+            if (!Object.prototype.hasOwnProperty.call(and, key))
                 continue;
-            const value = data[key];
+            const value = and[key];
             if (value === undefined)
                 continue;
             const existing = whr[key];
@@ -825,7 +826,7 @@ class BaseRepository extends typeorm_1.Repository {
                 // For nested objects, recursively apply mapWhere
                 const nestedExisting = existing && typeof existing === "object" && !this.isFindOperator(existing) ? existing : {};
                 // Type-safe recursive call for nested objects
-                const nestedResult = this.mapWhere(nestedExisting, value, operator, wrap);
+                const nestedResult = this.mapAndWhere(nestedExisting, value, operator, wrap);
                 whr[key] = nestedResult;
             }
             else {
@@ -849,5 +850,4 @@ class BaseRepository extends typeorm_1.Repository {
         return whr;
     }
 }
-exports.BaseRepository = BaseRepository;
 //# sourceMappingURL=base-repository.js.map

package/base/base-repository.js.map

@@ -1 +1 @@
-{"version":3,"file":"base-repository.js","sourceRoot":"","sources":["../../../../libs/nest-crud/src/base/base-repository.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"base-repository.js","sourceRoot":"","sources":["../../../../libs/nest-crud/src/base/base-repository.ts"],"names":[],"mappings":"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"}

package/base/base-user.entity.d.ts

@@ -1,5 +1,6 @@
 import { UserInfo } from "@hichchi/nest-connector";
 import { EntityId, Model } from "@hichchi/nest-connector/crud";
+import { AuthProvider, GoogleProfile } from "@hichchi/nest-connector/auth";
 /**
  * Base user entity class that provides common user fields and functionality
  *
@@ -144,6 +145,11 @@ export declare class HichchiUserEntity implements UserInfo, Model {
      * alternative authentication methods like email-only authentication.
      */
     username: string | null;
+    password: string | null;
+    emailVerified: boolean;
+    avatar: string | null;
+    profileData: GoogleProfile | null;
+    signUpType: AuthProvider;
     /**
      * Lifecycle hooks that run before an entity is inserted or updated
      *
@@ -174,5 +180,5 @@ export declare class HichchiUserEntity implements UserInfo, Model {
      * @returns {UserInfo} A simplified user object with only essential information
      * @private
      */
-    private _mapUserEntity;
+    protected _mapUserEntity?(user: UserInfo): UserInfo;
 }