@aws/nx-plugin 1.0.0-rc.3 → 1.0.0-rc.30

package/src/utils/commands.js

@@ -1,33 +1,52 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.buildCreateNxWorkspaceCommand = exports.buildInstallCommand = exports.buildPackageManagerShortCommand = exports.buildPackageManagerExecCommand = exports.PACKAGE_MANAGER_COMMANDS = void 0;
-exports.PACKAGE_MANAGER_COMMANDS = {
-    npm: { exec: 'npx', run: 'npm run', create: 'npm create' },
-    pnpm: { exec: 'pnpm', run: 'pnpm', create: 'pnpm create' },
-    yarn: { exec: 'yarn', run: 'yarn', create: 'yarn create' },
-    bun: { exec: 'bunx', run: 'bun', create: 'bun create' },
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ /**
+ * Display-friendly command prefixes for each package manager.
+ *
+ * - `exec`: prefix for running local binaries (e.g. `npx nx`, `pnpm nx`, `bunx nx`)
+ * - `run`: prefix for running package.json scripts (e.g. `npm run build`, `pnpm build`)
+ *
+ * @see docs/src/components/package-manager-exec-command.astro
+ * @see docs/src/components/package-manager-short-command.astro
+ */ export const PACKAGE_MANAGER_COMMANDS = {
+    npm: {
+        exec: 'npx',
+        run: 'npm run',
+        create: 'npm create'
+    },
+    pnpm: {
+        exec: 'pnpm',
+        run: 'pnpm',
+        create: 'pnpm create'
+    },
+    yarn: {
+        exec: 'yarn',
+        run: 'yarn',
+        create: 'yarn create'
+    },
+    bun: {
+        exec: 'bunx',
+        run: 'bun',
+        create: 'bun create'
+    }
 };
 /**
  * Build a package manager exec command (e.g. pnpm cmd, npx cmd, bunx cmd)
- */
-const buildPackageManagerExecCommand = (pm, command) => {
-    const prefix = exports.PACKAGE_MANAGER_COMMANDS[pm]?.exec ?? pm;
+ */ export const buildPackageManagerExecCommand = (pm, command)=>{
+    const prefix = PACKAGE_MANAGER_COMMANDS[pm]?.exec ?? pm;
     return `${prefix} ${command}`;
 };
-exports.buildPackageManagerExecCommand = buildPackageManagerExecCommand;
 /**
  * Build a short package manager command (e.g. pnpm build, npm run build)
- */
-const buildPackageManagerShortCommand = (pm, command) => {
-    const prefix = exports.PACKAGE_MANAGER_COMMANDS[pm]?.run ?? pm;
+ */ export const buildPackageManagerShortCommand = (pm, command)=>{
+    const prefix = PACKAGE_MANAGER_COMMANDS[pm]?.run ?? pm;
     return `${prefix} ${command}`;
 };
-exports.buildPackageManagerShortCommand = buildPackageManagerShortCommand;
 /**
  * Build an install command for a given package manager
- */
-const buildInstallCommand = (pm, pkg, dev) => {
-    switch (pm) {
+ */ export const buildInstallCommand = (pm, pkg, dev)=>{
+    switch(pm){
         case 'pnpm':
             return `pnpm add ${dev ? '-D' : '-'}w ${pkg}`;
         case 'yarn':
@@ -40,7 +59,6 @@ const buildInstallCommand = (pm, pkg, dev) => {
             return `${pm} install ${dev ? '-D ' : ''}${pkg}`;
     }
 };
-exports.buildInstallCommand = buildInstallCommand;
 /**
  * Build a command to create a new workspace using @aws/create-nx-workspace.
  *
@@ -52,19 +70,22 @@ exports.buildInstallCommand = buildInstallCommand;
  *
  * The package manager is auto-detected by @aws/create-nx-workspace from the
  * invoking command, so --pm is not needed.
- */
-const buildCreateNxWorkspaceCommand = (pm, workspace, iac, tag) => {
-    const createPrefix = exports.PACKAGE_MANAGER_COMMANDS[pm]?.create ?? `${pm} create`;
+ */ export const buildCreateNxWorkspaceCommand = (pm, workspace, iac, tag)=>{
+    const createPrefix = PACKAGE_MANAGER_COMMANDS[pm]?.create ?? `${pm} create`;
     const pkgName = tag ? `@aws/nx-workspace@${tag}` : '@aws/nx-workspace';
     const parts = [
         createPrefix,
         pkgName,
         // npm requires '--' to stop interpreting subsequent flags as npm config
-        ...(pm === 'npm' ? ['--'] : []),
+        ...pm === 'npm' ? [
+            '--'
+        ] : [],
         workspace,
-        ...(iac ? [`--iac=${iac}`] : []),
+        ...iac ? [
+            `--iac=${iac}`
+        ] : []
     ];
     return parts.join(' ');
 };
-exports.buildCreateNxWorkspaceCommand = buildCreateNxWorkspaceCommand;
+
 //# sourceMappingURL=commands.js.map

package/src/utils/commands.js.map

@@ -1 +1 @@
-{"version":3,"file":"commands.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/utils/commands.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/commands.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n/**\n * Display-friendly command prefixes for each package manager.\n *\n * - `exec`: prefix for running local binaries (e.g. `npx nx`, `pnpm nx`, `bunx nx`)\n * - `run`: prefix for running package.json scripts (e.g. `npm run build`, `pnpm build`)\n *\n * @see docs/src/components/package-manager-exec-command.astro\n * @see docs/src/components/package-manager-short-command.astro\n */\nexport interface PackageManagerDisplayCommands {\n  /** Prefix for running local binaries: npx, pnpm, yarn, bunx */\n  exec: string;\n  /** Prefix for running package.json scripts: `npm run`, pnpm, yarn, bun */\n  run: string;\n  /** Prefix for `create` commands: `npm create`, `pnpm create`, etc. */\n  create: string;\n}\n\nexport const PACKAGE_MANAGER_COMMANDS: Record<\n  string,\n  PackageManagerDisplayCommands\n> = {\n  npm: { exec: 'npx', run: 'npm run', create: 'npm create' },\n  pnpm: { exec: 'pnpm', run: 'pnpm', create: 'pnpm create' },\n  yarn: { exec: 'yarn', run: 'yarn', create: 'yarn create' },\n  bun: { exec: 'bunx', run: 'bun', create: 'bun create' },\n};\n\n/**\n * Build a package manager exec command (e.g. pnpm cmd, npx cmd, bunx cmd)\n */\nexport const buildPackageManagerExecCommand = (pm: string, command: string) => {\n  const prefix = PACKAGE_MANAGER_COMMANDS[pm]?.exec ?? pm;\n  return `${prefix} ${command}`;\n};\n\n/**\n * Build a short package manager command (e.g. pnpm build, npm run build)\n */\nexport const buildPackageManagerShortCommand = (\n  pm: string,\n  command: string,\n) => {\n  const prefix = PACKAGE_MANAGER_COMMANDS[pm]?.run ?? pm;\n  return `${prefix} ${command}`;\n};\n\n/**\n * Build an install command for a given package manager\n */\nexport const buildInstallCommand = (pm: string, pkg: string, dev: boolean) => {\n  switch (pm) {\n    case 'pnpm':\n      return `pnpm add ${dev ? '-D' : '-'}w ${pkg}`;\n    case 'yarn':\n      return `yarn add ${dev ? '-D ' : ''}${pkg}`;\n    case 'npm':\n      return `npm install --legacy-peer-deps ${dev ? '-D ' : ''}${pkg}`;\n    case 'bun':\n      return `bun install ${dev ? '-D ' : ''}${pkg}`;\n    default:\n      return `${pm} install ${dev ? '-D ' : ''}${pkg}`;\n  }\n};\n\n/**\n * Build a command to create a new workspace using @aws/create-nx-workspace.\n *\n * Uses the `create` shorthand for each package manager:\n *   npm create @aws/nx-workspace my-project\n *   pnpm create @aws/nx-workspace my-project\n *   yarn create @aws/nx-workspace my-project\n *   bun create @aws/nx-workspace my-project\n *\n * The package manager is auto-detected by @aws/create-nx-workspace from the\n * invoking command, so --pm is not needed.\n */\nexport const buildCreateNxWorkspaceCommand = (\n  pm: string,\n  workspace: string,\n  iac?: 'cdk' | 'terraform',\n  tag?: string,\n) => {\n  const createPrefix = PACKAGE_MANAGER_COMMANDS[pm]?.create ?? `${pm} create`;\n  const pkgName = tag ? `@aws/nx-workspace@${tag}` : '@aws/nx-workspace';\n  const parts = [\n    createPrefix,\n    pkgName,\n    // npm requires '--' to stop interpreting subsequent flags as npm config\n    ...(pm === 'npm' ? ['--'] : []),\n    workspace,\n    ...(iac ? [`--iac=${iac}`] : []),\n  ];\n  return parts.join(' ');\n};\n"],"names":["PACKAGE_MANAGER_COMMANDS","npm","exec","run","create","pnpm","yarn","bun","buildPackageManagerExecCommand","pm","command","prefix","buildPackageManagerShortCommand","buildInstallCommand","pkg","dev","buildCreateNxWorkspaceCommand","workspace","iac","tag","createPrefix","pkgName","parts","join"],"mappings":"AAAA;;;CAGC,GACD;;;;;;;;CAQC,GAUD,OAAO,MAAMA,2BAGT;IACFC,KAAK;QAAEC,MAAM;QAAOC,KAAK;QAAWC,QAAQ;IAAa;IACzDC,MAAM;QAAEH,MAAM;QAAQC,KAAK;QAAQC,QAAQ;IAAc;IACzDE,MAAM;QAAEJ,MAAM;QAAQC,KAAK;QAAQC,QAAQ;IAAc;IACzDG,KAAK;QAAEL,MAAM;QAAQC,KAAK;QAAOC,QAAQ;IAAa;AACxD,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMI,iCAAiC,CAACC,IAAYC;IACzD,MAAMC,SAASX,wBAAwB,CAACS,GAAG,EAAEP,QAAQO;IACrD,OAAO,GAAGE,OAAO,CAAC,EAAED,SAAS;AAC/B,EAAE;AAEF;;CAEC,GACD,OAAO,MAAME,kCAAkC,CAC7CH,IACAC;IAEA,MAAMC,SAASX,wBAAwB,CAACS,GAAG,EAAEN,OAAOM;IACpD,OAAO,GAAGE,OAAO,CAAC,EAAED,SAAS;AAC/B,EAAE;AAEF;;CAEC,GACD,OAAO,MAAMG,sBAAsB,CAACJ,IAAYK,KAAaC;IAC3D,OAAQN;QACN,KAAK;YACH,OAAO,CAAC,SAAS,EAAEM,MAAM,OAAO,IAAI,EAAE,EAAED,KAAK;QAC/C,KAAK;YACH,OAAO,CAAC,SAAS,EAAEC,MAAM,QAAQ,KAAKD,KAAK;QAC7C,KAAK;YACH,OAAO,CAAC,+BAA+B,EAAEC,MAAM,QAAQ,KAAKD,KAAK;QACnE,KAAK;YACH,OAAO,CAAC,YAAY,EAAEC,MAAM,QAAQ,KAAKD,KAAK;QAChD;YACE,OAAO,GAAGL,GAAG,SAAS,EAAEM,MAAM,QAAQ,KAAKD,KAAK;IACpD;AACF,EAAE;AAEF;;;;;;;;;;;CAWC,GACD,OAAO,MAAME,gCAAgC,CAC3CP,IACAQ,WACAC,KACAC;IAEA,MAAMC,eAAepB,wBAAwB,CAACS,GAAG,EAAEL,UAAU,GAAGK,GAAG,OAAO,CAAC;IAC3E,MAAMY,UAAUF,MAAM,CAAC,kBAAkB,EAAEA,KAAK,GAAG;IACnD,MAAMG,QAAQ;QACZF;QACAC;QACA,wEAAwE;WACpEZ,OAAO,QAAQ;YAAC;SAAK,GAAG,EAAE;QAC9BQ;WACIC,MAAM;YAAC,CAAC,MAAM,EAAEA,KAAK;SAAC,GAAG,EAAE;KAChC;IACD,OAAOI,MAAMC,IAAI,CAAC;AACpB,EAAE"}

package/src/utils/config/index.d.ts

@@ -2,12 +2,12 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { LicenseConfig } from '../../license/config-types';
-import { IacConfig } from '../iac';
-import { ContainersConfig } from '../containers';
+import type { LicenseConfig } from '../../license/config-types';
+import type { ContainersConfig } from '../containers';
+import type { IacConfig } from '../iac';
 export * from '../../license/config-types';
-export { IacConfig, Iac } from '../iac';
-export { ContainersConfig, Containers } from '../containers';
+export type { Containers, ContainersConfig } from '../containers';
+export type { Iac, IacConfig } from '../iac';
 /**
  * Configuration for the nx plugin
  */

package/src/utils/config/index.js

@@ -1,5 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("../../license/config-types"), exports);
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export * from "../../license/config-types.js";
+
 //# sourceMappingURL=index.js.map

package/src/utils/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/config/index.ts"],"names":[],"mappings":";;;AAQA,qEAA2C"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/config/index.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport type { LicenseConfig } from '../../license/config-types';\nimport type { ContainersConfig } from '../containers';\nimport type { IacConfig } from '../iac';\n\nexport * from '../../license/config-types';\nexport type { Containers, ContainersConfig } from '../containers';\nexport type { Iac, IacConfig } from '../iac';\n\n/**\n * Configuration for the nx plugin\n */\nexport interface AwsNxPluginConfig {\n  /**\n   * Configuration for the license sync generator\n   */\n  license?: LicenseConfig;\n\n  /**\n   * Configuration for infrastructure as code\n   */\n  iac?: IacConfig;\n\n  /**\n   * Configuration for container tooling (build/push/login)\n   */\n  containers?: ContainersConfig;\n\n  /**\n   * List of tags\n   */\n  tags?: string[];\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAKD,cAAc,gCAA6B"}

package/src/utils/config/utils.d.ts

@@ -2,17 +2,27 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
-import { AwsNxPluginConfig } from '.';
+import { type Tree } from '@nx/devkit';
+import type { AwsNxPluginConfig } from '.';
 export declare const AWS_NX_PLUGIN_CONFIG_FILE_NAME = "aws-nx-plugin.config.mts";
 /**
  * Ensure that the config file exists
  */
 export declare const ensureAwsNxPluginConfig: (tree: Tree) => Promise<AwsNxPluginConfig>;
 /**
- * Read config from the aws nx plugin configuration file
+ * Read config from the aws nx plugin configuration file.
+ *
+ * Uses jiti to evaluate the TypeScript source in-memory with proper module
+ * resolution — imports from @aws/nx-plugin/* resolve via alias, and any
+ * third-party imports resolve from the workspace's node_modules.
  */
 export declare const readAwsNxPluginConfig: (tree: Tree) => Promise<AwsNxPluginConfig | undefined>;
+/**
+ * Read config directly from disk. Used by executors that run in the real
+ * workspace (not a virtual Tree). Resolves all imports — including
+ * third-party dependencies — from the workspace's node_modules.
+ */
+export declare const readAwsNxPluginConfigFromDisk: (workspaceRoot: string) => AwsNxPluginConfig | undefined;
 /**
  * Update the aws nx plugin config file.
  * Only the specified top-level keys are replaced; all other properties

package/src/utils/config/utils.js

@@ -1,71 +1,94 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAwsNxPluginConfig = exports.readAwsNxPluginConfig = exports.ensureAwsNxPluginConfig = exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME = void 0;
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-const devkit_1 = require("@nx/devkit");
-const ast_1 = require("../ast");
-const format_1 = require("../format");
-const js_1 = require("../js");
-exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME = 'aws-nx-plugin.config.mts';
+ */ import { generateFiles, joinPathFragments } from "@nx/devkit";
+import { existsSync, readFileSync } from "fs";
+import { createJiti } from "jiti";
+import { join } from "path";
+import { applyGritQL, matchGritQL } from "../ast.js";
+import { formatFilesInSubtree } from "../format.js";
+export const AWS_NX_PLUGIN_CONFIG_FILE_NAME = 'aws-nx-plugin.config.mts';
+/**
+ * Aliases used by jiti to resolve `@aws/nx-plugin` imports in the config file
+ * to this package's source, so the config can be evaluated in-memory.
+ */ const AWS_NX_PLUGIN_JITI_ALIASES = {
+    '@aws/nx-plugin/sdk/license': join(import.meta.dirname, '..', '..', 'sdk', 'license'),
+    '@aws/nx-plugin': join(import.meta.dirname, '..', '..')
+};
 /**
  * Ensure that the config file exists
- */
-const ensureAwsNxPluginConfig = async (tree) => {
-    if (!tree.exists(exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {
+ */ export const ensureAwsNxPluginConfig = async (tree)=>{
+    if (!tree.exists(AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {
         // Create an empty config file if it doesn't already exist
-        (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), '.', {});
+        generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), '.', {});
     }
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    return await (0, exports.readAwsNxPluginConfig)(tree);
+    return await readAwsNxPluginConfig(tree);
 };
-exports.ensureAwsNxPluginConfig = ensureAwsNxPluginConfig;
 /**
- * Read config from the aws nx plugin configuration file
- */
-const readAwsNxPluginConfig = async (tree) => {
-    if (!tree.exists(exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {
+ * Read config from the aws nx plugin configuration file.
+ *
+ * Uses jiti to evaluate the TypeScript source in-memory with proper module
+ * resolution — imports from @aws/nx-plugin/* resolve via alias, and any
+ * third-party imports resolve from the workspace's node_modules.
+ */ export const readAwsNxPluginConfig = async (tree)=>{
+    if (!tree.exists(AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {
         return undefined;
     }
-    const configTs = tree.read(exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME, 'utf-8');
-    return await (0, js_1.importTypeScriptModule)(configTs);
+    const source = tree.read(AWS_NX_PLUGIN_CONFIG_FILE_NAME, 'utf-8');
+    const configFilePath = join(tree.root, AWS_NX_PLUGIN_CONFIG_FILE_NAME);
+    const jiti = createJiti(import.meta.filename, {
+        alias: AWS_NX_PLUGIN_JITI_ALIASES
+    });
+    const mod = jiti.evalModule(source, {
+        filename: configFilePath
+    });
+    return mod.default ?? mod;
+};
+/**
+ * Read config directly from disk. Used by executors that run in the real
+ * workspace (not a virtual Tree). Resolves all imports — including
+ * third-party dependencies — from the workspace's node_modules.
+ */ export const readAwsNxPluginConfigFromDisk = (workspaceRoot)=>{
+    const configPath = join(workspaceRoot, AWS_NX_PLUGIN_CONFIG_FILE_NAME);
+    if (!existsSync(configPath)) return undefined;
+    const source = readFileSync(configPath, 'utf-8');
+    const jiti = createJiti(import.meta.filename, {
+        alias: AWS_NX_PLUGIN_JITI_ALIASES
+    });
+    const mod = jiti.evalModule(source, {
+        filename: configPath
+    });
+    return mod.default ?? mod;
 };
-exports.readAwsNxPluginConfig = readAwsNxPluginConfig;
 const PLACEHOLDER = '"__PLACEHOLDER__"';
 /**
  * Use GritQL to set a top-level property in the export default object,
  * then substitute the placeholder with the JSON-serialized value.
  * Preserves all other properties (including JS expressions) untouched.
- */
-const setConfigProperty = async (tree, filePath, key, value) => {
+ */ const setConfigProperty = async (tree, filePath, key, value)=>{
     const json = JSON.stringify(value);
     // Check if the property already exists using a named metavariable
     // to avoid ambiguity with anonymous $_ in nested where clauses
-    const existsInSatisfies = await (0, ast_1.matchGritQL)(tree, filePath, `\`${key}: $val\` where { $val <: within \`export default $_ satisfies $_\` }`);
-    const existsInPlain = !existsInSatisfies &&
-        (await (0, ast_1.matchGritQL)(tree, filePath, `\`${key}: $val\` where { $val <: within \`export default $_\` }`));
+    const existsInSatisfies = await matchGritQL(tree, filePath, `\`${key}: $val\` where { $val <: within \`export default $_ satisfies $_\` }`);
+    const existsInPlain = !existsInSatisfies && await matchGritQL(tree, filePath, `\`${key}: $val\` where { $val <: within \`export default $_\` }`);
     if (existsInSatisfies || existsInPlain) {
         // Replace only this property's value, scoped to the export default
-        const within = existsInSatisfies
-            ? `within \`export default $_ satisfies $_\``
-            : `within \`export default $_\``;
-        await (0, ast_1.applyGritQL)(tree, filePath, `\`${key}: $old\` => \`${key}: ${PLACEHOLDER}\` where { $old <: ${within} }`);
-    }
-    else {
+        const within = existsInSatisfies ? `within \`export default $_ satisfies $_\`` : `within \`export default $_\``;
+        await applyGritQL(tree, filePath, `\`${key}: $old\` => \`${key}: ${PLACEHOLDER}\` where { $old <: ${within} }`);
+    } else {
         // Add the new property using GritQL's += (accumulate) operator.
         // For non-empty objects, += appends correctly without double commas.
         // For empty objects, += fails so we fall back to a direct replacement.
-        let added = await (0, ast_1.applyGritQL)(tree, filePath, `\`export default { $props } satisfies $type\` where { $props += \`, ${key}: ${PLACEHOLDER}\` }`);
+        let added = await applyGritQL(tree, filePath, `\`export default { $props } satisfies $type\` where { $props += \`, ${key}: ${PLACEHOLDER}\` }`);
         if (!added) {
-            added = await (0, ast_1.applyGritQL)(tree, filePath, `\`export default { } satisfies $type\` => \`export default { ${key}: ${PLACEHOLDER} } satisfies $type\``);
+            added = await applyGritQL(tree, filePath, `\`export default { } satisfies $type\` => \`export default { ${key}: ${PLACEHOLDER} } satisfies $type\``);
         }
         if (!added) {
-            added = await (0, ast_1.applyGritQL)(tree, filePath, `\`export default { $props }\` where { $props += \`, ${key}: ${PLACEHOLDER}\` }`);
+            added = await applyGritQL(tree, filePath, `\`export default { $props }\` where { $props += \`, ${key}: ${PLACEHOLDER}\` }`);
         }
         if (!added) {
-            await (0, ast_1.applyGritQL)(tree, filePath, `\`export default { }\` => \`export default { ${key}: ${PLACEHOLDER} }\``);
+            await applyGritQL(tree, filePath, `\`export default { }\` => \`export default { ${key}: ${PLACEHOLDER} }\``);
         }
     }
     // Substitute the placeholder with the actual JSON value
@@ -76,14 +99,13 @@ const setConfigProperty = async (tree, filePath, key, value) => {
  * Update the aws nx plugin config file.
  * Only the specified top-level keys are replaced; all other properties
  * (including those containing JS expressions) are left untouched in source.
- */
-const updateAwsNxPluginConfig = async (tree, configUpdate) => {
-    const filePath = exports.AWS_NX_PLUGIN_CONFIG_FILE_NAME;
-    for (const [key, value] of Object.entries(configUpdate)) {
+ */ export const updateAwsNxPluginConfig = async (tree, configUpdate)=>{
+    const filePath = AWS_NX_PLUGIN_CONFIG_FILE_NAME;
+    for (const [key, value] of Object.entries(configUpdate)){
         await setConfigProperty(tree, filePath, key, value);
     }
     // Prettier formats the result into properly indented TypeScript
-    await (0, format_1.formatFilesInSubtree)(tree, filePath);
+    await formatFilesInSubtree(tree, filePath);
 };
-exports.updateAwsNxPluginConfig = updateAwsNxPluginConfig;
+
 //# sourceMappingURL=utils.js.map

package/src/utils/config/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/config/utils.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAAoE;AAEpE,gCAAkD;AAClD,sCAAiD;AACjD,8BAA+C;AAElC,QAAA,8BAA8B,GAAG,0BAA0B,CAAC;AAEzE;;GAEG;AACI,MAAM,uBAAuB,GAAG,KAAK,EAC1C,IAAU,EACkB,EAAE;IAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,sCAA8B,CAAC,EAAE,CAAC;QACjD,0DAA0D;QAC1D,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IACtE,CAAC;IACD,oEAAoE;IACpE,OAAO,MAAM,IAAA,6BAAqB,EAAC,IAAI,CAAE,CAAC;AAC5C,CAAC,CAAC;AATW,QAAA,uBAAuB,2BASlC;AAEF;;GAEG;AACI,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAU,EAC8B,EAAE;IAC1C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,sCAA8B,CAAC,EAAE,CAAC;QACjD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,sCAA8B,EAAE,OAAO,CAAC,CAAC;IACpE,OAAO,MAAM,IAAA,2BAAsB,EAAC,QAAQ,CAAC,CAAC;AAChD,CAAC,CAAC;AARW,QAAA,qBAAqB,yBAQhC;AAEF,MAAM,WAAW,GAAG,mBAAmB,CAAC;AAExC;;;;GAIG;AACH,MAAM,iBAAiB,GAAG,KAAK,EAC7B,IAAU,EACV,QAAgB,EAChB,GAAW,EACX,KAAc,EACC,EAAE;IACjB,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;IAEnC,kEAAkE;IAClE,+DAA+D;IAC/D,MAAM,iBAAiB,GAAG,MAAM,IAAA,iBAAW,EACzC,IAAI,EACJ,QAAQ,EACR,KAAK,GAAG,sEAAsE,CAC/E,CAAC;IACF,MAAM,aAAa,GACjB,CAAC,iBAAiB;QAClB,CAAC,MAAM,IAAA,iBAAW,EAChB,IAAI,EACJ,QAAQ,EACR,KAAK,GAAG,yDAAyD,CAClE,CAAC,CAAC;IAEL,IAAI,iBAAiB,IAAI,aAAa,EAAE,CAAC;QACvC,mEAAmE;QACnE,MAAM,MAAM,GAAG,iBAAiB;YAC9B,CAAC,CAAC,2CAA2C;YAC7C,CAAC,CAAC,8BAA8B,CAAC;QACnC,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,QAAQ,EACR,KAAK,GAAG,iBAAiB,GAAG,KAAK,WAAW,sBAAsB,MAAM,IAAI,CAC7E,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,gEAAgE;QAChE,qEAAqE;QACrE,uEAAuE;QACvE,IAAI,KAAK,GAAG,MAAM,IAAA,iBAAW,EAC3B,IAAI,EACJ,QAAQ,EACR,uEAAuE,GAAG,KAAK,WAAW,MAAM,CACjG,CAAC;QAEF,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,MAAM,IAAA,iBAAW,EACvB,IAAI,EACJ,QAAQ,EACR,gEAAgE,GAAG,KAAK,WAAW,sBAAsB,CAC1G,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,KAAK,GAAG,MAAM,IAAA,iBAAW,EACvB,IAAI,EACJ,QAAQ,EACR,uDAAuD,GAAG,KAAK,WAAW,MAAM,CACjF,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAA,iBAAW,EACf,IAAI,EACJ,QAAQ,EACR,gDAAgD,GAAG,KAAK,WAAW,MAAM,CAC1E,CAAC;QACJ,CAAC;IACH,CAAC;IAED,wDAAwD;IACxD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAE,CAAC,QAAQ,EAAE,CAAC;IAChD,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;AAC3D,CAAC,CAAC;AAEF;;;;GAIG;AACI,MAAM,uBAAuB,GAAG,KAAK,EAC1C,IAAU,EACV,YAAwC,EACzB,EAAE;IACjB,MAAM,QAAQ,GAAG,sCAA8B,CAAC;IAEhD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QACxD,MAAM,iBAAiB,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAED,gEAAgE;IAChE,MAAM,IAAA,6BAAoB,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;AAC7C,CAAC,CAAC;AAZW,QAAA,uBAAuB,2BAYlC"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/config/utils.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { generateFiles, joinPathFragments, type Tree } from '@nx/devkit';\nimport { existsSync, readFileSync } from 'fs';\nimport { createJiti } from 'jiti';\nimport { join } from 'path';\nimport { applyGritQL, matchGritQL } from '../ast';\nimport { formatFilesInSubtree } from '../format';\nimport type { AwsNxPluginConfig } from '.';\n\nexport const AWS_NX_PLUGIN_CONFIG_FILE_NAME = 'aws-nx-plugin.config.mts';\n\n/**\n * Aliases used by jiti to resolve `@aws/nx-plugin` imports in the config file\n * to this package's source, so the config can be evaluated in-memory.\n */\nconst AWS_NX_PLUGIN_JITI_ALIASES = {\n  '@aws/nx-plugin/sdk/license': join(\n    import.meta.dirname,\n    '..',\n    '..',\n    'sdk',\n    'license',\n  ),\n  '@aws/nx-plugin': join(import.meta.dirname, '..', '..'),\n};\n\n/**\n * Ensure that the config file exists\n */\nexport const ensureAwsNxPluginConfig = async (\n  tree: Tree,\n): Promise<AwsNxPluginConfig> => {\n  if (!tree.exists(AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {\n    // Create an empty config file if it doesn't already exist\n    generateFiles(\n      tree,\n      joinPathFragments(import.meta.dirname, 'files'),\n      '.',\n      {},\n    );\n  }\n  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion\n  return await readAwsNxPluginConfig(tree)!;\n};\n\n/**\n * Read config from the aws nx plugin configuration file.\n *\n * Uses jiti to evaluate the TypeScript source in-memory with proper module\n * resolution — imports from @aws/nx-plugin/* resolve via alias, and any\n * third-party imports resolve from the workspace's node_modules.\n */\nexport const readAwsNxPluginConfig = async (\n  tree: Tree,\n): Promise<AwsNxPluginConfig | undefined> => {\n  if (!tree.exists(AWS_NX_PLUGIN_CONFIG_FILE_NAME)) {\n    return undefined;\n  }\n  const source = tree.read(AWS_NX_PLUGIN_CONFIG_FILE_NAME, 'utf-8')!;\n  const configFilePath = join(tree.root, AWS_NX_PLUGIN_CONFIG_FILE_NAME);\n\n  const jiti = createJiti(import.meta.filename, {\n    alias: AWS_NX_PLUGIN_JITI_ALIASES,\n  });\n\n  const mod = jiti.evalModule(source, { filename: configFilePath });\n  return (mod as any).default ?? mod;\n};\n\n/**\n * Read config directly from disk. Used by executors that run in the real\n * workspace (not a virtual Tree). Resolves all imports — including\n * third-party dependencies — from the workspace's node_modules.\n */\nexport const readAwsNxPluginConfigFromDisk = (\n  workspaceRoot: string,\n): AwsNxPluginConfig | undefined => {\n  const configPath = join(workspaceRoot, AWS_NX_PLUGIN_CONFIG_FILE_NAME);\n  if (!existsSync(configPath)) return undefined;\n\n  const source = readFileSync(configPath, 'utf-8');\n\n  const jiti = createJiti(import.meta.filename, {\n    alias: AWS_NX_PLUGIN_JITI_ALIASES,\n  });\n  const mod = jiti.evalModule(source, { filename: configPath });\n  return (mod as any).default ?? mod;\n};\n\nconst PLACEHOLDER = '\"__PLACEHOLDER__\"';\n\n/**\n * Use GritQL to set a top-level property in the export default object,\n * then substitute the placeholder with the JSON-serialized value.\n * Preserves all other properties (including JS expressions) untouched.\n */\nconst setConfigProperty = async (\n  tree: Tree,\n  filePath: string,\n  key: string,\n  value: unknown,\n): Promise<void> => {\n  const json = JSON.stringify(value);\n\n  // Check if the property already exists using a named metavariable\n  // to avoid ambiguity with anonymous $_ in nested where clauses\n  const existsInSatisfies = await matchGritQL(\n    tree,\n    filePath,\n    `\\`${key}: $val\\` where { $val <: within \\`export default $_ satisfies $_\\` }`,\n  );\n  const existsInPlain =\n    !existsInSatisfies &&\n    (await matchGritQL(\n      tree,\n      filePath,\n      `\\`${key}: $val\\` where { $val <: within \\`export default $_\\` }`,\n    ));\n\n  if (existsInSatisfies || existsInPlain) {\n    // Replace only this property's value, scoped to the export default\n    const within = existsInSatisfies\n      ? `within \\`export default $_ satisfies $_\\``\n      : `within \\`export default $_\\``;\n    await applyGritQL(\n      tree,\n      filePath,\n      `\\`${key}: $old\\` => \\`${key}: ${PLACEHOLDER}\\` where { $old <: ${within} }`,\n    );\n  } else {\n    // Add the new property using GritQL's += (accumulate) operator.\n    // For non-empty objects, += appends correctly without double commas.\n    // For empty objects, += fails so we fall back to a direct replacement.\n    let added = await applyGritQL(\n      tree,\n      filePath,\n      `\\`export default { $props } satisfies $type\\` where { $props += \\`, ${key}: ${PLACEHOLDER}\\` }`,\n    );\n\n    if (!added) {\n      added = await applyGritQL(\n        tree,\n        filePath,\n        `\\`export default { } satisfies $type\\` => \\`export default { ${key}: ${PLACEHOLDER} } satisfies $type\\``,\n      );\n    }\n\n    if (!added) {\n      added = await applyGritQL(\n        tree,\n        filePath,\n        `\\`export default { $props }\\` where { $props += \\`, ${key}: ${PLACEHOLDER}\\` }`,\n      );\n    }\n\n    if (!added) {\n      await applyGritQL(\n        tree,\n        filePath,\n        `\\`export default { }\\` => \\`export default { ${key}: ${PLACEHOLDER} }\\``,\n      );\n    }\n  }\n\n  // Substitute the placeholder with the actual JSON value\n  const content = tree.read(filePath)!.toString();\n  tree.write(filePath, content.replace(PLACEHOLDER, json));\n};\n\n/**\n * Update the aws nx plugin config file.\n * Only the specified top-level keys are replaced; all other properties\n * (including those containing JS expressions) are left untouched in source.\n */\nexport const updateAwsNxPluginConfig = async (\n  tree: Tree,\n  configUpdate: Partial<AwsNxPluginConfig>,\n): Promise<void> => {\n  const filePath = AWS_NX_PLUGIN_CONFIG_FILE_NAME;\n\n  for (const [key, value] of Object.entries(configUpdate)) {\n    await setConfigProperty(tree, filePath, key, value);\n  }\n\n  // Prettier formats the result into properly indented TypeScript\n  await formatFilesInSubtree(tree, filePath);\n};\n"],"names":["generateFiles","joinPathFragments","existsSync","readFileSync","createJiti","join","applyGritQL","matchGritQL","formatFilesInSubtree","AWS_NX_PLUGIN_CONFIG_FILE_NAME","AWS_NX_PLUGIN_JITI_ALIASES","dirname","ensureAwsNxPluginConfig","tree","exists","readAwsNxPluginConfig","undefined","source","read","configFilePath","root","jiti","filename","alias","mod","evalModule","default","readAwsNxPluginConfigFromDisk","workspaceRoot","configPath","PLACEHOLDER","setConfigProperty","filePath","key","value","json","JSON","stringify","existsInSatisfies","existsInPlain","within","added","content","toString","write","replace","updateAwsNxPluginConfig","configUpdate","Object","entries"],"mappings":"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"}

package/src/utils/connection/open-api/files/components/__apiNameClassName__Provider.tsx.template

@@ -39,7 +39,7 @@ const useCreate<%- apiNameClassName %>Client = (): <%- apiNameClassName %> => {
   const user = auth?.user;
   const cognitoClient: typeof fetch = (url, init) => {
     const headers = new Headers(init?.headers);
-    headers.set('Authorization', `Bearer ${user?.id_token}`);
+    headers.set('Authorization', `Bearer ${user?.access_token}`);
     return fetch(url, { ...init, headers });
   };
   <%_ } _%>

package/src/utils/connection/open-api/react.d.ts

@@ -2,7 +2,7 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { ProjectConfiguration, Tree } from '@nx/devkit';
+import { type ProjectConfiguration, type Tree } from '@nx/devkit';
 export interface AddOpenApiReactClientOptions {
     /**
      * The react project to add the openapi client and build targets to
@@ -43,13 +43,13 @@ export interface AddOpenApiReactClientOptions {
      */
     isAgentRuntime?: boolean;
     /**
-     * When true, skips the serve-local setup. Use this when the caller
-     * handles serve-local configuration separately (e.g. agent connections
-     * that use a component-specific serve-local target instead of 'serve').
+     * When true, skips the dev target setup. Use this when the caller
+     * handles dev target configuration separately (e.g. agent connections
+     * that use a component-specific dev target instead of 'serve').
      */
-    skipServeLocal?: boolean;
+    skipLocalDev?: boolean;
 }
 /**
  * Adds an OpenAPI React client to the frontend project along with supporting build targets
  */
-export declare const addOpenApiReactClient: (tree: Tree, { apiName, frontendProjectConfig, backendProjectConfig, specBuildProject, specPath, specBuildTargetName, auth, port, isAgentRuntime, skipServeLocal, }: AddOpenApiReactClientOptions) => Promise<void>;
+export declare const addOpenApiReactClient: (tree: Tree, { apiName, frontendProjectConfig, backendProjectConfig, specBuildProject, specPath, specBuildTargetName, auth, port, isAgentRuntime, skipLocalDev, }: AddOpenApiReactClientOptions) => Promise<void>;