@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.
Files changed (186) hide show
  1. package/LICENSE-THIRD-PARTY +688 -54
  2. package/bin/aws-nx-mcp.js +3 -4
  3. package/bin/aws-nx-mcp.js.map +1 -1
  4. package/package.json +2 -2
  5. package/sdk/utils/ast.d.ts +2 -1
  6. package/sdk/utils/ast.js +4 -2
  7. package/sdk/utils/ast.js.map +1 -1
  8. package/src/connection/generator.js +20 -26
  9. package/src/connection/generator.js.map +1 -1
  10. package/src/connection/serve-local.js +7 -9
  11. package/src/connection/serve-local.js.map +1 -1
  12. package/src/infra/app/generator.js +152 -143
  13. package/src/infra/app/generator.js.map +1 -1
  14. package/src/license/config.js +90 -79
  15. package/src/license/config.js.map +1 -1
  16. package/src/license/generator.js +20 -15
  17. package/src/license/generator.js.map +1 -1
  18. package/src/license/sync/generator.js +71 -77
  19. package/src/license/sync/generator.js.map +1 -1
  20. package/src/license/sync/project-file-sync.js +13 -6
  21. package/src/license/sync/project-file-sync.js.map +1 -1
  22. package/src/mcp-server/generator-info.js +28 -34
  23. package/src/mcp-server/generator-info.js.map +1 -1
  24. package/src/mcp-server/index.js +3 -4
  25. package/src/mcp-server/index.js.map +1 -1
  26. package/src/mcp-server/tools/general-guidance.js +8 -11
  27. package/src/mcp-server/tools/general-guidance.js.map +1 -1
  28. package/src/mcp-server/tools/generator-guide.js +3 -4
  29. package/src/mcp-server/tools/generator-guide.js.map +1 -1
  30. package/src/open-api/ts-client/generator.js +8 -8
  31. package/src/open-api/ts-client/generator.js.map +1 -1
  32. package/src/open-api/ts-hooks/generator.js +4 -4
  33. package/src/open-api/ts-hooks/generator.js.map +1 -1
  34. package/src/open-api/ts-metadata/generator.js +4 -4
  35. package/src/open-api/ts-metadata/generator.js.map +1 -1
  36. package/src/open-api/utils/codegen-data/languages.js +1 -2
  37. package/src/open-api/utils/codegen-data/languages.js.map +1 -1
  38. package/src/open-api/utils/codegen-data.js +90 -92
  39. package/src/open-api/utils/codegen-data.js.map +1 -1
  40. package/src/open-api/utils/normalise.js +34 -34
  41. package/src/open-api/utils/normalise.js.map +1 -1
  42. package/src/open-api/utils/parse.js +3 -3
  43. package/src/open-api/utils/parse.js.map +1 -1
  44. package/src/open-api/utils/refs.js +1 -1
  45. package/src/open-api/utils/refs.js.map +1 -1
  46. package/src/preset/__snapshots__/generator.spec.ts.snap +2 -1
  47. package/src/preset/generator.js +51 -24
  48. package/src/preset/generator.js.map +1 -1
  49. package/src/py/fast-api/generator.js +18 -13
  50. package/src/py/fast-api/generator.js.map +1 -1
  51. package/src/py/fast-api/react/generator.js +8 -10
  52. package/src/py/fast-api/react/generator.js.map +1 -1
  53. package/src/py/fast-api/react/open-api.js +15 -7
  54. package/src/py/fast-api/react/open-api.js.map +1 -1
  55. package/src/py/lambda-function/generator.js +18 -16
  56. package/src/py/lambda-function/generator.js.map +1 -1
  57. package/src/py/mcp-server/generator.js +36 -24
  58. package/src/py/mcp-server/generator.js.map +1 -1
  59. package/src/py/project/generator.js +36 -24
  60. package/src/py/project/generator.js.map +1 -1
  61. package/src/py/strands-agent/generator.js +21 -16
  62. package/src/py/strands-agent/generator.js.map +1 -1
  63. package/src/py/strands-agent/mcp-connection/generator.js +30 -32
  64. package/src/py/strands-agent/mcp-connection/generator.js.map +1 -1
  65. package/src/smithy/project/generator.js +6 -8
  66. package/src/smithy/project/generator.js.map +1 -1
  67. package/src/smithy/react-connection/generator.js +14 -17
  68. package/src/smithy/react-connection/generator.js.map +1 -1
  69. package/src/smithy/ts/api/generator.js +19 -13
  70. package/src/smithy/ts/api/generator.js.map +1 -1
  71. package/src/terraform/project/generator.js +191 -189
  72. package/src/terraform/project/generator.js.map +1 -1
  73. package/src/trpc/backend/generator.js +95 -83
  74. package/src/trpc/backend/generator.js.map +1 -1
  75. package/src/trpc/react/__snapshots__/generator.spec.ts.snap +12 -9
  76. package/src/trpc/react/files/src/components/__apiNameClassName__ClientProvider.tsx.template +1 -1
  77. package/src/trpc/react/files/src/hooks/use__apiNameClassName__.tsx.template +3 -3
  78. package/src/trpc/react/generator.js +75 -76
  79. package/src/trpc/react/generator.js.map +1 -1
  80. package/src/ts/lambda-function/generator.js +16 -13
  81. package/src/ts/lambda-function/generator.js.map +1 -1
  82. package/src/ts/lib/eslint.d.ts +1 -1
  83. package/src/ts/lib/eslint.js +42 -44
  84. package/src/ts/lib/eslint.js.map +1 -1
  85. package/src/ts/lib/generator.js +48 -26
  86. package/src/ts/lib/generator.js.map +1 -1
  87. package/src/ts/lib/grit/eslint-dependency-checks-warn.grit +1 -0
  88. package/src/ts/lib/grit/vitest-pass-with-no-tests.grit +7 -0
  89. package/src/ts/lib/ts-project-utils.js +54 -31
  90. package/src/ts/lib/ts-project-utils.js.map +1 -1
  91. package/src/ts/lib/vitest.d.ts +1 -1
  92. package/src/ts/lib/vitest.js +17 -19
  93. package/src/ts/lib/vitest.js.map +1 -1
  94. package/src/ts/mcp-server/generator.js +23 -18
  95. package/src/ts/mcp-server/generator.js.map +1 -1
  96. package/src/ts/nx-generator/generator.js +40 -22
  97. package/src/ts/nx-generator/generator.js.map +1 -1
  98. package/src/ts/nx-plugin/generator.js +14 -11
  99. package/src/ts/nx-plugin/generator.js.map +1 -1
  100. package/src/ts/nx-plugin/utils.js +11 -10
  101. package/src/ts/nx-plugin/utils.js.map +1 -1
  102. package/src/ts/react-website/app/__snapshots__/generator.spec.ts.snap +33 -23
  103. package/src/ts/react-website/app/generator.js +257 -255
  104. package/src/ts/react-website/app/generator.js.map +1 -1
  105. package/src/ts/react-website/cognito-auth/__snapshots__/generator.ux-provider.spec.ts.snap +5 -7
  106. package/src/ts/react-website/cognito-auth/generator.js +68 -92
  107. package/src/ts/react-website/cognito-auth/generator.js.map +1 -1
  108. package/src/ts/react-website/cognito-auth/grit/app-layout-use-auth.grit +10 -0
  109. package/src/ts/react-website/cognito-auth/grit/cognito-auth-wrapper.grit +3 -0
  110. package/src/ts/react-website/cognito-auth/utils.js +14 -21
  111. package/src/ts/react-website/cognito-auth/utils.js.map +1 -1
  112. package/src/ts/react-website/runtime-config/generator.js +35 -34
  113. package/src/ts/react-website/runtime-config/generator.js.map +1 -1
  114. package/src/ts/strands-agent/generator.js +19 -14
  115. package/src/ts/strands-agent/generator.js.map +1 -1
  116. package/src/ts/strands-agent/mcp-connection/generator.js +15 -17
  117. package/src/ts/strands-agent/mcp-connection/generator.js.map +1 -1
  118. package/src/ts/sync/generator.js +36 -14
  119. package/src/ts/sync/generator.js.map +1 -1
  120. package/src/utils/agent-connection/agent-connection.js +62 -68
  121. package/src/utils/agent-connection/agent-connection.js.map +1 -1
  122. package/src/utils/agent-core-constructs/agent-core-constructs.js +14 -16
  123. package/src/utils/agent-core-constructs/agent-core-constructs.js.map +1 -1
  124. package/src/utils/api-constructs/api-constructs.js +8 -10
  125. package/src/utils/api-constructs/api-constructs.js.map +1 -1
  126. package/src/utils/api-constructs/open-api-metadata.js +1 -2
  127. package/src/utils/api-constructs/open-api-metadata.js.map +1 -1
  128. package/src/utils/ast/website.js +66 -124
  129. package/src/utils/ast/website.js.map +1 -1
  130. package/src/utils/ast.d.ts +2 -2
  131. package/src/utils/ast.js +23 -26
  132. package/src/utils/ast.js.map +1 -1
  133. package/src/utils/bundle/bundle.d.ts +1 -1
  134. package/src/utils/bundle/bundle.js +37 -82
  135. package/src/utils/bundle/bundle.js.map +1 -1
  136. package/src/utils/config/utils.js +9 -9
  137. package/src/utils/config/utils.js.map +1 -1
  138. package/src/utils/connection/open-api/react.js +28 -23
  139. package/src/utils/connection/open-api/react.js.map +1 -1
  140. package/src/utils/format.js +50 -47
  141. package/src/utils/format.js.map +1 -1
  142. package/src/utils/fs.js +1 -0
  143. package/src/utils/fs.js.map +1 -1
  144. package/src/utils/function-constructs/function-constructs.js +16 -12
  145. package/src/utils/function-constructs/function-constructs.js.map +1 -1
  146. package/src/utils/git.js +2 -3
  147. package/src/utils/git.js.map +1 -1
  148. package/src/utils/iac.js +4 -6
  149. package/src/utils/iac.js.map +1 -1
  150. package/src/utils/identity-constructs/identity-constructs.js +6 -7
  151. package/src/utils/identity-constructs/identity-constructs.js.map +1 -1
  152. package/src/utils/js.js +7 -8
  153. package/src/utils/js.js.map +1 -1
  154. package/src/utils/metrics.js +12 -13
  155. package/src/utils/metrics.js.map +1 -1
  156. package/src/utils/mock-project-graph.js +3 -6
  157. package/src/utils/mock-project-graph.js.map +1 -1
  158. package/src/utils/names.js +8 -3
  159. package/src/utils/names.js.map +1 -1
  160. package/src/utils/npm-scope.js +1 -1
  161. package/src/utils/npm-scope.js.map +1 -1
  162. package/src/utils/nx.js +42 -19
  163. package/src/utils/nx.js.map +1 -1
  164. package/src/utils/nxlv-python.d.ts +124 -5
  165. package/src/utils/nxlv-python.js +5 -14
  166. package/src/utils/nxlv-python.js.map +1 -1
  167. package/src/utils/pkg-manager.js +1 -1
  168. package/src/utils/pkg-manager.js.map +1 -1
  169. package/src/utils/port.js +4 -6
  170. package/src/utils/port.js.map +1 -1
  171. package/src/utils/py.js +12 -12
  172. package/src/utils/py.js.map +1 -1
  173. package/src/utils/shared-constructs.js +67 -72
  174. package/src/utils/shared-constructs.js.map +1 -1
  175. package/src/utils/shared-infra-config.js +24 -26
  176. package/src/utils/shared-infra-config.js.map +1 -1
  177. package/src/utils/shared-scripts.js +24 -26
  178. package/src/utils/shared-scripts.js.map +1 -1
  179. package/src/utils/shared-shadcn.js +71 -67
  180. package/src/utils/shared-shadcn.js.map +1 -1
  181. package/src/utils/versions.d.ts +5 -1
  182. package/src/utils/versions.js +8 -4
  183. package/src/utils/versions.js.map +1 -1
  184. package/src/utils/website-constructs/website-constructs.js +9 -11
  185. package/src/utils/website-constructs/website-constructs.js.map +1 -1
  186. package/src/utils/bundle/__snapshots__/bundle.spec.ts.snap +0 -46
@@ -2,8 +2,127 @@
2
2
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
3
3
  * SPDX-License-Identifier: Apache-2.0
4
4
  */
5
- export declare const UVProvider: typeof import('@nxlv/python/dist/provider/uv/provider').UVProvider;
6
- export type UVPyprojectToml = import('@nxlv/python/dist/provider/uv/types').UVPyprojectToml;
7
- export declare const Logger: typeof import('@nxlv/python/dist/executors/utils/logger').Logger;
8
- export declare const migrateToSharedVenvGenerator: typeof import('@nxlv/python/dist/generators/migrate-to-shared-venv/generator').default;
9
- export declare const uvProjectGenerator: typeof import('@nxlv/python/dist/generators/uv-project/generator').default;
5
+ /**
6
+ * Re-exports internal modules from @nxlv/python that are not exposed
7
+ * via the package's "exports" field.
8
+ *
9
+ * Newer versions of Node.js and Vite strictly enforce the "exports" map
10
+ * in package.json, which prevents deep imports like:
11
+ * import { UVProvider } from '@nxlv/python/dist/provider/uv/provider'
12
+ *
13
+ * This module resolves the package location and loads the internal modules
14
+ * directly by filesystem path, bypassing the exports restriction.
15
+ *
16
+ * Type definitions are inlined from the @nxlv/python .d.ts files because
17
+ * moduleResolution: "bundler" does not allow deep path type imports for
18
+ * packages without proper exports.
19
+ */
20
+ import { Tree } from '@nx/devkit';
21
+ export type UVPyprojectTomlIndex = {
22
+ name: string;
23
+ url: string;
24
+ };
25
+ export type UVPyprojectToml = {
26
+ project?: {
27
+ name: string;
28
+ version: string;
29
+ dependencies: string[];
30
+ 'optional-dependencies': {
31
+ [key: string]: string[];
32
+ };
33
+ };
34
+ 'dependency-groups': {
35
+ [key: string]: string[];
36
+ };
37
+ 'build-system'?: {
38
+ requires?: string[];
39
+ 'build-backend'?: string;
40
+ };
41
+ tool?: {
42
+ hatch?: {
43
+ build?: {
44
+ targets?: {
45
+ wheel?: {
46
+ packages: string[];
47
+ };
48
+ };
49
+ };
50
+ metadata?: {
51
+ 'allow-direct-references'?: boolean;
52
+ };
53
+ };
54
+ uv?: {
55
+ sources?: {
56
+ [key: string]: {
57
+ path?: string;
58
+ workspace?: boolean;
59
+ index?: string;
60
+ };
61
+ };
62
+ index?: UVPyprojectTomlIndex[];
63
+ workspace?: {
64
+ members: string[];
65
+ };
66
+ 'build-backend'?: {
67
+ 'module-name'?: string[];
68
+ namespace?: boolean;
69
+ };
70
+ };
71
+ };
72
+ };
73
+ interface ILogger {
74
+ setOptions(options: {
75
+ silent: boolean;
76
+ }): void;
77
+ info(message: unknown): void;
78
+ }
79
+ interface IUVProvider {
80
+ install(): Promise<void>;
81
+ }
82
+ interface IUVProviderConstructor {
83
+ new (workspaceRoot: string, logger: ILogger, tree?: Tree): IUVProvider;
84
+ }
85
+ interface ILoggerConstructor {
86
+ new (): ILogger;
87
+ }
88
+ interface MigrateToSharedVenvSchema {
89
+ moveDevDependencies: boolean;
90
+ pyprojectPythonDependency: string;
91
+ pyenvPythonVersion: string | number;
92
+ autoActivate: boolean;
93
+ packageManager: 'poetry' | 'uv';
94
+ }
95
+ interface UVProjectGeneratorSchema {
96
+ name: string;
97
+ publishable: boolean;
98
+ buildLockedVersions: boolean;
99
+ buildBundleLocalDependencies: boolean;
100
+ linter: 'flake8' | 'ruff' | 'none';
101
+ devDependenciesProject?: string;
102
+ rootPyprojectDependencyGroup: string;
103
+ templateDir?: string;
104
+ pyprojectPythonDependency: string;
105
+ projectType: 'application' | 'library';
106
+ projectNameAndRootFormat: 'as-provided' | 'derived';
107
+ packageName?: string;
108
+ description?: string;
109
+ moduleName?: string;
110
+ pyenvPythonVersion?: string | number;
111
+ tags?: string;
112
+ directory?: string;
113
+ useSyncGenerators?: boolean;
114
+ unitTestRunner: 'pytest' | 'none';
115
+ codeCoverage: boolean;
116
+ codeCoverageHtmlReport: boolean;
117
+ codeCoverageXmlReport: boolean;
118
+ codeCoverageThreshold?: number;
119
+ unitTestHtmlReport: boolean;
120
+ unitTestJUnitReport: boolean;
121
+ buildSystem: 'hatch' | 'uv';
122
+ srcDir: boolean;
123
+ }
124
+ export declare const UVProvider: IUVProviderConstructor;
125
+ export declare const Logger: ILoggerConstructor;
126
+ export declare const migrateToSharedVenvGenerator: (tree: Tree, options: MigrateToSharedVenvSchema) => Promise<() => Promise<void>>;
127
+ export declare const uvProjectGenerator: (tree: Tree, options: UVProjectGeneratorSchema) => Promise<() => Promise<void>>;
128
+ export {};
@@ -3,22 +3,13 @@
3
3
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
4
4
  * SPDX-License-Identifier: Apache-2.0
5
5
  */
6
- var _a, _b;
7
6
  Object.defineProperty(exports, "__esModule", { value: true });
8
7
  exports.uvProjectGenerator = exports.migrateToSharedVenvGenerator = exports.Logger = exports.UVProvider = void 0;
9
8
  const tslib_1 = require("tslib");
10
- /**
11
- * Re-exports internal modules from @nxlv/python that are not exposed
12
- * via the package's "exports" field.
13
- *
14
- * Newer versions of Node.js and Vite strictly enforce the "exports" map
15
- * in package.json, which prevents deep imports like:
16
- * import { UVProvider } from '@nxlv/python/dist/provider/uv/provider'
17
- *
18
- * This module resolves the package location and loads the internal modules
19
- * directly by filesystem path, bypassing the exports restriction.
20
- */
21
9
  const path_1 = tslib_1.__importDefault(require("path"));
10
+ // ---------------------------------------------------------------------------
11
+ // Runtime module loading via filesystem paths
12
+ // ---------------------------------------------------------------------------
22
13
  // Resolve the @nxlv/python package root by finding its package.json
23
14
  // (which IS listed in the exports map as "./package.json")
24
15
  const nxlvPythonPkgJson = require.resolve('@nxlv/python/package.json');
@@ -33,6 +24,6 @@ const migrateToSharedVenvModule = require(path_1.default.join(nxlvPythonRoot, 'd
33
24
  const uvProjectModule = require(path_1.default.join(nxlvPythonRoot, 'dist/generators/uv-project/generator'));
34
25
  exports.UVProvider = uvProviderModule.UVProvider;
35
26
  exports.Logger = loggerModule.Logger;
36
- exports.migrateToSharedVenvGenerator = (_a = migrateToSharedVenvModule.default) !== null && _a !== void 0 ? _a : migrateToSharedVenvModule;
37
- exports.uvProjectGenerator = (_b = uvProjectModule.default) !== null && _b !== void 0 ? _b : uvProjectModule;
27
+ exports.migrateToSharedVenvGenerator = migrateToSharedVenvModule.default ?? migrateToSharedVenvModule;
28
+ exports.uvProjectGenerator = uvProjectModule.default ?? uvProjectModule;
38
29
  //# sourceMappingURL=nxlv-python.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"nxlv-python.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/nxlv-python.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;;AAEH;;;;;;;;;;GAUG;AACH,wDAAwB;AAExB,oEAAoE;AACpE,2DAA2D;AAC3D,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;AACvE,MAAM,cAAc,GAAG,cAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEvD,iEAAiE;AACjE,MAAM,gBAAgB,GAAG,OAAO,CAC9B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,2BAA2B,CAAC,CACvD,CAAC;AACF,iEAAiE;AACjE,MAAM,YAAY,GAAG,OAAO,CAC1B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,6BAA6B,CAAC,CACzD,CAAC;AACF,iEAAiE;AACjE,MAAM,yBAAyB,GAAG,OAAO,CACvC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,kDAAkD,CAAC,CAC9E,CAAC;AACF,iEAAiE;AACjE,MAAM,eAAe,GAAG,OAAO,CAC7B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,sCAAsC,CAAC,CAClE,CAAC;AAEW,QAAA,UAAU,GACrB,gBAAgB,CAAC,UAAU,CAAC;AAOjB,QAAA,MAAM,GACjB,YAAY,CAAC,MAAM,CAAC;AAET,QAAA,4BAA4B,GACvC,MAAA,yBAAyB,CAAC,OAAO,mCAAI,yBAAyB,CAAC;AAEpD,QAAA,kBAAkB,GAC7B,MAAA,eAAe,CAAC,OAAO,mCAAI,eAAe,CAAC"}
1
+ {"version":3,"file":"nxlv-python.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/nxlv-python.ts"],"names":[],"mappings":";AAAA;;;GAGG;;;;AAkBH,wDAAwB;AAmHxB,8EAA8E;AAC9E,8CAA8C;AAC9C,8EAA8E;AAE9E,oEAAoE;AACpE,2DAA2D;AAC3D,MAAM,iBAAiB,GAAG,OAAO,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAC;AACvE,MAAM,cAAc,GAAG,cAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;AAEvD,iEAAiE;AACjE,MAAM,gBAAgB,GAAG,OAAO,CAC9B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,2BAA2B,CAAC,CACvD,CAAC;AACF,iEAAiE;AACjE,MAAM,YAAY,GAAG,OAAO,CAC1B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,6BAA6B,CAAC,CACzD,CAAC;AACF,iEAAiE;AACjE,MAAM,yBAAyB,GAAG,OAAO,CACvC,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,kDAAkD,CAAC,CAC9E,CAAC;AACF,iEAAiE;AACjE,MAAM,eAAe,GAAG,OAAO,CAC7B,cAAI,CAAC,IAAI,CAAC,cAAc,EAAE,sCAAsC,CAAC,CAClE,CAAC;AAEW,QAAA,UAAU,GAA2B,gBAAgB,CAAC,UAAU,CAAC;AAEjE,QAAA,MAAM,GAAuB,YAAY,CAAC,MAAM,CAAC;AAEjD,QAAA,4BAA4B,GAIvC,yBAAyB,CAAC,OAAO,IAAI,yBAAyB,CAAC;AAEpD,QAAA,kBAAkB,GAGK,eAAe,CAAC,OAAO,IAAI,eAAe,CAAC"}
@@ -15,6 +15,6 @@ const COMMANDS = {
15
15
  /**
16
16
  * Returns display-friendly command prefixes for the detected package manager.
17
17
  */
18
- const getPackageManagerDisplayCommands = (pm = (0, devkit_1.detectPackageManager)()) => { var _a; return (_a = COMMANDS[pm]) !== null && _a !== void 0 ? _a : COMMANDS['npm']; };
18
+ const getPackageManagerDisplayCommands = (pm = (0, devkit_1.detectPackageManager)()) => COMMANDS[pm] ?? COMMANDS['npm'];
19
19
  exports.getPackageManagerDisplayCommands = getPackageManagerDisplayCommands;
20
20
  //# sourceMappingURL=pkg-manager.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pkg-manager.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/pkg-manager.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAkD;AAyBlD,MAAM,QAAQ,GAAkD;IAC9D,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE;IACpC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE;CAClC,CAAC;AAEF;;GAEG;AACI,MAAM,gCAAgC,GAAG,CAC9C,EAAE,GAAG,IAAA,6BAAoB,GAAE,EACI,EAAE,WAAC,OAAA,MAAA,QAAQ,CAAC,EAAE,CAAC,mCAAI,QAAQ,CAAC,KAAK,CAAC,CAAA,EAAA,CAAC;AAFvD,QAAA,gCAAgC,oCAEuB"}
1
+ {"version":3,"file":"pkg-manager.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/pkg-manager.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAkD;AAyBlD,MAAM,QAAQ,GAAkD;IAC9D,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE;IACpC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;IACnC,GAAG,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE;CAClC,CAAC;AAEF;;GAEG;AACI,MAAM,gCAAgC,GAAG,CAC9C,EAAE,GAAG,IAAA,6BAAoB,GAAE,EACI,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,KAAK,CAAC,CAAC;AAFvD,QAAA,gCAAgC,oCAEuB"}
package/src/utils/port.js CHANGED
@@ -11,17 +11,15 @@ const devkit_1 = require("@nx/devkit");
11
11
  * Mutates the project to add/update its metadata.ports with the newly assigned port
12
12
  */
13
13
  const assignPort = (tree, project, startPort) => {
14
- var _a, _b;
15
- var _c;
16
14
  // Find all existing ports
17
15
  const allPorts = new Set([...(0, devkit_1.getProjects)(tree).values()].flatMap((p) => {
18
16
  const metadata = p.metadata;
19
17
  const ports = [];
20
18
  // Support old port assignment where each project registered a single port
21
- if ((metadata === null || metadata === void 0 ? void 0 : metadata.port) && typeof metadata.port === 'number') {
19
+ if (metadata?.port && typeof metadata.port === 'number') {
22
20
  ports.push(metadata.port);
23
21
  }
24
- if ((metadata === null || metadata === void 0 ? void 0 : metadata.ports) && typeof metadata.ports === 'object' && Array.isArray(metadata.ports)) {
22
+ if (metadata?.ports && typeof metadata.ports === 'object' && Array.isArray(metadata.ports)) {
25
23
  ports.push(...metadata.ports);
26
24
  }
27
25
  return ports;
@@ -31,8 +29,8 @@ const assignPort = (tree, project, startPort) => {
31
29
  while (allPorts.has(candidatePort)) {
32
30
  candidatePort++;
33
31
  }
34
- (_a = project.metadata) !== null && _a !== void 0 ? _a : (project.metadata = {});
35
- (_b = (_c = project.metadata).ports) !== null && _b !== void 0 ? _b : (_c.ports = []);
32
+ project.metadata ??= {};
33
+ project.metadata.ports ??= [];
36
34
  project.metadata.ports = [
37
35
  ...project.metadata.ports,
38
36
  candidatePort,
@@ -1 +1 @@
1
- {"version":3,"file":"port.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/port.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAqE;AAErE;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAC,IAAU,EAAE,OAA6B,EAAE,SAAiB,EAAE,EAAE;;;IACzF,0BAA0B;IAC1B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrE,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAe,CAAC;QACnC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,0EAA0E;QAC1E,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,IAAI,KAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,KAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3F,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC,CAAC;IAEJ,0DAA0D;IAC1D,IAAI,aAAa,GAAG,SAAS,CAAC;IAC9B,OAAO,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QACnC,aAAa,EAAE,CAAC;IAClB,CAAC;IAED,MAAA,OAAO,CAAC,QAAQ,oCAAhB,OAAO,CAAC,QAAQ,GAAK,EAAE,EAAC;IACxB,YAAC,OAAO,CAAC,QAAgB,EAAC,KAAK,uCAAL,KAAK,GAAK,EAAE,EAAC;IACtC,OAAO,CAAC,QAAgB,CAAC,KAAK,GAAG;QAChC,GAAI,OAAO,CAAC,QAAgB,CAAC,KAAK;QAClC,aAAa;KACd,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AA7BW,QAAA,UAAU,cA6BrB"}
1
+ {"version":3,"file":"port.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/port.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAqE;AAErE;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAC,IAAU,EAAE,OAA6B,EAAE,SAAiB,EAAE,EAAE;IACzF,0BAA0B;IAC1B,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACrE,MAAM,QAAQ,GAAG,CAAC,CAAC,QAAe,CAAC;QACnC,MAAM,KAAK,GAAa,EAAE,CAAC;QAC3B,0EAA0E;QAC1E,IAAI,QAAQ,EAAE,IAAI,IAAI,OAAO,QAAQ,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACxD,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC5B,CAAC;QACD,IAAI,QAAQ,EAAE,KAAK,IAAI,OAAO,QAAQ,CAAC,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAC3F,KAAK,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC,CAAC,CAAC,CAAC;IAEJ,0DAA0D;IAC1D,IAAI,aAAa,GAAG,SAAS,CAAC;IAC9B,OAAO,QAAQ,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;QACnC,aAAa,EAAE,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,QAAQ,KAAK,EAAE,CAAC;IACvB,OAAO,CAAC,QAAgB,CAAC,KAAK,KAAK,EAAE,CAAC;IACtC,OAAO,CAAC,QAAgB,CAAC,KAAK,GAAG;QAChC,GAAI,OAAO,CAAC,QAAgB,CAAC,KAAK;QAClC,aAAa;KACd,CAAC;IAEF,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AA7BW,QAAA,UAAU,cA6BrB"}
package/src/utils/py.js CHANGED
@@ -14,12 +14,11 @@ const toml_2 = require("./toml");
14
14
  * Add dependencies to a pyproject.toml file
15
15
  */
16
16
  const addDependenciesToPyProjectToml = (tree, projectRoot, deps) => {
17
- var _a, _b;
18
17
  const projectToml = (0, toml_1.parse)(tree.read((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), 'utf8'));
19
18
  const newDeps = new Set(deps);
20
19
  projectToml.project.dependencies = [
21
20
  // Replace any dependencies that already exist
22
- ...((_b = (_a = projectToml.project) === null || _a === void 0 ? void 0 : _a.dependencies) !== null && _b !== void 0 ? _b : []).filter((dep) => {
21
+ ...(projectToml.project?.dependencies ?? []).filter((dep) => {
23
22
  const parsedDep = (0, pip_requirements_js_1.parsePipRequirementsLine)(dep);
24
23
  return parsedDep.type !== 'ProjectName' || !newDeps.has(parsedDep.name);
25
24
  }),
@@ -29,17 +28,19 @@ const addDependenciesToPyProjectToml = (tree, projectRoot, deps) => {
29
28
  };
30
29
  exports.addDependenciesToPyProjectToml = addDependenciesToPyProjectToml;
31
30
  const addDependenciesToDependencyGroupInPyProjectToml = (tree, projectRoot, group, deps) => {
32
- var _a, _b;
33
31
  const projectToml = (0, toml_1.parse)(tree.read((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), 'utf8'));
34
32
  const newDeps = new Set(deps);
35
- projectToml['dependency-groups'] = Object.assign(Object.assign({}, projectToml['dependency-groups']), { [group]: [
33
+ projectToml['dependency-groups'] = {
34
+ ...projectToml['dependency-groups'],
35
+ [group]: [
36
36
  // Replace any dependencies that already exist
37
- ...((_b = (_a = projectToml['dependency-groups']) === null || _a === void 0 ? void 0 : _a[group]) !== null && _b !== void 0 ? _b : []).filter((dep) => {
37
+ ...(projectToml['dependency-groups']?.[group] ?? []).filter((dep) => {
38
38
  const parsedDep = (0, pip_requirements_js_1.parsePipRequirementsLine)(dep);
39
39
  return parsedDep.type !== 'ProjectName' || !newDeps.has(parsedDep.name);
40
40
  }),
41
41
  ...(0, versions_1.withPyVersions)(deps),
42
- ] });
42
+ ],
43
+ };
43
44
  tree.write((0, devkit_1.joinPathFragments)(projectRoot, 'pyproject.toml'), (0, toml_1.stringify)(projectToml));
44
45
  };
45
46
  exports.addDependenciesToDependencyGroupInPyProjectToml = addDependenciesToDependencyGroupInPyProjectToml;
@@ -51,7 +52,7 @@ exports.addDependenciesToDependencyGroupInPyProjectToml = addDependenciesToDepen
51
52
  const uvxCommand = (dep, args, withDeps) => {
52
53
  return `uvx ${withDeps
53
54
  ? `${withDeps
54
- .map(({ dep, version, specifier }) => `--with ${dep}${specifier !== null && specifier !== void 0 ? specifier : '=='}${version}`)
55
+ .map(({ dep, version, specifier }) => `--with ${dep}${specifier ?? '=='}${version}`)
55
56
  .join(' ')} `
56
57
  : ''}${(0, versions_1.withPyVersions)([dep])[0]}${args ? ` ${args}` : ''}`;
57
58
  };
@@ -66,18 +67,17 @@ const addWorkspaceDependencyToPyProject = (tree, projectRoot, dependencyPackageN
66
67
  return;
67
68
  }
68
69
  (0, toml_2.updateToml)(tree, pyprojectPath, (toml) => {
69
- var _a, _b, _c, _d, _e;
70
70
  // Add to [project].dependencies if not already present
71
- const deps = (_b = (_a = toml.project) === null || _a === void 0 ? void 0 : _a.dependencies) !== null && _b !== void 0 ? _b : [];
71
+ const deps = toml.project?.dependencies ?? [];
72
72
  if (!deps.some((d) => d === dependencyPackageName ||
73
73
  d.startsWith(`${dependencyPackageName}>=`) ||
74
74
  d.startsWith(`${dependencyPackageName}==`))) {
75
75
  toml.project.dependencies = [...deps, dependencyPackageName];
76
76
  }
77
77
  // Add to [tool.uv.sources] with workspace = true
78
- toml.tool = (_c = toml.tool) !== null && _c !== void 0 ? _c : {};
79
- toml.tool.uv = (_d = toml.tool.uv) !== null && _d !== void 0 ? _d : {};
80
- toml.tool.uv.sources = (_e = toml.tool.uv.sources) !== null && _e !== void 0 ? _e : {};
78
+ toml.tool = toml.tool ?? {};
79
+ toml.tool.uv = toml.tool.uv ?? {};
80
+ toml.tool.uv.sources = toml.tool.uv.sources ?? {};
81
81
  toml.tool.uv.sources[dependencyPackageName] = {
82
82
  workspace: true,
83
83
  };
@@ -1 +1 @@
1
- {"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"py.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/py.ts"],"names":[],"mappings":"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"}
@@ -15,87 +15,82 @@ const format_1 = require("./format");
15
15
  const pkg_manager_1 = require("./pkg-manager");
16
16
  const shared_constructs_constants_1 = require("./shared-constructs-constants");
17
17
  const utils_1 = require("./config/utils");
18
- function sharedConstructsGenerator(tree, options) {
19
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
20
- var _a, _b;
21
- const { iacProvider } = options;
22
- const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
23
- updateGitignore(tree);
24
- if (iacProvider === 'CDK') {
25
- if (!tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'project.json'))) {
26
- yield (0, generator_1.default)(tree, {
27
- name: shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME,
28
- directory: shared_constructs_constants_1.PACKAGES_DIR,
29
- subDirectory: shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR,
30
- });
31
- tree.delete((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'));
32
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'), {
33
- npmScopePrefix,
34
- scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix),
35
- tags: (_b = (_a = (yield (0, utils_1.readAwsNxPluginConfig)(tree))) === null || _a === void 0 ? void 0 : _a.tags) !== null && _b !== void 0 ? _b : [],
36
- }, {
37
- overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
38
- });
39
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR), {
40
- fullyQualifiedName: `${npmScopePrefix}${shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME}`,
41
- name: shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME,
42
- pkgMgrCmd: (0, pkg_manager_1.getPackageManagerDisplayCommands)().exec,
43
- }, {
44
- overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
45
- });
46
- (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['constructs', 'aws-cdk-lib']), (0, versions_1.withVersions)(['@types/node']));
47
- yield (0, format_1.formatFilesInSubtree)(tree);
48
- }
18
+ async function sharedConstructsGenerator(tree, options) {
19
+ const { iacProvider } = options;
20
+ const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
21
+ updateGitignore(tree);
22
+ if (iacProvider === 'CDK') {
23
+ if (!tree.exists((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'project.json'))) {
24
+ await (0, generator_1.default)(tree, {
25
+ name: shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME,
26
+ directory: shared_constructs_constants_1.PACKAGES_DIR,
27
+ subDirectory: shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR,
28
+ });
29
+ tree.delete((0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'));
30
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src'), {
31
+ npmScopePrefix,
32
+ scopeAlias: (0, npm_scope_1.toScopeAlias)(npmScopePrefix),
33
+ tags: (await (0, utils_1.readAwsNxPluginConfig)(tree))?.tags ?? [],
34
+ }, {
35
+ overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
36
+ });
37
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR), {
38
+ fullyQualifiedName: `${npmScopePrefix}${shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME}`,
39
+ name: shared_constructs_constants_1.SHARED_CONSTRUCTS_NAME,
40
+ pkgMgrCmd: (0, pkg_manager_1.getPackageManagerDisplayCommands)().exec,
41
+ }, {
42
+ overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
43
+ });
44
+ (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)(['constructs', 'aws-cdk-lib']), (0, versions_1.withVersions)(['@types/node']));
45
+ await (0, format_1.formatFilesInSubtree)(tree);
49
46
  }
50
- // Handle Terraform provider
51
- if (iacProvider === 'Terraform') {
52
- const terraformLibPath = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR);
53
- if (!tree.exists((0, devkit_1.joinPathFragments)(terraformLibPath, 'project.json'))) {
54
- yield (0, generator_2.default)(tree, {
55
- name: shared_constructs_constants_1.SHARED_TERRAFORM_NAME,
56
- directory: (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, 'common'),
57
- type: 'library',
58
- });
59
- // Add target to reset runtime config as part of the build, ensuring any plan/apply target
60
- // which depends on shared terraform will build runtime-config.json from scratch, meaning no old
61
- // values will remain when resources are removed.
62
- // NB: runtime-config.json starts as an empty object to keep the reader terraform module simple
63
- (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'project.json'), (projectConfig) => {
64
- var _a, _b, _c;
65
- var _d;
66
- (_a = projectConfig.targets) !== null && _a !== void 0 ? _a : (projectConfig.targets = {});
67
- projectConfig.targets['reset-runtime-config'] = {
68
- executor: 'nx:run-commands',
69
- options: {
70
- command: "node -e \"const fs=require('fs');fs.mkdirSync(process.env.DIST_DIR,{recursive:true});fs.writeFileSync(process.env.DIST_DIR+'/runtime-config.json','{}');\"",
71
- env: {
72
- DIST_DIR: 'dist/{projectRoot}',
73
- },
47
+ }
48
+ // Handle Terraform provider
49
+ if (iacProvider === 'Terraform') {
50
+ const terraformLibPath = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR);
51
+ if (!tree.exists((0, devkit_1.joinPathFragments)(terraformLibPath, 'project.json'))) {
52
+ await (0, generator_2.default)(tree, {
53
+ name: shared_constructs_constants_1.SHARED_TERRAFORM_NAME,
54
+ directory: (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, 'common'),
55
+ type: 'library',
56
+ });
57
+ // Add target to reset runtime config as part of the build, ensuring any plan/apply target
58
+ // which depends on shared terraform will build runtime-config.json from scratch, meaning no old
59
+ // values will remain when resources are removed.
60
+ // NB: runtime-config.json starts as an empty object to keep the reader terraform module simple
61
+ (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_TERRAFORM_DIR, 'project.json'), (projectConfig) => {
62
+ projectConfig.targets ??= {};
63
+ projectConfig.targets['reset-runtime-config'] = {
64
+ executor: 'nx:run-commands',
65
+ options: {
66
+ command: "node -e \"const fs=require('fs');fs.mkdirSync(process.env.DIST_DIR,{recursive:true});fs.writeFileSync(process.env.DIST_DIR+'/runtime-config.json','{}');\"",
67
+ env: {
68
+ DIST_DIR: 'dist/{projectRoot}',
74
69
  },
75
- };
76
- (_b = (_d = projectConfig.targets).build) !== null && _b !== void 0 ? _b : (_d.build = {});
77
- projectConfig.targets.build.dependsOn = [
78
- ...((_c = projectConfig.targets.build.dependsOn) !== null && _c !== void 0 ? _c : []).filter((t) => t !== 'reset-runtime-config'),
79
- 'reset-runtime-config',
80
- ];
81
- return projectConfig;
82
- });
83
- tree.delete((0, devkit_1.joinPathFragments)(terraformLibPath, 'src', 'main.tf'));
84
- // Create the metrics.tf file with empty initial values
85
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform'), terraformLibPath, {}, {
86
- overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
87
- });
88
- yield (0, format_1.formatFilesInSubtree)(tree);
89
- }
70
+ },
71
+ };
72
+ projectConfig.targets.build ??= {};
73
+ projectConfig.targets.build.dependsOn = [
74
+ ...(projectConfig.targets.build.dependsOn ?? []).filter((t) => t !== 'reset-runtime-config'),
75
+ 'reset-runtime-config',
76
+ ];
77
+ return projectConfig;
78
+ });
79
+ tree.delete((0, devkit_1.joinPathFragments)(terraformLibPath, 'src', 'main.tf'));
80
+ // Create the metrics.tf file with empty initial values
81
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'terraform'), terraformLibPath, {}, {
82
+ overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
83
+ });
84
+ await (0, format_1.formatFilesInSubtree)(tree);
90
85
  }
91
- });
86
+ }
92
87
  }
93
88
  const updateGitignore = (tree) => {
94
89
  const gitignore = tree.exists('.gitignore')
95
90
  ? tree.read('.gitignore', 'utf-8')
96
91
  : '';
97
92
  const regex = /runtime-config.json/gm;
98
- const hasRuntimeConfig = regex.test(gitignore !== null && gitignore !== void 0 ? gitignore : '');
93
+ const hasRuntimeConfig = regex.test(gitignore ?? '');
99
94
  if (hasRuntimeConfig) {
100
95
  return;
101
96
  }
@@ -1 +1 @@
1
- {"version":3,"file":"shared-constructs.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"shared-constructs.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-constructs.ts"],"names":[],"mappings":"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"}
@@ -17,32 +17,30 @@ const shared_constructs_constants_1 = require("./shared-constructs-constants");
17
17
  * Contains stage configuration types and the user's stage-to-credential mappings.
18
18
  * Importable from any package via ts project references.
19
19
  */
20
- function sharedInfraConfigGenerator(tree) {
21
- return tslib_1.__awaiter(this, void 0, void 0, function* () {
22
- const configDir = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_INFRA_CONFIG_DIR);
23
- // Don't recreate if it already exists
24
- if (tree.exists((0, devkit_1.joinPathFragments)(configDir, 'project.json'))) {
25
- return;
26
- }
27
- const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
28
- const displayCmds = (0, pkg_manager_1.getPackageManagerDisplayCommands)();
29
- yield (0, generator_1.default)(tree, {
30
- name: shared_constructs_constants_1.SHARED_INFRA_CONFIG_NAME,
31
- directory: shared_constructs_constants_1.PACKAGES_DIR,
32
- subDirectory: shared_constructs_constants_1.SHARED_INFRA_CONFIG_DIR,
33
- });
34
- // Replace default src/ with our templates
35
- tree.delete((0, devkit_1.joinPathFragments)(configDir, 'src'));
36
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_INFRA_CONFIG_DIR, 'src'), (0, devkit_1.joinPathFragments)(configDir, 'src'), {
37
- pkgMgrRunNx: `${displayCmds.exec} nx`,
38
- }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
39
- // Generate README
40
- (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), configDir, {
41
- fullyQualifiedName: `${npmScopePrefix}${shared_constructs_constants_1.SHARED_INFRA_CONFIG_NAME}`,
42
- name: shared_constructs_constants_1.SHARED_INFRA_CONFIG_NAME,
43
- pkgMgrCmd: displayCmds.exec,
44
- }, { overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite });
45
- yield (0, format_1.formatFilesInSubtree)(tree);
20
+ async function sharedInfraConfigGenerator(tree) {
21
+ const configDir = (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_INFRA_CONFIG_DIR);
22
+ // Don't recreate if it already exists
23
+ if (tree.exists((0, devkit_1.joinPathFragments)(configDir, 'project.json'))) {
24
+ return;
25
+ }
26
+ const npmScopePrefix = (0, npm_scope_1.getNpmScopePrefix)(tree);
27
+ const displayCmds = (0, pkg_manager_1.getPackageManagerDisplayCommands)();
28
+ await (0, generator_1.default)(tree, {
29
+ name: shared_constructs_constants_1.SHARED_INFRA_CONFIG_NAME,
30
+ directory: shared_constructs_constants_1.PACKAGES_DIR,
31
+ subDirectory: shared_constructs_constants_1.SHARED_INFRA_CONFIG_DIR,
46
32
  });
33
+ // Replace default src/ with our templates
34
+ tree.delete((0, devkit_1.joinPathFragments)(configDir, 'src'));
35
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_INFRA_CONFIG_DIR, 'src'), (0, devkit_1.joinPathFragments)(configDir, 'src'), {
36
+ pkgMgrRunNx: `${displayCmds.exec} nx`,
37
+ }, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
38
+ // Generate README
39
+ (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'common', 'readme'), configDir, {
40
+ fullyQualifiedName: `${npmScopePrefix}${shared_constructs_constants_1.SHARED_INFRA_CONFIG_NAME}`,
41
+ name: shared_constructs_constants_1.SHARED_INFRA_CONFIG_NAME,
42
+ pkgMgrCmd: displayCmds.exec,
43
+ }, { overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite });
44
+ await (0, format_1.formatFilesInSubtree)(tree);
47
45
  }
48
46
  //# sourceMappingURL=shared-infra-config.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"shared-infra-config.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-infra-config.ts"],"names":[],"mappings":";;AAyBA,gEA2CC;;AApED;;;GAGG;AACH,uCAKoB;AACpB,2CAAgD;AAChD,4EAAqD;AACrD,qCAAgD;AAChD,+CAAiE;AACjE,+EAIuC;AAEvC;;;;GAIG;AACH,SAAsB,0BAA0B,CAAC,IAAU;;QACzD,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,0CAAY,EAAE,qDAAuB,CAAC,CAAC;QAE3E,sCAAsC;QACtC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;YAC9D,OAAO;QACT,CAAC;QAED,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,WAAW,GAAG,IAAA,8CAAgC,GAAE,CAAC;QAEvD,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,sDAAwB;YAC9B,SAAS,EAAE,0CAAY;YACvB,YAAY,EAAE,qDAAuB;SACtC,CAAC,CAAC;QAEH,0CAA0C;QAC1C,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACjD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,qDAAuB,EAAE,KAAK,CAAC,EACrE,IAAA,0BAAiB,EAAC,SAAS,EAAE,KAAK,CAAC,EACnC;YACE,WAAW,EAAE,GAAG,WAAW,CAAC,IAAI,KAAK;SACtC,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;QAEF,kBAAkB;QAClB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACzD,SAAS,EACT;YACE,kBAAkB,EAAE,GAAG,cAAc,GAAG,sDAAwB,EAAE;YAClE,IAAI,EAAE,sDAAwB;YAC9B,SAAS,EAAE,WAAW,CAAC,IAAI;SAC5B,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS,EAAE,CACnD,CAAC;QAEF,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACnC,CAAC;CAAA"}
1
+ {"version":3,"file":"shared-infra-config.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/shared-infra-config.ts"],"names":[],"mappings":";;AAyBA,gEA2CC;;AApED;;;GAGG;AACH,uCAKoB;AACpB,2CAAgD;AAChD,4EAAqD;AACrD,qCAAgD;AAChD,+CAAiE;AACjE,+EAIuC;AAEvC;;;;GAIG;AACI,KAAK,UAAU,0BAA0B,CAAC,IAAU;IACzD,MAAM,SAAS,GAAG,IAAA,0BAAiB,EAAC,0CAAY,EAAE,qDAAuB,CAAC,CAAC;IAE3E,sCAAsC;IACtC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;QAC9D,OAAO;IACT,CAAC;IAED,MAAM,cAAc,GAAG,IAAA,6BAAiB,EAAC,IAAI,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAG,IAAA,8CAAgC,GAAE,CAAC;IAEvD,MAAM,IAAA,mBAAkB,EAAC,IAAI,EAAE;QAC7B,IAAI,EAAE,sDAAwB;QAC9B,SAAS,EAAE,0CAAY;QACvB,YAAY,EAAE,qDAAuB;KACtC,CAAC,CAAC;IAEH,0CAA0C;IAC1C,IAAI,CAAC,MAAM,CAAC,IAAA,0BAAiB,EAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;IACjD,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,qDAAuB,EAAE,KAAK,CAAC,EACrE,IAAA,0BAAiB,EAAC,SAAS,EAAE,KAAK,CAAC,EACnC;QACE,WAAW,EAAE,GAAG,WAAW,CAAC,IAAI,KAAK;KACtC,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,YAAY,EAAE,CACtD,CAAC;IAEF,kBAAkB;IAClB,IAAA,sBAAa,EACX,IAAI,EACJ,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,EACzD,SAAS,EACT;QACE,kBAAkB,EAAE,GAAG,cAAc,GAAG,sDAAwB,EAAE;QAClE,IAAI,EAAE,sDAAwB;QAC9B,SAAS,EAAE,WAAW,CAAC,IAAI;KAC5B,EACD,EAAE,iBAAiB,EAAE,0BAAiB,CAAC,SAAS,EAAE,CACnD,CAAC;IAEF,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;AACnC,CAAC"}