@aws-amplify/amplify-util-uibuilder 1.5.0 → 1.6.0-cdkv2.0

package/lib/commands/utils/getUiBuilderComponentsPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"getUiBuilderComponentsPath.js","sourceRoot":"","sources":["../../../src/commands/utils/getUiBuilderComponentsPath.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,wDAA0B;AAC1B,+CAA4C;AAGrC,MAAM,0BAA0B,GAAG,CAAC,OAAmB,EAAE,EAAE;IAChE,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC;IACrG,MAAM,uBAAuB,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAEtF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE;QAC3C,kBAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;KACxC;IAED,OAAO,uBAAuB,CAAC;AACjC,CAAC,CAAC;AAVW,QAAA,0BAA0B,8BAUrC"}
+{"version":3,"file":"getUiBuilderComponentsPath.js","sourceRoot":"","sources":["../../../src/commands/utils/getUiBuilderComponentsPath.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,wDAA0B;AAE1B,+CAA4C;AAMrC,MAAM,0BAA0B,GAAG,CAAC,OAAmB,EAAU,EAAE;IACxE,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC;IACrG,MAAM,uBAAuB,GAAG,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,CAAC;IAEtF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE;QAE3C,kBAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,CAAC;KACxC;IAED,OAAO,uBAAuB,CAAC;AACjC,CAAC,CAAC;AAXW,QAAA,0BAA0B,8BAWrC"}

package/lib/commands/utils/shouldRenderComponents.d.ts

@@ -1,3 +1,3 @@
 import { $TSContext } from 'amplify-cli-core';
-export declare function shouldRenderComponents(context: $TSContext): Promise<boolean>;
+export declare const shouldRenderComponents: (context: $TSContext) => Promise<boolean>;
 //# sourceMappingURL=shouldRenderComponents.d.ts.map

package/lib/commands/utils/shouldRenderComponents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shouldRenderComponents.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/shouldRenderComponents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,UAAU,oBA+B/D"}
+{"version":3,"file":"shouldRenderComponents.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/shouldRenderComponents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQ9C,eAAO,MAAM,sBAAsB,YAAmB,UAAU,KAAG,QAAQ,OAAO,CAoCjF,CAAC"}

package/lib/commands/utils/shouldRenderComponents.js

@@ -2,33 +2,39 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.shouldRenderComponents = void 0;
 const amplify_prompts_1 = require("amplify-prompts");
-async function shouldRenderComponents(context) {
+const clients_1 = require("../../clients");
+const environmentHelpers_1 = require("./environmentHelpers");
+const shouldRenderComponents = async (context) => {
     var _a, _b, _c;
     if (process.env.FORCE_RENDER) {
         amplify_prompts_1.printer.debug('Forcing component render since environment variable flag is set.');
         return true;
     }
     if ((_b = (_a = context === null || context === void 0 ? void 0 : context.input) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b['no-codegen']) {
-        amplify_prompts_1.printer.debug('Not pulling components because --no-codegen flag is set');
+        amplify_prompts_1.printer.debug('Not pulling components because --no-codegen flag is set.');
         return false;
     }
     if (!((_c = context === null || context === void 0 ? void 0 : context.exeInfo) === null || _c === void 0 ? void 0 : _c.projectConfig)) {
-        amplify_prompts_1.printer.debug('Not pulling components because there is no projectConfig set for this project');
+        amplify_prompts_1.printer.debug('Not pulling components because there is no projectConfig set for this project.');
         return false;
     }
     if (!context.exeInfo.projectConfig.providers.includes('awscloudformation')) {
-        amplify_prompts_1.printer.debug('Not pulling components because there is no "awscloudformation" provider');
+        amplify_prompts_1.printer.debug('Not pulling components because there is no "awscloudformation" provider.');
         return false;
     }
     if (context.exeInfo.projectConfig.frontend !== 'javascript') {
-        amplify_prompts_1.printer.debug('Not pulling components because this project is not configured as a javascript frontend');
+        amplify_prompts_1.printer.debug('Not pulling components because this project is not configured as a javascript frontend.');
         return false;
     }
-    if (context.exeInfo.projectConfig['javascript'].framework !== 'react') {
-        amplify_prompts_1.printer.debug('Not pulling components because this project is not configured with the "react" framework');
+    if (context.exeInfo.projectConfig.javascript.framework !== 'react') {
+        amplify_prompts_1.printer.debug('Not pulling components because this project is not configured with the "react" framework.');
+        return false;
+    }
+    if (!(await clients_1.AmplifyStudioClient.isAmplifyApp(context, (0, environmentHelpers_1.getAppId)(context)))) {
+        amplify_prompts_1.printer.debug('Not pulling components because this project is not Amplify Studio enabled.');
         return false;
     }
     return true;
-}
+};
 exports.shouldRenderComponents = shouldRenderComponents;
 //# sourceMappingURL=shouldRenderComponents.js.map

package/lib/commands/utils/shouldRenderComponents.js.map

@@ -1 +1 @@
-{"version":3,"file":"shouldRenderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/shouldRenderComponents.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AACnC,KAAK,UAAU,sBAAsB,CAAC,OAAmB;;IAC9D,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;QAC5B,yBAAO,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;KACb;IACD,IAAI,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,OAAO,0CAAG,YAAY,CAAC,EAAE;QAC3C,yBAAO,CAAC,KAAK,CAAC,yDAAyD,CAAC,CAAC;QACzE,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,aAAa,CAAA,EAAE;QACpC,yBAAO,CAAC,KAAK,CAAC,+EAA+E,CAAC,CAAC;QAC/F,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;QAC1E,yBAAO,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAC;QACzF,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,KAAK,YAAY,EAAE;QAC3D,yBAAO,CAAC,KAAK,CAAC,wFAAwF,CAAC,CAAC;QACxG,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC,SAAS,KAAK,OAAO,EAAE;QACrE,yBAAO,CAAC,KAAK,CAAC,0FAA0F,CAAC,CAAC;QAC1G,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AA/BD,wDA+BC"}
+{"version":3,"file":"shouldRenderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/shouldRenderComponents.ts"],"names":[],"mappings":";;;AAEA,qDAA0C;AAC1C,2CAAoD;AACpD,6DAAgD;AAKzC,MAAM,sBAAsB,GAAG,KAAK,EAAE,OAAmB,EAAoB,EAAE;;IACpF,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;QAC5B,yBAAO,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;KACb;IACD,IAAI,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,OAAO,0CAAG,YAAY,CAAC,EAAE;QAC3C,yBAAO,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;QAC1E,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,aAAa,CAAA,EAAE;QACpC,yBAAO,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;QAChG,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;QAC1E,yBAAO,CAAC,KAAK,CAAC,0EAA0E,CAAC,CAAC;QAC1F,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,KAAK,YAAY,EAAE;QAC3D,yBAAO,CAAC,KAAK,CAAC,yFAAyF,CAAC,CAAC;QACzG,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,KAAK,OAAO,EAAE;QAClE,yBAAO,CAAC,KAAK,CAAC,2FAA2F,CAAC,CAAC;QAC3G,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,CAAC,MAAM,6BAAmB,CAAC,YAAY,CAAC,OAAO,EAAE,IAAA,6BAAQ,EAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACzE,yBAAO,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAC5F,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC"}

package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts

@@ -1,25 +1,17 @@
 import { $TSContext } from 'amplify-cli-core';
-import { StudioComponent, StudioTheme, GenericDataSchema } from '@aws-amplify/codegen-ui';
-export declare const generateUiBuilderComponents: (context: $TSContext, componentSchemas: any[], dataSchema?: GenericDataSchema | undefined) => ({
-    resultType: string;
-    component: StudioComponent;
-    schemaName?: undefined;
-    error?: undefined;
+import { StudioComponent, StudioTheme, GenericDataSchema, StudioForm, StudioSchema } from '@aws-amplify/codegen-ui';
+declare type CodegenResponse<T extends StudioSchema> = {
+    resultType: 'SUCCESS';
+    schema: T;
+    schemaName?: string;
 } | {
-    resultType: string;
+    resultType: 'FAILURE';
     schemaName: string;
     error: Error;
-    component?: undefined;
-})[];
-export declare const generateUiBuilderThemes: (context: $TSContext, themeSchemas: any[]) => ({
-    resultType: string;
-    theme: StudioTheme;
-    schemaName?: undefined;
-    error?: undefined;
-} | {
-    resultType: string;
-    schemaName: string;
-    error: Error;
-    theme?: undefined;
-})[];
+    schema?: T;
+};
+export declare const generateUiBuilderComponents: (context: $TSContext, componentSchemas: any[], dataSchema?: GenericDataSchema | undefined) => CodegenResponse<StudioComponent>[];
+export declare const generateUiBuilderThemes: (context: $TSContext, themeSchemas: any[]) => CodegenResponse<StudioTheme>[];
+export declare const generateUiBuilderForms: (context: $TSContext, formSchemas: any[], dataSchema?: GenericDataSchema | undefined, autoGenerateForms?: boolean | undefined) => CodegenResponse<StudioForm>[];
+export {};
 //# sourceMappingURL=syncAmplifyUiBuilderComponents.d.ts.map

package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"syncAmplifyUiBuilderComponents.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAChD,MAAM,yBAAyB,CAAC;AAQjC,eAAO,MAAM,2BAA2B,YAAa,UAAU,oBAAoB,GAAG,EAAE,iDAAmC,CAAC;IAC1H,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,eAAe,CAAC;IAC3B,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,GAAG;IACF,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC,EAkBD,CAAC;AAMF,eAAO,MAAM,uBAAuB,YAAa,UAAU,gBAAgB,GAAG,EAAE,KAAG,CAAC;IAClF,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,WAAW,CAAC;IACnB,UAAU,CAAC,EAAE,SAAS,CAAC;IACvB,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,GAAG;IACF,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,KAAK,CAAC,EAAE,SAAS,CAAC;CACnB,CAAC,EAgBD,CAAC"}
+{"version":3,"file":"syncAmplifyUiBuilderComponents.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EACL,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAC1E,MAAM,yBAAyB,CAAC;AASjC,aAAK,eAAe,CAAC,CAAC,SAAS,YAAY,IACvC;IACE,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,CAAC,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACD;IACE,UAAU,EAAE,SAAS,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CAAC;AAON,eAAO,MAAM,2BAA2B,YAC7B,UAAU,oBACD,GAAG,EAAE,iDAEtB,gBAAgB,eAAe,CAAC,EAkBlC,CAAC;AAMF,eAAO,MAAM,uBAAuB,YAAa,UAAU,gBAAgB,GAAG,EAAE,KAAG,gBAAgB,WAAW,CAAC,EAgB9G,CAAC;AAKF,eAAO,MAAM,sBAAsB,YAExB,UAAU,eACN,GAAG,EAAE,0FAGjB,gBAAgB,UAAU,CAAC,EAiC7B,CAAC"}

package/lib/commands/utils/syncAmplifyUiBuilderComponents.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateUiBuilderThemes = exports.generateUiBuilderComponents = void 0;
+exports.generateUiBuilderForms = exports.generateUiBuilderThemes = exports.generateUiBuilderComponents = void 0;
 const amplify_prompts_1 = require("amplify-prompts");
+const codegen_ui_1 = require("@aws-amplify/codegen-ui");
 const codegenResources_1 = require("./codegenResources");
 const getUiBuilderComponentsPath_1 = require("./getUiBuilderComponentsPath");
 const generateUiBuilderComponents = (context, componentSchemas, dataSchema) => {
     const componentResults = componentSchemas.map(schema => {
         try {
             const component = (0, codegenResources_1.createUiBuilderComponent)(context, schema, dataSchema);
-            return { resultType: 'SUCCESS', component };
+            return { resultType: 'SUCCESS', schema: component };
         }
         catch (e) {
             amplify_prompts_1.printer.debug(`Failure caught processing ${schema.name}`);
@@ -24,7 +25,7 @@ const generateUiBuilderThemes = (context, themeSchemas) => {
     const themeResults = themeSchemas.map(schema => {
         try {
             const theme = (0, codegenResources_1.createUiBuilderTheme)(context, schema);
-            return { resultType: 'SUCCESS', theme };
+            return { resultType: 'SUCCESS', schema: theme };
         }
         catch (e) {
             amplify_prompts_1.printer.debug(`Failure caught processing ${schema.name}`);
@@ -36,4 +37,36 @@ const generateUiBuilderThemes = (context, themeSchemas) => {
     return themeResults;
 };
 exports.generateUiBuilderThemes = generateUiBuilderThemes;
+const generateUiBuilderForms = (context, formSchemas, dataSchema, autoGenerateForms) => {
+    const modelMap = {};
+    if ((dataSchema === null || dataSchema === void 0 ? void 0 : dataSchema.dataSourceType) === 'DataStore' && autoGenerateForms) {
+        Object.entries(dataSchema.models).forEach(([name, model]) => {
+            if ((0, codegen_ui_1.checkIsSupportedAsForm)(model) && !model.isJoinTable) {
+                modelMap[name] = new Set(['create', 'update']);
+            }
+        });
+    }
+    const codegenForm = (schema) => {
+        try {
+            const form = (0, codegenResources_1.createUiBuilderForm)(context, schema, dataSchema);
+            return { resultType: 'SUCCESS', schema: form };
+        }
+        catch (e) {
+            amplify_prompts_1.printer.debug(`Failure caught processing ${schema.name}`);
+            amplify_prompts_1.printer.debug(e);
+            return { resultType: 'FAILURE', schemaName: schema.name, error: e };
+        }
+    };
+    const formResults = formSchemas.map((schema) => {
+        var _a, _b;
+        if ((schema === null || schema === void 0 ? void 0 : schema.dataType) && ((_a = schema.dataType) === null || _a === void 0 ? void 0 : _a.dataSourceType) === 'DataStore') {
+            (_b = modelMap[schema.dataType.dataTypeName]) === null || _b === void 0 ? void 0 : _b.delete(schema.formActionType);
+        }
+        return codegenForm(schema);
+    });
+    formResults.push(...(0, codegenResources_1.generateBaseForms)(modelMap).map(codegenForm));
+    amplify_prompts_1.printer.debug(`Generated ${formResults.filter(result => result.resultType === 'SUCCESS').length} forms in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
+    return formResults;
+};
+exports.generateUiBuilderForms = generateUiBuilderForms;
 //# sourceMappingURL=syncAmplifyUiBuilderComponents.js.map

package/lib/commands/utils/syncAmplifyUiBuilderComponents.js.map

@@ -1 +1 @@
-{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAK1C,yDAAoF;AACpF,6EAA0E;AAMnE,MAAM,2BAA2B,GAAG,CAAC,OAAmB,EAAE,gBAAuB,EAAE,UAA8B,EAUnH,EAAE;IACL,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QACrD,IAAI;YACF,MAAM,SAAS,GAAG,IAAA,2CAAwB,EAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YACxE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;SAC7C;QAAC,OAAO,CAAC,EAAE;YACV,yBAAO,CAAC,KAAK,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1D,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;SACrE;IACH,CAAC,CAAC,CAAC;IAEH,yBAAO,CAAC,KAAK,CACX,aAAa,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,MAAM,kBAAkB,IAAA,uDAA0B,EAChI,OAAO,CACR,EAAE,CACJ,CAAC;IACF,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AA5BW,QAAA,2BAA2B,+BA4BtC;AAMK,MAAM,uBAAuB,GAAG,CAAC,OAAmB,EAAE,YAAmB,EAU3E,EAAE;IACL,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAI;YACF,MAAM,KAAK,GAAG,IAAA,uCAAoB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACpD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;SACzC;QAAC,OAAO,CAAC,EAAE;YACV,yBAAO,CAAC,KAAK,CAAC,6BAA6B,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC1D,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACjB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;SACrE;IACH,CAAC,CAAC,CAAC;IAEH,yBAAO,CAAC,KAAK,CACX,aAAa,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,MAAM,cAAc,IAAA,uDAA0B,EAAC,OAAO,CAAC,EAAE,CACtI,CAAC;IACF,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AA1BW,QAAA,uBAAuB,2BA0BlC"}
+{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"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"}

package/lib/commands/version.d.ts

@@ -1,2 +1,2 @@
-export declare function run(): Promise<void>;
+export declare const run: () => Promise<void>;
 //# sourceMappingURL=version.d.ts.map

package/lib/commands/version.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAGA,wBAAsB,GAAG,kBAExB"}
+{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,GAAG,QAAa,QAAQ,IAAI,CAExC,CAAC"}

package/lib/commands/version.js

@@ -25,8 +25,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const amplify_prompts_1 = require("amplify-prompts");
 const path_1 = __importDefault(require("path"));
-async function run() {
+const run = async () => {
     amplify_prompts_1.printer.info((await Promise.resolve().then(() => __importStar(require(path_1.default.join(__dirname, '..', '..', 'package.json'))))).version);
-}
+};
 exports.run = run;
 //# sourceMappingURL=version.js.map

package/lib/commands/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA0C;AAC1C,gDAAwB;AAEjB,KAAK,UAAU,GAAG;IACvB,yBAAO,CAAC,IAAI,CAAC,CAAC,wDAAa,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,GAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AACzF,CAAC;AAFD,kBAEC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/commands/version.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qDAA0C;AAC1C,gDAAwB;AAKjB,MAAM,GAAG,GAAG,KAAK,IAAmB,EAAE;IAC3C,yBAAO,CAAC,IAAI,CAAC,CAAC,wDAAa,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,GAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AACzF,CAAC,CAAC;AAFW,QAAA,GAAG,OAEd"}

package/lib/event-handlers/handle-PostEnvAdd.d.ts

@@ -1,3 +1,3 @@
 import { $TSContext } from 'amplify-cli-core';
-export declare function run(context: $TSContext): Promise<void>;
+export declare const run: (context: $TSContext) => Promise<void>;
 //# sourceMappingURL=handle-PostEnvAdd.d.ts.map

package/lib/event-handlers/handle-PostEnvAdd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-PostEnvAdd.d.ts","sourceRoot":"","sources":["../../src/event-handlers/handle-PostEnvAdd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU,iBAU5C"}
+{"version":3,"file":"handle-PostEnvAdd.d.ts","sourceRoot":"","sources":["../../src/event-handlers/handle-PostEnvAdd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQ9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAO3D,CAAC"}

package/lib/event-handlers/handle-PostEnvAdd.js

@@ -2,16 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const amplify_prompts_1 = require("amplify-prompts");
-async function run(context) {
+const cloneComponentsFromEnv_1 = require("../commands/cloneComponentsFromEnv");
+const run = async (context) => {
     try {
-        await context.amplify.invokePluginMethod(context, 'ui-builder', undefined, 'executeAmplifyCommand', [
-            context,
-            'cloneComponentsFromEnv',
-        ]);
+        await (0, cloneComponentsFromEnv_1.run)(context);
     }
     catch (e) {
         amplify_prompts_1.printer.debug(e);
     }
-}
+};
 exports.run = run;
 //# sourceMappingURL=handle-PostEnvAdd.js.map

package/lib/event-handlers/handle-PostEnvAdd.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-PostEnvAdd.js","sourceRoot":"","sources":["../../src/event-handlers/handle-PostEnvAdd.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAEnC,KAAK,UAAU,GAAG,CAAC,OAAmB;IAC3C,IAAI;QACF,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,uBAAuB,EAAE;YAClG,OAAO;YACP,wBAAwB;SACzB,CAAC,CAAC;KACJ;IAAC,OAAO,CAAC,EAAE;QAEV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC;AAVD,kBAUC"}
+{"version":3,"file":"handle-PostEnvAdd.js","sourceRoot":"","sources":["../../src/event-handlers/handle-PostEnvAdd.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAC1C,+EAAmF;AAM5E,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;IAC9D,IAAI;QACF,MAAM,IAAA,4BAAsB,EAAC,OAAO,CAAC,CAAC;KACvC;IAAC,OAAO,CAAC,EAAE;QAEV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAPW,QAAA,GAAG,OAOd"}

package/lib/event-handlers/handle-PostPull.d.ts

@@ -1,3 +1,3 @@
 import { $TSContext } from 'amplify-cli-core';
-export declare function run(context: $TSContext): Promise<void>;
+export declare const run: (context: $TSContext) => Promise<void>;
 //# sourceMappingURL=handle-PostPull.d.ts.map

package/lib/event-handlers/handle-PostPull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handle-PostPull.d.ts","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAsB,GAAG,CAAC,OAAO,EAAE,UAAU,iBAO5C"}
+{"version":3,"file":"handle-PostPull.d.ts","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPull.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAO3D,CAAC"}

package/lib/event-handlers/handle-PostPull.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.run = void 0;
 const amplify_prompts_1 = require("amplify-prompts");
-async function run(context) {
+const generateComponents_1 = require("../commands/generateComponents");
+const run = async (context) => {
     try {
-        await context.amplify.invokePluginMethod(context, 'ui-builder', undefined, 'executeAmplifyCommand', [context, 'generateComponents']);
+        await (0, generateComponents_1.run)(context);
     }
     catch (e) {
         amplify_prompts_1.printer.debug(e);
     }
-}
+};
 exports.run = run;
 //# sourceMappingURL=handle-PostPull.js.map

package/lib/event-handlers/handle-PostPull.js.map

@@ -1 +1 @@
-{"version":3,"file":"handle-PostPull.js","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPull.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAEnC,KAAK,UAAU,GAAG,CAAC,OAAmB;IAC3C,IAAI;QACF,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,uBAAuB,EAAE,CAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC,CAAC;KACtI;IAAC,OAAO,CAAC,EAAE;QAEV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC;AAPD,kBAOC"}
+{"version":3,"file":"handle-PostPull.js","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPull.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAC1C,uEAA2E;AAKpE,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;IAC9D,IAAI;QACF,MAAM,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;KACnC;IAAC,OAAO,CAAC,EAAE;QAEV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAPW,QAAA,GAAG,OAOd"}

package/lib/event-handlers/handle-PostPush.d.ts

@@ -0,0 +1,3 @@
+import { $TSContext } from 'amplify-cli-core';
+export declare const run: (context: $TSContext) => Promise<void>;
+//# sourceMappingURL=handle-PostPush.d.ts.map

package/lib/event-handlers/handle-PostPush.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handle-PostPush.d.ts","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPush.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAO3D,CAAC"}

package/lib/event-handlers/handle-PostPush.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.run = void 0;
+const amplify_prompts_1 = require("amplify-prompts");
+const generateComponents_1 = require("../commands/generateComponents");
+const run = async (context) => {
+    try {
+        await (0, generateComponents_1.run)(context);
+    }
+    catch (e) {
+        amplify_prompts_1.printer.debug(e);
+    }
+};
+exports.run = run;
+//# sourceMappingURL=handle-PostPush.js.map

package/lib/event-handlers/handle-PostPush.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"handle-PostPush.js","sourceRoot":"","sources":["../../src/event-handlers/handle-PostPush.ts"],"names":[],"mappings":";;;AACA,qDAA0C;AAC1C,uEAA2E;AAKpE,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;IAC9D,IAAI;QACF,MAAM,IAAA,wBAAkB,EAAC,OAAO,CAAC,CAAC;KACnC;IAAC,OAAO,CAAC,EAAE;QAEV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KAClB;AACH,CAAC,CAAC;AAPW,QAAA,GAAG,OAOd"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.5.0",
+  "version": "1.6.0-cdkv2.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -13,11 +13,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/codegen-ui": "^2.4.2",
-    "@aws-amplify/codegen-ui-react": "^2.4.2",
-    "amplify-cli-core": "3.2.2",
+    "@aws-amplify/codegen-ui": "2.5.2",
+    "@aws-amplify/codegen-ui-react": "2.5.2",
+    "amplify-cli-core": "4.0.0-cdkv2.0",
     "amplify-prompts": "2.6.0",
-    "aws-sdk": "^2.1113.0",
+    "aws-sdk": "^2.1233.0",
+    "fs-extra": "^8.1.0",
     "ora": "^4.0.3"
   },
   "devDependencies": {
@@ -67,5 +68,5 @@
     "usePathForSuiteName": "true",
     "addFileAttribute": "true"
   },
-  "gitHead": "c4f1e5f3b3dc4e92ccc4561610fa00beac7b3a1f"
+  "gitHead": "6a63f0c4abcdba01799057fbbab581a179143f31"
 }

package/src/__tests__/cloneComponentsFromEnv.test.ts

@@ -5,6 +5,9 @@ import { run } from '../commands/cloneComponentsFromEnv';
 const extractArgsDependencyMock = extractArgsDependency as any;
 const awsMock = aws as any;
 
+jest.mock('../commands/utils/featureFlags', () => ({
+  getTransformerVersion: jest.fn().mockReturnValue(2),
+}));
 jest.mock('../commands/utils/extractArgs');
 jest.mock('amplify-cli-core');
 
@@ -18,7 +21,7 @@ const mockedComponentExport = jest.fn((envName: string) => {
     entities: [{}],
   };
 });
-const mockedComponentCreate = jest.fn(() => ({ entity: {} }));
+const mockedComponentCreate = jest.fn().mockReturnValue({ entity: {} });
 
 describe('can clone components to new environment', () => {
   let context: any;
@@ -34,18 +37,26 @@ describe('can clone components to new environment', () => {
         },
       },
     };
-    extractArgsDependencyMock.extractArgs = jest.fn().mockImplementation(() => ({
+    extractArgsDependencyMock.extractArgs = jest.fn().mockReturnValue({
       sourceEnvName: 'sourceEnvName',
       newEnvName: 'newEnvName',
       appId: 'appId',
       environmentName: 'environmentName',
-    }));
-    awsMock.AmplifyUIBuilder = jest.fn(() => ({
+    });
+    awsMock.AmplifyUIBuilder = jest.fn().mockReturnValue({
       exportComponents: jest.fn(({ environmentName }) => ({
         promise: () => mockedComponentExport(environmentName),
       })),
-      createComponent: jest.fn(() => ({ promise: () => mockedComponentCreate() })),
-    }));
+      createComponent: jest.fn().mockReturnValue({ promise: () => mockedComponentCreate() }),
+      getMetadata: jest.fn().mockReturnValue({
+        promise: jest.fn().mockReturnValue({
+          features: {
+            autoGenerateForms: 'true',
+            autoGenerateViews: 'true',
+          },
+        }),
+      }),
+    });
   });
 
   it('clones components to a new env', async () => {

package/src/__tests__/createUiBuilderComponent.test.ts

@@ -3,11 +3,12 @@ import {
   generateAmplifyUiBuilderIndexFile,
   createUiBuilderTheme,
   createUiBuilderComponent,
+  createUiBuilderForm,
+  generateAmplifyUiBuilderUtilFile,
 } from '../commands/utils/codegenResources';
 
 jest.mock('@aws-amplify/codegen-ui');
 const codegenMock = codegen as any;
-const renderSchemaToTemplateMock = jest.fn();
 
 describe('can create a ui builder component', () => {
   let context: any;
@@ -42,9 +43,10 @@ describe('can create a ui builder component', () => {
       properties: {},
       variants: [],
     };
-    codegenMock.StudioTemplateRendererManager = jest.fn().mockImplementation(() => ({
+    const renderSchemaToTemplateMock = jest.fn();
+    codegenMock.StudioTemplateRendererManager = jest.fn().mockReturnValue({
       renderSchemaToTemplate: renderSchemaToTemplateMock,
-    }));
+    });
   });
   it('calls the renderManager', () => {
     createUiBuilderComponent(context, schema);
@@ -54,8 +56,24 @@ describe('can create a ui builder component', () => {
     createUiBuilderTheme(context, schema);
     expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
   });
+  it('calls the renderManager for forms', () => {
+    createUiBuilderForm(context, schema);
+    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
+  });
   it('calls the renderManager for index file', () => {
     generateAmplifyUiBuilderIndexFile(context, [schema]);
     expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).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']));
+  });
+  it('calls the renderManager for utils file w/ formatter helper if there is a view', () => {
+    generateAmplifyUiBuilderUtilFile(context, { hasForms: false, hasViews: true });
+    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledWith(['formatter']);
+  });
+  it('should not call the renderManager for utils file if there is neither form nor views', () => {
+    generateAmplifyUiBuilderUtilFile(context, { hasForms: false, hasViews: false });
+    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledTimes(0);
+  });
 });

package/src/__tests__/generateComponents.test.ts

@@ -7,8 +7,11 @@ jest.mock('amplify-cli-core');
 const awsMock = aws as any;
 const utilsMock = utils as any;
 
-utilsMock.shouldRenderComponents = jest.fn().mockImplementation(() => true);
-utilsMock.notifyMissingPackages = jest.fn().mockImplementation(() => true);
+utilsMock.shouldRenderComponents = jest.fn().mockReturnValue(true);
+utilsMock.notifyMissingPackages = jest.fn().mockReturnValue(true);
+jest.mock('../commands/utils/featureFlags', () => ({
+  getTransformerVersion: jest.fn().mockImplementation(() => 2),
+}));
 
 describe('can generate components', () => {
   let context: any;
@@ -36,27 +39,52 @@ describe('can generate components', () => {
         },
       ],
     };
-    mockedExport = jest.fn(() => ({
+    mockedExport = jest.fn().mockReturnValue({
       entities: schemas.entities,
-    }));
-    awsMock.AmplifyUIBuilder = jest.fn(() => ({
-      exportComponents: jest.fn(() => ({
+    });
+    awsMock.AmplifyUIBuilder = jest.fn().mockReturnValue({
+      exportComponents: jest.fn().mockReturnValue({
         promise: () => mockedExport(),
-      })),
-      exportThemes: jest.fn(() => ({
+      }),
+      exportThemes: jest.fn().mockReturnValue({
         promise: () => mockedExport(),
-      })),
-    }));
-    utilsMock.generateUiBuilderComponents = jest.fn().mockImplementation(() => schemas.entities);
-    utilsMock.generateUiBuilderThemes = jest.fn().mockImplementation(() => schemas.entities);
-    utilsMock.getAmplifyDataSchema = jest.fn().mockImplementation(() => undefined);
-    utilsMock.generateAmplifyUiBuilderIndexFile = jest.fn().mockImplementation(() => true);
+      }),
+      exportForms: jest.fn().mockReturnValue({
+        promise: () => mockedExport(),
+      }),
+      exportViews: jest.fn().mockReturnValue({
+        promise: () => mockedExport(),
+      }),
+      getMetadata: jest.fn().mockReturnValue({
+        promise: jest.fn().mockReturnValue({
+          features: {
+            autoGenerateForms: 'true',
+            autoGenerateViews: 'true',
+          },
+        }),
+      }),
+    });
+    utilsMock.generateUiBuilderComponents = jest.fn().mockReturnValue(schemas.entities);
+    utilsMock.generateUiBuilderThemes = jest.fn().mockReturnValue(schemas.entities);
+    utilsMock.generateUiBuilderForms = jest.fn().mockReturnValue(schemas.entities);
+    utilsMock.getAmplifyDataSchema = jest.fn().mockReturnValue(undefined);
+    utilsMock.generateAmplifyUiBuilderIndexFile = jest.fn().mockReturnValue(true);
+    utilsMock.generateAmplifyUiBuilderUtilFile = jest.fn().mockReturnValue(true);
   });
 
   it('runs generateComponents', async () => {
     await run(context);
-    expect(mockedExport).toBeCalledTimes(2);
+    expect(mockedExport).toBeCalledTimes(3);
     expect(utilsMock.generateUiBuilderComponents).toBeCalledTimes(1);
     expect(utilsMock.generateUiBuilderThemes).toBeCalledTimes(1);
+    expect(utilsMock.generateUiBuilderForms).toBeCalledTimes(1);
+  });
+  it('does not run generateComponents if not Amplify Admin app', async () => {
+    utilsMock.shouldRenderComponents = jest.fn().mockReturnValue(false);
+    await run(context);
+    expect(mockedExport).toBeCalledTimes(0);
+    expect(utilsMock.generateUiBuilderComponents).toBeCalledTimes(0);
+    expect(utilsMock.generateUiBuilderThemes).toBeCalledTimes(0);
+    expect(utilsMock.generateUiBuilderForms).toBeCalledTimes(0);
   });
 });