@aws-amplify/amplify-util-uibuilder 1.6.8-beta.1 → 1.6.8-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/amplify-plugin.json +2 -11
- package/lib/clients/amplify-studio-client.d.ts.map +1 -1
- package/lib/clients/amplify-studio-client.js +1 -3
- package/lib/clients/amplify-studio-client.js.map +1 -1
- package/lib/commands/cloneComponentsFromEnv.d.ts.map +1 -1
- package/lib/commands/cloneComponentsFromEnv.js +2 -1
- package/lib/commands/cloneComponentsFromEnv.js.map +1 -1
- package/lib/commands/generateComponents.js +9 -9
- package/lib/commands/generateComponents.js.map +1 -1
- package/lib/commands/utils/codegenResources.d.ts.map +1 -1
- package/lib/commands/utils/codegenResources.js +2 -2
- package/lib/commands/utils/codegenResources.js.map +1 -1
- package/lib/commands/utils/detachedFormCleanup.d.ts.map +1 -1
- package/lib/commands/utils/detachedFormCleanup.js +1 -2
- package/lib/commands/utils/detachedFormCleanup.js.map +1 -1
- package/lib/commands/utils/featureFlags.d.ts.map +1 -1
- package/lib/commands/utils/featureFlags.js.map +1 -1
- package/lib/commands/utils/notifyMissingPackages.d.ts.map +1 -1
- package/lib/commands/utils/notifyMissingPackages.js.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js +9 -6
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js.map +1 -1
- package/lib/utils/prePushHandler.d.ts.map +1 -1
- package/lib/utils/prePushHandler.js +2 -5
- package/lib/utils/prePushHandler.js.map +1 -1
- package/package.json +4 -4
- package/src/__tests__/createUiBuilderComponent.test.ts +4 -2
- package/src/__tests__/detachedFormCleanup.test.ts +3 -6
- package/src/__tests__/generateComponents.test.ts +1 -1
- package/src/__tests__/getAmplifyDataSchema.test.ts +2 -1
- package/src/__tests__/package.json +2 -2
- package/src/__tests__/prePushHandler.test.ts +3 -1
- package/src/__tests__/shouldRenderComponents.test.ts +8 -8
- package/src/__tests__/syncAmplifyUiComponents.test.ts +54 -53
- package/src/__tests__/utils.ts +2 -3
- package/src/clients/amplify-studio-client.ts +4 -8
- package/src/commands/cloneComponentsFromEnv.ts +4 -6
- package/src/commands/generateComponents.ts +11 -11
- package/src/commands/utils/codegenResources.ts +14 -15
- package/src/commands/utils/detachedFormCleanup.ts +6 -6
- package/src/commands/utils/featureFlags.ts +3 -4
- package/src/commands/utils/notifyMissingPackages.ts +1 -3
- package/src/commands/utils/syncAmplifyUiBuilderComponents.ts +12 -18
- package/src/utils/prePushHandler.ts +15 -15
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,17 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [1.6.8-beta.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.7...@aws-amplify/amplify-util-uibuilder@1.6.8-beta.2) (2023-02-17)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* **amplify-util-uibuilder:** update codegen-ui to 2.8.0 ([#11867](https://github.com/aws-amplify/amplify-cli/issues/11867)) ([0969a90](https://github.com/aws-amplify/amplify-cli/commit/0969a9077000f8e57778222b047ae3449302a55f))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
6
17
|
## [1.6.8-beta.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.7...@aws-amplify/amplify-util-uibuilder@1.6.8-beta.1) (2023-02-15)
|
|
7
18
|
|
|
8
19
|
|
package/amplify-plugin.json
CHANGED
|
@@ -1,15 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ui-builder",
|
|
3
3
|
"type": "util",
|
|
4
|
-
"commands": [
|
|
5
|
-
|
|
6
|
-
"cloneComponentsFromEnv",
|
|
7
|
-
"generateComponents"
|
|
8
|
-
],
|
|
9
|
-
"eventHandlers": [
|
|
10
|
-
"PrePush",
|
|
11
|
-
"PostEnvAdd",
|
|
12
|
-
"PostPull",
|
|
13
|
-
"PostPush"
|
|
14
|
-
]
|
|
4
|
+
"commands": ["version", "cloneComponentsFromEnv", "generateComponents"],
|
|
5
|
+
"eventHandlers": ["PrePush", "PostEnvAdd", "PostPull", "PostPush"]
|
|
15
6
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amplify-studio-client.d.ts","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgC,MAAM,kBAAkB,CAAC;AAC5E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"amplify-studio-client.d.ts","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAgC,MAAM,kBAAkB,CAAC;AAC5E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AASpG,MAAM,MAAM,cAAc,GAAG;IAC3B,iBAAiB,EAAE,OAAO,CAAC;IAC3B,iBAAiB,EAAE,OAAO,CAAC;CAC5B,CAAC;AAqCF,MAAM,CAAC,OAAO,OAAO,mBAAmB;;IAKtC,QAAQ,EAAE,cAAc,CAAC;IACzB,kBAAkB,UAAS;IAK3B,MAAM,CAAC,YAAY,YAAmB,UAAU,SAAS,MAAM,KAAG,QAAQ,OAAO,CAAC,CAUhF;WAKW,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;gBAwBnG,aAAa,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IActF,YAAY,aAAoB,MAAM,UAAU,MAAM,KAAG,QAAQ,IAAI,CAAC,CAiBpE;IAKF,cAAc,aAAoB,MAAM,UAAU,MAAM,KAAG,QAAQ;QAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;KAAE,CAAC,CAsB3F;IAKF,UAAU,aAAoB,MAAM,UAAU,MAAM,KAAG,QAAQ;QAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;KAAE,CAAC,CAuBnF;IAEF,SAAS,aAAoB,MAAM,UAAU,MAAM,KAAG,QAAQ;QAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;KAAE,CAAC,CAsBjF;IAEF,eAAe,cAAqB,mBAAmB,YAAY,MAAM,UAAU,MAAM,KAAG,QAAQ,SAAS,GAAG,SAAS,CAAC,CAexH;IAEF,UAAU,WAAkB,MAAM,YAAY,MAAM,UAAU,MAAM,KAAG,QAAQ,IAAI,CAAC,CASlF;IAEF,SAAS,iBAAwB,MAAM,YAAY,MAAM,UAAU,MAAM,KAAG,QAAQ,MAAM,GAAG,SAAS,CAAC,CAerG;CACH"}
|
|
@@ -175,9 +175,7 @@ class AmplifyStudioClient {
|
|
|
175
175
|
const environmentName = envName || __classPrivateFieldGet(this, _AmplifyStudioClient_envName, "f");
|
|
176
176
|
const resolvedAppId = appId || __classPrivateFieldGet(this, _AmplifyStudioClient_appId, "f");
|
|
177
177
|
try {
|
|
178
|
-
await __classPrivateFieldGet(this, _AmplifyStudioClient_amplifyUiBuilder, "f")
|
|
179
|
-
.deleteForm({ id: formId, environmentName, appId: resolvedAppId })
|
|
180
|
-
.promise();
|
|
178
|
+
await __classPrivateFieldGet(this, _AmplifyStudioClient_amplifyUiBuilder, "f").deleteForm({ id: formId, environmentName, appId: resolvedAppId }).promise();
|
|
181
179
|
}
|
|
182
180
|
catch (err) {
|
|
183
181
|
amplify_prompts_1.printer.debug(err.toString());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amplify-studio-client.js","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uDAA4E;
|
|
1
|
+
{"version":3,"file":"amplify-studio-client.js","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloneComponentsFromEnv.d.ts","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"cloneComponentsFromEnv.d.ts","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAO9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,CA4C3D,CAAC"}
|
|
@@ -13,7 +13,8 @@ const run = async (context) => {
|
|
|
13
13
|
const appId = (_a = args.appId) !== null && _a !== void 0 ? _a : (_e = (_d = (_c = (_b = context.exeInfo) === null || _b === void 0 ? void 0 : _b.teamProviderInfo) === null || _c === void 0 ? void 0 : _c[sourceEnvName]) === null || _d === void 0 ? void 0 : _d.awscloudformation) === null || _e === void 0 ? void 0 : _e.AmplifyAppId;
|
|
14
14
|
const studioClient = await clients_1.AmplifyStudioClient.setClientInfo(context, sourceEnvName, appId);
|
|
15
15
|
const [existingComponents, existingComponentsNewEnv] = await Promise.all([
|
|
16
|
-
studioClient.listComponents(sourceEnvName),
|
|
16
|
+
studioClient.listComponents(sourceEnvName),
|
|
17
|
+
studioClient.listComponents(newEnvName),
|
|
17
18
|
]);
|
|
18
19
|
if (existingComponents.entities.length === 0) {
|
|
19
20
|
amplify_prompts_1.printer.debug(`${existingComponents.entities.length} components exist in source env. Skipping creation of local components.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cloneComponentsFromEnv.js","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAE1C,mCAAsC;AACtC,wCAAiD;AAK1C,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;;IAC9D,yBAAO,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;IAC9F,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;IAC5F,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,mCAAI,MAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,gBAAgB,0CAAG,aAAa,CAAC,0CAAE,iBAAiB,0CAAE,YAAY,CAAC;IAChH,MAAM,YAAY,GAAG,MAAM,6BAAmB,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;IAE5F,MAAM,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvE,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC,
|
|
1
|
+
{"version":3,"file":"cloneComponentsFromEnv.js","sourceRoot":"","sources":["../../src/commands/cloneComponentsFromEnv.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAE1C,mCAAsC;AACtC,wCAAiD;AAK1C,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;;IAC9D,yBAAO,CAAC,KAAK,CAAC,6DAA6D,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,IAAA,mBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC;IAC9F,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC;IAC5F,MAAM,KAAK,GAAG,MAAA,IAAI,CAAC,KAAK,mCAAI,MAAA,MAAA,MAAA,MAAA,OAAO,CAAC,OAAO,0CAAE,gBAAgB,0CAAG,aAAa,CAAC,0CAAE,iBAAiB,0CAAE,YAAY,CAAC;IAChH,MAAM,YAAY,GAAG,MAAM,6BAAmB,CAAC,aAAa,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,CAAC,CAAC;IAE5F,MAAM,CAAC,kBAAkB,EAAE,wBAAwB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvE,YAAY,CAAC,cAAc,CAAC,aAAa,CAAC;QAC1C,YAAY,CAAC,cAAc,CAAC,UAAU,CAAC;KACxC,CAAC,CAAC;IACH,IAAI,kBAAkB,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5C,yBAAO,CAAC,KAAK,CAAC,GAAG,kBAAkB,CAAC,QAAQ,CAAC,MAAM,yEAAyE,CAAC,CAAC;QAC9H,OAAO;KACR;IAED,IAAI,wBAAwB,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;QAChD,yBAAO,CAAC,KAAK,CACX,GAAG,wBAAwB,CAAC,QAAQ,CAAC,MAAM,8EAA8E,CAC1H,CAAC;QACF,OAAO;KACR;IAED,MAAM,UAAU,GAAG,kBAAkB,CAAC,QAAQ,CAAC;IAC/C,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE;QACtB,yBAAO,CAAC,KAAK,CAAC,wCAAwC,KAAK,aAAa,aAAa,qCAAqC,CAAC,CAAC;QAC5H,OAAO;KACR;IACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC1C,MAAM,EACJ,KAAK,EAAE,MAAM,EACb,eAAe,EACf,EAAE,EACF,SAAS,EACT,UAAU,EACV,GAAG,mBAAmB,EACvB,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;QAClB,MAAM,YAAY,CAAC,eAAe,CAAC,mBAAmB,EAAE,UAAU,EAAE,KAAK,CAAC,CAAC;KAC5E;IAED,yBAAO,CAAC,IAAI,CACV,uBAAuB,UAAU,CAAC,MAAM,gCAAgC,KAAK,aAAa,aAAa,WAAW,UAAU,GAAG,CAChI,CAAC;AACJ,CAAC,CAAC;AA5CW,QAAA,GAAG,OA4Cd"}
|
|
@@ -22,7 +22,7 @@ const run = async (context, eventType) => {
|
|
|
22
22
|
(0, utils_1.getAmplifyDataSchema)(studioClient),
|
|
23
23
|
]);
|
|
24
24
|
const nothingWouldAutogenerate = !dataSchema || !studioClient.metadata.autoGenerateForms || !studioClient.isGraphQLSupported;
|
|
25
|
-
if (nothingWouldAutogenerate && [componentSchemas, themeSchemas, formSchemas].every(group => !group.entities.length)) {
|
|
25
|
+
if (nothingWouldAutogenerate && [componentSchemas, themeSchemas, formSchemas].every((group) => !group.entities.length)) {
|
|
26
26
|
amplify_prompts_1.printer.debug('Skipping UI component generation since none are found.');
|
|
27
27
|
return;
|
|
28
28
|
}
|
|
@@ -38,7 +38,7 @@ const run = async (context, eventType) => {
|
|
|
38
38
|
const failedResponseNames = [];
|
|
39
39
|
const modelNames = (dataSchema === null || dataSchema === void 0 ? void 0 : dataSchema.models) ? new Set(Object.keys(dataSchema.models)) : new Set();
|
|
40
40
|
Object.entries(generatedResults).forEach(([key, results]) => {
|
|
41
|
-
results.forEach(result => {
|
|
41
|
+
results.forEach((result) => {
|
|
42
42
|
if (result.resultType === 'SUCCESS') {
|
|
43
43
|
successfulSchemas.push(result.schema);
|
|
44
44
|
if (key === 'form') {
|
|
@@ -47,11 +47,11 @@ const run = async (context, eventType) => {
|
|
|
47
47
|
}
|
|
48
48
|
else {
|
|
49
49
|
const failedSchema = result.schema;
|
|
50
|
-
if ((0, utils_1.isStudioForm)(failedSchema)
|
|
51
|
-
|
|
52
|
-
&&
|
|
53
|
-
|
|
54
|
-
|
|
50
|
+
if ((0, utils_1.isStudioForm)(failedSchema) &&
|
|
51
|
+
failedSchema.id &&
|
|
52
|
+
dataSchema &&
|
|
53
|
+
eventType === 'PostPush' &&
|
|
54
|
+
(0, utils_1.isFormDetachedFromModel)(failedSchema, modelNames)) {
|
|
55
55
|
detachedForms.push({ id: failedSchema.id, name: failedSchema.name });
|
|
56
56
|
return;
|
|
57
57
|
}
|
|
@@ -68,8 +68,8 @@ const run = async (context, eventType) => {
|
|
|
68
68
|
spinner.succeed('Synced UI components.');
|
|
69
69
|
}
|
|
70
70
|
const invalidComponentNames = [
|
|
71
|
-
...componentSchemas.entities.filter(component => !component.schemaVersion).map(component => component.name),
|
|
72
|
-
...formSchemas.entities.filter(form => !form.schemaVersion).map(form => form.name),
|
|
71
|
+
...componentSchemas.entities.filter((component) => !component.schemaVersion).map((component) => component.name),
|
|
72
|
+
...formSchemas.entities.filter((form) => !form.schemaVersion).map((form) => form.name),
|
|
73
73
|
];
|
|
74
74
|
if (invalidComponentNames.length) {
|
|
75
75
|
amplify_prompts_1.printer.warn(`The components ${invalidComponentNames.join(', ')} were synced with an older version of Amplify Studio. Please re-sync your components with Figma to get latest features and changes.`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAsB;AACtB,qDAA0C;AAE1C,wCAAiD;AACjD,mCAYiB;AAKV,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAE,SAAkC,EAAiB,EAAE;IAClG,IAAI,CAAC,CAAC,MAAM,IAAA,8BAAsB,EAAC,OAAO,CAAC,CAAC,EAAE;QAC5C,OAAO;KACR;IACD,MAAM,OAAO,GAAG,IAAA,aAAG,EAAC,EAAE,CAAC,CAAC;IACxB,IAAI;QACF,MAAM,YAAY,GAAG,MAAM,6BAAmB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACtE,MAAM,CAAC,gBAAgB,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAClF,YAAY,CAAC,cAAc,EAAE;YAC7B,YAAY,CAAC,UAAU,EAAE;YACzB,YAAY,CAAC,SAAS,EAAE;YACxB,IAAA,4BAAoB,EAAC,YAAY,CAAC;SACnC,CAAC,CAAC;QAEH,MAAM,wBAAwB,GAAG,CAAC,UAAU,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,iBAAiB,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC;QAE7H,IAAI,wBAAwB,IAAI,CAAC,gBAAgB,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegenResources.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EACf,WAAW,EAKX,iBAAiB,EAEjB,UAAU,EACV,YAAY,EACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAUL,uCAAuC,EACxC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,
|
|
1
|
+
{"version":3,"file":"codegenResources.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EACf,WAAW,EAKX,iBAAiB,EAEjB,UAAU,EACV,YAAY,EACb,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAUL,uCAAuC,EACxC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,UAAU,EAA4D,MAAM,kBAAkB,CAAC;AAExG,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAYpD,eAAO,MAAM,wBAAwB,YAAa,UAAU,UAAU,eAAe,eAAe,iBAAiB,KAAG,eAcvH,CAAC;AAKF,eAAO,MAAM,oBAAoB,YACtB,UAAU,UACX,WAAW,YACT,uCAAuC,KAChD,WA2BF,CAAC;AAKF,eAAO,MAAM,mBAAmB,YAAa,UAAU,UAAU,UAAU,eAAe,iBAAiB,KAAG,UA2B7G,CAAC;AAKF,eAAO,MAAM,iCAAiC,YAAa,UAAU,WAAW,YAAY,EAAE,KAAG,IA2BhG,CAAC;AAEF,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,OAAO,CAAC;CACnB,CAAC;AAKF,eAAO,MAAM,gCAAgC,YAAa,UAAU,0BAA0B,cAAc,KAAG,IAiC9G,CAAC;AAMF,eAAO,MAAM,oBAAoB,iBAAwB,mBAAmB,KAAG,QAAQ,iBAAiB,GAAG,SAAS,CAsBnH,CAAC;AAKF,eAAO,MAAM,iBAAiB;;MAA8D,UAAU,EAiBrG,CAAC"}
|
|
@@ -82,7 +82,7 @@ const generateAmplifyUiBuilderIndexFile = (context, schemas) => {
|
|
|
82
82
|
exports.generateAmplifyUiBuilderIndexFile = generateAmplifyUiBuilderIndexFile;
|
|
83
83
|
const generateAmplifyUiBuilderUtilFile = (context, { hasForms, hasViews }) => {
|
|
84
84
|
const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
|
|
85
|
-
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((utils) =>
|
|
85
|
+
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((utils) => new codegen_ui_react_1.ReactUtilsStudioTemplateRenderer(utils, config));
|
|
86
86
|
const outputPathDir = uiBuilderComponentsPath;
|
|
87
87
|
const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
|
|
88
88
|
outputPathDir,
|
|
@@ -144,7 +144,7 @@ const generateBaseForms = (modelMap) => {
|
|
|
144
144
|
});
|
|
145
145
|
const schemas = [];
|
|
146
146
|
Object.entries(modelMap).forEach(([name, set]) => {
|
|
147
|
-
set.forEach(type => schemas.push(getSchema(name, type)));
|
|
147
|
+
set.forEach((type) => schemas.push(getSchema(name, type)));
|
|
148
148
|
});
|
|
149
149
|
return schemas;
|
|
150
150
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegenResources.js","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":";;;AAEA,wDAYiC;AACjC,oEAWuC;AACvC,qDAA0C;AAC1C,
|
|
1
|
+
{"version":3,"file":"codegenResources.js","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detachedFormCleanup.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/detachedFormCleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAOpD,eAAO,MAAM,uBAAuB,eAAgB,UAAU,GAAG,IAAI,cAAc,IAAI,MAAM,CAAC,KAAG,OAEhG,CAAC;AAOF,eAAO,MAAM,sBAAsB,eAAgB,UAAU,GAAG,IAAI,KAAG,OAUtE,CAAC;AAKF,eAAO,MAAM,YAAY,WAAY,YAAY,GAAG,SAAS,yBAG5D,CAAC;AAEF,eAAO,MAAM,mBAAmB,kBAAyB;
|
|
1
|
+
{"version":3,"file":"detachedFormCleanup.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/detachedFormCleanup.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,IAAI,EAAE,MAAM,kCAAkC,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAOpD,eAAO,MAAM,uBAAuB,eAAgB,UAAU,GAAG,IAAI,cAAc,IAAI,MAAM,CAAC,KAAG,OAEhG,CAAC;AAOF,eAAO,MAAM,sBAAsB,eAAgB,UAAU,GAAG,IAAI,KAAG,OAUtE,CAAC;AAKF,eAAO,MAAM,YAAY,WAAY,YAAY,GAAG,SAAS,yBAG5D,CAAC;AAEF,eAAO,MAAM,mBAAmB,kBAAyB;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,MAAM,CAAA;CAAE,EAAE,gBAAgB,mBAAmB,kBAazH,CAAC"}
|
|
@@ -15,7 +15,7 @@ const isFormSchemaCustomized = (formSchema) => {
|
|
|
15
15
|
if (!isEmpty({ ...fields, ...sectionalElements })) {
|
|
16
16
|
return true;
|
|
17
17
|
}
|
|
18
|
-
return Object.values(style).some(styleConfig => styleConfig !== undefined);
|
|
18
|
+
return Object.values(style).some((styleConfig) => styleConfig !== undefined);
|
|
19
19
|
};
|
|
20
20
|
exports.isFormSchemaCustomized = isFormSchemaCustomized;
|
|
21
21
|
const isStudioForm = (schema) => {
|
|
@@ -37,7 +37,6 @@ const deleteDetachedForms = async (detachedForms, studioClient) => {
|
|
|
37
37
|
for await (const status of (0, tiny_async_pool_1.default)(5, detachedForms, deleteForm)) {
|
|
38
38
|
amplify_prompts_1.printer.debug(status.message);
|
|
39
39
|
}
|
|
40
|
-
;
|
|
41
40
|
};
|
|
42
41
|
exports.deleteDetachedForms = deleteDetachedForms;
|
|
43
42
|
const isEmpty = (obj) => Object.keys(obj).length === 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"detachedFormCleanup.js","sourceRoot":"","sources":["../../../src/commands/utils/detachedFormCleanup.ts"],"names":[],"mappings":";;;;;;AAGA,qDAA0C;AAC1C,sEAAwC;AAKjC,MAAM,uBAAuB,GAAG,CAAC,UAA6B,EAAE,UAAuB,EAAW,EAAE;IACzG,OAAO,UAAU,CAAC,QAAQ,CAAC,cAAc,KAAK,WAAW,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AACjH,CAAC,CAAC;AAFW,QAAA,uBAAuB,2BAElC;AAOK,MAAM,sBAAsB,GAAG,CAAC,UAA6B,EAAW,EAAE;IAC/E,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC;IAExD,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,iBAAiB,EAAE,CAAC,EAAE;QACjD,OAAO,IAAI,CAAC;KACb;IAID,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"detachedFormCleanup.js","sourceRoot":"","sources":["../../../src/commands/utils/detachedFormCleanup.ts"],"names":[],"mappings":";;;;;;AAGA,qDAA0C;AAC1C,sEAAwC;AAKjC,MAAM,uBAAuB,GAAG,CAAC,UAA6B,EAAE,UAAuB,EAAW,EAAE;IACzG,OAAO,UAAU,CAAC,QAAQ,CAAC,cAAc,KAAK,WAAW,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;AACjH,CAAC,CAAC;AAFW,QAAA,uBAAuB,2BAElC;AAOK,MAAM,sBAAsB,GAAG,CAAC,UAA6B,EAAW,EAAE;IAC/E,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,GAAG,UAAU,CAAC;IAExD,IAAI,CAAC,OAAO,CAAC,EAAE,GAAG,MAAM,EAAE,GAAG,iBAAiB,EAAE,CAAC,EAAE;QACjD,OAAO,IAAI,CAAC;KACb;IAID,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC;AAC/E,CAAC,CAAC;AAVW,QAAA,sBAAsB,0BAUjC;AAKK,MAAM,YAAY,GAAG,CAAC,MAAgC,EAAwB,EAAE;IACrF,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAC1B,OAAO,gBAAgB,IAAI,MAAM,CAAC;AACpC,CAAC,CAAC;AAHW,QAAA,YAAY,gBAGvB;AAEK,MAAM,mBAAmB,GAAG,KAAK,EAAE,aAA6C,EAAE,YAAiC,EAAE,EAAE;IAC5H,MAAM,UAAU,GAAG,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAgC,EAAE,EAAE;QACtE,IAAI;YAEF,MAAM,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAClC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,yBAAyB,IAAI,EAAE,EAAE,CAAC;SACxE;QAAC,OAAO,KAAK,EAAE;YACd,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,kCAAkC,IAAI,EAAE,EAAE,CAAC;SAC9E;IACH,CAAC,CAAC;IACF,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,IAAA,yBAAS,EAAC,CAAC,EAAE,aAAa,EAAE,UAAU,CAAC,EAAE;QAClE,yBAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;KAC/B;AACH,CAAC,CAAC;AAbW,QAAA,mBAAmB,uBAa9B;AAGF,MAAM,OAAO,GAAG,CAAC,GAAS,EAAW,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/featureFlags.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"featureFlags.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/featureFlags.ts"],"names":[],"mappings":"AAiBA,eAAO,MAAM,qBAAqB,QAAa,QAAQ,MAAM,CAe5D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../../src/commands/utils/featureFlags.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../../src/commands/utils/featureFlags.ts"],"names":[],"mappings":";;;AACA,uDAA2E;AAC3E,qDAA0C;AAO1C,MAAM,qCAAqC,GAAG,GAAY,EAAE,CAC1D,+BAAY,CAAC,UAAU,CAAC,wDAAwD,CAAC,CAAC;AACpF,MAAM,oBAAoB,GAAG,GAAW,EAAE,CAAC,+BAAY,CAAC,SAAS,CAAC,uCAAuC,CAAC,CAAC;AAMpG,MAAM,qBAAqB,GAAG,KAAK,IAAqB,EAAE;IAC/D,IAAI,qCAAqC,EAAE,KAAK,KAAK,EAAE;QACrD,OAAO,CAAC,CAAC;KACV;IAED,IAAI,gCAAgC,EAAE,EAAE;QACtC,MAAM,sCAAsC,EAAE,CAAC;KAChD;IAED,MAAM,kBAAkB,GAAG,oBAAoB,EAAE,CAAC;IAClD,IAAI,kBAAkB,KAAK,CAAC,IAAI,kBAAkB,KAAK,CAAC,EAAE;QACxD,MAAM,IAAI,KAAK,CAAC,oDAAoD,kBAAkB,GAAG,CAAC,CAAC;KAC5F;IAED,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC;AAKF,MAAM,gCAAgC,GAAG,GAAY,EAAE,CAAC,qCAAqC,EAAE,IAAI,oBAAoB,EAAE,KAAK,CAAC,CAAC;AAKhI,MAAM,sCAAsC,GAAG,KAAK,IAAmB,EAAE;;IACvE,MAAM,WAAW,GAAG,MAAA,8BAAW,CAAC,eAAe,EAAE,mCAAI,OAAO,CAAC,GAAG,EAAE,CAAC;IAEnE,MAAM,MAAM,GAAG,+BAAY,CAAC,UAAU,CAAC,WAAW,EAAE,SAAS,EAAE;QAC7D,eAAe,EAAE,KAAK;QACtB,gBAAgB,EAAE,IAAI;KACvB,CAAC,CAAC;IAGH,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,kBAAkB,GAAG,CAAC,CAAC;IAC1D,+BAAY,CAAC,UAAU,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAC7C,MAAM,+BAAY,CAAC,YAAY,EAAE,CAAC;IAElC,yBAAO,CAAC,IAAI,CACV,0DAA0D,oBAAoB,EAAE,gDAAgD,qCAAqC,EAAE,uCACrK,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,kBACrC,wDAAwD,CACzD,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifyMissingPackages.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"notifyMissingPackages.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,UAAU,EAAU,MAAM,kBAAkB,CAAC;AAelF,eAAO,MAAM,qBAAqB,YAAa,UAAU,KAAG,IA8B3D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifyMissingPackages.js","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"notifyMissingPackages.js","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAkF;AAClF,qDAA0C;AAC1C,wDAA0B;AAC1B,gDAAwB;AACxB,kEAA+C;AAE/C,oEAAgF;AAChF,+CAA4C;AAE5C,MAAM,uBAAuB,GAAG,GAAyB,EAAE,CAAC,IAAI,kDAA+B,EAAE,CAAC,uBAAuB,EAAE,CAAC;AAMrH,MAAM,qBAAqB,GAAG,CAAC,OAAmB,EAAQ,EAAE;;IACjE,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,8BAAW,CAAC,mBAAmB,EAAE,CAAC;IACpF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QACpC,yBAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;QAC9F,OAAO;KACR;IACD,MAAM,YAAY,GAAG,gCAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAE,YAAuB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACxF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;QACnC,yBAAO,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;QACjF,OAAO;KACR;IACD,MAAM,WAAW,GAAG,gCAAa,CAAC,QAAQ,CAAC,eAAe,CAAgD,CAAC;IAC3G,uBAAuB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;QACvD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACrG,IAAI,CAAC,kBAAkB,EAAE;YACvB,yBAAO,CAAC,IAAI,CACV,iCAAiC,UAAU,CAAC,cAAc,0DAA0D,UAAU,CAAC,cAAc,IAAI,UAAU,CAAC,sBAAsB,QAAQ,UAAU,CAAC,MAAM,EAAE,CAC9M,CAAC;SACH;aAAM,IAAI,CAAC,IAAA,gBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,sBAAsB,CAAC,EAAE;YAC/G,yBAAO,CAAC,IAAI,CACV,yCAAyC,UAAU,CAAC,sBAAsB,SACxE,UAAU,CAAC,cACb,oCAAoC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,yBACrF,UAAU,CAAC,cACb,IAAI,UAAU,CAAC,sBAAsB,QAAQ,UAAU,CAAC,MAAM,EAAE,CACjE,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA9BW,QAAA,qBAAqB,yBA8BhC"}
|
|
@@ -1 +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,
|
|
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,EAAE,eAAe,EAAE,WAAW,EAAE,iBAAiB,EAAE,UAAU,EAAE,YAAY,EAA0B,MAAM,yBAAyB,CAAC;AAI5I,KAAK,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,eACV,iBAAiB,KAC7B,gBAAgB,eAAe,CAAC,EAkBlC,CAAC;AAMF,eAAO,MAAM,uBAAuB,YAAa,UAAU,gBAAgB,GAAG,EAAE,KAAG,gBAAgB,WAAW,CAAC,EAmB9G,CAAC;AAoBF,eAAO,MAAM,sBAAsB,YACxB,UAAU,eAEN,GAAG,EAAE,eACL,iBAAiB,sBACV,OAAO,KAC1B,gBAAgB,UAAU,CAAC,EAsC7B,CAAC"}
|
|
@@ -6,7 +6,7 @@ const codegen_ui_1 = require("@aws-amplify/codegen-ui");
|
|
|
6
6
|
const codegenResources_1 = require("./codegenResources");
|
|
7
7
|
const getUiBuilderComponentsPath_1 = require("./getUiBuilderComponentsPath");
|
|
8
8
|
const generateUiBuilderComponents = (context, componentSchemas, dataSchema) => {
|
|
9
|
-
const componentResults = componentSchemas.map(schema => {
|
|
9
|
+
const componentResults = componentSchemas.map((schema) => {
|
|
10
10
|
try {
|
|
11
11
|
const component = (0, codegenResources_1.createUiBuilderComponent)(context, schema, dataSchema);
|
|
12
12
|
return { resultType: 'SUCCESS', schema: component };
|
|
@@ -17,7 +17,7 @@ const generateUiBuilderComponents = (context, componentSchemas, dataSchema) => {
|
|
|
17
17
|
return { resultType: 'FAILURE', schemaName: schema.name, error: e };
|
|
18
18
|
}
|
|
19
19
|
});
|
|
20
|
-
amplify_prompts_1.printer.debug(`Generated ${componentResults.filter(result => result.resultType === 'SUCCESS').length} components in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
|
|
20
|
+
amplify_prompts_1.printer.debug(`Generated ${componentResults.filter((result) => result.resultType === 'SUCCESS').length} components in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
|
|
21
21
|
return componentResults;
|
|
22
22
|
};
|
|
23
23
|
exports.generateUiBuilderComponents = generateUiBuilderComponents;
|
|
@@ -25,7 +25,7 @@ const generateUiBuilderThemes = (context, themeSchemas) => {
|
|
|
25
25
|
if (themeSchemas.length === 0) {
|
|
26
26
|
return [generateDefaultTheme(context)];
|
|
27
27
|
}
|
|
28
|
-
const themeResults = themeSchemas.map(schema => {
|
|
28
|
+
const themeResults = themeSchemas.map((schema) => {
|
|
29
29
|
try {
|
|
30
30
|
const theme = (0, codegenResources_1.createUiBuilderTheme)(context, schema);
|
|
31
31
|
return { resultType: 'SUCCESS', schema: theme };
|
|
@@ -36,7 +36,7 @@ const generateUiBuilderThemes = (context, themeSchemas) => {
|
|
|
36
36
|
return { resultType: 'FAILURE', schemaName: schema.name, error: e };
|
|
37
37
|
}
|
|
38
38
|
});
|
|
39
|
-
amplify_prompts_1.printer.debug(`Generated ${themeResults.filter(result => result.resultType === 'SUCCESS').length} themes in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
|
|
39
|
+
amplify_prompts_1.printer.debug(`Generated ${themeResults.filter((result) => result.resultType === 'SUCCESS').length} themes in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
|
|
40
40
|
return themeResults;
|
|
41
41
|
};
|
|
42
42
|
exports.generateUiBuilderThemes = generateUiBuilderThemes;
|
|
@@ -70,7 +70,10 @@ const generateUiBuilderForms = (context, formSchemas, dataSchema, autoGenerateFo
|
|
|
70
70
|
amplify_prompts_1.printer.debug(`Failure caught processing ${schema.name}`);
|
|
71
71
|
amplify_prompts_1.printer.debug(e);
|
|
72
72
|
return {
|
|
73
|
-
resultType: 'FAILURE',
|
|
73
|
+
resultType: 'FAILURE',
|
|
74
|
+
schemaName: schema.name,
|
|
75
|
+
schema,
|
|
76
|
+
error: e,
|
|
74
77
|
};
|
|
75
78
|
}
|
|
76
79
|
};
|
|
@@ -82,7 +85,7 @@ const generateUiBuilderForms = (context, formSchemas, dataSchema, autoGenerateFo
|
|
|
82
85
|
return codegenForm(schema);
|
|
83
86
|
});
|
|
84
87
|
formResults.push(...(0, codegenResources_1.generateBaseForms)(modelMap).map(codegenForm));
|
|
85
|
-
amplify_prompts_1.printer.debug(`Generated ${formResults.filter(result => result.resultType === 'SUCCESS').length} forms in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
|
|
88
|
+
amplify_prompts_1.printer.debug(`Generated ${formResults.filter((result) => result.resultType === 'SUCCESS').length} forms in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
|
|
86
89
|
return formResults;
|
|
87
90
|
};
|
|
88
91
|
exports.generateUiBuilderForms = generateUiBuilderForms;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAE1C,
|
|
1
|
+
{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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"}
|
|
@@ -9,10 +9,7 @@ const prePushHandler = async (context) => {
|
|
|
9
9
|
return;
|
|
10
10
|
}
|
|
11
11
|
const studioClient = await clients_1.AmplifyStudioClient.setClientInfo(context);
|
|
12
|
-
const [formSchemas, localSchema] = await Promise.all([
|
|
13
|
-
studioClient.listForms(),
|
|
14
|
-
context.amplify.invokePluginMethod(context, 'codegen', undefined, 'getModelIntrospection', [context]),
|
|
15
|
-
]);
|
|
12
|
+
const [formSchemas, localSchema] = await Promise.all([studioClient.listForms(), context.amplify.invokePluginMethod(context, 'codegen', undefined, 'getModelIntrospection', [context])]);
|
|
16
13
|
if (!localSchema) {
|
|
17
14
|
amplify_prompts_1.printer.debug('Local schema not found');
|
|
18
15
|
return;
|
|
@@ -23,7 +20,7 @@ exports.prePushHandler = prePushHandler;
|
|
|
23
20
|
const printDetachedFormsWarning = (formSchemas, localSchema) => {
|
|
24
21
|
const modelNames = new Set(Object.keys(localSchema.models));
|
|
25
22
|
const detachedCustomForms = [];
|
|
26
|
-
formSchemas.entities.forEach(form => {
|
|
23
|
+
formSchemas.entities.forEach((form) => {
|
|
27
24
|
if ((0, utils_1.isFormDetachedFromModel)(form, modelNames) && (0, utils_1.isFormSchemaCustomized)(form)) {
|
|
28
25
|
detachedCustomForms.push(form.name);
|
|
29
26
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"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,
|
|
1
|
+
{"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
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/amplify-util-uibuilder",
|
|
3
|
-
"version": "1.6.8-beta.
|
|
3
|
+
"version": "1.6.8-beta.2",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@aws-amplify/codegen-ui": "2.8.0",
|
|
18
18
|
"@aws-amplify/codegen-ui-react": "2.8.0",
|
|
19
|
-
"amplify-cli-core": "4.0.0-beta.
|
|
20
|
-
"amplify-prompts": "2.6.4-beta.
|
|
19
|
+
"amplify-cli-core": "4.0.0-beta.7",
|
|
20
|
+
"amplify-prompts": "2.6.4-beta.2",
|
|
21
21
|
"aws-sdk": "^2.1233.0",
|
|
22
22
|
"fs-extra": "^8.1.0",
|
|
23
23
|
"ora": "^4.0.3",
|
|
@@ -71,5 +71,5 @@
|
|
|
71
71
|
"usePathForSuiteName": "true",
|
|
72
72
|
"addFileAttribute": "true"
|
|
73
73
|
},
|
|
74
|
-
"gitHead": "
|
|
74
|
+
"gitHead": "7286abc51cd2e1c20095d2780567360996468b38"
|
|
75
75
|
}
|
|
@@ -72,10 +72,12 @@ describe('can create a ui builder component', () => {
|
|
|
72
72
|
it('does not call renderSchemaToTemplate for index file if no schema', () => {
|
|
73
73
|
generateAmplifyUiBuilderIndexFile(context, []);
|
|
74
74
|
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).not.toBeCalled();
|
|
75
|
-
})
|
|
75
|
+
});
|
|
76
76
|
it('calls the renderManager for utils file w/ validation, formatter, and fetchByPath helpers if there is a form', () => {
|
|
77
77
|
generateAmplifyUiBuilderUtilFile(context, { hasForms: true, hasViews: false });
|
|
78
|
-
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledWith(
|
|
78
|
+
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledWith(
|
|
79
|
+
expect.arrayContaining(['validation', 'formatter', 'fetchByPath']),
|
|
80
|
+
);
|
|
79
81
|
});
|
|
80
82
|
it('calls the renderManager for utils file w/ formatter helper if there is a view', () => {
|
|
81
83
|
generateAmplifyUiBuilderUtilFile(context, { hasForms: false, hasViews: true });
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
// @aws-amplify/codegen-ui is in project dependencies
|
|
2
2
|
import { StudioSchema } from '@aws-amplify/codegen-ui'; // eslint-disable-line import/no-extraneous-dependencies
|
|
3
|
-
import {AmplifyStudioClient} from '../clients'; // eslint-disable-line import/no-extraneous-dependencies
|
|
4
|
-
import {
|
|
5
|
-
isFormDetachedFromModel, isFormSchemaCustomized, isStudioForm, deleteDetachedForms
|
|
6
|
-
} from '../commands/utils';
|
|
3
|
+
import { AmplifyStudioClient } from '../clients'; // eslint-disable-line import/no-extraneous-dependencies
|
|
4
|
+
import { isFormDetachedFromModel, isFormSchemaCustomized, isStudioForm, deleteDetachedForms } from '../commands/utils';
|
|
7
5
|
|
|
8
6
|
const amplifyStudioClientMock = AmplifyStudioClient as any;
|
|
9
7
|
|
|
@@ -38,7 +36,6 @@ const formWithFields: StudioSchema = {
|
|
|
38
36
|
};
|
|
39
37
|
|
|
40
38
|
describe('detachedFormCleanup', () => {
|
|
41
|
-
|
|
42
39
|
it('isStudioForm should return true', () => {
|
|
43
40
|
expect(isStudioForm(formWithNoCustomization)).toBe(true);
|
|
44
41
|
});
|
|
@@ -71,7 +68,7 @@ describe('detachedFormCleanup', () => {
|
|
|
71
68
|
it('should delete detached forms', async () => {
|
|
72
69
|
const mockedDeleteForm = jest.fn().mockReturnValue(undefined);
|
|
73
70
|
amplifyStudioClientMock.deleteForm = mockedDeleteForm;
|
|
74
|
-
await deleteDetachedForms([{id: '12345', name: 'BlogCreateForm'}], amplifyStudioClientMock);
|
|
71
|
+
await deleteDetachedForms([{ id: '12345', name: 'BlogCreateForm' }], amplifyStudioClientMock);
|
|
75
72
|
expect(mockedDeleteForm).toBeCalledTimes(1);
|
|
76
73
|
expect(mockedDeleteForm).toHaveBeenCalledWith('12345');
|
|
77
74
|
});
|
|
@@ -9,7 +9,7 @@ const utilsMock = utils as any;
|
|
|
9
9
|
|
|
10
10
|
utilsMock.shouldRenderComponents = jest.fn().mockReturnValue(true);
|
|
11
11
|
utilsMock.notifyMissingPackages = jest.fn().mockReturnValue(true);
|
|
12
|
-
utilsMock.getAmplifyDataSchema = jest.fn().mockReturnValue(
|
|
12
|
+
utilsMock.getAmplifyDataSchema = jest.fn().mockReturnValue({});
|
|
13
13
|
|
|
14
14
|
jest.mock('../commands/utils/featureFlags', () => ({
|
|
15
15
|
getTransformerVersion: jest.fn().mockReturnValue(2),
|
|
@@ -33,7 +33,8 @@ const mockedFeatureFlags = mocked(FeatureFlags);
|
|
|
33
33
|
|
|
34
34
|
const getMockedSchema = jest.fn(
|
|
35
35
|
// eslint-disable-next-line no-useless-escape, spellcheck/spell-checker
|
|
36
|
-
() =>
|
|
36
|
+
() =>
|
|
37
|
+
`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};`,
|
|
37
38
|
);
|
|
38
39
|
|
|
39
40
|
describe('should sync amplify backend models', () => {
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
}
|
|
2
|
+
"version": "1.0.0"
|
|
3
|
+
}
|
|
@@ -91,7 +91,9 @@ describe('handlePrePush', () => {
|
|
|
91
91
|
utilsMock.isFormSchemaCustomized = jest.fn().mockReturnValue(true);
|
|
92
92
|
const spy = jest.spyOn(printer, 'warn');
|
|
93
93
|
await prePushHandler(context);
|
|
94
|
-
expect(spy).toHaveBeenCalledWith(
|
|
94
|
+
expect(spy).toHaveBeenCalledWith(
|
|
95
|
+
'The following forms will no longer be available because the connected data model no longer exists: BlogCreateForm, BlogUpdateForm',
|
|
96
|
+
);
|
|
95
97
|
});
|
|
96
98
|
|
|
97
99
|
it('runs handlePrePush without schema', async () => {
|