@aws/nx-plugin 1.0.0-rc.96 → 1.0.0-rc.98

package/src/ts/lib/biome.js

@@ -4,75 +4,77 @@
  */ import { readNxJson, updateNxJson, updateProjectConfiguration } from "@nx/devkit";
 import { readProjectConfigurationUnqualified } from "../../utils/nx.js";
 import { sortObjectKeys } from "../../utils/object.js";
-export const configureBiomeLint = async (tree, options)=>{
-    const projectJson = readProjectConfigurationUnqualified(tree, options.fullyQualifiedName);
-    const biomeConfigured = tree.exists('biome.json');
-    // When there's no root Biome configuration (eg the user removed it), make the
-    // lint target a no-op rather than failing on a missing config.
-    const lintTarget = biomeConfigured ? {
-        executor: 'nx:run-commands',
-        cache: true,
-        inputs: [
-            'biome'
-        ],
-        options: {
-            command: 'biome lint {projectRoot}'
-        },
-        configurations: {
-            fix: {
-                command: 'biome check --write {projectRoot}'
+/**
+ * The `format` and `lint` targets every Biome-linted project gets, so a project
+ * that isn't scaffolded by `ts#project` (e.g. an AgentCore Gateway hosting only
+ * `local-dev.ts`) is linted identically rather than by its own copy.
+ *
+ * When there's no root Biome configuration (eg the user removed it), the targets
+ * are no-ops rather than failing on a missing config.
+ */ export const biomeTargets = (tree)=>{
+    if (!tree.exists('biome.json')) {
+        return {
+            format: {
+                executor: 'nx:noop'
             },
-            'skip-lint': {
-                // Cross-platform no-op (`true` is not available on Windows cmd).
-                command: 'node -e ""'
+            lint: {
+                executor: 'nx:noop'
             }
-        },
-        // Format before linting so any fixable formatting issues (eg line too
-        // long) are resolved first, mirroring the Python project generator.
-        dependsOn: [
-            'format'
-        ]
-    } : {
-        executor: 'nx:noop'
-    };
-    // The base format target checks formatting (failing when files aren't
-    // formatted); the `fix` configuration writes the changes. `skip-lint` is a
-    // no-op so `nx lint --configuration=skip-lint` propagates cleanly through the
-    // lint -> format dependency edge.
-    const formatTarget = biomeConfigured ? {
-        executor: 'nx:run-commands',
-        cache: true,
-        inputs: [
-            'biome'
-        ],
-        options: {
-            command: 'biome format {projectRoot}'
-        },
-        configurations: {
-            fix: {
-                command: 'biome format --write {projectRoot}'
+        };
+    }
+    return {
+        // The base format target checks formatting (failing when files aren't
+        // formatted); the `fix` configuration writes the changes. `skip-lint` is a
+        // no-op so `nx lint --configuration=skip-lint` propagates cleanly through
+        // the lint -> format dependency edge.
+        format: {
+            executor: 'nx:run-commands',
+            cache: true,
+            inputs: [
+                'biome'
+            ],
+            options: {
+                command: 'biome format {projectRoot}'
             },
-            'skip-lint': {
-                // Cross-platform no-op (`true` is not available on Windows cmd).
-                command: 'node -e ""'
+            configurations: {
+                fix: {
+                    command: 'biome format --write {projectRoot}'
+                },
+                'skip-lint': {
+                    // Cross-platform no-op (`true` is not available on Windows cmd).
+                    command: 'node -e ""'
+                }
             }
+        },
+        lint: {
+            executor: 'nx:run-commands',
+            cache: true,
+            inputs: [
+                'biome'
+            ],
+            options: {
+                command: 'biome lint {projectRoot}'
+            },
+            configurations: {
+                fix: {
+                    command: 'biome check --write {projectRoot}'
+                },
+                'skip-lint': {
+                    command: 'node -e ""'
+                }
+            },
+            // Format before linting so any fixable formatting issues (eg line too
+            // long) are resolved first, mirroring the Python project generator.
+            dependsOn: [
+                'format'
+            ]
         }
-    } : {
-        executor: 'nx:noop'
     };
-    updateProjectConfiguration(tree, options.fullyQualifiedName, {
-        ...projectJson,
-        // Sort targets so the lint and format targets land in deterministic
-        // positions regardless of whether they already existed (keeps re-runs
-        // stable)
-        targets: sortObjectKeys({
-            ...projectJson?.targets,
-            format: formatTarget,
-            lint: lintTarget
-        })
-    });
-    // Register the `biome` named input so lint targets are cache-invalidated when
-    // the root biome.json changes.
+};
+/**
+ * Register the `biome` named input so lint targets are cache-invalidated when
+ * the root biome.json changes.
+ */ export const registerBiomeNamedInput = (tree)=>{
     const nxJson = readNxJson(tree);
     if (!nxJson.namedInputs?.biome || !nxJson.namedInputs.biome.includes('{workspaceRoot}/biome.json')) {
         updateNxJson(tree, {
@@ -87,5 +89,19 @@ export const configureBiomeLint = async (tree, options)=>{
         });
     }
 };
+export const configureBiomeLint = async (tree, options)=>{
+    const projectJson = readProjectConfigurationUnqualified(tree, options.fullyQualifiedName);
+    updateProjectConfiguration(tree, options.fullyQualifiedName, {
+        ...projectJson,
+        // Sort targets so the lint and format targets land in deterministic
+        // positions regardless of whether they already existed (keeps re-runs
+        // stable)
+        targets: sortObjectKeys({
+            ...projectJson?.targets,
+            ...biomeTargets(tree)
+        })
+    });
+    registerBiomeNamedInput(tree);
+};
 
 //# sourceMappingURL=biome.js.map

package/src/ts/lib/biome.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/biome.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  readNxJson,\n  type Tree,\n  updateNxJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { readProjectConfigurationUnqualified } from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport type { ConfigureProjectOptions } from './types.js';\n\nexport const configureBiomeLint = async (\n  tree: Tree,\n  options: ConfigureProjectOptions,\n) => {\n  const projectJson = readProjectConfigurationUnqualified(\n    tree,\n    options.fullyQualifiedName,\n  );\n\n  const biomeConfigured = tree.exists('biome.json');\n\n  // When there's no root Biome configuration (eg the user removed it), make the\n  // lint target a no-op rather than failing on a missing config.\n  const lintTarget = biomeConfigured\n    ? {\n        executor: 'nx:run-commands',\n        cache: true,\n        inputs: ['biome'],\n        options: {\n          command: 'biome lint {projectRoot}',\n        },\n        configurations: {\n          fix: {\n            command: 'biome check --write {projectRoot}',\n          },\n          'skip-lint': {\n            // Cross-platform no-op (`true` is not available on Windows cmd).\n            command: 'node -e \"\"',\n          },\n        },\n        // Format before linting so any fixable formatting issues (eg line too\n        // long) are resolved first, mirroring the Python project generator.\n        dependsOn: ['format'],\n      }\n    : { executor: 'nx:noop' };\n\n  // The base format target checks formatting (failing when files aren't\n  // formatted); the `fix` configuration writes the changes. `skip-lint` is a\n  // no-op so `nx lint --configuration=skip-lint` propagates cleanly through the\n  // lint -> format dependency edge.\n  const formatTarget = biomeConfigured\n    ? {\n        executor: 'nx:run-commands',\n        cache: true,\n        inputs: ['biome'],\n        options: {\n          command: 'biome format {projectRoot}',\n        },\n        configurations: {\n          fix: {\n            command: 'biome format --write {projectRoot}',\n          },\n          'skip-lint': {\n            // Cross-platform no-op (`true` is not available on Windows cmd).\n            command: 'node -e \"\"',\n          },\n        },\n      }\n    : { executor: 'nx:noop' };\n\n  updateProjectConfiguration(tree, options.fullyQualifiedName, {\n    ...projectJson,\n    // Sort targets so the lint and format targets land in deterministic\n    // positions regardless of whether they already existed (keeps re-runs\n    // stable)\n    targets: sortObjectKeys({\n      ...projectJson?.targets,\n      format: formatTarget,\n      lint: lintTarget,\n    }),\n  });\n\n  // Register the `biome` named input so lint targets are cache-invalidated when\n  // the root biome.json changes.\n  const nxJson = readNxJson(tree);\n  if (\n    !nxJson.namedInputs?.biome ||\n    !nxJson.namedInputs.biome.includes('{workspaceRoot}/biome.json')\n  ) {\n    updateNxJson(tree, {\n      ...nxJson,\n      namedInputs: {\n        ...nxJson.namedInputs,\n        biome: ['default', '{workspaceRoot}/biome.json'],\n      },\n    });\n  }\n};\n"],"names":["readNxJson","updateNxJson","updateProjectConfiguration","readProjectConfigurationUnqualified","sortObjectKeys","configureBiomeLint","tree","options","projectJson","fullyQualifiedName","biomeConfigured","exists","lintTarget","executor","cache","inputs","command","configurations","fix","dependsOn","formatTarget","targets","format","lint","nxJson","namedInputs","biome","includes"],"mappings":"AAAA;;;CAGC,GACD,SACEA,UAAU,EAEVC,YAAY,EACZC,0BAA0B,QACrB,aAAa;AACpB,SAASC,mCAAmC,QAAQ,oBAAoB;AACxE,SAASC,cAAc,QAAQ,wBAAwB;AAGvD,OAAO,MAAMC,qBAAqB,OAChCC,MACAC;IAEA,MAAMC,cAAcL,oCAClBG,MACAC,QAAQE,kBAAkB;IAG5B,MAAMC,kBAAkBJ,KAAKK,MAAM,CAAC;IAEpC,8EAA8E;IAC9E,+DAA+D;IAC/D,MAAMC,aAAaF,kBACf;QACEG,UAAU;QACVC,OAAO;QACPC,QAAQ;YAAC;SAAQ;QACjBR,SAAS;YACPS,SAAS;QACX;QACAC,gBAAgB;YACdC,KAAK;gBACHF,SAAS;YACX;YACA,aAAa;gBACX,iEAAiE;gBACjEA,SAAS;YACX;QACF;QACA,sEAAsE;QACtE,oEAAoE;QACpEG,WAAW;YAAC;SAAS;IACvB,IACA;QAAEN,UAAU;IAAU;IAE1B,sEAAsE;IACtE,2EAA2E;IAC3E,8EAA8E;IAC9E,kCAAkC;IAClC,MAAMO,eAAeV,kBACjB;QACEG,UAAU;QACVC,OAAO;QACPC,QAAQ;YAAC;SAAQ;QACjBR,SAAS;YACPS,SAAS;QACX;QACAC,gBAAgB;YACdC,KAAK;gBACHF,SAAS;YACX;YACA,aAAa;gBACX,iEAAiE;gBACjEA,SAAS;YACX;QACF;IACF,IACA;QAAEH,UAAU;IAAU;IAE1BX,2BAA2BI,MAAMC,QAAQE,kBAAkB,EAAE;QAC3D,GAAGD,WAAW;QACd,oEAAoE;QACpE,sEAAsE;QACtE,UAAU;QACVa,SAASjB,eAAe;YACtB,GAAGI,aAAaa,OAAO;YACvBC,QAAQF;YACRG,MAAMX;QACR;IACF;IAEA,8EAA8E;IAC9E,+BAA+B;IAC/B,MAAMY,SAASxB,WAAWM;IAC1B,IACE,CAACkB,OAAOC,WAAW,EAAEC,SACrB,CAACF,OAAOC,WAAW,CAACC,KAAK,CAACC,QAAQ,CAAC,+BACnC;QACA1B,aAAaK,MAAM;YACjB,GAAGkB,MAAM;YACTC,aAAa;gBACX,GAAGD,OAAOC,WAAW;gBACrBC,OAAO;oBAAC;oBAAW;iBAA6B;YAClD;QACF;IACF;AACF,EAAE"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/biome.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  readNxJson,\n  type TargetConfiguration,\n  type Tree,\n  updateNxJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { readProjectConfigurationUnqualified } from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport type { ConfigureProjectOptions } from './types.js';\n\n/**\n * The `format` and `lint` targets every Biome-linted project gets, so a project\n * that isn't scaffolded by `ts#project` (e.g. an AgentCore Gateway hosting only\n * `local-dev.ts`) is linted identically rather than by its own copy.\n *\n * When there's no root Biome configuration (eg the user removed it), the targets\n * are no-ops rather than failing on a missing config.\n */\nexport const biomeTargets = (\n  tree: Tree,\n): Record<'format' | 'lint', TargetConfiguration> => {\n  if (!tree.exists('biome.json')) {\n    return { format: { executor: 'nx:noop' }, lint: { executor: 'nx:noop' } };\n  }\n  return {\n    // The base format target checks formatting (failing when files aren't\n    // formatted); the `fix` configuration writes the changes. `skip-lint` is a\n    // no-op so `nx lint --configuration=skip-lint` propagates cleanly through\n    // the lint -> format dependency edge.\n    format: {\n      executor: 'nx:run-commands',\n      cache: true,\n      inputs: ['biome'],\n      options: {\n        command: 'biome format {projectRoot}',\n      },\n      configurations: {\n        fix: {\n          command: 'biome format --write {projectRoot}',\n        },\n        'skip-lint': {\n          // Cross-platform no-op (`true` is not available on Windows cmd).\n          command: 'node -e \"\"',\n        },\n      },\n    },\n    lint: {\n      executor: 'nx:run-commands',\n      cache: true,\n      inputs: ['biome'],\n      options: {\n        command: 'biome lint {projectRoot}',\n      },\n      configurations: {\n        fix: {\n          command: 'biome check --write {projectRoot}',\n        },\n        'skip-lint': {\n          command: 'node -e \"\"',\n        },\n      },\n      // Format before linting so any fixable formatting issues (eg line too\n      // long) are resolved first, mirroring the Python project generator.\n      dependsOn: ['format'],\n    },\n  };\n};\n\n/**\n * Register the `biome` named input so lint targets are cache-invalidated when\n * the root biome.json changes.\n */\nexport const registerBiomeNamedInput = (tree: Tree): void => {\n  const nxJson = readNxJson(tree);\n  if (\n    !nxJson.namedInputs?.biome ||\n    !nxJson.namedInputs.biome.includes('{workspaceRoot}/biome.json')\n  ) {\n    updateNxJson(tree, {\n      ...nxJson,\n      namedInputs: {\n        ...nxJson.namedInputs,\n        biome: ['default', '{workspaceRoot}/biome.json'],\n      },\n    });\n  }\n};\n\nexport const configureBiomeLint = async (\n  tree: Tree,\n  options: ConfigureProjectOptions,\n) => {\n  const projectJson = readProjectConfigurationUnqualified(\n    tree,\n    options.fullyQualifiedName,\n  );\n\n  updateProjectConfiguration(tree, options.fullyQualifiedName, {\n    ...projectJson,\n    // Sort targets so the lint and format targets land in deterministic\n    // positions regardless of whether they already existed (keeps re-runs\n    // stable)\n    targets: sortObjectKeys({\n      ...projectJson?.targets,\n      ...biomeTargets(tree),\n    }),\n  });\n\n  registerBiomeNamedInput(tree);\n};\n"],"names":["readNxJson","updateNxJson","updateProjectConfiguration","readProjectConfigurationUnqualified","sortObjectKeys","biomeTargets","tree","exists","format","executor","lint","cache","inputs","options","command","configurations","fix","dependsOn","registerBiomeNamedInput","nxJson","namedInputs","biome","includes","configureBiomeLint","projectJson","fullyQualifiedName","targets"],"mappings":"AAAA;;;CAGC,GACD,SACEA,UAAU,EAGVC,YAAY,EACZC,0BAA0B,QACrB,aAAa;AACpB,SAASC,mCAAmC,QAAQ,oBAAoB;AACxE,SAASC,cAAc,QAAQ,wBAAwB;AAGvD;;;;;;;CAOC,GACD,OAAO,MAAMC,eAAe,CAC1BC;IAEA,IAAI,CAACA,KAAKC,MAAM,CAAC,eAAe;QAC9B,OAAO;YAAEC,QAAQ;gBAAEC,UAAU;YAAU;YAAGC,MAAM;gBAAED,UAAU;YAAU;QAAE;IAC1E;IACA,OAAO;QACL,sEAAsE;QACtE,2EAA2E;QAC3E,0EAA0E;QAC1E,sCAAsC;QACtCD,QAAQ;YACNC,UAAU;YACVE,OAAO;YACPC,QAAQ;gBAAC;aAAQ;YACjBC,SAAS;gBACPC,SAAS;YACX;YACAC,gBAAgB;gBACdC,KAAK;oBACHF,SAAS;gBACX;gBACA,aAAa;oBACX,iEAAiE;oBACjEA,SAAS;gBACX;YACF;QACF;QACAJ,MAAM;YACJD,UAAU;YACVE,OAAO;YACPC,QAAQ;gBAAC;aAAQ;YACjBC,SAAS;gBACPC,SAAS;YACX;YACAC,gBAAgB;gBACdC,KAAK;oBACHF,SAAS;gBACX;gBACA,aAAa;oBACXA,SAAS;gBACX;YACF;YACA,sEAAsE;YACtE,oEAAoE;YACpEG,WAAW;gBAAC;aAAS;QACvB;IACF;AACF,EAAE;AAEF;;;CAGC,GACD,OAAO,MAAMC,0BAA0B,CAACZ;IACtC,MAAMa,SAASnB,WAAWM;IAC1B,IACE,CAACa,OAAOC,WAAW,EAAEC,SACrB,CAACF,OAAOC,WAAW,CAACC,KAAK,CAACC,QAAQ,CAAC,+BACnC;QACArB,aAAaK,MAAM;YACjB,GAAGa,MAAM;YACTC,aAAa;gBACX,GAAGD,OAAOC,WAAW;gBACrBC,OAAO;oBAAC;oBAAW;iBAA6B;YAClD;QACF;IACF;AACF,EAAE;AAEF,OAAO,MAAME,qBAAqB,OAChCjB,MACAO;IAEA,MAAMW,cAAcrB,oCAClBG,MACAO,QAAQY,kBAAkB;IAG5BvB,2BAA2BI,MAAMO,QAAQY,kBAAkB,EAAE;QAC3D,GAAGD,WAAW;QACd,oEAAoE;QACpE,sEAAsE;QACtE,UAAU;QACVE,SAAStB,eAAe;YACtB,GAAGoB,aAAaE,OAAO;YACvB,GAAGrB,aAAaC,KAAK;QACvB;IACF;IAEAY,wBAAwBZ;AAC1B,EAAE"}

package/src/ts/lib/generator.js

@@ -10,7 +10,7 @@ import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
 import { isEsmWorkspace } from "../../utils/module-format.js";
 import { toKebabCase } from "../../utils/names.js";
 import { getNpmScopePrefix } from "../../utils/npm-scope.js";
-import { addGeneratorMetadata, getGeneratorInfo, mergeTargetDefault, projectExists } from "../../utils/nx.js";
+import { addGeneratorMetadata, getGeneratorInfo, mergeTarget, mergeTargetDefault, projectExists } from "../../utils/nx.js";
 import { sortObjectKeys } from "../../utils/object.js";
 import { getPackageManagerDisplayCommands } from "../../utils/pkg-manager.js";
 import { configureTsProject, TS_PROJECT_DEPENDENCIES } from "./ts-project-utils.js";
@@ -97,7 +97,11 @@ const VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS = [
     }, DEPENDENCIES);
     const projectConfiguration = readProjectConfiguration(tree, fullyQualifiedName);
     const targets = projectConfiguration.targets;
-    targets['compile'] = {
+    // Merged rather than assigned so a re-run converges this generator's own
+    // configuration without discarding what other generators contributed to the
+    // same targets — the `bundle` that ts#lambda-function adds to build and
+    // assemble, say, which those targets must keep depending on.
+    targets['compile'] = mergeTarget(targets['compile'], {
         executor: 'nx:run-commands',
         outputs: [
             '{workspaceRoot}/dist/{projectRoot}/tsc'
@@ -106,20 +110,20 @@ const VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS = [
             command: 'tsc --build tsconfig.lib.json',
             cwd: '{projectRoot}'
         }
-    };
-    targets['build'] = {
+    });
+    targets['build'] = mergeTarget(targets['build'], {
         dependsOn: [
             'lint',
             'compile',
             'test'
         ]
-    };
+    });
     // The artifact-only sibling of build, which the deploy targets depend on.
-    targets['assemble'] = {
+    targets['assemble'] = mergeTarget(targets['assemble'], {
         dependsOn: [
             'compile'
         ]
-    };
+    });
     projectConfiguration.targets = sortObjectKeys(targets);
     updateProjectConfiguration(tree, fullyQualifiedName, projectConfiguration);
     addGeneratorMetadata(tree, fullyQualifiedName, TS_LIB_GENERATOR_INFO);

package/src/ts/lib/generator.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/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  type NxJsonConfiguration,\n  OverwriteStrategy,\n  readProjectConfiguration,\n  type TargetConfiguration,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { libraryGenerator } from '@nx/js';\nimport { declareDependencies } from '../../utils/declared-dependencies.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport { isEsmWorkspace } from '../../utils/module-format.js';\nimport { toKebabCase } from '../../utils/names.js';\nimport { getNpmScopePrefix } from '../../utils/npm-scope.js';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  mergeTargetDefault,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager.js';\nimport type { TsProjectGeneratorSchema } from './schema';\nimport {\n  configureTsProject,\n  TS_PROJECT_DEPENDENCIES,\n} from './ts-project-utils.js';\nimport { VITEST_DEPENDENCIES } from './vitest.js';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [...VITEST_DEPENDENCIES, ...TS_PROJECT_DEPENDENCIES],\n});\n\nexport const TS_LIB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Consumes build artifacts produced by a project's dependencies, so a task\n * re-runs when the output it actually reads changes.\n *\n * Test reports are excluded rather than build artifacts included: several\n * generators emit generated sources outside `dist` (an OpenAPI client under a\n * website's `src/generated`, a Smithy SSDK, the Prisma client) and add them to\n * `.gitignore`, which keeps them out of the project's own fileset — so this\n * input is the only thing that hashes them. `reports/` and `coverage/` hold\n * pytest's JUnit and coverage XML, which carry a wall-clock timestamp and so\n * mint a fresh hash on every test run that would cascade through the graph.\n */\nexport const DEPENDENT_TASKS_OUTPUT_FILES_INPUT = {\n  dependentTasksOutputFiles: '!{reports,coverage}/**',\n  transitive: true,\n};\n\n// Globs this generator has vended for the dependent-task-output input. Any of\n// them is replaced in place, so the entry is neither duplicated nor left at a\n// different scope when a generator re-runs.\nconst VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS = [\n  '**/*',\n  'dist/**',\n  DEPENDENT_TASKS_OUTPUT_FILES_INPUT.dependentTasksOutputFiles,\n];\n\nexport interface TsLibDetails {\n  /**\n   * Full package name including scope (eg @foo/bar)\n   */\n  readonly fullyQualifiedName: string;\n  /**\n   * Directory of the library relative to the root\n   */\n  readonly dir: string;\n}\n\n/**\n * Returns details about the TS library to be created\n */\nexport const getTsLibDetails = (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): TsLibDetails => {\n  const scope = getNpmScopePrefix(tree);\n  const normalizedName = toKebabCase(schema.name);\n  const fullyQualifiedName = `${scope}${normalizedName}`;\n  // NB: interactive nx generator cli can pass empty string\n  const dir = joinPathFragments(\n    schema.directory || '.',\n    schema.subDirectory || normalizedName,\n  );\n  return { dir, fullyQualifiedName };\n};\n\n/**\n * Generates a typescript project\n */\nexport const tsProjectGenerator = async (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, schema);\n  // The module format is workspace-wide, established by the preset when the\n  // workspace is created, so vending generators always infer it from the tree.\n  const esm = isEsmWorkspace(tree);\n\n  // Only scaffold the project on first run; on re-run skip creation so user\n  // edits are preserved, but continue to (re)apply the configuration below.\n  if (!projectExists(tree, fullyQualifiedName)) {\n    await libraryGenerator(tree, {\n      ...schema,\n      name: fullyQualifiedName,\n      directory: dir,\n      skipPackageJson: true,\n      bundler: 'tsc', // TODO: consider supporting others\n      linter: 'none',\n      unitTestRunner: 'vitest',\n      // Register the @nx/vitest plugin so the test target is inferred rather\n      // than emitting the deprecated @nx/vitest:test executor target.\n      addPlugin: true,\n    });\n\n    // Replace with simpler sample source code\n    tree.delete(joinPathFragments(dir, 'src'));\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files'),\n      joinPathFragments(dir),\n      {\n        fullyQualifiedName,\n        esm,\n        pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n  await configureTsProject(\n    tree,\n    {\n      dir,\n      fullyQualifiedName,\n      esm,\n    },\n    DEPENDENCIES,\n  );\n\n  const projectConfiguration = readProjectConfiguration(\n    tree,\n    fullyQualifiedName,\n  );\n  const targets = projectConfiguration.targets;\n\n  targets['compile'] = {\n    executor: 'nx:run-commands',\n    outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],\n    options: {\n      command: 'tsc --build tsconfig.lib.json',\n      cwd: '{projectRoot}',\n    },\n  };\n  targets['build'] = {\n    dependsOn: ['lint', 'compile', 'test'],\n  };\n  // The artifact-only sibling of build, which the deploy targets depend on.\n  targets['assemble'] = {\n    dependsOn: ['compile'],\n  };\n  projectConfiguration.targets = sortObjectKeys(targets);\n\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfiguration);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_LIB_GENERATOR_INFO);\n\n  updateJson(tree, 'nx.json', (nxJson: NxJsonConfiguration) => {\n    nxJson.namedInputs = {\n      ...nxJson.namedInputs,\n      default: [\n        ...(nxJson.namedInputs?.default ?? []).filter(\n          (input) =>\n            typeof input !== 'object' ||\n            !('dependentTasksOutputFiles' in input) ||\n            !(\n              VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS.includes(\n                input.dependentTasksOutputFiles as string,\n              ) && input.transitive\n            ),\n        ),\n        DEPENDENT_TASKS_OUTPUT_FILES_INPUT,\n      ],\n    };\n\n    const withDefaultInput = (base: Partial<TargetConfiguration>) => ({\n      ...base,\n      inputs: [\n        ...(base.inputs ?? []).filter((i) => i !== 'default'),\n        'default',\n      ],\n    });\n\n    nxJson.targetDefaults = {\n      ...nxJson.targetDefaults,\n      compile: mergeTargetDefault(nxJson.targetDefaults?.compile, (base) => ({\n        cache: true,\n        ...withDefaultInput(base),\n      })),\n      build: mergeTargetDefault(nxJson.targetDefaults?.build, (base) => ({\n        cache: true,\n        ...withDefaultInput(base),\n      })),\n      test: mergeTargetDefault(nxJson.targetDefaults?.test, withDefaultInput),\n    };\n\n    // Ensure we only declare a single typescript plugin with the correct settings\n    nxJson.plugins = [\n      {\n        plugin: '@nx/js/typescript',\n        options: {\n          typecheck: {\n            targetName: 'typecheck',\n          },\n          build: {\n            targetName: 'compile',\n            configName: 'tsconfig.lib.json',\n            buildDepsName: 'build-deps',\n            watchDepsName: 'watch-deps',\n          },\n        },\n      },\n      ...(nxJson.plugins ?? []).filter(\n        (p) => typeof p === 'string' || p.plugin !== '@nx/js/typescript',\n      ),\n    ];\n\n    return nxJson;\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_LIB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  // `installDependencies` ensures vitest resolves for the `typescript` language (the\n  // generated vitest.config.mts imports it and Nx loads that config when\n  // computing the project graph), so a deferred install still runs when needed.\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\nexport default tsProjectGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateJson","updateProjectConfiguration","libraryGenerator","declareDependencies","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","isEsmWorkspace","toKebabCase","getNpmScopePrefix","addGeneratorMetadata","getGeneratorInfo","mergeTargetDefault","projectExists","sortObjectKeys","getPackageManagerDisplayCommands","configureTsProject","TS_PROJECT_DEPENDENCIES","VITEST_DEPENDENCIES","DEPENDENCIES","ts","TS_LIB_GENERATOR_INFO","filename","DEPENDENT_TASKS_OUTPUT_FILES_INPUT","dependentTasksOutputFiles","transitive","VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS","getTsLibDetails","tree","schema","scope","normalizedName","name","fullyQualifiedName","dir","directory","subDirectory","tsProjectGenerator","esm","skipPackageJson","bundler","linter","unitTestRunner","addPlugin","delete","dirname","pkgMgrCmd","exec","overwriteStrategy","KeepExisting","projectConfiguration","targets","executor","outputs","options","command","cwd","dependsOn","nxJson","namedInputs","default","filter","input","includes","withDefaultInput","base","inputs","i","targetDefaults","compile","cache","build","test","plugins","plugin","typecheck","targetName","configName","buildDepsName","watchDepsName","p","preferInstallDependencies","languages"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/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  type NxJsonConfiguration,\n  OverwriteStrategy,\n  readProjectConfiguration,\n  type TargetConfiguration,\n  type Tree,\n  updateJson,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport { libraryGenerator } from '@nx/js';\nimport { declareDependencies } from '../../utils/declared-dependencies.js';\nimport { formatFilesInSubtree } from '../../utils/format.js';\nimport { installDependencies } from '../../utils/install.js';\nimport { addGeneratorMetricsIfApplicable } from '../../utils/metrics.js';\nimport { isEsmWorkspace } from '../../utils/module-format.js';\nimport { toKebabCase } from '../../utils/names.js';\nimport { getNpmScopePrefix } from '../../utils/npm-scope.js';\nimport {\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  mergeTarget,\n  mergeTargetDefault,\n  type NxGeneratorInfo,\n  projectExists,\n} from '../../utils/nx.js';\nimport { sortObjectKeys } from '../../utils/object.js';\nimport { getPackageManagerDisplayCommands } from '../../utils/pkg-manager.js';\nimport type { TsProjectGeneratorSchema } from './schema';\nimport {\n  configureTsProject,\n  TS_PROJECT_DEPENDENCIES,\n} from './ts-project-utils.js';\nimport { VITEST_DEPENDENCIES } from './vitest.js';\n\nexport const DEPENDENCIES = declareDependencies()({\n  ts: [...VITEST_DEPENDENCIES, ...TS_PROJECT_DEPENDENCIES],\n});\n\nexport const TS_LIB_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\n/**\n * Consumes build artifacts produced by a project's dependencies, so a task\n * re-runs when the output it actually reads changes.\n *\n * Test reports are excluded rather than build artifacts included: several\n * generators emit generated sources outside `dist` (an OpenAPI client under a\n * website's `src/generated`, a Smithy SSDK, the Prisma client) and add them to\n * `.gitignore`, which keeps them out of the project's own fileset — so this\n * input is the only thing that hashes them. `reports/` and `coverage/` hold\n * pytest's JUnit and coverage XML, which carry a wall-clock timestamp and so\n * mint a fresh hash on every test run that would cascade through the graph.\n */\nexport const DEPENDENT_TASKS_OUTPUT_FILES_INPUT = {\n  dependentTasksOutputFiles: '!{reports,coverage}/**',\n  transitive: true,\n};\n\n// Globs this generator has vended for the dependent-task-output input. Any of\n// them is replaced in place, so the entry is neither duplicated nor left at a\n// different scope when a generator re-runs.\nconst VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS = [\n  '**/*',\n  'dist/**',\n  DEPENDENT_TASKS_OUTPUT_FILES_INPUT.dependentTasksOutputFiles,\n];\n\nexport interface TsLibDetails {\n  /**\n   * Full package name including scope (eg @foo/bar)\n   */\n  readonly fullyQualifiedName: string;\n  /**\n   * Directory of the library relative to the root\n   */\n  readonly dir: string;\n}\n\n/**\n * Returns details about the TS library to be created\n */\nexport const getTsLibDetails = (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): TsLibDetails => {\n  const scope = getNpmScopePrefix(tree);\n  const normalizedName = toKebabCase(schema.name);\n  const fullyQualifiedName = `${scope}${normalizedName}`;\n  // NB: interactive nx generator cli can pass empty string\n  const dir = joinPathFragments(\n    schema.directory || '.',\n    schema.subDirectory || normalizedName,\n  );\n  return { dir, fullyQualifiedName };\n};\n\n/**\n * Generates a typescript project\n */\nexport const tsProjectGenerator = async (\n  tree: Tree,\n  schema: TsProjectGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  const { fullyQualifiedName, dir } = getTsLibDetails(tree, schema);\n  // The module format is workspace-wide, established by the preset when the\n  // workspace is created, so vending generators always infer it from the tree.\n  const esm = isEsmWorkspace(tree);\n\n  // Only scaffold the project on first run; on re-run skip creation so user\n  // edits are preserved, but continue to (re)apply the configuration below.\n  if (!projectExists(tree, fullyQualifiedName)) {\n    await libraryGenerator(tree, {\n      ...schema,\n      name: fullyQualifiedName,\n      directory: dir,\n      skipPackageJson: true,\n      bundler: 'tsc', // TODO: consider supporting others\n      linter: 'none',\n      unitTestRunner: 'vitest',\n      // Register the @nx/vitest plugin so the test target is inferred rather\n      // than emitting the deprecated @nx/vitest:test executor target.\n      addPlugin: true,\n    });\n\n    // Replace with simpler sample source code\n    tree.delete(joinPathFragments(dir, 'src'));\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files'),\n      joinPathFragments(dir),\n      {\n        fullyQualifiedName,\n        esm,\n        pkgMgrCmd: getPackageManagerDisplayCommands().exec,\n      },\n      {\n        overwriteStrategy: OverwriteStrategy.KeepExisting,\n      },\n    );\n  }\n  await configureTsProject(\n    tree,\n    {\n      dir,\n      fullyQualifiedName,\n      esm,\n    },\n    DEPENDENCIES,\n  );\n\n  const projectConfiguration = readProjectConfiguration(\n    tree,\n    fullyQualifiedName,\n  );\n  const targets = projectConfiguration.targets;\n\n  // Merged rather than assigned so a re-run converges this generator's own\n  // configuration without discarding what other generators contributed to the\n  // same targets — the `bundle` that ts#lambda-function adds to build and\n  // assemble, say, which those targets must keep depending on.\n  targets['compile'] = mergeTarget(targets['compile'], {\n    executor: 'nx:run-commands',\n    outputs: ['{workspaceRoot}/dist/{projectRoot}/tsc'],\n    options: {\n      command: 'tsc --build tsconfig.lib.json',\n      cwd: '{projectRoot}',\n    },\n  });\n  targets['build'] = mergeTarget(targets['build'], {\n    dependsOn: ['lint', 'compile', 'test'],\n  });\n  // The artifact-only sibling of build, which the deploy targets depend on.\n  targets['assemble'] = mergeTarget(targets['assemble'], {\n    dependsOn: ['compile'],\n  });\n  projectConfiguration.targets = sortObjectKeys(targets);\n\n  updateProjectConfiguration(tree, fullyQualifiedName, projectConfiguration);\n\n  addGeneratorMetadata(tree, fullyQualifiedName, TS_LIB_GENERATOR_INFO);\n\n  updateJson(tree, 'nx.json', (nxJson: NxJsonConfiguration) => {\n    nxJson.namedInputs = {\n      ...nxJson.namedInputs,\n      default: [\n        ...(nxJson.namedInputs?.default ?? []).filter(\n          (input) =>\n            typeof input !== 'object' ||\n            !('dependentTasksOutputFiles' in input) ||\n            !(\n              VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS.includes(\n                input.dependentTasksOutputFiles as string,\n              ) && input.transitive\n            ),\n        ),\n        DEPENDENT_TASKS_OUTPUT_FILES_INPUT,\n      ],\n    };\n\n    const withDefaultInput = (base: Partial<TargetConfiguration>) => ({\n      ...base,\n      inputs: [\n        ...(base.inputs ?? []).filter((i) => i !== 'default'),\n        'default',\n      ],\n    });\n\n    nxJson.targetDefaults = {\n      ...nxJson.targetDefaults,\n      compile: mergeTargetDefault(nxJson.targetDefaults?.compile, (base) => ({\n        cache: true,\n        ...withDefaultInput(base),\n      })),\n      build: mergeTargetDefault(nxJson.targetDefaults?.build, (base) => ({\n        cache: true,\n        ...withDefaultInput(base),\n      })),\n      test: mergeTargetDefault(nxJson.targetDefaults?.test, withDefaultInput),\n    };\n\n    // Ensure we only declare a single typescript plugin with the correct settings\n    nxJson.plugins = [\n      {\n        plugin: '@nx/js/typescript',\n        options: {\n          typecheck: {\n            targetName: 'typecheck',\n          },\n          build: {\n            targetName: 'compile',\n            configName: 'tsconfig.lib.json',\n            buildDepsName: 'build-deps',\n            watchDepsName: 'watch-deps',\n          },\n        },\n      },\n      ...(nxJson.plugins ?? []).filter(\n        (p) => typeof p === 'string' || p.plugin !== '@nx/js/typescript',\n      ),\n    ];\n\n    return nxJson;\n  });\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_LIB_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n\n  // `installDependencies` ensures vitest resolves for the `typescript` language (the\n  // generated vitest.config.mts imports it and Nx loads that config when\n  // computing the project graph), so a deferred install still runs when needed.\n  return () =>\n    installDependencies(tree, schema.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\nexport default tsProjectGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","readProjectConfiguration","updateJson","updateProjectConfiguration","libraryGenerator","declareDependencies","formatFilesInSubtree","installDependencies","addGeneratorMetricsIfApplicable","isEsmWorkspace","toKebabCase","getNpmScopePrefix","addGeneratorMetadata","getGeneratorInfo","mergeTarget","mergeTargetDefault","projectExists","sortObjectKeys","getPackageManagerDisplayCommands","configureTsProject","TS_PROJECT_DEPENDENCIES","VITEST_DEPENDENCIES","DEPENDENCIES","ts","TS_LIB_GENERATOR_INFO","filename","DEPENDENT_TASKS_OUTPUT_FILES_INPUT","dependentTasksOutputFiles","transitive","VENDED_DEPENDENT_TASKS_OUTPUT_GLOBS","getTsLibDetails","tree","schema","scope","normalizedName","name","fullyQualifiedName","dir","directory","subDirectory","tsProjectGenerator","esm","skipPackageJson","bundler","linter","unitTestRunner","addPlugin","delete","dirname","pkgMgrCmd","exec","overwriteStrategy","KeepExisting","projectConfiguration","targets","executor","outputs","options","command","cwd","dependsOn","nxJson","namedInputs","default","filter","input","includes","withDefaultInput","base","inputs","i","targetDefaults","compile","cache","build","test","plugins","plugin","typecheck","targetName","configName","buildDepsName","watchDepsName","p","preferInstallDependencies","languages"],"mappings":"AAAA;;;CAGC,GACD,SAEEA,aAAa,EACbC,iBAAiB,EAEjBC,iBAAiB,EACjBC,wBAAwB,EAGxBC,UAAU,EACVC,0BAA0B,QACrB,aAAa;AACpB,SAASC,gBAAgB,QAAQ,SAAS;AAC1C,SAASC,mBAAmB,QAAQ,uCAAuC;AAC3E,SAASC,oBAAoB,QAAQ,wBAAwB;AAC7D,SAASC,mBAAmB,QAAQ,yBAAyB;AAC7D,SAASC,+BAA+B,QAAQ,yBAAyB;AACzE,SAASC,cAAc,QAAQ,+BAA+B;AAC9D,SAASC,WAAW,QAAQ,uBAAuB;AACnD,SAASC,iBAAiB,QAAQ,2BAA2B;AAC7D,SACEC,oBAAoB,EACpBC,gBAAgB,EAChBC,WAAW,EACXC,kBAAkB,EAElBC,aAAa,QACR,oBAAoB;AAC3B,SAASC,cAAc,QAAQ,wBAAwB;AACvD,SAASC,gCAAgC,QAAQ,6BAA6B;AAE9E,SACEC,kBAAkB,EAClBC,uBAAuB,QAClB,wBAAwB;AAC/B,SAASC,mBAAmB,QAAQ,cAAc;AAElD,OAAO,MAAMC,eAAejB,sBAAsB;IAChDkB,IAAI;WAAIF;WAAwBD;KAAwB;AAC1D,GAAG;AAEH,OAAO,MAAMI,wBAAyCX,iBACpD,YAAYY,QAAQ,EACpB;AAEF;;;;;;;;;;;CAWC,GACD,OAAO,MAAMC,qCAAqC;IAChDC,2BAA2B;IAC3BC,YAAY;AACd,EAAE;AAEF,8EAA8E;AAC9E,8EAA8E;AAC9E,4CAA4C;AAC5C,MAAMC,sCAAsC;IAC1C;IACA;IACAH,mCAAmCC,yBAAyB;CAC7D;AAaD;;CAEC,GACD,OAAO,MAAMG,kBAAkB,CAC7BC,MACAC;IAEA,MAAMC,QAAQtB,kBAAkBoB;IAChC,MAAMG,iBAAiBxB,YAAYsB,OAAOG,IAAI;IAC9C,MAAMC,qBAAqB,GAAGH,QAAQC,gBAAgB;IACtD,yDAAyD;IACzD,MAAMG,MAAMtC,kBACViC,OAAOM,SAAS,IAAI,KACpBN,OAAOO,YAAY,IAAIL;IAEzB,OAAO;QAAEG;QAAKD;IAAmB;AACnC,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMI,qBAAqB,OAChCT,MACAC;IAEA,MAAM,EAAEI,kBAAkB,EAAEC,GAAG,EAAE,GAAGP,gBAAgBC,MAAMC;IAC1D,0EAA0E;IAC1E,6EAA6E;IAC7E,MAAMS,MAAMhC,eAAesB;IAE3B,0EAA0E;IAC1E,0EAA0E;IAC1E,IAAI,CAACf,cAAce,MAAMK,qBAAqB;QAC5C,MAAMhC,iBAAiB2B,MAAM;YAC3B,GAAGC,MAAM;YACTG,MAAMC;YACNE,WAAWD;YACXK,iBAAiB;YACjBC,SAAS;YACTC,QAAQ;YACRC,gBAAgB;YAChB,uEAAuE;YACvE,gEAAgE;YAChEC,WAAW;QACb;QAEA,0CAA0C;QAC1Cf,KAAKgB,MAAM,CAAChD,kBAAkBsC,KAAK;QACnCvC,cACEiC,MACAhC,kBAAkB,YAAYiD,OAAO,EAAE,UACvCjD,kBAAkBsC,MAClB;YACED;YACAK;YACAQ,WAAW/B,mCAAmCgC,IAAI;QACpD,GACA;YACEC,mBAAmBnD,kBAAkBoD,YAAY;QACnD;IAEJ;IACA,MAAMjC,mBACJY,MACA;QACEM;QACAD;QACAK;IACF,GACAnB;IAGF,MAAM+B,uBAAuBpD,yBAC3B8B,MACAK;IAEF,MAAMkB,UAAUD,qBAAqBC,OAAO;IAE5C,yEAAyE;IACzE,4EAA4E;IAC5E,wEAAwE;IACxE,6DAA6D;IAC7DA,OAAO,CAAC,UAAU,GAAGxC,YAAYwC,OAAO,CAAC,UAAU,EAAE;QACnDC,UAAU;QACVC,SAAS;YAAC;SAAyC;QACnDC,SAAS;YACPC,SAAS;YACTC,KAAK;QACP;IACF;IACAL,OAAO,CAAC,QAAQ,GAAGxC,YAAYwC,OAAO,CAAC,QAAQ,EAAE;QAC/CM,WAAW;YAAC;YAAQ;YAAW;SAAO;IACxC;IACA,0EAA0E;IAC1EN,OAAO,CAAC,WAAW,GAAGxC,YAAYwC,OAAO,CAAC,WAAW,EAAE;QACrDM,WAAW;YAAC;SAAU;IACxB;IACAP,qBAAqBC,OAAO,GAAGrC,eAAeqC;IAE9CnD,2BAA2B4B,MAAMK,oBAAoBiB;IAErDzC,qBAAqBmB,MAAMK,oBAAoBZ;IAE/CtB,WAAW6B,MAAM,WAAW,CAAC8B;QAC3BA,OAAOC,WAAW,GAAG;YACnB,GAAGD,OAAOC,WAAW;YACrBC,SAAS;mBACJ,AAACF,CAAAA,OAAOC,WAAW,EAAEC,WAAW,EAAE,AAAD,EAAGC,MAAM,CAC3C,CAACC,QACC,OAAOA,UAAU,YACjB,CAAE,CAAA,+BAA+BA,KAAI,KACrC,CACEpC,CAAAA,oCAAoCqC,QAAQ,CAC1CD,MAAMtC,yBAAyB,KAC5BsC,MAAMrC,UAAU,AAAD;gBAG1BF;aACD;QACH;QAEA,MAAMyC,mBAAmB,CAACC,OAAwC,CAAA;gBAChE,GAAGA,IAAI;gBACPC,QAAQ;uBACH,AAACD,CAAAA,KAAKC,MAAM,IAAI,EAAE,AAAD,EAAGL,MAAM,CAAC,CAACM,IAAMA,MAAM;oBAC3C;iBACD;YACH,CAAA;QAEAT,OAAOU,cAAc,GAAG;YACtB,GAAGV,OAAOU,cAAc;YACxBC,SAASzD,mBAAmB8C,OAAOU,cAAc,EAAEC,SAAS,CAACJ,OAAU,CAAA;oBACrEK,OAAO;oBACP,GAAGN,iBAAiBC,KAAK;gBAC3B,CAAA;YACAM,OAAO3D,mBAAmB8C,OAAOU,cAAc,EAAEG,OAAO,CAACN,OAAU,CAAA;oBACjEK,OAAO;oBACP,GAAGN,iBAAiBC,KAAK;gBAC3B,CAAA;YACAO,MAAM5D,mBAAmB8C,OAAOU,cAAc,EAAEI,MAAMR;QACxD;QAEA,8EAA8E;QAC9EN,OAAOe,OAAO,GAAG;YACf;gBACEC,QAAQ;gBACRpB,SAAS;oBACPqB,WAAW;wBACTC,YAAY;oBACd;oBACAL,OAAO;wBACLK,YAAY;wBACZC,YAAY;wBACZC,eAAe;wBACfC,eAAe;oBACjB;gBACF;YACF;eACG,AAACrB,CAAAA,OAAOe,OAAO,IAAI,EAAE,AAAD,EAAGZ,MAAM,CAC9B,CAACmB,IAAM,OAAOA,MAAM,YAAYA,EAAEN,MAAM,KAAK;SAEhD;QAED,OAAOhB;IACT;IAEA,MAAMrD,gCAAgCuB,MAAM;QAACP;KAAsB;IAEnE,MAAMlB,qBAAqByB;IAE3B,mFAAmF;IACnF,uEAAuE;IACvE,8EAA8E;IAC9E,OAAO,IACLxB,oBAAoBwB,MAAMC,OAAOoD,yBAAyB,EAAE;YAC1DC,WAAW;gBAAC;aAAa;QAC3B;AACJ,EAAE;AACF,eAAe7C,mBAAmB"}

package/src/ts/lib/ts-project-utils.d.ts

@@ -31,6 +31,20 @@ export declare const TS_PROJECT_DEPENDENCIES: readonly [{
  * generator neither duplicates nor reorders references.
  */
 export declare const mergeTsReferences: (existing: TsConfigReference[] | undefined, toAdd: TsConfigReference[]) => TsConfigReference[];
+/**
+ * Merges a reference to another project's directory into existing TypeScript
+ * project references, treating any reference that resolves inside that
+ * directory as the same reference.
+ *
+ * `nx sync` rewrites a reference to a project's `tsconfig.json` into the
+ * specific `tsconfig.lib.json` it resolves to, so matching on the exact path
+ * alone would append a second reference to the same project on every re-run —
+ * which leaves the workspace out of sync and fails the next `build`.
+ *
+ * `projectDirRef` is the referenced project's directory, relative to the
+ * tsconfig being updated (eg `../common/shadcn`).
+ */
+export declare const mergeTsProjectDirReference: (existing: TsConfigReference[] | undefined, projectDirRef: string) => TsConfigReference[];
 /**
  * Updates typescript projects
  */

package/src/ts/lib/ts-project-utils.js

@@ -46,6 +46,30 @@ import { configureVitest } from "./vitest.js";
     }
     return references;
 };
+/**
+ * Merges a reference to another project's directory into existing TypeScript
+ * project references, treating any reference that resolves inside that
+ * directory as the same reference.
+ *
+ * `nx sync` rewrites a reference to a project's `tsconfig.json` into the
+ * specific `tsconfig.lib.json` it resolves to, so matching on the exact path
+ * alone would append a second reference to the same project on every re-run —
+ * which leaves the workspace out of sync and fails the next `build`.
+ *
+ * `projectDirRef` is the referenced project's directory, relative to the
+ * tsconfig being updated (eg `../common/shadcn`).
+ */ export const mergeTsProjectDirReference = (existing, projectDirRef)=>{
+    const references = [
+        ...existing ?? []
+    ];
+    const alreadyReferenced = references.some((ref)=>ref.path === projectDirRef || ref.path.startsWith(`${projectDirRef}/tsconfig`));
+    return alreadyReferenced ? references : [
+        ...references,
+        {
+            path: `${projectDirRef}/tsconfig.json`
+        }
+    ];
+};
 /**
  * Updates typescript projects
  */ export const configureTsProject = async (tree, options, declaration)=>{

package/src/ts/lib/ts-project-utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/ts-project-utils.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { joinPathFragments, logger, type Tree, updateJson } from '@nx/devkit';\nimport { join, relative } from 'path';\nimport { addLicenseCheckToLintTarget } from '../../license/config.js';\nimport { addTsDependencies } from '../../utils/add-dependencies.js';\nimport { AWS_NX_PLUGIN_CONFIG_FILE_NAME } from '../../utils/config/utils.js';\nimport {\n  type DependencyDeclaration,\n  forDependencies,\n  type MustDeclare,\n} from '../../utils/declared-dependencies.js';\nimport { isEsmWorkspace } from '../../utils/module-format.js';\nimport { ensureProjectPackageJson } from '../../utils/project-package-json.js';\nimport type { ITsDepVersion } from '../../utils/versions.js';\nimport { configureBiomeLint } from './biome.js';\nimport type { ConfigureProjectOptions } from './types.js';\nimport { configureVitest, type VITEST_DEPENDENCIES } from './vitest.js';\n\ninterface TsConfigReference {\n  path: string;\n}\n\n/**\n * Dependencies a caller must declare to configure a TypeScript project.\n *\n * `@nx/js` writes `types: ['node']` into every project's `tsconfig.lib.json`, so\n * the types must be declared for `tsc` to resolve them. Declared twice: on the\n * project whose tsconfig names them, and at the root, which `@nx/js` seeded until\n * Nx 23.2 stopped.\n */\nexport const TS_PROJECT_DEPENDENCIES = [\n  { name: '@types/node', dev: true },\n  { name: '@types/node', dev: true, root: true },\n] as const satisfies readonly {\n  name: ITsDepVersion;\n  dev?: boolean;\n  root?: boolean;\n}[];\n\n/**\n * Merges new TypeScript project references into existing ones, deduplicating by\n * path and preserving the order of existing references so re-running a\n * generator neither duplicates nor reorders references.\n */\nexport const mergeTsReferences = (\n  existing: TsConfigReference[] | undefined,\n  toAdd: TsConfigReference[],\n): TsConfigReference[] => {\n  const references = [...(existing ?? [])];\n  const existingPaths = new Set(references.map((ref) => ref.path));\n  for (const ref of toAdd) {\n    if (!existingPaths.has(ref.path)) {\n      references.push(ref);\n      existingPaths.add(ref.path);\n    }\n  }\n  return references;\n};\n\n/**\n * Updates typescript projects\n */\nexport const configureTsProject = async <const D extends DependencyDeclaration>(\n  tree: Tree,\n  options: ConfigureProjectOptions,\n  declaration: D &\n    MustDeclare<typeof VITEST_DEPENDENCIES, D> &\n    MustDeclare<typeof TS_PROJECT_DEPENDENCIES, D>,\n) => {\n  // Point users at init when the workspace hasn't been configured, since\n  // lint/format targets and workspace dependency sync depend on it.\n  if (!tree.exists(AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {\n    logger.warn(\n      `This workspace has no ${AWS_NX_PLUGIN_CONFIG_FILE_NAME} — run 'nx g @aws/nx-plugin:init' (or 'nx add @aws/nx-plugin') to configure linting, formatting and workspace dependency sync.`,\n    );\n  }\n\n  // When the caller doesn't specify a module format, infer it from the\n  // workspace root package.json (defaulting to ESM for a fresh workspace).\n  const esm = options.esm ?? isEsmWorkspace(tree);\n\n  // Remove a conflicting `module: commonjs` from the project tsconfig.json\n  // (CommonJS is configured on tsconfig.lib.json below when needed).\n  updateJson(tree, join(options.dir, 'tsconfig.json'), (tsConfig) => ({\n    ...tsConfig,\n    compilerOptions: {\n      ...tsConfig.compilerOptions,\n      module:\n        tsConfig.compilerOptions?.module === 'commonjs'\n          ? undefined\n          : tsConfig.compilerOptions?.module,\n    },\n  }));\n  const outDirToRootRelativePath = relative(\n    join(tree.root, options.dir),\n    tree.root,\n  );\n  const distDir = join(outDirToRootRelativePath, 'dist', options.dir, 'tsc');\n  // Remove baseUrl and rootDir from the tsconfig.lib.json\n  if (tree.exists(join(options.dir, 'tsconfig.lib.json'))) {\n    updateJson(tree, join(options.dir, 'tsconfig.lib.json'), (tsConfig) => ({\n      ...tsConfig,\n      compilerOptions: {\n        ...tsConfig.compilerOptions,\n        baseUrl: undefined,\n        rootDir: '.',\n        outDir: distDir,\n        tsBuildInfoFile: join(distDir, 'tsconfig.lib.tsbuildinfo'),\n        // @nx/js configures the lib for ESM (module `nodenext`). CommonJS\n        // projects use `node16`, which honours the workspace's\n        // `type: commonjs`, emits CommonJS and resolves extensionless relative\n        // imports. (Plain `commonjs`/`node` is deprecated in TypeScript 6.)\n        ...(esm ? {} : { module: 'node16', moduleResolution: 'node16' }),\n      },\n    }));\n  }\n  // Update root project tsconfig\n  updateJson(tree, 'tsconfig.base.json', (tsConfig) => ({\n    ...tsConfig,\n    compilerOptions: {\n      ...tsConfig.compilerOptions,\n      // baseUrl is deprecated in TypeScript 6 — use ./ prefix in paths instead\n      baseUrl: undefined,\n      rootDir: '.',\n      paths: {\n        ...tsConfig.compilerOptions?.paths,\n        [options.fullyQualifiedName]: [\n          `./${joinPathFragments(options.dir, 'src', 'index.ts')}`,\n        ],\n      },\n    },\n  }));\n  if (tree.exists('tsconfig.json')) {\n    updateJson(tree, 'tsconfig.json', (tsConfig) => ({\n      ...tsConfig,\n      // Add project references, deduplicating and preserving existing order\n      references: mergeTsReferences(tsConfig.references, [\n        { path: `./${options.dir}` },\n      ]),\n    }));\n  }\n  // Every project carries a minimal private package.json so the workspace\n  // follows the standard npm package layout (see ensureProjectPackageJson).\n  ensureProjectPackageJson(tree, {\n    dir: options.dir,\n    fullyQualifiedName: options.fullyQualifiedName,\n    esm,\n  });\n\n  // From this helper's constant, not the caller's declaration, which marks these\n  // `ownedElsewhere` because the install happens here.\n  addTsDependencies(\n    tree,\n    { ts: [...TS_PROJECT_DEPENDENCIES], py: [] },\n    { projectRoot: options.dir },\n  );\n\n  await configureBiomeLint(tree, options);\n  await configureVitest(\n    tree,\n    options,\n    forDependencies<typeof VITEST_DEPENDENCIES>(declaration),\n  );\n\n  // If license checking is configured, make this project's lint target depend\n  // on the root license-check target. No-op if there's no license-check target\n  // (i.e. the license generator hasn't run); the license generator wires up\n  // existing projects itself, so this works regardless of generator order.\n  addLicenseCheckToLintTarget(tree, options.fullyQualifiedName);\n};\n"],"names":["joinPathFragments","logger","updateJson","join","relative","addLicenseCheckToLintTarget","addTsDependencies","AWS_NX_PLUGIN_CONFIG_FILE_NAME","forDependencies","isEsmWorkspace","ensureProjectPackageJson","configureBiomeLint","configureVitest","TS_PROJECT_DEPENDENCIES","name","dev","root","mergeTsReferences","existing","toAdd","references","existingPaths","Set","map","ref","path","has","push","add","configureTsProject","tree","options","declaration","exists","warn","esm","dir","tsConfig","compilerOptions","module","undefined","outDirToRootRelativePath","distDir","baseUrl","rootDir","outDir","tsBuildInfoFile","moduleResolution","paths","fullyQualifiedName","ts","py","projectRoot"],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/ts/lib/ts-project-utils.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { joinPathFragments, logger, type Tree, updateJson } from '@nx/devkit';\nimport { join, relative } from 'path';\nimport { addLicenseCheckToLintTarget } from '../../license/config.js';\nimport { addTsDependencies } from '../../utils/add-dependencies.js';\nimport { AWS_NX_PLUGIN_CONFIG_FILE_NAME } from '../../utils/config/utils.js';\nimport {\n  type DependencyDeclaration,\n  forDependencies,\n  type MustDeclare,\n} from '../../utils/declared-dependencies.js';\nimport { isEsmWorkspace } from '../../utils/module-format.js';\nimport { ensureProjectPackageJson } from '../../utils/project-package-json.js';\nimport type { ITsDepVersion } from '../../utils/versions.js';\nimport { configureBiomeLint } from './biome.js';\nimport type { ConfigureProjectOptions } from './types.js';\nimport { configureVitest, type VITEST_DEPENDENCIES } from './vitest.js';\n\ninterface TsConfigReference {\n  path: string;\n}\n\n/**\n * Dependencies a caller must declare to configure a TypeScript project.\n *\n * `@nx/js` writes `types: ['node']` into every project's `tsconfig.lib.json`, so\n * the types must be declared for `tsc` to resolve them. Declared twice: on the\n * project whose tsconfig names them, and at the root, which `@nx/js` seeded until\n * Nx 23.2 stopped.\n */\nexport const TS_PROJECT_DEPENDENCIES = [\n  { name: '@types/node', dev: true },\n  { name: '@types/node', dev: true, root: true },\n] as const satisfies readonly {\n  name: ITsDepVersion;\n  dev?: boolean;\n  root?: boolean;\n}[];\n\n/**\n * Merges new TypeScript project references into existing ones, deduplicating by\n * path and preserving the order of existing references so re-running a\n * generator neither duplicates nor reorders references.\n */\nexport const mergeTsReferences = (\n  existing: TsConfigReference[] | undefined,\n  toAdd: TsConfigReference[],\n): TsConfigReference[] => {\n  const references = [...(existing ?? [])];\n  const existingPaths = new Set(references.map((ref) => ref.path));\n  for (const ref of toAdd) {\n    if (!existingPaths.has(ref.path)) {\n      references.push(ref);\n      existingPaths.add(ref.path);\n    }\n  }\n  return references;\n};\n\n/**\n * Merges a reference to another project's directory into existing TypeScript\n * project references, treating any reference that resolves inside that\n * directory as the same reference.\n *\n * `nx sync` rewrites a reference to a project's `tsconfig.json` into the\n * specific `tsconfig.lib.json` it resolves to, so matching on the exact path\n * alone would append a second reference to the same project on every re-run —\n * which leaves the workspace out of sync and fails the next `build`.\n *\n * `projectDirRef` is the referenced project's directory, relative to the\n * tsconfig being updated (eg `../common/shadcn`).\n */\nexport const mergeTsProjectDirReference = (\n  existing: TsConfigReference[] | undefined,\n  projectDirRef: string,\n): TsConfigReference[] => {\n  const references = [...(existing ?? [])];\n  const alreadyReferenced = references.some(\n    (ref) =>\n      ref.path === projectDirRef ||\n      ref.path.startsWith(`${projectDirRef}/tsconfig`),\n  );\n  return alreadyReferenced\n    ? references\n    : [...references, { path: `${projectDirRef}/tsconfig.json` }];\n};\n\n/**\n * Updates typescript projects\n */\nexport const configureTsProject = async <const D extends DependencyDeclaration>(\n  tree: Tree,\n  options: ConfigureProjectOptions,\n  declaration: D &\n    MustDeclare<typeof VITEST_DEPENDENCIES, D> &\n    MustDeclare<typeof TS_PROJECT_DEPENDENCIES, D>,\n) => {\n  // Point users at init when the workspace hasn't been configured, since\n  // lint/format targets and workspace dependency sync depend on it.\n  if (!tree.exists(AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {\n    logger.warn(\n      `This workspace has no ${AWS_NX_PLUGIN_CONFIG_FILE_NAME} — run 'nx g @aws/nx-plugin:init' (or 'nx add @aws/nx-plugin') to configure linting, formatting and workspace dependency sync.`,\n    );\n  }\n\n  // When the caller doesn't specify a module format, infer it from the\n  // workspace root package.json (defaulting to ESM for a fresh workspace).\n  const esm = options.esm ?? isEsmWorkspace(tree);\n\n  // Remove a conflicting `module: commonjs` from the project tsconfig.json\n  // (CommonJS is configured on tsconfig.lib.json below when needed).\n  updateJson(tree, join(options.dir, 'tsconfig.json'), (tsConfig) => ({\n    ...tsConfig,\n    compilerOptions: {\n      ...tsConfig.compilerOptions,\n      module:\n        tsConfig.compilerOptions?.module === 'commonjs'\n          ? undefined\n          : tsConfig.compilerOptions?.module,\n    },\n  }));\n  const outDirToRootRelativePath = relative(\n    join(tree.root, options.dir),\n    tree.root,\n  );\n  const distDir = join(outDirToRootRelativePath, 'dist', options.dir, 'tsc');\n  // Remove baseUrl and rootDir from the tsconfig.lib.json\n  if (tree.exists(join(options.dir, 'tsconfig.lib.json'))) {\n    updateJson(tree, join(options.dir, 'tsconfig.lib.json'), (tsConfig) => ({\n      ...tsConfig,\n      compilerOptions: {\n        ...tsConfig.compilerOptions,\n        baseUrl: undefined,\n        rootDir: '.',\n        outDir: distDir,\n        tsBuildInfoFile: join(distDir, 'tsconfig.lib.tsbuildinfo'),\n        // @nx/js configures the lib for ESM (module `nodenext`). CommonJS\n        // projects use `node16`, which honours the workspace's\n        // `type: commonjs`, emits CommonJS and resolves extensionless relative\n        // imports. (Plain `commonjs`/`node` is deprecated in TypeScript 6.)\n        ...(esm ? {} : { module: 'node16', moduleResolution: 'node16' }),\n      },\n    }));\n  }\n  // Update root project tsconfig\n  updateJson(tree, 'tsconfig.base.json', (tsConfig) => ({\n    ...tsConfig,\n    compilerOptions: {\n      ...tsConfig.compilerOptions,\n      // baseUrl is deprecated in TypeScript 6 — use ./ prefix in paths instead\n      baseUrl: undefined,\n      rootDir: '.',\n      paths: {\n        ...tsConfig.compilerOptions?.paths,\n        [options.fullyQualifiedName]: [\n          `./${joinPathFragments(options.dir, 'src', 'index.ts')}`,\n        ],\n      },\n    },\n  }));\n  if (tree.exists('tsconfig.json')) {\n    updateJson(tree, 'tsconfig.json', (tsConfig) => ({\n      ...tsConfig,\n      // Add project references, deduplicating and preserving existing order\n      references: mergeTsReferences(tsConfig.references, [\n        { path: `./${options.dir}` },\n      ]),\n    }));\n  }\n  // Every project carries a minimal private package.json so the workspace\n  // follows the standard npm package layout (see ensureProjectPackageJson).\n  ensureProjectPackageJson(tree, {\n    dir: options.dir,\n    fullyQualifiedName: options.fullyQualifiedName,\n    esm,\n  });\n\n  // From this helper's constant, not the caller's declaration, which marks these\n  // `ownedElsewhere` because the install happens here.\n  addTsDependencies(\n    tree,\n    { ts: [...TS_PROJECT_DEPENDENCIES], py: [] },\n    { projectRoot: options.dir },\n  );\n\n  await configureBiomeLint(tree, options);\n  await configureVitest(\n    tree,\n    options,\n    forDependencies<typeof VITEST_DEPENDENCIES>(declaration),\n  );\n\n  // If license checking is configured, make this project's lint target depend\n  // on the root license-check target. No-op if there's no license-check target\n  // (i.e. the license generator hasn't run); the license generator wires up\n  // existing projects itself, so this works regardless of generator order.\n  addLicenseCheckToLintTarget(tree, options.fullyQualifiedName);\n};\n"],"names":["joinPathFragments","logger","updateJson","join","relative","addLicenseCheckToLintTarget","addTsDependencies","AWS_NX_PLUGIN_CONFIG_FILE_NAME","forDependencies","isEsmWorkspace","ensureProjectPackageJson","configureBiomeLint","configureVitest","TS_PROJECT_DEPENDENCIES","name","dev","root","mergeTsReferences","existing","toAdd","references","existingPaths","Set","map","ref","path","has","push","add","mergeTsProjectDirReference","projectDirRef","alreadyReferenced","some","startsWith","configureTsProject","tree","options","declaration","exists","warn","esm","dir","tsConfig","compilerOptions","module","undefined","outDirToRootRelativePath","distDir","baseUrl","rootDir","outDir","tsBuildInfoFile","moduleResolution","paths","fullyQualifiedName","ts","py","projectRoot"],"mappings":"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"}

package/src/ts/mcp-server/__snapshots__/generator.spec.ts.snap

@@ -155,7 +155,7 @@ exports[`ts#mcp-server generator > should match snapshot for Terraform generated
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "6.62.0"
+      version = "6.63.0"
     }
     null = {
       source  = "hashicorp/null"
@@ -514,7 +514,7 @@ resource "null_resource" "runtime_ready" {
 
   provisioner "local-exec" {
     command = <<-EOT
-      uv run --with boto3==1.43.83 python -c "
+      uv run --with boto3==1.43.89 python -c "
 import boto3
 import json
 import os
@@ -737,9 +737,9 @@ output "security_group_id" {
 
 exports[`ts#mcp-server generator > should match snapshot for generated files > mcp-server-http.ts 1`] = `
 "#!/usr/bin/env node
-import { createServer } from './server.js';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import express, { Request, Response } from 'express';
+import { createServer } from './server.js';
 
 const PORT = parseInt(process.env.PORT || '8000');
 

package/src/ts/mcp-server/files/app/http.ts.template

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-import { createServer } from './server<% if (esm) { %>.js<% } %>';
 import { StreamableHTTPServerTransport } from '@modelcontextprotocol/sdk/server/streamableHttp.js';
 import express, { Request, Response } from 'express';
+import { createServer } from './server<% if (esm) { %>.js<% } %>';
 
 const PORT = parseInt(process.env.PORT || '8000');
 

package/src/ts/mcp-server/generator.js

@@ -17,7 +17,7 @@ import { addGeneratorMetricsIfApplicable } from "../../utils/metrics.js";
 import { isEsmWorkspace } from "../../utils/module-format.js";
 import { kebabCase, toClassName } from "../../utils/names.js";
 import { getNpmScope } from "../../utils/npm-scope.js";
-import { addArtifactDependencyToTargets, addComponentDevTarget, addComponentGeneratorMetadata, addDependencyToTargetIfNotPresent, getGeneratorInfo, readProjectConfigurationUnqualified } from "../../utils/nx.js";
+import { addArtifactDependencyToTargets, addComponentDevTarget, addComponentGeneratorMetadata, addDependencyToTargetIfNotPresent, getGeneratorInfo, normalizeTargetKeyOrder, readProjectConfigurationUnqualified } from "../../utils/nx.js";
 import { sortObjectKeys } from "../../utils/object.js";
 import { registerPnpmBuiltDependencies } from "../../utils/pnpm-workspace.js";
 import { assignPort } from "../../utils/port.js";
@@ -124,7 +124,7 @@ export const tsMcpServerGenerator = async (tree, options)=>{
             });
             const dockerTargetName = `${mcpTargetPrefix}-docker`;
             const fs = new FsCommands(tree, DEPENDENCIES);
-            project.targets[dockerTargetName] = {
+            project.targets[dockerTargetName] = normalizeTargetKeyOrder({
                 cache: IMAGE_BUILD_CACHE,
                 executor: 'nx:run-commands',
                 options: {
@@ -137,7 +137,7 @@ export const tsMcpServerGenerator = async (tree, options)=>{
                 dependsOn: [
                     'bundle'
                 ]
-            };
+            });
             addDependencyToTargetIfNotPresent(project, 'docker', dockerTargetName);
             addArtifactDependencyToTargets(project, 'docker');
             addDockerScanTarget(tree, {