@ackplus/nest-crud-request 1.1.1 → 1.1.5

package/src/lib/types.ts

@@ -1,61 +0,0 @@
-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 enum WhereLogicalOperatorEnum {
-    AND = '$and',
-    OR = '$or',
-}
-
-export 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 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;

package/src/lib/utils.ts

@@ -1,11 +0,0 @@
-export function deepMerge(target: any, source: any): any {
-    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/lib/where-builder.ts

@@ -1,159 +0,0 @@
-import { WhereLogicalOperatorEnum, WhereOperatorEnum } from './types';
-
-
-export type WhereBuilderCondition = [string, any] | [string, WhereOperatorEnum, any] | [Record<string, any>] | [(builder: WhereBuilder) => void];
-
-export class WhereBuilder {
-
-    private whereObject: Record<string, any> = {};
-
-    constructor(where?: Record<string, any> | string) {
-        this.whereObject = typeof where === 'string' ? JSON.parse(where) : where || {};
-    }
-
-    private isOperator(value: any): boolean {
-        return `${value}`.startsWith('$');
-    }
-
-    clear(): this {
-        this.whereObject = {};
-        return this;
-    }
-
-    where(...args: WhereBuilderCondition): this {
-        this.parseCondition(null, ...args);
-        return this;
-    }
-
-    andWhere(...args: WhereBuilderCondition): this {
-        this.parseCondition(WhereLogicalOperatorEnum.AND, ...args);
-        return this;
-    }
-
-    orWhere(...args: WhereBuilderCondition): this {
-        this.parseCondition(WhereLogicalOperatorEnum.OR, ...args);
-        return this;
-    }
-
-    removeWhere(field: string): this {
-        const keys = field.split('.');
-        let current = this.whereObject;
-
-        for (let i = 0; i < keys.length - 1; i++) {
-            if (!current[keys[i]]) {
-                return this; // If the path doesn't exist, do nothing
-            }
-            current = current[keys[i]];
-        }
-
-        delete current[keys[keys.length - 1]];
-        return this;
-    }
-
-    hasConditions(): boolean {
-        return Object.keys(this.whereObject).length > 0;
-    }
-
-    toObject(): Record<string, any> {
-        return this.whereObject;
-    }
-
-    toJson(): string {
-        return JSON.stringify(this.whereObject);
-    }
-
-    private parseCondition(type: WhereLogicalOperatorEnum | null, ...args: any[]): Record<string, any> {
-        let field: string;
-        let operator: WhereOperatorEnum;
-        let value: any;
-
-        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]: { [WhereOperatorEnum.EQ]: value } }, type);
-                    }
-                } else if (this.isOperator(value)) {
-                    this.updateCondition({ [field]: { [value]: true } }, type);
-                } else {
-                    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];
-                this.updateCondition({ [field]: { [operator]: value } }, type);
-            }
-        }
-        return this;
-    }
-
-    // private updateCondition(condition: Record<string, any>, type: '$and' | '$or'): void {
-    //     this.whereObject[type] = [...(this.whereObject[type] || []), condition].filter(Boolean);
-    // }
-
-    private updateCondition(condition: Record<string, any>, type: WhereLogicalOperatorEnum | null): void {
-        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
-     */
-    private mergeConditions(target: Record<string, any>, source: Record<string, any>): void {
-        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') {
-                    // 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;
-                }
-            }
-        }
-    }
-
-}

package/src/test/query-builder-where.spec.ts

@@ -1,173 +0,0 @@
-import { QueryBuilder } from '../lib/query-builder';
-import { WhereOperatorEnum } from '../lib/types';
-
-
-describe('QueryBuilder - Where Conditions', () => {
-    let queryBuilder: QueryBuilder;
-
-    beforeEach(() => {
-        queryBuilder = new QueryBuilder({});
-    });
-
-    it('should add where conditions', () => {
-        queryBuilder.where('age', 25);
-        expect(queryBuilder.toObject(true).where).toEqual({ age: { $eq: 25 } });
-    });
-
-    it('should add or where conditions', () => {
-        queryBuilder.orWhere('age', 25);
-        expect(queryBuilder.toObject(true).where).toEqual({ $or: [{ age: { $eq: 25 } }] });
-    });
-
-    it('should add where conditions with a function', () => {
-        queryBuilder.where((builder) => {
-            builder.where('age', 25);
-            builder.orWhere('name', 'John');
-        });
-
-        expect(queryBuilder.toObject(true).where).toEqual({
-            age: { $eq: 25 },
-            $or: [{ name: { $eq: 'John' } }],
-        });
-    });
-
-    it('should add or where conditions with a function', () => {
-        queryBuilder.orWhere((builder) => {
-            builder.where('age', 25);
-            builder.orWhere('name', 'John');
-        });
-
-        expect(queryBuilder.toObject(true).where).toEqual({
-            $or: [
-                {
-                    age: { $eq: 25 },
-                    $or: [{ name: { $eq: 'John' } }],
-                },
-            ],
-        });
-    });
-
-    it('should handle complex where conditions with multiple nested functions', () => {
-        queryBuilder.where((builder) => {
-            builder.where('age', 25);
-            builder.orWhere((innerBuilder) => {
-                innerBuilder.where('name', 'John');
-                innerBuilder.where('status', 'active');
-            });
-            builder.where('country', 'USA');
-        });
-
-        expect(queryBuilder.toObject(true).where).toEqual({
-            age: { $eq: 25 },
-            $or: [
-                {
-                    name: { $eq: 'John' },
-                    status: { $eq: 'active' },
-                },
-            ],
-            country: { $eq: 'USA' },
-        });
-    });
-
-    it('should handle complex or where conditions with multiple nested functions', () => {
-        queryBuilder.orWhere((builder) => {
-            builder.where('age', 25);
-            builder.orWhere((innerBuilder) => {
-                innerBuilder.where('name', 'John');
-                innerBuilder.orWhere('status', 'active');
-            });
-            builder.orWhere('country', 'USA');
-        });
-
-        expect(queryBuilder.toObject(true).where).toEqual({
-            $or: [
-                {
-                    age: { $eq: 25 },
-                    $or: [
-                        {
-                            name: { $eq: 'John' },
-                            $or: [{ status: { $eq: 'active' } }],
-                        },
-                        { country: { $eq: 'USA' } },
-                    ],
-                },
-            ],
-        });
-    });
-
-    it('should handle empty where conditions', () => {
-        queryBuilder.where(() => {
-            // Do nothing
-        });
-
-        expect(queryBuilder.toObject(true).where).toEqual(undefined);
-    });
-
-    it('should handle single condition without nesting', () => {
-        queryBuilder.where('age', 30);
-
-        expect(queryBuilder.toObject(true).where).toEqual({
-            age: { $eq: 30 },
-        });
-    });
-
-    it('should handle multiple conditions with different operators', () => {
-        queryBuilder.where((builder) => {
-            builder.where('age', 30);
-            builder.where('salary', WhereOperatorEnum.GT, 50000);
-            builder.orWhere('status', 'employed');
-        });
-
-        expect(queryBuilder.toObject(true).where).toEqual({
-            age: { $eq: 30 },
-            salary: { $gt: 50000 },
-            $or: [{ status: { $eq: 'employed' } }],
-        });
-    });
-
-    it('should handle nested orWhere with multiple conditions', () => {
-        queryBuilder.orWhere((builder) => {
-            builder.where('age', 30);
-            builder.orWhere((innerBuilder) => {
-                innerBuilder.where('name', 'Alice');
-                innerBuilder.orWhere('city', 'New York');
-            });
-        });
-
-        expect(queryBuilder.toObject(true).where).toEqual({
-            $or: [
-                {
-                    age: { $eq: 30 },
-                    $or: [
-                        {
-                            name: { $eq: 'Alice' },
-                            $or: [{ city: { $eq: 'New York' } }],
-                        },
-                    ],
-                },
-            ],
-        });
-    });
-
-    it('should handle complex conditions with mixed operators', () => {
-        queryBuilder.where((builder) => {
-            builder.where('age', { $gte: 18 });
-            builder.orWhere((innerBuilder) => {
-                innerBuilder.where('name', 'Bob');
-                innerBuilder.where('status', { $ne: 'inactive' });
-            });
-            builder.where('country', { $in: ['USA', 'Canada'] });
-        });
-
-        expect(queryBuilder.toObject(true).where).toEqual({
-            age: { $gte: 18 },
-            $or: [
-                {
-                    name: { $eq: 'Bob' },
-                    status: { $ne: 'inactive' },
-                },
-            ],
-            country: { $in: ['USA', 'Canada'] },
-        });
-    });
-});

package/src/test/query-builder.spec.ts

@@ -1,140 +0,0 @@
-import { QueryBuilder } from '../lib/query-builder';
-import { OrderDirectionEnum } from '../lib/types';
-
-
-describe('QueryBuilder', () => {
-    let queryBuilder: QueryBuilder;
-
-    beforeEach(() => {
-        queryBuilder = new QueryBuilder({});
-    });
-
-    it('should set options', () => {
-        const options = { select: ['name', 'age'] };
-        queryBuilder.setOptions(options);
-        expect(queryBuilder.toObject(true).select).toEqual(options.select);
-    });
-
-    it('should merge options shallowly', () => {
-        queryBuilder.setOptions({ select: ['name'] });
-        queryBuilder.mergeOptions({ select: ['age'] });
-        expect(queryBuilder.toObject(true).select).toEqual(['age']);
-    });
-
-    it('should merge options deeply', () => {
-        queryBuilder.setOptions({ where: { age: { $gt: 18 } } });
-        queryBuilder.mergeOptions({ where: { name: { $eq: 'John' } } }, true);
-        expect(queryBuilder.toObject(true).where).toEqual({
-            age: { $gt: 18 },
-            name: { $eq: 'John' },
-        });
-    });
-
-    it('should add select fields', () => {
-        queryBuilder.addSelect('name');
-        queryBuilder.addSelect(['age', 'email']);
-        expect(queryBuilder.toObject(true).select).toEqual([
-            'name',
-            'age',
-            'email',
-        ]);
-    });
-
-    it('should remove select fields', () => {
-        queryBuilder.addSelect([
-            'name',
-            'age',
-            'email',
-        ]);
-        queryBuilder.removeSelect('age');
-        expect(queryBuilder.toObject(true).select).toEqual(['name', 'email']);
-    });
-
-    it('should add and remove relations as array of objects', () => {
-        queryBuilder.addRelation('profile', ['id', 'bio']);
-        queryBuilder.addRelation('posts', ['title', 'content']);
-
-        const relations = queryBuilder.toObject(true).relations;
-        expect(relations).toEqual(
-            expect.objectContaining({
-                profile: { select: ['id', 'bio'] },
-                posts: { select: ['title', 'content'] },
-            }),
-        );
-
-        queryBuilder.removeRelation('profile');
-        const updatedRelations = queryBuilder.toObject(true).relations;
-        expect(updatedRelations).toEqual(
-            expect.objectContaining({
-                posts: { select: ['title', 'content'] },
-            }),
-        );
-        expect(updatedRelations).not.toEqual(
-            expect.objectContaining({ profile: true }),
-        );
-    });
-
-    it('should handle null or empty relations', () => {
-        queryBuilder.addRelation('profile');
-        expect(queryBuilder.toObject(true).relations).not.toEqual(undefined);
-
-        queryBuilder.addRelation('profile');
-        queryBuilder.removeRelation('profile');
-        expect(queryBuilder.toObject(true).relations).toEqual(undefined);
-    });
-
-    it('should add and remove relations as array of strings', () => {
-        queryBuilder.addRelation('profile');
-        queryBuilder.addRelation('posts');
-
-        const relations = queryBuilder.toObject(true).relations;
-        expect(relations).toEqual(
-            expect.objectContaining({ profile: true, posts: true }),
-        );
-
-        queryBuilder.removeRelation('profile');
-        const updatedRelations = queryBuilder.toObject(true).relations;
-        expect(updatedRelations).toEqual(
-            expect.objectContaining({ posts: true }),
-        );
-        expect(updatedRelations).not.toEqual(
-            expect.objectContaining({ profile: true }),
-        );
-    });
-
-    it('should add where conditions', () => {
-        queryBuilder.where('age', 25);
-        expect(queryBuilder.toObject(true).where).toEqual({ age: { $eq: 25 } });
-    });
-
-    it('should handle empty where conditions', () => {
-        queryBuilder.where(() => {
-            // Do nothing
-        });
-        expect(queryBuilder.toObject(true).where).toEqual(undefined);
-    });
-
-    it('should add order', () => {
-        queryBuilder.addOrder('name', OrderDirectionEnum.ASC);
-        expect(queryBuilder.toObject(true).order).toEqual({ name: OrderDirectionEnum.ASC });
-    });
-
-    it('should remove order', () => {
-        queryBuilder.addOrder('name', OrderDirectionEnum.ASC);
-        queryBuilder.removeOrder('name');
-        expect(queryBuilder.toObject(true).order).toEqual(undefined);
-    });
-
-    it('should set skip and take', () => {
-        queryBuilder.setSkip(10);
-        queryBuilder.setTake(5);
-        expect(queryBuilder.toObject(true).skip).toBe(10);
-        expect(queryBuilder.toObject(true).take).toBe(5);
-    });
-
-    it('should convert to JSON', () => {
-        queryBuilder.setOptions({ select: ['name'] });
-        const json = queryBuilder.toJson();
-        expect(json).toBe(JSON.stringify(queryBuilder.toObject(true)));
-    });
-});

package/src/test/relation-builder.spec.ts

@@ -1,32 +0,0 @@
-import { RelationBuilder } from '../lib/relation-builder';
-
-
-describe('RelationBuilder', () => {
-    let relationBuilder: RelationBuilder;
-
-    beforeEach(() => {
-        relationBuilder = new RelationBuilder();
-    });
-
-    it('should handle empty relations', () => {
-        // Initially, the relations should be empty
-        expect(relationBuilder.toObject()).toEqual({});
-
-        // Clear any relations if set
-        relationBuilder.clear();
-        expect(relationBuilder.toObject()).toEqual({});
-    });
-
-    it('should handle setting empty relations', () => {
-        // Set empty relations
-        relationBuilder.setRelations([]);
-        expect(relationBuilder.toObject()).toEqual({});
-    });
-
-    it('should handle clearing relations', () => {
-        // Add some relations and then clear them
-        relationBuilder.setRelations(['relation1', 'relation2']);
-        relationBuilder.clear();
-        expect(relationBuilder.toObject()).toEqual({});
-    });
-});