Skip to content

CHG - Provide options for qs url params stringify #748 #749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CHG - Provide options for qs url params stringify #748 #749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
90f32bb
CHG - Provide options for qs url params stringify #748
tarekbazine Nov 12, 2021
4f9e04b
CHG - check for duplicate join relation
tarekbazine Nov 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 18 additions & 22 deletions packages/crud-request/src/request-query.builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,7 @@
import {
hasValue,
isObject,
isString,
isArrayFull,
isNil,
isUndefined,
} from '@nestjsx/util';
import { stringify } from 'qs';
import { hasValue, isArrayFull, isNil, isObject, isString, isUndefined } from '@nestjsx/util';
import { IStringifyOptions, stringify } from 'qs';

import { RequestQueryBuilderOptions, CreateQueryParams } from './interfaces';
import { CreateQueryParams, RequestQueryBuilderOptions } from './interfaces';
import {
validateCondition,
validateFields,
Expand All @@ -29,6 +22,12 @@ import {

// tslint:disable:variable-name ban-types
export class RequestQueryBuilder {
public queryObject: { [key: string]: any } = {};
public queryString: string;
private paramNames: {
[key in keyof RequestQueryBuilderOptions['paramNamesMap']]: string;
} = {};

constructor() {
this.setParamNames();
}
Expand All @@ -50,11 +49,10 @@ export class RequestQueryBuilder {
includeDeleted: 'include_deleted',
},
};
private paramNames: {
[key in keyof RequestQueryBuilderOptions['paramNamesMap']]: string;
} = {};
public queryObject: { [key: string]: any } = {};
public queryString: string;

get options(): RequestQueryBuilderOptions {
return RequestQueryBuilder._options;
}

static setOptions(options: RequestQueryBuilderOptions) {
RequestQueryBuilder._options = {
Expand All @@ -76,23 +74,19 @@ export class RequestQueryBuilder {
return isObject(params) ? qb.createFromParams(params) : qb;
}

get options(): RequestQueryBuilderOptions {
return RequestQueryBuilder._options;
}

setParamNames() {
Object.keys(RequestQueryBuilder._options.paramNamesMap).forEach((key) => {
const name = RequestQueryBuilder._options.paramNamesMap[key];
this.paramNames[key] = isString(name) ? (name as string) : (name[0] as string);
});
}

query(encode = true): string {
query(encode = true, options: IStringifyOptions = { arrayFormat: 'brackets' }): string {
if (this.queryObject[this.paramNames.search]) {
this.queryObject[this.paramNames.filter] = undefined;
this.queryObject[this.paramNames.or] = undefined;
}
this.queryString = stringify(this.queryObject, { encode });
this.queryString = stringify(this.queryObject, { encode, ...options });
return this.queryString;
}

Expand Down Expand Up @@ -129,7 +123,9 @@ export class RequestQueryBuilder {
...(Array.isArray(j) && !isString(j[0])
? (j as Array<QueryJoin | QueryJoinArr>).map((o) => this.addJoin(o))
: [this.addJoin(j as QueryJoin | QueryJoinArr)]),
];
].filter((item, pos) => {
return this.queryObject[param].indexOf(item) === pos;
});
}
return this;
}
Expand Down