@aws-amplify/amplify-util-uibuilder 1.6.19-gfix.0 → 1.7.0-rc.374a34c65a.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 +9 -56
- package/lib/clients/amplify-studio-client.d.ts +4 -0
- package/lib/clients/amplify-studio-client.d.ts.map +1 -1
- package/lib/clients/amplify-studio-client.js +9 -1
- package/lib/clients/amplify-studio-client.js.map +1 -1
- package/lib/commands/generateComponents.d.ts.map +1 -1
- package/lib/commands/generateComponents.js +1 -1
- package/lib/commands/generateComponents.js.map +1 -1
- package/lib/commands/utils/codegenResources.d.ts +2 -2
- 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/syncAmplifyUiBuilderComponents.d.ts +2 -2
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js +3 -3
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js.map +1 -1
- package/package.json +7 -7
- package/src/__tests__/cloneComponentsFromEnv.test.ts +4 -0
- package/src/__tests__/generateComponents.test.ts +4 -0
- package/src/__tests__/notifyMissingPackages.test.ts +3 -3
- package/src/__tests__/prePushHandler.test.ts +4 -0
- package/src/__tests__/shouldRenderComponents.test.ts +4 -0
- package/src/__tests__/syncAmplifyUiComponents.test.ts +8 -0
- package/src/clients/amplify-studio-client.ts +12 -0
- package/src/commands/generateComponents.ts +1 -0
- package/src/commands/utils/codegenResources.ts +8 -2
- package/src/commands/utils/syncAmplifyUiBuilderComponents.ts +12 -3
- package/tsconfig.tsbuildinfo +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,75 +3,28 @@
|
|
|
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
|
-
|
|
7
|
-
|
|
8
|
-
**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
## [1.6.18](https://github.com/edwardfoyle/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.12-rc.e9e0d157d.0...@aws-amplify/amplify-util-uibuilder@1.6.18) (2023-04-03)
|
|
6
|
+
# [1.7.0-rc.374a34c65a.0](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.14...@aws-amplify/amplify-util-uibuilder@1.7.0-rc.374a34c65a.0) (2023-04-18)
|
|
15
7
|
|
|
16
8
|
|
|
17
9
|
### Bug Fixes
|
|
18
10
|
|
|
19
|
-
*
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
## [1.6.17](https://github.com/edwardfoyle/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.12-rc.e9e0d157d.0...@aws-amplify/amplify-util-uibuilder@1.6.17) (2023-04-03)
|
|
11
|
+
* fixes merge conflicts ([7e2490f](https://github.com/aws-amplify/amplify-cli/commit/7e2490f3bbeee3aa57c31636c0e3e027ef3bb405))
|
|
12
|
+
* modelgen regression ([a87fc75](https://github.com/aws-amplify/amplify-cli/commit/a87fc7549440ee362fdf40b06c1b1e9f61bdc287))
|
|
26
13
|
|
|
27
14
|
|
|
28
|
-
###
|
|
29
|
-
|
|
30
|
-
* **amplify-util-uibuilder:** update codegen-ui to 2.11.0 ([#12265](https://github.com/edwardfoyle/amplify-cli/issues/12265)) ([0dab648](https://github.com/edwardfoyle/amplify-cli/commit/0dab648a9ae50cf58b39263d64862dd34d5fdfc7))
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
## [1.6.16](https://github.com/edwardfoyle/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.12-rc.e9e0d157d.0...@aws-amplify/amplify-util-uibuilder@1.6.16) (2023-04-03)
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
### Bug Fixes
|
|
40
|
-
|
|
41
|
-
* **amplify-util-uibuilder:** update codegen-ui to 2.11.0 ([#12265](https://github.com/edwardfoyle/amplify-cli/issues/12265)) ([0dab648](https://github.com/edwardfoyle/amplify-cli/commit/0dab648a9ae50cf58b39263d64862dd34d5fdfc7))
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
## [1.6.15](https://github.com/edwardfoyle/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.12-rc.e9e0d157d.0...@aws-amplify/amplify-util-uibuilder@1.6.15) (2023-04-01)
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
### Bug Fixes
|
|
51
|
-
|
|
52
|
-
* **amplify-util-uibuilder:** update codegen-ui to 2.11.0 ([#12265](https://github.com/edwardfoyle/amplify-cli/issues/12265)) ([0dab648](https://github.com/edwardfoyle/amplify-cli/commit/0dab648a9ae50cf58b39263d64862dd34d5fdfc7))
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
## [1.6.14](https://github.com/edwardfoyle/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.12-rc.e9e0d157d.0...@aws-amplify/amplify-util-uibuilder@1.6.14) (2023-03-31)
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
### Bug Fixes
|
|
62
|
-
|
|
63
|
-
* **amplify-util-uibuilder:** update codegen-ui to 2.11.0 ([#12265](https://github.com/edwardfoyle/amplify-cli/issues/12265)) ([0dab648](https://github.com/edwardfoyle/amplify-cli/commit/0dab648a9ae50cf58b39263d64862dd34d5fdfc7))
|
|
15
|
+
### Features
|
|
64
16
|
|
|
17
|
+
* **amplify-util-uibuilder:** formFeatureFlags metadata ([#12369](https://github.com/aws-amplify/amplify-cli/issues/12369)) ([b5f34d5](https://github.com/aws-amplify/amplify-cli/commit/b5f34d55040759d3200e145646cb89999cef6078))
|
|
18
|
+
* **amplify-util-uibuilder:** support StorageField ([#12386](https://github.com/aws-amplify/amplify-cli/issues/12386)) ([90fe1e4](https://github.com/aws-amplify/amplify-cli/commit/90fe1e4574c52eb4cacd110d50310f55bf913214))
|
|
19
|
+
* minor version bump ([f7af76d](https://github.com/aws-amplify/amplify-cli/commit/f7af76d5c97908b4ff06b89a019bc8ac9129fb71))
|
|
65
20
|
|
|
66
21
|
|
|
67
22
|
|
|
68
23
|
|
|
69
|
-
## [1.6.13](https://github.com/edwardfoyle/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.12-rc.e9e0d157d.0...@aws-amplify/amplify-util-uibuilder@1.6.13) (2023-03-31)
|
|
70
24
|
|
|
25
|
+
## [1.6.14](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.12...@aws-amplify/amplify-util-uibuilder@1.6.14) (2023-04-14)
|
|
71
26
|
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
* **amplify-util-uibuilder:** update codegen-ui to 2.11.0 ([#12265](https://github.com/edwardfoyle/amplify-cli/issues/12265)) ([0dab648](https://github.com/edwardfoyle/amplify-cli/commit/0dab648a9ae50cf58b39263d64862dd34d5fdfc7))
|
|
27
|
+
**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
|
|
75
28
|
|
|
76
29
|
|
|
77
30
|
|
|
@@ -4,6 +4,10 @@ import type { CreateComponentData, Component, Theme, Form } from 'aws-sdk/client
|
|
|
4
4
|
export type StudioMetadata = {
|
|
5
5
|
autoGenerateForms: boolean;
|
|
6
6
|
autoGenerateViews: boolean;
|
|
7
|
+
formFeatureFlags: {
|
|
8
|
+
isRelationshipSupported: boolean;
|
|
9
|
+
isNonModelSupported: boolean;
|
|
10
|
+
};
|
|
7
11
|
};
|
|
8
12
|
export default class AmplifyStudioClient {
|
|
9
13
|
#private;
|
|
@@ -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,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;
|
|
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;IAC3B,gBAAgB,EAAE;QAChB,uBAAuB,EAAE,OAAO,CAAC;QACjC,mBAAmB,EAAE,OAAO,CAAC;KAC9B,CAAC;CACH,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;IAkBtF,YAAY,aAAoB,MAAM,UAAU,MAAM,KAAG,QAAQ,IAAI,CAAC,CAqBpE;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"}
|
|
@@ -63,7 +63,7 @@ class AmplifyStudioClient {
|
|
|
63
63
|
_AmplifyStudioClient_envName.set(this, void 0);
|
|
64
64
|
this.isGraphQLSupported = false;
|
|
65
65
|
this.loadMetadata = async (envName, appId) => {
|
|
66
|
-
var _b, _c;
|
|
66
|
+
var _b, _c, _d, _e;
|
|
67
67
|
const environmentName = envName || __classPrivateFieldGet(this, _AmplifyStudioClient_envName, "f");
|
|
68
68
|
const resolvedAppId = appId || __classPrivateFieldGet(this, _AmplifyStudioClient_appId, "f");
|
|
69
69
|
try {
|
|
@@ -76,6 +76,10 @@ class AmplifyStudioClient {
|
|
|
76
76
|
this.metadata = {
|
|
77
77
|
autoGenerateForms: ((_b = response.features) === null || _b === void 0 ? void 0 : _b.autoGenerateForms) === 'true',
|
|
78
78
|
autoGenerateViews: ((_c = response.features) === null || _c === void 0 ? void 0 : _c.autoGenerateViews) === 'true',
|
|
79
|
+
formFeatureFlags: {
|
|
80
|
+
isRelationshipSupported: ((_d = response.features) === null || _d === void 0 ? void 0 : _d.isRelationshipSupported) === 'true',
|
|
81
|
+
isNonModelSupported: ((_e = response.features) === null || _e === void 0 ? void 0 : _e.isNonModelSupported) === 'true',
|
|
82
|
+
},
|
|
79
83
|
};
|
|
80
84
|
}
|
|
81
85
|
catch (err) {
|
|
@@ -206,6 +210,10 @@ class AmplifyStudioClient {
|
|
|
206
210
|
this.metadata = {
|
|
207
211
|
autoGenerateForms: false,
|
|
208
212
|
autoGenerateViews: false,
|
|
213
|
+
formFeatureFlags: {
|
|
214
|
+
isRelationshipSupported: false,
|
|
215
|
+
isNonModelSupported: false,
|
|
216
|
+
},
|
|
209
217
|
};
|
|
210
218
|
}
|
|
211
219
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"amplify-studio-client.js","sourceRoot":"","sources":["../../src/clients/amplify-studio-client.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uDAA4E;AAG5E,qCAA2D;AAC3D,kEAAuD;AACvD,6EAA4E;AAC5E,iEAAuE;
|
|
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;AAmB9C,eAAO,MAAM,GAAG,YAAmB,UAAU,aAAa,UAAU,GAAG,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;AAmB9C,eAAO,MAAM,GAAG,YAAmB,UAAU,aAAa,UAAU,GAAG,UAAU,KAAG,QAAQ,IAAI,CAkG/F,CAAC"}
|
|
@@ -30,7 +30,7 @@ const run = async (context, eventType) => {
|
|
|
30
30
|
const generatedResults = {
|
|
31
31
|
component: (0, utils_1.generateUiBuilderComponents)(context, componentSchemas.entities, dataSchema),
|
|
32
32
|
theme: (0, utils_1.generateUiBuilderThemes)(context, themeSchemas.entities),
|
|
33
|
-
form: (0, utils_1.generateUiBuilderForms)(context, formSchemas.entities, dataSchema, studioClient.metadata.autoGenerateForms && studioClient.isGraphQLSupported),
|
|
33
|
+
form: (0, utils_1.generateUiBuilderForms)(context, formSchemas.entities, dataSchema, studioClient.metadata.autoGenerateForms && studioClient.isGraphQLSupported, studioClient.metadata.formFeatureFlags),
|
|
34
34
|
};
|
|
35
35
|
const successfulSchemas = [];
|
|
36
36
|
const detachedForms = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":";;;;;;AAEA,8CAAsB;AACtB,kEAAuD;AAEvD,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,YAAY,CAAC,kBAAkB,CAAC,CAAC,CAAC,IAAA,4BAAoB,EAAC,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC;SAC7F,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,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;YACtH,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,EACP,WAAW,CAAC,QAAQ,EACpB,UAAU,EACV,YAAY,CAAC,QAAQ,CAAC,iBAAiB,IAAI,YAAY,CAAC,kBAAkB,
|
|
1
|
+
{"version":3,"file":"generateComponents.js","sourceRoot":"","sources":["../../src/commands/generateComponents.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import { StudioComponent, StudioTheme, GenericDataSchema, StudioForm, StudioSchema } from '@aws-amplify/codegen-ui';
|
|
1
|
+
import { StudioComponent, StudioTheme, GenericDataSchema, StudioForm, StudioSchema, FormFeatureFlags } from '@aws-amplify/codegen-ui';
|
|
2
2
|
import { ReactThemeStudioTemplateRendererOptions } from '@aws-amplify/codegen-ui-react';
|
|
3
3
|
import { $TSContext } from 'amplify-cli-core';
|
|
4
4
|
export declare const createUiBuilderComponent: (context: $TSContext, schema: StudioComponent, dataSchema?: GenericDataSchema) => StudioComponent;
|
|
5
5
|
export declare const createUiBuilderTheme: (context: $TSContext, schema: StudioTheme, options?: ReactThemeStudioTemplateRendererOptions) => StudioTheme;
|
|
6
|
-
export declare const createUiBuilderForm: (context: $TSContext, schema: StudioForm, dataSchema?: GenericDataSchema) => StudioForm;
|
|
6
|
+
export declare const createUiBuilderForm: (context: $TSContext, schema: StudioForm, dataSchema?: GenericDataSchema, formFeatureFlags?: FormFeatureFlags) => StudioForm;
|
|
7
7
|
export declare const generateAmplifyUiBuilderIndexFile: (context: $TSContext, schemas: StudioSchema[]) => void;
|
|
8
8
|
type UtilFileChecks = {
|
|
9
9
|
hasForms: boolean;
|
|
@@ -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,
|
|
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,EACZ,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAUL,uCAAuC,EACxC,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAc9C,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,YACrB,UAAU,UACX,UAAU,eACL,iBAAiB,qBACX,gBAAgB,KAClC,UA2BF,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,YAAmB,UAAU,KAAG,QAAQ,iBAAiB,GAAG,SAAS,CAarG,CAAC;AAKF,eAAO,MAAM,iBAAiB;;MAA8D,UAAU,EAiBrG,CAAC"}
|
|
@@ -41,9 +41,9 @@ const createUiBuilderTheme = (context, schema, options) => {
|
|
|
41
41
|
}
|
|
42
42
|
};
|
|
43
43
|
exports.createUiBuilderTheme = createUiBuilderTheme;
|
|
44
|
-
const createUiBuilderForm = (context, schema, dataSchema) => {
|
|
44
|
+
const createUiBuilderForm = (context, schema, dataSchema, formFeatureFlags) => {
|
|
45
45
|
const uiBuilderComponentsPath = (0, getUiBuilderComponentsPath_1.getUiBuilderComponentsPath)(context);
|
|
46
|
-
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((form) => new codegen_ui_react_1.AmplifyFormRenderer(form, dataSchema, config));
|
|
46
|
+
const rendererFactory = new codegen_ui_1.StudioTemplateRendererFactory((form) => new codegen_ui_react_1.AmplifyFormRenderer(form, dataSchema, config, formFeatureFlags));
|
|
47
47
|
const outputPathDir = uiBuilderComponentsPath;
|
|
48
48
|
const rendererManager = new codegen_ui_1.StudioTemplateRendererManager(rendererFactory, {
|
|
49
49
|
outputPathDir,
|
|
@@ -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,5 +1,5 @@
|
|
|
1
1
|
import { $TSContext } from 'amplify-cli-core';
|
|
2
|
-
import { StudioComponent, StudioTheme, GenericDataSchema, StudioForm, StudioSchema } from '@aws-amplify/codegen-ui';
|
|
2
|
+
import { StudioComponent, StudioTheme, GenericDataSchema, StudioForm, StudioSchema, FormFeatureFlags } from '@aws-amplify/codegen-ui';
|
|
3
3
|
type CodegenResponse<T extends StudioSchema> = {
|
|
4
4
|
resultType: 'SUCCESS';
|
|
5
5
|
schema: T;
|
|
@@ -12,6 +12,6 @@ type CodegenResponse<T extends StudioSchema> = {
|
|
|
12
12
|
};
|
|
13
13
|
export declare const generateUiBuilderComponents: (context: $TSContext, componentSchemas: any[], dataSchema?: GenericDataSchema) => CodegenResponse<StudioComponent>[];
|
|
14
14
|
export declare const generateUiBuilderThemes: (context: $TSContext, themeSchemas: any[]) => CodegenResponse<StudioTheme>[];
|
|
15
|
-
export declare const generateUiBuilderForms: (context: $TSContext, formSchemas: any[], dataSchema?: GenericDataSchema, autoGenerateForms?: boolean) => CodegenResponse<StudioForm>[];
|
|
15
|
+
export declare const generateUiBuilderForms: (context: $TSContext, formSchemas: any[], dataSchema?: GenericDataSchema, autoGenerateForms?: boolean, formFeatureFlags?: FormFeatureFlags) => CodegenResponse<StudioForm>[];
|
|
16
16
|
export {};
|
|
17
17
|
//# 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,
|
|
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,EACf,WAAW,EACX,iBAAiB,EACjB,UAAU,EACV,YAAY,EAEZ,gBAAgB,EACjB,MAAM,yBAAyB,CAAC;AAIjC,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,qBACR,gBAAgB,KAClC,gBAAgB,UAAU,CAAC,EAsC7B,CAAC"}
|
|
@@ -52,18 +52,18 @@ const generateDefaultTheme = (context) => {
|
|
|
52
52
|
return { resultType: 'FAILURE', schemaName: 'studioTheme', error: e };
|
|
53
53
|
}
|
|
54
54
|
};
|
|
55
|
-
const generateUiBuilderForms = (context, formSchemas, dataSchema, autoGenerateForms) => {
|
|
55
|
+
const generateUiBuilderForms = (context, formSchemas, dataSchema, autoGenerateForms, formFeatureFlags) => {
|
|
56
56
|
const modelMap = {};
|
|
57
57
|
if ((dataSchema === null || dataSchema === void 0 ? void 0 : dataSchema.dataSourceType) === 'DataStore' && autoGenerateForms) {
|
|
58
58
|
Object.entries(dataSchema.models).forEach(([name, model]) => {
|
|
59
|
-
if ((0, codegen_ui_1.checkIsSupportedAsForm)(model) && !model.isJoinTable) {
|
|
59
|
+
if ((0, codegen_ui_1.checkIsSupportedAsForm)(model, formFeatureFlags) && !model.isJoinTable) {
|
|
60
60
|
modelMap[name] = new Set(['create', 'update']);
|
|
61
61
|
}
|
|
62
62
|
});
|
|
63
63
|
}
|
|
64
64
|
const codegenForm = (schema) => {
|
|
65
65
|
try {
|
|
66
|
-
const form = (0, codegenResources_1.createUiBuilderForm)(context, schema, dataSchema);
|
|
66
|
+
const form = (0, codegenResources_1.createUiBuilderForm)(context, schema, dataSchema, formFeatureFlags);
|
|
67
67
|
return { resultType: 'SUCCESS', schema: form };
|
|
68
68
|
}
|
|
69
69
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":";;;AAAA,kEAAuD;AAEvD,
|
|
1
|
+
{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/amplify-util-uibuilder",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.7.0-rc.374a34c65a.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -14,11 +14,11 @@
|
|
|
14
14
|
"access": "public"
|
|
15
15
|
},
|
|
16
16
|
"dependencies": {
|
|
17
|
-
"@aws-amplify/amplify-prompts": "2.6.
|
|
18
|
-
"@aws-amplify/codegen-ui": "2.
|
|
19
|
-
"@aws-amplify/codegen-ui-react": "2.
|
|
20
|
-
"amplify-cli-core": "4.0.
|
|
21
|
-
"amplify-codegen": "
|
|
17
|
+
"@aws-amplify/amplify-prompts": "2.6.8",
|
|
18
|
+
"@aws-amplify/codegen-ui": "2.12.1",
|
|
19
|
+
"@aws-amplify/codegen-ui-react": "2.12.1",
|
|
20
|
+
"amplify-cli-core": "4.0.4-rc.374a34c65a.0",
|
|
21
|
+
"amplify-codegen": "3.4.2",
|
|
22
22
|
"aws-sdk": "^2.1233.0",
|
|
23
23
|
"fs-extra": "^8.1.0",
|
|
24
24
|
"ora": "^4.0.3",
|
|
@@ -73,5 +73,5 @@
|
|
|
73
73
|
"usePathForSuiteName": "true",
|
|
74
74
|
"addFileAttribute": "true"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "85bd01ddc982ac14b64240825c3b341f209f4754"
|
|
77
77
|
}
|
|
@@ -53,13 +53,13 @@ describe('should notify when packages are missing', () => {
|
|
|
53
53
|
},
|
|
54
54
|
};
|
|
55
55
|
notifyMissingPackages(context as unknown as $TSContext);
|
|
56
|
-
expect(printerDependency.printer.warn).toBeCalledTimes(
|
|
56
|
+
expect(printerDependency.printer.warn).toBeCalledTimes(3);
|
|
57
57
|
});
|
|
58
58
|
|
|
59
59
|
it('notifies for partial missing dependencies', async () => {
|
|
60
60
|
JSONUtilitiesDependency.JSONUtilities.readJson = jest.fn().mockImplementation(() => ({
|
|
61
61
|
projectPath: __dirname,
|
|
62
|
-
dependencies: { '@aws-amplify/ui-react': '4.
|
|
62
|
+
dependencies: { '@aws-amplify/ui-react': '4.6.0' },
|
|
63
63
|
}));
|
|
64
64
|
const context = {
|
|
65
65
|
input: {
|
|
@@ -69,6 +69,6 @@ describe('should notify when packages are missing', () => {
|
|
|
69
69
|
},
|
|
70
70
|
};
|
|
71
71
|
notifyMissingPackages(context as unknown as $TSContext);
|
|
72
|
-
expect(printerDependency.printer.warn).toBeCalledTimes(
|
|
72
|
+
expect(printerDependency.printer.warn).toBeCalledTimes(2);
|
|
73
73
|
});
|
|
74
74
|
});
|
|
@@ -139,6 +139,10 @@ describe('should sync amplify ui builder components', () => {
|
|
|
139
139
|
features: {
|
|
140
140
|
autoGenerateForms: 'true',
|
|
141
141
|
autoGenerateViews: 'true',
|
|
142
|
+
formFeatureFlags: {
|
|
143
|
+
isRelationshipSupported: 'false',
|
|
144
|
+
isNonModelSupported: 'false',
|
|
145
|
+
},
|
|
142
146
|
},
|
|
143
147
|
})),
|
|
144
148
|
})),
|
|
@@ -179,6 +183,10 @@ describe('should sync amplify ui builder components', () => {
|
|
|
179
183
|
expect.objectContaining({
|
|
180
184
|
autoGenerateForms: true,
|
|
181
185
|
autoGenerateViews: true,
|
|
186
|
+
formFeatureFlags: {
|
|
187
|
+
isRelationshipSupported: false,
|
|
188
|
+
isNonModelSupported: false,
|
|
189
|
+
},
|
|
182
190
|
}),
|
|
183
191
|
);
|
|
184
192
|
});
|
|
@@ -12,6 +12,10 @@ import { getTransformerVersion } from '../commands/utils/featureFlags';
|
|
|
12
12
|
export type StudioMetadata = {
|
|
13
13
|
autoGenerateForms: boolean;
|
|
14
14
|
autoGenerateViews: boolean;
|
|
15
|
+
formFeatureFlags: {
|
|
16
|
+
isRelationshipSupported: boolean;
|
|
17
|
+
isNonModelSupported: boolean;
|
|
18
|
+
};
|
|
15
19
|
};
|
|
16
20
|
|
|
17
21
|
/**
|
|
@@ -107,6 +111,10 @@ export default class AmplifyStudioClient {
|
|
|
107
111
|
this.metadata = {
|
|
108
112
|
autoGenerateForms: false,
|
|
109
113
|
autoGenerateViews: false,
|
|
114
|
+
formFeatureFlags: {
|
|
115
|
+
isRelationshipSupported: false,
|
|
116
|
+
isNonModelSupported: false,
|
|
117
|
+
},
|
|
110
118
|
};
|
|
111
119
|
}
|
|
112
120
|
|
|
@@ -126,6 +134,10 @@ export default class AmplifyStudioClient {
|
|
|
126
134
|
this.metadata = {
|
|
127
135
|
autoGenerateForms: response.features?.autoGenerateForms === 'true',
|
|
128
136
|
autoGenerateViews: response.features?.autoGenerateViews === 'true',
|
|
137
|
+
formFeatureFlags: {
|
|
138
|
+
isRelationshipSupported: response.features?.isRelationshipSupported === 'true',
|
|
139
|
+
isNonModelSupported: response.features?.isNonModelSupported === 'true',
|
|
140
|
+
},
|
|
129
141
|
};
|
|
130
142
|
} catch (err) {
|
|
131
143
|
throw new Error(`Failed to load metadata: ${err.message}`);
|
|
@@ -12,6 +12,7 @@ import {
|
|
|
12
12
|
getGenericFromDataStore,
|
|
13
13
|
StudioForm,
|
|
14
14
|
StudioSchema,
|
|
15
|
+
FormFeatureFlags,
|
|
15
16
|
} from '@aws-amplify/codegen-ui';
|
|
16
17
|
import {
|
|
17
18
|
AmplifyRenderer,
|
|
@@ -95,11 +96,16 @@ export const createUiBuilderTheme = (
|
|
|
95
96
|
/**
|
|
96
97
|
* Writes form file to the work space
|
|
97
98
|
*/
|
|
98
|
-
export const createUiBuilderForm = (
|
|
99
|
+
export const createUiBuilderForm = (
|
|
100
|
+
context: $TSContext,
|
|
101
|
+
schema: StudioForm,
|
|
102
|
+
dataSchema?: GenericDataSchema,
|
|
103
|
+
formFeatureFlags?: FormFeatureFlags,
|
|
104
|
+
): StudioForm => {
|
|
99
105
|
const uiBuilderComponentsPath = getUiBuilderComponentsPath(context);
|
|
100
106
|
const rendererFactory = new StudioTemplateRendererFactory(
|
|
101
107
|
(form: StudioForm) =>
|
|
102
|
-
new AmplifyFormRenderer(form, dataSchema, config) as unknown as StudioTemplateRenderer<
|
|
108
|
+
new AmplifyFormRenderer(form, dataSchema, config, formFeatureFlags) as unknown as StudioTemplateRenderer<
|
|
103
109
|
unknown,
|
|
104
110
|
StudioForm,
|
|
105
111
|
FrameworkOutputManager<unknown>,
|
|
@@ -1,6 +1,14 @@
|
|
|
1
1
|
import { printer } from '@aws-amplify/amplify-prompts';
|
|
2
2
|
import { $TSContext } from 'amplify-cli-core';
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
StudioComponent,
|
|
5
|
+
StudioTheme,
|
|
6
|
+
GenericDataSchema,
|
|
7
|
+
StudioForm,
|
|
8
|
+
StudioSchema,
|
|
9
|
+
checkIsSupportedAsForm,
|
|
10
|
+
FormFeatureFlags,
|
|
11
|
+
} from '@aws-amplify/codegen-ui';
|
|
4
12
|
import { createUiBuilderComponent, createUiBuilderForm, createUiBuilderTheme, generateBaseForms } from './codegenResources';
|
|
5
13
|
import { getUiBuilderComponentsPath } from './getUiBuilderComponentsPath';
|
|
6
14
|
|
|
@@ -95,18 +103,19 @@ export const generateUiBuilderForms = (
|
|
|
95
103
|
formSchemas: any[],
|
|
96
104
|
dataSchema?: GenericDataSchema,
|
|
97
105
|
autoGenerateForms?: boolean,
|
|
106
|
+
formFeatureFlags?: FormFeatureFlags,
|
|
98
107
|
): CodegenResponse<StudioForm>[] => {
|
|
99
108
|
const modelMap: { [model: string]: Set<'create' | 'update'> } = {};
|
|
100
109
|
if (dataSchema?.dataSourceType === 'DataStore' && autoGenerateForms) {
|
|
101
110
|
Object.entries(dataSchema.models).forEach(([name, model]) => {
|
|
102
|
-
if (checkIsSupportedAsForm(model) && !model.isJoinTable) {
|
|
111
|
+
if (checkIsSupportedAsForm(model, formFeatureFlags) && !model.isJoinTable) {
|
|
103
112
|
modelMap[name] = new Set(['create', 'update']);
|
|
104
113
|
}
|
|
105
114
|
});
|
|
106
115
|
}
|
|
107
116
|
const codegenForm = (schema: StudioForm): CodegenResponse<StudioForm> => {
|
|
108
117
|
try {
|
|
109
|
-
const form = createUiBuilderForm(context, schema, dataSchema);
|
|
118
|
+
const form = createUiBuilderForm(context, schema, dataSchema, formFeatureFlags);
|
|
110
119
|
return { resultType: 'SUCCESS', schema: form };
|
|
111
120
|
} catch (e) {
|
|
112
121
|
printer.debug(`Failure caught processing ${schema.name}`);
|