@aws-amplify/amplify-util-uibuilder 1.5.0-studio-forms.0 → 1.5.0
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 +1 -2
- package/amplify-plugin.json +3 -10
- package/lib/clients/amplify-studio-client.d.ts +2 -13
- package/lib/clients/amplify-studio-client.d.ts.map +1 -1
- package/lib/clients/amplify-studio-client.js +4 -72
- package/lib/clients/amplify-studio-client.js.map +1 -1
- package/lib/commands/generateComponents.d.ts.map +1 -1
- package/lib/commands/generateComponents.js +15 -36
- package/lib/commands/generateComponents.js.map +1 -1
- package/lib/commands/help.d.ts +1 -1
- package/lib/commands/help.d.ts.map +1 -1
- package/lib/commands/help.js +2 -2
- package/lib/commands/help.js.map +1 -1
- package/lib/commands/utils/codegenResources.d.ts +2 -12
- package/lib/commands/utils/codegenResources.d.ts.map +1 -1
- package/lib/commands/utils/codegenResources.js +3 -70
- package/lib/commands/utils/codegenResources.js.map +1 -1
- package/lib/commands/utils/getUiBuilderComponentsPath.d.ts.map +1 -1
- package/lib/commands/utils/getUiBuilderComponentsPath.js.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts +20 -12
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js +3 -36
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js.map +1 -1
- package/lib/commands/version.d.ts +1 -1
- package/lib/commands/version.d.ts.map +1 -1
- package/lib/commands/version.js +2 -2
- package/lib/commands/version.js.map +1 -1
- package/lib/event-handlers/handle-PostEnvAdd.d.ts +1 -1
- package/lib/event-handlers/handle-PostEnvAdd.d.ts.map +1 -1
- package/lib/event-handlers/handle-PostEnvAdd.js +6 -4
- package/lib/event-handlers/handle-PostEnvAdd.js.map +1 -1
- package/lib/event-handlers/handle-PostPull.d.ts +1 -1
- package/lib/event-handlers/handle-PostPull.d.ts.map +1 -1
- package/lib/event-handlers/handle-PostPull.js +3 -4
- package/lib/event-handlers/handle-PostPull.js.map +1 -1
- package/package.json +7 -8
- package/src/__tests__/cloneComponentsFromEnv.test.ts +0 -11
- package/src/__tests__/createUiBuilderComponent.test.ts +1 -19
- package/src/__tests__/generateComponents.test.ts +1 -35
- package/src/__tests__/getAmplifyDataSchema.test.ts +3 -43
- package/src/__tests__/handleEvents.test.ts +21 -0
- package/src/__tests__/syncAmplifyUiComponents.test.ts +8 -111
- package/src/clients/amplify-studio-client.ts +63 -146
- package/src/commands/generateComponents.ts +16 -46
- package/src/commands/help.ts +2 -5
- package/src/commands/utils/codegenResources.ts +4 -108
- package/src/commands/utils/getUiBuilderComponentsPath.ts +2 -7
- package/src/commands/utils/syncAmplifyUiBuilderComponents.ts +29 -74
- package/src/commands/version.ts +2 -5
- package/src/event-handlers/handle-PostEnvAdd.ts +6 -8
- package/src/event-handlers/handle-PostPull.ts +3 -7
- package/tsconfig.tsbuildinfo +1 -1
- package/lib/commands/utils/featureFlags.d.ts +0 -3
- package/lib/commands/utils/featureFlags.d.ts.map +0 -1
- package/lib/commands/utils/featureFlags.js +0 -34
- package/lib/commands/utils/featureFlags.js.map +0 -1
- package/lib/event-handlers/handle-PostPush.d.ts +0 -3
- package/lib/event-handlers/handle-PostPush.d.ts.map +0 -1
- package/lib/event-handlers/handle-PostPush.js +0 -15
- package/lib/event-handlers/handle-PostPush.js.map +0 -1
- package/src/__tests__/utils.ts +0 -70
- package/src/commands/utils/featureFlags.ts +0 -61
- package/src/event-handlers/handle-PostPush.ts +0 -15
package/CHANGELOG.md
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
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.5.0
|
|
6
|
+
# [1.5.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.4.2...@aws-amplify/amplify-util-uibuilder@1.5.0) (2022-10-13)
|
|
7
7
|
|
|
8
8
|
|
|
9
9
|
### Bug Fixes
|
|
@@ -13,7 +13,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
|
|
|
13
13
|
|
|
14
14
|
### Features
|
|
15
15
|
|
|
16
|
-
* **amplify-util-uibuilder:** add studio forms ([e019c3c](https://github.com/aws-amplify/amplify-cli/commit/e019c3c26dac5b32fe769c36fbdbb4ceb58c41cf))
|
|
17
16
|
* **amplify-util-uibuilder:** update codegen-ui with responsive app support ([#11028](https://github.com/aws-amplify/amplify-cli/issues/11028)) ([2088309](https://github.com/aws-amplify/amplify-cli/commit/2088309f91f32069765cf514d91067600770a0ac))
|
|
18
17
|
|
|
19
18
|
|
package/amplify-plugin.json
CHANGED
|
@@ -1,13 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "ui-builder",
|
|
3
3
|
"type": "util",
|
|
4
|
-
"commands": [
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
"generateComponents"
|
|
8
|
-
],
|
|
9
|
-
"eventHandlers": [
|
|
10
|
-
"PostEnvAdd",
|
|
11
|
-
"PostPush"
|
|
12
|
-
]
|
|
13
|
-
}
|
|
4
|
+
"commands": ["version", "cloneComponentsFromEnv", "generateComponents"],
|
|
5
|
+
"eventHandlers": ["PostEnvAdd"]
|
|
6
|
+
}
|
|
@@ -1,28 +1,17 @@
|
|
|
1
|
-
import { $TSContext } from 'amplify-cli-core';
|
|
1
|
+
import type { $TSContext } from 'amplify-cli-core';
|
|
2
2
|
import type { ServiceConfigurationOptions } from 'aws-sdk/lib/service';
|
|
3
|
-
import type { CreateComponentData, Component, Theme
|
|
4
|
-
export declare type StudioMetadata = {
|
|
5
|
-
autoGenerateForms: boolean;
|
|
6
|
-
autoGenerateViews: boolean;
|
|
7
|
-
};
|
|
3
|
+
import type { CreateComponentData, Component, Theme } from 'aws-sdk/clients/amplifyuibuilder';
|
|
8
4
|
export default class AmplifyStudioClient {
|
|
9
5
|
#private;
|
|
10
|
-
metadata: StudioMetadata;
|
|
11
|
-
isSupportedGraphQL: boolean;
|
|
12
6
|
static setClientInfo(context: $TSContext, envName?: string, appId?: string): Promise<AmplifyStudioClient>;
|
|
13
7
|
constructor(awsConfigInfo: ServiceConfigurationOptions, appId: string, envName: string);
|
|
14
|
-
loadMetadata: (envName?: string | undefined, appId?: string | undefined) => Promise<void>;
|
|
15
8
|
listComponents: (envName?: string | undefined, appId?: string | undefined) => Promise<{
|
|
16
9
|
entities: Component[];
|
|
17
10
|
}>;
|
|
18
11
|
listThemes: (envName?: string | undefined, appId?: string | undefined) => Promise<{
|
|
19
12
|
entities: Theme[];
|
|
20
13
|
}>;
|
|
21
|
-
listForms: (envName?: string | undefined, appId?: string | undefined) => Promise<{
|
|
22
|
-
entities: Form[];
|
|
23
|
-
}>;
|
|
24
14
|
createComponent: (component: CreateComponentData, envName?: string | undefined, appId?: string | undefined) => Promise<Component | undefined>;
|
|
25
15
|
getModels: (resourceName: string, envName?: string | undefined, appId?: string | undefined) => Promise<string | undefined>;
|
|
26
|
-
isAmplifyApp: (context: $TSContext) => Promise<boolean>;
|
|
27
16
|
}
|
|
28
17
|
//# sourceMappingURL=amplify-studio-client.d.ts.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"amplify-studio-client.d.ts","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EAAE,mBAAmB,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAwC9F,MAAM,CAAC,OAAO,OAAO,mBAAmB;;WAQzB,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC;gBAcnG,aAAa,EAAE,2BAA2B,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM;IAUtF,cAAc,gEAA6C,QAAQ;QAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;KAAE,CAAC,CAuB5F;IAKF,UAAU,gEAA6C,QAAQ;QAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;KAAE,CAAC,CAwBpF;IAED,eAAe,cAAqB,mBAAmB,+DAAqC,QAAQ,SAAS,GAAG,SAAS,CAAC,CAczH;IAED,SAAS,iBAAwB,MAAM,+DAAqC,QAAQ,MAAM,GAAG,SAAS,CAAC,CAetG;CACD"}
|
|
@@ -12,11 +12,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
12
12
|
};
|
|
13
13
|
var _AmplifyStudioClient_amplifyUiBuilder, _AmplifyStudioClient_amplifyBackend, _AmplifyStudioClient_appId, _AmplifyStudioClient_envName;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
-
const amplify_cli_core_1 = require("amplify-cli-core");
|
|
16
15
|
const aws_sdk_1 = require("aws-sdk");
|
|
17
16
|
const amplify_prompts_1 = require("amplify-prompts");
|
|
18
17
|
const environmentHelpers_1 = require("../commands/utils/environmentHelpers");
|
|
19
|
-
const featureFlags_1 = require("../commands/utils/featureFlags");
|
|
20
18
|
const buildAmplifyBackendClient = (awsConfigInfo) => {
|
|
21
19
|
const awsConfig = { ...awsConfigInfo };
|
|
22
20
|
if (process.env.AMPLIFY_BACKEND_ENDPOINT) {
|
|
@@ -43,28 +41,6 @@ class AmplifyStudioClient {
|
|
|
43
41
|
_AmplifyStudioClient_amplifyBackend.set(this, void 0);
|
|
44
42
|
_AmplifyStudioClient_appId.set(this, void 0);
|
|
45
43
|
_AmplifyStudioClient_envName.set(this, void 0);
|
|
46
|
-
this.isSupportedGraphQL = false;
|
|
47
|
-
this.loadMetadata = async (envName, appId) => {
|
|
48
|
-
var _a, _b;
|
|
49
|
-
const environmentName = envName || __classPrivateFieldGet(this, _AmplifyStudioClient_envName, "f");
|
|
50
|
-
const resolvedAppId = appId || __classPrivateFieldGet(this, _AmplifyStudioClient_appId, "f");
|
|
51
|
-
try {
|
|
52
|
-
const response = await __classPrivateFieldGet(this, _AmplifyStudioClient_amplifyUiBuilder, "f")
|
|
53
|
-
.getMetadata({
|
|
54
|
-
appId: resolvedAppId,
|
|
55
|
-
environmentName,
|
|
56
|
-
})
|
|
57
|
-
.promise();
|
|
58
|
-
this.metadata = {
|
|
59
|
-
autoGenerateForms: ((_a = response.features) === null || _a === void 0 ? void 0 : _a.autoGenerateForms) === 'true',
|
|
60
|
-
autoGenerateViews: ((_b = response.features) === null || _b === void 0 ? void 0 : _b.autoGenerateViews) === 'true',
|
|
61
|
-
};
|
|
62
|
-
}
|
|
63
|
-
catch (e) {
|
|
64
|
-
amplify_prompts_1.printer.debug(e.toString());
|
|
65
|
-
throw e;
|
|
66
|
-
}
|
|
67
|
-
};
|
|
68
44
|
this.listComponents = async (envName, appId) => {
|
|
69
45
|
const environmentName = envName || __classPrivateFieldGet(this, _AmplifyStudioClient_envName, "f");
|
|
70
46
|
const resolvedAppId = appId || __classPrivateFieldGet(this, _AmplifyStudioClient_appId, "f");
|
|
@@ -115,42 +91,15 @@ class AmplifyStudioClient {
|
|
|
115
91
|
throw e;
|
|
116
92
|
}
|
|
117
93
|
};
|
|
118
|
-
this.listForms = async (envName, appId) => {
|
|
119
|
-
const environmentName = envName || __classPrivateFieldGet(this, _AmplifyStudioClient_envName, "f");
|
|
120
|
-
const resolvedAppId = appId || __classPrivateFieldGet(this, _AmplifyStudioClient_appId, "f");
|
|
121
|
-
try {
|
|
122
|
-
let nextToken;
|
|
123
|
-
const uibuilderForms = [];
|
|
124
|
-
do {
|
|
125
|
-
const response = await __classPrivateFieldGet(this, _AmplifyStudioClient_amplifyUiBuilder, "f")
|
|
126
|
-
.exportForms({
|
|
127
|
-
appId: resolvedAppId,
|
|
128
|
-
environmentName,
|
|
129
|
-
nextToken,
|
|
130
|
-
})
|
|
131
|
-
.promise();
|
|
132
|
-
uibuilderForms.push(...response.entities);
|
|
133
|
-
nextToken = response.nextToken;
|
|
134
|
-
} while (nextToken);
|
|
135
|
-
amplify_prompts_1.printer.debug(JSON.stringify(uibuilderForms, null, 2));
|
|
136
|
-
return { entities: uibuilderForms };
|
|
137
|
-
}
|
|
138
|
-
catch (e) {
|
|
139
|
-
amplify_prompts_1.printer.debug(e);
|
|
140
|
-
throw e;
|
|
141
|
-
}
|
|
142
|
-
};
|
|
143
94
|
this.createComponent = async (component, envName, appId) => {
|
|
144
95
|
const environmentName = envName || __classPrivateFieldGet(this, _AmplifyStudioClient_envName, "f");
|
|
145
96
|
const resolvedAppId = appId || __classPrivateFieldGet(this, _AmplifyStudioClient_appId, "f");
|
|
146
97
|
try {
|
|
147
|
-
const response = await __classPrivateFieldGet(this, _AmplifyStudioClient_amplifyUiBuilder, "f")
|
|
148
|
-
.createComponent({
|
|
98
|
+
const response = await __classPrivateFieldGet(this, _AmplifyStudioClient_amplifyUiBuilder, "f").createComponent({
|
|
149
99
|
appId: resolvedAppId,
|
|
150
100
|
environmentName,
|
|
151
101
|
componentToCreate: component,
|
|
152
|
-
})
|
|
153
|
-
.promise();
|
|
102
|
+
}).promise();
|
|
154
103
|
return response.entity;
|
|
155
104
|
}
|
|
156
105
|
catch (err) {
|
|
@@ -162,8 +111,7 @@ class AmplifyStudioClient {
|
|
|
162
111
|
try {
|
|
163
112
|
const environmentName = envName || __classPrivateFieldGet(this, _AmplifyStudioClient_envName, "f");
|
|
164
113
|
const resolvedAppId = appId || __classPrivateFieldGet(this, _AmplifyStudioClient_appId, "f");
|
|
165
|
-
const { Models } = await __classPrivateFieldGet(this, _AmplifyStudioClient_amplifyBackend, "f")
|
|
166
|
-
.getBackendAPIModels({
|
|
114
|
+
const { Models } = await __classPrivateFieldGet(this, _AmplifyStudioClient_amplifyBackend, "f").getBackendAPIModels({
|
|
167
115
|
AppId: resolvedAppId,
|
|
168
116
|
BackendEnvironmentName: environmentName,
|
|
169
117
|
ResourceName: resourceName,
|
|
@@ -176,18 +124,10 @@ class AmplifyStudioClient {
|
|
|
176
124
|
throw new Error(`Models not found in AmplifyBackend:GetBackendAPIModels response: ${e.message}`);
|
|
177
125
|
}
|
|
178
126
|
};
|
|
179
|
-
this.isAmplifyApp = async (context) => {
|
|
180
|
-
const { isAdminApp } = await amplify_cli_core_1.CloudformationProviderFacade.isAmplifyAdminApp(context, __classPrivateFieldGet(this, _AmplifyStudioClient_appId, "f"));
|
|
181
|
-
return isAdminApp;
|
|
182
|
-
};
|
|
183
127
|
__classPrivateFieldSet(this, _AmplifyStudioClient_amplifyUiBuilder, buildAmplifyUiBuilderClient(awsConfigInfo), "f");
|
|
184
128
|
__classPrivateFieldSet(this, _AmplifyStudioClient_amplifyBackend, buildAmplifyBackendClient(awsConfigInfo), "f");
|
|
185
129
|
__classPrivateFieldSet(this, _AmplifyStudioClient_appId, appId, "f");
|
|
186
130
|
__classPrivateFieldSet(this, _AmplifyStudioClient_envName, envName, "f");
|
|
187
|
-
this.metadata = {
|
|
188
|
-
autoGenerateForms: false,
|
|
189
|
-
autoGenerateViews: false,
|
|
190
|
-
};
|
|
191
131
|
}
|
|
192
132
|
static async setClientInfo(context, envName, appId) {
|
|
193
133
|
const resolvedEnvName = (0, environmentHelpers_1.getEnvName)(context, envName);
|
|
@@ -197,15 +137,7 @@ class AmplifyStudioClient {
|
|
|
197
137
|
resolvedEnvName,
|
|
198
138
|
resolvedAppId,
|
|
199
139
|
]));
|
|
200
|
-
|
|
201
|
-
if ((await (0, featureFlags_1.getTransformerVersion)(context)) === 2) {
|
|
202
|
-
await client.loadMetadata();
|
|
203
|
-
client.isSupportedGraphQL = true;
|
|
204
|
-
}
|
|
205
|
-
else {
|
|
206
|
-
client.isSupportedGraphQL = false;
|
|
207
|
-
}
|
|
208
|
-
return client;
|
|
140
|
+
return new AmplifyStudioClient(awsConfigInfo, resolvedAppId, resolvedEnvName);
|
|
209
141
|
}
|
|
210
142
|
}
|
|
211
143
|
exports.default = AmplifyStudioClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amplify-studio-client.js","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;
|
|
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":"generateComponents.d.ts","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generateComponents.d.ts","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAc9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,CAkD3D,CAAC"}
|
|
@@ -15,54 +15,33 @@ const run = async (context) => {
|
|
|
15
15
|
const spinner = (0, ora_1.default)('');
|
|
16
16
|
try {
|
|
17
17
|
const studioClient = await clients_1.AmplifyStudioClient.setClientInfo(context);
|
|
18
|
-
|
|
19
|
-
return;
|
|
20
|
-
}
|
|
21
|
-
const [componentSchemas, themeSchemas, formSchemas, dataSchema] = await Promise.all([
|
|
18
|
+
const [componentSchemas, themeSchemas, dataSchema] = await Promise.all([
|
|
22
19
|
studioClient.listComponents(),
|
|
23
20
|
studioClient.listThemes(),
|
|
24
|
-
studioClient.listForms(),
|
|
25
21
|
(0, utils_1.getAmplifyDataSchema)(studioClient),
|
|
26
22
|
]);
|
|
27
|
-
|
|
28
|
-
if (nothingWouldAutogen && [componentSchemas, themeSchemas, formSchemas].every(group => !group.entities.length)) {
|
|
23
|
+
if (componentSchemas.entities.length === 0 && themeSchemas.entities.length === 0) {
|
|
29
24
|
amplify_prompts_1.printer.debug('Skipping UI component generation since none are found.');
|
|
30
25
|
return;
|
|
31
26
|
}
|
|
32
27
|
spinner.start('Generating UI components...');
|
|
33
|
-
const
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
if (key === 'form') {
|
|
46
|
-
hasSuccessfulForm = true;
|
|
47
|
-
}
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
failedResponseNames.push(result.schemaName);
|
|
51
|
-
}
|
|
52
|
-
});
|
|
53
|
-
});
|
|
54
|
-
(0, utils_1.generateAmplifyUiBuilderIndexFile)(context, successfulSchemas);
|
|
55
|
-
(0, utils_1.generateAmplifyUiBuilderUtilFile)(context, { hasForms: hasSuccessfulForm, hasViews: false });
|
|
56
|
-
if (failedResponseNames.length > 0) {
|
|
57
|
-
spinner.fail(`Failed to sync the following components: ${failedResponseNames.join(', ')}`);
|
|
28
|
+
const generatedComponentResults = (0, utils_1.generateUiBuilderComponents)(context, componentSchemas.entities, dataSchema);
|
|
29
|
+
const generatedThemeResults = (0, utils_1.generateUiBuilderThemes)(context, themeSchemas.entities);
|
|
30
|
+
(0, utils_1.generateAmplifyUiBuilderIndexFile)(context, [
|
|
31
|
+
...generatedComponentResults.filter(({ resultType }) => resultType === 'SUCCESS').map(({ component }) => component),
|
|
32
|
+
...generatedThemeResults.filter(({ resultType }) => resultType === 'SUCCESS').map(({ theme }) => theme),
|
|
33
|
+
]);
|
|
34
|
+
const failedSchemas = [
|
|
35
|
+
...generatedComponentResults.filter(({ resultType }) => resultType === 'FAILURE').map(({ schemaName }) => schemaName),
|
|
36
|
+
...generatedThemeResults.filter(({ resultType }) => resultType === 'FAILURE').map(({ schemaName }) => schemaName),
|
|
37
|
+
];
|
|
38
|
+
if (failedSchemas.length > 0) {
|
|
39
|
+
spinner.fail(`Failed to sync the following components: ${failedSchemas.join(', ')}`);
|
|
58
40
|
}
|
|
59
41
|
else {
|
|
60
42
|
spinner.succeed('Synced UI components.');
|
|
61
43
|
}
|
|
62
|
-
const invalidComponentNames =
|
|
63
|
-
...componentSchemas.entities.filter(component => !component.schemaVersion).map(component => component.name),
|
|
64
|
-
...formSchemas.entities.filter(form => !form.schemaVersion).map(form => form.name),
|
|
65
|
-
];
|
|
44
|
+
const invalidComponentNames = componentSchemas.entities.filter(component => !component.schemaVersion).map(component => component.name);
|
|
66
45
|
if (invalidComponentNames.length) {
|
|
67
46
|
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.`);
|
|
68
47
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"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"}
|
package/lib/commands/help.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare
|
|
1
|
+
export declare function run(): Promise<void>;
|
|
2
2
|
//# sourceMappingURL=help.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/commands/help.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/commands/help.ts"],"names":[],"mappings":"AAEA,wBAAsB,GAAG,kBAExB"}
|
package/lib/commands/help.js
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.run = void 0;
|
|
4
4
|
const amplify_prompts_1 = require("amplify-prompts");
|
|
5
|
-
|
|
5
|
+
async function run() {
|
|
6
6
|
amplify_prompts_1.printer.info('Supported commands: generateComponents, cloneComponentsFromEnv');
|
|
7
|
-
}
|
|
7
|
+
}
|
|
8
8
|
exports.run = run;
|
|
9
9
|
//# sourceMappingURL=help.js.map
|
package/lib/commands/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/commands/help.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/commands/help.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAEnC,KAAK,UAAU,GAAG;IACvB,yBAAO,CAAC,IAAI,CAAC,gEAAgE,CAAC,CAAC;AACjF,CAAC;AAFD,kBAEC"}
|
|
@@ -1,18 +1,8 @@
|
|
|
1
|
-
import { StudioComponent, StudioTheme,
|
|
1
|
+
import { StudioComponent, StudioTheme, RenderTextComponentResponse, GenericDataSchema } from '@aws-amplify/codegen-ui';
|
|
2
2
|
import { $TSContext } from 'amplify-cli-core';
|
|
3
3
|
import { AmplifyStudioClient } from '../../clients';
|
|
4
4
|
export declare const createUiBuilderComponent: (context: $TSContext, schema: StudioComponent, dataSchema?: GenericDataSchema | undefined) => StudioComponent;
|
|
5
5
|
export declare const createUiBuilderTheme: (context: $TSContext, schema: StudioTheme) => StudioTheme;
|
|
6
|
-
export declare const
|
|
7
|
-
export declare const generateAmplifyUiBuilderIndexFile: (context: $TSContext, schemas: StudioSchema[]) => void;
|
|
8
|
-
declare type UtilFileChecks = {
|
|
9
|
-
hasForms: boolean;
|
|
10
|
-
hasViews: boolean;
|
|
11
|
-
};
|
|
12
|
-
export declare const generateAmplifyUiBuilderUtilFile: (context: $TSContext, { hasForms, hasViews }: UtilFileChecks) => void;
|
|
6
|
+
export declare const generateAmplifyUiBuilderIndexFile: (context: $TSContext, schemas: StudioComponent[]) => RenderTextComponentResponse;
|
|
13
7
|
export declare const getAmplifyDataSchema: (studioClient: AmplifyStudioClient) => Promise<GenericDataSchema | undefined>;
|
|
14
|
-
export declare const generateBaseForms: (modelMap: {
|
|
15
|
-
[model: string]: Set<"create" | "update">;
|
|
16
|
-
}) => StudioForm[];
|
|
17
|
-
export {};
|
|
18
8
|
//# sourceMappingURL=codegenResources.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegenResources.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EACf,WAAW,
|
|
1
|
+
{"version":3,"file":"codegenResources.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":"AAEA,OAAO,EAEL,eAAe,EACf,WAAW,EAIX,2BAA2B,EAC3B,iBAAiB,EAElB,MAAM,yBAAyB,CAAC;AAUjC,OAAO,EACL,UAAU,EACX,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAYpD,eAAO,MAAM,wBAAwB,YAAa,UAAU,UAAU,eAAe,iDAAmC,eAcvH,CAAC;AAKF,eAAO,MAAM,oBAAoB,YAAa,UAAU,UAAU,WAAW,KAAG,WA0B/E,CAAC;AAKF,eAAO,MAAM,iCAAiC,YAAa,UAAU,WAAW,eAAe,EAAE,KAAG,2BAwBnG,CAAC;AAMF,eAAO,MAAM,oBAAoB,iBACjB,mBAAmB,KAChC,QAAQ,iBAAiB,GAAG,SAAS,CAmBvC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getAmplifyDataSchema = exports.generateAmplifyUiBuilderIndexFile = exports.createUiBuilderTheme = exports.createUiBuilderComponent = void 0;
|
|
4
4
|
const codegen_ui_1 = require("@aws-amplify/codegen-ui");
|
|
5
5
|
const codegen_ui_react_1 = require("@aws-amplify/codegen-ui-react");
|
|
6
6
|
const amplify_prompts_1 = require("amplify-prompts");
|
|
@@ -42,34 +42,15 @@ const createUiBuilderTheme = (context, schema) => {
|
|
|
42
42
|
}
|
|
43
43
|
};
|
|
44
44
|
exports.createUiBuilderTheme = createUiBuilderTheme;
|
|
45
|
-
const createUiBuilderForm = (context, schema, dataSchema) => {
|
|
46
|
-
const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
|
|
47
|
-
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((form) => new codegen_ui_react_1.AmplifyFormRenderer(form, dataSchema, config));
|
|
48
|
-
const outputPathDir = uiBuilderComponentsPath;
|
|
49
|
-
const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
|
|
50
|
-
outputPathDir,
|
|
51
|
-
});
|
|
52
|
-
try {
|
|
53
|
-
rendererManager.renderSchemaToTemplate(schema);
|
|
54
|
-
return schema;
|
|
55
|
-
}
|
|
56
|
-
catch (e) {
|
|
57
|
-
amplify_prompts_1.printer.debug(e);
|
|
58
|
-
amplify_prompts_1.printer.debug('Skipping invalid form with schema');
|
|
59
|
-
amplify_prompts_1.printer.debug(JSON.stringify(schema, null, 2));
|
|
60
|
-
throw e;
|
|
61
|
-
}
|
|
62
|
-
};
|
|
63
|
-
exports.createUiBuilderForm = createUiBuilderForm;
|
|
64
45
|
const generateAmplifyUiBuilderIndexFile = (context, schemas) => {
|
|
65
46
|
const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
|
|
66
|
-
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((
|
|
47
|
+
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_1.ReactIndexStudioTemplateRenderer(component, config));
|
|
67
48
|
const outputPathDir = uiBuilderComponentsPath;
|
|
68
49
|
const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
|
|
69
50
|
outputPathDir,
|
|
70
51
|
});
|
|
71
52
|
try {
|
|
72
|
-
rendererManager.renderSchemaToTemplate(schemas);
|
|
53
|
+
return rendererManager.renderSchemaToTemplate(schemas);
|
|
73
54
|
}
|
|
74
55
|
catch (e) {
|
|
75
56
|
amplify_prompts_1.printer.debug(e);
|
|
@@ -78,39 +59,8 @@ const generateAmplifyUiBuilderIndexFile = (context, schemas) => {
|
|
|
78
59
|
}
|
|
79
60
|
};
|
|
80
61
|
exports.generateAmplifyUiBuilderIndexFile = generateAmplifyUiBuilderIndexFile;
|
|
81
|
-
const generateAmplifyUiBuilderUtilFile = (context, { hasForms, hasViews }) => {
|
|
82
|
-
const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
|
|
83
|
-
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((utils) => (new codegen_ui_react_1.ReactUtilsStudioTemplateRenderer(utils, config)));
|
|
84
|
-
const outputPathDir = uiBuilderComponentsPath;
|
|
85
|
-
const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
|
|
86
|
-
outputPathDir,
|
|
87
|
-
});
|
|
88
|
-
const utils = new Set();
|
|
89
|
-
if (hasForms) {
|
|
90
|
-
utils.add('validation');
|
|
91
|
-
utils.add('formatter');
|
|
92
|
-
utils.add('fetchByPath');
|
|
93
|
-
}
|
|
94
|
-
if (hasViews) {
|
|
95
|
-
utils.add('formatter');
|
|
96
|
-
}
|
|
97
|
-
try {
|
|
98
|
-
if (utils.size) {
|
|
99
|
-
rendererManager.renderSchemaToTemplate([...utils]);
|
|
100
|
-
}
|
|
101
|
-
}
|
|
102
|
-
catch (e) {
|
|
103
|
-
amplify_prompts_1.printer.debug(e);
|
|
104
|
-
amplify_prompts_1.printer.debug('Failed to generate component index file');
|
|
105
|
-
throw e;
|
|
106
|
-
}
|
|
107
|
-
};
|
|
108
|
-
exports.generateAmplifyUiBuilderUtilFile = generateAmplifyUiBuilderUtilFile;
|
|
109
62
|
const getAmplifyDataSchema = async (studioClient) => {
|
|
110
63
|
var _a;
|
|
111
|
-
if (!studioClient.isSupportedGraphQL) {
|
|
112
|
-
return undefined;
|
|
113
|
-
}
|
|
114
64
|
try {
|
|
115
65
|
const meta = amplify_cli_core_1.stateManager.getMeta();
|
|
116
66
|
const resourceName = (_a = Object.entries(meta[amplify_cli_core_1.AmplifyCategories.API]).find(([, value]) => value.service === amplify_cli_core_1.AmplifySupportedService.APPSYNC)) === null || _a === void 0 ? void 0 : _a[0];
|
|
@@ -130,21 +80,4 @@ const getAmplifyDataSchema = async (studioClient) => {
|
|
|
130
80
|
}
|
|
131
81
|
};
|
|
132
82
|
exports.getAmplifyDataSchema = getAmplifyDataSchema;
|
|
133
|
-
const generateBaseForms = (modelMap) => {
|
|
134
|
-
const getSchema = (name, type) => ({
|
|
135
|
-
name: `${name}${type === 'create' ? 'CreateForm' : 'UpdateForm'}`,
|
|
136
|
-
formActionType: type,
|
|
137
|
-
dataType: { dataSourceType: 'DataStore', dataTypeName: name },
|
|
138
|
-
fields: {},
|
|
139
|
-
sectionalElements: {},
|
|
140
|
-
style: {},
|
|
141
|
-
cta: {},
|
|
142
|
-
});
|
|
143
|
-
const schemas = [];
|
|
144
|
-
Object.entries(modelMap).forEach(([name, set]) => {
|
|
145
|
-
set.forEach(type => schemas.push(getSchema(name, type)));
|
|
146
|
-
});
|
|
147
|
-
return schemas;
|
|
148
|
-
};
|
|
149
|
-
exports.generateBaseForms = generateBaseForms;
|
|
150
83
|
//# sourceMappingURL=codegenResources.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegenResources.js","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":";;;AAEA,
|
|
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":"getUiBuilderComponentsPath.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/getUiBuilderComponentsPath.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getUiBuilderComponentsPath.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/getUiBuilderComponentsPath.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,eAAO,MAAM,0BAA0B,YAAa,UAAU,WAU7D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getUiBuilderComponentsPath.js","sourceRoot":"","sources":["../../../src/commands/utils/getUiBuilderComponentsPath.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwB;AACxB,wDAA0B;
|
|
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"}
|
|
@@ -1,17 +1,25 @@
|
|
|
1
1
|
import { $TSContext } from 'amplify-cli-core';
|
|
2
|
-
import { StudioComponent, StudioTheme, GenericDataSchema
|
|
3
|
-
declare
|
|
4
|
-
resultType:
|
|
5
|
-
|
|
6
|
-
schemaName?:
|
|
2
|
+
import { StudioComponent, StudioTheme, GenericDataSchema } from '@aws-amplify/codegen-ui';
|
|
3
|
+
export declare const generateUiBuilderComponents: (context: $TSContext, componentSchemas: any[], dataSchema?: GenericDataSchema | undefined) => ({
|
|
4
|
+
resultType: string;
|
|
5
|
+
component: StudioComponent;
|
|
6
|
+
schemaName?: undefined;
|
|
7
|
+
error?: undefined;
|
|
7
8
|
} | {
|
|
8
|
-
resultType:
|
|
9
|
+
resultType: string;
|
|
9
10
|
schemaName: string;
|
|
10
11
|
error: Error;
|
|
11
|
-
|
|
12
|
-
};
|
|
13
|
-
export declare const
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
12
|
+
component?: undefined;
|
|
13
|
+
})[];
|
|
14
|
+
export declare const generateUiBuilderThemes: (context: $TSContext, themeSchemas: any[]) => ({
|
|
15
|
+
resultType: string;
|
|
16
|
+
theme: StudioTheme;
|
|
17
|
+
schemaName?: undefined;
|
|
18
|
+
error?: undefined;
|
|
19
|
+
} | {
|
|
20
|
+
resultType: string;
|
|
21
|
+
schemaName: string;
|
|
22
|
+
error: Error;
|
|
23
|
+
theme?: undefined;
|
|
24
|
+
})[];
|
|
17
25
|
//# sourceMappingURL=syncAmplifyUiBuilderComponents.d.ts.map
|
|
@@ -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,EACL,eAAe,EAAE,WAAW,EAAE,iBAAiB,
|
|
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"}
|