@aws-amplify/amplify-util-uibuilder 1.6.8 → 1.6.9-mxp.0

package/lib/utils/prePushHandler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"prePushHandler.d.ts","sourceRoot":"","sources":["../../src/utils/prePushHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAU9C,eAAO,MAAM,cAAc,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAuBtE,CAAC"}
+{"version":3,"file":"prePushHandler.d.ts","sourceRoot":"","sources":["../../src/utils/prePushHandler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAc9C,eAAO,MAAM,cAAc,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAmBtE,CAAC"}

package/lib/utils/prePushHandler.js

@@ -9,10 +9,7 @@ const prePushHandler = async (context) => {
         return;
     }
     const studioClient = await clients_1.AmplifyStudioClient.setClientInfo(context);
-    const [formSchemas, localSchema] = await Promise.all([
-        studioClient.listForms(),
-        context.amplify.invokePluginMethod(context, 'codegen', undefined, 'getModelIntrospection', [context]),
-    ]);
+    const [formSchemas, localSchema] = await Promise.all([studioClient.listForms(), context.amplify.invokePluginMethod(context, 'codegen', undefined, 'getModelIntrospection', [context])]);
     if (!localSchema) {
         amplify_prompts_1.printer.debug('Local schema not found');
         return;
@@ -23,7 +20,7 @@ exports.prePushHandler = prePushHandler;
 const printDetachedFormsWarning = (formSchemas, localSchema) => {
     const modelNames = new Set(Object.keys(localSchema.models));
     const detachedCustomForms = [];
-    formSchemas.entities.forEach(form => {
+    formSchemas.entities.forEach((form) => {
         if ((0, utils_1.isFormDetachedFromModel)(form, modelNames) && (0, utils_1.isFormSchemaCustomized)(form)) {
             detachedCustomForms.push(form.name);
         }

package/lib/utils/prePushHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"prePushHandler.js","sourceRoot":"","sources":["../../src/utils/prePushHandler.ts"],"names":[],"mappings":";;;AAEA,qDAA0C;AAE1C,wCAAiD;AACjD,6CAA4G;AAKrG,MAAM,cAAc,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;IACzE,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC,EAAE;QAC5C,OAAO;KACR;IACD,MAAM,YAAY,GAAG,MAAM,6BAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACtE,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAE9B;QACpB,YAAY,CAAC,SAAS,EAAE;QACxB,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAChC,OAAO,EACP,SAAS,EACT,SAAS,EACT,uBAAuB,EACvB,CAAC,OAAO,CAAC,CACV;KACF,CAAC,CAAC;IAEH,IAAI,CAAC,WAAW,EAAE;QAChB,yBAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACxC,OAAO;KACR;IACD,yBAAyB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AACtD,CAAC,CAAC;AAvBW,QAAA,cAAc,kBAuBzB;AAEF,MAAM,yBAAyB,GAAG,CAAC,WAAkD,EAAE,WAAmB,EAAQ,EAAE;IAClH,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,MAAM,mBAAmB,GAAa,EAAE,CAAC;IAEzC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAGlC,IAAI,IAAA,+BAAuB,EAAC,IAAI,EAAE,UAAU,CAAC,IAAI,IAAA,8BAAsB,EAAC,IAAI,CAAC,EAAE;YAC7E,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;QAClC,yBAAO,CAAC,IAAI,CAAC,qBAAqB,mBAAmB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,mFAAmF,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACnM;AACH,CAAC,CAAC"}
+{"version":3,"file":"prePushHandler.js","sourceRoot":"","sources":["../../src/utils/prePushHandler.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAE1C,wCAAiD;AACjD,6CAA4G;AAUrG,MAAM,cAAc,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;IACzE,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC,EAAE;QAC5C,OAAO;KACR;IACD,MAAM,YAAY,GAAG,MAAM,6BAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACtE,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAOlD,CAAC,YAAY,CAAC,SAAS,EAAE,EAAE,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,uBAAuB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IAErI,IAAI,CAAC,WAAW,EAAE;QAChB,yBAAO,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACxC,OAAO;KACR;IACD,yBAAyB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;AACtD,CAAC,CAAC;AAnBW,QAAA,cAAc,kBAmBzB;AAEF,MAAM,yBAAyB,GAAG,CAAC,WAAkD,EAAE,WAAmB,EAAQ,EAAE;IAClH,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,MAAM,mBAAmB,GAAa,EAAE,CAAC;IAEzC,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAGpC,IAAI,IAAA,+BAAuB,EAAC,IAAI,EAAE,UAAU,CAAC,IAAI,IAAA,8BAAsB,EAAC,IAAI,CAAC,EAAE;YAC7E,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACrC;IACH,CAAC,CAAC,CAAC;IAEH,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;QAClC,yBAAO,CAAC,IAAI,CACV,qBACE,mBAAmB,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAC1C,mFAAmF,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACpH,CAAC;KACH;AACH,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.6.8",
+  "version": "1.6.9-mxp.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -14,10 +14,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/codegen-ui": "2.7.2",
-    "@aws-amplify/codegen-ui-react": "2.7.2",
-    "amplify-cli-core": "3.6.2",
-    "amplify-prompts": "2.6.3",
+    "@aws-amplify/codegen-ui": "2.8.0",
+    "@aws-amplify/codegen-ui-react": "2.8.0",
+    "amplify-cli-core": "3.7.0-mxp.0",
+    "amplify-prompts": "2.6.4-mxp.0",
     "aws-sdk": "^2.1233.0",
     "fs-extra": "^8.1.0",
     "ora": "^4.0.3",
@@ -71,5 +71,5 @@
     "usePathForSuiteName": "true",
     "addFileAttribute": "true"
   },
-  "gitHead": "0340048db1302aa03c40e5fca87d5ccd6c675af6"
+  "gitHead": "365285713b1fbea6891ae6ce792142c9ebc7cc22"
 }

package/src/__tests__/createUiBuilderComponent.test.ts

@@ -72,10 +72,12 @@ describe('can create a ui builder component', () => {
   it('does not call renderSchemaToTemplate for index file if no schema', () => {
     generateAmplifyUiBuilderIndexFile(context, []);
     expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).not.toBeCalled();
-  })
+  });
   it('calls the renderManager for utils file w/ validation, formatter, and fetchByPath helpers if there is a form', () => {
     generateAmplifyUiBuilderUtilFile(context, { hasForms: true, hasViews: false });
-    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledWith(expect.arrayContaining(['validation', 'formatter', 'fetchByPath']));
+    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledWith(
+      expect.arrayContaining(['validation', 'formatter', 'fetchByPath']),
+    );
   });
   it('calls the renderManager for utils file w/ formatter helper if there is a view', () => {
     generateAmplifyUiBuilderUtilFile(context, { hasForms: false, hasViews: true });

package/src/__tests__/detachedFormCleanup.test.ts

@@ -1,9 +1,7 @@
 // @aws-amplify/codegen-ui is in project dependencies
 import { StudioSchema } from '@aws-amplify/codegen-ui'; // eslint-disable-line import/no-extraneous-dependencies
-import {AmplifyStudioClient} from '../clients'; // eslint-disable-line import/no-extraneous-dependencies
-import {
-  isFormDetachedFromModel, isFormSchemaCustomized, isStudioForm, deleteDetachedForms
-} from '../commands/utils';
+import { AmplifyStudioClient } from '../clients'; // eslint-disable-line import/no-extraneous-dependencies
+import { isFormDetachedFromModel, isFormSchemaCustomized, isStudioForm, deleteDetachedForms } from '../commands/utils';
 
 const amplifyStudioClientMock = AmplifyStudioClient as any;
 
@@ -38,7 +36,6 @@ const formWithFields: StudioSchema = {
 };
 
 describe('detachedFormCleanup', () => {
-
   it('isStudioForm should return true', () => {
     expect(isStudioForm(formWithNoCustomization)).toBe(true);
   });
@@ -71,7 +68,7 @@ describe('detachedFormCleanup', () => {
   it('should delete detached forms', async () => {
     const mockedDeleteForm = jest.fn().mockReturnValue(undefined);
     amplifyStudioClientMock.deleteForm = mockedDeleteForm;
-    await deleteDetachedForms([{id: '12345', name: 'BlogCreateForm'}], amplifyStudioClientMock);
+    await deleteDetachedForms([{ id: '12345', name: 'BlogCreateForm' }], amplifyStudioClientMock);
     expect(mockedDeleteForm).toBeCalledTimes(1);
     expect(mockedDeleteForm).toHaveBeenCalledWith('12345');
   });

package/src/__tests__/generateComponents.test.ts

@@ -9,7 +9,7 @@ const utilsMock = utils as any;
 
 utilsMock.shouldRenderComponents = jest.fn().mockReturnValue(true);
 utilsMock.notifyMissingPackages = jest.fn().mockReturnValue(true);
-utilsMock.getAmplifyDataSchema = jest.fn().mockReturnValue(({}));
+utilsMock.getAmplifyDataSchema = jest.fn().mockReturnValue({});
 
 jest.mock('../commands/utils/featureFlags', () => ({
   getTransformerVersion: jest.fn().mockReturnValue(2),

package/src/__tests__/getAmplifyDataSchema.test.ts

@@ -33,7 +33,8 @@ const mockedFeatureFlags = mocked(FeatureFlags);
 
 const getMockedSchema = jest.fn(
   // eslint-disable-next-line no-useless-escape, spellcheck/spell-checker
-  () => `export const schema = {\n    \"models\": {\n        \"Blog\": {\n            \"name\": \"Blog\",\n            \"fields\": {\n                \"id\": {\n                    \"name\": \"id\",\n                    \"isArray\": false,\n                    \"type\": \"ID\",\n                    \"isRequired\": true,\n                    \"attributes\": []\n                },\n                \"title\": {\n                    \"name\": \"title\",\n                    \"isArray\": false,\n                    \"type\": \"String\",\n                    \"isRequired\": false,\n                    \"attributes\": []\n                },\n                \"content\": {\n                    \"name\": \"content\",\n                    \"isArray\": false,\n                    \"type\": \"String\",\n                    \"isRequired\": false,\n                    \"attributes\": []\n                },\n                \"status\": {\n                    \"name\": \"status\",\n                    \"isArray\": false,\n                    \"type\": {\n                        \"enum\": \"Status\"\n                    },\n                    \"isRequired\": false,\n                    \"attributes\": []\n                },\n                \"createdAt\": {\n                    \"name\": \"createdAt\",\n                    \"isArray\": false,\n                    \"type\": \"AWSDateTime\",\n                    \"isRequired\": false,\n                    \"attributes\": [],\n                    \"isReadOnly\": true\n                },\n                \"updatedAt\": {\n                    \"name\": \"updatedAt\",\n                    \"isArray\": false,\n                    \"type\": \"AWSDateTime\",\n                    \"isRequired\": false,\n                    \"attributes\": [],\n                    \"isReadOnly\": true\n                }\n            },\n            \"syncable\": true,\n            \"pluralName\": \"Blogs\",\n            \"attributes\": [\n                {\n                    \"type\": \"model\",\n                    \"properties\": {}\n                },\n                {\n                    \"type\": \"auth\",\n                    \"properties\": {\n                        \"rules\": [\n                            {\n                                \"allow\": \"public\",\n                                \"operations\": [\n                                    \"create\",\n                                    \"update\",\n                                    \"delete\",\n                                    \"read\"\n                                ]\n                            }\n                        ]\n                    }\n                }\n            ]\n        }\n    },\n    \"enums\": {\n        \"Status\": {\n            \"name\": \"Status\",\n            \"values\": [\n                \"ENABLED\",\n                \"DISABLED\"\n            ]\n        }\n    },\n    \"nonModels\": {},\n    \"version\": \"demo\"\n};`,
+  () =>
+    `export const schema = {\n    \"models\": {\n        \"Blog\": {\n            \"name\": \"Blog\",\n            \"fields\": {\n                \"id\": {\n                    \"name\": \"id\",\n                    \"isArray\": false,\n                    \"type\": \"ID\",\n                    \"isRequired\": true,\n                    \"attributes\": []\n                },\n                \"title\": {\n                    \"name\": \"title\",\n                    \"isArray\": false,\n                    \"type\": \"String\",\n                    \"isRequired\": false,\n                    \"attributes\": []\n                },\n                \"content\": {\n                    \"name\": \"content\",\n                    \"isArray\": false,\n                    \"type\": \"String\",\n                    \"isRequired\": false,\n                    \"attributes\": []\n                },\n                \"status\": {\n                    \"name\": \"status\",\n                    \"isArray\": false,\n                    \"type\": {\n                        \"enum\": \"Status\"\n                    },\n                    \"isRequired\": false,\n                    \"attributes\": []\n                },\n                \"createdAt\": {\n                    \"name\": \"createdAt\",\n                    \"isArray\": false,\n                    \"type\": \"AWSDateTime\",\n                    \"isRequired\": false,\n                    \"attributes\": [],\n                    \"isReadOnly\": true\n                },\n                \"updatedAt\": {\n                    \"name\": \"updatedAt\",\n                    \"isArray\": false,\n                    \"type\": \"AWSDateTime\",\n                    \"isRequired\": false,\n                    \"attributes\": [],\n                    \"isReadOnly\": true\n                }\n            },\n            \"syncable\": true,\n            \"pluralName\": \"Blogs\",\n            \"attributes\": [\n                {\n                    \"type\": \"model\",\n                    \"properties\": {}\n                },\n                {\n                    \"type\": \"auth\",\n                    \"properties\": {\n                        \"rules\": [\n                            {\n                                \"allow\": \"public\",\n                                \"operations\": [\n                                    \"create\",\n                                    \"update\",\n                                    \"delete\",\n                                    \"read\"\n                                ]\n                            }\n                        ]\n                    }\n                }\n            ]\n        }\n    },\n    \"enums\": {\n        \"Status\": {\n            \"name\": \"Status\",\n            \"values\": [\n                \"ENABLED\",\n                \"DISABLED\"\n            ]\n        }\n    },\n    \"nonModels\": {},\n    \"version\": \"demo\"\n};`,
 );
 
 describe('should sync amplify backend models', () => {

package/src/__tests__/notifyMissingPackages.test.ts

@@ -1,6 +1,7 @@
 import * as printerDependency from 'amplify-prompts';
 import * as JSONUtilitiesDependency from 'amplify-cli-core';
 import { notifyMissingPackages } from '../commands/utils/notifyMissingPackages';
+import { $TSContext } from 'amplify-cli-core';
 jest.mock('amplify-prompts');
 jest.mock('amplify-cli-core');
 printerDependency.printer.info = jest.fn();
@@ -23,7 +24,7 @@ describe('should notify when packages are missing', () => {
         },
       },
     };
-    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
+    notifyMissingPackages(context as unknown as $TSContext);
     expect(printerDependency.printer.debug).toBeCalledTimes(1);
   });
 
@@ -39,7 +40,7 @@ describe('should notify when packages are missing', () => {
         },
       },
     };
-    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
+    notifyMissingPackages(context as unknown as $TSContext);
     expect(printerDependency.printer.debug).toBeCalledTimes(1);
   });
 
@@ -51,7 +52,7 @@ describe('should notify when packages are missing', () => {
         },
       },
     };
-    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
+    notifyMissingPackages(context as unknown as $TSContext);
     expect(printerDependency.printer.warn).toBeCalledTimes(2);
   });
 
@@ -67,7 +68,7 @@ describe('should notify when packages are missing', () => {
         },
       },
     };
-    notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
+    notifyMissingPackages(context as unknown as $TSContext);
     expect(printerDependency.printer.warn).toBeCalledTimes(1);
   });
 });

package/src/__tests__/package.json

@@ -1,3 +1,3 @@
 {
-	"version": "1.0.0"
-}
+  "version": "1.0.0"
+}

package/src/__tests__/prePushHandler.test.ts

@@ -24,7 +24,7 @@ describe('handlePrePush', () => {
   beforeEach(() => {
     context = {
       amplify: {
-        invokePluginMethod: () => ({ models: { Comment: {} } }),
+        invokePluginMethod: jest.fn().mockResolvedValue({ models: { Comment: {} } }),
       },
       input: {
         options: {
@@ -87,17 +87,17 @@ describe('handlePrePush', () => {
   });
 
   it('runs handlePrePush', async () => {
-    utilsMock.isFormDetachedFromModel = jest.fn().mockImplementation(() => true);
-    utilsMock.isFormSchemaCustomized = jest.fn().mockImplementation(() => true);
+    utilsMock.isFormDetachedFromModel = jest.fn().mockReturnValue(true);
+    utilsMock.isFormSchemaCustomized = jest.fn().mockReturnValue(true);
     const spy = jest.spyOn(printer, 'warn');
     await prePushHandler(context);
-    expect(spy).toHaveBeenCalledWith('The following forms will no longer be available because the connected data model no longer exists: BlogCreateForm, BlogUpdateForm');
+    expect(spy).toHaveBeenCalledWith(
+      'The following forms will no longer be available because the connected data model no longer exists: BlogCreateForm, BlogUpdateForm',
+    );
   });
 
   it('runs handlePrePush without schema', async () => {
-    context.amplify.invokePluginMethod = jest.fn()
-      .mockImplementation(() => ({ models: { Comment: {} } }))
-      .mockImplementation(() => (null));
+    context.amplify.invokePluginMethod = jest.fn().mockResolvedValue(null);
     const spy = jest.spyOn(printer, 'debug');
     await prePushHandler(context);
     expect(spy).toHaveBeenCalledWith('Local schema not found');

package/src/__tests__/shouldRenderComponents.test.ts

@@ -1,5 +1,5 @@
 // eslint-disable-next-line import/no-extraneous-dependencies
-import {$TSContext} from 'amplify-cli-core';
+import { $TSContext } from 'amplify-cli-core';
 import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
 import { shouldRenderComponents } from '../commands/utils/shouldRenderComponents';
 
@@ -14,14 +14,14 @@ jest.mock('amplify-cli-core', () => ({
       javascript: {
         framework: 'react',
       },
-    })
+    }),
   },
 }));
 
 jest.mock('../clients', () => ({
   AmplifyStudioClient: {
-    isAmplifyApp: jest.fn().mockReturnValue(true)
-  }
+    isAmplifyApp: jest.fn().mockReturnValue(true),
+  },
 }));
 
 describe('should render components', () => {
@@ -70,8 +70,8 @@ describe('should render components', () => {
           javascript: {
             framework: 'react',
           },
-        })
-      }
+        }),
+      },
     }));
     const shouldIt = await shouldRenderComponents(context);
     expect(shouldIt).toBe(false);
@@ -83,7 +83,7 @@ describe('should render components', () => {
         getProjectConfig: jest.fn().mockReturnValue({
           providers: [],
           frontend: 'ios',
-        })
+        }),
       },
     }));
     const shouldIt = await shouldRenderComponents(context);
@@ -99,7 +99,7 @@ describe('should render components', () => {
           javascript: {
             framework: 'vue',
           },
-        })
+        }),
       },
     }));
     const shouldIt = await shouldRenderComponents(context);

package/src/__tests__/syncAmplifyUiComponents.test.ts

@@ -90,44 +90,48 @@ describe('should sync amplify ui builder components', () => {
       })),
       exportForms: jest.fn(() => ({
         promise: jest.fn(() => ({
-          entities: [{
-            name: 'BasicFormCreate',
-            formActionType: 'create',
-            dataType: {
-              dataSourceType: 'Custom',
-              dataTypeName: 'Post',
-            },
-            fields: {
-              name: {
-                inputType: {
-                  required: true,
-                  type: 'TextField',
-                  name: 'name',
-                  defaultValue: 'John Doe',
+          entities: [
+            {
+              name: 'BasicFormCreate',
+              formActionType: 'create',
+              dataType: {
+                dataSourceType: 'Custom',
+                dataTypeName: 'Post',
+              },
+              fields: {
+                name: {
+                  inputType: {
+                    required: true,
+                    type: 'TextField',
+                    name: 'name',
+                    defaultValue: 'John Doe',
+                  },
+                  label: 'name',
                 },
-                label: 'name',
               },
+              sectionalElements: {},
+              style: {},
             },
-            sectionalElements: {},
-            style: {},
-          }],
+          ],
         })),
       })),
       exportViews: jest.fn(() => ({
         promise: jest.fn(() => ({
-          entities: [{
-            appId: '23342',
-            dataSource: { type: 'Custom' },
-            environmentName: 'staging',
-            id: 'id',
-            name: 'ProductTable',
-            // TODO: replace with export when Codegen updated
-            schemaVersion: '1.0',
-            style: {},
-            viewConfiguration: {
-              type: 'Table',
+          entities: [
+            {
+              appId: '23342',
+              dataSource: { type: 'Custom' },
+              environmentName: 'staging',
+              id: 'id',
+              name: 'ProductTable',
+              // TODO: replace with export when Codegen updated
+              schemaVersion: '1.0',
+              style: {},
+              viewConfiguration: {
+                type: 'Table',
+              },
             },
-          }],
+          ],
         })),
       })),
       getMetadata: jest.fn(() => ({
@@ -168,18 +172,15 @@ describe('should sync amplify ui builder components', () => {
     process.env.UI_BUILDER_ENDPOINT = 'https://mock-endpoint.com';
     process.env.UI_BUILDER_REGION = 'mock-region';
     const client = await AmplifyStudioClient.setClientInfo(context);
-    expect(Object.keys(client)).toEqual(expect.arrayContaining([
-      'listComponents',
-      'listThemes',
-      'listForms',
-      'getModels',
-      'loadMetadata',
-      'createComponent',
-    ]));
-    expect(client.metadata).toEqual(expect.objectContaining({
-      autoGenerateForms: true,
-      autoGenerateViews: true,
-    }));
+    expect(Object.keys(client)).toEqual(
+      expect.arrayContaining(['listComponents', 'listThemes', 'listForms', 'getModels', 'loadMetadata', 'createComponent']),
+    );
+    expect(client.metadata).toEqual(
+      expect.objectContaining({
+        autoGenerateForms: true,
+        autoGenerateViews: true,
+      }),
+    );
   });
   it('can list components', async () => {
     const client = await AmplifyStudioClient.setClientInfo(context);
@@ -217,55 +218,55 @@ describe('should sync amplify ui builder components', () => {
   it('can generate ui builder components', async () => {
     createUiBuilderComponentDependencyMock.createUiBuilderComponent = jest.fn().mockImplementation(() => ({}));
     const components = generateUiBuilderComponents(context, [{}, {}]);
-    expect(components.every(component => component.resultType === 'SUCCESS')).toBeTruthy();
+    expect(components.every((component) => component.resultType === 'SUCCESS')).toBeTruthy();
   });
   it('can handle failed generation generate ui builder components', async () => {
     createUiBuilderComponentDependencyMock.createUiBuilderComponent = jest.fn().mockImplementation(() => {
       throw new Error('ahh!');
     });
     const components = generateUiBuilderComponents(context, [{}, {}]);
-    expect(components.every(component => component.resultType === 'FAILURE')).toBeTruthy();
+    expect(components.every((component) => component.resultType === 'FAILURE')).toBeTruthy();
   });
   it('can generate ui builder themes', async () => {
     createUiBuilderComponentDependencyMock.createUiBuilderTheme = jest.fn().mockImplementation(() => ({}));
     const themes = generateUiBuilderThemes(context, [{}, {}]);
-    expect(themes.every(theme => theme.resultType === 'SUCCESS')).toBeTruthy();
+    expect(themes.every((theme) => theme.resultType === 'SUCCESS')).toBeTruthy();
   });
   it('can handle failed generation generate ui builder themes', async () => {
     createUiBuilderComponentDependencyMock.createUiBuilderTheme = jest.fn().mockImplementation(() => {
       throw new Error('ahh!');
     });
     const themes = generateUiBuilderThemes(context, [{}, {}]);
-    expect(themes.every(theme => theme.resultType === 'FAILURE')).toBeTruthy();
+    expect(themes.every((theme) => theme.resultType === 'FAILURE')).toBeTruthy();
   });
   it('can generate ui builder default theme when no themes are passed', async () => {
     createUiBuilderComponentDependencyMock.createUiBuilderTheme = jest.fn().mockImplementation(() => ({}));
     const themes = generateUiBuilderThemes(context, []);
-    expect(themes.every(theme => theme.resultType === 'SUCCESS')).toBeTruthy();
+    expect(themes.every((theme) => theme.resultType === 'SUCCESS')).toBeTruthy();
   });
   it('can handle failed generation generate ui builder default theme when no themes are passed', async () => {
     createUiBuilderComponentDependencyMock.createUiBuilderTheme = jest.fn().mockImplementation(() => {
       throw new Error('ahh!');
     });
     const themes = generateUiBuilderThemes(context, []);
-    expect(themes.every(theme => theme.resultType === 'FAILURE')).toBeTruthy();
+    expect(themes.every((theme) => theme.resultType === 'FAILURE')).toBeTruthy();
   });
   it('can generate ui builder forms', async () => {
     createUiBuilderComponentDependencyMock.createUiBuilderForm = jest.fn().mockImplementation(() => ({}));
     const forms = generateUiBuilderForms(context, [{}, {}]);
-    expect(forms.every(form => form.resultType === 'SUCCESS')).toBeTruthy();
+    expect(forms.every((form) => form.resultType === 'SUCCESS')).toBeTruthy();
   });
   it('can handle failed generation generate ui builder forms', async () => {
     createUiBuilderComponentDependencyMock.createUiBuilderForm = jest.fn().mockImplementation(() => {
       throw new Error('ahh!');
     });
     const forms = generateUiBuilderForms(context, [{}, {}]);
-    expect(forms.every(form => form.resultType === 'FAILURE')).toBeTruthy();
+    expect(forms.every((form) => form.resultType === 'FAILURE')).toBeTruthy();
   });
   it('can generate uibuilder forms from data schema if autogenerate true', async () => {
     createUiBuilderComponentDependencyMock.createUiBuilderForm = jest.fn().mockImplementation(() => ({}));
     const forms = generateUiBuilderForms(context, [], exampleSchema, true);
-    expect(forms.every(form => form.resultType === 'SUCCESS')).toBeTruthy();
+    expect(forms.every((form) => form.resultType === 'SUCCESS')).toBeTruthy();
     // create & update form for author model
     expect(forms.length).toEqual(2);
   });
@@ -277,9 +278,9 @@ describe('should sync amplify ui builder components', () => {
       (_ctx, schema, _dataSchema) => ({ name: schema.dataType.dataTypeName }),
     );
     const forms = generateUiBuilderForms(context, [], exampleSchema, true);
-    expect(forms.every(form => form.resultType === 'SUCCESS')).toBeTruthy();
+    expect(forms.every((form) => form.resultType === 'SUCCESS')).toBeTruthy();
     // only create & update form for author model
-    expect(forms.map(f => (f.schema as any).name)).toStrictEqual(['Author', 'Author']);
+    expect(forms.map((f) => (f.schema as any).name)).toStrictEqual(['Author', 'Author']);
   });
 
   it('does not generate uibuilder forms from data schema if autogenerate false', async () => {

package/src/__tests__/utils.ts

@@ -60,12 +60,11 @@ export const exampleSchema: GenericDataSchema = {
           isArray: false,
         },
       },
-      isJoinTable: true
+      isJoinTable: true,
     },
     EmptyModel: {
       primaryKeys: ['id'],
-      fields: {
-      },
+      fields: {},
     },
   },
   enums: {}, // eslint-disable-line spellcheck/spell-checker

package/src/clients/amplify-studio-client.ts

@@ -1,8 +1,6 @@
 import { $TSContext, CloudformationProviderFacade } from 'amplify-cli-core';
 import type { ServiceConfigurationOptions } from 'aws-sdk/lib/service';
-import type {
-  CreateComponentData, Component, Theme, Form,
-} from 'aws-sdk/clients/amplifyuibuilder';
+import type { CreateComponentData, Component, Theme, Form } from 'aws-sdk/clients/amplifyuibuilder';
 import { AmplifyUIBuilder, AmplifyBackend } from 'aws-sdk';
 import { printer } from 'amplify-prompts';
 import { getAppId, getEnvName } from '../commands/utils/environmentHelpers';
@@ -72,7 +70,7 @@ export default class AmplifyStudioClient {
       printer.debug(`Failed admin app check: ${err.message}`);
       return false;
     }
-  }
+  };
 
   /**
    * Used to configure the AWS Amplify clients.
@@ -234,14 +232,12 @@ export default class AmplifyStudioClient {
     const environmentName = envName || this.#envName;
     const resolvedAppId = appId || this.#appId;
     try {
-      await this.#amplifyUiBuilder
-        .deleteForm({ id: formId, environmentName, appId: resolvedAppId })
-        .promise();
+      await this.#amplifyUiBuilder.deleteForm({ id: formId, environmentName, appId: resolvedAppId }).promise();
     } catch (err) {
       printer.debug(err.toString());
       throw err;
     }
-  }
+  };
 
   getModels = async (resourceName: string, envName?: string, appId?: string): Promise<string | undefined> => {
     try {

package/src/commands/cloneComponentsFromEnv.ts

@@ -15,7 +15,9 @@ export const run = async (context: $TSContext): Promise<void> => {
   const studioClient = await AmplifyStudioClient.setClientInfo(context, sourceEnvName, appId);
 
   const [existingComponents, existingComponentsNewEnv] = await Promise.all([
-    studioClient.listComponents(sourceEnvName), studioClient.listComponents(newEnvName)]);
+    studioClient.listComponents(sourceEnvName),
+    studioClient.listComponents(newEnvName),
+  ]);
   if (existingComponents.entities.length === 0) {
     printer.debug(`${existingComponents.entities.length} components exist in source env. Skipping creation of local components.`);
     return;
@@ -42,11 +44,7 @@ export const run = async (context: $TSContext): Promise<void> => {
       modifiedAt, // eslint-disable-line @typescript-eslint/no-unused-vars
       ...componentCreateData
     } = components[i];
-    await studioClient.createComponent(
-      componentCreateData,
-      newEnvName,
-      appId,
-    );
+    await studioClient.createComponent(componentCreateData, newEnvName, appId);
   }
 
   printer.info(

package/src/commands/generateComponents.ts

@@ -37,7 +37,7 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
 
     const nothingWouldAutogenerate = !dataSchema || !studioClient.metadata.autoGenerateForms || !studioClient.isGraphQLSupported;
 
-    if (nothingWouldAutogenerate && [componentSchemas, themeSchemas, formSchemas].every(group => !group.entities.length)) {
+    if (nothingWouldAutogenerate && [componentSchemas, themeSchemas, formSchemas].every((group) => !group.entities.length)) {
       printer.debug('Skipping UI component generation since none are found.');
       return;
     }
@@ -55,13 +55,13 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
     };
 
     const successfulSchemas: StudioSchema[] = [];
-    const detachedForms: {id: string, name: string}[] = [];
+    const detachedForms: { id: string; name: string }[] = [];
     let hasSuccessfulForm = false;
     const failedResponseNames: string[] = [];
     const modelNames = dataSchema?.models ? new Set(Object.keys(dataSchema.models)) : new Set<string>();
 
     Object.entries(generatedResults).forEach(([key, results]) => {
-      results.forEach(result => {
+      results.forEach((result) => {
         if (result.resultType === 'SUCCESS') {
           successfulSchemas.push(result.schema);
           if (key === 'form') {
@@ -74,14 +74,14 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
            * no longer exists.
            */
           if (
-            isStudioForm(failedSchema)
-            && failedSchema.id
-            && dataSchema
-            && eventType === 'PostPush'
-            && isFormDetachedFromModel(failedSchema, modelNames)
+            isStudioForm(failedSchema) &&
+            failedSchema.id &&
+            dataSchema &&
+            eventType === 'PostPush' &&
+            isFormDetachedFromModel(failedSchema, modelNames)
           ) {
             // Don't need to add form to failedResponseNames if it is going to be deleted
-            detachedForms.push({id: failedSchema.id, name: failedSchema.name});
+            detachedForms.push({ id: failedSchema.id, name: failedSchema.name });
             return;
           }
           failedResponseNames.push(result.schemaName);
@@ -100,8 +100,8 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
     }
 
     const invalidComponentNames = [
-      ...componentSchemas.entities.filter(component => !component.schemaVersion).map(component => component.name),
-      ...formSchemas.entities.filter(form => !form.schemaVersion).map(form => form.name),
+      ...componentSchemas.entities.filter((component) => !component.schemaVersion).map((component) => component.name),
+      ...formSchemas.entities.filter((form) => !form.schemaVersion).map((form) => form.name),
     ];
     if (invalidComponentNames.length) {
       printer.warn(
@@ -113,7 +113,7 @@ export const run = async (context: $TSContext, eventType: 'PostPush' | 'PostPull
 
     notifyMissingPackages(context);
 
-    deleteDetachedForms(detachedForms, studioClient);
+    await deleteDetachedForms(detachedForms, studioClient);
   } catch (e) {
     printer.debug(e);
     spinner.fail('Failed to sync UI components');