@aws/nx-plugin 1.0.0-rc.45 → 1.0.0-rc.47

package/LICENSE-THIRD-PARTY

@@ -3297,7 +3297,7 @@ SOFTWARE.
 
 ---
 
-The following software may be included in this product: @emnapi/core (1.11.1)
+The following software may be included in this product: @emnapi/core (1.11.2)
 This software contains the following license and notice below:
 
 MIT License
@@ -3351,7 +3351,7 @@ SOFTWARE.
 
 ---
 
-The following software may be included in this product: @emnapi/runtime (1.11.1)
+The following software may be included in this product: @emnapi/runtime (1.11.2)
 This software contains the following license and notice below:
 
 MIT License
@@ -12944,7 +12944,7 @@ THE SOFTWARE.
 
 ---
 
-The following software may be included in this product: enhanced-resolve (5.21.6)
+The following software may be included in this product: enhanced-resolve (5.24.2)
 This software contains the following license and notice below:
 
 Copyright JS Foundation and other contributors
@@ -25979,21 +25979,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---
 
-The following software may be included in this product: supports-color (10.2.2)
-This software contains the following license and notice below:
-
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (https://sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
 The following software may be included in this product: supports-preserve-symlinks-flag (1.0.0)
 This software contains the following license and notice below:
 
@@ -40255,48 +40240,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ---
 
-The following software may be included in this product: semver (7.8.0)
-This software contains the following license and notice below:
-
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
----
-
-The following software may be included in this product: semver (7.8.2)
-This software contains the following license and notice below:
-
-The ISC License
-
-Copyright (c) Isaac Z. Schlueter and Contributors
-
-Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
-IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
----
-
 The following software may be included in this product: semver (7.8.4)
 This software contains the following license and notice below:
 

package/generators.json

@@ -7,7 +7,7 @@
       "factory": "./src/init/generator",
       "schema": "./src/init/schema.json",
       "description": "Configure an existing Nx workspace to use the @aws/nx-plugin",
-      "metric": "g57",
+      "metric": "g66",
       "guidePages": ["existing-project"]
     },
     "agentcore-gateway": {
@@ -27,7 +27,7 @@
       "factory": "./src/agentcore-gateway/gateway-connection/generator",
       "schema": "./src/agentcore-gateway/gateway-connection/schema.json",
       "description": "Connect an AgentCore Gateway to another AgentCore Gateway",
-      "metric": "g52",
+      "metric": "g65",
       "hidden": true
     },
     "connection": {
@@ -215,7 +215,7 @@
       "factory": "./src/ts/dcr-proxy/generator",
       "schema": "./src/ts/dcr-proxy/schema.json",
       "description": "Generate an OAuth Dynamic Client Registration (DCR) proxy construct for Cognito-authenticated MCP servers",
-      "metric": "g56"
+      "metric": "g67"
     },
     "ts#mcp-server": {
       "factory": "./src/ts/mcp-server/generator",
@@ -248,7 +248,7 @@
       "factory": "./src/ts/website/app/generator",
       "schema": "./src/ts/website/app/schema.json",
       "description": "Generates a website application",
-      "metric": "g43",
+      "metric": "g60",
       "guidePages": ["website", "react-website"]
     },
     "ts#website#auth": {
@@ -340,7 +340,7 @@
     "ts#sync": {
       "factory": "./src/ts/sync/generator",
       "schema": "./src/ts/sync/schema.json",
-      "description": "TypeScript path alias sync generator",
+      "description": "TypeScript path alias and local workspace dependency sync generator",
       "metric": "g29",
       "hidden": true
     },
@@ -405,27 +405,27 @@
       "factory": "./src/ts/dynamodb/generator",
       "schema": "./src/ts/dynamodb/schema.json",
       "description": "Create a TypeScript DynamoDB project",
-      "metric": "g43"
+      "metric": "g61"
     },
     "ts#dynamodb#trpc-connection": {
       "factory": "./src/ts/dynamodb/trpc-connection/generator",
       "schema": "./src/ts/dynamodb/trpc-connection/schema.json",
       "description": "Connect a ts#trpc-api project to a ts#dynamodb project",
-      "metric": "g44",
+      "metric": "g62",
       "hidden": true
     },
     "ts#dynamodb#smithy-connection": {
       "factory": "./src/ts/dynamodb/smithy-connection/generator",
       "schema": "./src/ts/dynamodb/smithy-connection/schema.json",
       "description": "Connect a Smithy backend to a ts#dynamodb project",
-      "metric": "g45",
+      "metric": "g63",
       "hidden": true
     },
     "ts#dynamodb#agent-connection": {
       "factory": "./src/ts/dynamodb/agent-connection/generator",
       "schema": "./src/ts/dynamodb/agent-connection/schema.json",
       "description": "Connect a ts#agent to a ts#dynamodb project",
-      "metric": "g46",
+      "metric": "g64",
       "hidden": true
     },
     "ts#dynamodb#mcp-server-connection": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "1.0.0-rc.45",
+  "version": "1.0.0-rc.47",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",
@@ -49,11 +49,11 @@
     "@nx/js": "23.1.0",
     "@nx/react": "23.1.0",
     "@nx/vite": "23.1.0",
+    "@nxlv/python": "22.2.2",
+    "@phenomnomnominal/tsquery": "6.2.0",
     "@types/estree": "1.0.9",
     "@types/js-yaml": "4.0.9",
     "@types/mdast": "4.0.4",
-    "@nxlv/python": "22.2.2",
-    "@phenomnomnominal/tsquery": "6.2.0",
     "enquirer": "2.4.1",
     "fast-glob": "3.3.3",
     "jiti": "2.7.0",
@@ -73,6 +73,7 @@
     "remark-mdx": "3.1.1",
     "remark-parse": "11.0.0",
     "remark-stringify": "11.0.0",
+    "semver": "7.8.5",
     "spdx-satisfies": "6.0.0",
     "typescript": "6.0.3",
     "unified": "11.0.5",
@@ -80,5 +81,8 @@
     "vite": "8.1.5",
     "vitest": "4.1.10",
     "zod": "4.4.3"
+  },
+  "devDependencies": {
+    "@types/semver": "7.7.1"
   }
 }

package/src/agentcore-gateway/generator.js

@@ -1,8 +1,9 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { addDependenciesToPackageJson, addProjectConfiguration, generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
+ */ import { addProjectConfiguration, generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
 import { addAgentCoreGatewayInfra } from "../utils/agent-core-constructs/agent-core-constructs.js";
+import { addDependenciesToPackageJson } from "../utils/dependencies.js";
 import { formatFilesInSubtree } from "../utils/format.js";
 import { resolveIac } from "../utils/iac.js";
 import { installDependencies } from "../utils/install.js";
@@ -11,6 +12,7 @@ import { kebabCase, toClassName } from "../utils/names.js";
 import { getNpmScopePrefix } from "../utils/npm-scope.js";
 import { addGeneratorMetadata, getGeneratorInfo, projectExists, readProjectConfigurationUnqualified } from "../utils/nx.js";
 import { assignPort } from "../utils/port.js";
+import { ensureProjectPackageJson } from "../utils/project-package-json.js";
 import { sharedConstructsGenerator } from "../utils/shared-constructs.js";
 import { withVersions } from "../utils/versions.js";
 export const AGENTCORE_GATEWAY_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
@@ -68,6 +70,12 @@ export const agentcoreGatewayGenerator = async (tree, options)=>{
         });
         project = readProjectConfigurationUnqualified(tree, fullyQualifiedName);
     }
+    // Ensure the project has its own package.json so its runtime dependencies
+    // (added below) are declared in it rather than the workspace root.
+    ensureProjectPackageJson(tree, {
+        dir: projectRoot,
+        fullyQualifiedName
+    });
     const port = assignPort(tree, project, 8100);
     // A gateway is its own standalone project, so it uses plain `serve` / `dev`
     // targets. Re-run: keep existing targets (their dependsOn may have been
@@ -109,10 +117,12 @@ export const agentcoreGatewayGenerator = async (tree, options)=>{
         '@modelcontextprotocol/sdk',
         'express'
     ]), withVersions([
-        'tsx',
         '@types/express',
         'ejs',
         '@types/ejs'
+    ]), joinPathFragments(projectRoot, 'package.json'));
+    addDependenciesToPackageJson(tree, {}, withVersions([
+        'tsx'
     ]));
     // Wire up infra (CDK or Terraform); re-running with infra=agentcore adds
     // the infrastructure to a previously infra-less gateway.

package/src/agentcore-gateway/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../packages/nx-plugin/src/agentcore-gateway/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  addProjectConfiguration,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addAgentCoreGatewayInfra } from '../utils/agent-core-constructs/agent-core-constructs';\nimport { formatFilesInSubtree } from '../utils/format';\nimport { resolveIac } from '../utils/iac';\nimport { installDependencies } from '../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../utils/metrics';\nimport { kebabCase, toClassName } from '../utils/names';\nimport { getNpmScopePrefix } from '../utils/npm-scope';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n  readProjectConfigurationUnqualified,\n} from '../utils/nx';\nimport { assignPort } from '../utils/port';\nimport { sharedConstructsGenerator } from '../utils/shared-constructs';\nimport { withVersions } from '../utils/versions';\nimport type { AgentcoreGatewayGeneratorSchema } from './schema';\n\nexport const AGENTCORE_GATEWAY_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const agentcoreGatewayGenerator = async (\n  tree: Tree,\n  options: AgentcoreGatewayGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const name = kebabCase(options.name);\n  const nameClassName = toClassName(name);\n  const parentDir = options.directory ?? 'packages';\n  const subDir = options.subDirectory ?? name;\n  const projectRoot = joinPathFragments(parentDir, subDir);\n  const fullyQualifiedName = `${getNpmScopePrefix(tree)}${name}`;\n\n  // Protocol is fixed to mcp — the enum accepts only this value, but we still\n  // persist the resolved value in metadata so connection generators can read\n  // it uniformly (and future additions are non-breaking).\n  const protocol = options.protocol ?? 'mcp';\n  // Inbound auth is iam (default) or cognito. Persisted in metadata so\n  // connection generators can validate it (agent -> gateway connections\n  // require an IAM gateway).\n  const auth = options.auth ?? 'iam';\n  const cedarPolicy = options.cedarPolicy ?? true;\n  const infra = options.infra ?? 'agentcore';\n\n  // local-dev.ts is the local gateway: a continuous MCP aggregator chaining\n  // onto attached MCP servers' dev targets (added by the mcp-connection\n  // generator), so a single `nx dev <gateway>` boots the gateway and every\n  // attached MCP server together.\n  //\n  // `serve` exists for parity with other generators; the deployed Gateway is\n  // a managed AWS resource, so `serve`-mode agents talk to it via runtime\n  // config and the local gateway sits idle.\n  const localGatewayTarget = (port: number) => ({\n    executor: 'nx:run-commands' as const,\n    continuous: true,\n    options: {\n      command: 'tsx local-dev.ts',\n      cwd: '{projectRoot}',\n      env: { PORT: `${port}` },\n    },\n    dependsOn: [] as Array<string | { projects: string[]; target: string }>,\n  });\n  let project: ProjectConfiguration;\n  if (projectExists(tree, fullyQualifiedName)) {\n    project = readProjectConfigurationUnqualified(tree, fullyQualifiedName);\n  } else {\n    addProjectConfiguration(tree, fullyQualifiedName, {\n      name: fullyQualifiedName,\n      root: projectRoot,\n      projectType: 'library',\n      sourceRoot: projectRoot,\n      tags: [],\n      targets: {},\n      metadata: {\n        generator: AGENTCORE_GATEWAY_GENERATOR_INFO.id,\n      } as any,\n    });\n    project = readProjectConfigurationUnqualified(tree, fullyQualifiedName);\n  }\n  const port = assignPort(tree, project, 8100);\n  // A gateway is its own standalone project, so it uses plain `serve` / `dev`\n  // targets. Re-run: keep existing targets (their dependsOn may have been\n  // populated by the mcp-connection generator), just ensure both exist.\n  project.targets ??= {};\n  project.targets['serve'] ??= localGatewayTarget(port);\n  project.targets['dev'] ??= localGatewayTarget(port);\n  updateProjectConfiguration(tree, project.name, project);\n\n  // Scaffold the gateway project: local-dev.ts (+ Cedar policies if requested)\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'project'),\n    projectRoot,\n    { nameClassName, nameKebabCase: name, port, attachedMcpServers: [] },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n  if (cedarPolicy) {\n    // The default permit-all policy differs by auth type: AgentCore represents\n    // IAM callers as `AgentCore::IamEntity` and Cognito/JWT callers as\n    // `AgentCore::OAuthUser`, so the two policies match different principals.\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'cedar'),\n      projectRoot,\n      { nameClassName, auth },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n  }\n\n  addGeneratorMetadata(\n    tree,\n    fullyQualifiedName,\n    AGENTCORE_GATEWAY_GENERATOR_INFO,\n    {\n      name,\n      rc: nameClassName,\n      protocol,\n      auth,\n      port,\n    },\n  );\n\n  // local-dev.ts dependencies (+ ejs for Cedar policy rendering in the\n  // shared gateway construct)\n  addDependenciesToPackageJson(\n    tree,\n    withVersions(['@modelcontextprotocol/sdk', 'express']),\n    withVersions(['tsx', '@types/express', 'ejs', '@types/ejs']),\n  );\n\n  // Wire up infra (CDK or Terraform); re-running with infra=agentcore adds\n  // the infrastructure to a previously infra-less gateway.\n  if (infra === 'agentcore') {\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n\n    await addAgentCoreGatewayInfra(tree, {\n      gatewayNameClassName: nameClassName,\n      gatewayNameKebabCase: name,\n      projectName: fullyQualifiedName,\n      projectDirectory: projectRoot,\n      cedarPolicy,\n      auth,\n      iac,\n    });\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    AGENTCORE_GATEWAY_GENERATOR_INFO,\n  ]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\n/**\n * Gateway details stored in the gateway project's metadata.\n */\nexport interface AgentCoreGatewayMetadata {\n  name: string;\n  rc: string;\n  protocol: string;\n  auth: string;\n  port: number;\n}\n\n/**\n * Read a gateway project's metadata, validating it was generated by the\n * agentcore-gateway generator.\n */\nexport const readAgentCoreGatewayMetadata = (\n  project: ProjectConfiguration,\n): AgentCoreGatewayMetadata => {\n  const metadata = project.metadata as any;\n  if (metadata?.generator !== AGENTCORE_GATEWAY_GENERATOR_INFO.id) {\n    throw new Error(\n      `Project '${project.name}' was not generated by the '${AGENTCORE_GATEWAY_GENERATOR_INFO.id}' generator.`,\n    );\n  }\n  return metadata as AgentCoreGatewayMetadata;\n};\n\nexport default agentcoreGatewayGenerator;\n"],"names":["addDependenciesToPackageJson","addProjectConfiguration","generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","addAgentCoreGatewayInfra","formatFilesInSubtree","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","kebabCase","toClassName","getNpmScopePrefix","addGeneratorMetadata","getGeneratorInfo","projectExists","readProjectConfigurationUnqualified","assignPort","sharedConstructsGenerator","withVersions","AGENTCORE_GATEWAY_GENERATOR_INFO","filename","agentcoreGatewayGenerator","tree","options","name","nameClassName","parentDir","directory","subDir","subDirectory","projectRoot","fullyQualifiedName","protocol","auth","cedarPolicy","infra","localGatewayTarget","port","executor","continuous","command","cwd","env","PORT","dependsOn","project","root","projectType","sourceRoot","tags","targets","metadata","generator","id","dirname","nameKebabCase","attachedMcpServers","overwriteStrategy","KeepExisting","rc","iac","gatewayNameClassName","gatewayNameKebabCase","projectName","projectDirectory","preferInstallDependencies","languages","readAgentCoreGatewayMetadata","Error"],"mappings":"AAAA;;;CAGC,GACD,SACEA,4BAA4B,EAC5BC,uBAAuB,EAEvBC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAGjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,wBAAwB,QAAQ,0DAAuD;AAChG,SAASC,oBAAoB,QAAQ,qBAAkB;AACvD,SAASC,UAAU,QAAQ,kBAAe;AAC1C,SAASC,mBAAmB,QAAQ,sBAAmB;AACvD,SAASC,+BAA+B,QAAQ,sBAAmB;AACnE,SAASC,SAAS,EAAEC,WAAW,QAAQ,oBAAiB;AACxD,SAASC,iBAAiB,QAAQ,wBAAqB;AACvD,SACEC,oBAAoB,EACpBC,gBAAgB,EAEhBC,aAAa,EACbC,mCAAmC,QAC9B,iBAAc;AACrB,SAASC,UAAU,QAAQ,mBAAgB;AAC3C,SAASC,yBAAyB,QAAQ,gCAA6B;AACvE,SAASC,YAAY,QAAQ,uBAAoB;AAGjD,OAAO,MAAMC,mCACXN,iBAAiB,YAAYO,QAAQ,EAAE;AAEzC,OAAO,MAAMC,4BAA4B,OACvCC,MACAC;IAEA,MAAMC,OAAOf,UAAUc,QAAQC,IAAI;IACnC,MAAMC,gBAAgBf,YAAYc;IAClC,MAAME,YAAYH,QAAQI,SAAS,IAAI;IACvC,MAAMC,SAASL,QAAQM,YAAY,IAAIL;IACvC,MAAMM,cAAc7B,kBAAkByB,WAAWE;IACjD,MAAMG,qBAAqB,GAAGpB,kBAAkBW,QAAQE,MAAM;IAE9D,4EAA4E;IAC5E,2EAA2E;IAC3E,wDAAwD;IACxD,MAAMQ,WAAWT,QAAQS,QAAQ,IAAI;IACrC,qEAAqE;IACrE,sEAAsE;IACtE,2BAA2B;IAC3B,MAAMC,OAAOV,QAAQU,IAAI,IAAI;IAC7B,MAAMC,cAAcX,QAAQW,WAAW,IAAI;IAC3C,MAAMC,QAAQZ,QAAQY,KAAK,IAAI;IAE/B,0EAA0E;IAC1E,sEAAsE;IACtE,yEAAyE;IACzE,gCAAgC;IAChC,EAAE;IACF,2EAA2E;IAC3E,wEAAwE;IACxE,0CAA0C;IAC1C,MAAMC,qBAAqB,CAACC,OAAkB,CAAA;YAC5CC,UAAU;YACVC,YAAY;YACZhB,SAAS;gBACPiB,SAAS;gBACTC,KAAK;gBACLC,KAAK;oBAAEC,MAAM,GAAGN,MAAM;gBAAC;YACzB;YACAO,WAAW,EAAE;QACf,CAAA;IACA,IAAIC;IACJ,IAAI/B,cAAcQ,MAAMS,qBAAqB;QAC3Cc,UAAU9B,oCAAoCO,MAAMS;IACtD,OAAO;QACLhC,wBAAwBuB,MAAMS,oBAAoB;YAChDP,MAAMO;YACNe,MAAMhB;YACNiB,aAAa;YACbC,YAAYlB;YACZmB,MAAM,EAAE;YACRC,SAAS,CAAC;YACVC,UAAU;gBACRC,WAAWjC,iCAAiCkC,EAAE;YAChD;QACF;QACAR,UAAU9B,oCAAoCO,MAAMS;IACtD;IACA,MAAMM,OAAOrB,WAAWM,MAAMuB,SAAS;IACvC,4EAA4E;IAC5E,wEAAwE;IACxE,sEAAsE;IACtEA,QAAQK,OAAO,KAAK,CAAC;IACrBL,QAAQK,OAAO,CAAC,QAAQ,KAAKd,mBAAmBC;IAChDQ,QAAQK,OAAO,CAAC,MAAM,KAAKd,mBAAmBC;IAC9ClC,2BAA2BmB,MAAMuB,QAAQrB,IAAI,EAAEqB;IAE/C,6EAA6E;IAC7E7C,cACEsB,MACArB,kBAAkB,YAAYqD,OAAO,EAAE,SAAS,YAChDxB,aACA;QAAEL;QAAe8B,eAAe/B;QAAMa;QAAMmB,oBAAoB,EAAE;IAAC,GACnE;QAAEC,mBAAmBvD,kBAAkBwD,YAAY;IAAC;IAEtD,IAAIxB,aAAa;QACf,2EAA2E;QAC3E,mEAAmE;QACnE,0EAA0E;QAC1ElC,cACEsB,MACArB,kBAAkB,YAAYqD,OAAO,EAAE,SAAS,UAChDxB,aACA;YAAEL;YAAeQ;QAAK,GACtB;YAAEwB,mBAAmBvD,kBAAkBwD,YAAY;QAAC;IAExD;IAEA9C,qBACEU,MACAS,oBACAZ,kCACA;QACEK;QACAmC,IAAIlC;QACJO;QACAC;QACAI;IACF;IAGF,qEAAqE;IACrE,4BAA4B;IAC5BvC,6BACEwB,MACAJ,aAAa;QAAC;QAA6B;KAAU,GACrDA,aAAa;QAAC;QAAO;QAAkB;QAAO;KAAa;IAG7D,yEAAyE;IACzE,yDAAyD;IACzD,IAAIiB,UAAU,aAAa;QACzB,MAAMyB,MAAM,MAAMtD,WAAWgB,MAAMC,QAAQqC,GAAG;QAC9C,MAAM3C,0BAA0BK,MAAM;YAAEsC;QAAI;QAE5C,MAAMxD,yBAAyBkB,MAAM;YACnCuC,sBAAsBpC;YACtBqC,sBAAsBtC;YACtBuC,aAAahC;YACbiC,kBAAkBlC;YAClBI;YACAD;YACA2B;QACF;IACF;IAEA,MAAMpD,gCAAgCc,MAAM;QAC1CH;KACD;IAED,MAAMd,qBAAqBiB;IAC3B,OAAO,IACLf,oBAAoBe,MAAMC,QAAQ0C,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAaF;;;CAGC,GACD,OAAO,MAAMC,+BAA+B,CAC1CtB;IAEA,MAAMM,WAAWN,QAAQM,QAAQ;IACjC,IAAIA,UAAUC,cAAcjC,iCAAiCkC,EAAE,EAAE;QAC/D,MAAM,IAAIe,MACR,CAAC,SAAS,EAAEvB,QAAQrB,IAAI,CAAC,4BAA4B,EAAEL,iCAAiCkC,EAAE,CAAC,YAAY,CAAC;IAE5G;IACA,OAAOF;AACT,EAAE;AAEF,eAAe9B,0BAA0B"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/agentcore-gateway/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addProjectConfiguration,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { addAgentCoreGatewayInfra } from '../utils/agent-core-constructs/agent-core-constructs';\nimport { addDependenciesToPackageJson } from '../utils/dependencies';\nimport { formatFilesInSubtree } from '../utils/format';\nimport { resolveIac } from '../utils/iac';\nimport { installDependencies } from '../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../utils/metrics';\nimport { kebabCase, toClassName } from '../utils/names';\nimport { getNpmScopePrefix } from '../utils/npm-scope';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n  readProjectConfigurationUnqualified,\n} from '../utils/nx';\nimport { assignPort } from '../utils/port';\nimport { ensureProjectPackageJson } from '../utils/project-package-json';\nimport { sharedConstructsGenerator } from '../utils/shared-constructs';\nimport { withVersions } from '../utils/versions';\nimport type { AgentcoreGatewayGeneratorSchema } from './schema';\n\nexport const AGENTCORE_GATEWAY_GENERATOR_INFO: NxGeneratorInfo =\n  getGeneratorInfo(import.meta.filename);\n\nexport const agentcoreGatewayGenerator = async (\n  tree: Tree,\n  options: AgentcoreGatewayGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const name = kebabCase(options.name);\n  const nameClassName = toClassName(name);\n  const parentDir = options.directory ?? 'packages';\n  const subDir = options.subDirectory ?? name;\n  const projectRoot = joinPathFragments(parentDir, subDir);\n  const fullyQualifiedName = `${getNpmScopePrefix(tree)}${name}`;\n\n  // Protocol is fixed to mcp — the enum accepts only this value, but we still\n  // persist the resolved value in metadata so connection generators can read\n  // it uniformly (and future additions are non-breaking).\n  const protocol = options.protocol ?? 'mcp';\n  // Inbound auth is iam (default) or cognito. Persisted in metadata so\n  // connection generators can validate it (agent -> gateway connections\n  // require an IAM gateway).\n  const auth = options.auth ?? 'iam';\n  const cedarPolicy = options.cedarPolicy ?? true;\n  const infra = options.infra ?? 'agentcore';\n\n  // local-dev.ts is the local gateway: a continuous MCP aggregator chaining\n  // onto attached MCP servers' dev targets (added by the mcp-connection\n  // generator), so a single `nx dev <gateway>` boots the gateway and every\n  // attached MCP server together.\n  //\n  // `serve` exists for parity with other generators; the deployed Gateway is\n  // a managed AWS resource, so `serve`-mode agents talk to it via runtime\n  // config and the local gateway sits idle.\n  const localGatewayTarget = (port: number) => ({\n    executor: 'nx:run-commands' as const,\n    continuous: true,\n    options: {\n      command: 'tsx local-dev.ts',\n      cwd: '{projectRoot}',\n      env: { PORT: `${port}` },\n    },\n    dependsOn: [] as Array<string | { projects: string[]; target: string }>,\n  });\n  let project: ProjectConfiguration;\n  if (projectExists(tree, fullyQualifiedName)) {\n    project = readProjectConfigurationUnqualified(tree, fullyQualifiedName);\n  } else {\n    addProjectConfiguration(tree, fullyQualifiedName, {\n      name: fullyQualifiedName,\n      root: projectRoot,\n      projectType: 'library',\n      sourceRoot: projectRoot,\n      tags: [],\n      targets: {},\n      metadata: {\n        generator: AGENTCORE_GATEWAY_GENERATOR_INFO.id,\n      } as any,\n    });\n    project = readProjectConfigurationUnqualified(tree, fullyQualifiedName);\n  }\n  // Ensure the project has its own package.json so its runtime dependencies\n  // (added below) are declared in it rather than the workspace root.\n  ensureProjectPackageJson(tree, {\n    dir: projectRoot,\n    fullyQualifiedName,\n  });\n  const port = assignPort(tree, project, 8100);\n  // A gateway is its own standalone project, so it uses plain `serve` / `dev`\n  // targets. Re-run: keep existing targets (their dependsOn may have been\n  // populated by the mcp-connection generator), just ensure both exist.\n  project.targets ??= {};\n  project.targets['serve'] ??= localGatewayTarget(port);\n  project.targets['dev'] ??= localGatewayTarget(port);\n  updateProjectConfiguration(tree, project.name, project);\n\n  // Scaffold the gateway project: local-dev.ts (+ Cedar policies if requested)\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'project'),\n    projectRoot,\n    { nameClassName, nameKebabCase: name, port, attachedMcpServers: [] },\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n  if (cedarPolicy) {\n    // The default permit-all policy differs by auth type: AgentCore represents\n    // IAM callers as `AgentCore::IamEntity` and Cognito/JWT callers as\n    // `AgentCore::OAuthUser`, so the two policies match different principals.\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files', 'cedar'),\n      projectRoot,\n      { nameClassName, auth },\n      { overwriteStrategy: OverwriteStrategy.KeepExisting },\n    );\n  }\n\n  addGeneratorMetadata(\n    tree,\n    fullyQualifiedName,\n    AGENTCORE_GATEWAY_GENERATOR_INFO,\n    {\n      name,\n      rc: nameClassName,\n      protocol,\n      auth,\n      port,\n    },\n  );\n\n  // local-dev.ts dependencies (+ ejs for Cedar policy rendering in the\n  // shared gateway construct)\n  addDependenciesToPackageJson(\n    tree,\n    withVersions(['@modelcontextprotocol/sdk', 'express']),\n    withVersions(['@types/express', 'ejs', '@types/ejs']),\n    joinPathFragments(projectRoot, 'package.json'),\n  );\n  addDependenciesToPackageJson(tree, {}, withVersions(['tsx']));\n\n  // Wire up infra (CDK or Terraform); re-running with infra=agentcore adds\n  // the infrastructure to a previously infra-less gateway.\n  if (infra === 'agentcore') {\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, { iac });\n\n    await addAgentCoreGatewayInfra(tree, {\n      gatewayNameClassName: nameClassName,\n      gatewayNameKebabCase: name,\n      projectName: fullyQualifiedName,\n      projectDirectory: projectRoot,\n      cedarPolicy,\n      auth,\n      iac,\n    });\n  }\n\n  await addGeneratorMetricsIfApplicable(tree, [\n    AGENTCORE_GATEWAY_GENERATOR_INFO,\n  ]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\n/**\n * Gateway details stored in the gateway project's metadata.\n */\nexport interface AgentCoreGatewayMetadata {\n  name: string;\n  rc: string;\n  protocol: string;\n  auth: string;\n  port: number;\n}\n\n/**\n * Read a gateway project's metadata, validating it was generated by the\n * agentcore-gateway generator.\n */\nexport const readAgentCoreGatewayMetadata = (\n  project: ProjectConfiguration,\n): AgentCoreGatewayMetadata => {\n  const metadata = project.metadata as any;\n  if (metadata?.generator !== AGENTCORE_GATEWAY_GENERATOR_INFO.id) {\n    throw new Error(\n      `Project '${project.name}' was not generated by the '${AGENTCORE_GATEWAY_GENERATOR_INFO.id}' generator.`,\n    );\n  }\n  return metadata as AgentCoreGatewayMetadata;\n};\n\nexport default agentcoreGatewayGenerator;\n"],"names":["addProjectConfiguration","generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","addAgentCoreGatewayInfra","addDependenciesToPackageJson","formatFilesInSubtree","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","kebabCase","toClassName","getNpmScopePrefix","addGeneratorMetadata","getGeneratorInfo","projectExists","readProjectConfigurationUnqualified","assignPort","ensureProjectPackageJson","sharedConstructsGenerator","withVersions","AGENTCORE_GATEWAY_GENERATOR_INFO","filename","agentcoreGatewayGenerator","tree","options","name","nameClassName","parentDir","directory","subDir","subDirectory","projectRoot","fullyQualifiedName","protocol","auth","cedarPolicy","infra","localGatewayTarget","port","executor","continuous","command","cwd","env","PORT","dependsOn","project","root","projectType","sourceRoot","tags","targets","metadata","generator","id","dir","dirname","nameKebabCase","attachedMcpServers","overwriteStrategy","KeepExisting","rc","iac","gatewayNameClassName","gatewayNameKebabCase","projectName","projectDirectory","preferInstallDependencies","languages","readAgentCoreGatewayMetadata","Error"],"mappings":"AAAA;;;CAGC,GACD,SACEA,uBAAuB,EAEvBC,aAAa,EACbC,iBAAiB,EACjBC,iBAAiB,EAGjBC,0BAA0B,QACrB,aAAa;AACpB,SAASC,wBAAwB,QAAQ,0DAAuD;AAChG,SAASC,4BAA4B,QAAQ,2BAAwB;AACrE,SAASC,oBAAoB,QAAQ,qBAAkB;AACvD,SAASC,UAAU,QAAQ,kBAAe;AAC1C,SAASC,mBAAmB,QAAQ,sBAAmB;AACvD,SAASC,+BAA+B,QAAQ,sBAAmB;AACnE,SAASC,SAAS,EAAEC,WAAW,QAAQ,oBAAiB;AACxD,SAASC,iBAAiB,QAAQ,wBAAqB;AACvD,SACEC,oBAAoB,EACpBC,gBAAgB,EAEhBC,aAAa,EACbC,mCAAmC,QAC9B,iBAAc;AACrB,SAASC,UAAU,QAAQ,mBAAgB;AAC3C,SAASC,wBAAwB,QAAQ,mCAAgC;AACzE,SAASC,yBAAyB,QAAQ,gCAA6B;AACvE,SAASC,YAAY,QAAQ,uBAAoB;AAGjD,OAAO,MAAMC,mCACXP,iBAAiB,YAAYQ,QAAQ,EAAE;AAEzC,OAAO,MAAMC,4BAA4B,OACvCC,MACAC;IAEA,MAAMC,OAAOhB,UAAUe,QAAQC,IAAI;IACnC,MAAMC,gBAAgBhB,YAAYe;IAClC,MAAME,YAAYH,QAAQI,SAAS,IAAI;IACvC,MAAMC,SAASL,QAAQM,YAAY,IAAIL;IACvC,MAAMM,cAAc/B,kBAAkB2B,WAAWE;IACjD,MAAMG,qBAAqB,GAAGrB,kBAAkBY,QAAQE,MAAM;IAE9D,4EAA4E;IAC5E,2EAA2E;IAC3E,wDAAwD;IACxD,MAAMQ,WAAWT,QAAQS,QAAQ,IAAI;IACrC,qEAAqE;IACrE,sEAAsE;IACtE,2BAA2B;IAC3B,MAAMC,OAAOV,QAAQU,IAAI,IAAI;IAC7B,MAAMC,cAAcX,QAAQW,WAAW,IAAI;IAC3C,MAAMC,QAAQZ,QAAQY,KAAK,IAAI;IAE/B,0EAA0E;IAC1E,sEAAsE;IACtE,yEAAyE;IACzE,gCAAgC;IAChC,EAAE;IACF,2EAA2E;IAC3E,wEAAwE;IACxE,0CAA0C;IAC1C,MAAMC,qBAAqB,CAACC,OAAkB,CAAA;YAC5CC,UAAU;YACVC,YAAY;YACZhB,SAAS;gBACPiB,SAAS;gBACTC,KAAK;gBACLC,KAAK;oBAAEC,MAAM,GAAGN,MAAM;gBAAC;YACzB;YACAO,WAAW,EAAE;QACf,CAAA;IACA,IAAIC;IACJ,IAAIhC,cAAcS,MAAMS,qBAAqB;QAC3Cc,UAAU/B,oCAAoCQ,MAAMS;IACtD,OAAO;QACLlC,wBAAwByB,MAAMS,oBAAoB;YAChDP,MAAMO;YACNe,MAAMhB;YACNiB,aAAa;YACbC,YAAYlB;YACZmB,MAAM,EAAE;YACRC,SAAS,CAAC;YACVC,UAAU;gBACRC,WAAWjC,iCAAiCkC,EAAE;YAChD;QACF;QACAR,UAAU/B,oCAAoCQ,MAAMS;IACtD;IACA,0EAA0E;IAC1E,mEAAmE;IACnEf,yBAAyBM,MAAM;QAC7BgC,KAAKxB;QACLC;IACF;IACA,MAAMM,OAAOtB,WAAWO,MAAMuB,SAAS;IACvC,4EAA4E;IAC5E,wEAAwE;IACxE,sEAAsE;IACtEA,QAAQK,OAAO,KAAK,CAAC;IACrBL,QAAQK,OAAO,CAAC,QAAQ,KAAKd,mBAAmBC;IAChDQ,QAAQK,OAAO,CAAC,MAAM,KAAKd,mBAAmBC;IAC9CpC,2BAA2BqB,MAAMuB,QAAQrB,IAAI,EAAEqB;IAE/C,6EAA6E;IAC7E/C,cACEwB,MACAvB,kBAAkB,YAAYwD,OAAO,EAAE,SAAS,YAChDzB,aACA;QAAEL;QAAe+B,eAAehC;QAAMa;QAAMoB,oBAAoB,EAAE;IAAC,GACnE;QAAEC,mBAAmB1D,kBAAkB2D,YAAY;IAAC;IAEtD,IAAIzB,aAAa;QACf,2EAA2E;QAC3E,mEAAmE;QACnE,0EAA0E;QAC1EpC,cACEwB,MACAvB,kBAAkB,YAAYwD,OAAO,EAAE,SAAS,UAChDzB,aACA;YAAEL;YAAeQ;QAAK,GACtB;YAAEyB,mBAAmB1D,kBAAkB2D,YAAY;QAAC;IAExD;IAEAhD,qBACEW,MACAS,oBACAZ,kCACA;QACEK;QACAoC,IAAInC;QACJO;QACAC;QACAI;IACF;IAGF,qEAAqE;IACrE,4BAA4B;IAC5BlC,6BACEmB,MACAJ,aAAa;QAAC;QAA6B;KAAU,GACrDA,aAAa;QAAC;QAAkB;QAAO;KAAa,GACpDnB,kBAAkB+B,aAAa;IAEjC3B,6BAA6BmB,MAAM,CAAC,GAAGJ,aAAa;QAAC;KAAM;IAE3D,yEAAyE;IACzE,yDAAyD;IACzD,IAAIiB,UAAU,aAAa;QACzB,MAAM0B,MAAM,MAAMxD,WAAWiB,MAAMC,QAAQsC,GAAG;QAC9C,MAAM5C,0BAA0BK,MAAM;YAAEuC;QAAI;QAE5C,MAAM3D,yBAAyBoB,MAAM;YACnCwC,sBAAsBrC;YACtBsC,sBAAsBvC;YACtBwC,aAAajC;YACbkC,kBAAkBnC;YAClBI;YACAD;YACA4B;QACF;IACF;IAEA,MAAMtD,gCAAgCe,MAAM;QAC1CH;KACD;IAED,MAAMf,qBAAqBkB;IAC3B,OAAO,IACLhB,oBAAoBgB,MAAMC,QAAQ2C,yBAAyB,EAAE;YAC3DC,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AAaF;;;CAGC,GACD,OAAO,MAAMC,+BAA+B,CAC1CvB;IAEA,MAAMM,WAAWN,QAAQM,QAAQ;IACjC,IAAIA,UAAUC,cAAcjC,iCAAiCkC,EAAE,EAAE;QAC/D,MAAM,IAAIgB,MACR,CAAC,SAAS,EAAExB,QAAQrB,IAAI,CAAC,4BAA4B,EAAEL,iCAAiCkC,EAAE,CAAC,YAAY,CAAC;IAE5G;IACA,OAAOF;AACT,EAAE;AAEF,eAAe9B,0BAA0B"}

package/src/infra/app/__snapshots__/generator.spec.ts.snap

@@ -1,53 +1,47 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
-{
-  "aws-cdk": "2.1132.0",
-  "aws-cdk-lib": "2.261.0",
-  "constructs": "10.7.0",
-  "esbuild": "0.28.1",
-  "source-map-support": "0.5.21",
-}
-`;
+exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `{}`;
 
 exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
 {
   "@nx/js": "23.1.0",
   "@nx/vitest": "23.1.0",
   "@swc/helpers": "~0.5.18",
-  "@types/node": "26.1.1",
-  "@vitest/coverage-v8": "4.1.10",
+  "@types/node": "catalog:",
+  "@vitest/coverage-v8": "catalog:",
+  "aws-cdk": "catalog:",
+  "esbuild": "catalog:",
   "jsdom": "^27.1.0",
-  "tsx": "4.23.1",
+  "tsx": "catalog:",
   "typescript": "~6.0.3",
-  "vite": "8.1.5",
-  "vitest": "4.1.10",
+  "vite": "catalog:",
+  "vitest": "catalog:",
 }
 `;
 
 exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
 {
-  "dependencies": {
-    "aws-cdk": "2.1132.0",
-    "aws-cdk-lib": "2.261.0",
-    "constructs": "10.7.0",
-    "esbuild": "0.28.1",
-    "source-map-support": "0.5.21",
-  },
+  "dependencies": {},
   "devDependencies": {
     "@nx/js": "23.1.0",
     "@nx/vitest": "23.1.0",
     "@swc/helpers": "~0.5.18",
-    "@types/node": "26.1.1",
-    "@vitest/coverage-v8": "4.1.10",
+    "@types/node": "catalog:",
+    "@vitest/coverage-v8": "catalog:",
+    "aws-cdk": "catalog:",
+    "esbuild": "catalog:",
     "jsdom": "^27.1.0",
-    "tsx": "4.23.1",
+    "tsx": "catalog:",
     "typescript": "~6.0.3",
-    "vite": "8.1.5",
-    "vitest": "4.1.10",
+    "vite": "catalog:",
+    "vitest": "catalog:",
   },
   "name": "@proj/source",
   "type": "module",
+  "workspaces": [
+    "packages/*",
+    "packages/common/constructs",
+  ],
 }
 `;
 
@@ -403,7 +397,7 @@ exports[`infra generator > should generate consistent file content across runs >
 }
 ",
   "src/main.ts": "import { ApplicationStage } from './stages/application-stage.js';
-import { App } from ':proj/common-constructs';
+import { App } from '@proj/common-constructs';
 
 const app = new App();
 
@@ -555,7 +549,7 @@ exports[`infra generator > should generate files with correct content > cdk-json
 
 exports[`infra generator > should generate files with correct content > main-ts 1`] = `
 "import { ApplicationStage } from './stages/application-stage.js';
-import { App } from ':proj/common-constructs';
+import { App } from '@proj/common-constructs';
 
 const app = new App();
 
@@ -642,7 +636,7 @@ exports[`infra generator > should handle custom project names correctly > custom
 }
 ",
   "src/main.ts": "import { ApplicationStage } from './stages/application-stage.js';
-import { App } from ':proj/common-constructs';
+import { App } from '@proj/common-constructs';
 
 const app = new App();
 
@@ -1044,7 +1038,7 @@ export function buildCdkCommand(
 `;
 
 exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/credentials.ts 1`] = `
-"import type { StageCredentials, StagesConfig } from ':proj/common-infra-config';
+"import type { StageCredentials, StagesConfig } from '@proj/common-infra-config';
 
 /**
  * Looks up credentials for a given project + stage combination.
@@ -1147,7 +1141,7 @@ export function describeCredentials(creds: StageCredentials): string {
 
 exports[`infra generator > with stageConfig > should snapshot generated scripts src directory > packages/common/scripts/src/infra/stage-credentials/run.ts 1`] = `
 "import { spawnSync } from 'child_process';
-import stagesConfig from ':proj/common-infra-config';
+import stagesConfig from '@proj/common-infra-config';
 import { parseStageName } from './stage-parser.js';
 import {
   lookupCredentials,

package/src/infra/app/generator.js

@@ -1,17 +1,18 @@
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */ import { addDependenciesToPackageJson, generateFiles, joinPathFragments, OverwriteStrategy, readProjectConfiguration, updateJson } from "@nx/devkit";
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, readProjectConfiguration, updateJson } from "@nx/devkit";
 import path from "path";
 import tsProjectGenerator, { getTsLibDetails } from "../../ts/lib/generator.js";
 import { mergeTsReferences } from "../../ts/lib/ts-project-utils.js";
 import { resolveContainers } from "../../utils/containers.js";
+import { addDependenciesToPackageJson } from "../../utils/dependencies.js";
 import { formatFilesInSubtree } from "../../utils/format.js";
 import { installDependencies } from "../../utils/install.js";
 import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
 import { esmVars } from "../../utils/module-format.js";
 import { kebabCase } from "../../utils/names.js";
-import { getNpmScopePrefix, toScopeAlias } from "../../utils/npm-scope.js";
+import { getNpmScopePrefix } from "../../utils/npm-scope.js";
 import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorInfo, projectExists } from "../../utils/nx.js";
 import { sortObjectKeys } from "../../utils/object.js";
 import { getPackageManagerDisplayCommands } from "../../utils/pkg-manager.js";
@@ -65,7 +66,7 @@ export async function tsInfraGenerator(tree, schema) {
     const projectConfig = readProjectConfiguration(tree, lib.fullyQualifiedName);
     const libraryRoot = projectConfig.root;
     const npmScopePrefix = getNpmScopePrefix(tree);
-    const scopeAlias = toScopeAlias(npmScopePrefix);
+    const scopeAlias = npmScopePrefix;
     const fullyQualifiedName = `${npmScopePrefix}${schema.name}`;
     tree.delete(joinPathFragments(libraryRoot, 'src'));
     generateFiles(tree, joinPathFragments(import.meta.dirname, './files/app'), libraryRoot, {
@@ -181,11 +182,13 @@ export async function tsInfraGenerator(tree, schema) {
     });
     addDependenciesToPackageJson(tree, withVersions([
         'aws-cdk-lib',
-        'aws-cdk',
-        'esbuild',
         'constructs',
         'source-map-support'
-    ]), withVersions([
+    ]), {}, joinPathFragments(libraryRoot, 'package.json'));
+    // The `aws-cdk` CLI, esbuild (CDK bundling) and tsx are shared tooling.
+    addDependenciesToPackageJson(tree, {}, withVersions([
+        'aws-cdk',
+        'esbuild',
         'tsx'
     ]));
     updateJson(tree, `${libraryRoot}/tsconfig.lib.json`, (tsConfig)=>({

package/src/infra/app/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  addDependenciesToPackageJson,\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport path from 'path';\nimport tsProjectGenerator, { getTsLibDetails } from '../../ts/lib/generator';\nimport { mergeTsReferences } from '../../ts/lib/ts-project-utils';\nimport { resolveContainers } from '../../utils/containers';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport { kebabCase } from '../../utils/names';\nimport { getNpmScopePrefix, toScopeAlias } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport { uvxCommand } from '../../utils/py';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_INFRA_CONFIG_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedInfraConfigGenerator } from '../../utils/shared-infra-config';\nimport { sharedInfraScriptsGenerator } from '../../utils/shared-infra-scripts';\nimport { withVersions } from '../../utils/versions';\nimport type { TsInfraGeneratorSchema } from './schema';\n\nexport const INFRA_APP_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport async function tsInfraGenerator(\n  tree: Tree,\n  schema: TsInfraGeneratorSchema,\n): Promise<GeneratorCallback> {\n  const lib = getTsLibDetails(tree, schema);\n\n  if (!projectExists(tree, lib.fullyQualifiedName)) {\n    await tsProjectGenerator(tree, {\n      ...schema,\n      preferInstallDependencies: false,\n    });\n  }\n\n  // CDK shells out to a container engine to build image assets. Default\n  // (docker) needs no env override; finch is set via CDK_DOCKER per\n  // https://docs.aws.amazon.com/cdk/v2/guide/build-containers.html#build-container-replace.\n  const containers = await resolveContainers(tree, 'inherit');\n  const cdkEnv: Record<string, string> | undefined =\n    containers === 'docker' ? undefined : { CDK_DOCKER: containers };\n  const withCdkEnv = <T extends Record<string, unknown>>(opts: T): T => {\n    if (!cdkEnv) return opts;\n    const existingEnv = (opts.env as Record<string, string> | undefined) ?? {};\n    return { ...opts, env: { ...existingEnv, ...cdkEnv } } as T;\n  };\n\n  addGeneratorMetadata(tree, lib.fullyQualifiedName, INFRA_APP_GENERATOR_INFO);\n\n  // Shared constructs always in CDK for typescript infra generator\n  await sharedConstructsGenerator(tree, {\n    iac: 'cdk',\n  });\n\n  // Shared infra-config and infra-scripts packages (lazy creation, only when enabled)\n  const stageConfig = schema.stageConfig ?? false;\n  if (stageConfig) {\n    await sharedInfraConfigGenerator(tree);\n    await sharedInfraScriptsGenerator(tree);\n  }\n\n  const synthDirFromRoot = `/dist/${lib.dir}/cdk.out`;\n  const synthDirFromProject =\n    lib.dir\n      .split('/')\n      .map(() => '..')\n      .join('/') + `/dist/${lib.dir}/cdk.out`;\n  const distDirFromProjectRoot =\n    lib.dir\n      .split('/')\n      .map(() => '..')\n      .join('/') + '/dist/{projectRoot}/cdk.out';\n  const projectConfig = readProjectConfiguration(tree, lib.fullyQualifiedName);\n  const libraryRoot = projectConfig.root;\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = toScopeAlias(npmScopePrefix);\n  const fullyQualifiedName = `${npmScopePrefix}${schema.name}`;\n  tree.delete(joinPathFragments(libraryRoot, 'src'));\n\n  generateFiles(\n    tree, // the virtual file system\n    joinPathFragments(import.meta.dirname, './files/app'), // path to the file templates\n    libraryRoot, // destination path of the files\n    {\n      synthDir: synthDirFromProject,\n      scopeAlias: scopeAlias,\n      namespace: kebabCase(fullyQualifiedName),\n      fullyQualifiedName,\n      pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n      dir: lib.dir,\n      stageConfig,\n      ...schema,\n      ...esmVars(tree),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.Overwrite,\n    },\n  );\n\n  updateJson(\n    tree,\n    `${libraryRoot}/project.json`,\n    (config: ProjectConfiguration) => {\n      config.projectType = 'application';\n      addDependencyToTargetIfNotPresent(config, 'build', 'synth');\n      addDependencyToTargetIfNotPresent(config, 'build', 'checkov');\n      config.targets.compile.outputs = [\n        '{workspaceRoot}/dist/{projectRoot}/tsc',\n      ];\n      config.targets.synth = {\n        cache: true,\n        executor: 'nx:run-commands',\n        inputs: ['default'],\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/cdk.out'],\n        dependsOn: ['^build', 'compile'], // compile clobbers dist directory, so ensure synth runs afterwards\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk synth',\n        }),\n      };\n      config.targets.checkov = {\n        cache: true,\n        executor: 'nx:run-commands',\n        inputs: ['{workspaceRoot}/dist/{projectRoot}/cdk.out'],\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/checkov'],\n        dependsOn: ['synth'],\n        options: {\n          command: uvxCommand(\n            'checkov',\n            '--config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation',\n          ),\n        },\n      };\n      config.targets.deploy = {\n        executor: 'nx:run-commands',\n        dependsOn: ['^build', 'compile'],\n        options: stageConfig\n          ? withCdkEnv({\n              command: `tsx packages/common/scripts/src/infra/infra-deploy.ts ${libraryRoot}`,\n            })\n          : withCdkEnv({\n              cwd: '{projectRoot}',\n              command: 'cdk deploy --require-approval=never',\n            }),\n      };\n      config.targets['deploy-ci'] = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: `cdk deploy --require-approval=never --app ${distDirFromProjectRoot}`,\n        }),\n      };\n      config.targets.destroy = {\n        executor: 'nx:run-commands',\n        dependsOn: ['^build', 'compile'],\n        options: stageConfig\n          ? withCdkEnv({\n              command: `tsx packages/common/scripts/src/infra/infra-destroy.ts ${libraryRoot}`,\n            })\n          : withCdkEnv({\n              cwd: '{projectRoot}',\n              command: 'cdk destroy --require-approval=never',\n            }),\n      };\n      config.targets['destroy-ci'] = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: `cdk destroy --require-approval=never --app ${distDirFromProjectRoot}`,\n        }),\n      };\n      config.targets.cdk = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk',\n        }),\n      };\n      config.targets.bootstrap = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk bootstrap',\n        }),\n      };\n      config.targets = sortObjectKeys(config.targets);\n      return config;\n    },\n  );\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      'aws-cdk-lib',\n      'aws-cdk',\n      'esbuild',\n      'constructs',\n      'source-map-support',\n    ]),\n    withVersions(['tsx']),\n  );\n\n  updateJson(tree, `${libraryRoot}/tsconfig.lib.json`, (tsConfig) => ({\n    ...tsConfig,\n    references: mergeTsReferences(tsConfig.references, [\n      {\n        path: `${path.relative(\n          libraryRoot,\n          `${tree.root}/${PACKAGES_DIR}`,\n        )}/${SHARED_CONSTRUCTS_DIR}/tsconfig.lib.json`,\n      },\n      ...(stageConfig\n        ? [\n            {\n              path: `${path.relative(\n                libraryRoot,\n                `${tree.root}/${PACKAGES_DIR}`,\n              )}/${SHARED_INFRA_CONFIG_DIR}/tsconfig.json`,\n            },\n          ]\n        : []),\n    ]),\n  }));\n\n  await addGeneratorMetricsIfApplicable(tree, [INFRA_APP_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n}\nexport default tsInfraGenerator;\n"],"names":["addDependenciesToPackageJson","generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateJson","path","tsProjectGenerator","getTsLibDetails","mergeTsReferences","resolveContainers","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","getNpmScopePrefix","toScopeAlias","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","projectExists","sortObjectKeys","getPackageManagerDisplayCommands","uvxCommand","sharedConstructsGenerator","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_INFRA_CONFIG_DIR","sharedInfraConfigGenerator","sharedInfraScriptsGenerator","withVersions","INFRA_APP_GENERATOR_INFO","filename","tsInfraGenerator","tree","schema","lib","fullyQualifiedName","preferInstallDependencies","containers","cdkEnv","undefined","CDK_DOCKER","withCdkEnv","opts","existingEnv","env","iac","stageConfig","synthDirFromRoot","dir","synthDirFromProject","split","map","join","distDirFromProjectRoot","projectConfig","libraryRoot","root","npmScopePrefix","scopeAlias","name","delete","dirname","synthDir","namespace","pkgMgrCmd","exec","overwriteStrategy","Overwrite","config","projectType","targets","compile","outputs","synth","cache","executor","inputs","dependsOn","options","cwd","command","checkov","deploy","destroy","cdk","bootstrap","tsConfig","references","relative","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  readProjectConfiguration,\n  type Tree,\n  updateJson,\n} from '@nx/devkit';\nimport path from 'path';\nimport tsProjectGenerator, { getTsLibDetails } from '../../ts/lib/generator';\nimport { mergeTsReferences } from '../../ts/lib/ts-project-utils';\nimport { resolveContainers } from '../../utils/containers';\nimport { addDependenciesToPackageJson } from '../../utils/dependencies';\nimport { formatFilesInSubtree } from '../../utils/format';\nimport { installDependencies } from '../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics';\nimport { esmVars } from '../../utils/module-format';\nimport { kebabCase } from '../../utils/names';\nimport { getNpmScopePrefix } from '../../utils/npm-scope';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx';\nimport { sortObjectKeys } from '../../utils/object';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager';\nimport { uvxCommand } from '../../utils/py';\nimport { sharedConstructsGenerator } from '../../utils/shared-constructs';\nimport {\n  PACKAGES_DIR,\n  SHARED_CONSTRUCTS_DIR,\n  SHARED_INFRA_CONFIG_DIR,\n} from '../../utils/shared-constructs-constants';\nimport { sharedInfraConfigGenerator } from '../../utils/shared-infra-config';\nimport { sharedInfraScriptsGenerator } from '../../utils/shared-infra-scripts';\nimport { withVersions } from '../../utils/versions';\nimport type { TsInfraGeneratorSchema } from './schema';\n\nexport const INFRA_APP_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport async function tsInfraGenerator(\n  tree: Tree,\n  schema: TsInfraGeneratorSchema,\n): Promise<GeneratorCallback> {\n  const lib = getTsLibDetails(tree, schema);\n\n  if (!projectExists(tree, lib.fullyQualifiedName)) {\n    await tsProjectGenerator(tree, {\n      ...schema,\n      preferInstallDependencies: false,\n    });\n  }\n\n  // CDK shells out to a container engine to build image assets. Default\n  // (docker) needs no env override; finch is set via CDK_DOCKER per\n  // https://docs.aws.amazon.com/cdk/v2/guide/build-containers.html#build-container-replace.\n  const containers = await resolveContainers(tree, 'inherit');\n  const cdkEnv: Record<string, string> | undefined =\n    containers === 'docker' ? undefined : { CDK_DOCKER: containers };\n  const withCdkEnv = <T extends Record<string, unknown>>(opts: T): T => {\n    if (!cdkEnv) return opts;\n    const existingEnv = (opts.env as Record<string, string> | undefined) ?? {};\n    return { ...opts, env: { ...existingEnv, ...cdkEnv } } as T;\n  };\n\n  addGeneratorMetadata(tree, lib.fullyQualifiedName, INFRA_APP_GENERATOR_INFO);\n\n  // Shared constructs always in CDK for typescript infra generator\n  await sharedConstructsGenerator(tree, {\n    iac: 'cdk',\n  });\n\n  // Shared infra-config and infra-scripts packages (lazy creation, only when enabled)\n  const stageConfig = schema.stageConfig ?? false;\n  if (stageConfig) {\n    await sharedInfraConfigGenerator(tree);\n    await sharedInfraScriptsGenerator(tree);\n  }\n\n  const synthDirFromRoot = `/dist/${lib.dir}/cdk.out`;\n  const synthDirFromProject =\n    lib.dir\n      .split('/')\n      .map(() => '..')\n      .join('/') + `/dist/${lib.dir}/cdk.out`;\n  const distDirFromProjectRoot =\n    lib.dir\n      .split('/')\n      .map(() => '..')\n      .join('/') + '/dist/{projectRoot}/cdk.out';\n  const projectConfig = readProjectConfiguration(tree, lib.fullyQualifiedName);\n  const libraryRoot = projectConfig.root;\n  const npmScopePrefix = getNpmScopePrefix(tree);\n  const scopeAlias = npmScopePrefix;\n  const fullyQualifiedName = `${npmScopePrefix}${schema.name}`;\n  tree.delete(joinPathFragments(libraryRoot, 'src'));\n\n  generateFiles(\n    tree, // the virtual file system\n    joinPathFragments(import.meta.dirname, './files/app'), // path to the file templates\n    libraryRoot, // destination path of the files\n    {\n      synthDir: synthDirFromProject,\n      scopeAlias: scopeAlias,\n      namespace: kebabCase(fullyQualifiedName),\n      fullyQualifiedName,\n      pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n      dir: lib.dir,\n      stageConfig,\n      ...schema,\n      ...esmVars(tree),\n    },\n    {\n      overwriteStrategy: OverwriteStrategy.Overwrite,\n    },\n  );\n\n  updateJson(\n    tree,\n    `${libraryRoot}/project.json`,\n    (config: ProjectConfiguration) => {\n      config.projectType = 'application';\n      addDependencyToTargetIfNotPresent(config, 'build', 'synth');\n      addDependencyToTargetIfNotPresent(config, 'build', 'checkov');\n      config.targets.compile.outputs = [\n        '{workspaceRoot}/dist/{projectRoot}/tsc',\n      ];\n      config.targets.synth = {\n        cache: true,\n        executor: 'nx:run-commands',\n        inputs: ['default'],\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/cdk.out'],\n        dependsOn: ['^build', 'compile'], // compile clobbers dist directory, so ensure synth runs afterwards\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk synth',\n        }),\n      };\n      config.targets.checkov = {\n        cache: true,\n        executor: 'nx:run-commands',\n        inputs: ['{workspaceRoot}/dist/{projectRoot}/cdk.out'],\n        outputs: ['{workspaceRoot}/dist/{projectRoot}/checkov'],\n        dependsOn: ['synth'],\n        options: {\n          command: uvxCommand(\n            'checkov',\n            '--config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation',\n          ),\n        },\n      };\n      config.targets.deploy = {\n        executor: 'nx:run-commands',\n        dependsOn: ['^build', 'compile'],\n        options: stageConfig\n          ? withCdkEnv({\n              command: `tsx packages/common/scripts/src/infra/infra-deploy.ts ${libraryRoot}`,\n            })\n          : withCdkEnv({\n              cwd: '{projectRoot}',\n              command: 'cdk deploy --require-approval=never',\n            }),\n      };\n      config.targets['deploy-ci'] = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: `cdk deploy --require-approval=never --app ${distDirFromProjectRoot}`,\n        }),\n      };\n      config.targets.destroy = {\n        executor: 'nx:run-commands',\n        dependsOn: ['^build', 'compile'],\n        options: stageConfig\n          ? withCdkEnv({\n              command: `tsx packages/common/scripts/src/infra/infra-destroy.ts ${libraryRoot}`,\n            })\n          : withCdkEnv({\n              cwd: '{projectRoot}',\n              command: 'cdk destroy --require-approval=never',\n            }),\n      };\n      config.targets['destroy-ci'] = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: `cdk destroy --require-approval=never --app ${distDirFromProjectRoot}`,\n        }),\n      };\n      config.targets.cdk = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk',\n        }),\n      };\n      config.targets.bootstrap = {\n        executor: 'nx:run-commands',\n        options: withCdkEnv({\n          cwd: '{projectRoot}',\n          command: 'cdk bootstrap',\n        }),\n      };\n      config.targets = sortObjectKeys(config.targets);\n      return config;\n    },\n  );\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions(['aws-cdk-lib', 'constructs', 'source-map-support']),\n    {},\n    joinPathFragments(libraryRoot, 'package.json'),\n  );\n  // The `aws-cdk` CLI, esbuild (CDK bundling) and tsx are shared tooling.\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(['aws-cdk', 'esbuild', 'tsx']),\n  );\n\n  updateJson(tree, `${libraryRoot}/tsconfig.lib.json`, (tsConfig) => ({\n    ...tsConfig,\n    references: mergeTsReferences(tsConfig.references, [\n      {\n        path: `${path.relative(\n          libraryRoot,\n          `${tree.root}/${PACKAGES_DIR}`,\n        )}/${SHARED_CONSTRUCTS_DIR}/tsconfig.lib.json`,\n      },\n      ...(stageConfig\n        ? [\n            {\n              path: `${path.relative(\n                libraryRoot,\n                `${tree.root}/${PACKAGES_DIR}`,\n              )}/${SHARED_INFRA_CONFIG_DIR}/tsconfig.json`,\n            },\n          ]\n        : []),\n    ]),\n  }));\n\n  await addGeneratorMetricsIfApplicable(tree, [INFRA_APP_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n}\nexport default tsInfraGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateJson","path","tsProjectGenerator","getTsLibDetails","mergeTsReferences","resolveContainers","addDependenciesToPackageJson","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","esmVars","kebabCase","getNpmScopePrefix","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","projectExists","sortObjectKeys","getPackageManagerDisplayCommands","uvxCommand","sharedConstructsGenerator","PACKAGES_DIR","SHARED_CONSTRUCTS_DIR","SHARED_INFRA_CONFIG_DIR","sharedInfraConfigGenerator","sharedInfraScriptsGenerator","withVersions","INFRA_APP_GENERATOR_INFO","filename","tsInfraGenerator","tree","schema","lib","fullyQualifiedName","preferInstallDependencies","containers","cdkEnv","undefined","CDK_DOCKER","withCdkEnv","opts","existingEnv","env","iac","stageConfig","synthDirFromRoot","dir","synthDirFromProject","split","map","join","distDirFromProjectRoot","projectConfig","libraryRoot","root","npmScopePrefix","scopeAlias","name","delete","dirname","synthDir","namespace","pkgMgrCmd","exec","overwriteStrategy","Overwrite","config","projectType","targets","compile","outputs","synth","cache","executor","inputs","dependsOn","options","cwd","command","checkov","deploy","destroy","cdk","bootstrap","tsConfig","references","relative","languages"],"mappings":"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"}

package/src/license/config.js

@@ -517,7 +517,7 @@ import { addDependencyToTargetIfNotPresent } from "../utils/nx.js";
 /**
  * Read license configuration
  */ export const readLicenseConfig = async (tree)=>{
-    return (await readAwsNxPluginConfig(tree))?.license;
+    return readAwsNxPluginConfig(tree)?.license;
 };
 
 //# sourceMappingURL=config.js.map