fix: enum input type in filter input when list is disabled (#2446)

packages/amplify-graphql-index-transformer/src/__tests__/amplify-graphql-index-transformer.test.ts

@@ -8,7 +8,7 @@ import {
   validateModelSchema,
 } from '@aws-amplify/graphql-transformer-core';
 import { Template as AssertionTemplate } from 'aws-cdk-lib/assertions';
-import { DocumentNode, parse } from 'graphql';
+import { DocumentNode, InputObjectTypeDefinitionNode, parse } from 'graphql';
 import {
   AmplifyApiGraphQlResourceStackTemplate,
   mockSqlDataSourceStrategy,
@@ -621,6 +621,53 @@ test('sort direction and filter input are generated if default list query does n
   expect(todoInputType).toBeDefined();
 });
 
+test('enum input types within the filter input are generated if default list query does not exist', () => {
+  const inputSchema = `
+    type Todo @model(queries: { get: "getTodo", list: null }) {
+      id: ID!
+      description: String
+      createdAt: AWSDateTime @index(name: "byCreatedAt", queryField: "byCreatedAt")
+      status: Status!
+      statusList: [Status!]
+    }
+    enum Status {
+      progress
+      completed
+      rejected
+    }
+  `;
+  const out = testTransform({
+    schema: inputSchema,
+    transformers: [new ModelTransformer(), new IndexTransformer()],
+  });
+  const schema = parse(out.schema);
+
+  validateModelSchema(schema);
+
+  const todoInputType = schema.definitions.find(
+    (d: any) => d.kind === 'InputObjectTypeDefinition' && d.name.value === 'ModelTodoFilterInput',
+  );
+  expect(todoInputType).toBeDefined();
+  const enumInputType = schema.definitions.find(
+    (d: any) => d.kind === 'InputObjectTypeDefinition' && d.name.value === 'ModelStatusInput',
+  ) as InputObjectTypeDefinitionNode;
+  expect(enumInputType).toBeDefined();
+  const enumInputTypeFields = enumInputType.fields;
+  expect(enumInputTypeFields).toBeDefined();
+  expect(enumInputTypeFields?.length).toBe(2);
+  const enumInputTypeFieldNames = enumInputTypeFields?.map((f) => f.name.value);
+  expect(enumInputTypeFieldNames).toEqual(['eq', 'ne']);
+  const enumInputListType = schema.definitions.find(
+    (d: any) => d.kind === 'InputObjectTypeDefinition' && d.name.value === 'ModelStatusListInput',
+  ) as InputObjectTypeDefinitionNode;
+  expect(enumInputListType).toBeDefined();
+  const enumInputListTypeFields = enumInputListType.fields;
+  expect(enumInputListTypeFields).toBeDefined();
+  expect(enumInputListTypeFields?.length).toBe(4);
+  const enumInputListTypeFieldNames = enumInputListTypeFields?.map((f) => f.name.value);
+  expect(enumInputListTypeFieldNames).toEqual(['eq', 'ne', 'contains', 'notContains']);
+});
+
 test('@index adds an LSI with secondaryKeyAsGSI FF set to false', () => {
   const inputSchema = `
     type Test @model {

packages/amplify-graphql-index-transformer/src/schema.ts

@@ -1,4 +1,4 @@
-import { makeModelSortDirectionEnumObject } from '@aws-amplify/graphql-model-transformer';
+import { createEnumModelFilters, makeModelSortDirectionEnumObject } from '@aws-amplify/graphql-model-transformer';
 import { TransformerContextProvider } from '@aws-amplify/graphql-transformer-interfaces';
 import {
   EnumTypeDefinitionNode,
@@ -373,12 +373,21 @@ export function ensureModelSortDirectionEnum(ctx: TransformerContextProvider): v
 }
 
 function generateFilterInputs(config: IndexDirectiveConfiguration, ctx: TransformerContextProvider): void {
+  /**
+   * Create ModelFilterInput objects for enum fields within the filter input
+   * This function is also executed when generating the list query object in model transformer
+   * When the list query is disabled in model type, this code takes effect to ensure the enum filter types in the generated schema
+   */
+  const filterInputs = createEnumModelFilters(ctx, config.object);
   // Create the ModelXFilterInput
   const tableXQueryFilterInput = makeModelXFilterInputObject(config, ctx);
-
-  if (!ctx.output.hasType(tableXQueryFilterInput.name.value)) {
-    ctx.output.addInput(tableXQueryFilterInput);
-  }
+  filterInputs.push(tableXQueryFilterInput);
+  filterInputs.forEach((input) => {
+    const conditionInputName = input.name.value;
+    if (!ctx.output.hasType(conditionInputName)) {
+      ctx.output.addInput(input);
+    }
+  });
 }
 
 function makeModelXFilterInputObject(config: IndexDirectiveConfiguration, ctx: TransformerContextProvider): InputObjectTypeDefinitionNode {