@aws-amplify/amplify-util-uibuilder 1.3.0-rc.c36fa71f5.0 → 1.3.0

package/lib/commands/utils/syncAmplifyUiBuilderComponents.js

@@ -1,85 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateUiBuilderThemes = exports.generateUiBuilderComponents = exports.listUiBuilderThemes = exports.listUiBuilderComponents = exports.getAppId = exports.resolveAppId = exports.getEnvName = void 0;
-const amplifyUiBuilderService_1 = require("./amplifyUiBuilderService");
+exports.generateUiBuilderThemes = exports.generateUiBuilderComponents = void 0;
 const amplify_prompts_1 = require("amplify-prompts");
-const createUiBuilderComponent_1 = require("./createUiBuilderComponent");
+const codegenResources_1 = require("./codegenResources");
 const getUiBuilderComponentsPath_1 = require("./getUiBuilderComponentsPath");
-const extractArgs_1 = require("./extractArgs");
-const getEnvName = (context, envName) => {
-    const args = (0, extractArgs_1.extractArgs)(context);
-    return envName ? envName : args.environmentName ? args.environmentName : context.exeInfo.localEnvInfo.envName;
-};
-exports.getEnvName = getEnvName;
-const resolveAppId = async (context) => {
-    return await context.amplify.invokePluginMethod(context, 'awscloudformation', undefined, 'resolveAppId', [context]);
-};
-exports.resolveAppId = resolveAppId;
-const getAppId = async (context) => {
-    const appId = (0, extractArgs_1.extractArgs)(context).appId || (await (0, exports.resolveAppId)(context));
-    if (!appId) {
-        throw new Error('Unable to sync Studio components since appId could not be determined. This can happen when you hit the soft limit of number of apps that you can have in Amplify console.');
-    }
-    return appId;
-};
-exports.getAppId = getAppId;
-async function listUiBuilderComponents(context, envName) {
-    const environmentName = (0, exports.getEnvName)(context, envName);
-    const appId = await (0, exports.getAppId)(context);
-    try {
-        const amplifyUIBuilder = await (0, amplifyUiBuilderService_1.getAmplifyUIBuilderService)(context, environmentName, appId);
-        let nextToken;
-        const uiBuilderComponents = [];
-        do {
-            const response = await amplifyUIBuilder
-                .exportComponents({
-                appId,
-                environmentName,
-                nextToken
-            })
-                .promise();
-            uiBuilderComponents.push(...response.entities);
-            nextToken = response.nextToken;
-        } while (nextToken);
-        amplify_prompts_1.printer.debug(JSON.stringify(uiBuilderComponents, null, 2));
-        return { entities: uiBuilderComponents };
-    }
-    catch (e) {
-        amplify_prompts_1.printer.debug(e);
-        throw e;
-    }
-}
-exports.listUiBuilderComponents = listUiBuilderComponents;
-async function listUiBuilderThemes(context, envName) {
-    const environmentName = (0, exports.getEnvName)(context, envName);
-    const appId = await (0, exports.getAppId)(context);
-    try {
-        const amplifyUIBuilder = await (0, amplifyUiBuilderService_1.getAmplifyUIBuilderService)(context, environmentName, appId);
-        let nextToken;
-        const uiBuilderThemes = [];
-        do {
-            const response = await amplifyUIBuilder
-                .exportThemes({
-                appId,
-                environmentName,
-            })
-                .promise();
-            uiBuilderThemes.push(...response.entities);
-            nextToken = response.nextToken;
-        } while (nextToken);
-        amplify_prompts_1.printer.debug(JSON.stringify(uiBuilderThemes, null, 2));
-        return { entities: uiBuilderThemes };
-    }
-    catch (e) {
-        amplify_prompts_1.printer.debug(e);
-        throw e;
-    }
-}
-exports.listUiBuilderThemes = listUiBuilderThemes;
-function generateUiBuilderComponents(context, componentSchemas) {
+const generateUiBuilderComponents = (context, componentSchemas, dataSchema) => {
     const componentResults = componentSchemas.map(schema => {
         try {
-            const component = (0, createUiBuilderComponent_1.createUiBuilderComponent)(context, schema);
+            const component = (0, codegenResources_1.createUiBuilderComponent)(context, schema, dataSchema);
             return { resultType: 'SUCCESS', component };
         }
         catch (e) {
@@ -90,12 +18,12 @@ function generateUiBuilderComponents(context, componentSchemas) {
     });
     amplify_prompts_1.printer.debug(`Generated ${componentResults.filter(result => result.resultType === 'SUCCESS').length} components in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
     return componentResults;
-}
+};
 exports.generateUiBuilderComponents = generateUiBuilderComponents;
-function generateUiBuilderThemes(context, themeSchemas) {
+const generateUiBuilderThemes = (context, themeSchemas) => {
     const themeResults = themeSchemas.map(schema => {
         try {
-            const theme = (0, createUiBuilderComponent_1.createUiBuilderTheme)(context, schema);
+            const theme = (0, codegenResources_1.createUiBuilderTheme)(context, schema);
             return { resultType: 'SUCCESS', theme };
         }
         catch (e) {
@@ -106,6 +34,6 @@ function generateUiBuilderThemes(context, themeSchemas) {
     });
     amplify_prompts_1.printer.debug(`Generated ${themeResults.filter(result => result.resultType === 'SUCCESS').length} themes in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
     return themeResults;
-}
+};
 exports.generateUiBuilderThemes = generateUiBuilderThemes;
 //# 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,uEAAyF;AACzF,qDAA0C;AAC1C,yEAA4F;AAC5F,6EAA0E;AAC1E,+CAA4C;AAErC,MAAM,UAAU,GAAG,CAAC,OAAmB,EAAE,OAAgB,EAAE,EAAE;IAClE,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,OAAO,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;AAChH,CAAC,CAAC;AAHW,QAAA,UAAU,cAGrB;AAEK,MAAM,YAAY,GAAG,KAAK,EAAE,OAAmB,EAAE,EAAE;IACxD,OAAO,MAAM,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;AACtH,CAAC,CAAC;AAFW,QAAA,YAAY,gBAEvB;AAEK,MAAM,QAAQ,GAAG,KAAK,EAAE,OAAmB,EAAE,EAAE;IACpD,MAAM,KAAK,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC,KAAK,IAAI,CAAC,MAAM,IAAA,oBAAY,EAAC,OAAO,CAAC,CAAC,CAAC;IAE1E,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,KAAK,CACb,2KAA2K,CAC5K,CAAC;KACH;IACD,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AATW,QAAA,QAAQ,YASnB;AAEK,KAAK,UAAU,uBAAuB,CAAC,OAAmB,EAAE,OAAgB;IACjF,MAAM,eAAe,GAAG,IAAA,kBAAU,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAQ,EAAC,OAAO,CAAC,CAAC;IAEtC,IAAI;QACF,MAAM,gBAAgB,GAAG,MAAM,IAAA,oDAA0B,EAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;QAC3F,IAAI,SAA6B,CAAC;QAClC,MAAM,mBAAmB,GAAgB,EAAE,CAAC;QAC5C,GAAG;YACD,MAAM,QAAQ,GAAG,MAAM,gBAAgB;iBACtC,gBAAgB,CAAC;gBAChB,KAAK;gBACL,eAAe;gBACf,SAAS;aACV,CAAC;iBACD,OAAO,EAAE,CAAC;YACX,mBAAmB,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC/C,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;SAChC,QAAQ,SAAS,EAAE;QACpB,yBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC5D,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,CAAC;KAC1C;IAAC,OAAO,CAAC,EAAE;QACV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAzBD,0DAyBC;AAEM,KAAK,UAAU,mBAAmB,CAAC,OAAmB,EAAE,OAAgB;IAC7E,MAAM,eAAe,GAAG,IAAA,kBAAU,EAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACrD,MAAM,KAAK,GAAG,MAAM,IAAA,gBAAQ,EAAC,OAAO,CAAC,CAAC;IAEtC,IAAI;QACF,MAAM,gBAAgB,GAAG,MAAM,IAAA,oDAA0B,EAAC,OAAO,EAAE,eAAe,EAAE,KAAK,CAAC,CAAC;QAC3F,IAAI,SAA6B,CAAC;QAClC,MAAM,eAAe,GAAY,EAAE,CAAC;QACpC,GAAG;YACD,MAAM,QAAQ,GAAG,MAAM,gBAAgB;iBACtC,YAAY,CAAC;gBACZ,KAAK;gBACL,eAAe;aAChB,CAAC;iBACD,OAAO,EAAE,CAAC;YACX,eAAe,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;YAC3C,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;SAChC,QAAQ,SAAS,EAAE;QACpB,yBAAO,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QACxD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,CAAC;KACtC;IAAC,OAAO,CAAC,EAAE;QACV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,MAAM,CAAC,CAAC;KACT;AACH,CAAC;AAxBD,kDAwBC;AAED,SAAgB,2BAA2B,CAAC,OAAmB,EAAE,gBAAuB;IACtF,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QACrD,IAAI;YACF,MAAM,SAAS,GAAG,IAAA,mDAAwB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5D,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;AAlBD,kEAkBC;AAED,SAAgB,uBAAuB,CAAC,OAAmB,EAAE,YAAmB;IAC9E,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;QAC7C,IAAI;YACF,MAAM,KAAK,GAAG,IAAA,+CAAoB,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;AAhBD,0DAgBC"}
+{"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"}

package/lib/index.d.ts

@@ -1,6 +1,6 @@
 import { $TSContext } from 'amplify-cli-core';
-export declare function executeAmplifyCommand(context: $TSContext, cmd: string): Promise<void>;
-export declare function handleAmplifyEvent(context: $TSContext, { event }: {
+export declare const executeAmplifyCommand: (context: $TSContext, cmd: string) => Promise<void>;
+export declare const handleAmplifyEvent: (context: $TSContext, { event }: {
     event: string;
-}): Promise<void>;
+}) => Promise<void>;
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAG9C,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,iBAK3E;AAED,wBAAsB,kBAAkB,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,iBAKzF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQ9C,eAAO,MAAM,qBAAqB,YAAmB,UAAU,OAAO,MAAM,KAAG,QAAQ,IAAI,CAM1F,CAAC;AAKF,eAAO,MAAM,kBAAkB,YAAmB,UAAU;WAAsB,MAAM;MAAK,QAAQ,IAAI,CAMxG,CAAC"}

package/lib/index.js

@@ -5,18 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleAmplifyEvent = exports.executeAmplifyCommand = void 0;
 const path_1 = __importDefault(require("path"));
-async function executeAmplifyCommand(context, cmd) {
+const executeAmplifyCommand = async (context, cmd) => {
     const commandsDirPath = path_1.default.normalize(path_1.default.join(__dirname, 'commands'));
-    const commandPath = path_1.default.join(commandsDirPath, cmd ? cmd : context.input.command);
+    const commandPath = path_1.default.join(commandsDirPath, cmd || context.input.command);
     const commandModule = require(commandPath);
     await commandModule.run(context);
-}
+};
 exports.executeAmplifyCommand = executeAmplifyCommand;
-async function handleAmplifyEvent(context, { event }) {
+const handleAmplifyEvent = async (context, { event }) => {
     const eventHandlersDirPath = path_1.default.normalize(path_1.default.join(__dirname, 'event-handlers'));
     const eventHandlerPath = path_1.default.join(eventHandlersDirPath, `handle-${event}`);
     const eventHandlerModule = require(eventHandlerPath);
     await eventHandlerModule.run(context);
-}
+};
 exports.handleAmplifyEvent = handleAmplifyEvent;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAEjB,KAAK,UAAU,qBAAqB,CAAC,OAAmB,EAAE,GAAW;IAC1E,MAAM,eAAe,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IACzE,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAClF,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAC3C,MAAM,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC;AALD,sDAKC;AAEM,KAAK,UAAU,kBAAkB,CAAC,OAAmB,EAAE,EAAE,KAAK,EAAqB;IACxF,MAAM,oBAAoB,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;IACpF,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;IAC5E,MAAM,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACxC,CAAC;AALD,gDAKC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;AACA,gDAAwB;AAOjB,MAAM,qBAAqB,GAAG,KAAK,EAAE,OAAmB,EAAE,GAAW,EAAiB,EAAE;IAC7F,MAAM,eAAe,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC;IACzE,MAAM,WAAW,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IAE7E,MAAM,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;IAC3C,MAAM,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACnC,CAAC,CAAC;AANW,QAAA,qBAAqB,yBAMhC;AAKK,MAAM,kBAAkB,GAAG,KAAK,EAAE,OAAmB,EAAE,EAAE,KAAK,EAAqB,EAAiB,EAAE;IAC3G,MAAM,oBAAoB,GAAG,cAAI,CAAC,SAAS,CAAC,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;IACpF,MAAM,gBAAgB,GAAG,cAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,UAAU,KAAK,EAAE,CAAC,CAAC;IAE5E,MAAM,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC;IACrD,MAAM,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;AACxC,CAAC,CAAC;AANW,QAAA,kBAAkB,sBAM7B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/amplify-util-uibuilder",
-  "version": "1.3.0-rc.c36fa71f5.0",
+  "version": "1.3.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {
@@ -13,15 +13,16 @@
     "access": "public"
   },
   "dependencies": {
-    "@aws-amplify/codegen-ui": "^2.2.0",
-    "@aws-amplify/codegen-ui-react": "^2.2.0",
-    "amplify-cli-core": "2.12.0-rc.c36fa71f5.0",
+    "@aws-amplify/codegen-ui": "^2.3.2",
+    "@aws-amplify/codegen-ui-react": "^2.3.2",
+    "amplify-cli-core": "2.12.0",
     "amplify-prompts": "2.2.0",
     "aws-sdk": "^2.1113.0",
     "ora": "^4.0.3"
   },
   "devDependencies": {
     "@types/fs-extra": "^8.0.1",
+    "@types/jest": "^26.0.20",
     "@types/semver": "^7.1.0"
   },
   "jest": {
@@ -30,9 +31,16 @@
     "transform": {
       "^.+\\.tsx?$": "ts-jest"
     },
+    "globals": {
+      "window": {},
+      "ts-jest": {
+        "diagnostics": true
+      }
+    },
     "collectCoverage": true,
     "collectCoverageFrom": [
       "src/**/*.ts",
+      "!**/*.test.ts",
       "!**/node_modules/**",
       "!src/__tests__/**",
       "!lib/**"
@@ -43,7 +51,7 @@
     ],
     "testEnvironment": "node",
     "testURL": "http://localhost/",
-    "testRegex": "(src/(__tests__|__e2e__|__e2e_v2__)/.*.test.ts)$",
+    "testRegex": "((src/(__tests__|__e2e__|__e2e_v2__))/.*.test.ts)$",
     "moduleFileExtensions": [
       "ts",
       "tsx",
@@ -59,5 +67,5 @@
     "usePathForSuiteName": "true",
     "addFileAttribute": "true"
   },
-  "gitHead": "ab6956f4d1b2477b9f810d91da869fcea59bb1da"
+  "gitHead": "f13d9d36118d853454b977b559a5d523cc126c0c"
 }

package/src/__tests__/cloneComponentsFromEnv.test.ts

@@ -1,49 +1,56 @@
+import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
 import * as extractArgsDependency from '../commands/utils/extractArgs';
-import * as listUiBuilderComponentsDependency from '../commands/utils/syncAmplifyUiBuilderComponents';
 import { run } from '../commands/cloneComponentsFromEnv';
-const extractArgsDependency_mock = extractArgsDependency as any;
-const listUiBuilderComponentsDependency_mock = listUiBuilderComponentsDependency as any;
-jest.mock('aws-sdk', () => {
+
+const extractArgsDependencyMock = extractArgsDependency as any;
+const awsMock = aws as any;
+
+jest.mock('../commands/utils/extractArgs');
+jest.mock('amplify-cli-core');
+
+const mockedComponentExport = jest.fn((envName: string) => {
+  if (envName === 'newEnvName') {
+    return {
+      entities: [],
+    };
+  }
   return {
-    AmplifyUIBuilder: jest.fn(() => {
-      return {
-        createComponent: () => ({
-          promise: () => true,
-        }),
-      };
-    }),
+    entities: [{}],
   };
 });
-jest.mock('../commands/utils/extractArgs');
-jest.mock('../commands/utils/syncAmplifyUiBuilderComponents');
+const mockedComponentCreate = jest.fn(() => ({ entity: {} }));
 
 describe('can clone components to new environment', () => {
   let context: any;
   beforeEach(() => {
     context = {
       amplify: {
-        invokePluginMethod: () => true,
+        invokePluginMethod: () => ({}),
+      },
+      input: {
+        options: {
+          appId: 'testAppId',
+          envName: 'testEnvName',
+        },
       },
     };
-    extractArgsDependency_mock.extractArgs = jest.fn().mockImplementation(() => ({
+    extractArgsDependencyMock.extractArgs = jest.fn().mockImplementation(() => ({
       sourceEnvName: 'sourceEnvName',
       newEnvName: 'newEnvName',
       appId: 'appId',
       environmentName: 'environmentName',
     }));
-    listUiBuilderComponentsDependency_mock.listUiBuilderComponents = jest.fn().mockImplementation((context: any, envName: any) => {
-      if (envName === 'newEnvName') {
-        return {
-          entities: [],
-        };
-      }
-      return {
-        entities: [{}],
-      };
-    });
+    awsMock.AmplifyUIBuilder = jest.fn(() => ({
+      exportComponents: jest.fn(({ environmentName }) => ({
+        promise: () => mockedComponentExport(environmentName),
+      })),
+      createComponent: jest.fn(() => ({ promise: () => mockedComponentCreate() })),
+    }));
   });
+
   it('clones components to a new env', async () => {
     await run(context);
-    expect(listUiBuilderComponentsDependency.listUiBuilderComponents).toBeCalledTimes(2);
+    expect(mockedComponentExport).toBeCalledTimes(2);
+    expect(mockedComponentCreate).toBeCalledTimes(1);
   });
 });

package/src/__tests__/createUiBuilderComponent.test.ts

@@ -1,11 +1,12 @@
-import * as codegen from '@aws-amplify/codegen-ui';
+import * as codegen from '@aws-amplify/codegen-ui'; // eslint-disable-line import/no-extraneous-dependencies
 import {
   generateAmplifyUiBuilderIndexFile,
   createUiBuilderTheme,
   createUiBuilderComponent,
-} from '../commands/utils/createUiBuilderComponent';
+} from '../commands/utils/codegenResources';
+
 jest.mock('@aws-amplify/codegen-ui');
-const codegen_mock = codegen as any;
+const codegenMock = codegen as any;
 const renderSchemaToTemplateMock = jest.fn();
 
 describe('can create a ui builder component', () => {
@@ -41,20 +42,20 @@ describe('can create a ui builder component', () => {
       properties: {},
       variants: [],
     };
-    codegen_mock.StudioTemplateRendererManager = jest.fn().mockImplementation(() => ({
+    codegenMock.StudioTemplateRendererManager = jest.fn().mockImplementation(() => ({
       renderSchemaToTemplate: renderSchemaToTemplateMock,
     }));
   });
-  it('calls the renderManager', async () => {
-    await createUiBuilderComponent(context, schema);
-    expect(new codegen_mock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
+  it('calls the renderManager', () => {
+    createUiBuilderComponent(context, schema);
+    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
   });
-  it('calls the renderManager for themes', async () => {
-    await createUiBuilderTheme(context, schema);
-    expect(new codegen_mock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
+  it('calls the renderManager for themes', () => {
+    createUiBuilderTheme(context, schema);
+    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
   });
-  it('calls the renderManager for index file', async () => {
-    await generateAmplifyUiBuilderIndexFile(context, [schema]);
-    expect(new codegen_mock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
+  it('calls the renderManager for index file', () => {
+    generateAmplifyUiBuilderIndexFile(context, [schema]);
+    expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
   });
 });

package/src/__tests__/generateComponents.test.ts

@@ -1,33 +1,31 @@
-import * as shouldRenderComponentsDependency from '../commands/utils/shouldRenderComponents';
-import * as notifyMissingPackagesDependency from '../commands/utils/notifyMissingPackages';
-import * as listUiBuilderComponentsDependency from '../commands/utils/syncAmplifyUiBuilderComponents';
-import * as generateUiBuilderComponentsDependency from '../commands/utils/syncAmplifyUiBuilderComponents';
-import * as generateUiBuilderThemesDependency from '../commands/utils/syncAmplifyUiBuilderComponents';
-import * as listUiBuilderThemesDependency from '../commands/utils/syncAmplifyUiBuilderComponents';
-import * as generateAmplifyUiBuilderIndexFileDependency from '../commands/utils/createUiBuilderComponent';
+import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
+import * as utils from '../commands/utils';
 import { run } from '../commands/generateComponents';
-jest.mock('../commands/utils/syncAmplifyUiBuilderComponents');
-jest.mock('../commands/utils/createUiBuilderComponent');
-jest.mock('../commands/utils/shouldRenderComponents');
-jest.mock('../commands/utils/notifyMissingPackages');
-const shouldRenderComponentsDependency_mock = shouldRenderComponentsDependency as any;
-const notifyMissingPackagesDependency_mock = notifyMissingPackagesDependency as any;
-const listUiBuilderComponentsDependency_mock = listUiBuilderComponentsDependency as any;
-const generateUiBuilderComponentsDependency_mock = generateUiBuilderComponentsDependency as any;
-const generateUiBuilderThemesDependency_mock = generateUiBuilderThemesDependency as any;
-const listUiBuilderThemesDependency_mock = listUiBuilderThemesDependency as any;
-const generateAmplifyUiBuilderIndexFileDependency_mock = generateAmplifyUiBuilderIndexFileDependency as any;
 
-shouldRenderComponentsDependency_mock.shouldRenderComponents = jest.fn().mockImplementation(() => true);
-notifyMissingPackagesDependency_mock.notifyMissingPackages = jest.fn().mockImplementation(() => true);
+jest.mock('../commands/utils');
+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);
 
 describe('can generate components', () => {
   let context: any;
   let schemas: any;
-  let generateUiBuilderComponents: any;
-  let generateUiBuilderThemes: any;
+  let mockedExport: jest.Mock<any, any>;
   beforeEach(() => {
-    context = {};
+    context = {
+      amplify: {
+        invokePluginMethod: () => ({}),
+      },
+      input: {
+        options: {
+          appId: 'testAppId',
+          envName: 'testEnvName',
+        },
+      },
+    };
     schemas = {
       entities: [
         {
@@ -38,15 +36,27 @@ describe('can generate components', () => {
         },
       ],
     };
-    listUiBuilderComponentsDependency_mock.listUiBuilderComponents = jest.fn().mockImplementation(() => schemas);
-    listUiBuilderThemesDependency_mock.listUiBuilderThemes = jest.fn().mockImplementation(() => schemas);
-    generateUiBuilderComponentsDependency_mock.generateUiBuilderComponents = jest.fn().mockImplementation(() => schemas.entities);
-    generateUiBuilderThemesDependency_mock.generateUiBuilderThemes = jest.fn().mockImplementation(() => schemas.entities);
-    generateAmplifyUiBuilderIndexFileDependency_mock.generateAmplifyUiBuilderIndexFile = jest.fn().mockImplementation(() => true);
+    mockedExport = jest.fn(() => ({
+      entities: schemas.entities,
+    }));
+    awsMock.AmplifyUIBuilder = jest.fn(() => ({
+      exportComponents: jest.fn(() => ({
+        promise: () => mockedExport(),
+      })),
+      exportThemes: jest.fn(() => ({
+        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);
   });
+
   it('runs generateComponents', async () => {
     await run(context);
-    expect(generateUiBuilderComponentsDependency_mock.generateUiBuilderComponents).toBeCalledTimes(1);
-    expect(generateUiBuilderThemesDependency_mock.generateUiBuilderThemes).toBeCalledTimes(1);
+    expect(mockedExport).toBeCalledTimes(2);
+    expect(utilsMock.generateUiBuilderComponents).toBeCalledTimes(1);
+    expect(utilsMock.generateUiBuilderThemes).toBeCalledTimes(1);
   });
 });

package/src/__tests__/getAmplifyDataSchema.test.ts

@@ -0,0 +1,102 @@
+import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
+import { AmplifyCategories, AmplifySupportedService } from 'amplify-cli-core'; // eslint-disable-line import/no-extraneous-dependencies
+import { printer } from 'amplify-prompts'; // eslint-disable-line import/no-extraneous-dependencies
+import { AmplifyStudioClient } from '../clients';
+import { getAmplifyDataSchema } from '../commands/utils';
+
+const awsMock = aws as any;
+const printerMock = printer as any;
+
+jest.mock('amplify-cli-core', () => ({
+  ...jest.requireActual('amplify-cli-core'),
+  stateManager: {
+    getMeta: jest.fn(() => ({
+      [AmplifyCategories.API]: {
+        MyResourceName: {
+          service: AmplifySupportedService.APPSYNC,
+        },
+      },
+    })),
+  },
+  FeatureFlags: {
+    getBoolean: () => false,
+    getNumber: () => 0,
+  },
+}));
+jest.mock('amplify-prompts');
+
+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};`,
+);
+
+describe('should sync amplify backend models', () => {
+  let context: any;
+
+  beforeEach(() => {
+    context = {
+      exeInfo: {
+        projectConfig: {
+          javascript: {
+            config: {
+              SourceDir: 'src',
+            },
+          },
+        },
+      },
+      amplify: {
+        invokePluginMethod: () => ({}),
+      },
+      parameters: {
+        argv: [],
+      },
+      input: {
+        options: {
+          appId: 'testAppId',
+          envName: 'testEnvName',
+        },
+      },
+    };
+  });
+
+  it('should getAmplifyBackendModels', async () => {
+    awsMock.AmplifyBackend = jest.fn(() => ({
+      getBackendAPIModels: jest.fn(() => ({
+        promise: () => ({
+          Models: getMockedSchema(),
+        }),
+      })),
+    }));
+    const client = await AmplifyStudioClient.setClientInfo(context);
+    const dataSchema = await getAmplifyDataSchema(client);
+    expect(getMockedSchema).toBeCalled();
+    expect(dataSchema).toBeDefined();
+    expect(Object.keys(dataSchema!.models)).toContain('Blog');
+  });
+
+  it('should handle Models not found', async () => {
+    awsMock.AmplifyBackend = jest.fn(() => ({
+      getBackendAPIModels: jest.fn(() => ({
+        promise: jest.fn(() => ({
+          Models: undefined,
+        })),
+      })),
+    }));
+    const client = await AmplifyStudioClient.setClientInfo(context);
+    const dataSchema = await getAmplifyDataSchema(client);
+    expect(dataSchema).toBeUndefined();
+    expect(printerMock.debug).toHaveBeenCalledWith('Provided ResourceName: MyResourceName did not yield Models.');
+  });
+
+  it('should handle network error', async () => {
+    awsMock.AmplifyBackend = jest.fn(() => ({
+      getBackendAPIModels: jest.fn(() => ({
+        promise: jest.fn().mockRejectedValue(new Error('Network Error')),
+      })),
+    }));
+    const client = await AmplifyStudioClient.setClientInfo(context);
+    const dataSchema = await getAmplifyDataSchema(client);
+    expect(dataSchema).toBeUndefined();
+    expect(printerMock.debug).toHaveBeenCalledWith('Error: Models not found in AmplifyBackend:GetBackendAPIModels response: Network Error');
+  });
+});