@aws/nx-plugin 1.0.0-rc.2 → 1.0.0-rc.21

package/src/py/project/generator.js

@@ -6,16 +6,17 @@ exports.pyProjectGenerator = exports.getPyProjectDetails = exports.PY_PROJECT_GE
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const nxlv_python_1 = require("../../utils/nxlv-python");
-const versions_1 = require("../../utils/versions");
-const npm_scope_1 = require("../../utils/npm-scope");
-const names_1 = require("../../utils/names");
-const object_1 = require("../../utils/object");
+const config_1 = require("../../license/config");
 const git_1 = require("../../utils/git");
-const nx_1 = require("../../utils/nx");
 const metrics_1 = require("../../utils/metrics");
-const toml_1 = require("../../utils/toml");
+const names_1 = require("../../utils/names");
+const npm_scope_1 = require("../../utils/npm-scope");
+const nx_1 = require("../../utils/nx");
+const nxlv_python_1 = require("../../utils/nxlv-python");
+const object_1 = require("../../utils/object");
 const py_1 = require("../../utils/py");
+const toml_1 = require("../../utils/toml");
+const versions_1 = require("../../utils/versions");
 exports.PY_PROJECT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 /**
  * Returns details about the Python project to be created
@@ -39,6 +40,8 @@ const pyProjectGenerator = async (tree, schema) => {
     (0, devkit_1.addDependenciesToPackageJson)(tree, {}, pythonPlugin);
     Object.entries(pythonPlugin).forEach(([name, version]) => (0, devkit_1.ensurePackage)(name, version));
     const nxJson = (0, devkit_1.readNxJson)(tree);
+    // Only rewrite nx.json when the plugin needs adding, so re-running does not
+    // reserialize (and reformat) the file when nothing has changed.
     if (!nxJson.plugins?.find((p) => typeof p === 'string'
         ? p === '@nxlv/python'
         : p.plugin === '@nxlv/python')) {
@@ -51,60 +54,84 @@ const pyProjectGenerator = async (tree, schema) => {
                 },
             },
         ];
+        (0, devkit_1.updateNxJson)(tree, nxJson);
     }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-    if (!tree.exists('uv.lock')) {
-        await (0, nxlv_python_1.migrateToSharedVenvGenerator)(tree, {
-            autoActivate: true,
-            packageManager: 'uv',
-            moveDevDependencies: false,
+    // Only scaffold the project when it does not already exist so re-running with
+    // the same name does not throw. The rest of the generator still runs to apply
+    // any changed options to the existing project.
+    if (!(0, nx_1.projectExists)(tree, fullyQualifiedName)) {
+        if (!tree.exists('uv.lock')) {
+            await (0, nxlv_python_1.migrateToSharedVenvGenerator)(tree, {
+                autoActivate: true,
+                packageManager: 'uv',
+                moveDevDependencies: false,
+                pyenvPythonVersion: '3.14.0',
+                pyprojectPythonDependency: '>=3.14',
+            });
+        }
+        await (0, nxlv_python_1.uvProjectGenerator)(tree, {
+            name: fullyQualifiedName,
+            publishable: false,
+            buildLockedVersions: true,
+            buildBundleLocalDependencies: true,
+            linter: 'ruff',
+            rootPyprojectDependencyGroup: 'main',
             pyenvPythonVersion: '3.14.0',
             pyprojectPythonDependency: '>=3.14',
+            projectType: schema.type,
+            projectNameAndRootFormat: 'as-provided',
+            moduleName: normalizedModuleName,
+            directory: dir,
+            unitTestRunner: 'pytest',
+            codeCoverage: true,
+            codeCoverageHtmlReport: true,
+            codeCoverageXmlReport: true,
+            unitTestHtmlReport: true,
+            unitTestJUnitReport: true,
+            buildSystem: 'hatch',
+            srcDir: false,
         });
+        // Remove generated hello.py and test_hello.py as they are not needed
+        [
+            (0, devkit_1.joinPathFragments)(dir, normalizedModuleName, 'hello.py'),
+            (0, devkit_1.joinPathFragments)(dir, 'tests', 'test_hello.py'),
+        ].forEach((f) => tree.delete(f));
+        // Add a placeholder test so pytest doesn't fail with "no tests collected"
+        tree.write((0, devkit_1.joinPathFragments)(dir, 'tests', 'test_noop.py'), 'def test_noop():\n    pass\n');
     }
-    await (0, nxlv_python_1.uvProjectGenerator)(tree, {
-        name: fullyQualifiedName,
-        publishable: false,
-        buildLockedVersions: true,
-        buildBundleLocalDependencies: true,
-        linter: 'ruff',
-        rootPyprojectDependencyGroup: 'main',
-        pyenvPythonVersion: '3.14.0',
-        pyprojectPythonDependency: '>=3.14',
-        projectType: schema.type,
-        projectNameAndRootFormat: 'as-provided',
-        moduleName: normalizedModuleName,
-        directory: dir,
-        unitTestRunner: 'pytest',
-        codeCoverage: true,
-        codeCoverageHtmlReport: true,
-        codeCoverageXmlReport: true,
-        unitTestHtmlReport: true,
-        unitTestJUnitReport: true,
-        buildSystem: 'hatch',
-        srcDir: false,
-    });
-    // Remove generated hello.py and test_hello.py as they are not needed
-    [
-        (0, devkit_1.joinPathFragments)(dir, normalizedModuleName, 'hello.py'),
-        (0, devkit_1.joinPathFragments)(dir, 'tests', 'test_hello.py'),
-    ].forEach((f) => tree.delete(f));
-    // Add a placeholder test so pytest doesn't fail with "no tests collected"
-    tree.write((0, devkit_1.joinPathFragments)(dir, 'tests', 'test_noop.py'), 'def test_noop():\n    pass\n');
     const outputPath = '{workspaceRoot}/dist/{projectRoot}';
     const buildOutputPath = (0, devkit_1.joinPathFragments)(outputPath, 'build');
     const projectConfiguration = (0, devkit_1.readProjectConfiguration)(tree, fullyQualifiedName);
     projectConfiguration.name = fullyQualifiedName;
-    const buildTarget = projectConfiguration.targets.build;
-    projectConfiguration.targets.compile = {
-        ...buildTarget,
-        inputs: ['default', '^production'],
-        outputs: [buildOutputPath],
-        options: {
-            ...buildTarget.options,
-            outputPath: buildOutputPath,
-        },
-    };
+    // Derive the compile target from the uv build target, and rewrite build to
+    // orchestrate the other targets. This only runs on first creation: on re-run
+    // build has already been transformed, so re-deriving would corrupt compile
+    // and duplicate the build dependencies.
+    if (!projectConfiguration.targets.compile) {
+        const buildTarget = projectConfiguration.targets.build;
+        projectConfiguration.targets.compile = {
+            ...buildTarget,
+            inputs: ['default', '^production'],
+            outputs: [buildOutputPath],
+            options: {
+                ...buildTarget.options,
+                outputPath: buildOutputPath,
+            },
+        };
+        projectConfiguration.targets.build = {
+            inputs: ['default', '^production'],
+            dependsOn: [
+                'lint',
+                'compile',
+                'test',
+                'typecheck',
+                ...(buildTarget.dependsOn ?? []),
+            ],
+            options: {
+                outputPath,
+            },
+        };
+    }
     projectConfiguration.targets.typecheck = {
         cache: true,
         inputs: ['default', '^production'],
@@ -114,19 +141,6 @@ const pyProjectGenerator = async (tree, schema) => {
             cwd: '{projectRoot}',
         },
     };
-    projectConfiguration.targets.build = {
-        inputs: ['default', '^production'],
-        dependsOn: [
-            'lint',
-            'compile',
-            'test',
-            'typecheck',
-            ...(buildTarget.dependsOn ?? []),
-        ],
-        options: {
-            outputPath,
-        },
-    };
     // Set the default line length to 120, as 88 is a little too strict
     (0, toml_1.updateToml)(tree, (0, devkit_1.joinPathFragments)(dir, 'pyproject.toml'), (pyProjectToml) => {
         if (pyProjectToml.tool?.ruff) {
@@ -141,10 +155,6 @@ const pyProjectGenerator = async (tree, schema) => {
         ...projectConfiguration.targets.lint,
         cache: true,
         inputs: ['default', '^production'],
-        dependsOn: [
-            ...(projectConfiguration.targets.lint?.dependsOn ?? []).filter((d) => d !== 'format'),
-            'format',
-        ],
         configurations: {
             ...projectConfiguration.targets.lint?.configurations,
             fix: {
@@ -155,18 +165,34 @@ const pyProjectGenerator = async (tree, schema) => {
             },
         },
     };
+    // Append `format` without moving an existing entry, so re-running does not
+    // reorder lint dependencies (e.g. relative to a later-added license-check).
+    (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfiguration, 'lint', 'format');
     projectConfiguration.targets = (0, object_1.sortObjectKeys)(projectConfiguration.targets);
     (0, devkit_1.updateProjectConfiguration)(tree, fullyQualifiedName, projectConfiguration);
     (0, nx_1.addGeneratorMetadata)(tree, fullyQualifiedName, exports.PY_PROJECT_GENERATOR_INFO);
     // Update root .gitignore
     (0, git_1.updateGitIgnore)(tree, '.', (patterns) => [...patterns, '/reports']);
-    // Update project level .gitignore
+    // Update project level .gitignore. The cache directories are also kept out
+    // of type checking: `ty` respects .gitignore, and pytest creates and removes
+    // transient `pytest-cache-files-*` directories while the test and typecheck
+    // targets run concurrently, which would otherwise make `ty` fail with an I/O
+    // error when it scans one mid-deletion.
     (0, git_1.updateGitIgnore)(tree, dir, (patterns) => [
         ...patterns,
         '**/__pycache__',
         '.coverage',
+        '.pytest_cache',
+        'pytest-cache-files-*',
+        '.ruff_cache',
     ]);
     await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.PY_PROJECT_GENERATOR_INFO]);
+    await (0, config_1.ensurePythonLicenseCollector)(tree);
+    // If license checking is configured, make this project's lint target depend
+    // on the root license-check target. No-op if license checking isn't set up;
+    // the license generator wires up existing projects itself, so the dependency
+    // is added regardless of which generator runs first.
+    (0, config_1.addLicenseCheckToLintTarget)(tree, fullyQualifiedName);
     return async () => {
         (0, devkit_1.installPackagesTask)(tree);
         await new nxlv_python_1.UVProvider(tree.root, new nxlv_python_1.Logger(), tree).install();

package/src/py/project/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/project/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/py/project/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAWoB;AACpB,iDAG8B;AAC9B,yCAAkD;AAClD,iDAAsE;AACtE,6CAAgD;AAChD,qDAAoD;AACpD,uCAMwB;AAExB,yDAKiC;AACjC,+CAAoD;AACpD,uCAAiF;AACjF,2CAA8C;AAC9C,mDAAoD;AAGvC,QAAA,yBAAyB,GACpC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAiB/B;;GAEG;AACI,MAAM,mBAAmB,GAAG,CACjC,IAAU,EACV,MAKC,EACiB,EAAE;IACpB,MAAM,KAAK,GAAG,IAAA,mBAAW,EAAC,IAAA,uBAAW,EAAC,IAAI,CAAC,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,IAAA,mBAAW,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EACtC,MAAM,CAAC,UAAU,IAAI,GAAG,KAAK,IAAI,cAAc,EAAE,CAClD,CAAC;IACF,MAAM,kBAAkB,GAAG,GAAG,KAAK,IAAI,cAAc,EAAE,CAAC;IACxD,yDAAyD;IACzD,MAAM,GAAG,GAAG,IAAA,0BAAiB,EAC3B,MAAM,CAAC,SAAS,IAAI,GAAG,EACvB,MAAM,CAAC,YAAY,IAAI,cAAc,CACtC,CAAC;IACF,OAAO,EAAE,GAAG,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,CAAC;AAC3D,CAAC,CAAC;AArBW,QAAA,mBAAmB,uBAqB9B;AAEF;;GAEG;AACI,MAAM,kBAAkB,GAAG,KAAK,EACrC,IAAU,EACV,MAAgC,EACJ,EAAE;IAC9B,MAAM,EAAE,GAAG,EAAE,oBAAoB,EAAE,kBAAkB,EAAE,GAAG,IAAA,2BAAmB,EAC3E,IAAI,EACJ,MAAM,CACP,CAAC;IAEF,MAAM,YAAY,GAAG,IAAA,uBAAY,EAAC,CAAC,cAAc,CAAC,CAAC,CAAC;IACpD,IAAA,qCAA4B,EAAC,IAAI,EAAE,EAAE,EAAE,YAAY,CAAC,CAAC;IAErD,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,EAAE,CACvD,IAAA,sBAAa,EAAC,IAAI,EAAE,OAAO,CAAC,CAC7B,CAAC;IAEF,MAAM,MAAM,GAAG,IAAA,mBAAU,EAAC,IAAI,CAAC,CAAC;IAEhC,4EAA4E;IAC5E,gEAAgE;IAChE,IACE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAC1B,OAAO,CAAC,KAAK,QAAQ;QACnB,CAAC,CAAC,CAAC,KAAK,cAAc;QACtB,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,cAAc,CAChC,EACD,CAAC;QACD,MAAM,CAAC,OAAO,GAAG;YACf,GAAG,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;YACzB;gBACE,MAAM,EAAE,cAAc;gBACtB,OAAO,EAAE;oBACP,cAAc,EAAE,IAAI;iBACrB;aACF;SACF,CAAC;QACF,IAAA,qBAAY,EAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC7B,CAAC;IAED,8EAA8E;IAC9E,8EAA8E;IAC9E,+CAA+C;IAC/C,IAAI,CAAC,IAAA,kBAAa,EAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE,CAAC;QAC7C,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAA,0CAA4B,EAAC,IAAI,EAAE;gBACvC,YAAY,EAAE,IAAI;gBAClB,cAAc,EAAE,IAAI;gBACpB,mBAAmB,EAAE,KAAK;gBAC1B,kBAAkB,EAAE,QAAQ;gBAC5B,yBAAyB,EAAE,QAAQ;aACpC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,IAAA,gCAAkB,EAAC,IAAI,EAAE;YAC7B,IAAI,EAAE,kBAAkB;YACxB,WAAW,EAAE,KAAK;YAClB,mBAAmB,EAAE,IAAI;YACzB,4BAA4B,EAAE,IAAI;YAClC,MAAM,EAAE,MAAM;YACd,4BAA4B,EAAE,MAAM;YACpC,kBAAkB,EAAE,QAAQ;YAC5B,yBAAyB,EAAE,QAAQ;YACnC,WAAW,EAAE,MAAM,CAAC,IAAI;YACxB,wBAAwB,EAAE,aAAa;YACvC,UAAU,EAAE,oBAAoB;YAChC,SAAS,EAAE,GAAG;YACd,cAAc,EAAE,QAAQ;YACxB,YAAY,EAAE,IAAI;YAClB,sBAAsB,EAAE,IAAI;YAC5B,qBAAqB,EAAE,IAAI;YAC3B,kBAAkB,EAAE,IAAI;YACxB,mBAAmB,EAAE,IAAI;YACzB,WAAW,EAAE,OAAO;YACpB,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,qEAAqE;QACrE;YACE,IAAA,0BAAiB,EAAC,GAAG,EAAE,oBAAoB,EAAE,UAAU,CAAC;YACxD,IAAA,0BAAiB,EAAC,GAAG,EAAE,OAAO,EAAE,eAAe,CAAC;SACjD,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjC,0EAA0E;QAC1E,IAAI,CAAC,KAAK,CACR,IAAA,0BAAiB,EAAC,GAAG,EAAE,OAAO,EAAE,cAAc,CAAC,EAC/C,8BAA8B,CAC/B,CAAC;IACJ,CAAC;IAED,MAAM,UAAU,GAAG,oCAAoC,CAAC;IACxD,MAAM,eAAe,GAAG,IAAA,0BAAiB,EAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC/D,MAAM,oBAAoB,GAAG,IAAA,iCAAwB,EACnD,IAAI,EACJ,kBAAkB,CACnB,CAAC;IACF,oBAAoB,CAAC,IAAI,GAAG,kBAAkB,CAAC;IAC/C,2EAA2E;IAC3E,6EAA6E;IAC7E,2EAA2E;IAC3E,wCAAwC;IACxC,IAAI,CAAC,oBAAoB,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,WAAW,GAAG,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC;QACvD,oBAAoB,CAAC,OAAO,CAAC,OAAO,GAAG;YACrC,GAAG,WAAW;YACd,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;YAClC,OAAO,EAAE,CAAC,eAAe,CAAC;YAC1B,OAAO,EAAE;gBACP,GAAG,WAAW,CAAC,OAAO;gBACtB,UAAU,EAAE,eAAe;aAC5B;SACF,CAAC;QACF,oBAAoB,CAAC,OAAO,CAAC,KAAK,GAAG;YACnC,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;YAClC,SAAS,EAAE;gBACT,MAAM;gBACN,SAAS;gBACT,MAAM;gBACN,WAAW;gBACX,GAAG,CAAC,WAAW,CAAC,SAAS,IAAI,EAAE,CAAC;aACjC;YACD,OAAO,EAAE;gBACP,UAAU;aACX;SACF,CAAC;IACJ,CAAC;IACD,oBAAoB,CAAC,OAAO,CAAC,SAAS,GAAG;QACvC,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;QAClC,QAAQ,EAAE,2BAA2B;QACrC,OAAO,EAAE;YACP,OAAO,EAAE,iBAAiB;YAC1B,GAAG,EAAE,eAAe;SACrB;KACF,CAAC;IAEF,mEAAmE;IACnE,IAAA,iBAAU,EACR,IAAI,EACJ,IAAA,0BAAiB,EAAC,GAAG,EAAE,gBAAgB,CAAC,EACxC,CAAC,aAA8B,EAAE,EAAE;QACjC,IAAK,aAAa,CAAC,IAAY,EAAE,IAAI,EAAE,CAAC;YACrC,aAAa,CAAC,IAAY,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,GAAG,CAAC;QACxD,CAAC;QACD,OAAO,aAAa,CAAC;IACvB,CAAC,CACF,CAAC;IAEF,IAAA,oDAA+C,EAAC,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAE1E,kFAAkF;IAClF,yCAAyC;IACzC,oBAAoB,CAAC,OAAO,CAAC,IAAI,GAAG;QAClC,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI;QACpC,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,CAAC,SAAS,EAAE,aAAa,CAAC;QAClC,cAAc,EAAE;YACd,GAAG,oBAAoB,CAAC,OAAO,CAAC,IAAI,EAAE,cAAc;YACpD,GAAG,EAAE;gBACH,GAAG,EAAE,IAAI;aACV;YACD,WAAW,EAAE;gBACX,QAAQ,EAAE,IAAI;aACf;SACF;KACF,CAAC;IACF,2EAA2E;IAC3E,4EAA4E;IAC5E,IAAA,sCAAiC,EAAC,oBAAoB,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IAE1E,oBAAoB,CAAC,OAAO,GAAG,IAAA,uBAAc,EAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC;IAC5E,IAAA,mCAA0B,EAAC,IAAI,EAAE,kBAAkB,EAAE,oBAAoB,CAAC,CAAC;IAE3E,IAAA,yBAAoB,EAAC,IAAI,EAAE,kBAAkB,EAAE,iCAAyB,CAAC,CAAC;IAE1E,yBAAyB;IACzB,IAAA,qBAAe,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,GAAG,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;IAEpE,2EAA2E;IAC3E,6EAA6E;IAC7E,4EAA4E;IAC5E,6EAA6E;IAC7E,wCAAwC;IACxC,IAAA,qBAAe,EAAC,IAAI,EAAE,GAAG,EAAE,CAAC,QAAQ,EAAE,EAAE,CAAC;QACvC,GAAG,QAAQ;QACX,gBAAgB;QAChB,WAAW;QACX,eAAe;QACf,sBAAsB;QACtB,aAAa;KACd,CAAC,CAAC;IAEH,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,iCAAyB,CAAC,CAAC,CAAC;IAEzE,MAAM,IAAA,qCAA4B,EAAC,IAAI,CAAC,CAAC;IAEzC,4EAA4E;IAC5E,4EAA4E;IAC5E,6EAA6E;IAC7E,qDAAqD;IACrD,IAAA,oCAA2B,EAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAEtD,OAAO,KAAK,IAAI,EAAE;QAChB,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;QAC1B,MAAM,IAAI,wBAAU,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,oBAAM,EAAE,EAAE,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;IAChE,CAAC,CAAC;AACJ,CAAC,CAAC;AA7MW,QAAA,kBAAkB,sBA6M7B;AACF,kBAAe,0BAAkB,CAAC"}

package/src/smithy/project/__snapshots__/generator.spec.ts.snap

@@ -29,6 +29,10 @@ exports[`smithyProjectGenerator > should generate smithy project with all custom
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "backend/model/src",
   "projectType": "library",
+  "metadata": {
+    "generator": "smithy#project",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -47,10 +51,6 @@ exports[`smithyProjectGenerator > should generate smithy project with all custom
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -62,6 +62,10 @@ exports[`smithyProjectGenerator > should generate smithy project with custom dir
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apis/test-api/src",
   "projectType": "library",
+  "metadata": {
+    "generator": "smithy#project",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -80,10 +84,6 @@ exports[`smithyProjectGenerator > should generate smithy project with custom dir
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -137,6 +137,7 @@ service CustomService {
 
 exports[`smithyProjectGenerator > should generate smithy project with default options > build.Dockerfile 1`] = `
 "FROM public.ecr.aws/docker/library/node:24 AS builder
+ENV CI=true
 
 # Output directory
 RUN mkdir /out
@@ -248,6 +249,7 @@ operation Echo {
     input := {
         @httpQuery("message")
         @required
+        @length(max: 1024)
         message: String
     }
     output := {
@@ -287,6 +289,10 @@ exports[`smithyProjectGenerator > should generate smithy project with default op
   "$schema": "../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "test-api/src",
   "projectType": "library",
+  "metadata": {
+    "generator": "smithy#project",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -305,10 +311,6 @@ exports[`smithyProjectGenerator > should generate smithy project with default op
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -349,6 +351,10 @@ exports[`smithyProjectGenerator > should generate smithy project with subdirecto
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "services/model/src",
   "projectType": "library",
+  "metadata": {
+    "generator": "smithy#project",
+    "apiName": "test-api"
+  },
   "targets": {
     "build": {
       "dependsOn": ["compile"]
@@ -367,10 +373,6 @@ exports[`smithyProjectGenerator > should generate smithy project with subdirecto
         "cwd": "{workspaceRoot}"
       }
     }
-  },
-  "metadata": {
-    "generator": "smithy#project",
-    "apiName": "test-api"
   }
 }
 "
@@ -378,6 +380,7 @@ exports[`smithyProjectGenerator > should generate smithy project with subdirecto
 
 exports[`smithyProjectGenerator > should generate valid Docker build configuration > dockerfile 1`] = `
 "FROM public.ecr.aws/docker/library/node:24 AS builder
+ENV CI=true
 
 # Output directory
 RUN mkdir /out

package/src/smithy/project/files/build.Dockerfile.template

@@ -1,4 +1,5 @@
 FROM public.ecr.aws/docker/library/node:24 AS builder
+ENV CI=true
 
 # Output directory
 RUN mkdir /out

package/src/smithy/project/files/src/operations/echo.smithy.template

@@ -9,6 +9,7 @@ operation Echo {
     input := {
         @httpQuery("message")
         @required
+        @length(max: 1024)
         message: String
     }
     output := {

package/src/smithy/project/generator.d.ts

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

package/src/smithy/project/generator.js

@@ -6,45 +6,47 @@ exports.smithyProjectGenerator = exports.SMITHY_PROJECT_GENERATOR_INFO = void 0;
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../utils/nx");
-const metrics_1 = require("../../utils/metrics");
-const format_1 = require("../../utils/format");
 const generator_1 = require("../../ts/lib/generator");
+const containers_1 = require("../../utils/containers");
+const format_1 = require("../../utils/format");
+const fs_1 = require("../../utils/fs");
+const metrics_1 = require("../../utils/metrics");
 const names_1 = require("../../utils/names");
 const npm_scope_1 = require("../../utils/npm-scope");
-const fs_1 = require("../../utils/fs");
-const containers_1 = require("../../utils/containers");
+const nx_1 = require("../../utils/nx");
 exports.SMITHY_PROJECT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const smithyProjectGenerator = async (tree, options) => {
     const cmd = new fs_1.FsCommands(tree);
     const containers = await (0, containers_1.resolveContainers)(tree, 'inherit');
     // Create project.json
     const { fullyQualifiedName, dir } = (0, generator_1.getTsLibDetails)(tree, options);
-    (0, devkit_1.addProjectConfiguration)(tree, fullyQualifiedName, {
-        name: fullyQualifiedName,
-        root: dir,
-        sourceRoot: (0, devkit_1.joinPathFragments)(dir, 'src'),
-        projectType: 'library',
-        targets: {
-            build: {
-                dependsOn: ['compile'],
-            },
-            compile: {
-                cache: true,
-                outputs: ['{workspaceRoot}/dist/{projectRoot}/build'],
-                executor: 'nx:run-commands',
-                options: {
-                    commands: [
-                        cmd.rm('dist/{projectRoot}/build'),
-                        cmd.mkdir('dist/{projectRoot}/build'),
-                        `${containers} build -f {projectRoot}/build.Dockerfile --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}`,
-                    ],
-                    parallel: false,
-                    cwd: '{workspaceRoot}',
+    if (!(0, nx_1.projectExists)(tree, fullyQualifiedName)) {
+        (0, devkit_1.addProjectConfiguration)(tree, fullyQualifiedName, {
+            name: fullyQualifiedName,
+            root: dir,
+            sourceRoot: (0, devkit_1.joinPathFragments)(dir, 'src'),
+            projectType: 'library',
+            targets: {
+                build: {
+                    dependsOn: ['compile'],
+                },
+                compile: {
+                    cache: true,
+                    outputs: ['{workspaceRoot}/dist/{projectRoot}/build'],
+                    executor: 'nx:run-commands',
+                    options: {
+                        commands: [
+                            cmd.rm('dist/{projectRoot}/build'),
+                            cmd.mkdir('dist/{projectRoot}/build'),
+                            `${containers} build -f {projectRoot}/build.Dockerfile --target export --output type=local,dest=dist/{projectRoot}/build {projectRoot}`,
+                        ],
+                        parallel: false,
+                        cwd: '{workspaceRoot}',
+                    },
                 },
             },
-        },
-    });
+        });
+    }
     const serviceName = options.serviceName ?? options.name;
     const serviceNameClassName = (0, names_1.toClassName)(serviceName);
     const serviceNameKebabCase = (0, names_1.toKebabCase)(serviceName);

package/src/smithy/project/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/smithy/project/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AAEpB,uCAIwB;AACxB,iDAAsE;AACtE,+CAA0D;AAC1D,sDAAyD;AACzD,6CAA6D;AAC7D,qDAAoD;AACpD,uCAA4C;AAC5C,uDAA2D;AAE9C,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAU,EACV,OAAqC,EACT,EAAE;IAC9B,MAAM,GAAG,GAAG,IAAI,eAAU,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAiB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAE5D,sBAAsB;IACtB,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACnE,IAAA,gCAAuB,EAAC,IAAI,EAAE,kBAAkB,EAAE;QAChD,IAAI,EAAE,kBAAkB;QACxB,IAAI,EAAE,GAAG;QACT,UAAU,EAAE,IAAA,0BAAiB,EAAC,GAAG,EAAE,KAAK,CAAC;QACzC,WAAW,EAAE,SAAS;QACtB,OAAO,EAAE;YACP,KAAK,EAAE;gBACL,SAAS,EAAE,CAAC,SAAS,CAAC;aACvB;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,IAAI;gBACX,OAAO,EAAE,CAAC,0CAA0C,CAAC;gBACrD,QAAQ,EAAE,iBAAiB;gBAC3B,OAAO,EAAE;oBACP,QAAQ,EAAE;wBACR,GAAG,CAAC,EAAE,CAAC,0BAA0B,CAAC;wBAClC,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC;wBACrC,GAAG,UAAU,0HAA0H;qBACxI;oBACD,QAAQ,EAAE,KAAK;oBACf,GAAG,EAAE,iBAAiB;iBACvB;aACF;SACF;KACF,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IACxD,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;IACtD,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAA,uBAAW,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAE7E,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;QAC9D,SAAS;QACT,oBAAoB;QACpB,oBAAoB;QACpB,KAAK;KACN,CAAC,CAAC;IAEH,IAAA,yBAAoB,EAClB,IAAI,EACJ,kBAAkB,EAClB,qCAA6B,EAC7B;QACE,OAAO,EAAE,OAAO,CAAC,IAAI;KACtB,CACF,CAAC;IAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;IAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAC;AA/DW,QAAA,sBAAsB,0BA+DjC;AAEF,kBAAe,8BAAsB,CAAC"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/smithy/project/generator.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,uCAOoB;AACpB,sDAAyD;AACzD,uDAA2D;AAC3D,+CAA0D;AAC1D,uCAA4C;AAC5C,iDAAsE;AACtE,6CAA6D;AAC7D,qDAAoD;AACpD,uCAKwB;AAGX,QAAA,6BAA6B,GACxC,IAAA,qBAAgB,EAAC,UAAU,CAAC,CAAC;AAExB,MAAM,sBAAsB,GAAG,KAAK,EACzC,IAAU,EACV,OAAqC,EACT,EAAE;IAC9B,MAAM,GAAG,GAAG,IAAI,eAAU,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,UAAU,GAAG,MAAM,IAAA,8BAAiB,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAE5D,sBAAsB;IACtB,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,GAAG,IAAA,2BAAe,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEnE,IAAI,CAAC,IAAA,kBAAa,EAAC,IAAI,EAAE,kBAAkB,CAAC,EAAE,CAAC;QAC7C,IAAA,gCAAuB,EAAC,IAAI,EAAE,kBAAkB,EAAE;YAChD,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,GAAG;YACT,UAAU,EAAE,IAAA,0BAAiB,EAAC,GAAG,EAAE,KAAK,CAAC;YACzC,WAAW,EAAE,SAAS;YACtB,OAAO,EAAE;gBACP,KAAK,EAAE;oBACL,SAAS,EAAE,CAAC,SAAS,CAAC;iBACvB;gBACD,OAAO,EAAE;oBACP,KAAK,EAAE,IAAI;oBACX,OAAO,EAAE,CAAC,0CAA0C,CAAC;oBACrD,QAAQ,EAAE,iBAAiB;oBAC3B,OAAO,EAAE;wBACP,QAAQ,EAAE;4BACR,GAAG,CAAC,EAAE,CAAC,0BAA0B,CAAC;4BAClC,GAAG,CAAC,KAAK,CAAC,0BAA0B,CAAC;4BACrC,GAAG,UAAU,0HAA0H;yBACxI;wBACD,QAAQ,EAAE,KAAK;wBACf,GAAG,EAAE,iBAAiB;qBACvB;iBACF;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED,MAAM,WAAW,GAAG,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,IAAI,CAAC;IACxD,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;IACtD,MAAM,oBAAoB,GAAG,IAAA,mBAAW,EAAC,WAAW,CAAC,CAAC;IACtD,MAAM,KAAK,GAAG,IAAA,uBAAW,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IAE7E,IAAA,sBAAa,EAAC,IAAI,EAAE,IAAA,0BAAiB,EAAC,SAAS,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE;QAC9D,SAAS;QACT,oBAAoB;QACpB,oBAAoB;QACpB,KAAK;KACN,CAAC,CAAC;IAEH,IAAA,yBAAoB,EAClB,IAAI,EACJ,kBAAkB,EAClB,qCAA6B,EAC7B;QACE,OAAO,EAAE,OAAO,CAAC,IAAI;KACtB,CACF,CAAC;IAEF,MAAM,IAAA,yCAA+B,EAAC,IAAI,EAAE,CAAC,qCAA6B,CAAC,CAAC,CAAC;IAE7E,MAAM,IAAA,6BAAoB,EAAC,IAAI,CAAC,CAAC;IACjC,OAAO,GAAG,EAAE;QACV,IAAA,4BAAmB,EAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC;AACJ,CAAC,CAAC;AAlEW,QAAA,sBAAsB,0BAkEjC;AAEF,kBAAe,8BAAsB,CAAC"}

package/src/smithy/react-connection/__snapshots__/generator.spec.ts.snap

@@ -105,7 +105,7 @@ const useCreateTestApiClient = (): TestApi => {
   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 });
   };
   return useMemo(

package/src/smithy/react-connection/generator.d.ts

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

package/src/smithy/react-connection/generator.js

@@ -6,12 +6,12 @@ exports.smithyReactConnectionGenerator = exports.SMITHY_REACT_CONNECTION_GENERAT
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const nx_1 = require("../../utils/nx");
-const metrics_1 = require("../../utils/metrics");
+const react_1 = require("../../utils/connection/open-api/react");
 const format_1 = require("../../utils/format");
+const metrics_1 = require("../../utils/metrics");
+const nx_1 = require("../../utils/nx");
 const generator_1 = require("../project/generator");
 const generator_2 = require("../ts/api/generator");
-const react_1 = require("../../utils/connection/open-api/react");
 exports.SMITHY_REACT_CONNECTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const smithyReactConnectionGenerator = async (tree, options) => {
     const frontendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, options.frontendProjectName);

package/src/smithy/react-connection/generator.js.map

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

package/src/smithy/ts/api/__snapshots__/generator.spec.ts.snap

@@ -1,35 +1,6 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`tsSmithyApiGenerator > should configure git and eslint ignores for generated code > eslint.config.mjs 1`] = `
-"import baseConfig from '../../eslint.config.mjs';
-
-export default [
-  ...baseConfig,
-  {
-    files: ['**/*.json'],
-    rules: {
-      '@nx/dependency-checks': [
-        'warn',
-        {
-          ignoredFiles: [
-            '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}',
-            '{projectRoot}/vitest.config.{js,ts,mjs,mts}',
-          ],
-        },
-      ],
-    },
-    languageOptions: {
-      parser: await import('jsonc-eslint-parser'),
-    },
-  },
-  {
-    ignores: ['**/out-tsc', '**/generated'],
-  },
-];
-"
-`;
-
-exports[`tsSmithyApiGenerator > should configure git and eslint ignores for generated code > gitignore 1`] = `"src/generated"`;
+exports[`tsSmithyApiGenerator > should configure git ignores for generated code > gitignore 1`] = `"src/generated"`;
 
 exports[`tsSmithyApiGenerator > should generate smithy ts api with Cognito auth > cognito-auth-infra.ts 1`] = `
 "import { Construct } from 'constructs';
@@ -156,6 +127,9 @@ export class TestApi<
         authorizer: new CognitoUserPoolsAuthorizer(scope, 'TestApiAuthorizer', {
           cognitoUserPools: [props.identity.userPool],
         }),
+        // Accept access tokens from both sign-in flows: 'openid' (Cognito hosted UI)
+        // and 'aws.cognito.signin.user.admin' (Cognito admin/SRP auth APIs).
+        authorizationScopes: ['openid', 'aws.cognito.signin.user.admin'],
       },
       deployOptions: {
         tracingEnabled: true,
@@ -1341,15 +1315,18 @@ exports[`tsSmithyApiGenerator > should generate smithy ts api with default optio
       "dependsOn": ["copy-ssdk"]
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
+      "executor": "nx:run-commands",
       "cache": true,
-      "inputs": ["eslint"],
+      "inputs": ["biome"],
+      "options": {
+        "command": "biome lint {projectRoot}"
+      },
       "configurations": {
         "fix": {
-          "fix": true
+          "command": "biome check --write {projectRoot}"
         },
         "skip-lint": {
-          "force": true
+          "command": "node -e \\"\\""
         }
       }
     },
@@ -2223,6 +2200,9 @@ resource "aws_api_gateway_method" "proxy_method" {
 
   authorization = "COGNITO_USER_POOLS"
   authorizer_id = aws_api_gateway_authorizer.cognito_authorizer.id
+  # Accept access tokens from both sign-in flows: 'openid' (Cognito hosted UI)
+  # and 'aws.cognito.signin.user.admin' (Cognito admin/SRP auth APIs).
+  authorization_scopes = ["openid", "aws.cognito.signin.user.admin"]
 
   request_parameters = {
     "method.request.path.proxy" = true

package/src/smithy/ts/api/generator.d.ts

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