@ackplus/nest-crud-request 0.1.51 → 1.1.0

package/README.md

@@ -1,135 +1,11 @@
-# @ackplus/nest-crud-request
+# nest-crud-request
 
-A frontend utility package for building and formatting requests compatible with @ackplus/nest-crud backend. This package provides a type-safe way to construct CRUD requests with proper query parameters, filters, sorting, and pagination.
+This library was generated with [Nx](https://nx.dev).
 
-## Features
+## Building
 
-- Type-safe request builder
-- Query parameter construction
-- Filter builder
-- Sort builder
-- Search builder
-- Pagination builder
-- Request validation
-- Automatic URL parameter encoding
+Run `nx build nest-crud-request` to build the library.
 
-## Installation
+## Running unit tests
 
-```bash
-npm install @ackplus/nest-crud-request
-# or
-yarn add @ackplus/nest-crud-request
-```
-
-## Quick Start
-
-1. Import the request builder:
-
-```typescript
-import { CrudRequestBuilder } from '@ackplus/nest-crud-request';
-```
-
-2. Create and use the request builder:
-
-```typescript
-// Create a new request builder
-const request = new CrudRequestBuilder();
-
-// Add pagination
-request.paginate(1, 10);
-
-// Add sorting
-request.sort('name', 'asc');
-
-// Add filters
-request.filter('status', 'active');
-
-// Add search
-request.search('john');
-
-// Build the request
-const queryParams = request.build();
-// Result: ?page=1&limit=10&sort=name&order=asc&filter[status]=active&search=john
-
-// Use with your HTTP client
-const response = await axios.get(`/api/users${queryParams}`);
-```
-
-## API Documentation
-
-### CrudRequestBuilder
-
-The main class for building CRUD requests.
-
-#### Methods
-
-- `paginate(page: number, limit: number)` - Set pagination parameters
-- `sort(field: string, order: 'asc' | 'desc')` - Add sort parameters
-- `filter(field: string, value: any)` - Add filter conditions
-- `search(term: string)` - Add search term
-- `build()` - Build the request and return query string
-
-### Types
-
-- `CrudRequest` - Type definition for the request structure
-- `Filter` - Type for filter conditions
-- `Sort` - Type for sort conditions
-- `Pagination` - Type for pagination parameters
-
-## Examples
-
-### Basic Usage
-
-```typescript
-const request = new CrudRequestBuilder()
-  .paginate(1, 10)
-  .sort('createdAt', 'desc')
-  .filter('status', 'active')
-  .search('john')
-  .build();
-
-// Use with fetch
-const response = await fetch(`/api/users${request}`);
-```
-
-### Advanced Filtering
-
-```typescript
-const request = new CrudRequestBuilder()
-  .filter('age', { $gt: 18 })
-  .filter('status', { $in: ['active', 'pending'] })
-  .build();
-
-// Result: ?filter[age][$gt]=18&filter[status][$in]=active,pending
-```
-
-### Multiple Sorts
-
-```typescript
-const request = new CrudRequestBuilder()
-  .sort('name', 'asc')
-  .sort('age', 'desc')
-  .build();
-
-// Result: ?sort=name,age&order=asc,desc
-```
-
-### Complex Search
-
-```typescript
-const request = new CrudRequestBuilder()
-  .search('john doe')
-  .filter('department', 'IT')
-  .paginate(1, 20)
-  .build();
-
-// Result: ?search=john%20doe&filter[department]=IT&page=1&limit=20
-```
-
-## Contributing
-
-Contributions are welcome! Please feel free to submit a Pull Request.
-
-## License
-
-This project is licensed under the terms of the MIT license.
+Run `nx test nest-crud-request` to execute the unit tests via [Jest](https://jestjs.io).

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+export * from './lib/query-builder';
+export * from './lib/where-builder';
+export * from './lib/types';
+//# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,aAAa,CAAC"}

package/{src → dist}/lib/query-builder.d.ts

@@ -34,3 +34,4 @@ export declare class QueryBuilder {
     };
     toJson(): string;
 }
+//# sourceMappingURL=query-builder.d.ts.map

package/dist/lib/query-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../../src/lib/query-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,EAAgB,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAGtE,qBAAa,YAAY;IAErB,OAAO,CAAC,OAAO,CAA2B;IAE1C,OAAO,CAAC,YAAY,CAAoC;IAExD,OAAO,CAAC,eAAe,CAA0C;gBAErD,OAAO,CAAC,EAAE,mBAAmB;IAMzC,UAAU,CAAC,OAAO,EAAE,mBAAmB,GAAG,IAAI;IAO9C,YAAY,CAAC,OAAO,EAAE,mBAAmB,EAAE,IAAI,UAAQ,GAAG,IAAI;IAc9D,SAAS,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAa1C,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI;IAY7C,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAKnF,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAKtC,KAAK,CAAC,GAAG,IAAI,EAAE,qBAAqB,GAAG,IAAI;IAK3C,QAAQ,CAAC,GAAG,IAAI,EAAE,qBAAqB,GAAG,IAAI;IAK9C,OAAO,CAAC,GAAG,IAAI,EAAE,qBAAqB,GAAG,IAAI;IAK7C,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,kBAAkB,GAAG,IAAI;IAQ1D,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAOlC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK3B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAK3B,cAAc,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI;IAK1C,cAAc,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI;IAK1C,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,IAAI;IAKlC,QAAQ,CAAC,uBAAuB,UAAQ;;;;;;;;;;;IAoDxC,MAAM;CAKT"}

package/{src → dist}/lib/query-builder.js

@@ -1,36 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryBuilder = void 0;
-const relation_builder_1 = require("./relation-builder");
-const utils_1 = require("./utils");
-const where_builder_1 = require("./where-builder");
-class QueryBuilder {
+import { RelationBuilder } from './relation-builder';
+import { deepMerge } from './utils';
+import { WhereBuilder } from './where-builder';
+export class QueryBuilder {
+    options = {};
+    whereBuilder = new WhereBuilder();
+    relationBuilder = new RelationBuilder();
     constructor(options) {
-        this.options = {};
-        this.whereBuilder = new where_builder_1.WhereBuilder();
-        this.relationBuilder = new relation_builder_1.RelationBuilder();
         if (options) {
             this.setOptions(options);
         }
     }
     setOptions(options) {
         this.options = options;
-        this.whereBuilder = new where_builder_1.WhereBuilder(options.where);
-        this.relationBuilder = new relation_builder_1.RelationBuilder(options.relations);
+        this.whereBuilder = new WhereBuilder(options.where);
+        this.relationBuilder = new RelationBuilder(options.relations);
         return this;
     }
     mergeOptions(options, deep = false) {
         let updatedOptions = {};
         if (deep) {
-            updatedOptions = (0, utils_1.deepMerge)(this.options, options);
+            updatedOptions = deepMerge(this.options, options);
         }
         else {
-            updatedOptions = Object.assign(Object.assign({}, this.options), options);
+            updatedOptions = {
+                ...this.options,
+                ...options,
+            };
         }
         this.setOptions(updatedOptions);
         return this;
     }
     addSelect(fields) {
+        // Ensure select is always an array
         if (!this.options.select || typeof this.options.select === 'string') {
             this.options.select = [];
         }
@@ -43,6 +44,7 @@ class QueryBuilder {
         return this;
     }
     removeSelect(fields) {
+        // Ensure select is an array before filtering
         if (this.options.select && Array.isArray(this.options.select)) {
             if (Array.isArray(fields)) {
                 this.options.select = this.options.select.filter(field => !fields.includes(field));
@@ -107,7 +109,10 @@ class QueryBuilder {
         return this;
     }
     toObject(constrainToNestedObject = false) {
-        const options = Object.assign({}, this.options);
+        const options = {
+            ...this.options,
+        };
+        // Convert where conditions to JSON string
         if (this.whereBuilder.hasConditions()) {
             if (constrainToNestedObject) {
                 options.where = this.whereBuilder.toObject();
@@ -119,6 +124,7 @@ class QueryBuilder {
         else {
             delete options.where;
         }
+        // Convert relations to JSON string
         if (this.relationBuilder.hasRelations()) {
             if (constrainToNestedObject) {
                 options.relations = this.relationBuilder.toObject();
@@ -130,6 +136,7 @@ class QueryBuilder {
         else {
             delete options.relations;
         }
+        // Convert order to JSON string if it exists
         if (options.order && Object.keys(options.order).length > 0) {
             if (constrainToNestedObject) {
                 options.order = options.order;
@@ -141,6 +148,7 @@ class QueryBuilder {
         else {
             delete options.order;
         }
+        // Convert select to JSON string if it exists
         if (options.select && options.select.length > 0) {
             if (constrainToNestedObject) {
                 options.select = options.select;
@@ -159,4 +167,3 @@ class QueryBuilder {
         return JSON.stringify(obj);
     }
 }
-exports.QueryBuilder = QueryBuilder;

package/{src → dist}/lib/relation-builder.d.ts

@@ -10,3 +10,4 @@ export declare class RelationBuilder {
     toObject(): RelationObject;
     toJson(): string;
 }
+//# sourceMappingURL=relation-builder.d.ts.map

package/dist/lib/relation-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"relation-builder.d.ts","sourceRoot":"","sources":["../../src/lib/relation-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAuB,eAAe,EAAE,MAAM,SAAS,CAAC;AAG/E,qBAAa,eAAe;IAExB,OAAO,CAAC,SAAS,CAAsB;gBAE3B,SAAS,CAAC,EAAE,eAAe,GAAG,MAAM;IAOhD,YAAY,CAAC,SAAS,EAAE,eAAe,GAAG,IAAI;IAe9C,KAAK,IAAI,IAAI;IAKb,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI;IAgB3E,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAK9B,YAAY,IAAI,OAAO;IAIvB,QAAQ,IAAI,cAAc;IAI1B,MAAM,IAAI,MAAM;CAInB"}

package/{src → dist}/lib/relation-builder.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RelationBuilder = void 0;
-class RelationBuilder {
+export class RelationBuilder {
+    relations = {};
     constructor(relations) {
-        this.relations = {};
         if (relations) {
             const relationOptions = typeof relations === 'string' ? JSON.parse(relations) : relations;
             this.setRelations(relationOptions);
@@ -59,4 +56,3 @@ class RelationBuilder {
         return JSON.stringify(this.relations);
     }
 }
-exports.RelationBuilder = RelationBuilder;

package/dist/lib/types.d.ts

@@ -0,0 +1,53 @@
+export interface QueryBuilderOptions {
+    [key: string]: any;
+    select?: string[] | string;
+    relations?: RelationOptions | string;
+    where?: WhereOptions | string;
+    order?: Record<string, OrderDirectionEnum> | string;
+    skip?: number;
+    take?: number;
+    withDeleted?: boolean;
+    onlyDeleted?: boolean;
+}
+export declare enum WhereLogicalOperatorEnum {
+    AND = "$and",
+    OR = "$or"
+}
+export declare enum WhereOperatorEnum {
+    EQ = "$eq",
+    NOT_EQ = "$ne",
+    GT = "$gt",
+    GT_OR_EQ = "$gte",
+    LT = "$lt",
+    LT_OR_EQ = "$lte",
+    IN = "$in",
+    NOT_IN = "$notIn",
+    LIKE = "$like",
+    NOT_LIKE = "$notLike",
+    ILIKE = "$iLike",
+    NOT_ILIKE = "$notIlike",
+    IS_NULL = "$isNull",
+    IS_NOT_NULL = "$isNotNull",
+    BETWEEN = "$between",
+    NOT_BETWEEN = "$notBetween",
+    IS_TRUE = "$isTrue",
+    IS_FALSE = "$isFalse"
+}
+export declare enum OrderDirectionEnum {
+    ASC = "ASC",
+    DESC = "DESC"
+}
+export type WhereObject = {
+    [key: string]: any;
+    $and?: WhereObject | WhereObject[];
+    $or?: WhereObject | WhereObject[];
+};
+export type WhereOptions = WhereObject | WhereObject[];
+export type RelationObjectValue = {
+    select?: string[];
+    where?: WhereObject | WhereObject[];
+    joinType?: 'left' | 'inner';
+};
+export type RelationObject = Record<string, RelationObjectValue | boolean>;
+export type RelationOptions = string | string[] | RelationObject;
+//# sourceMappingURL=types.d.ts.map

package/dist/lib/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/lib/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,mBAAmB;IAChC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAC3B,SAAS,CAAC,EAAE,eAAe,GAAG,MAAM,CAAC;IACrC,KAAK,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC;IAC9B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,GAAG,MAAM,CAAC;IACpD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,WAAW,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,oBAAY,wBAAwB;IAChC,GAAG,SAAS;IACZ,EAAE,QAAQ;CACb;AAED,oBAAY,iBAAiB;IACzB,EAAE,QAAQ;IACV,MAAM,QAAQ;IACd,EAAE,QAAQ;IACV,QAAQ,SAAS;IACjB,EAAE,QAAQ;IACV,QAAQ,SAAS;IACjB,EAAE,QAAQ;IACV,MAAM,WAAW;IACjB,IAAI,UAAU;IACd,QAAQ,aAAa;IACrB,KAAK,WAAW;IAChB,SAAS,cAAc;IACvB,OAAO,YAAY;IACnB,WAAW,eAAe;IAC1B,OAAO,aAAa;IACpB,WAAW,gBAAgB;IAC3B,OAAO,YAAY;IACnB,QAAQ,aAAa;CACxB;AAED,oBAAY,kBAAkB;IAC1B,GAAG,QAAQ;IACX,IAAI,SAAS;CAChB;AAED,MAAM,MAAM,WAAW,GAAG;IACtB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;IACnB,IAAI,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,CAAC;IACnC,GAAG,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG,WAAW,EAAE,CAAC;AAGvD,MAAM,MAAM,mBAAmB,GAAG;IAC9B,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,KAAK,CAAC,EAAE,WAAW,GAAG,WAAW,EAAE,CAAC;IACpC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAAC,CAAC;AAE3E,MAAM,MAAM,eAAe,GAAG,MAAM,GAAG,MAAM,EAAE,GAAG,cAAc,CAAC"}

package/dist/lib/types.js

@@ -0,0 +1,31 @@
+export var WhereLogicalOperatorEnum;
+(function (WhereLogicalOperatorEnum) {
+    WhereLogicalOperatorEnum["AND"] = "$and";
+    WhereLogicalOperatorEnum["OR"] = "$or";
+})(WhereLogicalOperatorEnum || (WhereLogicalOperatorEnum = {}));
+export var WhereOperatorEnum;
+(function (WhereOperatorEnum) {
+    WhereOperatorEnum["EQ"] = "$eq";
+    WhereOperatorEnum["NOT_EQ"] = "$ne";
+    WhereOperatorEnum["GT"] = "$gt";
+    WhereOperatorEnum["GT_OR_EQ"] = "$gte";
+    WhereOperatorEnum["LT"] = "$lt";
+    WhereOperatorEnum["LT_OR_EQ"] = "$lte";
+    WhereOperatorEnum["IN"] = "$in";
+    WhereOperatorEnum["NOT_IN"] = "$notIn";
+    WhereOperatorEnum["LIKE"] = "$like";
+    WhereOperatorEnum["NOT_LIKE"] = "$notLike";
+    WhereOperatorEnum["ILIKE"] = "$iLike";
+    WhereOperatorEnum["NOT_ILIKE"] = "$notIlike";
+    WhereOperatorEnum["IS_NULL"] = "$isNull";
+    WhereOperatorEnum["IS_NOT_NULL"] = "$isNotNull";
+    WhereOperatorEnum["BETWEEN"] = "$between";
+    WhereOperatorEnum["NOT_BETWEEN"] = "$notBetween";
+    WhereOperatorEnum["IS_TRUE"] = "$isTrue";
+    WhereOperatorEnum["IS_FALSE"] = "$isFalse";
+})(WhereOperatorEnum || (WhereOperatorEnum = {}));
+export var OrderDirectionEnum;
+(function (OrderDirectionEnum) {
+    OrderDirectionEnum["ASC"] = "ASC";
+    OrderDirectionEnum["DESC"] = "DESC";
+})(OrderDirectionEnum || (OrderDirectionEnum = {}));

package/{src → dist}/lib/utils.d.ts

@@ -1 +1,2 @@
 export declare function deepMerge(target: any, source: any): any;
+//# sourceMappingURL=utils.d.ts.map

package/dist/lib/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":"AAAA,wBAAgB,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,GAAG,GAAG,CAUvD"}

package/dist/lib/utils.js

@@ -0,0 +1,11 @@
+export function deepMerge(target, source) {
+    for (const key in source) {
+        if (source[key] instanceof Object && key in target) {
+            Object.assign(source[key], deepMerge(target[key], source[key]));
+        }
+    }
+    return {
+        ...target,
+        ...source,
+    };
+}

package/{src → dist}/lib/where-builder.d.ts

@@ -14,5 +14,9 @@ export declare class WhereBuilder {
     toJson(): string;
     private parseCondition;
     private updateCondition;
+    /**
+     * Intelligently merge two condition objects, handling logical operators properly
+     */
     private mergeConditions;
 }
+//# sourceMappingURL=where-builder.d.ts.map

package/dist/lib/where-builder.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"where-builder.d.ts","sourceRoot":"","sources":["../../src/lib/where-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAGtE,MAAM,MAAM,qBAAqB,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,YAAY,KAAK,IAAI,CAAC,CAAC;AAEjJ,qBAAa,YAAY;IAErB,OAAO,CAAC,WAAW,CAA2B;gBAElC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,MAAM;IAIhD,OAAO,CAAC,UAAU;IAIlB,KAAK,IAAI,IAAI;IAKb,KAAK,CAAC,GAAG,IAAI,EAAE,qBAAqB,GAAG,IAAI;IAK3C,QAAQ,CAAC,GAAG,IAAI,EAAE,qBAAqB,GAAG,IAAI;IAK9C,OAAO,CAAC,GAAG,IAAI,EAAE,qBAAqB,GAAG,IAAI;IAK7C,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAehC,aAAa,IAAI,OAAO;IAIxB,QAAQ,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAI/B,MAAM,IAAI,MAAM;IAIhB,OAAO,CAAC,cAAc;IAuDtB,OAAO,CAAC,eAAe;IAUvB;;OAEG;IACH,OAAO,CAAC,eAAe;CA0B1B"}

package/{src → dist}/lib/where-builder.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.WhereBuilder = void 0;
-const types_1 = require("./types");
-class WhereBuilder {
+import { WhereLogicalOperatorEnum, WhereOperatorEnum } from './types';
+export class WhereBuilder {
+    whereObject = {};
     constructor(where) {
-        this.whereObject = {};
         this.whereObject = typeof where === 'string' ? JSON.parse(where) : where || {};
     }
     isOperator(value) {
@@ -19,11 +16,11 @@ class WhereBuilder {
         return this;
     }
     andWhere(...args) {
-        this.parseCondition(types_1.WhereLogicalOperatorEnum.AND, ...args);
+        this.parseCondition(WhereLogicalOperatorEnum.AND, ...args);
         return this;
     }
     orWhere(...args) {
-        this.parseCondition(types_1.WhereLogicalOperatorEnum.OR, ...args);
+        this.parseCondition(WhereLogicalOperatorEnum.OR, ...args);
         return this;
     }
     removeWhere(field) {
@@ -31,7 +28,7 @@ class WhereBuilder {
         let current = this.whereObject;
         for (let i = 0; i < keys.length - 1; i++) {
             if (!current[keys[i]]) {
-                return this;
+                return this; // If the path doesn't exist, do nothing
             }
             current = current[keys[i]];
         }
@@ -52,42 +49,49 @@ class WhereBuilder {
         let operator;
         let value;
         if (args.length === 0) {
+            // Do nothing
         }
         else if (args.length === 1) {
             const condition = args[0];
             if (typeof condition === 'function') {
+                // If the condition is a function, create a new WhereBuilder and call the function with it
                 const builder = new WhereBuilder();
                 condition(builder);
                 this.updateCondition(builder.toObject(), type);
             }
             else if (condition instanceof WhereBuilder) {
+                // If the condition is a WhereBuilder
                 this.updateCondition(condition.toObject(), type);
             }
             else {
+                // If the condition is a simple object
                 this.updateCondition(condition, type);
             }
         }
         else if (args.length === 2 || args.length === 3) {
             if (args.length === 2) {
+                // if there are only two arguments, the operator is EQ
                 field = args[0];
                 value = args[1];
                 if (typeof value === 'object') {
                     const firstKey = Object.keys(value)[0];
+                    // if the first key is a operator, update the value with the operator
                     if (firstKey.startsWith('$')) {
                         this.updateCondition({ [field]: value }, type);
                     }
                     else {
-                        this.updateCondition({ [field]: { [types_1.WhereOperatorEnum.EQ]: value } }, type);
+                        this.updateCondition({ [field]: { [WhereOperatorEnum.EQ]: value } }, type);
                     }
                 }
                 else if (this.isOperator(value)) {
                     this.updateCondition({ [field]: { [value]: true } }, type);
                 }
                 else {
-                    this.updateCondition({ [field]: { [types_1.WhereOperatorEnum.EQ]: value } }, type);
+                    this.updateCondition({ [field]: { [WhereOperatorEnum.EQ]: value } }, type);
                 }
             }
             else {
+                // if there are three arguments, the operator is the second argument
                 field = args[0];
                 operator = args[1];
                 value = args[2];
@@ -96,34 +100,47 @@ class WhereBuilder {
         }
         return this;
     }
+    // private updateCondition(condition: Record<string, any>, type: '$and' | '$or'): void {
+    //     this.whereObject[type] = [...(this.whereObject[type] || []), condition].filter(Boolean);
+    // }
     updateCondition(condition, type) {
         if (type === null) {
+            // For direct where conditions, we need to merge intelligently
             this.mergeConditions(this.whereObject, condition);
         }
         else {
+            // For logical operators ($and, $or), add to the array
             this.whereObject[type] = [...(this.whereObject[type] || []), condition].filter(Boolean);
         }
     }
+    /**
+     * Intelligently merge two condition objects, handling logical operators properly
+     */
     mergeConditions(target, source) {
         for (const key in source) {
             const sourceValue = source[key];
             if (key === '$and' || key === '$or') {
+                // Handle logical operators - merge arrays
                 if (target[key]) {
+                    // If target already has this logical operator, merge the arrays
                     target[key] = [...(target[key] || []), ...(Array.isArray(sourceValue) ? sourceValue : [sourceValue])];
                 }
                 else {
+                    // If target doesn't have this logical operator, set it
                     target[key] = Array.isArray(sourceValue) ? sourceValue : [sourceValue];
                 }
             }
             else {
+                // Handle regular field conditions
                 if (target[key] && typeof target[key] === 'object' && typeof sourceValue === 'object') {
-                    target[key] = Object.assign(Object.assign({}, target[key]), sourceValue);
+                    // If both target and source have the same field with object values, merge them
+                    target[key] = { ...target[key], ...sourceValue };
                 }
                 else {
+                    // Otherwise, simply assign the value
                     target[key] = sourceValue;
                 }
             }
         }
     }
 }
-exports.WhereBuilder = WhereBuilder;

package/eslint.config.mjs

@@ -0,0 +1,22 @@
+import baseConfig from '../../eslint.base.config';
+
+export default [
+  ...baseConfig,
+  {
+    files: ['**/*.json'],
+    rules: {
+      '@nx/dependency-checks': [
+        'error',
+        {
+          ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}'],
+        },
+      ],
+    },
+    languageOptions: {
+      parser: await import('jsonc-eslint-parser'),
+    },
+  },
+  {
+    ignores: ['**/out-tsc'],
+  },
+];

package/jest.config.ts

@@ -0,0 +1,10 @@
+export default {
+  displayName: 'nest-crud-request',
+  preset: '../../jest.preset.js',
+  testEnvironment: 'node',
+  transform: {
+    '^.+\\.[tj]s$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
+  },
+  moduleFileExtensions: ['ts', 'js', 'html'],
+  coverageDirectory: '../../coverage/packages/nest-crud-request',
+};

package/package.json

@@ -1,28 +1,10 @@
 {
   "name": "@ackplus/nest-crud-request",
-  "version": "0.1.51",
+  "version": "1.1.0",
   "type": "commonjs",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
-  "license": "MIT",
-  "description": "Request parsing and query building utilities for @ackplus/nest-crud",
-  "keywords": [
-    "nestjs",
-    "crud",
-    "query",
-    "request",
-    "parser",
-    "builder"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/ack-solutions/packages.git"
-  },
-  "homepage": "https://github.com/ack-solutions/packages.git#readme",
-  "publishConfig": {
-    "access": "public"
-  },
   "dependencies": {
     "tslib": "^2.3.0"
   }
-}
+}

package/project.json

@@ -0,0 +1,46 @@
+{
+  "name": "nest-crud-request",
+  "$schema": "../../node_modules/nx/schemas/project-schema.json",
+  "sourceRoot": "packages/nest-crud-request/src",
+  "projectType": "library",
+  "release": {
+    "version": {
+      "manifestRootsToUpdate": [
+        "dist/{projectRoot}"
+      ],
+      "currentVersionResolver": "git-tag",
+      "fallbackCurrentVersionResolver": "disk"
+    }
+  },
+  "tags": [],
+  "targets": {
+    "build": {
+      "executor": "@nx/js:tsc",
+      "outputs": [
+        "{options.outputPath}"
+      ],
+      "options": {
+        "outputPath": "dist/packages/nest-crud-request",
+        "main": "packages/nest-crud-request/src/index.ts",
+        "tsConfig": "packages/nest-crud-request/tsconfig.lib.json",
+        "assets": [
+          "packages/nest-crud-request/*.md"
+        ]
+      }
+    },
+    "nx-release-publish": {
+      "options": {
+        "packageRoot": "dist/{projectRoot}"
+      }
+    },
+    "test": {
+      "executor": "@nx/jest:jest",
+      "outputs": [
+        "{workspaceRoot}/coverage/{projectRoot}"
+      ],
+      "options": {
+        "jestConfig": "packages/nest-crud-request/jest.config.ts"
+      }
+    }
+  }
+}