@aws/nx-plugin 0.88.1 → 0.90.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/LICENSE-THIRD-PARTY +688 -54
- package/bin/aws-nx-mcp.js +3 -4
- package/bin/aws-nx-mcp.js.map +1 -1
- package/package.json +2 -2
- package/sdk/utils/ast.d.ts +2 -1
- package/sdk/utils/ast.js +4 -2
- package/sdk/utils/ast.js.map +1 -1
- package/src/connection/generator.js +20 -26
- package/src/connection/generator.js.map +1 -1
- package/src/connection/serve-local.js +7 -9
- package/src/connection/serve-local.js.map +1 -1
- package/src/infra/app/generator.js +152 -143
- package/src/infra/app/generator.js.map +1 -1
- package/src/license/config.js +90 -79
- package/src/license/config.js.map +1 -1
- package/src/license/generator.js +20 -15
- package/src/license/generator.js.map +1 -1
- package/src/license/sync/generator.js +71 -77
- package/src/license/sync/generator.js.map +1 -1
- package/src/license/sync/project-file-sync.js +13 -6
- package/src/license/sync/project-file-sync.js.map +1 -1
- package/src/mcp-server/generator-info.js +28 -34
- package/src/mcp-server/generator-info.js.map +1 -1
- package/src/mcp-server/index.js +3 -4
- package/src/mcp-server/index.js.map +1 -1
- package/src/mcp-server/tools/general-guidance.js +8 -11
- package/src/mcp-server/tools/general-guidance.js.map +1 -1
- package/src/mcp-server/tools/generator-guide.js +3 -4
- package/src/mcp-server/tools/generator-guide.js.map +1 -1
- package/src/open-api/ts-client/generator.js +8 -8
- package/src/open-api/ts-client/generator.js.map +1 -1
- package/src/open-api/ts-hooks/generator.js +4 -4
- package/src/open-api/ts-hooks/generator.js.map +1 -1
- package/src/open-api/ts-metadata/generator.js +4 -4
- package/src/open-api/ts-metadata/generator.js.map +1 -1
- package/src/open-api/utils/codegen-data/languages.js +1 -2
- package/src/open-api/utils/codegen-data/languages.js.map +1 -1
- package/src/open-api/utils/codegen-data.js +90 -92
- package/src/open-api/utils/codegen-data.js.map +1 -1
- package/src/open-api/utils/normalise.js +34 -34
- package/src/open-api/utils/normalise.js.map +1 -1
- package/src/open-api/utils/parse.js +3 -3
- package/src/open-api/utils/parse.js.map +1 -1
- package/src/open-api/utils/refs.js +1 -1
- package/src/open-api/utils/refs.js.map +1 -1
- package/src/preset/__snapshots__/generator.spec.ts.snap +2 -1
- package/src/preset/generator.js +51 -24
- package/src/preset/generator.js.map +1 -1
- package/src/py/fast-api/generator.js +18 -13
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/react/generator.js +8 -10
- package/src/py/fast-api/react/generator.js.map +1 -1
- package/src/py/fast-api/react/open-api.js +15 -7
- package/src/py/fast-api/react/open-api.js.map +1 -1
- package/src/py/lambda-function/generator.js +18 -16
- package/src/py/lambda-function/generator.js.map +1 -1
- package/src/py/mcp-server/generator.js +36 -24
- package/src/py/mcp-server/generator.js.map +1 -1
- package/src/py/project/generator.js +36 -24
- package/src/py/project/generator.js.map +1 -1
- package/src/py/strands-agent/generator.js +21 -16
- package/src/py/strands-agent/generator.js.map +1 -1
- package/src/py/strands-agent/mcp-connection/generator.js +30 -32
- package/src/py/strands-agent/mcp-connection/generator.js.map +1 -1
- package/src/smithy/project/generator.js +6 -8
- package/src/smithy/project/generator.js.map +1 -1
- package/src/smithy/react-connection/generator.js +14 -17
- package/src/smithy/react-connection/generator.js.map +1 -1
- package/src/smithy/ts/api/generator.js +19 -13
- package/src/smithy/ts/api/generator.js.map +1 -1
- package/src/terraform/project/generator.js +191 -189
- package/src/terraform/project/generator.js.map +1 -1
- package/src/trpc/backend/generator.js +95 -83
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/react/__snapshots__/generator.spec.ts.snap +12 -9
- package/src/trpc/react/files/src/components/__apiNameClassName__ClientProvider.tsx.template +1 -1
- package/src/trpc/react/files/src/hooks/use__apiNameClassName__.tsx.template +3 -3
- package/src/trpc/react/generator.js +75 -76
- package/src/trpc/react/generator.js.map +1 -1
- package/src/ts/lambda-function/generator.js +16 -13
- package/src/ts/lambda-function/generator.js.map +1 -1
- package/src/ts/lib/eslint.d.ts +1 -1
- package/src/ts/lib/eslint.js +42 -44
- package/src/ts/lib/eslint.js.map +1 -1
- package/src/ts/lib/generator.js +48 -26
- package/src/ts/lib/generator.js.map +1 -1
- package/src/ts/lib/grit/eslint-dependency-checks-warn.grit +1 -0
- package/src/ts/lib/grit/vitest-pass-with-no-tests.grit +7 -0
- package/src/ts/lib/ts-project-utils.js +54 -31
- package/src/ts/lib/ts-project-utils.js.map +1 -1
- package/src/ts/lib/vitest.d.ts +1 -1
- package/src/ts/lib/vitest.js +17 -19
- package/src/ts/lib/vitest.js.map +1 -1
- package/src/ts/mcp-server/generator.js +23 -18
- package/src/ts/mcp-server/generator.js.map +1 -1
- package/src/ts/nx-generator/generator.js +40 -22
- package/src/ts/nx-generator/generator.js.map +1 -1
- package/src/ts/nx-plugin/generator.js +14 -11
- package/src/ts/nx-plugin/generator.js.map +1 -1
- package/src/ts/nx-plugin/utils.js +11 -10
- package/src/ts/nx-plugin/utils.js.map +1 -1
- package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +33 -23
- package/src/ts/react-website/app/generator.js +257 -255
- package/src/ts/react-website/app/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/__snapshots__/generator.ux-provider.spec.ts.snap +5 -7
- package/src/ts/react-website/cognito-auth/generator.js +68 -92
- package/src/ts/react-website/cognito-auth/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/grit/app-layout-use-auth.grit +10 -0
- package/src/ts/react-website/cognito-auth/grit/cognito-auth-wrapper.grit +3 -0
- package/src/ts/react-website/cognito-auth/utils.js +14 -21
- package/src/ts/react-website/cognito-auth/utils.js.map +1 -1
- package/src/ts/react-website/runtime-config/generator.js +35 -34
- package/src/ts/react-website/runtime-config/generator.js.map +1 -1
- package/src/ts/strands-agent/generator.js +19 -14
- package/src/ts/strands-agent/generator.js.map +1 -1
- package/src/ts/strands-agent/mcp-connection/generator.js +15 -17
- package/src/ts/strands-agent/mcp-connection/generator.js.map +1 -1
- package/src/ts/sync/generator.js +36 -14
- package/src/ts/sync/generator.js.map +1 -1
- package/src/utils/agent-connection/agent-connection.js +62 -68
- package/src/utils/agent-connection/agent-connection.js.map +1 -1
- package/src/utils/agent-core-constructs/agent-core-constructs.js +14 -16
- package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
- package/src/utils/api-constructs/api-constructs.js +8 -10
- package/src/utils/api-constructs/api-constructs.js.map +1 -1
- package/src/utils/api-constructs/open-api-metadata.js +1 -2
- package/src/utils/api-constructs/open-api-metadata.js.map +1 -1
- package/src/utils/ast/website.js +66 -124
- package/src/utils/ast/website.js.map +1 -1
- package/src/utils/ast.d.ts +2 -2
- package/src/utils/ast.js +23 -26
- package/src/utils/ast.js.map +1 -1
- package/src/utils/bundle/bundle.d.ts +1 -1
- package/src/utils/bundle/bundle.js +37 -82
- package/src/utils/bundle/bundle.js.map +1 -1
- package/src/utils/config/utils.js +9 -9
- package/src/utils/config/utils.js.map +1 -1
- package/src/utils/connection/open-api/react.js +28 -23
- package/src/utils/connection/open-api/react.js.map +1 -1
- package/src/utils/format.js +50 -47
- package/src/utils/format.js.map +1 -1
- package/src/utils/fs.js +1 -0
- package/src/utils/fs.js.map +1 -1
- package/src/utils/function-constructs/function-constructs.js +16 -12
- package/src/utils/function-constructs/function-constructs.js.map +1 -1
- package/src/utils/git.js +2 -3
- package/src/utils/git.js.map +1 -1
- package/src/utils/iac.js +4 -6
- package/src/utils/iac.js.map +1 -1
- package/src/utils/identity-constructs/identity-constructs.js +6 -7
- package/src/utils/identity-constructs/identity-constructs.js.map +1 -1
- package/src/utils/js.js +7 -8
- package/src/utils/js.js.map +1 -1
- package/src/utils/metrics.js +12 -13
- package/src/utils/metrics.js.map +1 -1
- package/src/utils/mock-project-graph.js +3 -6
- package/src/utils/mock-project-graph.js.map +1 -1
- package/src/utils/names.js +8 -3
- package/src/utils/names.js.map +1 -1
- package/src/utils/npm-scope.js +1 -1
- package/src/utils/npm-scope.js.map +1 -1
- package/src/utils/nx.js +42 -19
- package/src/utils/nx.js.map +1 -1
- package/src/utils/nxlv-python.d.ts +124 -5
- package/src/utils/nxlv-python.js +5 -14
- package/src/utils/nxlv-python.js.map +1 -1
- package/src/utils/pkg-manager.js +1 -1
- package/src/utils/pkg-manager.js.map +1 -1
- package/src/utils/port.js +4 -6
- package/src/utils/port.js.map +1 -1
- package/src/utils/py.js +12 -12
- package/src/utils/py.js.map +1 -1
- package/src/utils/shared-constructs.js +67 -72
- package/src/utils/shared-constructs.js.map +1 -1
- package/src/utils/shared-infra-config.js +24 -26
- package/src/utils/shared-infra-config.js.map +1 -1
- package/src/utils/shared-scripts.js +24 -26
- package/src/utils/shared-scripts.js.map +1 -1
- package/src/utils/shared-shadcn.js +71 -67
- package/src/utils/shared-shadcn.js.map +1 -1
- package/src/utils/versions.d.ts +5 -1
- package/src/utils/versions.js +8 -4
- package/src/utils/versions.js.map +1 -1
- package/src/utils/website-constructs/website-constructs.js +9 -11
- package/src/utils/website-constructs/website-constructs.js.map +1 -1
- package/src/utils/bundle/__snapshots__/bundle.spec.ts.snap +0 -46
|
@@ -80,6 +80,7 @@ const AppLayout: React.FC = () => {
|
|
|
80
80
|
>([{ text: '/', href: '/' }]);
|
|
81
81
|
const [appLayoutProps, setAppLayoutProps] = useState<AppLayoutProps>({});
|
|
82
82
|
const { pathname, search } = useLocation();
|
|
83
|
+
|
|
83
84
|
const setAppLayoutPropsSafe = useCallback(
|
|
84
85
|
(props: AppLayoutProps) => {
|
|
85
86
|
JSON.stringify(appLayoutProps) !== JSON.stringify(props) &&
|
|
@@ -87,6 +88,7 @@ const AppLayout: React.FC = () => {
|
|
|
87
88
|
},
|
|
88
89
|
[appLayoutProps],
|
|
89
90
|
);
|
|
91
|
+
|
|
90
92
|
useEffect(() => {
|
|
91
93
|
const breadcrumbs = getBreadcrumbs(
|
|
92
94
|
pathname,
|
|
@@ -95,13 +97,9 @@ const AppLayout: React.FC = () => {
|
|
|
95
97
|
);
|
|
96
98
|
setActiveBreadcrumbs(breadcrumbs);
|
|
97
99
|
}, [pathname, search]);
|
|
100
|
+
|
|
98
101
|
const onNavigate = useCallback(
|
|
99
|
-
(
|
|
100
|
-
e: CustomEvent<{
|
|
101
|
-
href: string;
|
|
102
|
-
external?: boolean;
|
|
103
|
-
}>,
|
|
104
|
-
) => {
|
|
102
|
+
(e: CustomEvent<{ href: string; external?: boolean }>) => {
|
|
105
103
|
if (!e.detail.external) {
|
|
106
104
|
e.preventDefault();
|
|
107
105
|
setAppLayoutPropsSafe({
|
|
@@ -112,6 +110,7 @@ const AppLayout: React.FC = () => {
|
|
|
112
110
|
},
|
|
113
111
|
[navigate, setAppLayoutPropsSafe],
|
|
114
112
|
);
|
|
113
|
+
|
|
115
114
|
return (
|
|
116
115
|
<AppLayoutContext.Provider
|
|
117
116
|
value={{
|
|
@@ -222,7 +221,6 @@ const getBreadcrumbs = (
|
|
|
222
221
|
* Defines the App layout and contains logic for routing.
|
|
223
222
|
*/
|
|
224
223
|
const AppLayout: React.FC<React.PropsWithChildren> = ({ children }) => {
|
|
225
|
-
const { user, removeUser, signoutRedirect, clearStaleState } = useAuth();
|
|
226
224
|
const { user, removeUser, signoutRedirect, clearStaleState } = useAuth();
|
|
227
225
|
const [activeBreadcrumbs, setActiveBreadcrumbs] = useState<
|
|
228
226
|
{
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.COGNITO_AUTH_GENERATOR_INFO = void 0;
|
|
4
4
|
exports.tsReactWebsiteAuthGenerator = tsReactWebsiteAuthGenerator;
|
|
5
|
-
const tslib_1 = require("tslib");
|
|
6
5
|
/**
|
|
7
6
|
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
8
7
|
* SPDX-License-Identifier: Apache-2.0
|
|
@@ -10,9 +9,10 @@ const tslib_1 = require("tslib");
|
|
|
10
9
|
const devkit_1 = require("@nx/devkit");
|
|
11
10
|
const shared_constructs_1 = require("../../../utils/shared-constructs");
|
|
12
11
|
const generator_1 = require("../runtime-config/generator");
|
|
13
|
-
const typescript_1 = require("typescript");
|
|
14
12
|
const versions_1 = require("../../../utils/versions");
|
|
15
13
|
const ast_1 = require("../../../utils/ast");
|
|
14
|
+
const fs_1 = require("fs");
|
|
15
|
+
const path_1 = require("path");
|
|
16
16
|
const format_1 = require("../../../utils/format");
|
|
17
17
|
const nx_1 = require("../../../utils/nx");
|
|
18
18
|
const metrics_1 = require("../../../utils/metrics");
|
|
@@ -21,98 +21,74 @@ const identity_constructs_1 = require("../../../utils/identity-constructs/identi
|
|
|
21
21
|
const iac_1 = require("../../../utils/iac");
|
|
22
22
|
const utils_1 = require("./utils");
|
|
23
23
|
const paths_1 = require("../../../utils/paths");
|
|
24
|
+
const readGritPattern = (name) => (0, fs_1.readFileSync)((0, path_1.join)(__dirname, 'grit', `${name}.grit`), 'utf-8').trim();
|
|
24
25
|
exports.COGNITO_AUTH_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
25
|
-
function tsReactWebsiteAuthGenerator(tree, options) {
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
yield (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
41
|
-
iacProvider,
|
|
42
|
-
});
|
|
43
|
-
yield (0, identity_constructs_1.addIdentityInfra)(tree, {
|
|
44
|
-
iacProvider,
|
|
45
|
-
allowSignup: options.allowSignup,
|
|
46
|
-
cognitoDomain: options.cognitoDomain,
|
|
47
|
-
});
|
|
48
|
-
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), srcRoot, options, {
|
|
49
|
-
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
50
|
-
});
|
|
51
|
-
(0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['oidc-client-ts', 'react-oidc-context']), {});
|
|
52
|
-
const mainTsxPath = (0, devkit_1.joinPathFragments)(srcRoot, 'main.tsx');
|
|
53
|
-
yield (0, ast_1.addSingleImport)(tree, mainTsxPath, 'CognitoAuth', './components/CognitoAuth');
|
|
54
|
-
yield (0, website_1.addHookResultToRouterProviderContext)(tree, mainTsxPath, {
|
|
55
|
-
hook: 'useAuth',
|
|
56
|
-
module: 'react-oidc-context',
|
|
57
|
-
contextProp: 'auth',
|
|
58
|
-
});
|
|
59
|
-
const projectConfiguration = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
|
|
60
|
-
const uxProvider = (_b = (_a = projectConfiguration.metadata) === null || _a === void 0 ? void 0 : _a.uxProvider) !== null && _b !== void 0 ? _b : 'Cloudscape';
|
|
61
|
-
(0, ast_1.replace)(tree, mainTsxPath, 'JsxElement[openingElement.tagName.name="RuntimeConfigProvider"]', (node) => (0, ast_1.createJsxElement)(node.openingElement, [(0, ast_1.createJsxElementFromIdentifier)('CognitoAuth', node.children)], node.closingElement));
|
|
62
|
-
// Update App Layout
|
|
63
|
-
const appLayoutTsxPath = (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'AppLayout', 'index.tsx');
|
|
64
|
-
if (tree.exists(appLayoutTsxPath)) {
|
|
65
|
-
yield (0, ast_1.addDestructuredImport)(tree, appLayoutTsxPath, ['useAuth'], 'react-oidc-context');
|
|
66
|
-
(0, ast_1.replace)(tree, appLayoutTsxPath, 'VariableDeclaration', (node) => {
|
|
67
|
-
// Only process if this is the App component
|
|
68
|
-
if (node.name.getText() !== 'AppLayout') {
|
|
69
|
-
return node;
|
|
70
|
-
}
|
|
71
|
-
const arrowFunction = node.initializer;
|
|
72
|
-
const functionBody = arrowFunction.body;
|
|
73
|
-
// Create our new declaration
|
|
74
|
-
const authDeclaration = typescript_1.factory.createVariableStatement(undefined, typescript_1.factory.createVariableDeclarationList([
|
|
75
|
-
typescript_1.factory.createVariableDeclaration(typescript_1.factory.createObjectBindingPattern([
|
|
76
|
-
typescript_1.factory.createBindingElement(undefined, undefined, typescript_1.factory.createIdentifier('user'), undefined),
|
|
77
|
-
typescript_1.factory.createBindingElement(undefined, undefined, typescript_1.factory.createIdentifier('removeUser'), undefined),
|
|
78
|
-
typescript_1.factory.createBindingElement(undefined, undefined, typescript_1.factory.createIdentifier('signoutRedirect'), undefined),
|
|
79
|
-
typescript_1.factory.createBindingElement(undefined, undefined, typescript_1.factory.createIdentifier('clearStaleState'), undefined),
|
|
80
|
-
]), undefined, undefined, typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('useAuth'), undefined, [])),
|
|
81
|
-
], typescript_1.NodeFlags.Const));
|
|
82
|
-
// Add as first statement
|
|
83
|
-
const newStatements = [authDeclaration, ...functionBody.statements];
|
|
84
|
-
// Create new arrow function with updated body
|
|
85
|
-
const newArrowFunction = typescript_1.factory.updateArrowFunction(arrowFunction, arrowFunction.modifiers, arrowFunction.typeParameters, arrowFunction.parameters, arrowFunction.type, arrowFunction.equalsGreaterThanToken, typescript_1.factory.createBlock(newStatements, true));
|
|
86
|
-
// Update the variable declaration
|
|
87
|
-
return typescript_1.factory.updateVariableDeclaration(node, node.name, node.exclamationToken, node.type, newArrowFunction);
|
|
88
|
-
});
|
|
89
|
-
// TODO: update utils if they exist by appending to the array
|
|
90
|
-
// Add a top-level navigation menu that shows the signed-in user's profile and actions
|
|
91
|
-
switch (uxProvider) {
|
|
92
|
-
case 'Cloudscape':
|
|
93
|
-
yield (0, utils_1.addCloudscapeAuthMenu)(tree, appLayoutTsxPath);
|
|
94
|
-
break;
|
|
95
|
-
case 'Shadcn':
|
|
96
|
-
yield (0, utils_1.addShadcnAuthMenu)(tree, appLayoutTsxPath);
|
|
97
|
-
break;
|
|
98
|
-
case 'None':
|
|
99
|
-
yield (0, utils_1.addNoneAuthMenu)(tree, appLayoutTsxPath);
|
|
100
|
-
break;
|
|
101
|
-
default:
|
|
102
|
-
throw new Error(`Top-level navigation menu to show the signed-in user for uxProvider "${uxProvider}" is not implemented.`);
|
|
103
|
-
}
|
|
104
|
-
}
|
|
105
|
-
else {
|
|
106
|
-
console.info(`Skipping update to ${appLayoutTsxPath} as it does not exist.`);
|
|
107
|
-
}
|
|
108
|
-
// End update App Layout
|
|
109
|
-
(0, nx_1.addComponentGeneratorMetadata)(tree, options.project, exports.COGNITO_AUTH_GENERATOR_INFO, (0, paths_1.toProjectRelativePath)(projectConfig, (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'CognitoAuth')));
|
|
110
|
-
yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.COGNITO_AUTH_GENERATOR_INFO]);
|
|
111
|
-
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
112
|
-
return () => {
|
|
113
|
-
(0, devkit_1.installPackagesTask)(tree);
|
|
114
|
-
};
|
|
26
|
+
async function tsReactWebsiteAuthGenerator(tree, options) {
|
|
27
|
+
const projectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
|
|
28
|
+
const srcRoot = projectConfig.sourceRoot;
|
|
29
|
+
if (tree.exists((0, devkit_1.joinPathFragments)(srcRoot, 'components/CognitoAuth/index.tsx'))) {
|
|
30
|
+
throw new Error(`This generator has already been run on ${options.project}.`);
|
|
31
|
+
}
|
|
32
|
+
if (!options.cognitoDomain) {
|
|
33
|
+
throw new Error('A Cognito domain must be specified!');
|
|
34
|
+
}
|
|
35
|
+
await (0, generator_1.runtimeConfigGenerator)(tree, {
|
|
36
|
+
project: options.project,
|
|
37
|
+
});
|
|
38
|
+
const iacProvider = await (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
|
|
39
|
+
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
|
|
40
|
+
iacProvider,
|
|
115
41
|
});
|
|
42
|
+
await (0, identity_constructs_1.addIdentityInfra)(tree, {
|
|
43
|
+
iacProvider,
|
|
44
|
+
allowSignup: options.allowSignup,
|
|
45
|
+
cognitoDomain: options.cognitoDomain,
|
|
46
|
+
});
|
|
47
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), srcRoot, options, {
|
|
48
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
49
|
+
});
|
|
50
|
+
(0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['oidc-client-ts', 'react-oidc-context']), {});
|
|
51
|
+
const mainTsxPath = (0, devkit_1.joinPathFragments)(srcRoot, 'main.tsx');
|
|
52
|
+
await (0, ast_1.addSingleImport)(tree, mainTsxPath, 'CognitoAuth', './components/CognitoAuth');
|
|
53
|
+
await (0, website_1.addHookResultToRouterProviderContext)(tree, mainTsxPath, {
|
|
54
|
+
hook: 'useAuth',
|
|
55
|
+
module: 'react-oidc-context',
|
|
56
|
+
contextProp: 'auth',
|
|
57
|
+
});
|
|
58
|
+
const projectConfiguration = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
|
|
59
|
+
const uxProvider = projectConfiguration.metadata?.uxProvider ?? 'Cloudscape';
|
|
60
|
+
await (0, ast_1.applyGritQL)(tree, mainTsxPath, readGritPattern('cognito-auth-wrapper'));
|
|
61
|
+
// Update App Layout
|
|
62
|
+
const appLayoutTsxPath = (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'AppLayout', 'index.tsx');
|
|
63
|
+
if (tree.exists(appLayoutTsxPath)) {
|
|
64
|
+
await (0, ast_1.addDestructuredImport)(tree, appLayoutTsxPath, ['useAuth'], 'react-oidc-context');
|
|
65
|
+
await (0, ast_1.applyGritQL)(tree, appLayoutTsxPath, readGritPattern('app-layout-use-auth'));
|
|
66
|
+
// TODO: update utils if they exist by appending to the array
|
|
67
|
+
// Add a top-level navigation menu that shows the signed-in user's profile and actions
|
|
68
|
+
switch (uxProvider) {
|
|
69
|
+
case 'Cloudscape':
|
|
70
|
+
await (0, utils_1.addCloudscapeAuthMenu)(tree, appLayoutTsxPath);
|
|
71
|
+
break;
|
|
72
|
+
case 'Shadcn':
|
|
73
|
+
await (0, utils_1.addShadcnAuthMenu)(tree, appLayoutTsxPath);
|
|
74
|
+
break;
|
|
75
|
+
case 'None':
|
|
76
|
+
await (0, utils_1.addNoneAuthMenu)(tree, appLayoutTsxPath);
|
|
77
|
+
break;
|
|
78
|
+
default:
|
|
79
|
+
throw new Error(`Top-level navigation menu to show the signed-in user for uxProvider "${uxProvider}" is not implemented.`);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
console.info(`Skipping update to ${appLayoutTsxPath} as it does not exist.`);
|
|
84
|
+
}
|
|
85
|
+
// End update App Layout
|
|
86
|
+
(0, nx_1.addComponentGeneratorMetadata)(tree, options.project, exports.COGNITO_AUTH_GENERATOR_INFO, (0, paths_1.toProjectRelativePath)(projectConfig, (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'CognitoAuth')));
|
|
87
|
+
await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.COGNITO_AUTH_GENERATOR_INFO]);
|
|
88
|
+
await (0, format_1.formatFilesInSubtree)(tree);
|
|
89
|
+
return () => {
|
|
90
|
+
(0, devkit_1.installPackagesTask)(tree);
|
|
91
|
+
};
|
|
116
92
|
}
|
|
117
93
|
exports.default = tsReactWebsiteAuthGenerator;
|
|
118
94
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/cognito-auth/generator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/cognito-auth/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
or {
|
|
2
|
+
`const AppLayout: $type = ($params) => { $body }` => raw`const AppLayout: $type = ($params) => {
|
|
3
|
+
const { user, removeUser, signoutRedirect, clearStaleState } = useAuth();
|
|
4
|
+
$body
|
|
5
|
+
}` where { $body <: not contains `const $_ = useAuth()` },
|
|
6
|
+
`const AppLayout = ($params) => { $body }` => raw`const AppLayout = ($params) => {
|
|
7
|
+
const { user, removeUser, signoutRedirect, clearStaleState } = useAuth();
|
|
8
|
+
$body
|
|
9
|
+
}` where { $body <: not contains `const $_ = useAuth()` }
|
|
10
|
+
}
|
|
@@ -3,34 +3,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.addNoneAuthMenu = addNoneAuthMenu;
|
|
4
4
|
exports.addCloudscapeAuthMenu = addCloudscapeAuthMenu;
|
|
5
5
|
exports.addShadcnAuthMenu = addShadcnAuthMenu;
|
|
6
|
-
const tslib_1 = require("tslib");
|
|
7
6
|
const ast_1 = require("../../../utils/ast");
|
|
8
7
|
const fs_1 = require("fs");
|
|
9
8
|
const path_1 = require("path");
|
|
10
9
|
const readGritPattern = (name) => (0, fs_1.readFileSync)((0, path_1.join)(__dirname, 'grit', `${name}.grit`), 'utf-8').trim();
|
|
11
10
|
// Adds a user greeting and sign-out button to the default AppLayout header when using the None UX provider.
|
|
12
|
-
function addNoneAuthMenu(tree, appLayoutTsxPath) {
|
|
13
|
-
|
|
14
|
-
yield (0, ast_1.applyGritQLTransform)(tree, appLayoutTsxPath, readGritPattern('none-auth-menu'));
|
|
15
|
-
});
|
|
11
|
+
async function addNoneAuthMenu(tree, appLayoutTsxPath) {
|
|
12
|
+
await (0, ast_1.applyGritQL)(tree, appLayoutTsxPath, readGritPattern('none-auth-menu'));
|
|
16
13
|
}
|
|
17
14
|
// Adds a top navigation dropdown with sign-out when using the Cloudscape UX provider.
|
|
18
|
-
function addCloudscapeAuthMenu(tree, appLayoutTsxPath) {
|
|
19
|
-
|
|
20
|
-
yield (0, ast_1.applyGritQLTransform)(tree, appLayoutTsxPath, readGritPattern('cloudscape-auth-menu'));
|
|
21
|
-
});
|
|
15
|
+
async function addCloudscapeAuthMenu(tree, appLayoutTsxPath) {
|
|
16
|
+
await (0, ast_1.applyGritQL)(tree, appLayoutTsxPath, readGritPattern('cloudscape-auth-menu'));
|
|
22
17
|
}
|
|
23
|
-
function addShadcnAuthMenu(tree, appLayoutTsxPath) {
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
yield (0, ast_1.applyGritQLTransform)(tree, appLayoutTsxPath, readGritPattern('shadcn-auth-menu'));
|
|
34
|
-
});
|
|
18
|
+
async function addShadcnAuthMenu(tree, appLayoutTsxPath) {
|
|
19
|
+
if (!tree.exists(appLayoutTsxPath)) {
|
|
20
|
+
throw new Error(`Expected top nav component at ${appLayoutTsxPath}`);
|
|
21
|
+
}
|
|
22
|
+
// Prepend state declarations to the AppLayout component body
|
|
23
|
+
await (0, ast_1.applyGritQL)(tree, appLayoutTsxPath, readGritPattern('shadcn-state-declarations'));
|
|
24
|
+
// Add useEffect, useRef, useState imports from react
|
|
25
|
+
await (0, ast_1.addDestructuredImport)(tree, appLayoutTsxPath, ['useEffect', 'useRef', 'useState'], 'react');
|
|
26
|
+
// Append the auth menu to the header element
|
|
27
|
+
await (0, ast_1.applyGritQL)(tree, appLayoutTsxPath, readGritPattern('shadcn-auth-menu'));
|
|
35
28
|
}
|
|
36
29
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/cognito-auth/utils.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/cognito-auth/utils.ts"],"names":[],"mappings":";;AAaA,0CAEC;AAGD,sDASC;AAED,8CA0BC;AAlDD,4CAAwE;AACxE,2BAAkC;AAClC,+BAA4B;AAE5B,MAAM,eAAe,GAAG,CAAC,IAAY,EAAU,EAAE,CAC/C,IAAA,iBAAY,EAAC,IAAA,WAAI,EAAC,SAAS,EAAE,MAAM,EAAE,GAAG,IAAI,OAAO,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;AAExE,4GAA4G;AACrG,KAAK,UAAU,eAAe,CAAC,IAAU,EAAE,gBAAwB;IACxE,MAAM,IAAA,iBAAW,EAAC,IAAI,EAAE,gBAAgB,EAAE,eAAe,CAAC,gBAAgB,CAAC,CAAC,CAAC;AAC/E,CAAC;AAED,sFAAsF;AAC/E,KAAK,UAAU,qBAAqB,CACzC,IAAU,EACV,gBAAwB;IAExB,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gBAAgB,EAChB,eAAe,CAAC,sBAAsB,CAAC,CACxC,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,iBAAiB,CAAC,IAAU,EAAE,gBAAwB;IAC1E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,KAAK,CAAC,iCAAiC,gBAAgB,EAAE,CAAC,CAAC;IACvE,CAAC;IAED,6DAA6D;IAC7D,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gBAAgB,EAChB,eAAe,CAAC,2BAA2B,CAAC,CAC7C,CAAC;IAEF,qDAAqD;IACrD,MAAM,IAAA,2BAAqB,EACzB,IAAI,EACJ,gBAAgB,EAChB,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,EACnC,OAAO,CACR,CAAC;IAEF,6CAA6C;IAC7C,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gBAAgB,EAChB,eAAe,CAAC,kBAAkB,CAAC,CACpC,CAAC;AACJ,CAAC"}
|
|
@@ -2,7 +2,6 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.RUNTIME_CONFIG_GENERATOR_INFO = void 0;
|
|
4
4
|
exports.runtimeConfigGenerator = runtimeConfigGenerator;
|
|
5
|
-
const tslib_1 = require("tslib");
|
|
6
5
|
/**
|
|
7
6
|
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
8
7
|
* SPDX-License-Identifier: Apache-2.0
|
|
@@ -16,41 +15,43 @@ const metrics_1 = require("../../../utils/metrics");
|
|
|
16
15
|
const paths_1 = require("../../../utils/paths");
|
|
17
16
|
const website_1 = require("../../../utils/ast/website");
|
|
18
17
|
exports.RUNTIME_CONFIG_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
19
|
-
function runtimeConfigGenerator(tree, options) {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
18
|
+
async function runtimeConfigGenerator(tree, options) {
|
|
19
|
+
const projectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
|
|
20
|
+
const srcRoot = projectConfig.sourceRoot;
|
|
21
|
+
const mainTsxPath = (0, devkit_1.joinPathFragments)(srcRoot, 'main.tsx');
|
|
22
|
+
if (!tree.exists(mainTsxPath)) {
|
|
23
|
+
throw new Error(`Can only run this generator on a project which contains ${mainTsxPath}`);
|
|
24
|
+
}
|
|
25
|
+
const runtimeConfigPath = (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'RuntimeConfig', 'index.tsx');
|
|
26
|
+
if (tree.exists(runtimeConfigPath)) {
|
|
27
|
+
console.debug('Runtime config already exists, skipping generation');
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
30
|
+
const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
|
|
31
|
+
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), srcRoot, {
|
|
32
|
+
...options,
|
|
33
|
+
npmScopePrefix,
|
|
34
|
+
scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix),
|
|
35
|
+
}, {
|
|
36
|
+
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
37
|
+
});
|
|
38
|
+
// Only add RuntimeConfigProvider wrapper and import if not already present in JSX
|
|
39
|
+
const alreadyWrapped = await (0, ast_1.matchGritQL)(tree, mainTsxPath, '`<RuntimeConfigProvider>$_</RuntimeConfigProvider>`');
|
|
40
|
+
if (!alreadyWrapped) {
|
|
41
|
+
await (0, ast_1.addSingleImport)(tree, mainTsxPath, 'RuntimeConfigProvider', './components/RuntimeConfig');
|
|
42
|
+
const wrapped = await (0, ast_1.applyGritQL)(tree, mainTsxPath, '`<App />` => `<RuntimeConfigProvider><App /></RuntimeConfigProvider>`');
|
|
43
|
+
if (!wrapped) {
|
|
44
|
+
throw new Error('Could not locate the App element in main.tsx');
|
|
44
45
|
}
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
(0, nx_1.addComponentGeneratorMetadata)(tree, options.project, exports.RUNTIME_CONFIG_GENERATOR_INFO, (0, paths_1.toProjectRelativePath)(projectConfig, (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'RuntimeConfig')));
|
|
51
|
-
yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.RUNTIME_CONFIG_GENERATOR_INFO]);
|
|
52
|
-
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
46
|
+
}
|
|
47
|
+
await (0, website_1.addHookResultToRouterProviderContext)(tree, mainTsxPath, {
|
|
48
|
+
hook: 'useRuntimeConfig',
|
|
49
|
+
module: './hooks/useRuntimeConfig',
|
|
50
|
+
contextProp: 'runtimeConfig',
|
|
53
51
|
});
|
|
52
|
+
(0, nx_1.addComponentGeneratorMetadata)(tree, options.project, exports.RUNTIME_CONFIG_GENERATOR_INFO, (0, paths_1.toProjectRelativePath)(projectConfig, (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'RuntimeConfig')));
|
|
53
|
+
await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.RUNTIME_CONFIG_GENERATOR_INFO]);
|
|
54
|
+
await (0, format_1.formatFilesInSubtree)(tree);
|
|
54
55
|
}
|
|
55
56
|
exports.default = runtimeConfigGenerator;
|
|
56
57
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/runtime-config/generator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/runtime-config/generator.ts"],"names":[],"mappings":";;;AA2BA,wDAsFC;AAjHD;;;GAGG;AACH,uCAKoB;AAEpB,wDAA2E;AAC3E,kDAA6D;AAC7D,4CAA+E;AAC/E,0CAK2B;AAC3B,oDAAyE;AACzE,gDAA6D;AAC7D,wDAAkF;AAErE,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,KAAK,UAAU,sBAAsB,CAC1C,IAAU,EACV,OAAqC;IAErC,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;IACF,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC;IACzC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,KAAK,CACb,2DAA2D,WAAW,EAAE,CACzE,CAAC;IACJ,CAAC;IAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,OAAO,EACP,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;IACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACnC,OAAO,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACpE,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;IAC/C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,EAC5C,OAAO,EACP;QACE,GAAG,OAAO;QACV,cAAc;QACd,UAAU,EAAE,IAAA,wBAAY,EAAC,cAAc,CAAC;KACzC,EACD;QACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;KAClD,CACF,CAAC;IAEF,kFAAkF;IAClF,MAAM,cAAc,GAAG,MAAM,IAAA,iBAAW,EACtC,IAAI,EACJ,WAAW,EACX,qDAAqD,CACtD,CAAC;IACF,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAA,qBAAe,EACnB,IAAI,EACJ,WAAW,EACX,uBAAuB,EACvB,4BAA4B,CAC7B,CAAC;QAEF,MAAM,OAAO,GAAG,MAAM,IAAA,iBAAW,EAC/B,IAAI,EACJ,WAAW,EACX,uEAAuE,CACxE,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;IAED,MAAM,IAAA,8CAAoC,EAAC,IAAI,EAAE,WAAW,EAAE;QAC5D,IAAI,EAAE,kBAAkB;QACxB,MAAM,EAAE,0BAA0B;QAClC,WAAW,EAAE,eAAe;KAC7B,CAAC,CAAC;IAEH,IAAA,kCAA6B,EAC3B,IAAI,EACJ,OAAO,CAAC,OAAO,EACf,qCAA6B,EAC7B,IAAA,6BAAqB,EACnB,aAAa,EACb,IAAA,0BAAiB,EAAC,OAAO,EAAE,YAAY,EAAE,eAAe,CAAC,CAC1D,CACF,CAAC;IAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;IAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC;AACD,kBAAe,sBAAsB,CAAC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.tsStrandsAgentGenerator = exports.TS_STRANDS_AGENT_GENERATOR_INFO = void 0;
|
|
4
|
-
const tslib_1 = require("tslib");
|
|
5
4
|
/**
|
|
6
5
|
* Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
|
|
7
6
|
* SPDX-License-Identifier: Apache-2.0
|
|
@@ -19,8 +18,7 @@ const shared_constructs_1 = require("../../utils/shared-constructs");
|
|
|
19
18
|
const agent_core_constructs_1 = require("../../utils/agent-core-constructs/agent-core-constructs");
|
|
20
19
|
const port_1 = require("../../utils/port");
|
|
21
20
|
exports.TS_STRANDS_AGENT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
22
|
-
const tsStrandsAgentGenerator = (tree, options) =>
|
|
23
|
-
var _a;
|
|
21
|
+
const tsStrandsAgentGenerator = async (tree, options) => {
|
|
24
22
|
const project = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.project);
|
|
25
23
|
if (!tree.exists((0, devkit_1.joinPathFragments)(project.root, 'tsconfig.json'))) {
|
|
26
24
|
throw new Error(`Unsupported project ${options.project}. Expected a TypeScript project (with a tsconfig.json)`);
|
|
@@ -33,7 +31,7 @@ const tsStrandsAgentGenerator = (tree, options) => tslib_1.__awaiter(void 0, voi
|
|
|
33
31
|
const targetSourceDir = (0, devkit_1.joinPathFragments)(project.root, targetSourceDirRelativeToProjectRoot);
|
|
34
32
|
const relativeSourceDir = targetSourceDir.replace(project.root + '/', './');
|
|
35
33
|
const distDir = (0, devkit_1.joinPathFragments)('dist', project.root);
|
|
36
|
-
const computeType =
|
|
34
|
+
const computeType = options.computeType ?? 'BedrockAgentCoreRuntime';
|
|
37
35
|
// Generate example agent
|
|
38
36
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'app'), targetSourceDir, {
|
|
39
37
|
name,
|
|
@@ -43,7 +41,7 @@ const tsStrandsAgentGenerator = (tree, options) => tslib_1.__awaiter(void 0, voi
|
|
|
43
41
|
if (computeType === 'BedrockAgentCoreRuntime') {
|
|
44
42
|
const dockerImageTag = `${(0, npm_scope_1.getNpmScope)(tree)}-${name}:latest`;
|
|
45
43
|
// Add bundle target
|
|
46
|
-
(0, bundle_1.addTypeScriptBundleTarget)(tree, project, {
|
|
44
|
+
await (0, bundle_1.addTypeScriptBundleTarget)(tree, project, {
|
|
47
45
|
targetFilePath: `${targetSourceDirRelativeToProjectRoot}/index.ts`,
|
|
48
46
|
bundleOutputDir: (0, devkit_1.joinPathFragments)('agent', name),
|
|
49
47
|
});
|
|
@@ -65,9 +63,9 @@ const tsStrandsAgentGenerator = (tree, options) => tslib_1.__awaiter(void 0, voi
|
|
|
65
63
|
(0, nx_1.addDependencyToTargetIfNotPresent)(project, 'docker', dockerTargetName);
|
|
66
64
|
(0, nx_1.addDependencyToTargetIfNotPresent)(project, 'build', 'docker');
|
|
67
65
|
// Add shared constructs
|
|
68
|
-
const iacProvider =
|
|
69
|
-
|
|
70
|
-
|
|
66
|
+
const iacProvider = await (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
|
|
67
|
+
await (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iacProvider });
|
|
68
|
+
await (0, agent_core_constructs_1.addAgentInfra)(tree, {
|
|
71
69
|
agentNameKebabCase: name,
|
|
72
70
|
agentNameClassName,
|
|
73
71
|
projectName: project.name,
|
|
@@ -93,7 +91,11 @@ const tsStrandsAgentGenerator = (tree, options) => tslib_1.__awaiter(void 0, voi
|
|
|
93
91
|
// for those working on remote dev envirionments. The deployed agent in agentcore still runs on
|
|
94
92
|
// 8080 as per the agentcore contract.
|
|
95
93
|
const localDevPort = (0, port_1.assignPort)(tree, project, 8081);
|
|
96
|
-
(0, devkit_1.updateProjectConfiguration)(tree, project.name,
|
|
94
|
+
(0, devkit_1.updateProjectConfiguration)(tree, project.name, {
|
|
95
|
+
...project,
|
|
96
|
+
targets: {
|
|
97
|
+
...project.targets,
|
|
98
|
+
[`${agentTargetPrefix}-serve`]: {
|
|
97
99
|
executor: 'nx:run-commands',
|
|
98
100
|
options: {
|
|
99
101
|
commands: [`tsx --watch ${relativeSourceDir}/index.ts`],
|
|
@@ -103,7 +105,8 @@ const tsStrandsAgentGenerator = (tree, options) => tslib_1.__awaiter(void 0, voi
|
|
|
103
105
|
},
|
|
104
106
|
},
|
|
105
107
|
continuous: true,
|
|
106
|
-
},
|
|
108
|
+
},
|
|
109
|
+
[`${agentTargetPrefix}-serve-local`]: {
|
|
107
110
|
executor: 'nx:run-commands',
|
|
108
111
|
options: {
|
|
109
112
|
commands: [`tsx --watch ${relativeSourceDir}/index.ts`],
|
|
@@ -114,16 +117,18 @@ const tsStrandsAgentGenerator = (tree, options) => tslib_1.__awaiter(void 0, voi
|
|
|
114
117
|
},
|
|
115
118
|
},
|
|
116
119
|
continuous: true,
|
|
117
|
-
}
|
|
120
|
+
},
|
|
121
|
+
},
|
|
122
|
+
});
|
|
118
123
|
(0, nx_1.addComponentGeneratorMetadata)(tree, project.name, exports.TS_STRANDS_AGENT_GENERATOR_INFO, targetSourceDirRelativeToProjectRoot, agentTargetPrefix, { port: localDevPort, rc: agentNameClassName });
|
|
119
|
-
|
|
124
|
+
await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
|
|
120
125
|
exports.TS_STRANDS_AGENT_GENERATOR_INFO,
|
|
121
126
|
]);
|
|
122
|
-
|
|
127
|
+
await (0, format_1.formatFilesInSubtree)(tree);
|
|
123
128
|
return () => {
|
|
124
129
|
(0, devkit_1.installPackagesTask)(tree);
|
|
125
130
|
};
|
|
126
|
-
}
|
|
131
|
+
};
|
|
127
132
|
exports.tsStrandsAgentGenerator = tsStrandsAgentGenerator;
|
|
128
133
|
exports.default = exports.tsStrandsAgentGenerator;
|
|
129
134
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/strands-agent/generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/strands-agent/generator.ts"],"names":[],"mappings":"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"}
|