Skip to content

Commit

Permalink
rename filter input property
Browse files Browse the repository at this point in the history
  • Loading branch information
chriskalmar committed Jun 7, 2022
1 parent 2a4b8cb commit 6a430b3
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
14 changes: 7 additions & 7 deletions src/engine/filter.ts
Expand Up @@ -17,7 +17,7 @@ export type PreFilter = {
context: Context,
input: { [key: string]: unknown },
) => number[] | Promise<number[]>;
attributes?: ObjectDataType | DataTypeFunction;
input?: ObjectDataType | DataTypeFunction;
};

export type PreFilterMap = {
Expand Down Expand Up @@ -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;
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/graphqlProtocol/filter.ts
Expand Up @@ -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,
Expand All @@ -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: {
Expand All @@ -192,7 +192,7 @@ export const generateFilterInput = (entity, graphRegistry) => {

preFilterAttributesType = generatedType.getAttributes();
} else {
preFilterAttributesType = preFilter.attributes;
preFilterAttributesType = preFilter.input;
}

const preFilterInputType = generateDataInput(
Expand Down

0 comments on commit 6a430b3

Please sign in to comment.