@ptc-org/nestjs-query-core 4.1.0 → 4.3.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.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/src/helpers/filter.helpers.d.ts +2 -0
  3. package/src/helpers/filter.helpers.js +20 -1
  4. package/src/helpers/filter.helpers.js.map +1 -1
  5. package/src/index.d.ts +1 -1
  6. package/src/index.js +3 -1
  7. package/src/index.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ptc-org/nestjs-query-core",
3
- "version": "4.1.0",
3
+ "version": "4.3.0",
4
4
  "description": "Base query package",
5
5
  "author": "doug-martin <doug@dougamartin.com>",
6
6
  "homepage": "https://github.com/tripss/nestjs-query#readme",
package/src/helpers/filter.helpers.d.ts CHANGED
@@ -17,8 +17,10 @@ export declare const getFilterFieldComparison: <DTO, K extends keyof DTO>(obj: F
17
17
  } & FilterComparisons<DTO[K]>;
18
18
  export declare const transformFilter: <From, To>(filter: Filter<From>, fieldMap: QueryFieldMap<From, To, keyof To>) => Filter<To>;
19
19
  export declare const mergeFilter: <T>(base: Filter<T>, source: Filter<T>) => Filter<T>;
20
+ export declare const mergeFilters: <T>(...filters: Filter<T>[]) => Filter<T>;
20
21
  export declare const getFilterFields: <DTO>(filter: Filter<DTO>) => string[];
21
22
  export declare const getFilterComparisons: <DTO, K extends keyof DTO>(filter: Filter<DTO>, key: K) => FilterFieldComparison<DTO[K]>[];
23
+ export declare const transformFilterComparisons: <DTO, K extends keyof DTO>(filterComparisons: FilterFieldComparison<DTO[K]>[], key: K) => Filter<DTO>;
22
24
  export declare const getFilterOmitting: <DTO>(filter: Filter<DTO>, ...keys: (keyof DTO | keyof {
23
25
  and?: Filter<DTO>[];
24
26
  or?: Filter<DTO>[];
package/src/helpers/filter.helpers.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.applyFilter = exports.getFilterOmitting = exports.getFilterComparisons = exports.getFilterFields = exports.mergeFilter = exports.transformFilter = exports.getFilterFieldComparison = exports.isComparison = exports.isBooleanComparisonOperators = exports.isRangeComparisonOperators = exports.isBetweenComparisonOperators = exports.isInComparisonOperators = exports.isLikeComparisonOperator = void 0;
3
+ exports.applyFilter = exports.getFilterOmitting = exports.transformFilterComparisons = exports.getFilterComparisons = exports.getFilterFields = exports.mergeFilters = exports.mergeFilter = exports.transformFilter = exports.getFilterFieldComparison = exports.isComparison = exports.isBooleanComparisonOperators = exports.isRangeComparisonOperators = exports.isBetweenComparisonOperators = exports.isInComparisonOperators = exports.isLikeComparisonOperator = void 0;
4
4
  const filter_builder_1 = require("./filter.builder");
5
5
  const isLikeComparisonOperator = (op) => op === 'like' || op === 'notLike' || op === 'iLike' || op === 'notILike';
6
6
  exports.isLikeComparisonOperator = isLikeComparisonOperator;
@@ -54,6 +54,16 @@ const mergeFilter = (base, source) => {
54
54
  return { and: [source, base] };
55
55
  };
56
56
  exports.mergeFilter = mergeFilter;
57
+ const mergeFilters = (...filters) => {
58
+ const newFilter = { and: [] };
59
+ for (const filter of filters) {
60
+ if (Object.keys(filter).length) {
61
+ newFilter.and.push(filter);
62
+ }
63
+ }
64
+ return newFilter;
65
+ };
66
+ exports.mergeFilters = mergeFilters;
57
67
  const getFilterFields = (filter) => {
58
68
  const fieldSet = Object.keys(filter).reduce((fields, filterField) => {
59
69
  if (filterField === 'and' || filterField === 'or') {
@@ -83,6 +93,15 @@ const getFilterComparisons = (filter, key) => {
83
93
  return [...results];
84
94
  };
85
95
  exports.getFilterComparisons = getFilterComparisons;
96
+ const transformFilterComparisons = (filterComparisons, key) => {
97
+ return {
98
+ [key]: filterComparisons.reduce((flatFilter, filter) => ({
99
+ ...flatFilter,
100
+ ...filter
101
+ }), {})
102
+ };
103
+ };
104
+ exports.transformFilterComparisons = transformFilterComparisons;
86
105
  /*
87
106
  getFilterComparisons only returns the first layer, this one will return everything, it only returns the same
88
107
  item multiple times, that needs to be fixed first
package/src/helpers/filter.helpers.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"filter.helpers.js","sourceRoot":"","sources":["../../../../../packages/core/src/helpers/filter.helpers.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"filter.helpers.js","sourceRoot":"","sources":["../../../../../packages/core/src/helpers/filter.helpers.ts"],"names":[],"mappings":"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"}
package/src/index.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  export { AbstractAssembler, Assembler, AssemblerDeserializer, AssemblerFactory, AssemblerSerializer, ClassTransformerAssembler, DefaultAssembler } from './assemblers';
2
2
  export * from './common';
3
3
  export { getQueryServiceToken, InjectAssemblerQueryService, InjectQueryService } from './decorators';
4
- export { applyFilter, applyPaging, applyQuery, applySort, getFilterComparisons, getFilterFields, getFilterOmitting, invertSort, mergeFilter, mergeQuery, QueryFieldMap, transformAggregateQuery, transformAggregateResponse, transformFilter, transformQuery, transformSort } from './helpers';
4
+ export { applyFilter, applyPaging, applyQuery, applySort, getFilterComparisons, getFilterFields, getFilterOmitting, invertSort, mergeFilter, mergeFilters, mergeQuery, QueryFieldMap, transformAggregateQuery, transformAggregateResponse, transformFilter, transformFilterComparisons, transformQuery, transformSort } from './helpers';
5
5
  export * from './interfaces';
6
6
  export { NestjsQueryCoreModule, NestjsQueryCoreModuleOpts } from './module';
7
7
  export { AssemblerQueryService, NoOpQueryService, ProxyQueryService, QueryService, QueryServiceRelation, RelationQueryService } from './services';
package/src/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.RelationQueryService = exports.QueryService = exports.ProxyQueryService = exports.NoOpQueryService = exports.AssemblerQueryService = exports.NestjsQueryCoreModule = exports.transformSort = exports.transformQuery = exports.transformFilter = exports.transformAggregateResponse = exports.transformAggregateQuery = exports.mergeQuery = exports.mergeFilter = exports.invertSort = exports.getFilterOmitting = exports.getFilterFields = exports.getFilterComparisons = exports.applySort = exports.applyQuery = exports.applyPaging = exports.applyFilter = exports.InjectQueryService = exports.InjectAssemblerQueryService = exports.getQueryServiceToken = exports.DefaultAssembler = exports.ClassTransformerAssembler = exports.AssemblerSerializer = exports.AssemblerFactory = exports.AssemblerDeserializer = exports.Assembler = exports.AbstractAssembler = void 0;
3
+ exports.RelationQueryService = exports.QueryService = exports.ProxyQueryService = exports.NoOpQueryService = exports.AssemblerQueryService = exports.NestjsQueryCoreModule = exports.transformSort = exports.transformQuery = exports.transformFilterComparisons = exports.transformFilter = exports.transformAggregateResponse = exports.transformAggregateQuery = exports.mergeQuery = exports.mergeFilters = exports.mergeFilter = exports.invertSort = exports.getFilterOmitting = exports.getFilterFields = exports.getFilterComparisons = exports.applySort = exports.applyQuery = exports.applyPaging = exports.applyFilter = exports.InjectQueryService = exports.InjectAssemblerQueryService = exports.getQueryServiceToken = exports.DefaultAssembler = exports.ClassTransformerAssembler = exports.AssemblerSerializer = exports.AssemblerFactory = exports.AssemblerDeserializer = exports.Assembler = exports.AbstractAssembler = void 0;
4
4
  const tslib_1 = require("tslib");
5
5
  /* eslint-disable import/export */
6
6
  var assemblers_1 = require("./assemblers");
@@ -26,10 +26,12 @@ Object.defineProperty(exports, "getFilterFields", { enumerable: true, get: funct
26
26
  Object.defineProperty(exports, "getFilterOmitting", { enumerable: true, get: function () { return helpers_1.getFilterOmitting; } });
27
27
  Object.defineProperty(exports, "invertSort", { enumerable: true, get: function () { return helpers_1.invertSort; } });
28
28
  Object.defineProperty(exports, "mergeFilter", { enumerable: true, get: function () { return helpers_1.mergeFilter; } });
29
+ Object.defineProperty(exports, "mergeFilters", { enumerable: true, get: function () { return helpers_1.mergeFilters; } });
29
30
  Object.defineProperty(exports, "mergeQuery", { enumerable: true, get: function () { return helpers_1.mergeQuery; } });
30
31
  Object.defineProperty(exports, "transformAggregateQuery", { enumerable: true, get: function () { return helpers_1.transformAggregateQuery; } });
31
32
  Object.defineProperty(exports, "transformAggregateResponse", { enumerable: true, get: function () { return helpers_1.transformAggregateResponse; } });
32
33
  Object.defineProperty(exports, "transformFilter", { enumerable: true, get: function () { return helpers_1.transformFilter; } });
34
+ Object.defineProperty(exports, "transformFilterComparisons", { enumerable: true, get: function () { return helpers_1.transformFilterComparisons; } });
33
35
  Object.defineProperty(exports, "transformQuery", { enumerable: true, get: function () { return helpers_1.transformQuery; } });
34
36
  Object.defineProperty(exports, "transformSort", { enumerable: true, get: function () { return helpers_1.transformSort; } });
35
37
  tslib_1.__exportStar(require("./interfaces"), exports);
package/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/src/index.ts"],"names":[],"mappings":";;;;AAAA,kCAAkC;AAClC,2CAQqB;AAPnB,+GAAA,iBAAiB,OAAA;AACjB,uGAAA,SAAS,OAAA;AACT,mHAAA,qBAAqB,OAAA;AACrB,8GAAA,gBAAgB,OAAA;AAChB,iHAAA,mBAAmB,OAAA;AACnB,uHAAA,yBAAyB,OAAA;AACzB,8GAAA,gBAAgB,OAAA;AAElB,mDAAwB;AACxB,2CAAoG;AAA3F,kHAAA,oBAAoB,OAAA;AAAE,yHAAA,2BAA2B,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AAC9E,qCAiBkB;AAhBhB,sGAAA,WAAW,OAAA;AACX,sGAAA,WAAW,OAAA;AACX,qGAAA,UAAU,OAAA;AACV,oGAAA,SAAS,OAAA;AACT,+GAAA,oBAAoB,OAAA;AACpB,0GAAA,eAAe,OAAA;AACf,4GAAA,iBAAiB,OAAA;AACjB,qGAAA,UAAU,OAAA;AACV,sGAAA,WAAW,OAAA;AACX,qGAAA,UAAU,OAAA;AAEV,kHAAA,uBAAuB,OAAA;AACvB,qHAAA,0BAA0B,OAAA;AAC1B,0GAAA,eAAe,OAAA;AACf,yGAAA,cAAc,OAAA;AACd,wGAAA,aAAa,OAAA;AAEf,uDAA4B;AAC5B,mCAA2E;AAAlE,+GAAA,qBAAqB,OAAA;AAC9B,uCAOmB;AANjB,iHAAA,qBAAqB,OAAA;AACrB,4GAAA,gBAAgB,OAAA;AAChB,6GAAA,iBAAiB,OAAA;AACjB,wGAAA,YAAY,OAAA;AAEZ,gHAAA,oBAAoB,OAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/src/index.ts"],"names":[],"mappings":";;;;AAAA,kCAAkC;AAClC,2CAQqB;AAPnB,+GAAA,iBAAiB,OAAA;AACjB,uGAAA,SAAS,OAAA;AACT,mHAAA,qBAAqB,OAAA;AACrB,8GAAA,gBAAgB,OAAA;AAChB,iHAAA,mBAAmB,OAAA;AACnB,uHAAA,yBAAyB,OAAA;AACzB,8GAAA,gBAAgB,OAAA;AAElB,mDAAwB;AACxB,2CAAoG;AAA3F,kHAAA,oBAAoB,OAAA;AAAE,yHAAA,2BAA2B,OAAA;AAAE,gHAAA,kBAAkB,OAAA;AAC9E,qCAmBkB;AAlBhB,sGAAA,WAAW,OAAA;AACX,sGAAA,WAAW,OAAA;AACX,qGAAA,UAAU,OAAA;AACV,oGAAA,SAAS,OAAA;AACT,+GAAA,oBAAoB,OAAA;AACpB,0GAAA,eAAe,OAAA;AACf,4GAAA,iBAAiB,OAAA;AACjB,qGAAA,UAAU,OAAA;AACV,sGAAA,WAAW,OAAA;AACX,uGAAA,YAAY,OAAA;AACZ,qGAAA,UAAU,OAAA;AAEV,kHAAA,uBAAuB,OAAA;AACvB,qHAAA,0BAA0B,OAAA;AAC1B,0GAAA,eAAe,OAAA;AACf,qHAAA,0BAA0B,OAAA;AAC1B,yGAAA,cAAc,OAAA;AACd,wGAAA,aAAa,OAAA;AAEf,uDAA4B;AAC5B,mCAA2E;AAAlE,+GAAA,qBAAqB,OAAA;AAC9B,uCAOmB;AANjB,iHAAA,qBAAqB,OAAA;AACrB,4GAAA,gBAAgB,OAAA;AAChB,6GAAA,iBAAiB,OAAA;AACjB,wGAAA,YAAY,OAAA;AAEZ,gHAAA,oBAAoB,OAAA"}