@aws/nx-plugin 1.0.0-rc.5 → 1.0.0-rc.51

package/src/smithy/ts/api/files/handler.ts.template

@@ -10,8 +10,8 @@ import { injectLambdaContext } from '@aws-lambda-powertools/logger/middleware';
 import { Logger } from '@aws-lambda-powertools/logger';
 import { Metrics } from '@aws-lambda-powertools/metrics';
 import { logMetrics } from '@aws-lambda-powertools/metrics/middleware';
-import { Service } from './service.js';
-import { get<%- apiNameClassName %>ServiceHandler } from './generated/ssdk/index.js';
+import { Service } from './service<% if (esm) { %>.js<% } %>';
+import { get<%- apiNameClassName %>ServiceHandler } from './generated/ssdk/index<% if (esm) { %>.js<% } %>';
 
 process.env.POWERTOOLS_METRICS_NAMESPACE = '<%- apiNameClassName %>';
 process.env.POWERTOOLS_SERVICE_NAME = '<%- apiNameClassName %>';

package/src/smithy/ts/api/files/local-server.ts.template

@@ -3,8 +3,8 @@ import { convertRequest, writeResponse } from '@aws-smithy/server-node';
 import { Logger } from '@aws-lambda-powertools/logger';
 import { Metrics } from '@aws-lambda-powertools/metrics';
 import { Tracer } from '@aws-lambda-powertools/tracer';
-import { Service } from './service.js';
-import { get<%- apiNameClassName %>ServiceHandler } from './generated/ssdk/index.js';
+import { Service } from './service<% if (esm) { %>.js<% } %>';
+import { get<%- apiNameClassName %>ServiceHandler } from './generated/ssdk/index<% if (esm) { %>.js<% } %>';
 
 const PORT = <%- port %>;
 

package/src/smithy/ts/api/files/operations/echo.ts.template

@@ -1,5 +1,5 @@
-import { ServiceContext } from "../context.js";
-import { Echo as EchoOperation } from "../generated/ssdk/index.js";
+import { ServiceContext } from "../context<% if (esm) { %>.js<% } %>";
+import { Echo as EchoOperation } from "../generated/ssdk/index<% if (esm) { %>.js<% } %>";
 
 export const Echo: EchoOperation<ServiceContext> = async (input, ctx) => {
   ctx.logger.info('Starting Echo operation');

package/src/smithy/ts/api/files/service.ts.template

@@ -1,6 +1,6 @@
-import { ServiceContext } from './context.js';
-import { <%- apiNameClassName %>Service } from './generated/ssdk/index.js';
-import { Echo } from './operations/echo.js';
+import { ServiceContext } from './context<% if (esm) { %>.js<% } %>';
+import { <%- apiNameClassName %>Service } from './generated/ssdk/index<% if (esm) { %>.js<% } %>';
+import { Echo } from './operations/echo<% if (esm) { %>.js<% } %>';
 
 // Register operations to the service here
 export const Service: <%- apiNameClassName %>Service<ServiceContext> = {

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;

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

@@ -1,98 +1,95 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tsSmithyApiGenerator = exports.TS_SMITHY_API_GENERATOR_INFO = void 0;
-const tslib_1 = require("tslib");
 /**
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * 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 iac_1 = require("../../../utils/iac");
-const shared_constructs_1 = require("../../../utils/shared-constructs");
-const names_1 = require("../../../utils/names");
-const generator_1 = tslib_1.__importStar(require("../../../ts/lib/generator"));
-const port_1 = require("../../../utils/port");
-const versions_1 = require("../../../utils/versions");
-const generator_2 = tslib_1.__importDefault(require("../../project/generator"));
-const bundle_1 = require("../../../utils/bundle/bundle");
-const git_1 = require("../../../utils/git");
-const eslint_1 = require("../../../ts/lib/eslint");
-const fs_1 = require("../../../utils/fs");
-const api_constructs_1 = require("../../../utils/api-constructs/api-constructs");
-const open_api_metadata_1 = require("../../../utils/api-constructs/open-api-metadata");
-exports.TS_SMITHY_API_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
-const tsSmithyApiGenerator = async (tree, options) => {
-    if (options.infra !== 'rest-lambda' &&
-        options.infra !== 'none') {
-        throw new Error(`Unsupported infra '${options.infra}' for Smithy TypeScript API. ` +
-            `Only 'rest-lambda' (API Gateway REST API) is supported.`);
+ */ import { generateFiles, joinPathFragments, OverwriteStrategy, updateProjectConfiguration } from "@nx/devkit";
+import tsProjectGenerator, { getTsLibDetails } from "../../../ts/lib/generator.js";
+import { addApiGatewayInfra } from "../../../utils/api-constructs/api-constructs.js";
+import { addSharedConstructsOpenApiMetadataGenerateTarget } from "../../../utils/api-constructs/open-api-metadata.js";
+import { addTypeScriptBundleTarget } from "../../../utils/bundle/bundle.js";
+import { addDependenciesToPackageJson } from "../../../utils/dependencies.js";
+import { formatFilesInSubtree } from "../../../utils/format.js";
+import { FsCommands } from "../../../utils/fs.js";
+import { updateGitIgnore } from "../../../utils/git.js";
+import { resolveIac } from "../../../utils/iac.js";
+import { installDependencies } from "../../../utils/install.js";
+import { addGeneratorMetricsIfApplicable } from "../../../utils/metrics.js";
+import { esmVars } from "../../../utils/module-format.js";
+import { toClassName, toKebabCase } from "../../../utils/names.js";
+import { addDependencyToTargetIfNotPresent, addGeneratorMetadata, getGeneratorInfo, normalizeTargetKeyOrder, readProjectConfigurationUnqualified } from "../../../utils/nx.js";
+import { assignPort } from "../../../utils/port.js";
+import { sharedConstructsGenerator } from "../../../utils/shared-constructs.js";
+import { withVersions } from "../../../utils/versions.js";
+import smithyProjectGenerator from "../../project/generator.js";
+export const TS_SMITHY_API_GENERATOR_INFO = getGeneratorInfo(import.meta.filename);
+export const tsSmithyApiGenerator = async (tree, options)=>{
+    if (options.infra !== 'rest-lambda' && options.infra !== 'none') {
+        throw new Error(`Unsupported infra '${options.infra}' for Smithy TypeScript API. ` + `Only 'rest-lambda' (API Gateway REST API) is supported.`);
     }
     const integrationPattern = getIntegrationPattern(options);
-    const apiNameClassName = (0, names_1.toClassName)(options.name);
-    const apiNameKebabCase = (0, names_1.toKebabCase)(options.name);
-    const { fullyQualifiedName: backendFullyQualifiedName, dir } = (0, generator_1.getTsLibDetails)(tree, options);
+    const apiNameClassName = toClassName(options.name);
+    const apiNameKebabCase = toKebabCase(options.name);
+    const { fullyQualifiedName: backendFullyQualifiedName, dir } = getTsLibDetails(tree, options);
     const modelProjectName = `${apiNameKebabCase}-model`;
     let projectExists;
     try {
-        (0, nx_1.readProjectConfigurationUnqualified)(tree, backendFullyQualifiedName);
+        readProjectConfigurationUnqualified(tree, backendFullyQualifiedName);
         projectExists = true;
-    }
-    catch {
+    } catch  {
         projectExists = false;
     }
     if (!projectExists) {
         // Generate the model project
-        await (0, generator_2.default)(tree, {
+        await smithyProjectGenerator(tree, {
             name: modelProjectName,
             serviceName: apiNameClassName,
             namespace: options.namespace,
             directory: dir,
             subDirectory: 'model',
+            preferInstallDependencies: false
         });
         // Generate the backend project
-        await (0, generator_1.default)(tree, {
+        await tsProjectGenerator(tree, {
             name: options.name,
             directory: dir,
             subDirectory: 'backend',
+            preferInstallDependencies: false
         });
     }
     // Add metadata to associate backend project with model project
-    const modelProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, modelProjectName);
-    (0, devkit_1.updateProjectConfiguration)(tree, modelProjectConfig.name, {
+    const modelProjectConfig = readProjectConfigurationUnqualified(tree, modelProjectName);
+    updateProjectConfiguration(tree, modelProjectConfig.name, {
         ...modelProjectConfig,
         metadata: {
             ...modelProjectConfig.metadata,
-            backendProject: backendFullyQualifiedName,
-        },
+            backendProject: backendFullyQualifiedName
+        }
     });
-    (0, nx_1.addGeneratorMetadata)(tree, backendFullyQualifiedName, exports.TS_SMITHY_API_GENERATOR_INFO, {
+    addGeneratorMetadata(tree, backendFullyQualifiedName, TS_SMITHY_API_GENERATOR_INFO, {
         apiName: options.name,
         auth: options.auth,
-        modelProject: modelProjectConfig.name,
+        modelProject: modelProjectConfig.name
     });
-    const backendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, backendFullyQualifiedName);
-    const port = (0, port_1.assignPort)(tree, backendProjectConfig, 3001);
+    const backendProjectConfig = readProjectConfigurationUnqualified(tree, backendFullyQualifiedName);
+    const port = assignPort(tree, backendProjectConfig, 3001);
     // Delete default index.ts with "hello" function
-    tree.delete((0, devkit_1.joinPathFragments)(backendProjectConfig.sourceRoot, 'index.ts'));
-    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), backendProjectConfig.sourceRoot, {
+    tree.delete(joinPathFragments(backendProjectConfig.sourceRoot, 'index.ts'));
+    generateFiles(tree, joinPathFragments(import.meta.dirname, 'files'), backendProjectConfig.sourceRoot, {
         apiNameClassName,
         port,
+        ...esmVars(tree)
     });
     if (options.infra !== 'none') {
         if (options.auth === 'custom') {
-            (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', '..', 'utils', 'api-constructs', 'files', 'cdk', 'authorizer', 'rest'), backendProjectConfig.sourceRoot, {}, {
-                overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
+            generateFiles(tree, joinPathFragments(import.meta.dirname, '..', '..', '..', 'utils', 'api-constructs', 'files', 'cdk', 'authorizer', 'rest'), backendProjectConfig.sourceRoot, {}, {
+                overwriteStrategy: OverwriteStrategy.KeepExisting
             });
         }
         // Add infrastructure
-        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
-        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-            iac,
+        const iac = await resolveIac(tree, options.iac);
+        await sharedConstructsGenerator(tree, {
+            iac
         });
-        await (0, api_constructs_1.addApiGatewayInfra)(tree, {
+        await addApiGatewayInfra(tree, {
             iac,
             apiProjectName: backendFullyQualifiedName,
             apiNameClassName,
@@ -101,91 +98,111 @@ const tsSmithyApiGenerator = async (tree, options) => {
             constructType: 'rest',
             backend: {
                 type: 'smithy',
-                bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendProjectConfig.root, 'bundle'),
+                bundleOutputDir: joinPathFragments('dist', backendProjectConfig.root, 'bundle'),
                 integrationPattern,
-                ...(options.auth === 'custom' && {
-                    authorizerBundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendProjectConfig.root, 'bundle', 'authorizer'),
-                }),
-            },
+                ...options.auth === 'custom' && {
+                    authorizerBundleOutputDir: joinPathFragments('dist', backendProjectConfig.root, 'bundle', 'authorizer')
+                }
+            }
         });
-        (0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
+        addSharedConstructsOpenApiMetadataGenerateTarget(tree, {
             iac,
             apiNameKebabCase,
-            specPath: (0, devkit_1.joinPathFragments)('dist', modelProjectConfig.root, 'build', 'openapi', 'openapi.json'),
-            specBuildTargetName: `${modelProjectConfig.name}:build`,
+            specPath: joinPathFragments('dist', modelProjectConfig.root, 'build', 'openapi', 'openapi.json'),
+            specBuildTargetName: `${modelProjectConfig.name}:build`
         });
         // Add bundle target using rolldown
-        await (0, bundle_1.addTypeScriptBundleTarget)(tree, backendProjectConfig, {
+        await addTypeScriptBundleTarget(tree, backendProjectConfig, {
             targetFilePath: 'src/handler.ts',
-            external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
+            external: [
+                /@aws-sdk\/.*/
+            ]
         });
         if (options.auth === 'custom') {
-            await (0, bundle_1.addTypeScriptBundleTarget)(tree, backendProjectConfig, {
+            await addTypeScriptBundleTarget(tree, backendProjectConfig, {
                 targetFilePath: 'src/authorizer.ts',
                 bundleOutputDir: 'authorizer',
-                external: [/@aws-sdk\/.*/],
+                external: [
+                    /@aws-sdk\/.*/
+                ]
             });
         }
     }
-    const cmd = new fs_1.FsCommands(tree);
+    const cmd = new FsCommands(tree);
     const generatedSrcDirFromRoot = '{projectRoot}/src/generated';
     // Target for copying the ssdk built by the model
     backendProjectConfig.targets['copy-ssdk'] = {
         cache: true,
         inputs: [
             {
-                dependentTasksOutputFiles: '**/*',
-            },
+                dependentTasksOutputFiles: '**/*'
+            }
         ],
         executor: 'nx:run-commands',
         options: {
             commands: [
                 cmd.rm(generatedSrcDirFromRoot),
                 cmd.mkdir(generatedSrcDirFromRoot),
-                cmd.cp((0, devkit_1.joinPathFragments)('dist', modelProjectConfig.root, 'build', 'ssdk'), (0, devkit_1.joinPathFragments)(generatedSrcDirFromRoot, 'ssdk')),
+                cmd.cp(joinPathFragments('dist', modelProjectConfig.root, 'build', 'ssdk'), joinPathFragments(generatedSrcDirFromRoot, 'ssdk'))
             ],
-            parallel: false,
+            parallel: false
         },
-        outputs: ['{projectRoot}/src/generated'],
-        dependsOn: [`${modelProjectConfig.name}:build`],
+        outputs: [
+            '{projectRoot}/src/generated'
+        ],
+        dependsOn: [
+            `${modelProjectConfig.name}:build`
+        ]
     };
-    (0, nx_1.addDependencyToTargetIfNotPresent)(backendProjectConfig, 'compile', 'copy-ssdk');
+    addDependencyToTargetIfNotPresent(backendProjectConfig, 'compile', 'copy-ssdk');
     // Add a project which continuously copies based on changes to the model project
     // This allows the "serve" target to hot reload when the smithy model is changed
     backendProjectConfig.targets['watch-copy-ssdk'] = {
         executor: 'nx:run-commands',
-        options: {
-            command: `nx watch --projects=${modelProjectConfig.name} --includeDependentProjects -- nx run ${backendFullyQualifiedName}:copy-ssdk`,
-        },
         continuous: true,
+        options: {
+            command: `nx watch --projects=${modelProjectConfig.name} --includeDependencies -- nx run ${backendFullyQualifiedName}:copy-ssdk`
+        }
     };
     // Add serve target for running the server locally
-    backendProjectConfig.targets.serve = {
+    backendProjectConfig.targets.serve = normalizeTargetKeyOrder({
         executor: 'nx:run-commands',
+        continuous: true,
+        dependsOn: [
+            'copy-ssdk',
+            'watch-copy-ssdk'
+        ],
         options: {
             command: 'tsx --watch src/local-server.ts',
-            cwd: '{projectRoot}',
-        },
-        continuous: true,
-        dependsOn: ['copy-ssdk', 'watch-copy-ssdk'],
-    };
-    backendProjectConfig.targets['serve-local'] = {
+            cwd: '{projectRoot}'
+        }
+    });
+    const existingDevDependsOn = backendProjectConfig.targets['dev']?.dependsOn ?? [];
+    backendProjectConfig.targets['dev'] = normalizeTargetKeyOrder({
         ...backendProjectConfig.targets.serve,
+        // Own copy of dependsOn so adding dev dependencies below doesn't
+        // mutate the shared array referenced by the serve target.
+        dependsOn: [
+            ...backendProjectConfig.targets.serve.dependsOn ?? []
+        ],
         options: {
             ...backendProjectConfig.targets.serve.options,
             env: {
-                SERVE_LOCAL: 'true',
-            },
-        },
-    };
+                LOCAL_DEV: 'true'
+            }
+        }
+    });
+    // Preserve any dependencies added to dev by connection generators
+    for (const dependency of existingDevDependsOn){
+        addDependencyToTargetIfNotPresent(backendProjectConfig, 'dev', dependency);
+    }
     // Ignore generated code
-    (0, git_1.updateGitIgnore)(tree, backendProjectConfig.root, (patterns) => [
-        ...patterns,
-        'src/generated',
-    ]);
-    await (0, eslint_1.addIgnoresToEslintConfig)(tree, (0, devkit_1.joinPathFragments)(backendProjectConfig.root, 'eslint.config.mjs'), ['**/generated']);
-    (0, devkit_1.updateProjectConfiguration)(tree, backendFullyQualifiedName, backendProjectConfig);
-    (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
+    updateGitIgnore(tree, backendProjectConfig.root, (patterns)=>[
+            ...patterns,
+            'src/generated'
+        ]);
+    updateProjectConfiguration(tree, backendFullyQualifiedName, backendProjectConfig);
+    addDependenciesToPackageJson(tree, withVersions([
         '@aws-smithy/server-apigateway',
         '@aws-smithy/server-node',
         '@middy/core',
@@ -194,17 +211,26 @@ const tsSmithyApiGenerator = async (tree, options) => {
         '@aws-lambda-powertools/tracer',
         '@aws-lambda-powertools/metrics',
         '@aws-sdk/client-appconfigdata',
-        ...(options.auth === 'custom'
-            ? ['@aws-lambda-powertools/parser']
-            : []),
-    ]), (0, versions_1.withVersions)(['@types/aws-lambda']));
-    await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_SMITHY_API_GENERATOR_INFO]);
-    await (0, format_1.formatFilesInSubtree)(tree);
-    return () => {
-        (0, devkit_1.installPackagesTask)(tree);
-    };
+        ...options.auth === 'custom' ? [
+            '@aws-lambda-powertools/parser'
+        ] : []
+    ]), withVersions([
+        '@types/aws-lambda'
+    ]), joinPathFragments(backendProjectConfig.root, 'package.json'));
+    addDependenciesToPackageJson(tree, {}, withVersions([
+        'tsx'
+    ]));
+    await addGeneratorMetricsIfApplicable(tree, [
+        TS_SMITHY_API_GENERATOR_INFO
+    ]);
+    await formatFilesInSubtree(tree);
+    return ()=>installDependencies(tree, options.preferInstallDependencies, {
+            languages: [
+                'typescript'
+            ]
+        });
 };
-exports.tsSmithyApiGenerator = tsSmithyApiGenerator;
-const getIntegrationPattern = (options) => options.integrationPattern ?? 'isolated';
-exports.default = exports.tsSmithyApiGenerator;
+const getIntegrationPattern = (options)=>options.integrationPattern ?? 'isolated';
+export default tsSmithyApiGenerator;
+
 //# sourceMappingURL=generator.js.map

package/src/smithy/ts/api/generator.js.map

@@ -1 +1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/smithy/ts/api/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/smithy/ts/api/generator.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport {\n  type GeneratorCallback,\n  generateFiles,\n  joinPathFragments,\n  OverwriteStrategy,\n  type Tree,\n  updateProjectConfiguration,\n} from '@nx/devkit';\nimport tsProjectGenerator, { getTsLibDetails } from '../../../ts/lib/generator';\nimport { addApiGatewayInfra } from '../../../utils/api-constructs/api-constructs';\nimport { addSharedConstructsOpenApiMetadataGenerateTarget } from '../../../utils/api-constructs/open-api-metadata';\nimport { addTypeScriptBundleTarget } from '../../../utils/bundle/bundle';\nimport { addDependenciesToPackageJson } from '../../../utils/dependencies';\nimport { formatFilesInSubtree } from '../../../utils/format';\nimport { FsCommands } from '../../../utils/fs';\nimport { updateGitIgnore } from '../../../utils/git';\nimport { resolveIac } from '../../../utils/iac';\nimport { installDependencies } from '../../../utils/install';\nimport { addGeneratorMetricsIfApplicable } from '../../../utils/metrics';\nimport { esmVars } from '../../../utils/module-format';\nimport { toClassName, toKebabCase } from '../../../utils/names';\nimport {\n  addDependencyToTargetIfNotPresent,\n  addGeneratorMetadata,\n  getGeneratorInfo,\n  type NxGeneratorInfo,\n  normalizeTargetKeyOrder,\n  readProjectConfigurationUnqualified,\n} from '../../../utils/nx';\nimport { assignPort } from '../../../utils/port';\nimport { sharedConstructsGenerator } from '../../../utils/shared-constructs';\nimport { withVersions } from '../../../utils/versions';\nimport smithyProjectGenerator from '../../project/generator';\nimport type { TsSmithyApiGeneratorSchema } from './schema';\n\nexport const TS_SMITHY_API_GENERATOR_INFO: NxGeneratorInfo = getGeneratorInfo(\n  import.meta.filename,\n);\n\nexport const tsSmithyApiGenerator = async (\n  tree: Tree,\n  options: TsSmithyApiGeneratorSchema,\n): Promise<GeneratorCallback> => {\n  if (\n    (options.infra as string) !== 'rest-lambda' &&\n    (options.infra as string) !== 'none'\n  ) {\n    throw new Error(\n      `Unsupported infra '${options.infra}' for Smithy TypeScript API. ` +\n        `Only 'rest-lambda' (API Gateway REST API) is supported.`,\n    );\n  }\n\n  const integrationPattern = getIntegrationPattern(options);\n  const apiNameClassName = toClassName(options.name);\n  const apiNameKebabCase = toKebabCase(options.name);\n  const { fullyQualifiedName: backendFullyQualifiedName, dir } =\n    getTsLibDetails(tree, options);\n  const modelProjectName = `${apiNameKebabCase}-model`;\n\n  let projectExists: boolean;\n  try {\n    readProjectConfigurationUnqualified(tree, backendFullyQualifiedName);\n    projectExists = true;\n  } catch {\n    projectExists = false;\n  }\n\n  if (!projectExists) {\n    // Generate the model project\n    await smithyProjectGenerator(tree, {\n      name: modelProjectName,\n      serviceName: apiNameClassName,\n      namespace: options.namespace,\n      directory: dir,\n      subDirectory: 'model',\n      preferInstallDependencies: false,\n    });\n\n    // Generate the backend project\n    await tsProjectGenerator(tree, {\n      name: options.name,\n      directory: dir,\n      subDirectory: 'backend',\n      preferInstallDependencies: false,\n    });\n  }\n\n  // Add metadata to associate backend project with model project\n  const modelProjectConfig = readProjectConfigurationUnqualified(\n    tree,\n    modelProjectName,\n  );\n  updateProjectConfiguration(tree, modelProjectConfig.name, {\n    ...modelProjectConfig,\n    metadata: {\n      ...modelProjectConfig.metadata,\n      backendProject: backendFullyQualifiedName,\n    } as any,\n  });\n\n  addGeneratorMetadata(\n    tree,\n    backendFullyQualifiedName,\n    TS_SMITHY_API_GENERATOR_INFO,\n    {\n      apiName: options.name,\n      auth: options.auth,\n      modelProject: modelProjectConfig.name,\n    },\n  );\n\n  const backendProjectConfig = readProjectConfigurationUnqualified(\n    tree,\n    backendFullyQualifiedName,\n  );\n  const port = assignPort(tree, backendProjectConfig, 3001);\n\n  // Delete default index.ts with \"hello\" function\n  tree.delete(joinPathFragments(backendProjectConfig.sourceRoot, 'index.ts'));\n\n  generateFiles(\n    tree,\n    joinPathFragments(import.meta.dirname, 'files'),\n    backendProjectConfig.sourceRoot,\n    {\n      apiNameClassName,\n      port,\n      ...esmVars(tree),\n    },\n  );\n\n  if (options.infra !== 'none') {\n    if (options.auth === 'custom') {\n      generateFiles(\n        tree,\n        joinPathFragments(\n          import.meta.dirname,\n          '..',\n          '..',\n          '..',\n          'utils',\n          'api-constructs',\n          'files',\n          'cdk',\n          'authorizer',\n          'rest',\n        ),\n        backendProjectConfig.sourceRoot,\n        {},\n        {\n          overwriteStrategy: OverwriteStrategy.KeepExisting,\n        },\n      );\n    }\n\n    // Add infrastructure\n    const iac = await resolveIac(tree, options.iac);\n    await sharedConstructsGenerator(tree, {\n      iac,\n    });\n    await addApiGatewayInfra(tree, {\n      iac,\n      apiProjectName: backendFullyQualifiedName,\n      apiNameClassName,\n      apiNameKebabCase,\n      auth: options.auth,\n      constructType: 'rest',\n      backend: {\n        type: 'smithy',\n        bundleOutputDir: joinPathFragments(\n          'dist',\n          backendProjectConfig.root,\n          'bundle',\n        ),\n        integrationPattern,\n        ...(options.auth === 'custom' && {\n          authorizerBundleOutputDir: joinPathFragments(\n            'dist',\n            backendProjectConfig.root,\n            'bundle',\n            'authorizer',\n          ),\n        }),\n      },\n    });\n    addSharedConstructsOpenApiMetadataGenerateTarget(tree, {\n      iac,\n      apiNameKebabCase,\n      specPath: joinPathFragments(\n        'dist',\n        modelProjectConfig.root,\n        'build',\n        'openapi',\n        'openapi.json',\n      ),\n      specBuildTargetName: `${modelProjectConfig.name}:build`,\n    });\n\n    // Add bundle target using rolldown\n    await addTypeScriptBundleTarget(tree, backendProjectConfig, {\n      targetFilePath: 'src/handler.ts',\n      external: [/@aws-sdk\\/.*/], // lambda runtime provides aws sdk\n    });\n\n    if (options.auth === 'custom') {\n      await addTypeScriptBundleTarget(tree, backendProjectConfig, {\n        targetFilePath: 'src/authorizer.ts',\n        bundleOutputDir: 'authorizer',\n        external: [/@aws-sdk\\/.*/],\n      });\n    }\n  }\n\n  const cmd = new FsCommands(tree);\n  const generatedSrcDirFromRoot = '{projectRoot}/src/generated';\n\n  // Target for copying the ssdk built by the model\n  backendProjectConfig.targets['copy-ssdk'] = {\n    cache: true,\n    inputs: [\n      {\n        dependentTasksOutputFiles: '**/*',\n      },\n    ],\n    executor: 'nx:run-commands',\n    options: {\n      commands: [\n        cmd.rm(generatedSrcDirFromRoot),\n        cmd.mkdir(generatedSrcDirFromRoot),\n        cmd.cp(\n          joinPathFragments('dist', modelProjectConfig.root, 'build', 'ssdk'),\n          joinPathFragments(generatedSrcDirFromRoot, 'ssdk'),\n        ),\n      ],\n      parallel: false,\n    },\n    outputs: ['{projectRoot}/src/generated'],\n    dependsOn: [`${modelProjectConfig.name}:build`],\n  };\n  addDependencyToTargetIfNotPresent(\n    backendProjectConfig,\n    'compile',\n    'copy-ssdk',\n  );\n\n  // Add a project which continuously copies based on changes to the model project\n  // This allows the \"serve\" target to hot reload when the smithy model is changed\n  backendProjectConfig.targets['watch-copy-ssdk'] = {\n    executor: 'nx:run-commands',\n    continuous: true,\n    options: {\n      command: `nx watch --projects=${modelProjectConfig.name} --includeDependencies -- nx run ${backendFullyQualifiedName}:copy-ssdk`,\n    },\n  };\n\n  // Add serve target for running the server locally\n  backendProjectConfig.targets.serve = normalizeTargetKeyOrder({\n    executor: 'nx:run-commands',\n    continuous: true,\n    dependsOn: ['copy-ssdk', 'watch-copy-ssdk'],\n    options: {\n      command: 'tsx --watch src/local-server.ts',\n      cwd: '{projectRoot}',\n    },\n  });\n\n  const existingDevDependsOn =\n    backendProjectConfig.targets['dev']?.dependsOn ?? [];\n\n  backendProjectConfig.targets['dev'] = normalizeTargetKeyOrder({\n    ...backendProjectConfig.targets.serve,\n    // Own copy of dependsOn so adding dev dependencies below doesn't\n    // mutate the shared array referenced by the serve target.\n    dependsOn: [...(backendProjectConfig.targets.serve.dependsOn ?? [])],\n    options: {\n      ...backendProjectConfig.targets.serve.options,\n      env: {\n        LOCAL_DEV: 'true',\n      },\n    },\n  });\n\n  // Preserve any dependencies added to dev by connection generators\n  for (const dependency of existingDevDependsOn) {\n    addDependencyToTargetIfNotPresent(backendProjectConfig, 'dev', dependency);\n  }\n\n  // Ignore generated code\n  updateGitIgnore(tree, backendProjectConfig.root, (patterns) => [\n    ...patterns,\n    'src/generated',\n  ]);\n\n  updateProjectConfiguration(\n    tree,\n    backendFullyQualifiedName,\n    backendProjectConfig,\n  );\n\n  addDependenciesToPackageJson(\n    tree,\n    withVersions([\n      '@aws-smithy/server-apigateway',\n      '@aws-smithy/server-node',\n      '@middy/core',\n      '@aws-lambda-powertools/logger',\n      '@aws-lambda-powertools/parameters',\n      '@aws-lambda-powertools/tracer',\n      '@aws-lambda-powertools/metrics',\n      '@aws-sdk/client-appconfigdata',\n      ...(options.auth === 'custom'\n        ? (['@aws-lambda-powertools/parser'] as const)\n        : []),\n    ]),\n    withVersions(['@types/aws-lambda']),\n    joinPathFragments(backendProjectConfig.root, 'package.json'),\n  );\n  addDependenciesToPackageJson(tree, {}, withVersions(['tsx']));\n\n  await addGeneratorMetricsIfApplicable(tree, [TS_SMITHY_API_GENERATOR_INFO]);\n\n  await formatFilesInSubtree(tree);\n  return () =>\n    installDependencies(tree, options.preferInstallDependencies, {\n      languages: ['typescript'],\n    });\n};\n\nconst getIntegrationPattern = (\n  options: TsSmithyApiGeneratorSchema,\n): 'isolated' | 'shared' => options.integrationPattern ?? 'isolated';\n\nexport default tsSmithyApiGenerator;\n"],"names":["generateFiles","joinPathFragments","OverwriteStrategy","updateProjectConfiguration","tsProjectGenerator","getTsLibDetails","addApiGatewayInfra","addSharedConstructsOpenApiMetadataGenerateTarget","addTypeScriptBundleTarget","addDependenciesToPackageJson","formatFilesInSubtree","FsCommands","updateGitIgnore","resolveIac","installDependencies","addGeneratorMetricsIfApplicable","esmVars","toClassName","toKebabCase","addDependencyToTargetIfNotPresent","addGeneratorMetadata","getGeneratorInfo","normalizeTargetKeyOrder","readProjectConfigurationUnqualified","assignPort","sharedConstructsGenerator","withVersions","smithyProjectGenerator","TS_SMITHY_API_GENERATOR_INFO","filename","tsSmithyApiGenerator","tree","options","infra","Error","integrationPattern","getIntegrationPattern","apiNameClassName","name","apiNameKebabCase","fullyQualifiedName","backendFullyQualifiedName","dir","modelProjectName","projectExists","serviceName","namespace","directory","subDirectory","preferInstallDependencies","modelProjectConfig","metadata","backendProject","apiName","auth","modelProject","backendProjectConfig","port","delete","sourceRoot","dirname","overwriteStrategy","KeepExisting","iac","apiProjectName","constructType","backend","type","bundleOutputDir","root","authorizerBundleOutputDir","specPath","specBuildTargetName","targetFilePath","external","cmd","generatedSrcDirFromRoot","targets","cache","inputs","dependentTasksOutputFiles","executor","commands","rm","mkdir","cp","parallel","outputs","dependsOn","continuous","command","serve","cwd","existingDevDependsOn","env","LOCAL_DEV","dependency","patterns","languages"],"mappings":"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"}

package/src/smithy/ts/api/schema.d.js

@@ -0,0 +1,6 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */ export { };
+
+//# sourceMappingURL=schema.d.js.map

package/src/smithy/ts/api/schema.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../../../../../packages/nx-plugin/src/smithy/ts/api/schema.d.ts"],"sourcesContent":["/**\n * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.\n * SPDX-License-Identifier: Apache-2.0\n */\nimport { TsProjectGeneratorSchema } from '../../../ts/lib/schema';\nimport { IacOption } from '../../../utils/iac';\n\nexport interface TsSmithyApiGeneratorSchema {\n  name: string;\n  namespace?: string;\n  infra: 'rest-lambda' | 'none';\n  integrationPattern?: 'isolated' | 'shared';\n  auth: 'iam' | 'cognito' | 'custom';\n  directory?: TsProjectGeneratorSchema['directory'];\n  subDirectory?: TsProjectGeneratorSchema['subDirectory'];\n  iac: IacOption;\n  preferInstallDependencies?: boolean;\n}\n"],"names":[],"mappings":"AAAA;;;CAGC,GAID,WAUC"}

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

@@ -14,4 +14,5 @@ export interface TsSmithyApiGeneratorSchema {
   directory?: TsProjectGeneratorSchema['directory'];
   subDirectory?: TsProjectGeneratorSchema['subDirectory'];
   iac: IacOption;
+  preferInstallDependencies?: boolean;
 }

package/src/smithy/ts/api/schema.json

@@ -77,6 +77,11 @@
       "enum": ["rest-lambda", "none"],
       "x-prompt": "What infrastructure would you like to deploy your API with?",
       "x-priority": "internal"
+    },
+    "preferInstallDependencies": {
+      "type": "boolean",
+      "description": "Whether to prefer installing dependencies after the generator runs. Set to false to defer installing when batching multiple generators (an install still runs if needed so subsequent generators can compute the Nx project graph); install once at the end.",
+      "default": true
     }
   },
   "required": ["name"]

package/src/terraform/project/files/application/scripts/bootstrap.ts.template

@@ -4,7 +4,8 @@
  * Equivalent to `cdk bootstrap` — resolves account + region from the AWS
  * SDK credential chain, pulls any existing bootstrap tfstate from S3,
  * runs `terraform apply` in the `bootstrap` dir, then pushes the new
- * state back to S3.
+ * state back to S3. Adopts an already-existing state bucket when its
+ * state object is missing.
  */
 import { execFileSync } from 'node:child_process';
 import { mkdirSync, readFileSync, writeFileSync } from 'node:fs';
@@ -12,6 +13,7 @@ import { dirname, join, resolve } from 'node:path';
 import {
   S3Client,
   GetObjectCommand,
+  HeadBucketCommand,
   PutObjectCommand,
 } from '@aws-sdk/client-s3';
 import { fromNodeProviderChain } from '@aws-sdk/credential-providers';
@@ -34,6 +36,20 @@ const tfStatePath = join(
   'bootstrap.tfstate',
 );
 
+// S3 answers 404 only when the name is genuinely free; 403 means it exists
+// but is not readable with these credentials.
+const bucketExists = async (s3: S3Client, bucket: string) => {
+  try {
+    await s3.send(new HeadBucketCommand({ Bucket: bucket }));
+    return true;
+  } catch (err: any) {
+    const status = err?.$metadata?.httpStatusCode;
+    if (status === 404) return false;
+    if (status === 403) return true;
+    throw err;
+  }
+};
+
 const main = async () => {
   const { accountId, region } = await resolveAwsConfig();
   const bucket = `${accountId}-tf-state-${region}`;
@@ -46,12 +62,14 @@ const main = async () => {
   // Pull any existing bootstrap tfstate. First-time bootstrap has no
   // remote state yet — fall through and let terraform apply create the
   // bucket.
+  let haveState = false;
   try {
     const out = await s3.send(
       new GetObjectCommand({ Bucket: bucket, Key: key }),
     );
     if (out.Body) {
       writeFileSync(tfStatePath, await out.Body.transformToByteArray());
+      haveState = true;
     }
   } catch (err: any) {
     const name = err?.name ?? '';
@@ -65,6 +83,27 @@ const main = async () => {
   }
 
   execFileSync('terraform', ['init'], { cwd: bootstrapDir, stdio: 'inherit' });
+
+  // The bucket holds its own state, so losing the state object while the
+  // bucket survives would otherwise wedge bootstrap on a permanent
+  // `BucketAlreadyOwnedByYou`. Adopt the existing bucket instead.
+  if (!haveState && (await bucketExists(s3, bucket))) {
+    console.log(
+      `State bucket ${bucket} already exists but its bootstrap state is missing — importing it.`,
+    );
+    execFileSync(
+      'terraform',
+      [
+        'import',
+        `-state=${tfStatePath}`,
+        `-var=aws_region=${region}`,
+        'aws_s3_bucket.terraform_state',
+        bucket,
+      ],
+      { cwd: bootstrapDir, stdio: 'inherit' },
+    );
+  }
+
   execFileSync(
     'terraform',
     [

package/src/terraform/project/files/application/src/main.tf.template

@@ -14,6 +14,11 @@ resource "null_resource" "print_info" {
   # }
 
   provisioner "local-exec" {
-    command = "echo 'AWS Region: ${local.aws_region}, AWS Account: ${local.account_id}, Environment: ${var.environment}'"
+    command = "echo \"AWS Region: $AWS_REGION, AWS Account: $ACCOUNT_ID, Environment: $ENVIRONMENT\""
+    environment = {
+      AWS_REGION  = local.aws_region
+      ACCOUNT_ID  = local.account_id
+      ENVIRONMENT = var.environment
+    }
   }
 }

package/src/terraform/project/files/application/src/providers.tf.template

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "~> 6.0"
+      version = "<%- awsProviderVersion %>"
     }
   }
 

package/src/terraform/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 { Tree, GeneratorCallback } from '@nx/devkit';
-import { TerraformProjectGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type GeneratorCallback, type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { TerraformProjectGeneratorSchema } from './schema';
 export declare const TERRAFORM_PROJECT_GENERATOR_INFO: NxGeneratorInfo;
 export declare function terraformProjectGenerator(tree: Tree, schema: TerraformProjectGeneratorSchema): Promise<GeneratorCallback>;
 export default terraformProjectGenerator;