querier-ts 2.1.0 → 2.2.0

package/lib/query.js

@@ -18,7 +18,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _Query_rows, _Query_startAt, _Query_orderBy, _Query_limit;
+var _Query_rows, _Query_startAt, _Query_limit;
 import { QueryRowValidator } from './core/validation';
 import { integer, min, validateNumbers } from './core/validation/decorators';
 import { getObjectPropertyNames } from './utils/functions/generic/get-object-property-names';
@@ -85,19 +85,10 @@ export class Query {
          * Number of results to skip.
          */
         _Query_startAt.set(this, 0);
-        /**
-         * Columns to order the results by.
-         */
-        _Query_orderBy.set(this, []);
         /**
          * Limit of results.
          */
         _Query_limit.set(this, null);
-        /**
-         * Indicates whether conditions with `null` and `undefined` values should be
-         * skipped.
-         */
-        this.ignoreNullValues = false;
         __classPrivateFieldSet(this, _Query_rows, [...rows], "f");
     }
     /**
@@ -129,27 +120,24 @@ export class Query {
         }
         // create new query
         const query = new Query(rows);
-        // copy ordering columns that are part of the selected columns
-        if (__classPrivateFieldGet(this, _Query_orderBy, "f").length > 0) {
-            const orderBy = [];
-            for (const orderingColumn of __classPrivateFieldGet(this, _Query_orderBy, "f")) {
-                if (columns.includes(orderingColumn)) {
-                    orderBy.push(orderingColumn);
-                    continue;
-                }
-                let normalizedColumn = orderingColumn.toString();
-                if (normalizedColumn.startsWith('-')) {
-                    normalizedColumn = normalizedColumn.slice(1);
-                }
-                if (columns.includes(normalizedColumn)) {
-                    orderBy.push(orderingColumn);
-                }
-            }
-            __classPrivateFieldSet(query, _Query_orderBy, orderBy, "f");
+        this.cloneStateInto(query);
+        return query;
+    }
+    /**
+     * Maps each row to a new object and returns a new query.
+     *
+     * @param callback Function to be called for each row.
+     * @returns New query with the mapped rows.
+     */
+    map(callback) {
+        // map rows
+        const rows = [];
+        for (const row of __classPrivateFieldGet(this, _Query_rows, "f")) {
+            rows.push(callback(row));
         }
-        // copy the remaining query properties
-        __classPrivateFieldSet(query, _Query_startAt, __classPrivateFieldGet(this, _Query_startAt, "f"), "f");
-        __classPrivateFieldSet(query, _Query_limit, __classPrivateFieldGet(this, _Query_limit, "f"), "f");
+        // create new query
+        const query = new Query(rows);
+        this.cloneStateInto(query);
         return query;
     }
     /**
@@ -181,9 +169,7 @@ export class Query {
      * @returns Current query.
      */
     filterWhere(condition) {
-        this.ignoreNullValues = true;
-        this.filterRows(condition);
-        this.ignoreNullValues = false;
+        this.filterRows(condition, { ignoreNullValues: true });
         return this;
     }
     /**
@@ -211,21 +197,15 @@ export class Query {
      * @returns Current query.
      */
     orderBy(...columns) {
-        __classPrivateFieldSet(this, _Query_orderBy, columns, "f");
+        __classPrivateFieldSet(this, _Query_rows, __classPrivateFieldGet(this, _Query_rows, "f").sort(sortByProperties(...columns)), "f");
         return this;
     }
-    /**
-     * Groups the results by a specific key.
-     *
-     * @param key The key to group the results by.
-     *
-     * @returns A map with the grouped results.
-     */
-    groupBy(key) {
+    groupBy(arg) {
         const rows = this.getLimitedRows();
         const map = new Map();
+        const hasCallback = isFunction(arg);
         for (const row of rows) {
-            const index = row[key];
+            const index = hasCallback ? arg(row) : row[arg];
             if (map.has(index)) {
                 map.get(index).push(row);
             }
@@ -304,7 +284,11 @@ export class Query {
      * @returns Array with the values of all rows.
      */
     values() {
-        return this.getLimitedRows().map((row) => Object.values(row));
+        const rows = [];
+        for (const row of this.getLimitedRows()) {
+            rows.push(Object.values(row));
+        }
+        return rows;
     }
     /**
      * Defines the number of rows to skip.
@@ -334,16 +318,30 @@ export class Query {
         return this;
     }
     /**
-     * Returns the rows that should be used in the final results.
+     * Filters the rows according to the given conditions.
      *
-     * @returns Rows within the specified limit.
+     * @param condition Object or callback function.
      */
-    getLimitedRows() {
-        const rows = [...__classPrivateFieldGet(this, _Query_rows, "f")];
-        if (__classPrivateFieldGet(this, _Query_orderBy, "f").length > 0) {
-            rows.sort(sortByProperties(...__classPrivateFieldGet(this, _Query_orderBy, "f")));
+    filterRows(condition, options) {
+        const rows = __classPrivateFieldGet(this, _Query_rows, "f");
+        const result = [];
+        if (isFunction(condition)) {
+            for (let i = 0; i < rows.length; i++) {
+                const row = rows[i];
+                if (condition(row)) {
+                    result.push(row);
+                }
+            }
         }
-        return rows.slice(__classPrivateFieldGet(this, _Query_startAt, "f")).slice(0, __classPrivateFieldGet(this, _Query_limit, "f") ?? undefined);
+        else {
+            for (let i = 0; i < rows.length; i++) {
+                const row = rows[i];
+                if (QueryRowValidator.validate(row, condition, options)) {
+                    result.push(row);
+                }
+            }
+        }
+        __classPrivateFieldSet(this, _Query_rows, result, "f");
     }
     /**
      * Returns the first selected column or the first key of some row.
@@ -362,31 +360,25 @@ export class Query {
         return null;
     }
     /**
-     * Filters the rows according to the given conditions.
+     * Returns the rows that should be used in the final results.
      *
-     * @param condition Object or callback function.
+     * @returns Rows within the specified limit.
      */
-    filterRows(condition) {
-        __classPrivateFieldSet(this, _Query_rows, __classPrivateFieldGet(this, _Query_rows, "f").filter((row) => isFunction(condition)
-            ? condition(row)
-            : this.validateRow(row, condition)), "f");
+    getLimitedRows() {
+        const rows = [...__classPrivateFieldGet(this, _Query_rows, "f")];
+        return rows.slice(__classPrivateFieldGet(this, _Query_startAt, "f"), __classPrivateFieldGet(this, _Query_startAt, "f") + (__classPrivateFieldGet(this, _Query_limit, "f") ?? rows.length));
     }
     /**
-     * Validates a row based on the given conditions object.
-     *
-     * @param row Row to validate.
-     * @param condition Conditions object.
+     * Copies the state of the current query into the given query.
      *
-     * @returns {boolean} Validation result.
+     * @param query Query to copy the state into.
      */
-    validateRow(row, condition) {
-        return QueryRowValidator.validate(row, {
-            conditionsObject: condition,
-            ignoreNullValues: this.ignoreNullValues,
-        });
+    cloneStateInto(query) {
+        __classPrivateFieldSet(query, _Query_startAt, __classPrivateFieldGet(this, _Query_startAt, "f"), "f");
+        __classPrivateFieldSet(query, _Query_limit, __classPrivateFieldGet(this, _Query_limit, "f"), "f");
     }
 }
-_Query_rows = new WeakMap(), _Query_startAt = new WeakMap(), _Query_orderBy = new WeakMap(), _Query_limit = new WeakMap();
+_Query_rows = new WeakMap(), _Query_startAt = new WeakMap(), _Query_limit = new WeakMap();
 __decorate([
     validateNumbers,
     __param(0, integer),

package/lib/query.js.map

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

package/lib/utils/functions/type-guards/is-function.d.ts

@@ -4,6 +4,7 @@
  * @param value The value to check.
  *
  * @returns Validation result.
+ *
  */
-export declare const isFunction: <T>(value: unknown) => value is T;
+export declare const isFunction: (value: unknown) => value is (...args: any[]) => unknown;
 //# sourceMappingURL=is-function.d.ts.map

package/lib/utils/functions/type-guards/is-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"is-function.d.ts","sourceRoot":"","sources":["../../../../src/utils/functions/type-guards/is-function.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,eAAO,MAAM,UAAU,GAAI,CAAC,EAAE,OAAO,OAAO,KAAG,KAAK,IAAI,CAC3B,CAAC"}
+{"version":3,"file":"is-function.d.ts","sourceRoot":"","sources":["../../../../src/utils/functions/type-guards/is-function.ts"],"names":[],"mappings":"AAEA;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU,GACrB,OAAO,OAAO,KACb,KAAK,IAAI,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAsC,CAAC"}

package/lib/utils/functions/type-guards/is-function.js

@@ -1,9 +1,11 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /**
  * Determines if the given value is a function.
  *
  * @param value The value to check.
  *
  * @returns Validation result.
+ *
  */
 export const isFunction = (value) => typeof value === 'function';
 //# sourceMappingURL=is-function.js.map

package/lib/utils/functions/type-guards/is-function.js.map

@@ -1 +1 @@
-{"version":3,"file":"is-function.js","sourceRoot":"","sources":["../../../../src/utils/functions/type-guards/is-function.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAI,KAAc,EAAc,EAAE,CAC1D,OAAO,KAAK,KAAK,UAAU,CAAC"}
+{"version":3,"file":"is-function.js","sourceRoot":"","sources":["../../../../src/utils/functions/type-guards/is-function.ts"],"names":[],"mappings":"AAAA,uDAAuD;AAEvD;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,KAAc,EACwB,EAAE,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC"}

package/package.json

@@ -1,12 +1,25 @@
 {
   "name": "querier-ts",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "description": "Query tool for analysing arrays of objects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
     "lib/**/*"
   ],
+  "scripts": {
+    "test": "vitest",
+    "test:cov": "vitest --coverage",
+    "build": "tsc --project tsconfig.build.json",
+    "type-check": "tsc --noEmit",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "lint": "eslint \"src/**/*.ts\" --fix",
+    "prepare": "husky",
+    "prepublishOnly": "pnpm test && pnpm lint",
+    "preversion": "pnpm lint",
+    "version": "pnpm format && git add -A src",
+    "postversion": "git push && git push --tags"
+  },
   "lint-staged": {
     "src/**/*.ts": [
       "prettier --write",
@@ -49,16 +62,5 @@
     "typescript": "~5.9.3",
     "typescript-eslint": "^8.57.1",
     "vitest": "^4.1.2"
-  },
-  "scripts": {
-    "test": "vitest",
-    "test:cov": "vitest --coverage",
-    "build": "tsc",
-    "type-check": "tsc --noEmit",
-    "format": "prettier --write \"src/**/*.ts\"",
-    "lint": "eslint \"src/**/*.ts\" --fix",
-    "preversion": "pnpm lint",
-    "version": "pnpm format && git add -A src",
-    "postversion": "git push && git push --tags"
   }
-}
+}

package/lib/__tests__/query.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/__tests__/query.spec.js

@@ -1,165 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const errors_1 = require("../core/errors");
-const query_1 = require("../query");
-class User {
-    constructor(id, name, permissions, isActive, createdAt, updatedAt) {
-        this.id = id;
-        this.name = name;
-        this.permissions = permissions;
-        this.isActive = isActive;
-        this.createdAt = createdAt;
-        this.updatedAt = updatedAt;
-    }
-    isAdmin() {
-        return this.id === 1;
-    }
-}
-const users = [
-    new User(1, 'John', { useCookies: true, sendNotifications: true }, true, new Date('2023-01-01'), new Date('2023-01-10')),
-    new User(2, 'Mary', { useCookies: false, sendNotifications: true }, false, new Date('2023-02-01'), new Date('2023-02-10')),
-    new User(3, 'Bob', { useCookies: true, sendNotifications: false }, true, new Date('2023-03-01'), new Date('2023-03-10')),
-];
-describe('Query', () => {
-    describe('creation', () => {
-        it('should create a query from array', () => {
-            const query = query_1.Query.from(users);
-            expect(query.all().length).toBe(3);
-        });
-    });
-    describe('where()', () => {
-        it('should filter using object conditions', () => {
-            const result = query_1.Query.from(users).where({ isActive: true }).all();
-            expect(result).toHaveLength(2);
-            expect(result.every((u) => u.isActive)).toBe(true);
-        });
-        it('should filter using function condition', () => {
-            const result = query_1.Query.from(users)
-                .where((user) => user.isAdmin())
-                .all();
-            expect(result).toHaveLength(1);
-            expect(result[0].id).toBe(1);
-        });
-        it('should combine multiple where calls', () => {
-            const result = query_1.Query.from(users)
-                .where({ isActive: true })
-                .where((user) => user.permissions.useCookies)
-                .all();
-            expect(result).toHaveLength(2);
-        });
-    });
-    describe('nested where()', () => {
-        it('should filter using inner object conditions', () => {
-            const result = query_1.Query.from(users)
-                .where({
-                permissions: {
-                    sendNotifications: true,
-                },
-            })
-                .all();
-            expect(result).toHaveLength(2);
-        });
-    });
-    describe('filterWhere()', () => {
-        it('should ignore null and undefined conditions', () => {
-            const isActive = undefined;
-            const result = query_1.Query.from(users)
-                .filterWhere({
-                isActive,
-                id: 1,
-            })
-                .all();
-            expect(result).toHaveLength(1);
-            expect(result[0].id).toBe(1);
-        });
-    });
-    describe('select()', () => {
-        it('should select a single column', () => {
-            const result = query_1.Query.from(users).select('name').column();
-            expect(result).toEqual(['John', 'Mary', 'Bob']);
-        });
-        it('should select multiple columns', () => {
-            const result = query_1.Query.from(users).select(['id', 'name']).values();
-            expect(result).toEqual([
-                [1, 'John'],
-                [2, 'Mary'],
-                [3, 'Bob'],
-            ]);
-        });
-    });
-    describe('ordering', () => {
-        it('should order by ascending property', () => {
-            const result = query_1.Query.from(users).select('name').orderBy('name').column();
-            expect(result).toEqual(['Bob', 'John', 'Mary']);
-        });
-        it('should order by descending property', () => {
-            const result = query_1.Query.from(users).select('id').orderBy('-id').column();
-            expect(result).toEqual([3, 2, 1]);
-        });
-        it('should order by multiple properties', () => {
-            const result = query_1.Query.from(users)
-                .orderBy('isActive', '-id')
-                .select('id')
-                .column();
-            expect(result).toEqual([2, 3, 1]);
-        });
-        it('should override order defined previously', () => {
-            const result = query_1.Query.from(users)
-                .orderBy('id')
-                .orderBy('-id')
-                .select('id')
-                .column();
-            expect(result).toEqual([3, 2, 1]);
-        });
-        it('should clear order defined previously', () => {
-            const result = query_1.Query.from(users)
-                .orderBy('-id')
-                .orderBy()
-                .select('id')
-                .column();
-            expect(result).toEqual([1, 2, 3]);
-        });
-    });
-    describe('pagination', () => {
-        it('should skip rows', () => {
-            const result = query_1.Query.from(users).select('id').skip(1).column();
-            expect(result).toEqual([2, 3]);
-        });
-        it('should limit rows', () => {
-            const result = query_1.Query.from(users).select('id').limit(2).column();
-            expect(result).toEqual([1, 2]);
-        });
-        it('should combine skip and limit', () => {
-            const result = query_1.Query.from(users).select('id').skip(1).limit(1).column();
-            expect(result).toEqual([2]);
-        });
-        it('should throw if skip is negative', () => {
-            expect(() => query_1.Query.from(users).skip(-1)).toThrow(errors_1.InvalidArgumentError);
-        });
-        it('should throw if limit is not an integer', () => {
-            expect(() => query_1.Query.from(users).limit(1.5)).toThrow(errors_1.InvalidArgumentError);
-        });
-    });
-    describe('result helpers', () => {
-        it('count()', () => {
-            expect(query_1.Query.from(users).count()).toBe(3);
-        });
-        it('exists()', () => {
-            expect(query_1.Query.from(users).where({ id: 99 }).exists()).toBe(false);
-        });
-        it('first()', () => {
-            expect(query_1.Query.from(users).first()?.id).toBe(1);
-        });
-        it('last()', () => {
-            expect(query_1.Query.from(users).last()?.id).toBe(3);
-        });
-        it('scalar()', () => {
-            const id = query_1.Query.from(users).select('id').scalar();
-            expect(id).toBe(1);
-        });
-        it('scalar() should return false if no results', () => {
-            const result = query_1.Query.from(users).where({ id: 99 }).scalar();
-            expect(result).toBe(false);
-        });
-    });
-});

package/lib/core/errors/__tests__/invalid-argument-error.spec.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/core/errors/__tests__/invalid-argument-error.spec.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const invalid_argument_error_1 = require("../invalid-argument-error");
-describe('InvalidArgumentError', () => {
-    it('should be an instance of Error', () => {
-        const error = new invalid_argument_error_1.InvalidArgumentError({
-            method: 'testMethod',
-            param: 'value',
-            argument: 123,
-            expected: 'a string',
-        });
-        expect(error).toBeInstanceOf(Error);
-    });
-    it('should have the correct name', () => {
-        const error = new invalid_argument_error_1.InvalidArgumentError({
-            method: 'testMethod',
-            param: 'value',
-            argument: 123,
-            expected: 'a string',
-        });
-        expect(error.name).toBe('InvalidArgumentError');
-    });
-    it('should generate the correct error message', () => {
-        const error = new invalid_argument_error_1.InvalidArgumentError({
-            method: 'doSomething',
-            param: 0,
-            argument: false,
-            expected: 'a boolean',
-        });
-        expect(error.message).toBe('false is not a valid argument to param 0 on doSomething(). It should be a boolean.');
-    });
-    it('should expose configuration properties', () => {
-        const config = {
-            method: 'save',
-            param: 'id',
-            argument: null,
-            expected: 'a non-null value',
-        };
-        const error = new invalid_argument_error_1.InvalidArgumentError(config);
-        expect(error.method).toBe(config.method);
-        expect(error.param).toBe(config.param);
-        expect(error.argument).toBe(config.argument);
-        expect(error.expected).toBe(config.expected);
-    });
-    it('should preserve prototype chain', () => {
-        const error = new invalid_argument_error_1.InvalidArgumentError({
-            method: 'run',
-            param: 'options',
-            argument: {},
-            expected: 'a valid options object',
-        });
-        expect(error instanceof invalid_argument_error_1.InvalidArgumentError).toBe(true);
-    });
-});

package/lib/core/validation/__tests__/query-row-validator.spec.d.ts

@@ -1 +0,0 @@
-export {};