@aws/nx-plugin 1.0.0-rc.1 → 1.0.0-rc.11

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

@@ -2,8 +2,8 @@
 
 exports[`infra generator > should add required dependencies to package.json > dependencies 1`] = `
 {
-  "aws-cdk": "2.1124.1",
-  "aws-cdk-lib": "2.257.0",
+  "aws-cdk": "2.1126.0",
+  "aws-cdk-lib": "2.258.0",
   "constructs": "10.6.0",
   "esbuild": "0.28.0",
   "source-map-support": "0.5.21",
@@ -12,61 +12,43 @@ exports[`infra generator > should add required dependencies to package.json > de
 
 exports[`infra generator > should add required dependencies to package.json > dev-dependencies 1`] = `
 {
-  "@eslint/js": "^9.8.0",
-  "@nx/eslint": "22.7.3",
-  "@nx/eslint-plugin": "22.7.3",
-  "@nx/js": "22.7.3",
-  "@nx/vitest": "22.7.3",
+  "@nx/js": "22.7.5",
+  "@nx/vitest": "22.7.5",
   "@swc-node/register": "~1.11.1",
   "@swc/core": "~1.15.5",
   "@swc/helpers": "~0.5.18",
-  "@types/node": "25.9.1",
-  "@vitest/coverage-v8": "4.1.7",
-  "eslint": "^9.8.0",
-  "eslint-config-prettier": "^10.0.0",
-  "eslint-plugin-prettier": "5.5.5",
+  "@types/node": "25.9.2",
+  "@vitest/coverage-v8": "4.1.8",
   "jsdom": "^27.1.0",
-  "jsonc-eslint-parser": "3.1.0",
-  "prettier": "3.8.3",
-  "tsx": "4.22.3",
+  "tsx": "4.22.4",
   "typescript": "~5.9.2",
-  "typescript-eslint": "^8.40.0",
-  "vite": "8.0.14",
-  "vitest": "4.1.7",
+  "vite": "8.0.16",
+  "vitest": "4.1.8",
 }
 `;
 
 exports[`infra generator > should add required dependencies to package.json > package-json 1`] = `
 {
   "dependencies": {
-    "aws-cdk": "2.1124.1",
-    "aws-cdk-lib": "2.257.0",
+    "aws-cdk": "2.1126.0",
+    "aws-cdk-lib": "2.258.0",
     "constructs": "10.6.0",
     "esbuild": "0.28.0",
     "source-map-support": "0.5.21",
   },
   "devDependencies": {
-    "@eslint/js": "^9.8.0",
-    "@nx/eslint": "22.7.3",
-    "@nx/eslint-plugin": "22.7.3",
-    "@nx/js": "22.7.3",
-    "@nx/vitest": "22.7.3",
+    "@nx/js": "22.7.5",
+    "@nx/vitest": "22.7.5",
     "@swc-node/register": "~1.11.1",
     "@swc/core": "~1.15.5",
     "@swc/helpers": "~0.5.18",
-    "@types/node": "25.9.1",
-    "@vitest/coverage-v8": "4.1.7",
-    "eslint": "^9.8.0",
-    "eslint-config-prettier": "^10.0.0",
-    "eslint-plugin-prettier": "5.5.5",
+    "@types/node": "25.9.2",
+    "@vitest/coverage-v8": "4.1.8",
     "jsdom": "^27.1.0",
-    "jsonc-eslint-parser": "3.1.0",
-    "prettier": "3.8.3",
-    "tsx": "4.22.3",
+    "tsx": "4.22.4",
     "typescript": "~5.9.2",
-    "typescript-eslint": "^8.40.0",
-    "vite": "8.0.14",
-    "vitest": "4.1.7",
+    "vite": "8.0.16",
+    "vitest": "4.1.8",
   },
   "name": "@proj/source",
   "type": "module",
@@ -84,7 +66,7 @@ exports[`infra generator > should configure Checkov target correctly > checkov-t
     "{workspaceRoot}/dist/{projectRoot}/cdk.out",
   ],
   "options": {
-    "command": "uvx --from checkov==3.2.529 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+    "command": "uvx --from checkov==3.2.533 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
   },
   "outputs": [
     "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -177,7 +159,7 @@ exports[`infra generator > should configure project.json with correct targets >
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.529 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.2.533 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -233,16 +215,19 @@ exports[`infra generator > should configure project.json with correct targets >
       "cache": true,
       "configurations": {
         "fix": {
-          "fix": true,
+          "command": "biome check --write {projectRoot}",
         },
         "skip-lint": {
-          "force": true,
+          "command": "node -e """,
         },
       },
-      "executor": "@nx/eslint:lint",
+      "executor": "nx:run-commands",
       "inputs": [
-        "eslint",
+        "biome",
       ],
+      "options": {
+        "command": "biome lint {projectRoot}",
+      },
     },
     "synth": {
       "cache": true,
@@ -739,7 +724,7 @@ exports[`infra generator > should handle custom project names correctly > custom
         "{workspaceRoot}/dist/{projectRoot}/cdk.out",
       ],
       "options": {
-        "command": "uvx --from checkov==3.2.529 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
+        "command": "uvx --from checkov==3.2.533 checkov --config-file {projectRoot}/checkov.yml --directory dist/{projectRoot}/cdk.out --framework cloudformation",
       },
       "outputs": [
         "{workspaceRoot}/dist/{projectRoot}/checkov",
@@ -795,16 +780,19 @@ exports[`infra generator > should handle custom project names correctly > custom
       "cache": true,
       "configurations": {
         "fix": {
-          "fix": true,
+          "command": "biome check --write {projectRoot}",
         },
         "skip-lint": {
-          "force": true,
+          "command": "node -e """,
         },
       },
-      "executor": "@nx/eslint:lint",
+      "executor": "nx:run-commands",
       "inputs": [
-        "eslint",
+        "biome",
       ],
+      "options": {
+        "command": "biome lint {projectRoot}",
+      },
     },
     "synth": {
       "cache": true,
@@ -1081,8 +1069,9 @@ export async function buildChildEnv(
       let STSClient: typeof import('@aws-sdk/client-sts').STSClient;
       let AssumeRoleCommand: typeof import('@aws-sdk/client-sts').AssumeRoleCommand;
       try {
-        ({ STSClient, AssumeRoleCommand } =
-          await import('@aws-sdk/client-sts'));
+        ({ STSClient, AssumeRoleCommand } = await import(
+          '@aws-sdk/client-sts'
+        ));
       } catch {
         console.error(
           '[infra-deploy] Error: @aws-sdk/client-sts is required for assumeRole credentials but is not installed.',

package/src/infra/app/generator.d.ts

@@ -2,9 +2,9 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree, GeneratorCallback } from '@nx/devkit';
-import { TsInfraGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { TsInfraGeneratorSchema } from './schema';
 export declare const INFRA_APP_GENERATOR_INFO: NxGeneratorInfo;
 export declare function tsInfraGenerator(tree: Tree, schema: TsInfraGeneratorSchema): Promise<GeneratorCallback>;
 export default tsInfraGenerator;

package/src/infra/app/generator.js

@@ -8,26 +8,29 @@ const tslib_1 = require("tslib");
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const generator_1 = tslib_1.__importStar(require("../../ts/lib/generator"));
-const versions_1 = require("../../utils/versions");
-const npm_scope_1 = require("../../utils/npm-scope");
-const shared_constructs_1 = require("../../utils/shared-constructs");
-const shared_infra_config_1 = require("../../utils/shared-infra-config");
-const shared_scripts_1 = require("../../utils/shared-scripts");
-const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
 const path_1 = tslib_1.__importDefault(require("path"));
+const generator_1 = tslib_1.__importStar(require("../../ts/lib/generator"));
+const ts_project_utils_1 = require("../../ts/lib/ts-project-utils");
+const containers_1 = require("../../utils/containers");
 const format_1 = require("../../utils/format");
-const object_1 = require("../../utils/object");
-const nx_1 = require("../../utils/nx");
 const metrics_1 = require("../../utils/metrics");
 const names_1 = require("../../utils/names");
+const npm_scope_1 = require("../../utils/npm-scope");
+const nx_1 = require("../../utils/nx");
+const object_1 = require("../../utils/object");
 const pkg_manager_1 = require("../../utils/pkg-manager");
 const py_1 = require("../../utils/py");
-const containers_1 = require("../../utils/containers");
+const shared_constructs_1 = require("../../utils/shared-constructs");
+const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
+const shared_infra_config_1 = require("../../utils/shared-infra-config");
+const shared_scripts_1 = require("../../utils/shared-scripts");
+const versions_1 = require("../../utils/versions");
 exports.INFRA_APP_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 async function tsInfraGenerator(tree, schema) {
     const lib = (0, generator_1.getTsLibDetails)(tree, schema);
-    await (0, generator_1.default)(tree, schema);
+    if (!(0, nx_1.projectExists)(tree, lib.fullyQualifiedName)) {
+        await (0, generator_1.default)(tree, schema);
+    }
     // CDK shells out to a container engine to build image assets. Default
     // (docker) needs no env override; finch is set via CDK_DOCKER per
     // https://docs.aws.amazon.com/cdk/v2/guide/build-containers.html#build-container-replace.
@@ -172,8 +175,7 @@ async function tsInfraGenerator(tree, schema) {
     ]), (0, versions_1.withVersions)(['tsx']));
     (0, devkit_1.updateJson)(tree, `${libraryRoot}/tsconfig.lib.json`, (tsConfig) => ({
         ...tsConfig,
-        references: [
-            ...(tsConfig.references || []),
+        references: (0, ts_project_utils_1.mergeTsReferences)(tsConfig.references, [
             {
                 path: `${path_1.default.relative(libraryRoot, `${tree.root}/${shared_constructs_constants_1.PACKAGES_DIR}`)}/${shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR}/tsconfig.lib.json`,
             },
@@ -184,7 +186,7 @@ async function tsInfraGenerator(tree, schema) {
                     },
                 ]
                 : []),
-        ],
+        ]),
     }));
     await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.INFRA_APP_GENERATOR_INFO]);
     await (0, format_1.formatFilesInSubtree)(tree);

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

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/infra/app/generator.ts"],"names":[],"mappings":"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"}

package/src/license/__snapshots__/config.spec.ts.snap

@@ -100,3 +100,26 @@ exports[`license config > defaultLicenseConfig > should generate default license
   "spdx": "MIT",
 }
 `;
+
+exports[`license config > dependency check config writes > ensureDependencyCheckBlock > should add a dependencies block to a license config 1`] = `
+"import {
+  DEFAULT_LICENSE_ALLOWLIST,
+  npmCollector,
+} from '@aws/nx-plugin/sdk/license';
+import { AwsNxPluginConfig } from '@aws/nx-plugin';
+
+export default {
+  license: {
+    dependencies: {
+      allow: DEFAULT_LICENSE_ALLOWLIST,
+      collectors: [npmCollector()],
+      exceptions: [],
+    },
+    source: {
+      spdx: 'Apache-2.0',
+      copyrightHolder: 'Test',
+    },
+  },
+} satisfies AwsNxPluginConfig;
+"
+`;

package/src/license/config-types.d.ts

@@ -2,8 +2,24 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { SPDXLicenseIdentifier } from './schema';
+import type { DependencyCheckConfig } from './dependency-check/types';
+import type { SPDXLicenseIdentifier } from './schema';
 export interface LicenseConfig {
+    /**
+     * Configuration for licensing your own source code: license headers and
+     * LICENSE files. Omit to disable source license header and file syncing.
+     */
+    source?: LicenseSourceConfig;
+    /**
+     * Configuration for checking your dependencies' licenses against an
+     * allowlist. Omit to disable dependency license checking.
+     */
+    dependencies?: DependencyCheckConfig;
+}
+/**
+ * Configuration for licensing your own source code (headers and LICENSE files).
+ */
+export interface LicenseSourceConfig {
     /**
      * The SPDX license identifier for your chosen license.
      * License files will be synchronised according to the chosen SPDX
@@ -27,6 +43,7 @@ export interface LicenseConfig {
      */
     files?: LicenseFileConfig;
 }
+export type { AllowlistEntry, DependencyCheckConfig, DependencyCheckException, } from './dependency-check/types';
 /**
  * Configuration for the LICENSE file sync
  */

package/src/license/config-types.js

@@ -1,3 +1,7 @@
 "use strict";
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=config-types.js.map

package/src/license/config-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"config-types.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/license/config-types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"config-types.js","sourceRoot":"","sources":["../../../../../packages/nx-plugin/src/license/config-types.ts"],"names":[],"mappings":";AAAA;;;GAGG"}

package/src/license/config.d.ts

@@ -2,9 +2,10 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Tree } from '@nx/devkit';
-import { SPDXLicenseIdentifier } from './schema';
-import { CommentSyntax, LicenseConfig } from './config-types';
+import type { Tree } from '@nx/devkit';
+import type { CommentSyntax, LicenseConfig, LicenseSourceConfig } from './config-types';
+import type { DependencyCheckException } from './dependency-check/types';
+import type { SPDXLicenseIdentifier } from './schema';
 /**
  * Defines the comment syntax for popular programming languages
  */
@@ -12,13 +13,70 @@ export declare const LANGUAGE_COMMENT_SYNTAX: {
     [ext: string]: CommentSyntax;
 };
 /**
- * Build the default license config for a given license
+ * Recompute the `inputs` of the root `license-check` target from what's
+ * currently in the workspace: the present npm lockfiles, the config file, and
+ * a recursive uv.lock glob when the dependency check uses a Python collector.
+ *
+ * The uv lockfile is keyed off the collector (not file presence) because it is
+ * created by `uv` *after* the generator runs, and may live in a subdirectory of
+ * a uv workspace. Callers run this whenever they change the relevant state, so
+ * the inputs stay correct regardless of generator order. No-op if the
+ * license-check target doesn't exist yet.
  */
-export declare const defaultLicenseConfig: (spdx: SPDXLicenseIdentifier, copyrightHolder: string) => LicenseConfig;
+export declare const updateLicenseCheckTargetInputs: (tree: Tree) => Promise<void>;
 /**
- * Write license configuration to the aws nx plugin config
+ * Make a project's `lint` target depend on the root `license-check` target, so
+ * license checking runs as part of lint/build. No-op when the project has no
+ * `lint` target or there's no license-check target to depend on. Idempotent.
+ *
+ * Callers format afterwards (generators call `formatFilesInSubtree` at the end),
+ * so the rewritten project.json matches prettier.
  */
-export declare const writeLicenseConfig: (tree: Tree, config: LicenseConfig) => Promise<void>;
+export declare const addLicenseCheckToLintTarget: (tree: Tree, projectName: string) => void;
+/**
+ * Wire every project's `lint` target to the root `license-check` target.
+ * Called by the license generator so existing projects pick up the dependency
+ * regardless of the order generators ran in.
+ */
+export declare const addLicenseCheckToAllLintTargets: (tree: Tree) => void;
+export interface EnsureDependencyCheckBlockOptions {
+    includeCollectors?: 'npm' | 'npm+python';
+}
+/**
+ * Ensure the `dependencies` block (dependency license checking) exists within
+ * the `license` config. If one already exists it is left untouched, so user
+ * customizations survive.
+ */
+export declare const ensureDependencyCheckBlock: (tree: Tree, options?: EnsureDependencyCheckBlockOptions) => Promise<void>;
+/**
+ * Ensure license exceptions are present in `license.dependencies.exceptions`.
+ * An exception whose package is already listed is skipped (so existing reasons
+ * are never overwritten). Other exceptions, collectors and the allowlist are
+ * left untouched.
+ *
+ * The `dependencies: { $scope }` scope keeps edits within the dependency-check
+ * block, so an `exceptions` array elsewhere in the file isn't matched.
+ */
+export declare const ensureLicenseExceptions: (tree: Tree, exceptions: DependencyCheckException[]) => Promise<void>;
+/**
+ * Add `pythonCollector()` to `license.dependencies.collectors`, unless one is
+ * already configured.
+ */
+export declare const ensurePythonLicenseCollector: (tree: Tree) => Promise<void>;
+/**
+ * Build the default `license.source` config for a given license
+ */
+export declare const defaultLicenseConfig: (spdx: SPDXLicenseIdentifier, copyrightHolder: string) => LicenseSourceConfig;
+/**
+ * Write the `license.source` config (headers + LICENSE files) to the aws nx
+ * plugin config.
+ *
+ * The `source` block is (re)written, but any existing `license.dependencies`
+ * block — a user-customized allowlist, collectors and exceptions — is
+ * preserved, so re-running the license generator (e.g. to change the copyright
+ * holder) never clobbers dependency-check customizations.
+ */
+export declare const writeLicenseConfig: (tree: Tree, source: LicenseSourceConfig) => Promise<void>;
 /**
  * Read license configuration
  */