@ackplus/nest-crud-request 0.1.33 → 0.1.35

package/package.json

@@ -1,10 +1,19 @@
 {
   "name": "@ackplus/nest-crud-request",
-  "version": "0.1.33",
+  "version": "0.1.35",
   "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"

package/src/lib/query-builder.d.ts

@@ -21,12 +21,12 @@ export declare class QueryBuilder {
     setWithDeleted(withDeleted: boolean): this;
     setOnlyDeleted(onlyDeleted: boolean): this;
     set(key: string, value: any): this;
-    toObject(): {
-        [x: string]: any;
-        select?: string[];
-        relations?: import("./types").RelationOptions;
-        where?: import("./types").WhereOptions;
-        order?: Record<string, OrderDirectionEnum>;
+    toObject(constrainToNestedObject?: boolean): {
+        [key: string]: any;
+        select?: string[] | string;
+        relations?: import("./types").RelationOptions | string;
+        where?: import("./types").WhereOptions | string;
+        order?: Record<string, OrderDirectionEnum> | string;
         skip?: number;
         take?: number;
         withDeleted?: boolean;

package/src/lib/query-builder.js

@@ -31,7 +31,7 @@ class QueryBuilder {
         return this;
     }
     addSelect(fields) {
-        if (!this.options.select) {
+        if (!this.options.select || typeof this.options.select === 'string') {
             this.options.select = [];
         }
         if (Array.isArray(fields)) {
@@ -43,7 +43,7 @@ class QueryBuilder {
         return this;
     }
     removeSelect(fields) {
-        if (this.options.select) {
+        if (this.options.select && Array.isArray(this.options.select)) {
             if (Array.isArray(fields)) {
                 this.options.select = this.options.select.filter(field => !fields.includes(field));
             }
@@ -106,24 +106,56 @@ class QueryBuilder {
         this.options[key] = value;
         return this;
     }
-    toObject() {
+    toObject(constrainToNestedObject = false) {
         const options = Object.assign({}, this.options);
         if (this.whereBuilder.hasConditions()) {
-            options.where = this.whereBuilder.toObject();
+            if (constrainToNestedObject) {
+                options.where = this.whereBuilder.toObject();
+            }
+            else {
+                options.where = JSON.stringify(this.whereBuilder.toObject());
+            }
         }
         else {
             delete options.where;
         }
         if (this.relationBuilder.hasRelations()) {
-            options.relations = this.relationBuilder.toObject();
+            if (constrainToNestedObject) {
+                options.relations = this.relationBuilder.toObject();
+            }
+            else {
+                options.relations = JSON.stringify(this.relationBuilder.toObject());
+            }
         }
         else {
             delete options.relations;
         }
+        if (options.order && Object.keys(options.order).length > 0) {
+            if (constrainToNestedObject) {
+                options.order = options.order;
+            }
+            else {
+                options.order = JSON.stringify(options.order);
+            }
+        }
+        else {
+            delete options.order;
+        }
+        if (options.select && options.select.length > 0) {
+            if (constrainToNestedObject) {
+                options.select = options.select;
+            }
+            else {
+                options.select = JSON.stringify(options.select);
+            }
+        }
+        else {
+            delete options.select;
+        }
         return options;
     }
     toJson() {
-        const obj = this.toObject();
+        const obj = this.toObject(true);
         return JSON.stringify(obj);
     }
 }

package/src/lib/relation-builder.d.ts

@@ -1,7 +1,7 @@
 import { RelationObject, RelationOptions } from './types';
 export declare class RelationBuilder {
     private relations;
-    constructor(relations?: RelationOptions);
+    constructor(relations?: RelationOptions | string);
     setRelations(relations: RelationOptions): this;
     clear(): this;
     add(relation: string, select?: string[], where?: Record<string, any>): this;

package/src/lib/relation-builder.js

@@ -5,7 +5,8 @@ class RelationBuilder {
     constructor(relations) {
         this.relations = {};
         if (relations) {
-            this.setRelations(relations);
+            const relationOptions = typeof relations === 'string' ? JSON.parse(relations) : relations;
+            this.setRelations(relationOptions);
         }
     }
     setRelations(relations) {

package/src/lib/types.d.ts

@@ -1,9 +1,9 @@
 export interface QueryBuilderOptions {
     [key: string]: any;
-    select?: string[];
-    relations?: RelationOptions;
-    where?: WhereOptions;
-    order?: Record<string, OrderDirectionEnum>;
+    select?: string[] | string;
+    relations?: RelationOptions | string;
+    where?: WhereOptions | string;
+    order?: Record<string, OrderDirectionEnum> | string;
     skip?: number;
     take?: number;
     withDeleted?: boolean;
@@ -30,8 +30,6 @@ export declare enum WhereOperatorEnum {
     IS_NOT_NULL = "$isNotNull",
     BETWEEN = "$between",
     NOT_BETWEEN = "$notBetween",
-    NULL = "$null",
-    NOT_NULL = "$notNull",
     IS_TRUE = "$isTrue",
     IS_FALSE = "$isFalse"
 }

package/src/lib/types.js

@@ -24,8 +24,6 @@ var WhereOperatorEnum;
     WhereOperatorEnum["IS_NOT_NULL"] = "$isNotNull";
     WhereOperatorEnum["BETWEEN"] = "$between";
     WhereOperatorEnum["NOT_BETWEEN"] = "$notBetween";
-    WhereOperatorEnum["NULL"] = "$null";
-    WhereOperatorEnum["NOT_NULL"] = "$notNull";
     WhereOperatorEnum["IS_TRUE"] = "$isTrue";
     WhereOperatorEnum["IS_FALSE"] = "$isFalse";
 })(WhereOperatorEnum || (exports.WhereOperatorEnum = WhereOperatorEnum = {}));

package/src/lib/where-builder.d.ts

@@ -2,7 +2,7 @@ import { WhereOperatorEnum } from './types';
 export type WhereBuilderCondition = [string, any] | [string, WhereOperatorEnum, any] | [Record<string, any>] | [(builder: WhereBuilder) => void];
 export declare class WhereBuilder {
     private whereObject;
-    constructor(where?: Record<string, any>);
+    constructor(where?: Record<string, any> | string);
     private isOperator;
     clear(): this;
     where(...args: WhereBuilderCondition): this;

package/src/lib/where-builder.js

@@ -5,7 +5,7 @@ const types_1 = require("./types");
 class WhereBuilder {
     constructor(where) {
         this.whereObject = {};
-        this.whereObject = where || {};
+        this.whereObject = typeof where === 'string' ? JSON.parse(where) : where || {};
     }
     isOperator(value) {
         return `${value}`.startsWith('$');

package/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.3"}
+{"version":"5.8.3"}