querier-ts 1.0.0 → 1.0.1

package/lib/__tests__/query.spec.js

@@ -103,6 +103,22 @@ describe('Query', () => {
                 .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', () => {

package/lib/query.js

@@ -19,7 +19,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_columns, _Query_startAt, _Query_limit;
+var _Query_rows, _Query_columns, _Query_startAt, _Query_limit, _Query_sortFunction;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Query = void 0;
 const validation_1 = require("./core/validation");
@@ -95,6 +95,10 @@ class Query {
          * Limit of results.
          */
         _Query_limit.set(this, void 0);
+        /**
+         * Function to order the results.
+         */
+        _Query_sortFunction.set(this, void 0);
         /**
          * Indicates whether conditions with `null` and `undefined` values should be
          * skipped.
@@ -166,7 +170,12 @@ class Query {
      * @returns Current query.
      */
     orderBy(...columns) {
-        __classPrivateFieldGet(this, _Query_rows, "f").sort((0, sort_1.sortByProperties)(...columns));
+        if (columns.length > 0) {
+            __classPrivateFieldSet(this, _Query_sortFunction, (0, sort_1.sortByProperties)(...columns), "f");
+        }
+        else {
+            __classPrivateFieldSet(this, _Query_sortFunction, undefined, "f");
+        }
         return this;
     }
     /**
@@ -279,7 +288,11 @@ class Query {
      * @returns Rows within the specified limit.
      */
     getLimitedRows() {
-        return __classPrivateFieldGet(this, _Query_rows, "f").slice(__classPrivateFieldGet(this, _Query_startAt, "f")).slice(0, __classPrivateFieldGet(this, _Query_limit, "f"));
+        const rows = [...__classPrivateFieldGet(this, _Query_rows, "f")];
+        if (__classPrivateFieldGet(this, _Query_sortFunction, "f")) {
+            rows.sort(__classPrivateFieldGet(this, _Query_sortFunction, "f"));
+        }
+        return rows.slice(__classPrivateFieldGet(this, _Query_startAt, "f")).slice(0, __classPrivateFieldGet(this, _Query_limit, "f"));
     }
     /**
      * Returns the first selected column or the first key of some row.
@@ -319,7 +332,7 @@ class Query {
     }
 }
 exports.Query = Query;
-_Query_rows = new WeakMap(), _Query_columns = new WeakMap(), _Query_startAt = new WeakMap(), _Query_limit = new WeakMap();
+_Query_rows = new WeakMap(), _Query_columns = new WeakMap(), _Query_startAt = new WeakMap(), _Query_limit = new WeakMap(), _Query_sortFunction = new WeakMap();
 __decorate([
     decorators_1.validateNumbers,
     __param(0, decorators_1.integer),

package/lib/utils/functions/sort/sort-by-properties.d.ts

@@ -1,2 +1,2 @@
-import { addPrefixToObject, PropertyOnly, PropOf } from '../../types';
-export declare function sortByProperties<T extends object>(...props: (PropOf<T> | keyof addPrefixToObject<PropertyOnly<T>, '-'>)[]): (a: T, b: T) => number;
+import { addPrefixToObject, PropertyOnly, PropOf, SortFunction } from '../../types';
+export declare function sortByProperties<T extends object>(...props: (PropOf<T> | keyof addPrefixToObject<PropertyOnly<T>, '-'>)[]): SortFunction<T>;

package/lib/utils/functions/sort/sort-by-property.d.ts

@@ -1,2 +1,2 @@
-import { addPrefixToObject, PropertyOnly, PropOf } from '../../types';
-export declare function sortByProperty<T extends object>(property: PropOf<T> | keyof addPrefixToObject<PropertyOnly<T>, '-'>): (a: T, b: T) => number;
+import { addPrefixToObject, PropertyOnly, PropOf, SortFunction } from '../../types';
+export declare function sortByProperty<T extends object>(property: PropOf<T> | keyof addPrefixToObject<PropertyOnly<T>, '-'>): SortFunction<T>;

package/lib/utils/types/index.d.ts

@@ -7,3 +7,4 @@ export * from './partial-of-properties';
 export * from './prop-of';
 export * from './property-only';
 export * from './recursive-partial';
+export * from './sort-function';

package/lib/utils/types/index.js

@@ -23,3 +23,4 @@ __exportStar(require("./partial-of-properties"), exports);
 __exportStar(require("./prop-of"), exports);
 __exportStar(require("./property-only"), exports);
 __exportStar(require("./recursive-partial"), exports);
+__exportStar(require("./sort-function"), exports);

package/lib/utils/types/sort-function.d.ts

@@ -0,0 +1 @@
+export type SortFunction<T> = (a: T, b: T) => number;

package/lib/utils/types/sort-function.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querier-ts",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Query tool for analysing arrays of objects",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -40,7 +40,7 @@
     "typescript": "~5.9.3"
   },
   "scripts": {
-    "test": "jest --config jestconfig.json",
+    "test": "jest --config jest.config.ts",
     "build": "tsc",
     "format": "prettier --write \"src/**/*.ts\"",
     "lint": "tslint -p tsconfig.json",