From 4d76058fe3ecd34a33ecc7f675272a17f56eb6d9 Mon Sep 17 00:00:00 2001
From: Justin Shih <jushih@amazon.com>
Date: Thu, 21 Sep 2023 17:08:33 -0700
Subject: [PATCH] fix: remove async map generic dataschema

---
 .../src/__tests__/generateComponents.test.ts  |  1 +
 .../src/commands/generateComponents.ts        |  2 +-
 .../utils/syncAmplifyUiBuilderComponents.ts   |  2 +-
 yarn.lock                                     | 23 ++++++++++---------
 4 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/packages/amplify-util-uibuilder/src/__tests__/generateComponents.test.ts b/packages/amplify-util-uibuilder/src/__tests__/generateComponents.test.ts
index 493c7a6d1a..73f61ef3b0 100644
--- a/packages/amplify-util-uibuilder/src/__tests__/generateComponents.test.ts
+++ b/packages/amplify-util-uibuilder/src/__tests__/generateComponents.test.ts
@@ -35,6 +35,7 @@ const getUiBuilderComponentsPathMocked = getUiBuilderComponentsPath as any;
 utilsMock.shouldRenderComponents = jest.fn().mockReturnValue(true);
 utilsMock.notifyMissingPackages = jest.fn().mockReturnValue(true);
 utilsMock.getAmplifyDataSchema = jest.fn().mockReturnValue({});
+utilsMock.mapGenericDataSchemaToCodegen = jest.fn().mockReturnValue({});
 utilsMock.isFormDetachedFromModel = jest.fn().mockReturnValue(false);
 utilsMock.extractUIComponents = jest.fn().mockReturnValue(undefined);
 utilsMock.waitForSucceededJob = jest
diff --git a/packages/amplify-util-uibuilder/src/commands/generateComponents.ts b/packages/amplify-util-uibuilder/src/commands/generateComponents.ts
index 5409277760..387959db63 100644
--- a/packages/amplify-util-uibuilder/src/commands/generateComponents.ts
+++ b/packages/amplify-util-uibuilder/src/commands/generateComponents.ts
@@ -35,7 +35,7 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
       studioClient.isGraphQLSupported ? getAmplifyDataSchema(context) : Promise.resolve(undefined),
     ]);
     const genericDataSchema = dataSchema ? mapGenericDataSchemaToCodegen(dataSchema) : undefined;
-    
+
     const canGenerateDataComponents = genericDataSchema && studioClient.isGraphQLSupported;
 
     const apiConfiguration: AmplifyUIBuilder.ApiConfiguration = canGenerateDataComponents
diff --git a/packages/amplify-util-uibuilder/src/commands/utils/syncAmplifyUiBuilderComponents.ts b/packages/amplify-util-uibuilder/src/commands/utils/syncAmplifyUiBuilderComponents.ts
index d34bf13d90..eeaeb408ed 100644
--- a/packages/amplify-util-uibuilder/src/commands/utils/syncAmplifyUiBuilderComponents.ts
+++ b/packages/amplify-util-uibuilder/src/commands/utils/syncAmplifyUiBuilderComponents.ts
@@ -87,7 +87,7 @@ const mapDataFieldsToCodegen = (fields: { [fieldName: string]: GenericDataField
   return codegenFields;
 };
 
-export const mapGenericDataSchemaToCodegen = async (genericDataSchema: GenericDataSchema): CodegenJobGenericDataSchema | undefined => {
+export const mapGenericDataSchemaToCodegen = (genericDataSchema: GenericDataSchema): CodegenJobGenericDataSchema => {
   const { models, nonModels, enums, dataSourceType } = genericDataSchema;
   const codegenModels: { [key: string]: CodegenGenericDataModel } = {};
   const codegenNonModels: { [key: string]: CodegenGenericDataNonModel } = {};
diff --git a/yarn.lock b/yarn.lock
index 5d33ab4296..f40315ff4a 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1043,6 +1043,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@aws-amplify/api@npm:5.4.5":
+  version: 5.4.5
+  resolution: "@aws-amplify/api@npm:5.4.5"
+  dependencies:
+    "@aws-amplify/api-graphql": 3.4.11
+    "@aws-amplify/api-rest": 3.5.5
+    tslib: ^1.8.0
+  checksum: 13f3551e5d2d29a201f5011a265fcaa24fdec4796afe835f2c0d9b8fcc76f243663d691de2273c680b2efbe4fea2fb1ecd7678ed393a605997ee97021f03d138
+  languageName: node
+  linkType: hard
+
 "@aws-amplify/appsync-modelgen-plugin@npm:2.7.2, @aws-amplify/appsync-modelgen-plugin@npm:^2.6.0":
   version: 2.7.2
   resolution: "@aws-amplify/appsync-modelgen-plugin@npm:2.7.2"
@@ -12824,7 +12835,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-fetch@npm:2.6.4":
+"@types/node-fetch@npm:2.6.4, @types/node-fetch@npm:^2.6.1":
   version: 2.6.4
   resolution: "@types/node-fetch@npm:2.6.4"
   dependencies:
@@ -12834,16 +12845,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/node-fetch@npm:^2.6.1":
-  version: 2.6.1
-  resolution: "@types/node-fetch@npm:2.6.1"
-  dependencies:
-    "@types/node": "*"
-    form-data: ^3.0.0
-  checksum: 033945215fa6b36d5597b21bbdd7d946a751dcd066f8fa71e5f5ab5698390bc2e76e38932ec6ac709def39b6371dfd61844e6804409c7ba812e24d1c820fbff8
-  languageName: node
-  linkType: hard
-
 "@types/node@npm:*, @types/node@npm:^18.16.1":
   version: 18.16.1
   resolution: "@types/node@npm:18.16.1"