fix(transformer): sort resolvers to avoid circular dependency

packages/amplify-e2e-tests/schemas/circular_dependency_model.graphql

@@ -0,0 +1,11 @@
+type Member @model @auth(rules: [{ allow: owner }])
+{
+  owner: String! @primaryKey
+  secondaryIndex: String @index(name: "bySecondaryIndex", queryField: "memberBySecondaryIndex")
+  washCarTasks: [WashCarTask] @hasMany(indexName: "byOwner", fields: ["owner"])
+}
+
+type WashCarTask @model @auth(rules: [{ allow: owner }]) {
+  id: ID! @primaryKey
+  owner: String! @index(name: "byOwner", queryField: "washCarTaskByOwner")
+}

packages/amplify-e2e-tests/src/__tests__/graphql-v2/circular-dependency.test.ts

@@ -0,0 +1,42 @@
+import { addApi, addApiWithoutSchema, amplifyPush, cancelAmplifyMockApi, createNewProjectDir, deleteProject, deleteProjectDir, initJSProjectWithProfile, updateApiSchema } from "amplify-category-api-e2e-core";
+import { existsSync } from "fs-extra";
+import path from 'path';
+import { addCodegen } from "../../codegen/add";
+
+describe('Circurlar dependency tests', () => {
+  let projRoot: string;
+  let projFolderName: string;
+  beforeEach(async () => {
+    projFolderName = 'circulardependency';
+    projRoot = await createNewProjectDir(projFolderName);
+  });
+
+  afterEach(async () => {
+    const metaFilePath = path.join(projRoot, 'amplify', '#current-cloud-backend', 'amplify-meta.json');
+    if (existsSync(metaFilePath)) {
+      await deleteProject(projRoot);
+    }
+    deleteProjectDir(projRoot);
+  });
+  it('should not have circular dependency error when mocking api with a specific GraphQL schema', async () => {
+    const projName = 'circulardependency';
+    await initJSProjectWithProfile(projRoot, { name: projName });
+    await addApi(projRoot, {
+      'Amazon Cognito User Pool': {},
+      transformerVersion: 2,
+    });
+    await updateApiSchema(projRoot, projName, 'circular_dependency_model.graphql');
+    await addCodegen(projRoot, {});
+    await expect(cancelAmplifyMockApi(projRoot, {})).resolves.not.toThrow();
+  });
+  it('should not have circular dependency error when pushing api with a specific GraphQL schema', async () => {
+    const projName = 'circulardependency';
+    await initJSProjectWithProfile(projRoot, { name: projName });
+    await addApi(projRoot, {
+      'Amazon Cognito User Pool': {},
+      transformerVersion: 2,
+    });
+    await updateApiSchema(projRoot, projName, 'circular_dependency_model.graphql');
+    await expect(amplifyPush(projRoot)).resolves.not.toThrow();
+  });
+})

packages/amplify-graphql-transformer-core/src/transformation/transform.ts

@@ -34,7 +34,7 @@ import * as vm from 'vm2';
 import { ResolverConfig, TransformConfig } from '../config/transformer-config';
 import { InvalidTransformerError, SchemaValidationError, UnknownDirectiveError } from '../errors';
 import { GraphQLApi } from '../graphql-api';
-import { TransformerContext } from '../transformer-context';
+import { TransformerContext, TransformerResolver } from '../transformer-context';
 import { TransformerOutput } from '../transformer-context/output';
 import { StackManager } from '../transformer-context/stack-manager';
 import { ConstructResourceMeta } from '../types/types';
@@ -493,9 +493,20 @@ export class GraphQLTransform {
   }
 
   private collectResolvers(context: TransformerContext, api: GraphQLAPIProvider): void {
-    const resolverEntries = context.resolvers.collectResolvers();
-
-    for (const [resolverName, resolver] of resolverEntries) {
+    const resolverEntries = context.resolvers.collectResolvers() as Map<string, TransformerResolver>;
+    //Sort resolvers by stack name to group each resolver before synthesis to avoid circular dependency
+    const sortedResolverEntries = new Map([...resolverEntries].sort((a,b) => {
+      const left = a[1].getStackName();
+      const right = b[1].getStackName();
+      if (left > right) {
+        return 1;
+      }
+      if (left === right) {
+        return 0
+      }
+      return -1;
+    }));
+    for (const [resolverName, resolver] of sortedResolverEntries) {
       const userSlots = this.userDefinedSlots[resolverName] || [];
 
       userSlots.forEach(slot => {

packages/amplify-graphql-transformer-core/src/transformer-context/resolver.ts

@@ -124,6 +124,7 @@ export class TransformerResolver implements TransformerResolverProvider {
   private readonly slotMap: Map<string, Slot[]> = new Map();
   private readonly slotNames: Set<string>;
   private stack?: Stack;
+  private stackName?: string;
   constructor(
     private typeName: string,
     private fieldName: string,
@@ -154,6 +155,11 @@ export class TransformerResolver implements TransformerResolverProvider {
 
   mapToStack = (stack: Stack) => {
     this.stack = stack;
+    this.stackName = stack.stackName;
+  };
+
+  getStackName = () => {
+    return this.stackName ?? '';
   };
 
   addToSlot = (