From 6a430b37e21ab1edd3f2ed4b13d0bab89a39e43c Mon Sep 17 00:00:00 2001 From: Chris Kalmar Date: Tue, 7 Jun 2022 09:09:50 +0200 Subject: [PATCH] rename filter input property --- src/engine/filter.ts | 14 +++++++------- src/graphqlProtocol/filter.ts | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/engine/filter.ts b/src/engine/filter.ts index dbb5878b..0a72df94 100644 --- a/src/engine/filter.ts +++ b/src/engine/filter.ts @@ -17,7 +17,7 @@ export type PreFilter = { context: Context, input: { [key: string]: unknown }, ) => number[] | Promise; - attributes?: ObjectDataType | DataTypeFunction; + input?: ObjectDataType | DataTypeFunction; }; export type PreFilterMap = { @@ -176,23 +176,23 @@ const isPreFilter = (preFilterDefinition: PreFilter) => { if (isMap(preFilterDefinition)) { if (isFunction(preFilterDefinition.resolve)) { if ( - !preFilterDefinition.attributes || - isObjectDataType(preFilterDefinition.attributes) + !preFilterDefinition.input || + isObjectDataType(preFilterDefinition.input) ) { return true; } - if (isFunction(preFilterDefinition.attributes)) { - const dataTypeBuilder = preFilterDefinition.attributes; + if (isFunction(preFilterDefinition.input)) { + const dataTypeBuilder = preFilterDefinition.input; - const attributesType = dataTypeBuilder({ + const inputType = dataTypeBuilder({ setup: { name: 'temporary', description: 'temporary', }, }); - if (isObjectDataType(attributesType)) { + if (isObjectDataType(inputType)) { return true; } } diff --git a/src/graphqlProtocol/filter.ts b/src/graphqlProtocol/filter.ts index c429a538..8ec95ba6 100644 --- a/src/graphqlProtocol/filter.ts +++ b/src/graphqlProtocol/filter.ts @@ -170,7 +170,7 @@ export const generateFilterInput = (entity, graphRegistry) => { Object.keys(preFilters).map((preFilterName) => { const preFilter = preFilters[preFilterName]; - if (preFilter.attributes) { + if (preFilter.input) { const preFilterParamsInputTypeName = protocolConfiguration.generateFilterPreFilterParamsInputTypeName( entity, @@ -179,9 +179,9 @@ export const generateFilterInput = (entity, graphRegistry) => { let preFilterAttributesType: AttributesMap; - if (isFunction(preFilter.attributes)) { + if (isFunction(preFilter.input)) { const preFilterAttributesTypeFn = - preFilter.attributes as DataTypeFunction; + preFilter.input as DataTypeFunction; const generatedType = preFilterAttributesTypeFn({ setup: { @@ -192,7 +192,7 @@ export const generateFilterInput = (entity, graphRegistry) => { preFilterAttributesType = generatedType.getAttributes(); } else { - preFilterAttributesType = preFilter.attributes; + preFilterAttributesType = preFilter.input; } const preFilterInputType = generateDataInput(