@aws-amplify/amplify-util-uibuilder 1.6.0-cdkv2.2 → 1.6.0-cdkv2.4
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/API.md +19 -0
- package/CHANGELOG.md +72 -0
- 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 +5 -3
- package/lib/commands/utils/codegenResources.js.map +1 -1
- package/lib/commands/utils/notifyMissingPackages.js +2 -2
- package/lib/commands/utils/notifyMissingPackages.js.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.d.ts.map +1 -1
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js +15 -0
- package/lib/commands/utils/syncAmplifyUiBuilderComponents.js.map +1 -1
- package/package.json +8 -7
- package/src/__tests__/createUiBuilderComponent.test.ts +9 -0
- package/src/__tests__/generateComponents.test.ts +1 -0
- package/src/__tests__/notifyMissingPackages.test.ts +2 -2
- package/src/__tests__/syncAmplifyUiComponents.test.ts +13 -0
- package/src/commands/utils/codegenResources.ts +10 -3
- package/src/commands/utils/notifyMissingPackages.ts +2 -2
- package/src/commands/utils/syncAmplifyUiBuilderComponents.ts +23 -3
- package/tsconfig.tsbuildinfo +1 -1
package/API.md
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
## API Report File for "@aws-amplify/amplify-util-uibuilder"
|
|
2
|
+
|
|
3
|
+
> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
|
|
4
|
+
|
|
5
|
+
```ts
|
|
6
|
+
|
|
7
|
+
import { $TSContext } from 'amplify-cli-core';
|
|
8
|
+
|
|
9
|
+
// @public (undocumented)
|
|
10
|
+
export const executeAmplifyCommand: (context: $TSContext, cmd: string) => Promise<void>;
|
|
11
|
+
|
|
12
|
+
// @public (undocumented)
|
|
13
|
+
export const handleAmplifyEvent: (context: $TSContext, { event }: {
|
|
14
|
+
event: string;
|
|
15
|
+
}) => Promise<void>;
|
|
16
|
+
|
|
17
|
+
// (No @packageDocumentation comment for this package)
|
|
18
|
+
|
|
19
|
+
```
|
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,58 @@
|
|
|
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.0-cdkv2.4](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.0-cdkv2.3...@aws-amplify/amplify-util-uibuilder@1.6.0-cdkv2.4) (2022-12-13)
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
### Bug Fixes
|
|
10
|
+
|
|
11
|
+
* address UI Builder component generation errors ([#11536](https://github.com/aws-amplify/amplify-cli/issues/11536)) ([aceec4c](https://github.com/aws-amplify/amplify-cli/commit/aceec4c098bc85d2e8da0738bbc5e8089ad8ae6e))
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
|
|
16
|
+
|
|
17
|
+
# [1.6.0-cdkv2.3](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.2...@aws-amplify/amplify-util-uibuilder@1.6.0-cdkv2.3) (2022-12-01)
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
### Bug Fixes
|
|
21
|
+
|
|
22
|
+
* **cli:** fix grammar in pull warning message ([#11407](https://github.com/aws-amplify/amplify-cli/issues/11407)) ([984c0f8](https://github.com/aws-amplify/amplify-cli/commit/984c0f8548cec80d0e14269757cd49b031403097))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
# [1.6.0-beta.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.2...@aws-amplify/amplify-util-uibuilder@1.6.0-beta.2) (2022-12-01)
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
### Bug Fixes
|
|
32
|
+
|
|
33
|
+
* **cli:** fix grammar in pull warning message ([#11407](https://github.com/aws-amplify/amplify-cli/issues/11407)) ([984c0f8](https://github.com/aws-amplify/amplify-cli/commit/984c0f8548cec80d0e14269757cd49b031403097))
|
|
34
|
+
|
|
35
|
+
|
|
36
|
+
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
# [1.6.0-beta.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.0-beta.0...@aws-amplify/amplify-util-uibuilder@1.6.0-beta.1) (2022-11-19)
|
|
40
|
+
|
|
41
|
+
**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
|
|
47
|
+
# [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)
|
|
48
|
+
|
|
49
|
+
|
|
50
|
+
### Bug Fixes
|
|
51
|
+
|
|
52
|
+
* 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))
|
|
53
|
+
|
|
54
|
+
|
|
55
|
+
|
|
56
|
+
|
|
57
|
+
|
|
6
58
|
# [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)
|
|
7
59
|
|
|
8
60
|
**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
|
|
@@ -20,6 +72,26 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
|
|
|
20
72
|
|
|
21
73
|
|
|
22
74
|
# [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)
|
|
75
|
+
## [1.6.2](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.1...@aws-amplify/amplify-util-uibuilder@1.6.2) (2022-11-21)
|
|
76
|
+
|
|
77
|
+
**Note:** Version bump only for package @aws-amplify/amplify-util-uibuilder
|
|
78
|
+
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
|
|
82
|
+
|
|
83
|
+
## [1.6.1](https://github.com/aws-amplify/amplify-cli/compare/@aws-amplify/amplify-util-uibuilder@1.6.0...@aws-amplify/amplify-util-uibuilder@1.6.1) (2022-11-17)
|
|
84
|
+
|
|
85
|
+
|
|
86
|
+
### Bug Fixes
|
|
87
|
+
|
|
88
|
+
* 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))
|
|
89
|
+
|
|
90
|
+
|
|
91
|
+
|
|
92
|
+
|
|
93
|
+
|
|
94
|
+
# [1.6.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) (2022-10-27)
|
|
23
95
|
|
|
24
96
|
|
|
25
97
|
### Bug Fixes
|
|
@@ -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,IA0BhG,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,
|
|
@@ -69,7 +69,9 @@ const generateAmplifyUiBuilderIndexFile = (context, schemas) => {
|
|
|
69
69
|
outputPathDir,
|
|
70
70
|
});
|
|
71
71
|
try {
|
|
72
|
-
|
|
72
|
+
if (schemas.length) {
|
|
73
|
+
rendererManager.renderSchemaToTemplate(schemas);
|
|
74
|
+
}
|
|
73
75
|
}
|
|
74
76
|
catch (e) {
|
|
75
77
|
amplify_prompts_1.printer.debug(e);
|
|
@@ -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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"}
|
|
@@ -30,10 +30,10 @@ const notifyMissingPackages = (context) => {
|
|
|
30
30
|
getRequiredDependencies().forEach((dependency) => {
|
|
31
31
|
const packageIsInstalled = Object.keys(packageJson.dependencies).includes(dependency.dependencyName);
|
|
32
32
|
if (!packageIsInstalled) {
|
|
33
|
-
amplify_prompts_1.printer.warn(`UIBuilder components
|
|
33
|
+
amplify_prompts_1.printer.warn(`UIBuilder components require "${dependency.dependencyName}" that is not in your package.json. Run \`npm install "${dependency.dependencyName}@${dependency.supportedSemVerPattern}"\`. ${dependency.reason}`);
|
|
34
34
|
}
|
|
35
35
|
else if (!(0, subset_1.default)(packageJson.dependencies[dependency.dependencyName], dependency.supportedSemVerPattern)) {
|
|
36
|
-
amplify_prompts_1.printer.warn(`UIBuilder components
|
|
36
|
+
amplify_prompts_1.printer.warn(`UIBuilder components require version "${dependency.supportedSemVerPattern}" of "${dependency.dependencyName}". You currently are on version "${packageJson.dependencies[dependency.dependencyName]}". Run \`npm install "${dependency.dependencyName}@${dependency.supportedSemVerPattern}"\`. ${dependency.reason}`);
|
|
37
37
|
}
|
|
38
38
|
});
|
|
39
39
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"notifyMissingPackages.js","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":";;;;;;AAAA,uDAE0B;AAC1B,qDAA0C;AAC1C,wDAA0B;AAC1B,gDAAwB;AACxB,kEAA+C;AAE/C,oEAAgF;AAChF,+CAA4C;AAE5C,MAAM,uBAAuB,GAAG,GAAyB,EAAE,CAAC,IAAI,kDAA+B,EAAE,CAAC,uBAAuB,EAAE,CAAC;AAMrH,MAAM,qBAAqB,GAAG,CAAC,OAAmB,EAAQ,EAAE;;IACjE,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,8BAAW,CAAC,mBAAmB,EAAE,CAAC;IACpF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QACpC,yBAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;QAC9F,OAAO;KACR;IACD,MAAM,YAAY,GAAG,gCAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAE,YAAuB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACxF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;QACnC,yBAAO,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;QACjF,OAAO;KACR;IACD,MAAM,WAAW,GAAG,gCAAa,CAAC,QAAQ,CAAC,eAAe,CAAgD,CAAC;IAC3G,uBAAuB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;QACvD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACrG,IAAI,CAAC,kBAAkB,EAAE;YACvB,yBAAO,CAAC,IAAI,CACV,
|
|
1
|
+
{"version":3,"file":"notifyMissingPackages.js","sourceRoot":"","sources":["../../../src/commands/utils/notifyMissingPackages.ts"],"names":[],"mappings":";;;;;;AAAA,uDAE0B;AAC1B,qDAA0C;AAC1C,wDAA0B;AAC1B,gDAAwB;AACxB,kEAA+C;AAE/C,oEAAgF;AAChF,+CAA4C;AAE5C,MAAM,uBAAuB,GAAG,GAAyB,EAAE,CAAC,IAAI,kDAA+B,EAAE,CAAC,uBAAuB,EAAE,CAAC;AAMrH,MAAM,qBAAqB,GAAG,CAAC,OAAmB,EAAQ,EAAE;;IACjE,MAAM,IAAI,GAAG,IAAA,yBAAW,EAAC,OAAO,CAAC,CAAC;IAClC,MAAM,gBAAgB,GAAG,MAAA,IAAI,CAAC,gBAAgB,mCAAI,8BAAW,CAAC,mBAAmB,EAAE,CAAC;IACpF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,EAAE;QACpC,yBAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;QAC9F,OAAO;KACR;IACD,MAAM,YAAY,GAAG,gCAAa,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC9D,MAAM,eAAe,GAAG,cAAI,CAAC,IAAI,CAAE,YAAuB,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IACxF,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE;QACnC,yBAAO,CAAC,KAAK,CAAC,iEAAiE,CAAC,CAAC;QACjF,OAAO;KACR;IACD,MAAM,WAAW,GAAG,gCAAa,CAAC,QAAQ,CAAC,eAAe,CAAgD,CAAC;IAC3G,uBAAuB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAkB,EAAE,EAAE;QACvD,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QACrG,IAAI,CAAC,kBAAkB,EAAE;YACvB,yBAAO,CAAC,IAAI,CACV,iCAAiC,UAAU,CAAC,cAAc,0DAA0D,UAAU,CAAC,cAAc,IAAI,UAAU,CAAC,sBAAsB,QAAQ,UAAU,CAAC,MAAM,EAAE,CAC9M,CAAC;SACH;aAAM,IAAI,CAAC,IAAA,gBAAW,EAAC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,UAAU,CAAC,sBAAsB,CAAC,EAAE;YAC/G,yBAAO,CAAC,IAAI,CACV,yCAAyC,UAAU,CAAC,sBAAsB,SACxE,UAAU,CAAC,cACb,oCAAoC,WAAW,CAAC,YAAY,CAAC,UAAU,CAAC,cAAc,CAAC,yBACrF,UAAU,CAAC,cACb,IAAI,UAAU,CAAC,sBAAsB,QAAQ,UAAU,CAAC,MAAM,EAAE,CACjE,CAAC;SACH;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AA9BW,QAAA,qBAAqB,yBA8BhC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"syncAmplifyUiBuilderComponents.d.ts","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,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,
|
|
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;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,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;
|
|
1
|
+
{"version":3,"file":"syncAmplifyUiBuilderComponents.js","sourceRoot":"","sources":["../../../src/commands/utils/syncAmplifyUiBuilderComponents.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aws-amplify/amplify-util-uibuilder",
|
|
3
|
-
"version": "1.6.0-cdkv2.
|
|
3
|
+
"version": "1.6.0-cdkv2.4",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
7
7
|
"build": "tsc",
|
|
8
|
-
"test": "jest --logHeapUsage"
|
|
8
|
+
"test": "jest --logHeapUsage",
|
|
9
|
+
"extract-api": "ts-node ../../scripts/extract-api.ts"
|
|
9
10
|
},
|
|
10
11
|
"author": "Amazon Web Services",
|
|
11
12
|
"license": "Apache-2.0",
|
|
@@ -13,10 +14,10 @@
|
|
|
13
14
|
"access": "public"
|
|
14
15
|
},
|
|
15
16
|
"dependencies": {
|
|
16
|
-
"@aws-amplify/codegen-ui": "2.5.
|
|
17
|
-
"@aws-amplify/codegen-ui-react": "2.5.
|
|
18
|
-
"amplify-cli-core": "4.0.0-cdkv2.
|
|
19
|
-
"amplify-prompts": "2.6.2-cdkv2.
|
|
17
|
+
"@aws-amplify/codegen-ui": "2.5.6",
|
|
18
|
+
"@aws-amplify/codegen-ui-react": "2.5.6",
|
|
19
|
+
"amplify-cli-core": "4.0.0-cdkv2.4",
|
|
20
|
+
"amplify-prompts": "2.6.2-cdkv2.2",
|
|
20
21
|
"aws-sdk": "^2.1233.0",
|
|
21
22
|
"fs-extra": "^8.1.0",
|
|
22
23
|
"ora": "^4.0.3"
|
|
@@ -68,5 +69,5 @@
|
|
|
68
69
|
"usePathForSuiteName": "true",
|
|
69
70
|
"addFileAttribute": "true"
|
|
70
71
|
},
|
|
71
|
-
"gitHead": "
|
|
72
|
+
"gitHead": "ba726ce8e41ab9767cb982520de249c541c34bc4"
|
|
72
73
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable spellcheck/spell-checker */
|
|
1
2
|
import * as codegen from '@aws-amplify/codegen-ui'; // eslint-disable-line import/no-extraneous-dependencies
|
|
2
3
|
import {
|
|
3
4
|
generateAmplifyUiBuilderIndexFile,
|
|
@@ -56,6 +57,10 @@ describe('can create a ui builder component', () => {
|
|
|
56
57
|
createUiBuilderTheme(context, schema);
|
|
57
58
|
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
|
|
58
59
|
});
|
|
60
|
+
it('calls the renderManager for default theme', () => {
|
|
61
|
+
createUiBuilderTheme(context, schema, { renderDefaultTheme: true });
|
|
62
|
+
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
|
|
63
|
+
});
|
|
59
64
|
it('calls the renderManager for forms', () => {
|
|
60
65
|
createUiBuilderForm(context, schema);
|
|
61
66
|
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
|
|
@@ -64,6 +69,10 @@ describe('can create a ui builder component', () => {
|
|
|
64
69
|
generateAmplifyUiBuilderIndexFile(context, [schema]);
|
|
65
70
|
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalled();
|
|
66
71
|
});
|
|
72
|
+
it('does not call renderSchemaToTemplate for index file if no schema', () => {
|
|
73
|
+
generateAmplifyUiBuilderIndexFile(context, []);
|
|
74
|
+
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).not.toBeCalled();
|
|
75
|
+
})
|
|
67
76
|
it('calls the renderManager for utils file w/ validation, formatter, and fetchByPath helpers if there is a form', () => {
|
|
68
77
|
generateAmplifyUiBuilderUtilFile(context, { hasForms: true, hasViews: false });
|
|
69
78
|
expect(new codegenMock.StudioTemplateRendererManager().renderSchemaToTemplate).toBeCalledWith(expect.arrayContaining(['validation', 'formatter', 'fetchByPath']));
|
|
@@ -79,6 +79,7 @@ describe('can generate components', () => {
|
|
|
79
79
|
expect(utilsMock.generateUiBuilderThemes).toBeCalledTimes(1);
|
|
80
80
|
expect(utilsMock.generateUiBuilderForms).toBeCalledTimes(1);
|
|
81
81
|
});
|
|
82
|
+
|
|
82
83
|
it('does not run generateComponents if not Amplify Admin app', async () => {
|
|
83
84
|
utilsMock.shouldRenderComponents = jest.fn().mockReturnValue(false);
|
|
84
85
|
await run(context);
|
|
@@ -52,13 +52,13 @@ describe('should notify when packages are missing', () => {
|
|
|
52
52
|
},
|
|
53
53
|
};
|
|
54
54
|
notifyMissingPackages(context as JSONUtilitiesDependency.$TSContext);
|
|
55
|
-
expect(printerDependency.printer.warn).toBeCalledTimes(
|
|
55
|
+
expect(printerDependency.printer.warn).toBeCalledTimes(2);
|
|
56
56
|
});
|
|
57
57
|
|
|
58
58
|
it('notifies for partial missing dependencies', async () => {
|
|
59
59
|
JSONUtilitiesDependency.JSONUtilities.readJson = jest.fn().mockImplementation(() => ({
|
|
60
60
|
projectPath: __dirname,
|
|
61
|
-
dependencies: { '@aws-amplify/ui-react': '
|
|
61
|
+
dependencies: { '@aws-amplify/ui-react': '4.2.0' },
|
|
62
62
|
}));
|
|
63
63
|
const context = {
|
|
64
64
|
input: {
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
/* eslint-disable spellcheck/spell-checker */
|
|
1
2
|
import { AmplifyCategories, AmplifySupportedService, stateManager } from 'amplify-cli-core'; // eslint-disable-line import/no-extraneous-dependencies
|
|
2
3
|
import aws from 'aws-sdk'; // eslint-disable-line import/no-extraneous-dependencies
|
|
3
4
|
import {
|
|
@@ -237,6 +238,18 @@ describe('should sync amplify ui builder components', () => {
|
|
|
237
238
|
const themes = generateUiBuilderThemes(context, [{}, {}]);
|
|
238
239
|
expect(themes.every(theme => theme.resultType === 'FAILURE')).toBeTruthy();
|
|
239
240
|
});
|
|
241
|
+
it('can generate ui builder default theme when no themes are passed', async () => {
|
|
242
|
+
createUiBuilderComponentDependencyMock.createUiBuilderTheme = jest.fn().mockImplementation(() => ({}));
|
|
243
|
+
const themes = generateUiBuilderThemes(context, []);
|
|
244
|
+
expect(themes.every(theme => theme.resultType === 'SUCCESS')).toBeTruthy();
|
|
245
|
+
});
|
|
246
|
+
it('can handle failed generation generate ui builder default theme when no themes are passed', async () => {
|
|
247
|
+
createUiBuilderComponentDependencyMock.createUiBuilderTheme = jest.fn().mockImplementation(() => {
|
|
248
|
+
throw new Error('ahh!');
|
|
249
|
+
});
|
|
250
|
+
const themes = generateUiBuilderThemes(context, []);
|
|
251
|
+
expect(themes.every(theme => theme.resultType === 'FAILURE')).toBeTruthy();
|
|
252
|
+
});
|
|
240
253
|
it('can generate ui builder forms', async () => {
|
|
241
254
|
createUiBuilderComponentDependencyMock.createUiBuilderForm = jest.fn().mockImplementation(() => ({}));
|
|
242
255
|
const forms = generateUiBuilderForms(context, [{}, {}]);
|
|
@@ -23,6 +23,7 @@ import {
|
|
|
23
23
|
ScriptKind,
|
|
24
24
|
UtilTemplateType,
|
|
25
25
|
ReactUtilsStudioTemplateRenderer,
|
|
26
|
+
ReactThemeStudioTemplateRendererOptions,
|
|
26
27
|
} from '@aws-amplify/codegen-ui-react';
|
|
27
28
|
import { printer } from 'amplify-prompts';
|
|
28
29
|
import {
|
|
@@ -60,10 +61,14 @@ export const createUiBuilderComponent = (context: $TSContext, schema: StudioComp
|
|
|
60
61
|
/**
|
|
61
62
|
* Writes theme file to the work space
|
|
62
63
|
*/
|
|
63
|
-
export const createUiBuilderTheme = (
|
|
64
|
+
export const createUiBuilderTheme = (
|
|
65
|
+
context: $TSContext,
|
|
66
|
+
schema: StudioTheme,
|
|
67
|
+
options?: ReactThemeStudioTemplateRendererOptions,
|
|
68
|
+
): StudioTheme => {
|
|
64
69
|
const uiBuilderComponentsPath = getUiBuilderComponentsPath(context);
|
|
65
70
|
const rendererFactory = new StudioTemplateRendererFactory(
|
|
66
|
-
(component: StudioTheme) => (new ReactThemeStudioTemplateRenderer(component, config) as unknown) as StudioTemplateRenderer<
|
|
71
|
+
(component: StudioTheme) => (new ReactThemeStudioTemplateRenderer(component, config, options) as unknown) as StudioTemplateRenderer<
|
|
67
72
|
unknown,
|
|
68
73
|
StudioTheme,
|
|
69
74
|
FrameworkOutputManager<unknown>,
|
|
@@ -140,7 +145,9 @@ export const generateAmplifyUiBuilderIndexFile = (context: $TSContext, schemas:
|
|
|
140
145
|
});
|
|
141
146
|
|
|
142
147
|
try {
|
|
143
|
-
|
|
148
|
+
if(schemas.length) {
|
|
149
|
+
rendererManager.renderSchemaToTemplate(schemas);
|
|
150
|
+
}
|
|
144
151
|
} catch (e) {
|
|
145
152
|
printer.debug(e);
|
|
146
153
|
printer.debug('Failed to generate component index file');
|
|
@@ -33,11 +33,11 @@ export const notifyMissingPackages = (context: $TSContext): void => {
|
|
|
33
33
|
const packageIsInstalled = Object.keys(packageJson.dependencies).includes(dependency.dependencyName);
|
|
34
34
|
if (!packageIsInstalled) {
|
|
35
35
|
printer.warn(
|
|
36
|
-
`UIBuilder components
|
|
36
|
+
`UIBuilder components require "${dependency.dependencyName}" that is not in your package.json. Run \`npm install "${dependency.dependencyName}@${dependency.supportedSemVerPattern}"\`. ${dependency.reason}`,
|
|
37
37
|
);
|
|
38
38
|
} else if (!rangeSubset(packageJson.dependencies[dependency.dependencyName], dependency.supportedSemVerPattern)) {
|
|
39
39
|
printer.warn(
|
|
40
|
-
`UIBuilder components
|
|
40
|
+
`UIBuilder components require version "${dependency.supportedSemVerPattern}" of "${
|
|
41
41
|
dependency.dependencyName
|
|
42
42
|
}". You currently are on version "${packageJson.dependencies[dependency.dependencyName]}". Run \`npm install "${
|
|
43
43
|
dependency.dependencyName
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { printer } from 'amplify-prompts';
|
|
2
2
|
import { $TSContext } from 'amplify-cli-core';
|
|
3
3
|
import {
|
|
4
|
-
StudioComponent, StudioTheme, GenericDataSchema, StudioForm, StudioSchema,checkIsSupportedAsForm
|
|
4
|
+
StudioComponent, StudioTheme, GenericDataSchema, StudioForm, StudioSchema, checkIsSupportedAsForm,
|
|
5
5
|
} from '@aws-amplify/codegen-ui';
|
|
6
6
|
import {
|
|
7
7
|
createUiBuilderComponent,
|
|
@@ -58,6 +58,9 @@ export const generateUiBuilderComponents = (
|
|
|
58
58
|
*/
|
|
59
59
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
60
60
|
export const generateUiBuilderThemes = (context: $TSContext, themeSchemas: any[]): CodegenResponse<StudioTheme>[] => {
|
|
61
|
+
if (themeSchemas.length === 0) {
|
|
62
|
+
return [generateDefaultTheme(context)];
|
|
63
|
+
}
|
|
61
64
|
const themeResults = themeSchemas.map<CodegenResponse<StudioTheme>>(schema => {
|
|
62
65
|
try {
|
|
63
66
|
const theme = createUiBuilderTheme(context, schema);
|
|
@@ -75,12 +78,29 @@ export const generateUiBuilderThemes = (context: $TSContext, themeSchemas: any[]
|
|
|
75
78
|
return themeResults;
|
|
76
79
|
};
|
|
77
80
|
|
|
81
|
+
/**
|
|
82
|
+
* Generates the defaultTheme in the user's project that's exported from @aws-amplify/codegen-ui-react
|
|
83
|
+
*/
|
|
84
|
+
const generateDefaultTheme = (context: $TSContext): CodegenResponse<StudioTheme> => {
|
|
85
|
+
try {
|
|
86
|
+
const theme = createUiBuilderTheme(context, { name: 'studioTheme', values: [] }, { renderDefaultTheme: true });
|
|
87
|
+
printer.debug(
|
|
88
|
+
`Generated default theme in ${getUiBuilderComponentsPath(context)}`,
|
|
89
|
+
);
|
|
90
|
+
return { resultType: 'SUCCESS', schema: theme };
|
|
91
|
+
} catch (e) {
|
|
92
|
+
printer.debug(`Failure caught rendering default theme`);
|
|
93
|
+
printer.debug(e);
|
|
94
|
+
return { resultType: 'FAILURE', schemaName: 'studioTheme', error: e };
|
|
95
|
+
}
|
|
96
|
+
};
|
|
97
|
+
|
|
78
98
|
/**
|
|
79
99
|
* Returns instances of StudioForm from form schemas
|
|
80
100
|
*/
|
|
81
101
|
export const generateUiBuilderForms = (
|
|
82
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
83
102
|
context: $TSContext,
|
|
103
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
84
104
|
formSchemas: any[],
|
|
85
105
|
dataSchema?: GenericDataSchema,
|
|
86
106
|
autoGenerateForms?: boolean,
|
|
@@ -88,7 +108,7 @@ export const generateUiBuilderForms = (
|
|
|
88
108
|
const modelMap: { [model: string]: Set<'create' | 'update'> } = {};
|
|
89
109
|
if (dataSchema?.dataSourceType === 'DataStore' && autoGenerateForms) {
|
|
90
110
|
Object.entries(dataSchema.models).forEach(([name, model]) => {
|
|
91
|
-
if(checkIsSupportedAsForm(model) && !model.isJoinTable) {
|
|
111
|
+
if (checkIsSupportedAsForm(model) && !model.isJoinTable) {
|
|
92
112
|
modelMap[name] = new Set(['create', 'update']);
|
|
93
113
|
}
|
|
94
114
|
});
|