@aws/nx-plugin 1.0.0-rc.9 → 1.0.0-rc.90

package/src/utils/base-tsconfig.d.ts

@@ -0,0 +1,30 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/**
+ * The `tsconfig.base.json` compiler options the plugin's TypeScript projects
+ * rely on (project references, ESM, emit-less typecheck). Mirrors what
+ * `@nx/js` `initGenerator` produces for a fresh TS-solution workspace.
+ *
+ * Kept dependency-free so the docs site can import it directly and render the
+ * options without them drifting from what the generator writes.
+ */
+export declare const BASE_TSCONFIG_COMPILER_OPTIONS: {
+    composite: boolean;
+    declarationMap: boolean;
+    emitDeclarationOnly: boolean;
+    importHelpers: boolean;
+    isolatedModules: boolean;
+    lib: string[];
+    module: string;
+    moduleResolution: string;
+    noEmitOnError: boolean;
+    noFallthroughCasesInSwitch: boolean;
+    noImplicitOverride: boolean;
+    noImplicitReturns: boolean;
+    noUnusedLocals: boolean;
+    skipLibCheck: boolean;
+    strict: boolean;
+    target: string;
+};

package/src/utils/base-tsconfig.js

@@ -0,0 +1,32 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ /**
+ * The `tsconfig.base.json` compiler options the plugin's TypeScript projects
+ * rely on (project references, ESM, emit-less typecheck). Mirrors what
+ * `@nx/js` `initGenerator` produces for a fresh TS-solution workspace.
+ *
+ * Kept dependency-free so the docs site can import it directly and render the
+ * options without them drifting from what the generator writes.
+ */ export const BASE_TSCONFIG_COMPILER_OPTIONS = {
+    composite: true,
+    declarationMap: true,
+    emitDeclarationOnly: true,
+    importHelpers: true,
+    isolatedModules: true,
+    lib: [
+        'es2022'
+    ],
+    module: 'nodenext',
+    moduleResolution: 'nodenext',
+    noEmitOnError: true,
+    noFallthroughCasesInSwitch: true,
+    noImplicitOverride: true,
+    noImplicitReturns: true,
+    noUnusedLocals: true,
+    skipLibCheck: true,
+    strict: true,
+    target: 'es2022'
+};
+
+//# sourceMappingURL=base-tsconfig.js.map

package/src/utils/base-tsconfig.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../packages/nx-plugin/src/utils/base-tsconfig.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\n/**\n * The `tsconfig.base.json` compiler options the plugin's TypeScript projects\n * rely on (project references, ESM, emit-less typecheck). Mirrors what\n * `@nx/js` `initGenerator` produces for a fresh TS-solution workspace.\n *\n * Kept dependency-free so the docs site can import it directly and render the\n * options without them drifting from what the generator writes.\n */\nexport const BASE_TSCONFIG_COMPILER_OPTIONS = {\n  composite: true,\n  declarationMap: true,\n  emitDeclarationOnly: true,\n  importHelpers: true,\n  isolatedModules: true,\n  lib: ['es2022'],\n  module: 'nodenext',\n  moduleResolution: 'nodenext',\n  noEmitOnError: true,\n  noFallthroughCasesInSwitch: true,\n  noImplicitOverride: true,\n  noImplicitReturns: true,\n  noUnusedLocals: true,\n  skipLibCheck: true,\n  strict: true,\n  target: 'es2022',\n};\n"],"names":["BASE_TSCONFIG_COMPILER_OPTIONS","composite","declarationMap","emitDeclarationOnly","importHelpers","isolatedModules","lib","module","moduleResolution","noEmitOnError","noFallthroughCasesInSwitch","noImplicitOverride","noImplicitReturns","noUnusedLocals","skipLibCheck","strict","target"],"mappings":"AAAA;;;CAGC,GAED;;;;;;;CAOC,GACD,OAAO,MAAMA,iCAAiC;IAC5CC,WAAW;IACXC,gBAAgB;IAChBC,qBAAqB;IACrBC,eAAe;IACfC,iBAAiB;IACjBC,KAAK;QAAC;KAAS;IACfC,QAAQ;IACRC,kBAAkB;IAClBC,eAAe;IACfC,4BAA4B;IAC5BC,oBAAoB;IACpBC,mBAAmB;IACnBC,gBAAgB;IAChBC,cAAc;IACdC,QAAQ;IACRC,QAAQ;AACV,EAAE"}

package/src/utils/bundle/bundle.d.ts

@@ -3,6 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type ProjectConfiguration, type Tree } from '@nx/devkit';
+import { type DependencyDeclaration, type MustDeclare } from '../declared-dependencies.js';
+/** Dependencies a caller must declare to add a TypeScript bundle target. */
+export declare const BUNDLE_DEPENDENCIES: readonly [{
+    readonly name: "rolldown";
+}];
 export interface AddPythonBundleTargetOptions {
     /**
      * Python platform
@@ -40,4 +45,4 @@ export interface AddTypeScriptBundleTargetOptions {
 /**
  * Add a TypeScript bundle target using rolldown
  */
-export declare const addTypeScriptBundleTarget: (tree: Tree, project: ProjectConfiguration, opts: AddTypeScriptBundleTargetOptions) => Promise<void>;
+export declare const addTypeScriptBundleTarget: <const D extends DependencyDeclaration>(tree: Tree, project: ProjectConfiguration, opts: AddTypeScriptBundleTargetOptions, declaration: D & MustDeclare<typeof BUNDLE_DEPENDENCIES, D>) => Promise<void>;

package/src/utils/bundle/bundle.js

@@ -1,112 +1,134 @@
-"use strict";
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.addTypeScriptBundleTarget = exports.addPythonBundleTarget = void 0;
-const devkit_1 = require("@nx/devkit");
-const ast_1 = require("../ast");
-const nx_1 = require("../nx");
-const paths_1 = require("../paths");
-const versions_1 = require("../versions");
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy } from "@nx/devkit";
+import { applyGritQL } from "../ast.js";
+import { forDependencies } from "../declared-dependencies.js";
+import { addDependenciesToPackageJson } from "../dependencies.js";
+import { addArtifactDependencyToTargets, addDependencyToTargetIfNotPresent, normalizeTargetKeyOrder } from "../nx.js";
+import { getRelativePathToRoot } from "../paths.js";
+import { LAMBDA_RUNTIME_VERSIONS, withVersions } from "../versions.js";
+/** Dependencies a caller must declare to add a TypeScript bundle target. */ export const BUNDLE_DEPENDENCIES = [
+    {
+        name: 'rolldown'
+    }
+];
 /**
  * Create a target for bundling a python project
- */
-const createPythonBundleTarget = ({ packageName, pythonPlatform, bundleTargetName, }) => {
+ */ const createPythonBundleTarget = ({ packageName, pythonPlatform, bundleTargetName })=>{
     return {
         cache: true,
-        inputs: ['default', '^production'],
+        // The bundle holds exported dependencies and the entrypoint script, never
+        // test files, so tests are excluded via `production`.
+        inputs: [
+            'production',
+            '^production'
+        ],
         executor: 'nx:run-commands',
-        outputs: [`{workspaceRoot}/dist/{projectRoot}/${bundleTargetName}`],
+        outputs: [
+            `{workspaceRoot}/dist/{projectRoot}/${bundleTargetName}`
+        ],
         options: {
             commands: [
                 `uv export --frozen --no-dev --no-editable --project {projectRoot} --package ${packageName} -o dist/{projectRoot}/${bundleTargetName}/requirements.txt`,
-                `uv pip install -n --no-deps --no-installer-metadata --no-compile-bytecode --python-platform ${pythonPlatform} --target dist/{projectRoot}/${bundleTargetName} -r dist/{projectRoot}/${bundleTargetName}/requirements.txt`,
+                // `--python-version` pins wheel resolution to the Lambda Python runtime,
+                // so the bundle cannot be built against whichever interpreter happens to
+                // be on the build machine.
+                `uv pip install -n --no-deps --no-installer-metadata --no-compile-bytecode --python-platform ${pythonPlatform} --python-version ${LAMBDA_RUNTIME_VERSIONS.python} --target dist/{projectRoot}/${bundleTargetName} -r dist/{projectRoot}/${bundleTargetName}/requirements.txt`
             ],
-            parallel: false,
-        },
+            parallel: false
+        }
     };
 };
 /**
  * Adds a bundle target to the given project if it does not exist, and updates the build target to depend on it
- */
-const addPythonBundleTarget = (project, opts) => {
+ */ export const addPythonBundleTarget = (project, opts)=>{
     if (!project.targets) {
         project.targets = {};
     }
     const pythonPlatform = opts?.pythonPlatform ?? 'x86_64-manylinux_2_28';
     const bundleTargetName = pythonPlatform === 'aarch64-manylinux_2_28' ? 'bundle-arm' : 'bundle-x86';
     if (!project.targets?.[bundleTargetName]) {
-        project.targets[bundleTargetName] = {
+        project.targets[bundleTargetName] = normalizeTargetKeyOrder({
             ...createPythonBundleTarget({
                 packageName: project.name,
                 pythonPlatform,
-                bundleTargetName,
+                bundleTargetName
             }),
-            dependsOn: ['compile'],
-        };
+            dependsOn: [
+                'compile'
+            ]
+        });
     }
     // Add a "bundle" target which depends on either bundle-arm or bundle-x86 (or both)
-    (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'bundle', bundleTargetName);
-    (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'build', 'bundle');
+    addDependencyToTargetIfNotPresent(project, 'bundle', bundleTargetName);
+    addArtifactDependencyToTargets(project, 'bundle');
     return {
         bundleTargetName,
-        bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', project.root, bundleTargetName),
+        bundleOutputDir: joinPathFragments('dist', project.root, bundleTargetName)
     };
 };
-exports.addPythonBundleTarget = addPythonBundleTarget;
 /**
  * Add a TypeScript bundle target using rolldown
- */
-const addTypeScriptBundleTarget = async (tree, project, opts) => {
+ */ export const addTypeScriptBundleTarget = async (tree, project, opts, declaration)=>{
     project.targets ??= {};
     // Generate empty rolldown config if it doesn't exist
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'ts'), project.root, {}, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files', 'ts'), project.root, {}, {
+        overwriteStrategy: OverwriteStrategy.KeepExisting
+    });
     // Add the bundle target
     if (!project.targets.bundle) {
-        project.targets.bundle = {
+        project.targets.bundle = normalizeTargetKeyOrder({
             cache: true,
-            outputs: [`{workspaceRoot}/dist/{projectRoot}/bundle`],
+            // Declared rather than left to Nx's implicit `["default", "^default"]`,
+            // which reads a dependency's whole project directory: rolldown resolves
+            // dependencies through the build artifacts `default` already tracks, so
+            // `^default` only adds files no bundle can contain.
+            inputs: [
+                'default'
+            ],
+            outputs: [
+                `{workspaceRoot}/dist/{projectRoot}/bundle`
+            ],
             executor: 'nx:run-commands',
             options: {
                 command: 'rolldown -c rolldown.config.ts',
-                cwd: '{projectRoot}',
+                cwd: '{projectRoot}'
             },
-            dependsOn: ['compile'],
-        };
+            dependsOn: [
+                'compile'
+            ]
+        });
     }
     // Add bundle to the build target
-    (0, nx_1.addDependencyToTargetIfNotPresent)(project, 'build', 'bundle');
-    const rolldownConfigPath = (0, devkit_1.joinPathFragments)(project.root, 'rolldown.config.ts');
-    const outputFile = (0, devkit_1.joinPathFragments)((0, paths_1.getRelativePathToRoot)(tree, project.name), 'dist', project.root, 'bundle', opts.bundleOutputDir ?? '.', 'index.js');
-    const external = opts.external?.length
-        ? opts.external
-            .map((ext) => typeof ext === 'string' ? `'${ext}'` : `/${ext.source}/`)
-            .join(', ')
-        : '';
+    addArtifactDependencyToTargets(project, 'bundle');
+    const rolldownConfigPath = joinPathFragments(project.root, 'rolldown.config.ts');
+    const outputFile = joinPathFragments(getRelativePathToRoot(tree, project.name), 'dist', project.root, 'bundle', opts.bundleOutputDir ?? '.', 'index.js');
+    const external = opts.external?.length ? opts.external.map((ext)=>typeof ext === 'string' ? `'${ext}'` : `/${ext.source}/`).join(', ') : '';
     const entry = `{
     tsconfig: 'tsconfig.lib.json',
     input: '${opts.targetFilePath}',
-    output: { file: '${outputFile}', format: 'cjs', inlineDynamicImports: true },
+    output: { file: '${outputFile}', format: 'cjs', codeSplitting: false },
     platform: '${opts.platform ?? 'node'}',
     ${external ? `external: [${external}],` : ''}
   }`;
     // Use GritQL to append the config entry to the defineConfig array.
     // First try the non-empty array case using the accumulate (+=) operator,
     // with an idempotency guard that checks the input path is not already present.
-    const appended = await (0, ast_1.applyGritQL)(tree, rolldownConfigPath, `\`defineConfig([$items])\` where { $items <: not contains \`'${opts.targetFilePath}'\`, $items += ", ${entry}" }`);
+    const appended = await applyGritQL(tree, rolldownConfigPath, `\`defineConfig([$items])\` where { $items <: not contains \`'${opts.targetFilePath}'\`, $items += ", ${entry}" }`);
     if (!appended) {
         // Empty array — GritQL's += cannot accumulate into an empty list, so we
         // first insert a placeholder to make the array non-empty, then replace
         // the placeholder with the real entry via += (which handles regex
         // literals that are invalid inside GritQL backtick snippets).
-        const inserted = await (0, ast_1.applyGritQL)(tree, rolldownConfigPath, `\`defineConfig([])\` => \`defineConfig([__PLACEHOLDER__])\``);
+        const inserted = await applyGritQL(tree, rolldownConfigPath, `\`defineConfig([])\` => \`defineConfig([__PLACEHOLDER__])\``);
         if (inserted) {
-            await (0, ast_1.applyGritQL)(tree, rolldownConfigPath, `\`defineConfig([$items])\` where { $items <: \`__PLACEHOLDER__\` => ., $items += "${entry}" }`);
+            await applyGritQL(tree, rolldownConfigPath, `\`defineConfig([$items])\` where { $items <: \`__PLACEHOLDER__\` => ., $items += "${entry}" }`);
         }
     }
-    (0, devkit_1.addDependenciesToPackageJson)(tree, {}, (0, versions_1.withVersions)(['rolldown']));
+    addDependenciesToPackageJson(tree, {}, withVersions(forDependencies(declaration), [
+        'rolldown'
+    ]));
 };
-exports.addTypeScriptBundleTarget = addTypeScriptBundleTarget;
+
 //# sourceMappingURL=bundle.js.map

package/src/utils/bundle/bundle.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/utils/bundle/bundle.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../packages/nx-plugin/src/utils/bundle/bundle.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\n\nimport {\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type ProjectConfiguration,\n  type TargetConfiguration,\n  type Tree,\n} from '@nx/devkit';\nimport { applyGritQL } from '../ast.js';\nimport {\n  type DependencyDeclaration,\n  forDependencies,\n  type MustDeclare,\n} from '../declared-dependencies.js';\nimport { addDependenciesToPackageJson } from '../dependencies.js';\nimport {\n  addArtifactDependencyToTargets,\n  addDependencyToTargetIfNotPresent,\n  normalizeTargetKeyOrder,\n} from '../nx.js';\nimport { getRelativePathToRoot } from '../paths.js';\nimport {\n  type ITsDepVersion,\n  LAMBDA_RUNTIME_VERSIONS,\n  withVersions,\n} from '../versions.js';\n\n/** Dependencies a caller must declare to add a TypeScript bundle target. */\nexport const BUNDLE_DEPENDENCIES = [\n  { name: 'rolldown' },\n] as const satisfies readonly { name: ITsDepVersion }[];\n\nexport interface AddPythonBundleTargetOptions {\n  /**\n   * Python platform\n   * @default x86_64-manylinux_2_28\n   */\n  pythonPlatform?: 'x86_64-manylinux_2_28' | 'aarch64-manylinux_2_28';\n}\n\ninterface CreatePythonBundleTargetOptions\n  extends Required<AddPythonBundleTargetOptions> {\n  /**\n   * Python package name\n   */\n  packageName: string;\n\n  /**\n   * Name of the bundle target, used for the outdir for the bundle\n   */\n  bundleTargetName: string;\n}\n\n/**\n * Create a target for bundling a python project\n */\nconst createPythonBundleTarget = ({\n  packageName,\n  pythonPlatform,\n  bundleTargetName,\n}: CreatePythonBundleTargetOptions): TargetConfiguration => {\n  return {\n    cache: true,\n    // The bundle holds exported dependencies and the entrypoint script, never\n    // test files, so tests are excluded via `production`.\n    inputs: ['production', '^production'],\n    executor: 'nx:run-commands',\n    outputs: [`{workspaceRoot}/dist/{projectRoot}/${bundleTargetName}`],\n    options: {\n      commands: [\n        `uv export --frozen --no-dev --no-editable --project {projectRoot} --package ${packageName} -o dist/{projectRoot}/${bundleTargetName}/requirements.txt`,\n        // `--python-version` pins wheel resolution to the Lambda Python runtime,\n        // so the bundle cannot be built against whichever interpreter happens to\n        // be on the build machine.\n        `uv pip install -n --no-deps --no-installer-metadata --no-compile-bytecode --python-platform ${pythonPlatform} --python-version ${LAMBDA_RUNTIME_VERSIONS.python} --target dist/{projectRoot}/${bundleTargetName} -r dist/{projectRoot}/${bundleTargetName}/requirements.txt`,\n      ],\n      parallel: false,\n    },\n  };\n};\n\n/**\n * Adds a bundle target to the given project if it does not exist, and updates the build target to depend on it\n */\nexport const addPythonBundleTarget = (\n  project: ProjectConfiguration,\n  opts?: AddPythonBundleTargetOptions,\n) => {\n  if (!project.targets) {\n    project.targets = {};\n  }\n\n  const pythonPlatform = opts?.pythonPlatform ?? 'x86_64-manylinux_2_28';\n  const bundleTargetName =\n    pythonPlatform === 'aarch64-manylinux_2_28' ? 'bundle-arm' : 'bundle-x86';\n\n  if (!project.targets?.[bundleTargetName]) {\n    project.targets[bundleTargetName] = normalizeTargetKeyOrder({\n      ...createPythonBundleTarget({\n        packageName: project.name,\n        pythonPlatform,\n        bundleTargetName,\n      }),\n      dependsOn: ['compile'],\n    });\n  }\n\n  // Add a \"bundle\" target which depends on either bundle-arm or bundle-x86 (or both)\n  addDependencyToTargetIfNotPresent(project, 'bundle', bundleTargetName);\n  addArtifactDependencyToTargets(project, 'bundle');\n\n  return {\n    bundleTargetName,\n    bundleOutputDir: joinPathFragments('dist', project.root, bundleTargetName),\n  };\n};\n\nexport interface AddTypeScriptBundleTargetOptions {\n  /**\n   * Path to the target file relative to the project dir\n   */\n  targetFilePath: string;\n\n  /**\n   * Sub directory to write bundled index.js file to (if any)\n   * Outputs to dist/{projectRoot}/bundle/{bundleOutputDir}/index.js\n   */\n  bundleOutputDir?: string;\n\n  /**\n   * Modules to omit from the bundle and treat as external\n   */\n  external?: (string | RegExp)[];\n\n  /**\n   * Target platform for the bundle\n   * @default 'node'\n   */\n  platform?: 'node' | 'browser' | 'neutral';\n}\n\n/**\n * Add a TypeScript bundle target using rolldown\n */\nexport const addTypeScriptBundleTarget = async <\n  const D extends DependencyDeclaration,\n>(\n  tree: Tree,\n  project: ProjectConfiguration,\n  opts: AddTypeScriptBundleTargetOptions,\n  declaration: D & MustDeclare<typeof BUNDLE_DEPENDENCIES, D>,\n) => {\n  project.targets ??= {};\n\n  // Generate empty rolldown config if it doesn't exist\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files', 'ts'),\n    project.root,\n    {},\n    { overwriteStrategy: OverwriteStrategy.KeepExisting },\n  );\n\n  // Add the bundle target\n  if (!project.targets.bundle) {\n    project.targets.bundle = normalizeTargetKeyOrder({\n      cache: true,\n      // Declared rather than left to Nx's implicit `[\"default\", \"^default\"]`,\n      // which reads a dependency's whole project directory: rolldown resolves\n      // dependencies through the build artifacts `default` already tracks, so\n      // `^default` only adds files no bundle can contain.\n      inputs: ['default'],\n      outputs: [`{workspaceRoot}/dist/{projectRoot}/bundle`],\n      executor: 'nx:run-commands',\n      options: {\n        command: 'rolldown -c rolldown.config.ts',\n        cwd: '{projectRoot}',\n      },\n      dependsOn: ['compile'],\n    });\n  }\n\n  // Add bundle to the build target\n  addArtifactDependencyToTargets(project, 'bundle');\n\n  const rolldownConfigPath = joinPathFragments(\n    project.root,\n    'rolldown.config.ts',\n  );\n\n  const outputFile = joinPathFragments(\n    getRelativePathToRoot(tree, project.name),\n    'dist',\n    project.root,\n    'bundle',\n    opts.bundleOutputDir ?? '.',\n    'index.js',\n  );\n\n  const external = opts.external?.length\n    ? opts.external\n        .map((ext) =>\n          typeof ext === 'string' ? `'${ext}'` : `/${ext.source}/`,\n        )\n        .join(', ')\n    : '';\n\n  const entry = `{\n    tsconfig: 'tsconfig.lib.json',\n    input: '${opts.targetFilePath}',\n    output: { file: '${outputFile}', format: 'cjs', codeSplitting: false },\n    platform: '${opts.platform ?? 'node'}',\n    ${external ? `external: [${external}],` : ''}\n  }`;\n\n  // Use GritQL to append the config entry to the defineConfig array.\n  // First try the non-empty array case using the accumulate (+=) operator,\n  // with an idempotency guard that checks the input path is not already present.\n  const appended = await applyGritQL(\n    tree,\n    rolldownConfigPath,\n    `\\`defineConfig([$items])\\` where { $items <: not contains \\`'${opts.targetFilePath}'\\`, $items += \", ${entry}\" }`,\n  );\n\n  if (!appended) {\n    // Empty array — GritQL's += cannot accumulate into an empty list, so we\n    // first insert a placeholder to make the array non-empty, then replace\n    // the placeholder with the real entry via += (which handles regex\n    // literals that are invalid inside GritQL backtick snippets).\n    const inserted = await applyGritQL(\n      tree,\n      rolldownConfigPath,\n      `\\`defineConfig([])\\` => \\`defineConfig([__PLACEHOLDER__])\\``,\n    );\n    if (inserted) {\n      await applyGritQL(\n        tree,\n        rolldownConfigPath,\n        `\\`defineConfig([$items])\\` where { $items <: \\`__PLACEHOLDER__\\` => ., $items += \"${entry}\" }`,\n      );\n    }\n  }\n\n  addDependenciesToPackageJson(\n    tree,\n    {},\n    withVersions(forDependencies<typeof BUNDLE_DEPENDENCIES>(declaration), [\n      'rolldown',\n    ]),\n  );\n};\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","applyGritQL","forDependencies","addDependenciesToPackageJson","addArtifactDependencyToTargets","addDependencyToTargetIfNotPresent","normalizeTargetKeyOrder","getRelativePathToRoot","LAMBDA_RUNTIME_VERSIONS","withVersions","BUNDLE_DEPENDENCIES","name","createPythonBundleTarget","packageName","pythonPlatform","bundleTargetName","cache","inputs","executor","outputs","options","commands","python","parallel","addPythonBundleTarget","project","opts","targets","dependsOn","bundleOutputDir","root","addTypeScriptBundleTarget","tree","declaration","dirname","overwriteStrategy","KeepExisting","bundle","command","cwd","rolldownConfigPath","outputFile","external","length","map","ext","source","join","entry","targetFilePath","platform","appended","inserted"],"mappings":"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"}

package/src/utils/commands.d.ts

@@ -2,6 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
+import { NX_VERSION } from './versions.js';
+/** Re-exported for callers that already import it from here. */
+export { NX_VERSION };
 /**
  * Display-friendly command prefixes for each package manager.
  *
@@ -29,9 +32,17 @@ export declare const buildPackageManagerExecCommand: (pm: string, command: strin
  */
 export declare const buildPackageManagerShortCommand: (pm: string, command: string) => string;
 /**
- * Build an install command for a given package manager
+ * Build an install command. Without `pkg`, installs the workspace's existing
+ * dependencies. With `project`, targets that project's manifest (pnpm
+ * `--filter` by unscoped name, npm/bun by `projectDir` defaulting to
+ * `packages/<name>`, yarn by fully-qualified name); otherwise the root.
  */
-export declare const buildInstallCommand: (pm: string, pkg: string, dev: boolean) => string;
+export declare const buildInstallCommand: (pm: string, pkg?: string, dev?: boolean, project?: string, projectDir?: string) => string;
+/**
+ * Build the command that adds Nx to a non-Nx project, pinned to the nx
+ * version the plugin is built against.
+ */
+export declare const buildNxInitCommand: (pm: string) => string;
 /**
  * Build a command to create a new workspace using @aws/create-nx-workspace.
  *
@@ -44,4 +55,4 @@ export declare const buildInstallCommand: (pm: string, pkg: string, dev: boolean
  * The package manager is auto-detected by @aws/create-nx-workspace from the
  * invoking command, so --pm is not needed.
  */
-export declare const buildCreateNxWorkspaceCommand: (pm: string, workspace: string, iac?: "cdk" | "terraform", tag?: string) => string;
+export declare const buildCreateNxWorkspaceCommand: (pm: string, workspace: string, iac?: "cdk" | "terraform", tag?: string, module?: "esm" | "cjs", extraArgs?: string) => string;

package/src/utils/commands.js

@@ -1,33 +1,68 @@
-"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
+ */ import { NX_VERSION } from "./versions.js";
+/** Re-exported for callers that already import it from here. */ export { NX_VERSION };
+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) {
+ * Build an install command. Without `pkg`, installs the workspace's existing
+ * dependencies. With `project`, targets that project's manifest (pnpm
+ * `--filter` by unscoped name, npm/bun by `projectDir` defaulting to
+ * `packages/<name>`, yarn by fully-qualified name); otherwise the root.
+ */ export const buildInstallCommand = (pm, pkg, dev, project, projectDir)=>{
+    if (!pkg) {
+        return pm === 'yarn' ? 'yarn' : `${pm} install`;
+    }
+    if (project) {
+        const shortName = project.split('/').pop();
+        const dir = projectDir ?? `packages/${shortName}`;
+        switch(pm){
+            case 'pnpm':
+                return `pnpm add ${dev ? '-D ' : ''}${pkg} --filter ${shortName}`;
+            case 'yarn':
+                return `yarn workspace ${project} add ${dev ? '-D ' : ''}${pkg}`;
+            case 'npm':
+                return `npm install --legacy-peer-deps ${dev ? '-D ' : ''}${pkg} -w ${dir}`;
+            case 'bun':
+                return `bun add ${dev ? '-D ' : ''}${pkg} --cwd ${dir}`;
+            default:
+                return `${pm} install ${dev ? '-D ' : ''}${pkg}`;
+        }
+    }
+    switch(pm){
         case 'pnpm':
             return `pnpm add ${dev ? '-D' : '-'}w ${pkg}`;
         case 'yarn':
@@ -35,12 +70,23 @@ const buildInstallCommand = (pm, pkg, dev) => {
         case 'npm':
             return `npm install --legacy-peer-deps ${dev ? '-D ' : ''}${pkg}`;
         case 'bun':
-            return `bun install ${dev ? '-D ' : ''}${pkg}`;
+            return `bun add ${dev ? '-D ' : ''}${pkg}`;
         default:
             return `${pm} install ${dev ? '-D ' : ''}${pkg}`;
     }
 };
-exports.buildInstallCommand = buildInstallCommand;
+/**
+ * Build the command that adds Nx to a non-Nx project, pinned to the nx
+ * version the plugin is built against.
+ */ export const buildNxInitCommand = (pm)=>{
+    const dlxPrefix = {
+        npm: 'npx',
+        pnpm: 'pnpm dlx',
+        yarn: 'yarn dlx',
+        bun: 'bunx'
+    }[pm] ?? 'npx';
+    return `${dlxPrefix} nx@${NX_VERSION} init`;
+};
 /**
  * Build a command to create a new workspace using @aws/create-nx-workspace.
  *
@@ -52,19 +98,28 @@ 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, module, extraArgs)=>{
+    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}`
+        ] : [],
+        ...module ? [
+            `--module=${module}`
+        ] : [],
+        ...extraArgs ? [
+            extraArgs
+        ] : []
     ];
     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 */\nimport { NX_VERSION } from './versions.js';\n\n/** Re-exported for callers that already import it from here. */\nexport { NX_VERSION };\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. Without `pkg`, installs the workspace's existing\n * dependencies. With `project`, targets that project's manifest (pnpm\n * `--filter` by unscoped name, npm/bun by `projectDir` defaulting to\n * `packages/<name>`, yarn by fully-qualified name); otherwise the root.\n */\nexport const buildInstallCommand = (\n  pm: string,\n  pkg?: string,\n  dev?: boolean,\n  project?: string,\n  projectDir?: string,\n) => {\n  if (!pkg) {\n    return pm === 'yarn' ? 'yarn' : `${pm} install`;\n  }\n  if (project) {\n    const shortName = project.split('/').pop();\n    const dir = projectDir ?? `packages/${shortName}`;\n    switch (pm) {\n      case 'pnpm':\n        return `pnpm add ${dev ? '-D ' : ''}${pkg} --filter ${shortName}`;\n      case 'yarn':\n        return `yarn workspace ${project} add ${dev ? '-D ' : ''}${pkg}`;\n      case 'npm':\n        return `npm install --legacy-peer-deps ${dev ? '-D ' : ''}${pkg} -w ${dir}`;\n      case 'bun':\n        return `bun add ${dev ? '-D ' : ''}${pkg} --cwd ${dir}`;\n      default:\n        return `${pm} install ${dev ? '-D ' : ''}${pkg}`;\n    }\n  }\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 add ${dev ? '-D ' : ''}${pkg}`;\n    default:\n      return `${pm} install ${dev ? '-D ' : ''}${pkg}`;\n  }\n};\n\n/**\n * Build the command that adds Nx to a non-Nx project, pinned to the nx\n * version the plugin is built against.\n */\nexport const buildNxInitCommand = (pm: string) => {\n  const dlxPrefix =\n    { npm: 'npx', pnpm: 'pnpm dlx', yarn: 'yarn dlx', bun: 'bunx' }[pm] ??\n    'npx';\n  return `${dlxPrefix} nx@${NX_VERSION} init`;\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  module?: 'esm' | 'cjs',\n  extraArgs?: 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    ...(module ? [`--module=${module}`] : []),\n    ...(extraArgs ? [extraArgs] : []),\n  ];\n  return parts.join(' ');\n};\n"],"names":["NX_VERSION","PACKAGE_MANAGER_COMMANDS","npm","exec","run","create","pnpm","yarn","bun","buildPackageManagerExecCommand","pm","command","prefix","buildPackageManagerShortCommand","buildInstallCommand","pkg","dev","project","projectDir","shortName","split","pop","dir","buildNxInitCommand","dlxPrefix","buildCreateNxWorkspaceCommand","workspace","iac","tag","module","extraArgs","createPrefix","pkgName","parts","join"],"mappings":"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"}

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

@@ -2,12 +2,23 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import type { LicenseConfig } from '../../license/config-types';
-import type { ContainersConfig } from '../containers';
-import type { IacConfig } from '../iac';
-export * from '../../license/config-types';
-export { Containers, ContainersConfig } from '../containers';
-export { Iac, IacConfig } from '../iac';
+import type { LicenseConfig } from '../../license/config-types.js';
+import type { ContainersConfig } from '../containers.js';
+import type { IacConfig } from '../iac.js';
+export * from '../../license/config-types.js';
+export type { Containers, ContainersConfig } from '../containers.js';
+export type { Iac, IacConfig } from '../iac.js';
+/**
+ * Configuration for how generators manage dependencies via the package manager
+ */
+export interface PackageManagerConfig {
+    /**
+     * Whether generators record dependency versions in the package manager's
+     * catalog (pnpm/yarn/bun) via `catalog:` refs. When `false`, direct version
+     * ranges are written to each project. Defaults to `true`; no effect on npm.
+     */
+    catalogs?: boolean;
+}
 /**
  * Configuration for the nx plugin
  */
@@ -24,6 +35,11 @@ export interface AwsNxPluginConfig {
      * Configuration for container tooling (build/push/login)
      */
     containers?: ContainersConfig;
+    /**
+     * Configuration for how generators manage dependencies via the package
+     * manager (e.g. whether to use dependency catalogs)
+     */
+    packageManager?: PackageManagerConfig;
     /**
      * List of tags
      */

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.js';\nimport type { ContainersConfig } from '../containers.js';\nimport type { IacConfig } from '../iac.js';\n\nexport * from '../../license/config-types.js';\nexport type { Containers, ContainersConfig } from '../containers.js';\nexport type { Iac, IacConfig } from '../iac.js';\n\n/**\n * Configuration for how generators manage dependencies via the package manager\n */\nexport interface PackageManagerConfig {\n  /**\n   * Whether generators record dependency versions in the package manager's\n   * catalog (pnpm/yarn/bun) via `catalog:` refs. When `false`, direct version\n   * ranges are written to each project. Defaults to `true`; no effect on npm.\n   */\n  catalogs?: boolean;\n}\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   * Configuration for how generators manage dependencies via the package\n   * manager (e.g. whether to use dependency catalogs)\n   */\n  packageManager?: PackageManagerConfig;\n\n  /**\n   * List of tags\n   */\n  tags?: string[];\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAKD,cAAc,gCAAgC"}

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

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { type Tree } from '@nx/devkit';
-import type { AwsNxPluginConfig } from '.';
+import type { AwsNxPluginConfig } from './index.js';
 export declare const AWS_NX_PLUGIN_CONFIG_FILE_NAME = "aws-nx-plugin.config.mts";
 /**
  * Ensure that the config file exists
@@ -14,9 +14,15 @@ export declare const ensureAwsNxPluginConfig: (tree: Tree) => Promise<AwsNxPlugi
  *
  * 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.
+ * third-party imports resolve from the workspace's node_modules. Synchronous,
+ * since `jiti.evalModule` runs in-memory.
+ *
+ * The on-disk transform cache is off: jiti keys it by file path, but the source
+ * here comes from the Tree, so one path holds different content as generators
+ * mutate the config — and every test Tree shares the `/virtual` root, making
+ * concurrent workers collide on a single cache file.
  */
-export declare const readAwsNxPluginConfig: (tree: Tree) => Promise<AwsNxPluginConfig | undefined>;
+export declare const readAwsNxPluginConfig: (tree: Tree) => AwsNxPluginConfig | undefined;
 /**
  * Read config directly from disk. Used by executors that run in the real
  * workspace (not a virtual Tree). Resolves all imports — including