@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
package/src/ts/lib/eslint.js
CHANGED
|
@@ -1,20 +1,22 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.addIgnoresToEslintConfig = exports.configureEslint = 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
|
|
8
7
|
*/
|
|
9
8
|
const devkit_1 = require("@nx/devkit");
|
|
10
9
|
const versions_1 = require("../../utils/versions");
|
|
11
|
-
const typescript_1 = require("typescript");
|
|
12
10
|
const ast_1 = require("../../utils/ast");
|
|
13
11
|
const nx_1 = require("../../utils/nx");
|
|
14
|
-
const configureEslint = (tree, options) =>
|
|
12
|
+
const configureEslint = async (tree, options) => {
|
|
15
13
|
// Configure the lint task
|
|
16
14
|
const projectJson = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.fullyQualifiedName);
|
|
17
|
-
(0, devkit_1.updateProjectConfiguration)(tree, options.fullyQualifiedName,
|
|
15
|
+
(0, devkit_1.updateProjectConfiguration)(tree, options.fullyQualifiedName, {
|
|
16
|
+
...projectJson,
|
|
17
|
+
targets: {
|
|
18
|
+
...projectJson?.targets,
|
|
19
|
+
lint: {
|
|
18
20
|
executor: '@nx/eslint:lint',
|
|
19
21
|
cache: true,
|
|
20
22
|
inputs: ['eslint'],
|
|
@@ -26,36 +28,35 @@ const configureEslint = (tree, options) => tslib_1.__awaiter(void 0, void 0, voi
|
|
|
26
28
|
force: true,
|
|
27
29
|
},
|
|
28
30
|
},
|
|
29
|
-
}
|
|
31
|
+
},
|
|
32
|
+
},
|
|
33
|
+
});
|
|
30
34
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['prettier', 'eslint-plugin-prettier', 'jsonc-eslint-parser']));
|
|
31
35
|
// Update or create eslint.config.mjs
|
|
32
36
|
const eslintConfigPath = 'eslint.config.mjs';
|
|
33
37
|
if (tree.exists(eslintConfigPath)) {
|
|
34
38
|
// Add import if it doesn't exist
|
|
35
|
-
|
|
36
|
-
//
|
|
37
|
-
|
|
38
|
-
// Add eslintPluginPrettierRecommended to array if it doesn't exist
|
|
39
|
-
if (existingPlugin.length === 0) {
|
|
40
|
-
(0, ast_1.replace)(tree, eslintConfigPath, 'ExportAssignment > ArrayLiteralExpression', (node) => {
|
|
41
|
-
return typescript_1.factory.createArrayLiteralExpression([
|
|
42
|
-
typescript_1.factory.createIdentifier('eslintPluginPrettierRecommended'),
|
|
43
|
-
...node.elements,
|
|
44
|
-
], true);
|
|
45
|
-
});
|
|
46
|
-
}
|
|
39
|
+
await (0, ast_1.addSingleImport)(tree, eslintConfigPath, 'eslintPluginPrettierRecommended', 'eslint-plugin-prettier/recommended');
|
|
40
|
+
// Prepend eslintPluginPrettierRecommended to the exports array if not present
|
|
41
|
+
await (0, ast_1.applyGritQL)(tree, eslintConfigPath, 'or { `export default []` => `export default [eslintPluginPrettierRecommended]`, `export default [$items]` => `export default [eslintPluginPrettierRecommended, $items]` where { $items <: not contains `eslintPluginPrettierRecommended` } }');
|
|
47
42
|
// Add ignore patterns to eslint config
|
|
48
|
-
(0, exports.addIgnoresToEslintConfig)(tree, eslintConfigPath, [
|
|
43
|
+
await (0, exports.addIgnoresToEslintConfig)(tree, eslintConfigPath, [
|
|
49
44
|
'**/vite.config.*.timestamp*',
|
|
50
45
|
]);
|
|
51
46
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
52
|
-
(0, devkit_1.updateNxJson)(tree,
|
|
47
|
+
(0, devkit_1.updateNxJson)(tree, {
|
|
48
|
+
...nxJson,
|
|
49
|
+
namedInputs: {
|
|
50
|
+
...nxJson.namedInputs,
|
|
51
|
+
eslint: [
|
|
53
52
|
'default',
|
|
54
53
|
'{workspaceRoot}/eslint.config.mjs',
|
|
55
54
|
'{projectRoot}/eslint.config.mjs',
|
|
56
|
-
]
|
|
55
|
+
],
|
|
56
|
+
},
|
|
57
|
+
});
|
|
57
58
|
}
|
|
58
|
-
}
|
|
59
|
+
};
|
|
59
60
|
exports.configureEslint = configureEslint;
|
|
60
61
|
/**
|
|
61
62
|
* Adds ignore patterns to the eslint config file
|
|
@@ -63,30 +64,27 @@ exports.configureEslint = configureEslint;
|
|
|
63
64
|
* @param eslintConfigPath - Path to the eslint config file
|
|
64
65
|
* @param ignorePatterns - Array of ignore patterns to add
|
|
65
66
|
*/
|
|
66
|
-
const addIgnoresToEslintConfig = (tree, eslintConfigPath, ignorePatterns) => {
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
67
|
+
const addIgnoresToEslintConfig = async (tree, eslintConfigPath, ignorePatterns) => {
|
|
68
|
+
for (const pattern of ignorePatterns) {
|
|
69
|
+
const escaped = pattern.replace(/`/g, '\\`');
|
|
70
|
+
// Single or{} per pattern handles all cases:
|
|
71
|
+
// 1. No ignores object → add { ignores: ['pattern'] } to the exports array
|
|
72
|
+
// 2. Empty ignores: [] → rewrite to ignores: ['pattern']
|
|
73
|
+
// 3. Non-empty ignores: [items] → append 'pattern' to existing items
|
|
74
|
+
await (0, ast_1.applyGritQL)(tree, eslintConfigPath, `or {
|
|
75
|
+
\`export default [$items]\` where {
|
|
76
|
+
$items <: not some \`{ ignores: $_ }\`,
|
|
77
|
+
$items += \`{ ignores: ['${escaped}'] }\`
|
|
78
|
+
},
|
|
79
|
+
\`export default [$items]\` where {
|
|
80
|
+
$items <: contains \`ignores: []\` => \`ignores: ['${escaped}']\`
|
|
81
|
+
},
|
|
82
|
+
\`ignores: [$items]\` => \`ignores: [$items, '${escaped}']\` where {
|
|
83
|
+
$items <: within \`export default [$_]\`,
|
|
84
|
+
$items <: not some \`'${escaped}'\`
|
|
85
|
+
}
|
|
86
|
+
}`);
|
|
79
87
|
}
|
|
80
|
-
// Create set of ignore patterns for filtering
|
|
81
|
-
const ignorePatternSet = new Set(ignorePatterns);
|
|
82
|
-
// Call replace on the ignores array
|
|
83
|
-
(0, ast_1.replace)(tree, eslintConfigPath, 'ExportAssignment > ArrayLiteralExpression ObjectLiteralExpression > PropertyAssignment[name.text="ignores"] > ArrayLiteralExpression', (node) => {
|
|
84
|
-
return typescript_1.factory.createArrayLiteralExpression([
|
|
85
|
-
...node.elements.filter((p) => p.kind !== typescript_1.SyntaxKind.StringLiteral ||
|
|
86
|
-
!ignorePatternSet.has(p.getText().slice(1, -1))),
|
|
87
|
-
...ignorePatterns.map((pattern) => typescript_1.factory.createStringLiteral(pattern)),
|
|
88
|
-
], true);
|
|
89
|
-
});
|
|
90
88
|
};
|
|
91
89
|
exports.addIgnoresToEslintConfig = addIgnoresToEslintConfig;
|
|
92
90
|
//# sourceMappingURL=eslint.js.map
|
package/src/ts/lib/eslint.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/eslint.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/eslint.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAMoB;AACpB,mDAAoD;AACpD,yCAA+D;AAE/D,uCAAqE;AAE9D,MAAM,eAAe,GAAG,KAAK,EAClC,IAAU,EACV,OAAgC,EAChC,EAAE;IACF,0BAA0B;IAC1B,MAAM,WAAW,GAAG,IAAA,wCAAmC,EACrD,IAAI,EACJ,OAAO,CAAC,kBAAkB,CAC3B,CAAC;IACF,IAAA,mCAA0B,EAAC,IAAI,EAAE,OAAO,CAAC,kBAAkB,EAAE;QAC3D,GAAG,WAAW;QACd,OAAO,EAAE;YACP,GAAG,WAAW,EAAE,OAAO;YACvB,IAAI,EAAE;gBACJ,QAAQ,EAAE,iBAAiB;gBAC3B,KAAK,EAAE,IAAI;gBACX,MAAM,EAAE,CAAC,QAAQ,CAAC;gBAClB,cAAc,EAAE;oBACd,GAAG,EAAE;wBACH,GAAG,EAAE,IAAI;qBACV;oBACD,WAAW,EAAE;wBACX,KAAK,EAAE,IAAI;qBACZ;iBACF;aACF;SACF;KACF,CAAC,CAAC;IAEH,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,IAAA,uBAAY,EAAC,CAAC,UAAU,EAAE,wBAAwB,EAAE,qBAAqB,CAAC,CAAC,CAC5E,CAAC;IAEF,qCAAqC;IACrC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC;IAE7C,IAAI,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,CAAC;QAClC,iCAAiC;QACjC,MAAM,IAAA,qBAAe,EACnB,IAAI,EACJ,gBAAgB,EAChB,iCAAiC,EACjC,oCAAoC,CACrC,CAAC;QAEF,8EAA8E;QAC9E,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gBAAgB,EAChB,8OAA8O,CAC/O,CAAC;QAEF,uCAAuC;QACvC,MAAM,IAAA,gCAAwB,EAAC,IAAI,EAAE,gBAAgB,EAAE;YACrD,6BAA6B;SAC9B,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAA,qBAAY,EAAC,IAAI,EAAE;YACjB,GAAG,MAAM;YACT,WAAW,EAAE;gBACX,GAAG,MAAM,CAAC,WAAW;gBACrB,MAAM,EAAE;oBACN,SAAS;oBACT,mCAAmC;oBACnC,iCAAiC;iBAClC;aACF;SACF,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAxEW,QAAA,eAAe,mBAwE1B;AAEF;;;;;GAKG;AACI,MAAM,wBAAwB,GAAG,KAAK,EAC3C,IAAU,EACV,gBAAwB,EACxB,cAAwB,EACT,EAAE;IACjB,KAAK,MAAM,OAAO,IAAI,cAAc,EAAE,CAAC;QACrC,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7C,6CAA6C;QAC7C,2EAA2E;QAC3E,yDAAyD;QACzD,qEAAqE;QACrE,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,gBAAgB,EAChB;;;qCAG+B,OAAO;;;+DAGmB,OAAO;;wDAEd,OAAO;;kCAE7B,OAAO;;QAEjC,CACH,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AA7BW,QAAA,wBAAwB,4BA6BnC"}
|
package/src/ts/lib/generator.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.tsProjectGenerator = exports.getTsLibDetails = exports.TS_LIB_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
|
|
@@ -17,7 +16,9 @@ const object_1 = require("../../utils/object");
|
|
|
17
16
|
const nx_1 = require("../../utils/nx");
|
|
18
17
|
const metrics_1 = require("../../utils/metrics");
|
|
19
18
|
const ast_1 = require("../../utils/ast");
|
|
20
|
-
const
|
|
19
|
+
const fs_1 = require("fs");
|
|
20
|
+
const path_1 = require("path");
|
|
21
|
+
const readGritPattern = (name) => (0, fs_1.readFileSync)((0, path_1.join)(__dirname, 'grit', `${name}.grit`), 'utf-8').trim();
|
|
21
22
|
exports.TS_LIB_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
|
|
22
23
|
/**
|
|
23
24
|
* Returns details about the TS library to be created
|
|
@@ -34,9 +35,17 @@ exports.getTsLibDetails = getTsLibDetails;
|
|
|
34
35
|
/**
|
|
35
36
|
* Generates a typescript project
|
|
36
37
|
*/
|
|
37
|
-
const tsProjectGenerator = (tree, schema) =>
|
|
38
|
+
const tsProjectGenerator = async (tree, schema) => {
|
|
38
39
|
const { fullyQualifiedName, dir } = (0, exports.getTsLibDetails)(tree, schema);
|
|
39
|
-
|
|
40
|
+
await (0, js_1.libraryGenerator)(tree, {
|
|
41
|
+
...schema,
|
|
42
|
+
name: fullyQualifiedName,
|
|
43
|
+
directory: dir,
|
|
44
|
+
skipPackageJson: true,
|
|
45
|
+
bundler: 'tsc', // TODO: consider supporting others
|
|
46
|
+
linter: 'eslint',
|
|
47
|
+
unitTestRunner: 'vitest',
|
|
48
|
+
});
|
|
40
49
|
// Replace with simpler sample source code
|
|
41
50
|
tree.delete((0, devkit_1.joinPathFragments)(dir, 'src'));
|
|
42
51
|
(0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), (0, devkit_1.joinPathFragments)(dir), {
|
|
@@ -45,7 +54,7 @@ const tsProjectGenerator = (tree, schema) => tslib_1.__awaiter(void 0, void 0, v
|
|
|
45
54
|
}, {
|
|
46
55
|
overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
|
|
47
56
|
});
|
|
48
|
-
|
|
57
|
+
await (0, ts_project_utils_1.configureTsProject)(tree, {
|
|
49
58
|
dir,
|
|
50
59
|
fullyQualifiedName,
|
|
51
60
|
});
|
|
@@ -73,26 +82,44 @@ const tsProjectGenerator = (tree, schema) => tslib_1.__awaiter(void 0, void 0, v
|
|
|
73
82
|
(0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
|
|
74
83
|
(0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.TS_LIB_GENERATOR_INFO);
|
|
75
84
|
(0, devkit_1.updateJson)(tree, 'nx.json', (nxJson) => {
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
85
|
+
nxJson.namedInputs = {
|
|
86
|
+
...nxJson.namedInputs,
|
|
87
|
+
default: [
|
|
88
|
+
...(nxJson.namedInputs?.default ?? []).filter((input) => typeof input !== 'object' ||
|
|
79
89
|
!('dependentTasksOutputFiles' in input) ||
|
|
80
90
|
!(input.dependentTasksOutputFiles === '**/*' && input.transitive)),
|
|
81
91
|
{
|
|
82
92
|
dependentTasksOutputFiles: '**/*',
|
|
83
93
|
transitive: true,
|
|
84
94
|
},
|
|
85
|
-
]
|
|
86
|
-
|
|
87
|
-
|
|
95
|
+
],
|
|
96
|
+
};
|
|
97
|
+
nxJson.targetDefaults = {
|
|
98
|
+
...nxJson.targetDefaults,
|
|
99
|
+
compile: {
|
|
100
|
+
cache: true,
|
|
101
|
+
...nxJson.targetDefaults?.compile,
|
|
102
|
+
inputs: [
|
|
103
|
+
...(nxJson.targetDefaults?.compile?.inputs ?? []).filter((i) => i !== 'default'),
|
|
88
104
|
'default',
|
|
89
|
-
]
|
|
90
|
-
|
|
105
|
+
],
|
|
106
|
+
},
|
|
107
|
+
build: {
|
|
108
|
+
cache: true,
|
|
109
|
+
...nxJson.targetDefaults?.build,
|
|
110
|
+
inputs: [
|
|
111
|
+
...(nxJson.targetDefaults?.build?.inputs ?? []).filter((i) => i !== 'default'),
|
|
91
112
|
'default',
|
|
92
|
-
]
|
|
93
|
-
|
|
113
|
+
],
|
|
114
|
+
},
|
|
115
|
+
test: {
|
|
116
|
+
...nxJson.targetDefaults?.test,
|
|
117
|
+
inputs: [
|
|
118
|
+
...(nxJson.targetDefaults?.test?.inputs ?? []).filter((i) => i !== 'default'),
|
|
94
119
|
'default',
|
|
95
|
-
]
|
|
120
|
+
],
|
|
121
|
+
},
|
|
122
|
+
};
|
|
96
123
|
// Ensure we only declare a single typescript plugin with the correct settings
|
|
97
124
|
nxJson.plugins = [
|
|
98
125
|
{
|
|
@@ -109,25 +136,20 @@ const tsProjectGenerator = (tree, schema) => tslib_1.__awaiter(void 0, void 0, v
|
|
|
109
136
|
},
|
|
110
137
|
},
|
|
111
138
|
},
|
|
112
|
-
...(
|
|
139
|
+
...(nxJson.plugins ?? []).filter((p) => typeof p === 'string' || p.plugin !== '@nx/js/typescript'),
|
|
113
140
|
];
|
|
114
141
|
return nxJson;
|
|
115
142
|
});
|
|
116
143
|
// change error to warn for the @nx/dependency-checks rule
|
|
117
|
-
(0, ast_1.
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
...node.elements.slice(1),
|
|
121
|
-
]);
|
|
122
|
-
});
|
|
123
|
-
yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_LIB_GENERATOR_INFO]);
|
|
124
|
-
yield (0, format_1.formatFilesInSubtree)(tree);
|
|
144
|
+
await (0, ast_1.applyGritQL)(tree, (0, devkit_1.joinPathFragments)(dir, 'eslint.config.mjs'), readGritPattern('eslint-dependency-checks-warn'));
|
|
145
|
+
await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_LIB_GENERATOR_INFO]);
|
|
146
|
+
await (0, format_1.formatFilesInSubtree)(tree);
|
|
125
147
|
return () => {
|
|
126
148
|
if (!schema.skipInstall) {
|
|
127
149
|
(0, devkit_1.installPackagesTask)(tree);
|
|
128
150
|
}
|
|
129
151
|
};
|
|
130
|
-
}
|
|
152
|
+
};
|
|
131
153
|
exports.tsProjectGenerator = tsProjectGenerator;
|
|
132
154
|
exports.default = exports.tsProjectGenerator;
|
|
133
155
|
//# sourceMappingURL=generator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/generator.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
`'@nx/dependency-checks': ['error', $rest]` => `'@nx/dependency-checks': ['warn', $rest]`
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configureTsProject = 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
|
|
@@ -14,49 +13,73 @@ const eslint_1 = require("./eslint");
|
|
|
14
13
|
/**
|
|
15
14
|
* Updates typescript projects
|
|
16
15
|
*/
|
|
17
|
-
const configureTsProject = (tree, options) =>
|
|
16
|
+
const configureTsProject = async (tree, options) => {
|
|
18
17
|
// Remove conflicting commonjs module from tsconfig
|
|
19
|
-
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.dir, 'tsconfig.json'), (tsConfig) => {
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
18
|
+
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.dir, 'tsconfig.json'), (tsConfig) => ({
|
|
19
|
+
...tsConfig,
|
|
20
|
+
compilerOptions: {
|
|
21
|
+
...tsConfig.compilerOptions,
|
|
22
|
+
module: tsConfig.compilerOptions?.module === 'commonjs'
|
|
23
|
+
? undefined
|
|
24
|
+
: tsConfig.compilerOptions?.module,
|
|
25
|
+
},
|
|
26
|
+
}));
|
|
25
27
|
const outDirToRootRelativePath = (0, path_1.relative)((0, path_1.join)(tree.root, options.dir), tree.root);
|
|
26
28
|
const distDir = (0, path_1.join)(outDirToRootRelativePath, 'dist', options.dir, 'tsc');
|
|
27
29
|
// Remove baseUrl and rootDir from the tsconfig.lib.json
|
|
28
30
|
if (tree.exists((0, path_1.join)(options.dir, 'tsconfig.lib.json'))) {
|
|
29
|
-
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.dir, 'tsconfig.lib.json'), (tsConfig) => (
|
|
31
|
+
(0, devkit_1.updateJson)(tree, (0, path_1.join)(options.dir, 'tsconfig.lib.json'), (tsConfig) => ({
|
|
32
|
+
...tsConfig,
|
|
33
|
+
compilerOptions: {
|
|
34
|
+
...tsConfig.compilerOptions,
|
|
35
|
+
baseUrl: undefined,
|
|
36
|
+
rootDir: '.',
|
|
37
|
+
outDir: distDir,
|
|
38
|
+
tsBuildInfoFile: (0, path_1.join)(distDir, 'tsconfig.lib.tsbuildinfo'),
|
|
39
|
+
},
|
|
40
|
+
}));
|
|
30
41
|
}
|
|
31
42
|
// Update root project tsconfig
|
|
32
|
-
(0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (tsConfig) => {
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
43
|
+
(0, devkit_1.updateJson)(tree, 'tsconfig.base.json', (tsConfig) => ({
|
|
44
|
+
...tsConfig,
|
|
45
|
+
compilerOptions: {
|
|
46
|
+
...tsConfig.compilerOptions,
|
|
47
|
+
// baseUrl is deprecated in TypeScript 6 — use ./ prefix in paths instead
|
|
48
|
+
baseUrl: undefined,
|
|
49
|
+
rootDir: '.',
|
|
50
|
+
paths: {
|
|
51
|
+
// Remove any path aliases for this project with the npm scope prefix (eg remove @foo/bar)
|
|
52
|
+
...Object.fromEntries(Object.entries(tsConfig.compilerOptions?.paths ?? {}).filter(([k]) => k !== options.fullyQualifiedName)),
|
|
53
|
+
// Add aliases which begin with colon (eg :foo/bar) to avoid sniping attacks
|
|
54
|
+
[(0, npm_scope_1.toScopeAlias)(options.fullyQualifiedName)]: [
|
|
55
|
+
`./${(0, devkit_1.joinPathFragments)(options.dir, 'src', 'index.ts')}`,
|
|
56
|
+
],
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
}));
|
|
40
60
|
if (tree.exists('tsconfig.json')) {
|
|
41
|
-
(0, devkit_1.updateJson)(tree, 'tsconfig.json', (tsConfig) => {
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
});
|
|
61
|
+
(0, devkit_1.updateJson)(tree, 'tsconfig.json', (tsConfig) => ({
|
|
62
|
+
...tsConfig,
|
|
63
|
+
references: [
|
|
64
|
+
// Add project references, ensuring no duplication
|
|
65
|
+
...(tsConfig.references ?? []).filter((ref) => ref.path !== `./${options.dir}`),
|
|
66
|
+
{
|
|
67
|
+
path: `./${options.dir}`,
|
|
68
|
+
},
|
|
69
|
+
],
|
|
70
|
+
}));
|
|
51
71
|
}
|
|
52
72
|
// Update the root package.json
|
|
53
|
-
(0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => (
|
|
73
|
+
(0, devkit_1.updateJson)(tree, 'package.json', (packageJson) => ({
|
|
74
|
+
...packageJson,
|
|
75
|
+
type: 'module',
|
|
76
|
+
}));
|
|
54
77
|
// Remove package.json if it exists
|
|
55
78
|
if (tree.exists((0, path_1.join)(options.dir, 'package.json'))) {
|
|
56
79
|
tree.delete((0, path_1.join)(options.dir, 'package.json'));
|
|
57
80
|
}
|
|
58
|
-
|
|
59
|
-
(0, vitest_1.configureVitest)(tree, options);
|
|
60
|
-
}
|
|
81
|
+
await (0, eslint_1.configureEslint)(tree, options);
|
|
82
|
+
await (0, vitest_1.configureVitest)(tree, options);
|
|
83
|
+
};
|
|
61
84
|
exports.configureTsProject = configureTsProject;
|
|
62
85
|
//# sourceMappingURL=ts-project-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ts-project-utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/ts-project-utils.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"ts-project-utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/ts-project-utils.ts"],"names":[],"mappings":"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"}
|
package/src/ts/lib/vitest.d.ts
CHANGED
|
@@ -4,4 +4,4 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { Tree } from '@nx/devkit';
|
|
6
6
|
import { ConfigureProjectOptions } from './types';
|
|
7
|
-
export declare const configureVitest: (tree: Tree, options: ConfigureProjectOptions) => void
|
|
7
|
+
export declare const configureVitest: (tree: Tree, options: ConfigureProjectOptions) => Promise<void>;
|
package/src/ts/lib/vitest.js
CHANGED
|
@@ -1,43 +1,41 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.configureVitest = 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
|
|
8
7
|
*/
|
|
9
8
|
const devkit_1 = require("@nx/devkit");
|
|
10
9
|
const path_1 = require("path");
|
|
11
|
-
const typescript_1 = tslib_1.__importStar(require("typescript"));
|
|
12
10
|
const ast_1 = require("../../utils/ast");
|
|
13
11
|
const versions_1 = require("../../utils/versions");
|
|
14
|
-
const
|
|
15
|
-
|
|
12
|
+
const fs_1 = require("fs");
|
|
13
|
+
const readGritPattern = (name) => (0, fs_1.readFileSync)((0, path_1.join)(__dirname, 'grit', `${name}.grit`), 'utf-8').trim();
|
|
14
|
+
const configureVitest = async (tree, options) => {
|
|
16
15
|
// Find vitest.config.mts or vite.config.mts
|
|
17
16
|
const configPath = [
|
|
18
17
|
(0, path_1.join)(options.dir, 'vitest.config.mts'),
|
|
19
18
|
(0, path_1.join)(options.dir, 'vite.config.mts'),
|
|
20
19
|
].find((config) => tree.exists(config));
|
|
21
20
|
if (configPath) {
|
|
22
|
-
(0, ast_1.
|
|
23
|
-
// Check if passWithNoTests already exists
|
|
24
|
-
const hasPassWithNoTests = node.properties.some((p) => typescript_1.default.isPropertyAssignment(p) &&
|
|
25
|
-
typescript_1.default.isIdentifier(p.name) &&
|
|
26
|
-
p.name.text === 'passWithNoTests');
|
|
27
|
-
if (!hasPassWithNoTests) {
|
|
28
|
-
return typescript_1.factory.createObjectLiteralExpression([
|
|
29
|
-
...node.properties,
|
|
30
|
-
typescript_1.factory.createPropertyAssignment('passWithNoTests', typescript_1.factory.createTrue()),
|
|
31
|
-
]);
|
|
32
|
-
}
|
|
33
|
-
return node;
|
|
34
|
-
});
|
|
21
|
+
await (0, ast_1.applyGritQL)(tree, configPath, readGritPattern('vitest-pass-with-no-tests'));
|
|
35
22
|
const nxJson = (0, devkit_1.readNxJson)(tree);
|
|
36
|
-
(0, devkit_1.updateNxJson)(tree,
|
|
23
|
+
(0, devkit_1.updateNxJson)(tree, {
|
|
24
|
+
...nxJson,
|
|
25
|
+
targetDefaults: {
|
|
26
|
+
...(nxJson.targetDefaults ?? {}),
|
|
27
|
+
'@nx/vitest:test': {
|
|
28
|
+
cache: true,
|
|
29
|
+
inputs: ['default', '^production'],
|
|
30
|
+
configurations: {
|
|
37
31
|
'update-snapshot': {
|
|
38
32
|
args: '--update',
|
|
39
33
|
},
|
|
40
|
-
}
|
|
34
|
+
},
|
|
35
|
+
...nxJson.targetDefaults['@nx/vitest:test'],
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
});
|
|
41
39
|
}
|
|
42
40
|
(0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['vite', 'vitest', '@vitest/coverage-v8']));
|
|
43
41
|
};
|
package/src/ts/lib/vitest.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/vitest.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"vitest.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/ts/lib/vitest.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAKoB;AACpB,+BAA4B;AAE5B,yCAA8C;AAC9C,mDAAoD;AACpD,2BAAkC;AAElC,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;AAEjE,MAAM,eAAe,GAAG,KAAK,EAClC,IAAU,EACV,OAAgC,EAChC,EAAE;IACF,4CAA4C;IAC5C,MAAM,UAAU,GAAG;QACjB,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,mBAAmB,CAAC;QACtC,IAAA,WAAI,EAAC,OAAO,CAAC,GAAG,EAAE,iBAAiB,CAAC;KACrC,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IAExC,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,UAAU,EACV,eAAe,CAAC,2BAA2B,CAAC,CAC7C,CAAC;QAEF,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;QAChC,IAAA,qBAAY,EAAC,IAAI,EAAE;YACjB,GAAG,MAAM;YACT,cAAc,EAAE;gBACd,GAAG,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC;gBAChC,iBAAiB,EAAE;oBACjB,KAAK,EAAE,IAAI;oBACX,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;oBAClC,cAAc,EAAE;wBACd,iBAAiB,EAAE;4BACjB,IAAI,EAAE,UAAU;yBACjB;qBACF;oBACD,GAAG,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC;iBAC5C;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,IAAA,qCAA4B,EAC1B,IAAI,EACJ,EAAE,EACF,IAAA,uBAAY,EAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,qBAAqB,CAAC,CAAC,CACxD,CAAC;AACJ,CAAC,CAAC;AAzCW,QAAA,eAAe,mBAyC1B"}
|