@aws-amplify/amplify-util-uibuilder 1.5.0-studio-forms.0 → 1.6.0-beta.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 +44 -2
- package/lib/clients/amplify-studio-client.d.ts +2 -2
- package/lib/clients/amplify-studio-client.d.ts.map +1 -1
- package/lib/clients/amplify-studio-client.js +30 -30
- package/lib/clients/amplify-studio-client.js.map +1 -1
- package/lib/commands/generateComponents.d.ts.map +1 -1
- package/lib/commands/generateComponents.js +2 -5
- package/lib/commands/generateComponents.js.map +1 -1
- package/lib/commands/utils/codegenResources.d.ts +2 -1
- package/lib/commands/utils/codegenResources.d.ts.map +1 -1
- package/lib/commands/utils/codegenResources.js +3 -3
- package/lib/commands/utils/codegenResources.js.map +1 -1
- package/lib/commands/utils/featureFlags.d.ts +1 -2
- package/lib/commands/utils/featureFlags.d.ts.map +1 -1
- package/lib/commands/utils/featureFlags.js +5 -4
- package/lib/commands/utils/featureFlags.js.map +1 -1
- package/lib/commands/utils/shouldRenderComponents.d.ts +1 -1
- package/lib/commands/utils/shouldRenderComponents.d.ts.map +1 -1
- package/lib/commands/utils/shouldRenderComponents.js +14 -8
- package/lib/commands/utils/shouldRenderComponents.js.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js +15 -0
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js.map +1 -1
- package/package.json +7 -7
- package/src/__tests__/cloneComponentsFromEnv.test.ts +11 -11
- package/src/__tests__/createUiBuilderComponent.test.ts +7 -2
- package/src/__tests__/generateComponents.test.ts +27 -32
- package/src/__tests__/getAmplifyDataSchema.test.ts +17 -25
- package/src/__tests__/shouldRenderComponents.test.ts +51 -4
- package/src/__tests__/syncAmplifyUiComponents.test.ts +19 -4
- package/src/clients/amplify-studio-client.ts +31 -26
- package/src/commands/generateComponents.ts +2 -5
- package/src/commands/utils/codegenResources.ts +8 -3
- package/src/commands/utils/featureFlags.ts +6 -5
- package/src/commands/utils/shouldRenderComponents.ts +20 -8
- package/src/commands/utils/syncAmplifyUiBuilderComponents.ts +25 -3
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,7 +3,50 @@
|
|
|
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
|
+
# [1.6.0-beta.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.0-cdkv2.0...@aws-amplify/amplify-util-uibuilder@1.6.0-beta.0) (2022-11-17)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* generate default theme if user has no themes ([#11343](https://github.com/aws-amplify/amplify-cli/issues/11343)) ([13a02ac](https://github.com/aws-amplify/amplify-cli/commit/13a02ac32de717a518336871b1c741aa2714562b))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
# [1.6.0-cdkv2.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.0-cdkv2.0...@aws-amplify/amplify-util-uibuilder@1.6.0-cdkv2.2) (2022-11-10)
|
|
18
|
+
|
|
19
|
+
**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
# [1.6.0-cdkv2.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.0-cdkv2.0...@aws-amplify/amplify-util-uibuilder@1.6.0-cdkv2.1) (2022-11-10)
|
|
26
|
+
|
|
27
|
+
**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
|
|
28
|
+
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
|
|
32
|
+
|
|
33
|
+
# [1.6.0-cdkv2.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.5.0...@aws-amplify/amplify-util-uibuilder@1.6.0-cdkv2.0) (2022-11-01)
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
### Bug Fixes
|
|
37
|
+
|
|
38
|
+
* **amplify-util-uibuilder:** make studio app check static ([#11220](https://github.com/aws-amplify/amplify-cli/issues/11220)) ([b1fdc86](https://github.com/aws-amplify/amplify-cli/commit/b1fdc8634f10da558272aa2e98dfdffc28edd74c))
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
### Features
|
|
42
|
+
|
|
43
|
+
* **amplify-util-uibuilder:** add studio forms ([#11165](https://github.com/aws-amplify/amplify-cli/issues/11165)) ([6f15294](https://github.com/aws-amplify/amplify-cli/commit/6f15294d6809639c7d7e7d3aa4378df894168b0b))
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
|
|
49
|
+
# [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
50
|
|
|
8
51
|
|
|
9
52
|
### Bug Fixes
|
|
@@ -13,7 +56,6 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
|
|
|
13
56
|
|
|
14
57
|
### Features
|
|
15
58
|
|
|
16
|
-
* **amplify-util-uibuilder:** add studio forms ([e019c3c](https://github.com/aws-amplify/amplify-cli/commit/e019c3c26dac5b32fe769c36fbdbb4ceb58c41cf))
|
|
17
59
|
* **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
60
|
|
|
19
61
|
|
|
@@ -8,7 +8,8 @@ export declare type StudioMetadata = {
|
|
|
8
8
|
export default class AmplifyStudioClient {
|
|
9
9
|
#private;
|
|
10
10
|
metadata: StudioMetadata;
|
|
11
|
-
|
|
11
|
+
isGraphQLSupported: boolean;
|
|
12
|
+
static isAmplifyApp: (context: $TSContext, appId: string) => Promise<boolean>;
|
|
12
13
|
static setClientInfo(context: $TSContext, envName?: string, appId?: string): Promise<AmplifyStudioClient>;
|
|
13
14
|
constructor(awsConfigInfo: ServiceConfigurationOptions, appId: string, envName: string);
|
|
14
15
|
loadMetadata: (envName?: string | undefined, appId?: string | undefined) => Promise<void>;
|
|
@@ -23,6 +24,5 @@ export default class AmplifyStudioClient {
|
|
|
23
24
|
}>;
|
|
24
25
|
createComponent: (component: CreateComponentData, envName?: string | undefined, appId?: string | undefined) => Promise<Component | undefined>;
|
|
25
26
|
getModels: (resourceName: string, envName?: string | undefined, appId?: string | undefined) => Promise<string | undefined>;
|
|
26
|
-
isAmplifyApp: (context: $TSContext) => Promise<boolean>;
|
|
27
27
|
}
|
|
28
28
|
//# 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,EAAgC,MAAM,kBAAkB,CAAC;AAC5E,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EACV,mBAAmB,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAC5C,MAAM,kCAAkC,CAAC;AAS1C,oBAAY,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;
|
|
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,EACV,mBAAmB,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAC5C,MAAM,kCAAkC,CAAC;AAS1C,oBAAY,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,CAUjF;WAKY,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,gEAA6C,QAAQ,IAAI,CAAC,CAiBpE;IAKF,cAAc,gEAA6C,QAAQ;QAAE,QAAQ,EAAE,SAAS,EAAE,CAAA;KAAE,CAAC,CAsB3F;IAKF,UAAU,gEAA6C,QAAQ;QAAE,QAAQ,EAAE,KAAK,EAAE,CAAA;KAAE,CAAC,CAuBnF;IAEF,SAAS,gEAA6C,QAAQ;QAAE,QAAQ,EAAE,IAAI,EAAE,CAAA;KAAE,CAAC,CAsBjF;IAEF,eAAe,cAAqB,mBAAmB,+DAAqC,QAAQ,SAAS,GAAG,SAAS,CAAC,CAexH;IAEF,SAAS,iBAAwB,MAAM,+DAAqC,QAAQ,MAAM,GAAG,SAAS,CAAC,CAerG;CACH"}
|
|
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _AmplifyStudioClient_amplifyUiBuilder, _AmplifyStudioClient_amplifyBackend, _AmplifyStudioClient_appId, _AmplifyStudioClient_envName;
|
|
13
|
+
var _a, _AmplifyStudioClient_amplifyUiBuilder, _AmplifyStudioClient_amplifyBackend, _AmplifyStudioClient_appId, _AmplifyStudioClient_envName;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
const amplify_cli_core_1 = require("amplify-cli-core");
|
|
16
16
|
const aws_sdk_1 = require("aws-sdk");
|
|
@@ -43,9 +43,9 @@ class AmplifyStudioClient {
|
|
|
43
43
|
_AmplifyStudioClient_amplifyBackend.set(this, void 0);
|
|
44
44
|
_AmplifyStudioClient_appId.set(this, void 0);
|
|
45
45
|
_AmplifyStudioClient_envName.set(this, void 0);
|
|
46
|
-
this.
|
|
46
|
+
this.isGraphQLSupported = false;
|
|
47
47
|
this.loadMetadata = async (envName, appId) => {
|
|
48
|
-
var
|
|
48
|
+
var _b, _c;
|
|
49
49
|
const environmentName = envName || __classPrivateFieldGet(this, _AmplifyStudioClient_envName, "f");
|
|
50
50
|
const resolvedAppId = appId || __classPrivateFieldGet(this, _AmplifyStudioClient_appId, "f");
|
|
51
51
|
try {
|
|
@@ -56,13 +56,12 @@ class AmplifyStudioClient {
|
|
|
56
56
|
})
|
|
57
57
|
.promise();
|
|
58
58
|
this.metadata = {
|
|
59
|
-
autoGenerateForms: ((
|
|
60
|
-
autoGenerateViews: ((
|
|
59
|
+
autoGenerateForms: ((_b = response.features) === null || _b === void 0 ? void 0 : _b.autoGenerateForms) === 'true',
|
|
60
|
+
autoGenerateViews: ((_c = response.features) === null || _c === void 0 ? void 0 : _c.autoGenerateViews) === 'true',
|
|
61
61
|
};
|
|
62
62
|
}
|
|
63
|
-
catch (
|
|
64
|
-
|
|
65
|
-
throw e;
|
|
63
|
+
catch (err) {
|
|
64
|
+
throw new Error(`Failed to load metadata: ${err.message}`);
|
|
66
65
|
}
|
|
67
66
|
};
|
|
68
67
|
this.listComponents = async (envName, appId) => {
|
|
@@ -85,9 +84,8 @@ class AmplifyStudioClient {
|
|
|
85
84
|
amplify_prompts_1.printer.debug(JSON.stringify(uiBuilderComponents, null, 2));
|
|
86
85
|
return { entities: uiBuilderComponents };
|
|
87
86
|
}
|
|
88
|
-
catch (
|
|
89
|
-
|
|
90
|
-
throw e;
|
|
87
|
+
catch (err) {
|
|
88
|
+
throw new Error(`Failed to list components: ${err.message}`);
|
|
91
89
|
}
|
|
92
90
|
};
|
|
93
91
|
this.listThemes = async (envName, appId) => {
|
|
@@ -110,9 +108,8 @@ class AmplifyStudioClient {
|
|
|
110
108
|
amplify_prompts_1.printer.debug(JSON.stringify(uiBuilderThemes, null, 2));
|
|
111
109
|
return { entities: uiBuilderThemes };
|
|
112
110
|
}
|
|
113
|
-
catch (
|
|
114
|
-
|
|
115
|
-
throw e;
|
|
111
|
+
catch (err) {
|
|
112
|
+
throw new Error(`Failed to list themes: ${err.message}`);
|
|
116
113
|
}
|
|
117
114
|
};
|
|
118
115
|
this.listForms = async (envName, appId) => {
|
|
@@ -135,9 +132,8 @@ class AmplifyStudioClient {
|
|
|
135
132
|
amplify_prompts_1.printer.debug(JSON.stringify(uibuilderForms, null, 2));
|
|
136
133
|
return { entities: uibuilderForms };
|
|
137
134
|
}
|
|
138
|
-
catch (
|
|
139
|
-
|
|
140
|
-
throw e;
|
|
135
|
+
catch (err) {
|
|
136
|
+
throw new Error(`Failed to list forms: ${err.message}`);
|
|
141
137
|
}
|
|
142
138
|
};
|
|
143
139
|
this.createComponent = async (component, envName, appId) => {
|
|
@@ -154,8 +150,7 @@ class AmplifyStudioClient {
|
|
|
154
150
|
return response.entity;
|
|
155
151
|
}
|
|
156
152
|
catch (err) {
|
|
157
|
-
|
|
158
|
-
throw err;
|
|
153
|
+
throw new Error(`Failed to create component: ${err.message}`);
|
|
159
154
|
}
|
|
160
155
|
};
|
|
161
156
|
this.getModels = async (resourceName, envName, appId) => {
|
|
@@ -171,15 +166,10 @@ class AmplifyStudioClient {
|
|
|
171
166
|
.promise();
|
|
172
167
|
return Models;
|
|
173
168
|
}
|
|
174
|
-
catch (
|
|
175
|
-
|
|
176
|
-
throw new Error(`Models not found in AmplifyBackend:GetBackendAPIModels response: ${e.message}`);
|
|
169
|
+
catch (err) {
|
|
170
|
+
throw new Error(`Models not found in AmplifyBackend:GetBackendAPIModels response: ${err.message}`);
|
|
177
171
|
}
|
|
178
172
|
};
|
|
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
173
|
__classPrivateFieldSet(this, _AmplifyStudioClient_amplifyUiBuilder, buildAmplifyUiBuilderClient(awsConfigInfo), "f");
|
|
184
174
|
__classPrivateFieldSet(this, _AmplifyStudioClient_amplifyBackend, buildAmplifyBackendClient(awsConfigInfo), "f");
|
|
185
175
|
__classPrivateFieldSet(this, _AmplifyStudioClient_appId, appId, "f");
|
|
@@ -198,16 +188,26 @@ class AmplifyStudioClient {
|
|
|
198
188
|
resolvedAppId,
|
|
199
189
|
]));
|
|
200
190
|
const client = new AmplifyStudioClient(awsConfigInfo, resolvedAppId, resolvedEnvName);
|
|
201
|
-
if ((await (0, featureFlags_1.getTransformerVersion)(
|
|
191
|
+
if ((await (0, featureFlags_1.getTransformerVersion)()) === 2) {
|
|
202
192
|
await client.loadMetadata();
|
|
203
|
-
client.
|
|
193
|
+
client.isGraphQLSupported = true;
|
|
204
194
|
}
|
|
205
195
|
else {
|
|
206
|
-
client.
|
|
196
|
+
client.isGraphQLSupported = false;
|
|
207
197
|
}
|
|
208
198
|
return client;
|
|
209
199
|
}
|
|
210
200
|
}
|
|
211
201
|
exports.default = AmplifyStudioClient;
|
|
212
|
-
_AmplifyStudioClient_amplifyUiBuilder = new WeakMap(), _AmplifyStudioClient_amplifyBackend = new WeakMap(), _AmplifyStudioClient_appId = new WeakMap(), _AmplifyStudioClient_envName = new WeakMap();
|
|
202
|
+
_a = AmplifyStudioClient, _AmplifyStudioClient_amplifyUiBuilder = new WeakMap(), _AmplifyStudioClient_amplifyBackend = new WeakMap(), _AmplifyStudioClient_appId = new WeakMap(), _AmplifyStudioClient_envName = new WeakMap();
|
|
203
|
+
AmplifyStudioClient.isAmplifyApp = async (context, appId) => {
|
|
204
|
+
try {
|
|
205
|
+
const { isAdminApp } = await amplify_cli_core_1.CloudformationProviderFacade.isAmplifyAdminApp(context, appId);
|
|
206
|
+
return isAdminApp;
|
|
207
|
+
}
|
|
208
|
+
catch (err) {
|
|
209
|
+
amplify_prompts_1.printer.debug(`Failed admin app check: ${err.message}`);
|
|
210
|
+
return false;
|
|
211
|
+
}
|
|
212
|
+
};
|
|
213
213
|
//# sourceMappingURL=amplify-studio-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amplify-studio-client.js","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uDAA4E;AAK5E,qCAA2D;AAC3D,qDAA0C;AAC1C,6EAA4E;AAC5E,iEAAuE;AAavE,MAAM,yBAAyB,GAAG,CAAC,aAA0C,EAAkB,EAAE;IAC/F,MAAM,SAAS,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;IACvC,IAAI,OAAO,CAAC,GAAG,CAAC,wBAAwB,EAAE;QACxC,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,wBAAwB,CAAC;KAC3D;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,sBAAsB,EAAE;QACtC,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC;KACvD;IAED,OAAO,IAAI,wBAAc,CAAC,SAAS,CAAC,CAAC;AACvC,CAAC,CAAC;AAKF,MAAM,2BAA2B,GAAG,CAAC,aAA0C,EAAoB,EAAE;IACnG,MAAM,SAAS,GAAG,EAAE,GAAG,aAAa,EAAE,CAAC;IACvC,IAAI,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE;QACnC,SAAS,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC;KACtD;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE;QACjC,SAAS,CAAC,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC;KAClD;IAED,OAAO,IAAI,0BAAgB,CAAC,SAAS,CAAC,CAAC;AACzC,CAAC,CAAC;AAKF,MAAqB,mBAAmB;
|
|
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":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAgB9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"generateComponents.d.ts","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAgB9C,eAAO,MAAM,GAAG,YAAmB,UAAU,KAAG,QAAQ,IAAI,CA0E3D,CAAC"}
|
|
@@ -15,16 +15,13 @@ 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
|
-
if (!(await studioClient.isAmplifyApp(context))) {
|
|
19
|
-
return;
|
|
20
|
-
}
|
|
21
18
|
const [componentSchemas, themeSchemas, formSchemas, dataSchema] = await Promise.all([
|
|
22
19
|
studioClient.listComponents(),
|
|
23
20
|
studioClient.listThemes(),
|
|
24
21
|
studioClient.listForms(),
|
|
25
22
|
(0, utils_1.getAmplifyDataSchema)(studioClient),
|
|
26
23
|
]);
|
|
27
|
-
const nothingWouldAutogen = !dataSchema || !studioClient.metadata.autoGenerateForms || !studioClient.
|
|
24
|
+
const nothingWouldAutogen = !dataSchema || !studioClient.metadata.autoGenerateForms || !studioClient.isGraphQLSupported;
|
|
28
25
|
if (nothingWouldAutogen && [componentSchemas, themeSchemas, formSchemas].every(group => !group.entities.length)) {
|
|
29
26
|
amplify_prompts_1.printer.debug('Skipping UI component generation since none are found.');
|
|
30
27
|
return;
|
|
@@ -33,7 +30,7 @@ const run = async (context) => {
|
|
|
33
30
|
const generatedResults = {
|
|
34
31
|
component: (0, utils_1.generateUiBuilderComponents)(context, componentSchemas.entities, dataSchema),
|
|
35
32
|
theme: (0, utils_1.generateUiBuilderThemes)(context, themeSchemas.entities),
|
|
36
|
-
form: (0, utils_1.generateUiBuilderForms)(context, formSchemas.entities, dataSchema, studioClient.metadata.autoGenerateForms && studioClient.
|
|
33
|
+
form: (0, utils_1.generateUiBuilderForms)(context, formSchemas.entities, dataSchema, studioClient.metadata.autoGenerateForms && studioClient.isGraphQLSupported),
|
|
37
34
|
};
|
|
38
35
|
const successfulSchemas = [];
|
|
39
36
|
let hasSuccessfulForm = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAsB;AACtB,qDAA0C;AAE1C,wCAAiD;AACjD,mCASiB;AAKV,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;IAC9D,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,
|
|
1
|
+
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAsB;AACtB,qDAA0C;AAE1C,wCAAiD;AACjD,mCASiB;AAKV,MAAM,GAAG,GAAG,KAAK,EAAE,OAAmB,EAAiB,EAAE;IAC9D,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,mBAAmB,GAAG,CAAC,UAAU,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,iBAAiB,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC;QAExH,IAAI,mBAAmB,IAAI,CAAC,gBAAgB,EAAE,YAAY,EAAE,WAAW,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YAC/G,yBAAO,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;YACxE,OAAO;SACR;QACD,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;QAE7C,MAAM,gBAAgB,GAAG;YACvB,SAAS,EAAE,IAAA,mCAA2B,EAAC,OAAO,EAAE,gBAAgB,CAAC,QAAQ,EAAE,UAAU,CAAC;YACtF,KAAK,EAAE,IAAA,+BAAuB,EAAC,OAAO,EAAE,YAAY,CAAC,QAAQ,CAAC;YAC9D,IAAI,EAAE,IAAA,8BAAsB,EAC1B,OAAO,EAAE,WAAW,CAAC,QAAQ,EAAE,UAAU,EAAE,YAAY,CAAC,QAAQ,CAAC,iBAAiB,IAAI,YAAY,CAAC,kBAAkB,CACtH;SACF,CAAC;QAEF,MAAM,iBAAiB,GAAmB,EAAE,CAAC;QAC7C,IAAI,iBAAiB,GAAG,KAAK,CAAC;QAC9B,MAAM,mBAAmB,GAAa,EAAE,CAAC;QAEzC,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,EAAE;YAC1D,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBACvB,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS,EAAE;oBACnC,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;oBACtC,IAAI,GAAG,KAAK,MAAM,EAAE;wBAClB,iBAAiB,GAAG,IAAI,CAAC;qBAC1B;iBACF;qBAAM;oBACL,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;iBAC7C;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,IAAA,yCAAiC,EAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;QAE9D,IAAA,wCAAgC,EAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,iBAAiB,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QAE5F,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;YAClC,OAAO,CAAC,IAAI,CAAC,4CAA4C,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SAC5F;aAAM;YACL,OAAO,CAAC,OAAO,CAAC,uBAAuB,CAAC,CAAC;SAC1C;QAED,MAAM,qBAAqB,GAAG;YAC5B,GAAG,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC;YAC3G,GAAG,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC;SACnF,CAAC;QACF,IAAI,qBAAqB,CAAC,MAAM,EAAE;YAChC,yBAAO,CAAC,IAAI,CACV,kBAAkB,qBAAqB,CAAC,IAAI,CAC1C,IAAI,CACL,qIAAqI,CACvI,CAAC;SACH;QAED,IAAA,6BAAqB,EAAC,OAAO,CAAC,CAAC;KAChC;IAAC,OAAO,CAAC,EAAE;QACV,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;KAC9C;AACH,CAAC,CAAC;AA1EW,QAAA,GAAG,OA0Ed"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { StudioComponent, StudioTheme, GenericDataSchema, StudioForm, StudioSchema } from '@aws-amplify/codegen-ui';
|
|
2
|
+
import { ReactThemeStudioTemplateRendererOptions } from '@aws-amplify/codegen-ui-react';
|
|
2
3
|
import { $TSContext } from 'amplify-cli-core';
|
|
3
4
|
import { AmplifyStudioClient } from '../../clients';
|
|
4
5
|
export declare const createUiBuilderComponent: (context: $TSContext, schema: StudioComponent, dataSchema?: GenericDataSchema | undefined) => StudioComponent;
|
|
5
|
-
export declare const createUiBuilderTheme: (context: $TSContext, schema: StudioTheme) => StudioTheme;
|
|
6
|
+
export declare const createUiBuilderTheme: (context: $TSContext, schema: StudioTheme, options?: ReactThemeStudioTemplateRendererOptions | undefined) => StudioTheme;
|
|
6
7
|
export declare const createUiBuilderForm: (context: $TSContext, schema: StudioForm, dataSchema?: GenericDataSchema | undefined) => StudioForm;
|
|
7
8
|
export declare const generateAmplifyUiBuilderIndexFile: (context: $TSContext, schemas: StudioSchema[]) => void;
|
|
8
9
|
declare type UtilFileChecks = {
|
|
@@ -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;
|
|
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,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,YACtB,UAAU,UACX,WAAW,oEAElB,WA0BF,CAAC;AAKF,eAAO,MAAM,mBAAmB,YAAa,UAAU,UAAU,UAAU,iDAAmC,UA0B7G,CAAC;AAKF,eAAO,MAAM,iCAAiC,YAAa,UAAU,WAAW,YAAY,EAAE,KAAG,IAwBhG,CAAC;AAEF,aAAK,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,iBACjB,mBAAmB,KAChC,QAAQ,iBAAiB,GAAG,SAAS,CAsBvC,CAAC;AAKF,eAAO,MAAM,iBAAiB;;MAA4D,UAAU,EAiBnG,CAAC"}
|
|
@@ -23,9 +23,9 @@ const createUiBuilderComponent = (context, schema, dataSchema) => {
|
|
|
23
23
|
return schema;
|
|
24
24
|
};
|
|
25
25
|
exports.createUiBuilderComponent = createUiBuilderComponent;
|
|
26
|
-
const createUiBuilderTheme = (context, schema) => {
|
|
26
|
+
const createUiBuilderTheme = (context, schema, options) => {
|
|
27
27
|
const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
|
|
28
|
-
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_1.ReactThemeStudioTemplateRenderer(component, config));
|
|
28
|
+
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((component) => new codegen_ui_react_1.ReactThemeStudioTemplateRenderer(component, config, options));
|
|
29
29
|
const outputPathDir = uiBuilderComponentsPath;
|
|
30
30
|
const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
|
|
31
31
|
outputPathDir,
|
|
@@ -108,7 +108,7 @@ const generateAmplifyUiBuilderUtilFile = (context, { hasForms, hasViews }) => {
|
|
|
108
108
|
exports.generateAmplifyUiBuilderUtilFile = generateAmplifyUiBuilderUtilFile;
|
|
109
109
|
const getAmplifyDataSchema = async (studioClient) => {
|
|
110
110
|
var _a;
|
|
111
|
-
if (!studioClient.
|
|
111
|
+
if (!studioClient.isGraphQLSupported) {
|
|
112
112
|
return undefined;
|
|
113
113
|
}
|
|
114
114
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codegenResources.js","sourceRoot":"","sources":["../../../src/commands/utils/codegenResources.ts"],"names":[],"mappings":";;;AAEA,wDAYiC;AACjC,
|
|
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":"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":"AAkBA,eAAO,MAAM,qBAAqB,QAAa,QAAQ,MAAM,CAe5D,CAAC"}
|
|
@@ -2,14 +2,15 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTransformerVersion = void 0;
|
|
4
4
|
const amplify_cli_core_1 = require("amplify-cli-core");
|
|
5
|
+
const amplify_prompts_1 = require("amplify-prompts");
|
|
5
6
|
const useExperimentalPipelinedTransformerFF = () => amplify_cli_core_1.FeatureFlags.getBoolean('graphQLTransformer.useExperimentalPipelinedTransformer');
|
|
6
7
|
const transformerVersionFF = () => amplify_cli_core_1.FeatureFlags.getNumber('graphQLTransformer.transformerVersion');
|
|
7
|
-
const getTransformerVersion = async (
|
|
8
|
+
const getTransformerVersion = async () => {
|
|
8
9
|
if (useExperimentalPipelinedTransformerFF() === false) {
|
|
9
10
|
return 1;
|
|
10
11
|
}
|
|
11
12
|
if (isLegacyFeatureFlagConfiguration()) {
|
|
12
|
-
await migrateToTransformerVersionFeatureFlag(
|
|
13
|
+
await migrateToTransformerVersionFeatureFlag();
|
|
13
14
|
}
|
|
14
15
|
const transformerVersion = transformerVersionFF();
|
|
15
16
|
if (transformerVersion !== 1 && transformerVersion !== 2) {
|
|
@@ -19,7 +20,7 @@ const getTransformerVersion = async (context) => {
|
|
|
19
20
|
};
|
|
20
21
|
exports.getTransformerVersion = getTransformerVersion;
|
|
21
22
|
const isLegacyFeatureFlagConfiguration = () => useExperimentalPipelinedTransformerFF() && transformerVersionFF() === 1;
|
|
22
|
-
const migrateToTransformerVersionFeatureFlag = async (
|
|
23
|
+
const migrateToTransformerVersionFeatureFlag = async () => {
|
|
23
24
|
var _a;
|
|
24
25
|
const projectPath = (_a = amplify_cli_core_1.pathManager.findProjectRoot()) !== null && _a !== void 0 ? _a : process.cwd();
|
|
25
26
|
const config = amplify_cli_core_1.stateManager.getCLIJSON(projectPath, undefined, {
|
|
@@ -29,6 +30,6 @@ const migrateToTransformerVersionFeatureFlag = async (context) => {
|
|
|
29
30
|
config.features.graphqltransformer.transformerversion = 2;
|
|
30
31
|
amplify_cli_core_1.stateManager.setCLIJSON(projectPath, config);
|
|
31
32
|
await amplify_cli_core_1.FeatureFlags.reloadValues();
|
|
32
|
-
|
|
33
|
+
amplify_prompts_1.printer.warn(`\nThe project is configured with 'transformerVersion': ${transformerVersionFF()}, but 'useExperimentalPipelinedTransformer': ${useExperimentalPipelinedTransformerFF()}. Setting the 'transformerVersion': ${config.features.graphqltransformer.transformerversion}. 'useExperimentalPipelinedTransformer' is deprecated.`);
|
|
33
34
|
};
|
|
34
35
|
//# sourceMappingURL=featureFlags.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../../src/commands/utils/featureFlags.ts"],"names":[],"mappings":";;;AACA,uDAE0B;
|
|
1
|
+
{"version":3,"file":"featureFlags.js","sourceRoot":"","sources":["../../../src/commands/utils/featureFlags.ts"],"names":[],"mappings":";;;AACA,uDAE0B;AAC1B,qDAA0C;AAO1C,MAAM,qCAAqC,GAAG,GAAY,EAAE,CAAC,+BAAY,CAAC,UAAU,CAAC,wDAAwD,CAAC,CAAC;AAC/I,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,3 +1,3 @@
|
|
|
1
1
|
import { $TSContext } from 'amplify-cli-core';
|
|
2
|
-
export declare
|
|
2
|
+
export declare const shouldRenderComponents: (context: $TSContext) => Promise<boolean>;
|
|
3
3
|
//# sourceMappingURL=shouldRenderComponents.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shouldRenderComponents.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/shouldRenderComponents.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"shouldRenderComponents.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/shouldRenderComponents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAQ9C,eAAO,MAAM,sBAAsB,YAAmB,UAAU,KAAG,QAAQ,OAAO,CAoCjF,CAAC"}
|
|
@@ -2,33 +2,39 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.shouldRenderComponents = void 0;
|
|
4
4
|
const amplify_prompts_1 = require("amplify-prompts");
|
|
5
|
-
|
|
5
|
+
const clients_1 = require("../../clients");
|
|
6
|
+
const environmentHelpers_1 = require("./environmentHelpers");
|
|
7
|
+
const shouldRenderComponents = async (context) => {
|
|
6
8
|
var _a, _b, _c;
|
|
7
9
|
if (process.env.FORCE_RENDER) {
|
|
8
10
|
amplify_prompts_1.printer.debug('Forcing component render since environment variable flag is set.');
|
|
9
11
|
return true;
|
|
10
12
|
}
|
|
11
13
|
if ((_b = (_a = context === null || context === void 0 ? void 0 : context.input) === null || _a === void 0 ? void 0 : _a.options) === null || _b === void 0 ? void 0 : _b['no-codegen']) {
|
|
12
|
-
amplify_prompts_1.printer.debug('Not pulling components because --no-codegen flag is set');
|
|
14
|
+
amplify_prompts_1.printer.debug('Not pulling components because --no-codegen flag is set.');
|
|
13
15
|
return false;
|
|
14
16
|
}
|
|
15
17
|
if (!((_c = context === null || context === void 0 ? void 0 : context.exeInfo) === null || _c === void 0 ? void 0 : _c.projectConfig)) {
|
|
16
|
-
amplify_prompts_1.printer.debug('Not pulling components because there is no projectConfig set for this project');
|
|
18
|
+
amplify_prompts_1.printer.debug('Not pulling components because there is no projectConfig set for this project.');
|
|
17
19
|
return false;
|
|
18
20
|
}
|
|
19
21
|
if (!context.exeInfo.projectConfig.providers.includes('awscloudformation')) {
|
|
20
|
-
amplify_prompts_1.printer.debug('Not pulling components because there is no "awscloudformation" provider');
|
|
22
|
+
amplify_prompts_1.printer.debug('Not pulling components because there is no "awscloudformation" provider.');
|
|
21
23
|
return false;
|
|
22
24
|
}
|
|
23
25
|
if (context.exeInfo.projectConfig.frontend !== 'javascript') {
|
|
24
|
-
amplify_prompts_1.printer.debug('Not pulling components because this project is not configured as a javascript frontend');
|
|
26
|
+
amplify_prompts_1.printer.debug('Not pulling components because this project is not configured as a javascript frontend.');
|
|
25
27
|
return false;
|
|
26
28
|
}
|
|
27
|
-
if (context.exeInfo.projectConfig
|
|
28
|
-
amplify_prompts_1.printer.debug('Not pulling components because this project is not configured with the "react" framework');
|
|
29
|
+
if (context.exeInfo.projectConfig.javascript.framework !== 'react') {
|
|
30
|
+
amplify_prompts_1.printer.debug('Not pulling components because this project is not configured with the "react" framework.');
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
if (!(await clients_1.AmplifyStudioClient.isAmplifyApp(context, (0, environmentHelpers_1.getAppId)(context)))) {
|
|
34
|
+
amplify_prompts_1.printer.debug('Not pulling components because this project is not Amplify Studio enabled.');
|
|
29
35
|
return false;
|
|
30
36
|
}
|
|
31
37
|
return true;
|
|
32
|
-
}
|
|
38
|
+
};
|
|
33
39
|
exports.shouldRenderComponents = shouldRenderComponents;
|
|
34
40
|
//# sourceMappingURL=shouldRenderComponents.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shouldRenderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/shouldRenderComponents.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"shouldRenderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/shouldRenderComponents.ts"],"names":[],"mappings":";;;AAEA,qDAA0C;AAC1C,2CAAoD;AACpD,6DAAgD;AAKzC,MAAM,sBAAsB,GAAG,KAAK,EAAE,OAAmB,EAAoB,EAAE;;IACpF,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE;QAC5B,yBAAO,CAAC,KAAK,CAAC,kEAAkE,CAAC,CAAC;QAClF,OAAO,IAAI,CAAC;KACb;IACD,IAAI,MAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,0CAAE,OAAO,0CAAG,YAAY,CAAC,EAAE;QAC3C,yBAAO,CAAC,KAAK,CAAC,0DAA0D,CAAC,CAAC;QAC1E,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,CAAA,MAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,0CAAE,aAAa,CAAA,EAAE;QACpC,yBAAO,CAAC,KAAK,CAAC,gFAAgF,CAAC,CAAC;QAChG,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,CAAC,EAAE;QAC1E,yBAAO,CAAC,KAAK,CAAC,0EAA0E,CAAC,CAAC;QAC1F,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,KAAK,YAAY,EAAE;QAC3D,yBAAO,CAAC,KAAK,CAAC,yFAAyF,CAAC,CAAC;QACzG,OAAO,KAAK,CAAC;KACd;IAED,IAAI,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,KAAK,OAAO,EAAE;QAClE,yBAAO,CAAC,KAAK,CAAC,2FAA2F,CAAC,CAAC;QAC3G,OAAO,KAAK,CAAC;KACd;IAED,IAAI,CAAC,CAAC,MAAM,6BAAmB,CAAC,YAAY,CAAC,OAAO,EAAE,IAAA,6BAAQ,EAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACzE,yBAAO,CAAC,KAAK,CAAC,4EAA4E,CAAC,CAAC;QAC5F,OAAO,KAAK,CAAC;KACd;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AApCW,QAAA,sBAAsB,0BAoCjC"}
|
|
@@ -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,EAAE,UAAU,EAAE,YAAY,EAC1E,MAAM,yBAAyB,CAAC;AASjC,aAAK,eAAe,CAAC,CAAC,SAAS,YAAY,IACvC;IACE,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,CAAC,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACD;IACE,UAAU,EAAE,SAAS,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CAAC;
|
|
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,EAAE,UAAU,EAAE,YAAY,EAC1E,MAAM,yBAAyB,CAAC;AASjC,aAAK,eAAe,CAAC,CAAC,SAAS,YAAY,IACvC;IACE,UAAU,EAAE,SAAS,CAAC;IACtB,MAAM,EAAE,CAAC,CAAC;IACV,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,GACD;IACE,UAAU,EAAE,SAAS,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,CAAC,EAAE,CAAC,CAAC;CACZ,CAAC;AAON,eAAO,MAAM,2BAA2B,YAC7B,UAAU,oBACD,GAAG,EAAE,iDAEtB,gBAAgB,eAAe,CAAC,EAkBlC,CAAC;AAMF,eAAO,MAAM,uBAAuB,YAAa,UAAU,gBAAgB,GAAG,EAAE,KAAG,gBAAgB,WAAW,CAAC,EAmB9G,CAAC;AAsBF,eAAO,MAAM,sBAAsB,YACxB,UAAU,eAEN,GAAG,EAAE,0FAGjB,gBAAgB,UAAU,CAAC,EAiC7B,CAAC"}
|
|
@@ -22,6 +22,9 @@ const generateUiBuilderComponents = (context, componentSchemas, dataSchema) => {
|
|
|
22
22
|
};
|
|
23
23
|
exports.generateUiBuilderComponents = generateUiBuilderComponents;
|
|
24
24
|
const generateUiBuilderThemes = (context, themeSchemas) => {
|
|
25
|
+
if (themeSchemas.length === 0) {
|
|
26
|
+
return [generateDefaultTheme(context)];
|
|
27
|
+
}
|
|
25
28
|
const themeResults = themeSchemas.map(schema => {
|
|
26
29
|
try {
|
|
27
30
|
const theme = (0, codegenResources_1.createUiBuilderTheme)(context, schema);
|
|
@@ -37,6 +40,18 @@ const generateUiBuilderThemes = (context, themeSchemas) => {
|
|
|
37
40
|
return themeResults;
|
|
38
41
|
};
|
|
39
42
|
exports.generateUiBuilderThemes = generateUiBuilderThemes;
|
|
43
|
+
const generateDefaultTheme = (context) => {
|
|
44
|
+
try {
|
|
45
|
+
const theme = (0, codegenResources_1.createUiBuilderTheme)(context, { name: 'studioTheme', values: [] }, { renderDefaultTheme: true });
|
|
46
|
+
amplify_prompts_1.printer.debug(`Generated default theme in ${(0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context)}`);
|
|
47
|
+
return { resultType: 'SUCCESS', schema: theme };
|
|
48
|
+
}
|
|
49
|
+
catch (e) {
|
|
50
|
+
amplify_prompts_1.printer.debug(`Failure caught rendering default theme`);
|
|
51
|
+
amplify_prompts_1.printer.debug(e);
|
|
52
|
+
return { resultType: 'FAILURE', schemaName: 'studioTheme', error: e };
|
|
53
|
+
}
|
|
54
|
+
};
|
|
40
55
|
const generateUiBuilderForms = (context, formSchemas, dataSchema, autoGenerateForms) => {
|
|
41
56
|
const modelMap = {};
|
|
42
57
|
if ((dataSchema === null || dataSchema === void 0 ? void 0 : dataSchema.dataSourceType) === 'DataStore' && autoGenerateForms) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAE1C,wDAEiC;AACjC,yDAK4B;AAC5B,6EAA0E;
|
|
1
|
+
{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":";;;AAAA,qDAA0C;AAE1C,wDAEiC;AACjC,yDAK4B;AAC5B,6EAA0E;AAoBnE,MAAM,2BAA2B,GAAG,CACzC,OAAmB,EACnB,gBAAuB,EACvB,UAA8B,EACM,EAAE;IACtC,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,GAAG,CAAmC,MAAM,CAAC,EAAE;QACvF,IAAI;YACF,MAAM,SAAS,GAAG,IAAA,2CAAwB,EAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YACxE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;SACrD;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;AAtBW,QAAA,2BAA2B,+BAsBtC;AAMK,MAAM,uBAAuB,GAAG,CAAC,OAAmB,EAAE,YAAmB,EAAkC,EAAE;IAClH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7B,OAAO,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC;KACxC;IACD,MAAM,YAAY,GAAG,YAAY,CAAC,GAAG,CAA+B,MAAM,CAAC,EAAE;QAC3E,IAAI;YACF,MAAM,KAAK,GAAG,IAAA,uCAAoB,EAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YACpD,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;SACjD;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;AAnBW,QAAA,uBAAuB,2BAmBlC;AAKF,MAAM,oBAAoB,GAAG,CAAC,OAAmB,EAAgC,EAAE;IACjF,IAAI;QACF,MAAM,KAAK,GAAG,IAAA,uCAAoB,EAAC,OAAO,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,CAAC,CAAC;QAC/G,yBAAO,CAAC,KAAK,CACX,8BAA8B,IAAA,uDAA0B,EAAC,OAAO,CAAC,EAAE,CACpE,CAAC;QACF,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC;KACjD;IAAC,OAAO,CAAC,EAAE;QACV,yBAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACxD,yBAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;KACvE;AACH,CAAC,CAAC;AAKK,MAAM,sBAAsB,GAAG,CACpC,OAAmB,EAEnB,WAAkB,EAClB,UAA8B,EAC9B,iBAA2B,EACI,EAAE;IACjC,MAAM,QAAQ,GAAkD,EAAE,CAAC;IACnE,IAAI,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,cAAc,MAAK,WAAW,IAAI,iBAAiB,EAAE;QACnE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;YAC1D,IAAI,IAAA,mCAAsB,EAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;gBACvD,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;aAChD;QACH,CAAC,CAAC,CAAC;KACJ;IACD,MAAM,WAAW,GAAG,CAAC,MAAkB,EAA+B,EAAE;QACtE,IAAI;YACF,MAAM,IAAI,GAAG,IAAA,sCAAmB,EAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YAC9D,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;SAChD;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;IACF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,MAAkB,EAAE,EAAE;;QACzD,IAAI,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,QAAQ,KAAI,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,cAAc,MAAK,WAAW,EAAE;YACvE,MAAA,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,0CAAE,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;SACvE;QACD,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAGH,WAAW,CAAC,IAAI,CAAC,GAAG,IAAA,oCAAiB,EAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IAElE,yBAAO,CAAC,KAAK,CACX,aAAa,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,MAAM,aAAa,IAAA,uDAA0B,EAAC,OAAO,CAAC,EAAE,CACpI,CAAC;IACF,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAvCW,QAAA,sBAAsB,0BAuCjC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/amplify-util-uibuilder",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.6.0-beta.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -13,11 +13,11 @@
|
|
|
13
13
|
"access": "public"
|
|
14
14
|
},
|
|
15
15
|
"dependencies": {
|
|
16
|
-
"@aws-amplify/codegen-ui": "
|
|
17
|
-
"@aws-amplify/codegen-ui-react": "
|
|
18
|
-
"amplify-cli-core": "
|
|
19
|
-
"amplify-prompts": "2.6.
|
|
20
|
-
"aws-sdk": "^2.
|
|
16
|
+
"@aws-amplify/codegen-ui": "2.5.4",
|
|
17
|
+
"@aws-amplify/codegen-ui-react": "2.5.4",
|
|
18
|
+
"amplify-cli-core": "4.0.0-beta.0",
|
|
19
|
+
"amplify-prompts": "2.6.2-beta.0",
|
|
20
|
+
"aws-sdk": "^2.1233.0",
|
|
21
21
|
"fs-extra": "^8.1.0",
|
|
22
22
|
"ora": "^4.0.3"
|
|
23
23
|
},
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"usePathForSuiteName": "true",
|
|
69
69
|
"addFileAttribute": "true"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "435d9a4301fde0ea13358e7c1608a895955f84a1"
|
|
72
72
|
}
|