@ptc-org/nestjs-query-core 0.30.2 → 0.33.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -27,10 +27,10 @@ const transformQuery = (query, fieldMap) => ({
|
|
|
27
27
|
});
|
|
28
28
|
exports.transformQuery = transformQuery;
|
|
29
29
|
const mergeQuery = (base, source) => {
|
|
30
|
-
const { filter: baseFilter = {} } = base;
|
|
31
|
-
const { filter: sourceFilter = {} } = source;
|
|
30
|
+
const { filter: baseFilter = {}, ...restBase } = base;
|
|
31
|
+
const { filter: sourceFilter = {}, ...restSource } = source;
|
|
32
32
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
33
|
-
return (0, lodash_merge_1.default)(
|
|
33
|
+
return (0, lodash_merge_1.default)(restBase, restSource, { filter: (0, filter_helpers_1.mergeFilter)(baseFilter, sourceFilter) });
|
|
34
34
|
};
|
|
35
35
|
exports.mergeQuery = mergeQuery;
|
|
36
36
|
const applySort = (dtos, sortFields) => sort_builder_1.SortBuilder.build(sortFields)(dtos);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.helpers.js","sourceRoot":"","sources":["../../../../../packages/core/src/helpers/query.helpers.ts"],"names":[],"mappings":";;;;AAAA,6EAAiC;AACjC,8CAAmF;AACnF,iDAA6C;AAC7C,iDAA6C;AAC7C,qDAA6E;AAMtE,MAAM,aAAa,GAAG,CAC3B,OAAsC,EACtC,QAAiC,EACJ,EAAE;IAC/B,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,SAAS,CAAC;KAClB;IACD,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE;QACxB,MAAM,KAAK,GAAG,QAAQ,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;QACjC,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,qCAAqC,EAAE,CAAC,KAAe,+BAA+B,CAAC,CAAC;SACzG;QACD,OAAO,EAAE,GAAG,EAAE,EAAE,KAAK,EAAmB,CAAC;IAC3C,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAdW,QAAA,aAAa,iBAcxB;AAEK,MAAM,cAAc,GAAG,CAAW,KAAkB,EAAE,QAAiC,EAAa,EAAE,CAAC,CAAC;IAC7G,MAAM,EAAE,IAAA,gCAAe,EAAC,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC;IAC/C,MAAM,EAAE,KAAK,CAAC,MAAM;IACpB,OAAO,EAAE,IAAA,qBAAa,EAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,CAAC;CAChD,CAAC,CAAC;AAJU,QAAA,cAAc,kBAIxB;AAEI,MAAM,UAAU,GAAG,CAAI,IAAc,EAAE,MAAgB,EAAY,EAAE;IAC1E,MAAM,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"query.helpers.js","sourceRoot":"","sources":["../../../../../packages/core/src/helpers/query.helpers.ts"],"names":[],"mappings":"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"}
|