@ptc-org/nestjs-query-core 6.1.0 → 6.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ptc-org/nestjs-query-core",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "Base query package",
   "author": "doug-martin <doug@dougamartin.com>",
   "homepage": "https://github.com/tripss/nestjs-query#readme",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "lodash.merge": "^4.6.2",
-    "reflect-metadata": "^0.2.1",
+    "reflect-metadata": "^0.2.2",
     "tslib": "^2.6.2"
   },
   "peerDependencies": {

package/src/assemblers/assembler.d.ts

@@ -61,6 +61,6 @@ export interface AssemblerClasses<DTO, Entity> {
  * @param DTOClass - the DTO class.
  * @param EntityClass - The entity class.
  */
-export declare function Assembler<DTO, Entity, C = DeepPartial<DTO>, CE = DeepPartial<Entity>, U = DeepPartial<DTO>, UE = DeepPartial<Entity>>(DTOClass: Class<DTO>, EntityClass: Class<Entity>): <Cls extends Class<Assembler<DTO, Entity, C, CE, U, UE>>>(cls: Cls) => void | Cls;
+export declare function Assembler<DTO, Entity, C = DeepPartial<DTO>, CE = DeepPartial<Entity>, U = DeepPartial<DTO>, UE = DeepPartial<Entity>>(DTOClass: Class<DTO>, EntityClass: Class<Entity>): <Cls extends Class<Assembler<DTO, Entity, C, CE, U, UE>>>(cls: Cls) => Cls | void;
 export declare function getAssemblers<DTO>(DTOClass: Class<DTO>): MetaValue<Map<Class<unknown>, Class<Assembler<DTO, unknown, unknown, unknown, unknown, unknown>>>>;
 export declare function getAssemblerClasses<DTO, Entity, C, CE, U, UE>(AssemblerClass: Class<Assembler<DTO, Entity, C, CE, U, UE>>): MetaValue<AssemblerClasses<DTO, Entity>>;

package/src/assemblers/assembler.deserializer.d.ts

@@ -1,4 +1,4 @@
 import { Class, MetaValue } from '../common';
 export type AssemblerDeserializer<T> = (obj: object) => T;
-export declare function AssemblerDeserializer<T>(deserializer: AssemblerDeserializer<T>): <Cls extends Class<T>>(cls: Cls) => void | Cls;
+export declare function AssemblerDeserializer<T>(deserializer: AssemblerDeserializer<T>): <Cls extends Class<T>>(cls: Cls) => Cls | void;
 export declare function getAssemblerDeserializer<DTO>(DTOClass: Class<DTO>): MetaValue<AssemblerDeserializer<DTO>>;

package/src/assemblers/assembler.serializer.d.ts

@@ -1,4 +1,4 @@
 import { Class, MetaValue } from '../common';
 export type AssemblerSerializer<T> = (instance: T) => object;
-export declare function AssemblerSerializer<T>(serializer: AssemblerSerializer<T>): <Cls extends Class<T>>(cls: Cls) => void | Cls;
+export declare function AssemblerSerializer<T>(serializer: AssemblerSerializer<T>): <Cls extends Class<T>>(cls: Cls) => Cls | void;
 export declare function getAssemblerSerializer<DTO>(DTOClass: Class<DTO>): MetaValue<AssemblerSerializer<DTO>>;

package/src/helpers/aggregate.helpers.d.ts

@@ -1,4 +1,4 @@
 import { AggregateQuery, AggregateResponse } from '../interfaces';
 import { QueryFieldMap } from './query.helpers';
-export declare const transformAggregateQuery: <From, To>(query: AggregateQuery<From>, fieldMap: QueryFieldMap<From, To, keyof To>) => AggregateQuery<To>;
-export declare const transformAggregateResponse: <From, To>(response: AggregateResponse<From>, fieldMap: QueryFieldMap<From, To, keyof To>) => AggregateResponse<To>;
+export declare const transformAggregateQuery: <From, To>(query: AggregateQuery<From>, fieldMap: QueryFieldMap<From, To>) => AggregateQuery<To>;
+export declare const transformAggregateResponse: <From, To>(response: AggregateResponse<From>, fieldMap: QueryFieldMap<From, To>) => AggregateResponse<To>;

package/src/helpers/filter.helpers.d.ts

@@ -11,19 +11,13 @@ export declare const isBetweenComparisonOperators: (op: unknown) => op is Betwee
 export declare const isRangeComparisonOperators: (op: unknown) => op is RangeComparisonOperators;
 export declare const isBooleanComparisonOperators: (op: unknown) => op is BooleanComparisonOperators;
 export declare const isComparison: <DTO, K extends keyof DTO>(maybeComparison?: FilterFieldComparison<DTO[K]> | Filter<DTO[K]>) => maybeComparison is FilterFieldComparison<DTO[K]>;
-export declare const getFilterFieldComparison: <DTO, K extends keyof DTO>(obj: FilterComparisons<DTO>, field: K) => FilterFieldComparison<DTO[K]> & {
-    and?: Filter<DTO[K]>[];
-    or?: Filter<DTO[K]>[];
-} & FilterComparisons<DTO[K]>;
-export declare const transformFilter: <From, To>(filter: Filter<From>, fieldMap: QueryFieldMap<From, To, keyof To>) => Filter<To>;
+export declare const getFilterFieldComparison: <DTO, K extends keyof DTO>(obj: FilterComparisons<DTO>, field: K) => FilterFieldComparison<DTO[K]> & Filter<DTO[K]>;
+export declare const transformFilter: <From, To>(filter: Filter<From> | undefined, fieldMap: QueryFieldMap<From, To>) => Filter<To> | undefined;
 export declare const mergeFilter: <T>(base: Filter<T>, source: Filter<T>) => Filter<T>;
 export declare const mergeFilters: <T>(...filters: Filter<T>[]) => Filter<T>;
 export declare const getFilterFields: <DTO>(filter: Filter<DTO>) => string[];
 export declare const getFilterComparisons: <DTO, K extends keyof DTO>(filter: Filter<DTO>, key: K) => FilterFieldComparison<DTO[K]>[];
 export declare const transformFilterComparisons: <DTO, K extends keyof DTO>(filterComparisons: FilterFieldComparison<DTO[K]>[], key: K) => Filter<DTO>;
-export declare const getFilterOmitting: <DTO>(filter: Filter<DTO>, ...keys: (keyof DTO | keyof {
-    and?: Filter<DTO>[];
-    or?: Filter<DTO>[];
-})[]) => Filter<DTO>;
+export declare const getFilterOmitting: <DTO>(filter: Filter<DTO>, ...keys: (keyof Filter<DTO>)[]) => Filter<DTO>;
 export declare function applyFilter<DTO>(dto: DTO[], filter: Filter<DTO>): DTO[];
 export declare function applyFilter<DTO>(dto: DTO, filter: Filter<DTO>): boolean;

package/src/helpers/query.helpers.d.ts

@@ -2,8 +2,8 @@ import { Paging, Query, SortField } from '../interfaces';
 export type QueryFieldMap<From, To, T extends keyof To = keyof To> = {
     [F in keyof From]?: T;
 };
-export declare const transformSort: <From, To>(sorting: SortField<From>[], fieldMap: QueryFieldMap<From, To, keyof To>) => SortField<To>[];
-export declare const transformQuery: <From, To>(query: Query<From>, fieldMap: QueryFieldMap<From, To, keyof To>) => Query<To>;
+export declare const transformSort: <From, To>(sorting: SortField<From>[] | undefined, fieldMap: QueryFieldMap<From, To>) => SortField<To>[] | undefined;
+export declare const transformQuery: <From, To>(query: Query<From>, fieldMap: QueryFieldMap<From, To>) => Query<To>;
 export declare const mergeQuery: <T>(base: Query<T>, source: Query<T>) => Query<T>;
 export declare const applySort: <DTO>(dtos: DTO[], sortFields: SortField<DTO>[]) => DTO[];
 export declare const applyPaging: <DTO>(dtos: DTO[], paging: Paging) => DTO[];

package/src/services/query.service.d.ts

@@ -176,4 +176,4 @@ export interface QueryService<DTO, C = DeepPartial<DTO>, U = DeepPartial<DTO>> {
  * @param DTOClass - the DTO class that the QueryService is used for.
  * @param options - InjectableOptions
  */
-export declare function QueryService<DTO, C = DeepPartial<DTO>, U = DeepPartial<DTO>>(DTOClass: Class<DTO>, options?: InjectableOptions): <Cls extends Class<QueryService<DTO, C, U>>>(cls: Cls) => void | Cls;
+export declare function QueryService<DTO, C = DeepPartial<DTO>, U = DeepPartial<DTO>>(DTOClass: Class<DTO>, options?: InjectableOptions): <Cls extends Class<QueryService<DTO, C, U>>>(cls: Cls) => Cls | void;