@aws/nx-plugin 0.87.0 → 0.88.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/generators.json +7 -0
- package/package.json +2 -1
- package/src/connection/generator.js +5 -0
- package/src/connection/generator.js.map +1 -1
- package/src/connection/serve-local.d.ts +1 -1
- package/src/connection/serve-local.js +5 -7
- package/src/connection/serve-local.js.map +1 -1
- package/src/preset/generator.js +0 -2
- package/src/preset/generator.js.map +1 -1
- package/src/py/fast-api/__snapshots__/generator.spec.ts.snap +17 -8
- package/src/py/fast-api/generator.js +1 -1
- package/src/py/fast-api/generator.js.map +1 -1
- package/src/py/fast-api/react/__snapshots__/generator.spec.ts.snap +5 -3
- package/src/py/lambda-function/__snapshots__/generator.spec.ts.snap +2 -1
- package/src/py/lambda-function/generator.js +1 -1
- package/src/py/lambda-function/generator.js.map +1 -1
- package/src/py/mcp-server/__snapshots__/generator.spec.ts.snap +1 -1
- package/src/py/mcp-server/generator.js +1 -1
- package/src/py/mcp-server/generator.js.map +1 -1
- package/src/py/strands-agent/__snapshots__/generator.spec.ts.snap +11 -2
- package/src/py/strands-agent/generator.js +1 -1
- package/src/py/strands-agent/generator.js.map +1 -1
- package/src/py/strands-agent/mcp-connection/__snapshots__/generator.spec.ts.snap +211 -0
- package/src/py/strands-agent/mcp-connection/files/agent-connection/app/__mcpServerSnakeCase___client.py.template +45 -0
- package/src/py/strands-agent/mcp-connection/generator.d.ts +10 -0
- package/src/py/strands-agent/mcp-connection/generator.js +171 -0
- package/src/py/strands-agent/mcp-connection/generator.js.map +1 -0
- package/src/py/strands-agent/mcp-connection/schema.d.ts +15 -0
- package/src/py/strands-agent/mcp-connection/schema.json +26 -0
- package/src/smithy/ts/api/generator.js +1 -1
- package/src/smithy/ts/api/generator.js.map +1 -1
- package/src/trpc/backend/generator.js +1 -1
- package/src/trpc/backend/generator.js.map +1 -1
- package/src/trpc/react/generator.js +3 -3
- package/src/trpc/react/generator.js.map +1 -1
- package/src/ts/lambda-function/generator.js +1 -1
- 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 +4 -3
- package/src/ts/lib/eslint.js.map +1 -1
- package/src/ts/lib/generator.js +1 -1
- package/src/ts/lib/generator.js.map +1 -1
- package/src/ts/lib/ts-project-utils.d.ts +1 -1
- package/src/ts/lib/ts-project-utils.js +4 -3
- package/src/ts/lib/ts-project-utils.js.map +1 -1
- package/src/ts/mcp-server/generator.js +1 -1
- package/src/ts/mcp-server/generator.js.map +1 -1
- package/src/ts/nx-generator/generator.js +1 -1
- package/src/ts/nx-generator/generator.js.map +1 -1
- package/src/ts/react-website/app/generator.js +7 -7
- package/src/ts/react-website/app/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/generator.js +7 -7
- package/src/ts/react-website/cognito-auth/generator.js.map +1 -1
- package/src/ts/react-website/cognito-auth/grit/cloudscape-auth-menu.grit +19 -0
- package/src/ts/react-website/cognito-auth/grit/none-auth-menu.grit +24 -0
- package/src/ts/react-website/cognito-auth/grit/shadcn-auth-menu.grit +39 -0
- package/src/ts/react-website/cognito-auth/grit/shadcn-state-declarations.grit +15 -0
- package/src/ts/react-website/cognito-auth/utils.d.ts +3 -3
- package/src/ts/react-website/cognito-auth/utils.js +18 -186
- package/src/ts/react-website/cognito-auth/utils.js.map +1 -1
- package/src/ts/react-website/runtime-config/generator.js +4 -14
- package/src/ts/react-website/runtime-config/generator.js.map +1 -1
- package/src/ts/strands-agent/generator.js +1 -1
- package/src/ts/strands-agent/generator.js.map +1 -1
- package/src/ts/strands-agent/mcp-connection/generator.js +15 -41
- package/src/ts/strands-agent/mcp-connection/generator.js.map +1 -1
- package/src/utils/agent-connection/agent-connection.d.ts +24 -0
- package/src/utils/agent-connection/agent-connection.js +112 -0
- package/src/utils/agent-connection/agent-connection.js.map +1 -1
- package/src/{py/strands-agent/files/app → utils/agent-connection/files/py-core}/agentcore_mcp_client.py.template +33 -14
- package/src/utils/agent-core-constructs/agent-core-constructs.d.ts +2 -2
- package/src/utils/agent-core-constructs/agent-core-constructs.js +14 -13
- package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
- package/src/utils/api-constructs/api-constructs.d.ts +1 -1
- package/src/utils/api-constructs/api-constructs.js +8 -7
- package/src/utils/api-constructs/api-constructs.js.map +1 -1
- package/src/utils/ast/website.d.ts +1 -1
- package/src/utils/ast/website.js +4 -3
- package/src/utils/ast/website.js.map +1 -1
- package/src/utils/ast.d.ts +12 -3
- package/src/utils/ast.js +88 -54
- package/src/utils/ast.js.map +1 -1
- package/src/utils/connection/open-api/react.js +3 -3
- package/src/utils/connection/open-api/react.js.map +1 -1
- package/src/utils/files/terraform/src/metrics/metrics.tf.template +7 -1
- package/src/utils/format.d.ts +2 -1
- package/src/utils/format.js +81 -8
- package/src/utils/format.js.map +1 -1
- package/src/utils/function-constructs/function-constructs.d.ts +1 -1
- package/src/utils/function-constructs/function-constructs.js +8 -7
- package/src/utils/function-constructs/function-constructs.js.map +1 -1
- package/src/utils/identity-constructs/identity-constructs.d.ts +1 -1
- package/src/utils/identity-constructs/identity-constructs.js +7 -6
- package/src/utils/identity-constructs/identity-constructs.js.map +1 -1
- package/src/utils/metrics.d.ts +0 -1
- package/src/utils/metrics.js +23 -39
- package/src/utils/metrics.js.map +1 -1
- package/src/utils/py.d.ts +5 -0
- package/src/utils/py.js +31 -1
- package/src/utils/py.js.map +1 -1
- package/src/utils/shared-constructs.js +1 -5
- package/src/utils/shared-constructs.js.map +1 -1
- package/src/utils/shared-shadcn.js +1 -1
- package/src/utils/shared-shadcn.js.map +1 -1
- package/src/utils/website-constructs/website-constructs.d.ts +1 -1
- package/src/utils/website-constructs/website-constructs.js +9 -8
- package/src/utils/website-constructs/website-constructs.js.map +1 -1
|
@@ -3,202 +3,34 @@ 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");
|
|
6
7
|
const ast_1 = require("../../../utils/ast");
|
|
7
|
-
const
|
|
8
|
+
const fs_1 = require("fs");
|
|
9
|
+
const path_1 = require("path");
|
|
10
|
+
const readGritPattern = (name) => (0, fs_1.readFileSync)((0, path_1.join)(__dirname, 'grit', `${name}.grit`), 'utf-8').trim();
|
|
8
11
|
// Adds a user greeting and sign-out button to the default AppLayout header when using the None UX provider.
|
|
9
12
|
function addNoneAuthMenu(tree, appLayoutTsxPath) {
|
|
10
|
-
function
|
|
11
|
-
|
|
12
|
-
const classAttr = opening.attributes.properties.find((prop) => (0, typescript_1.isJsxAttribute)(prop) && prop.name.getText() === 'className');
|
|
13
|
-
const classValue = (classAttr === null || classAttr === void 0 ? void 0 : classAttr.initializer) && (0, typescript_1.isStringLiteral)(classAttr.initializer)
|
|
14
|
-
? classAttr.initializer.text
|
|
15
|
-
: undefined;
|
|
16
|
-
return classValue === null || classValue === void 0 ? void 0 : classValue.split(/\s+/).includes('app-header-inner');
|
|
17
|
-
}
|
|
18
|
-
(0, ast_1.replace)(tree, appLayoutTsxPath, 'JsxElement:has(JsxOpeningElement JsxAttribute[name.text="className"] StringLiteral[text="app-header-inner"])', (node) => {
|
|
19
|
-
if (!isAppHeaderInner(node)) {
|
|
20
|
-
return node;
|
|
21
|
-
}
|
|
22
|
-
const userGreeting = typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('div'), undefined, typescript_1.factory.createJsxAttributes([
|
|
23
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('className'), typescript_1.factory.createStringLiteral('user-greeting')),
|
|
24
|
-
])), [
|
|
25
|
-
typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('span'), undefined, typescript_1.factory.createJsxAttributes([])), [
|
|
26
|
-
typescript_1.factory.createJsxText('Hi, '),
|
|
27
|
-
typescript_1.factory.createJsxExpression(undefined, typescript_1.factory.createTemplateExpression(typescript_1.factory.createTemplateHead(''), [
|
|
28
|
-
typescript_1.factory.createTemplateSpan(typescript_1.factory.createElementAccessChain(typescript_1.factory.createPropertyAccessChain(typescript_1.factory.createIdentifier('user'), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), typescript_1.factory.createIdentifier('profile')), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), typescript_1.factory.createStringLiteral('cognito:username')), typescript_1.factory.createTemplateTail('')),
|
|
29
|
-
])),
|
|
30
|
-
], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('span'))),
|
|
31
|
-
typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('button'), undefined, typescript_1.factory.createJsxAttributes([
|
|
32
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('type'), typescript_1.factory.createStringLiteral('button')),
|
|
33
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('className'), typescript_1.factory.createStringLiteral('signout-link')),
|
|
34
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('onClick'), typescript_1.factory.createJsxExpression(undefined, typescript_1.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsGreaterThanToken), typescript_1.factory.createBlock([
|
|
35
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('removeUser'), undefined, [])),
|
|
36
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('signoutRedirect'), undefined, [
|
|
37
|
-
typescript_1.factory.createObjectLiteralExpression([
|
|
38
|
-
typescript_1.factory.createPropertyAssignment('post_logout_redirect_uri', typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('window'), typescript_1.factory.createIdentifier('location')), typescript_1.factory.createIdentifier('origin'))),
|
|
39
|
-
typescript_1.factory.createPropertyAssignment('extraQueryParams', typescript_1.factory.createObjectLiteralExpression([
|
|
40
|
-
typescript_1.factory.createPropertyAssignment('redirect_uri', typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('window'), typescript_1.factory.createIdentifier('location')), typescript_1.factory.createIdentifier('origin'))),
|
|
41
|
-
typescript_1.factory.createPropertyAssignment('response_type', typescript_1.factory.createStringLiteral('code')),
|
|
42
|
-
], true)),
|
|
43
|
-
], true),
|
|
44
|
-
])),
|
|
45
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('clearStaleState'), undefined, [])),
|
|
46
|
-
], true)))),
|
|
47
|
-
])), [typescript_1.factory.createJsxText('Sign out')], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('button'))),
|
|
48
|
-
], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('div')));
|
|
49
|
-
return typescript_1.factory.createJsxElement(node.openingElement, [...node.children, userGreeting], node.closingElement);
|
|
13
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
14
|
+
yield (0, ast_1.applyGritQLTransform)(tree, appLayoutTsxPath, readGritPattern('none-auth-menu'));
|
|
50
15
|
});
|
|
51
16
|
}
|
|
52
|
-
// Adds a top navigation dropdown with sign-out when using the Cloudscape UX provider
|
|
17
|
+
// Adds a top navigation dropdown with sign-out when using the Cloudscape UX provider.
|
|
53
18
|
function addCloudscapeAuthMenu(tree, appLayoutTsxPath) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
typescript_1.factory.createObjectLiteralExpression([
|
|
57
|
-
typescript_1.factory.createPropertyAssignment('type', typescript_1.factory.createStringLiteral('menu-dropdown')),
|
|
58
|
-
typescript_1.factory.createPropertyAssignment('text', typescript_1.factory.createTemplateExpression(typescript_1.factory.createTemplateHead(''), [
|
|
59
|
-
typescript_1.factory.createTemplateSpan(typescript_1.factory.createElementAccessChain(typescript_1.factory.createPropertyAccessChain(typescript_1.factory.createIdentifier('user'), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), typescript_1.factory.createIdentifier('profile')), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), typescript_1.factory.createStringLiteral('cognito:username')), typescript_1.factory.createTemplateTail('')),
|
|
60
|
-
])),
|
|
61
|
-
typescript_1.factory.createPropertyAssignment('iconName', typescript_1.factory.createStringLiteral('user-profile-active')),
|
|
62
|
-
typescript_1.factory.createPropertyAssignment('onItemClick', typescript_1.factory.createArrowFunction(undefined, undefined, [
|
|
63
|
-
typescript_1.factory.createParameterDeclaration(undefined, undefined, typescript_1.factory.createIdentifier('e'), undefined, undefined, undefined),
|
|
64
|
-
], undefined, typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsGreaterThanToken), typescript_1.factory.createBlock([
|
|
65
|
-
typescript_1.factory.createIfStatement(typescript_1.factory.createBinaryExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('e'), typescript_1.factory.createIdentifier('detail')), typescript_1.factory.createIdentifier('id')), typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsEqualsEqualsToken), typescript_1.factory.createStringLiteral('signout')), typescript_1.factory.createBlock([
|
|
66
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('removeUser'), undefined, [])),
|
|
67
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('signoutRedirect'), undefined, [
|
|
68
|
-
typescript_1.factory.createObjectLiteralExpression([
|
|
69
|
-
typescript_1.factory.createPropertyAssignment('post_logout_redirect_uri', typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('window'), typescript_1.factory.createIdentifier('location')), typescript_1.factory.createIdentifier('origin'))),
|
|
70
|
-
typescript_1.factory.createPropertyAssignment('extraQueryParams', typescript_1.factory.createObjectLiteralExpression([
|
|
71
|
-
typescript_1.factory.createPropertyAssignment('redirect_uri', typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('window'), typescript_1.factory.createIdentifier('location')), typescript_1.factory.createIdentifier('origin'))),
|
|
72
|
-
typescript_1.factory.createPropertyAssignment('response_type', typescript_1.factory.createStringLiteral('code')),
|
|
73
|
-
])),
|
|
74
|
-
]),
|
|
75
|
-
])),
|
|
76
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('clearStaleState'), undefined, [])),
|
|
77
|
-
], true)),
|
|
78
|
-
], true))),
|
|
79
|
-
typescript_1.factory.createPropertyAssignment('items', typescript_1.factory.createArrayLiteralExpression([
|
|
80
|
-
typescript_1.factory.createObjectLiteralExpression([
|
|
81
|
-
typescript_1.factory.createPropertyAssignment('id', typescript_1.factory.createStringLiteral('signout')),
|
|
82
|
-
typescript_1.factory.createPropertyAssignment('text', typescript_1.factory.createStringLiteral('Sign out')),
|
|
83
|
-
]),
|
|
84
|
-
])),
|
|
85
|
-
]),
|
|
86
|
-
], true)));
|
|
87
|
-
return typescript_1.factory.createJsxSelfClosingElement(node.tagName, node.typeArguments, typescript_1.factory.createJsxAttributes([
|
|
88
|
-
...node.attributes.properties,
|
|
89
|
-
utilitiesAttribute,
|
|
90
|
-
]));
|
|
19
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
20
|
+
yield (0, ast_1.applyGritQLTransform)(tree, appLayoutTsxPath, readGritPattern('cloudscape-auth-menu'));
|
|
91
21
|
});
|
|
92
22
|
}
|
|
93
23
|
function addShadcnAuthMenu(tree, appLayoutTsxPath) {
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
(0, ast_1.addDestructuredImport)(tree, appLayoutTsxPath, ['useEffect', 'useRef', 'useState'], 'react');
|
|
98
|
-
const menuStateDeclaration = typescript_1.factory.createVariableStatement(undefined, typescript_1.factory.createVariableDeclarationList([
|
|
99
|
-
typescript_1.factory.createVariableDeclaration(typescript_1.factory.createArrayBindingPattern([
|
|
100
|
-
typescript_1.factory.createBindingElement(undefined, undefined, typescript_1.factory.createIdentifier('menuOpen'), undefined),
|
|
101
|
-
typescript_1.factory.createBindingElement(undefined, undefined, typescript_1.factory.createIdentifier('setMenuOpen'), undefined),
|
|
102
|
-
]), undefined, undefined, typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('useState'), undefined, [typescript_1.factory.createFalse()])),
|
|
103
|
-
], typescript_1.NodeFlags.Const));
|
|
104
|
-
const menuRefDeclaration = typescript_1.factory.createVariableStatement(undefined, typescript_1.factory.createVariableDeclarationList([
|
|
105
|
-
typescript_1.factory.createVariableDeclaration(typescript_1.factory.createIdentifier('menuRef'), undefined, undefined, typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('useRef'), [
|
|
106
|
-
typescript_1.factory.createTypeReferenceNode(typescript_1.factory.createIdentifier('HTMLDivElement'), undefined),
|
|
107
|
-
], [typescript_1.factory.createNull()])),
|
|
108
|
-
], typescript_1.NodeFlags.Const));
|
|
109
|
-
const userNameExpr = typescript_1.factory.createAsExpression(typescript_1.factory.createElementAccessChain(typescript_1.factory.createPropertyAccessChain(typescript_1.factory.createIdentifier('user'), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), typescript_1.factory.createIdentifier('profile')), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), typescript_1.factory.createStringLiteral('cognito:username')), typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.AnyKeyword));
|
|
110
|
-
const userInitialExpr = typescript_1.factory.createCallChain(typescript_1.factory.createPropertyAccessChain(typescript_1.factory.createCallChain(typescript_1.factory.createPropertyAccessChain(userNameExpr, typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), typescript_1.factory.createIdentifier('charAt')), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), undefined, [typescript_1.factory.createNumericLiteral(0)]), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), typescript_1.factory.createIdentifier('toUpperCase')), typescript_1.factory.createToken(typescript_1.SyntaxKind.QuestionDotToken), undefined, []);
|
|
111
|
-
const useEffectStatement = typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('useEffect'), undefined, [
|
|
112
|
-
typescript_1.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsGreaterThanToken), typescript_1.factory.createBlock([
|
|
113
|
-
typescript_1.factory.createVariableStatement(undefined, typescript_1.factory.createVariableDeclarationList([
|
|
114
|
-
typescript_1.factory.createVariableDeclaration(typescript_1.factory.createIdentifier('handleClickOutside'), undefined, undefined, typescript_1.factory.createArrowFunction(undefined, undefined, [
|
|
115
|
-
typescript_1.factory.createParameterDeclaration(undefined, undefined, typescript_1.factory.createIdentifier('event'), undefined, typescript_1.factory.createTypeReferenceNode(typescript_1.factory.createIdentifier('MouseEvent'), undefined), undefined),
|
|
116
|
-
], undefined, typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsGreaterThanToken), typescript_1.factory.createBlock([
|
|
117
|
-
typescript_1.factory.createIfStatement(typescript_1.factory.createBinaryExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('menuRef'), typescript_1.factory.createIdentifier('current')), typescript_1.factory.createToken(typescript_1.SyntaxKind.AmpersandAmpersandToken), typescript_1.factory.createPrefixUnaryExpression(typescript_1.SyntaxKind.ExclamationToken, typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('menuRef'), typescript_1.factory.createIdentifier('current')), typescript_1.factory.createIdentifier('contains')), undefined, [
|
|
118
|
-
typescript_1.factory.createAsExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('event'), typescript_1.factory.createIdentifier('target')), typescript_1.factory.createKeywordTypeNode(typescript_1.SyntaxKind.AnyKeyword)),
|
|
119
|
-
]))), typescript_1.factory.createBlock([
|
|
120
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('setMenuOpen'), undefined, [typescript_1.factory.createFalse()])),
|
|
121
|
-
], true), undefined),
|
|
122
|
-
], true))),
|
|
123
|
-
], typescript_1.NodeFlags.Const)),
|
|
124
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('document'), typescript_1.factory.createIdentifier('addEventListener')), undefined, [
|
|
125
|
-
typescript_1.factory.createStringLiteral('mousedown'),
|
|
126
|
-
typescript_1.factory.createIdentifier('handleClickOutside'),
|
|
127
|
-
])),
|
|
128
|
-
typescript_1.factory.createReturnStatement(typescript_1.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsGreaterThanToken), typescript_1.factory.createBlock([
|
|
129
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('document'), typescript_1.factory.createIdentifier('removeEventListener')), undefined, [
|
|
130
|
-
typescript_1.factory.createStringLiteral('mousedown'),
|
|
131
|
-
typescript_1.factory.createIdentifier('handleClickOutside'),
|
|
132
|
-
])),
|
|
133
|
-
], true))),
|
|
134
|
-
], true)),
|
|
135
|
-
typescript_1.factory.createArrayLiteralExpression([], false),
|
|
136
|
-
]));
|
|
137
|
-
(0, ast_1.replace)(tree, appLayoutTsxPath, 'VariableDeclaration[name.text="AppLayout"]', (node) => {
|
|
138
|
-
const arrowFunction = node.initializer;
|
|
139
|
-
if (!arrowFunction || arrowFunction.body.kind !== typescript_1.SyntaxKind.Block) {
|
|
140
|
-
return node;
|
|
24
|
+
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
25
|
+
if (!tree.exists(appLayoutTsxPath)) {
|
|
26
|
+
throw new Error(`Expected top nav component at ${appLayoutTsxPath}`);
|
|
141
27
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
];
|
|
149
|
-
const newArrowFunction = typescript_1.factory.updateArrowFunction(arrowFunction, arrowFunction.modifiers, arrowFunction.typeParameters, arrowFunction.parameters, arrowFunction.type, arrowFunction.equalsGreaterThanToken, typescript_1.factory.updateBlock(body, newStatements));
|
|
150
|
-
return typescript_1.factory.updateVariableDeclaration(node, node.name, node.exclamationToken, node.type, newArrowFunction);
|
|
28
|
+
// Prepend state declarations to the AppLayout component body
|
|
29
|
+
yield (0, ast_1.applyGritQLTransform)(tree, appLayoutTsxPath, readGritPattern('shadcn-state-declarations'));
|
|
30
|
+
// Add useEffect, useRef, useState imports from react
|
|
31
|
+
yield (0, ast_1.addDestructuredImport)(tree, appLayoutTsxPath, ['useEffect', 'useRef', 'useState'], 'react');
|
|
32
|
+
// Append the auth menu to the header element
|
|
33
|
+
yield (0, ast_1.applyGritQLTransform)(tree, appLayoutTsxPath, readGritPattern('shadcn-auth-menu'));
|
|
151
34
|
});
|
|
152
|
-
const authMenu = typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('div'), undefined, typescript_1.factory.createJsxAttributes([
|
|
153
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('className'), typescript_1.factory.createStringLiteral('ml-auto flex items-center gap-3')),
|
|
154
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('ref'), typescript_1.factory.createJsxExpression(undefined, typescript_1.factory.createIdentifier('menuRef'))),
|
|
155
|
-
])), [
|
|
156
|
-
typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('button'), undefined, typescript_1.factory.createJsxAttributes([
|
|
157
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('type'), typescript_1.factory.createStringLiteral('button')),
|
|
158
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('onClick'), typescript_1.factory.createJsxExpression(undefined, typescript_1.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsGreaterThanToken), typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('setMenuOpen'), undefined, [
|
|
159
|
-
typescript_1.factory.createArrowFunction(undefined, undefined, [
|
|
160
|
-
typescript_1.factory.createParameterDeclaration(undefined, undefined, typescript_1.factory.createIdentifier('open'), undefined, undefined, undefined),
|
|
161
|
-
], undefined, typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsGreaterThanToken), typescript_1.factory.createPrefixUnaryExpression(typescript_1.SyntaxKind.ExclamationToken, typescript_1.factory.createIdentifier('open'))),
|
|
162
|
-
])))),
|
|
163
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('className'), typescript_1.factory.createStringLiteral('focus-visible:ring-ring/60 bg-muted text-muted-foreground flex size-10 items-center justify-center rounded-full border border-border/60 font-semibold shadow-sm outline-none transition hover:bg-muted/80 focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-background cursor-pointer')),
|
|
164
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('aria-label'), typescript_1.factory.createStringLiteral('Open user menu')),
|
|
165
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('aria-expanded'), typescript_1.factory.createJsxExpression(undefined, typescript_1.factory.createIdentifier('menuOpen'))),
|
|
166
|
-
])), [typescript_1.factory.createJsxExpression(undefined, userInitialExpr)], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('button'))),
|
|
167
|
-
typescript_1.factory.createJsxExpression(undefined, typescript_1.factory.createBinaryExpression(typescript_1.factory.createIdentifier('menuOpen'), typescript_1.factory.createToken(typescript_1.SyntaxKind.AmpersandAmpersandToken), typescript_1.factory.createParenthesizedExpression(typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('div'), undefined, typescript_1.factory.createJsxAttributes([
|
|
168
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('className'), typescript_1.factory.createStringLiteral('bg-popover text-popover-foreground absolute right-4 top-14 w-36 overflow-hidden rounded-md border shadow-md')),
|
|
169
|
-
])), [
|
|
170
|
-
typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('div'), undefined, typescript_1.factory.createJsxAttributes([
|
|
171
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('className'), typescript_1.factory.createStringLiteral('px-3 py-2 text-sm font-semibold')),
|
|
172
|
-
])), [
|
|
173
|
-
typescript_1.factory.createJsxText('Hi, '),
|
|
174
|
-
typescript_1.factory.createJsxExpression(undefined, userNameExpr),
|
|
175
|
-
typescript_1.factory.createJsxText('!'),
|
|
176
|
-
], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('div'))),
|
|
177
|
-
typescript_1.factory.createJsxSelfClosingElement(typescript_1.factory.createIdentifier('div'), undefined, typescript_1.factory.createJsxAttributes([
|
|
178
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('className'), typescript_1.factory.createStringLiteral('bg-border/70 h-px w-full')),
|
|
179
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('role'), typescript_1.factory.createStringLiteral('separator')),
|
|
180
|
-
])),
|
|
181
|
-
typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('button'), undefined, typescript_1.factory.createJsxAttributes([
|
|
182
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('type'), typescript_1.factory.createStringLiteral('button')),
|
|
183
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('className'), typescript_1.factory.createStringLiteral('hover:bg-muted w-full px-3 py-2 text-left text-sm cursor-pointer')),
|
|
184
|
-
typescript_1.factory.createJsxAttribute(typescript_1.factory.createIdentifier('onClick'), typescript_1.factory.createJsxExpression(undefined, typescript_1.factory.createArrowFunction(undefined, undefined, [], undefined, typescript_1.factory.createToken(typescript_1.SyntaxKind.EqualsGreaterThanToken), typescript_1.factory.createBlock([
|
|
185
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('setMenuOpen'), undefined, [typescript_1.factory.createFalse()])),
|
|
186
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('removeUser'), undefined, [])),
|
|
187
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('signoutRedirect'), undefined, [
|
|
188
|
-
typescript_1.factory.createObjectLiteralExpression([
|
|
189
|
-
typescript_1.factory.createPropertyAssignment('post_logout_redirect_uri', typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('window'), typescript_1.factory.createIdentifier('location')), typescript_1.factory.createIdentifier('origin'))),
|
|
190
|
-
typescript_1.factory.createPropertyAssignment('extraQueryParams', typescript_1.factory.createObjectLiteralExpression([
|
|
191
|
-
typescript_1.factory.createPropertyAssignment('redirect_uri', typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createPropertyAccessExpression(typescript_1.factory.createIdentifier('window'), typescript_1.factory.createIdentifier('location')), typescript_1.factory.createIdentifier('origin'))),
|
|
192
|
-
typescript_1.factory.createPropertyAssignment('response_type', typescript_1.factory.createStringLiteral('code')),
|
|
193
|
-
], true)),
|
|
194
|
-
], true),
|
|
195
|
-
])),
|
|
196
|
-
typescript_1.factory.createExpressionStatement(typescript_1.factory.createCallExpression(typescript_1.factory.createIdentifier('clearStaleState'), undefined, [])),
|
|
197
|
-
], true)))),
|
|
198
|
-
])), [typescript_1.factory.createJsxText('Sign out')], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('button'))),
|
|
199
|
-
], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('div')))))),
|
|
200
|
-
], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('div')));
|
|
201
|
-
const appendAuthMenu = (node) => typescript_1.factory.createJsxElement(node.openingElement, [...node.children, authMenu], node.closingElement);
|
|
202
|
-
(0, ast_1.replace)(tree, appLayoutTsxPath, 'JsxElement[openingElement.tagName.text="header"]', appendAuthMenu);
|
|
203
35
|
}
|
|
204
36
|
//# 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":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/cognito-auth/utils.ts"],"names":[],"mappings":";;AAgBA,0CAMC;AAGD,sDASC;AAED,8CA0BC;;AAzDD,4CAG4B;AAC5B,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;AAC5G,SAAsB,eAAe,CAAC,IAAU,EAAE,gBAAwB;;QACxE,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gBAAgB,EAChB,eAAe,CAAC,gBAAgB,CAAC,CAClC,CAAC;IACJ,CAAC;CAAA;AAED,sFAAsF;AACtF,SAAsB,qBAAqB,CACzC,IAAU,EACV,gBAAwB;;QAExB,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gBAAgB,EAChB,eAAe,CAAC,sBAAsB,CAAC,CACxC,CAAC;IACJ,CAAC;CAAA;AAED,SAAsB,iBAAiB,CAAC,IAAU,EAAE,gBAAwB;;QAC1E,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,iCAAiC,gBAAgB,EAAE,CAAC,CAAC;QACvE,CAAC;QAED,6DAA6D;QAC7D,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gBAAgB,EAChB,eAAe,CAAC,2BAA2B,CAAC,CAC7C,CAAC;QAEF,qDAAqD;QACrD,MAAM,IAAA,2BAAqB,EACzB,IAAI,EACJ,gBAAgB,EAChB,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,EACnC,OAAO,CACR,CAAC;QAEF,6CAA6C;QAC7C,MAAM,IAAA,0BAAoB,EACxB,IAAI,EACJ,gBAAgB,EAChB,eAAe,CAAC,kBAAkB,CAAC,CACpC,CAAC;IACJ,CAAC;CAAA"}
|
|
@@ -26,8 +26,7 @@ function runtimeConfigGenerator(tree, options) {
|
|
|
26
26
|
throw new Error(`Can only run this generator on a project which contains ${mainTsxPath}`);
|
|
27
27
|
}
|
|
28
28
|
const runtimeConfigPath = (0, devkit_1.joinPathFragments)(srcRoot, 'components', 'RuntimeConfig', 'index.tsx');
|
|
29
|
-
if (tree.exists(runtimeConfigPath)
|
|
30
|
-
(0, ast_1.query)(tree, mainTsxPath, 'JsxElement > JsxOpeningElement[name.text="RuntimeConfigProvider"]').length > 0) {
|
|
29
|
+
if (tree.exists(runtimeConfigPath)) {
|
|
31
30
|
console.debug('Runtime config already exists, skipping generation');
|
|
32
31
|
return;
|
|
33
32
|
}
|
|
@@ -37,20 +36,11 @@ function runtimeConfigGenerator(tree, options) {
|
|
|
37
36
|
});
|
|
38
37
|
const runtimeContextImport = typescript_1.factory.createImportDeclaration(undefined, typescript_1.factory.createImportClause(false, typescript_1.factory.createIdentifier('RuntimeConfigProvider'), undefined), typescript_1.factory.createStringLiteral('./components/RuntimeConfig', true));
|
|
39
38
|
(0, ast_1.prependStatements)(tree, mainTsxPath, [runtimeContextImport]);
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
if (node.tagName.getText() !== 'App') {
|
|
43
|
-
return node;
|
|
44
|
-
}
|
|
45
|
-
else {
|
|
46
|
-
locatedTargetNode = true;
|
|
47
|
-
}
|
|
48
|
-
return typescript_1.factory.createJsxElement(typescript_1.factory.createJsxOpeningElement(typescript_1.factory.createIdentifier('RuntimeConfigProvider'), undefined, typescript_1.factory.createJsxAttributes([])), [node], typescript_1.factory.createJsxClosingElement(typescript_1.factory.createIdentifier('RuntimeConfigProvider')));
|
|
49
|
-
});
|
|
50
|
-
if (!locatedTargetNode) {
|
|
39
|
+
const wrapped = yield (0, ast_1.applyGritQLTransform)(tree, mainTsxPath, '`<App />` => `<RuntimeConfigProvider><App /></RuntimeConfigProvider>`');
|
|
40
|
+
if (!wrapped) {
|
|
51
41
|
throw new Error('Could not locate the App element in main.tsx');
|
|
52
42
|
}
|
|
53
|
-
(0, website_1.addHookResultToRouterProviderContext)(tree, mainTsxPath, {
|
|
43
|
+
yield (0, website_1.addHookResultToRouterProviderContext)(tree, mainTsxPath, {
|
|
54
44
|
hook: 'useRuntimeConfig',
|
|
55
45
|
module: './hooks/useRuntimeConfig',
|
|
56
46
|
contextProp: 'runtimeConfig',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/runtime-config/generator.ts"],"names":[],"mappings":";;;AA4BA,
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/react-website/runtime-config/generator.ts"],"names":[],"mappings":";;;AA4BA,wDAiFC;;AA7GD;;;GAGG;AACH,uCAKoB;AAEpB,2CAAqC;AACrC,wDAA2E;AAC3E,kDAA6D;AAC7D,4CAA6E;AAC7E,0CAK2B;AAC3B,oDAAyE;AACzE,gDAA6D;AAC7D,wDAAkF;AAErE,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAE/B,SAAsB,sBAAsB,CAC1C,IAAU,EACV,OAAqC;;QAErC,MAAM,aAAa,GAAG,IAAA,wCAAmC,EACvD,IAAI,EACJ,OAAO,CAAC,OAAO,CAChB,CAAC;QACF,MAAM,OAAO,GAAG,aAAa,CAAC,UAAU,CAAC;QACzC,MAAM,WAAW,GAAG,IAAA,0BAAiB,EAAC,OAAO,EAAE,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CACb,2DAA2D,WAAW,EAAE,CACzE,CAAC;QACJ,CAAC;QAED,MAAM,iBAAiB,GAAG,IAAA,0BAAiB,EACzC,OAAO,EACP,YAAY,EACZ,eAAe,EACf,WAAW,CACZ,CAAC;QACF,IAAI,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;YACpE,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,KAAK,CAAC,EAC5C,OAAO,kCAEF,OAAO,KACV,cAAc,EACd,UAAU,EAAE,IAAA,wBAAY,EAAC,cAAc,CAAC,KAE1C;YACE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY;SAClD,CACF,CAAC;QACF,MAAM,oBAAoB,GAAG,oBAAO,CAAC,uBAAuB,CAC1D,SAAS,EACT,oBAAO,CAAC,kBAAkB,CACxB,KAAK,EACL,oBAAO,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,EACjD,SAAS,CACV,EACD,oBAAO,CAAC,mBAAmB,CAAC,4BAA4B,EAAE,IAAI,CAAC,CAChE,CAAC;QACF,IAAA,uBAAiB,EAAC,IAAI,EAAE,WAAW,EAAE,CAAC,oBAAoB,CAAC,CAAC,CAAC;QAE7D,MAAM,OAAO,GAAG,MAAM,IAAA,0BAAoB,EACxC,IAAI,EACJ,WAAW,EACX,uEAAuE,CACxE,CAAC;QAEF,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;QAClE,CAAC;QAED,MAAM,IAAA,8CAAoC,EAAC,IAAI,EAAE,WAAW,EAAE;YAC5D,IAAI,EAAE,kBAAkB;YACxB,MAAM,EAAE,0BAA0B;YAClC,WAAW,EAAE,eAAe;SAC7B,CAAC,CAAC;QAEH,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;QAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;QAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CAAA;AACD,kBAAe,sBAAsB,CAAC"}
|
|
@@ -67,7 +67,7 @@ const tsStrandsAgentGenerator = (tree, options) => tslib_1.__awaiter(void 0, voi
|
|
|
67
67
|
// Add shared constructs
|
|
68
68
|
const iacProvider = yield (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
|
|
69
69
|
yield (0, shared_constructs_1.sharedConstructsGenerator)(tree, { iacProvider });
|
|
70
|
-
(0, agent_core_constructs_1.addAgentInfra)(tree, {
|
|
70
|
+
yield (0, agent_core_constructs_1.addAgentInfra)(tree, {
|
|
71
71
|
agentNameKebabCase: name,
|
|
72
72
|
agentNameClassName,
|
|
73
73
|
projectName: project.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/strands-agent/generator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/strands-agent/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,6 @@ const versions_1 = require("../../../utils/versions");
|
|
|
15
15
|
const npm_scope_1 = require("../../../utils/npm-scope");
|
|
16
16
|
const ast_1 = require("../../../utils/ast");
|
|
17
17
|
const agent_connection_1 = require("../../../utils/agent-connection/agent-connection");
|
|
18
|
-
const typescript_1 = tslib_1.__importStar(require("typescript"));
|
|
19
18
|
exports.TS_STRANDS_AGENT_MCP_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
20
19
|
const tsStrandsAgentMcpConnectionGenerator = (tree, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
21
20
|
var _a, _b, _c, _d, _e, _f;
|
|
@@ -40,7 +39,7 @@ const tsStrandsAgentMcpConnectionGenerator = (tree, options) => tslib_1.__awaite
|
|
|
40
39
|
mcpServerPort,
|
|
41
40
|
}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
|
|
42
41
|
// Add re-export to index.ts
|
|
43
|
-
(0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(agent_connection_1.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), `./app/${mcpServerKebabCase}-client.js`);
|
|
42
|
+
yield (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(agent_connection_1.AGENT_CONNECTION_PROJECT_DIR, 'src', 'index.ts'), `./app/${mcpServerKebabCase}-client.js`);
|
|
44
43
|
// 3. AST transform agent.ts to add MCP tools
|
|
45
44
|
const agentSourceDir = (0, devkit_1.joinPathFragments)(sourceProject.root, (_c = agentComponent.path) !== null && _c !== void 0 ? _c : 'src');
|
|
46
45
|
const agentFilePath = (0, devkit_1.joinPathFragments)(agentSourceDir, 'agent.ts');
|
|
@@ -48,45 +47,20 @@ const tsStrandsAgentMcpConnectionGenerator = (tree, options) => tslib_1.__awaite
|
|
|
48
47
|
const clientClassName = `${mcpServerClassName}Client`;
|
|
49
48
|
const clientVarName = mcpServerClassName.charAt(0).toLowerCase() + mcpServerClassName.slice(1);
|
|
50
49
|
// Add import for the client
|
|
51
|
-
(0, ast_1.addDestructuredImport)(tree, agentFilePath, [clientClassName], `:${npmScope}/agent-connection`);
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
return typescript_1.factory.updateArrowFunction(arrow, arrow.modifiers, arrow.typeParameters, arrow.parameters, arrow.type, arrow.equalsGreaterThanToken, typescript_1.factory.createBlock([
|
|
66
|
-
clientCreationStatement,
|
|
67
|
-
typescript_1.factory.createReturnStatement(arrow.body),
|
|
68
|
-
], true));
|
|
69
|
-
}
|
|
70
|
-
// Body is already a block — insert before the statement containing `new Agent`
|
|
71
|
-
const b = arrow.body;
|
|
72
|
-
const agentStatementIndex = b.statements.findIndex((s) => s.getText().includes('new Agent('));
|
|
73
|
-
if (agentStatementIndex === -1)
|
|
74
|
-
return node;
|
|
75
|
-
const newStatements = [...b.statements];
|
|
76
|
-
newStatements.splice(agentStatementIndex, 0, clientCreationStatement);
|
|
77
|
-
return typescript_1.factory.updateArrowFunction(arrow, arrow.modifiers, arrow.typeParameters, arrow.parameters, arrow.type, arrow.equalsGreaterThanToken, typescript_1.factory.updateBlock(b, newStatements));
|
|
78
|
-
});
|
|
79
|
-
// Add client to the tools array: tools: [clientVarName, ...existing]
|
|
80
|
-
(0, ast_1.replaceIfExists)(tree, agentFilePath, 'NewExpression[expression.name="Agent"] ObjectLiteralExpression PropertyAssignment[name.name="tools"] ArrayLiteralExpression', (node) => {
|
|
81
|
-
const arr = node;
|
|
82
|
-
// Check if already added
|
|
83
|
-
if (arr.getText().includes(clientVarName))
|
|
84
|
-
return node;
|
|
85
|
-
return typescript_1.factory.updateArrayLiteralExpression(arr, [
|
|
86
|
-
typescript_1.factory.createIdentifier(clientVarName),
|
|
87
|
-
...arr.elements,
|
|
88
|
-
]);
|
|
89
|
-
});
|
|
50
|
+
yield (0, ast_1.addDestructuredImport)(tree, agentFilePath, [clientClassName], `:${npmScope}/agent-connection`);
|
|
51
|
+
const clientCreationStmt = `const ${clientVarName} = await ${clientClassName}.create(sessionId);`;
|
|
52
|
+
// Transform the arrow function that contains `new Agent`:
|
|
53
|
+
// - Expression body: wrap in block with client creation and return
|
|
54
|
+
// - Block body: prepend client creation statement
|
|
55
|
+
yield (0, ast_1.applyGritQLTransform)(tree, agentFilePath, `or { \`async ($p) => new Agent($args)\` => raw\`async ($p) => {
|
|
56
|
+
${clientCreationStmt}
|
|
57
|
+
return new Agent($args);
|
|
58
|
+
}\` where { $program <: not contains \`${clientClassName}.create\` }, \`async ($p) => { $body }\` => raw\`async ($p) => {
|
|
59
|
+
${clientCreationStmt}
|
|
60
|
+
$body
|
|
61
|
+
}\` where { $body <: contains \`new Agent($_)\`, $program <: not contains \`${clientClassName}.create\` } }`);
|
|
62
|
+
// Prepend client to the tools array
|
|
63
|
+
yield (0, ast_1.applyGritQLTransform)(tree, agentFilePath, `\`tools: [$items]\` => \`tools: [${clientVarName}, $items]\` where { $items <: within \`new Agent($_)\`, $items <: not contains \`${clientVarName}\` }`);
|
|
90
64
|
}
|
|
91
65
|
// 4. Set up serve-local target
|
|
92
66
|
const agentName = (_d = agentComponent.name) !== null && _d !== void 0 ? _d : 'agent';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/strands-agent/mcp-connection/generator.ts"],"names":[],"mappings":";;;;AAAA;;;GAGG;AACH,uCASoB;AAEpB,0CAI2B;AAC3B,oDAAyE;AACzE,kDAA6D;AAC7D,gDAAiD;AACjD,sDAAuD;AACvD,wDAAuD;AACvD,4CAI4B;AAC5B,uFAG0D;
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/ts/strands-agent/mcp-connection/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,8 +4,32 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { Tree } from '@nx/devkit';
|
|
6
6
|
export declare const AGENT_CONNECTION_PROJECT_DIR: string;
|
|
7
|
+
/**
|
|
8
|
+
* Get the directory of the shared Python agent-connection project.
|
|
9
|
+
*/
|
|
10
|
+
export declare function getPythonAgentConnectionProjectDir(tree: Tree): string;
|
|
11
|
+
/**
|
|
12
|
+
* Get the Python module name of the shared agent-connection project.
|
|
13
|
+
*/
|
|
14
|
+
export declare function getPythonAgentConnectionModuleName(tree: Tree): string;
|
|
15
|
+
/**
|
|
16
|
+
* Get the fully qualified Python package name of the shared agent-connection project.
|
|
17
|
+
*/
|
|
18
|
+
export declare function getPythonAgentConnectionPackageName(tree: Tree): string;
|
|
7
19
|
/**
|
|
8
20
|
* Ensure the shared TypeScript agent-connection project exists.
|
|
9
21
|
* Creates the project with the core AgentCoreMcpClient if it doesn't exist.
|
|
10
22
|
*/
|
|
11
23
|
export declare function ensureTypeScriptAgentConnectionProject(tree: Tree): Promise<void>;
|
|
24
|
+
/**
|
|
25
|
+
* Ensure the shared Python agent-connection project exists.
|
|
26
|
+
* Creates the project with the core AgentCoreMCPClient if it doesn't exist.
|
|
27
|
+
*/
|
|
28
|
+
export declare function ensurePythonAgentConnectionProject(tree: Tree): Promise<void>;
|
|
29
|
+
/**
|
|
30
|
+
* Add a re-export to the Python agent-connection module's __init__.py.
|
|
31
|
+
* Equivalent to addStarExport for TS.
|
|
32
|
+
* Uses `__all__` to mark re-exports as public (satisfies ruff F401).
|
|
33
|
+
* Uses GritQL for AST-aware transforms where possible.
|
|
34
|
+
*/
|
|
35
|
+
export declare function addPythonReExport(tree: Tree, initFilePath: string, fromModule: string, importName: string): Promise<void>;
|