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

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

@@ -7,37 +7,57 @@ const tslib_1 = require("tslib");
  * 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 generator_1 = tslib_1.__importStar(require("../../../ts/lib/generator"));
+const api_constructs_1 = require("../../../utils/api-constructs/api-constructs");
+const open_api_metadata_1 = require("../../../utils/api-constructs/open-api-metadata");
+const bundle_1 = require("../../../utils/bundle/bundle");
 const format_1 = require("../../../utils/format");
+const fs_1 = require("../../../utils/fs");
+const git_1 = require("../../../utils/git");
 const iac_1 = require("../../../utils/iac");
-const shared_constructs_1 = require("../../../utils/shared-constructs");
+const metrics_1 = require("../../../utils/metrics");
 const names_1 = require("../../../utils/names");
-const generator_1 = tslib_1.__importStar(require("../../../ts/lib/generator"));
+const nx_1 = require("../../../utils/nx");
 const port_1 = require("../../../utils/port");
+const shared_constructs_1 = require("../../../utils/shared-constructs");
 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.`);
+    }
     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 modelProjectName = `${apiNameKebabCase}-model`;
-    // Generate the model project
-    await (0, generator_2.default)(tree, {
-        name: modelProjectName,
-        serviceName: apiNameClassName,
-        namespace: options.namespace,
-        directory: dir,
-        subDirectory: 'model',
-    });
+    let projectExists;
+    try {
+        (0, nx_1.readProjectConfigurationUnqualified)(tree, backendFullyQualifiedName);
+        projectExists = true;
+    }
+    catch {
+        projectExists = false;
+    }
+    if (!projectExists) {
+        // Generate the model project
+        await (0, generator_2.default)(tree, {
+            name: modelProjectName,
+            serviceName: apiNameClassName,
+            namespace: options.namespace,
+            directory: dir,
+            subDirectory: 'model',
+        });
+        // Generate the backend project
+        await (0, generator_1.default)(tree, {
+            name: options.name,
+            directory: dir,
+            subDirectory: 'backend',
+        });
+    }
     // Add metadata to associate backend project with model project
     const modelProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, modelProjectName);
     (0, devkit_1.updateProjectConfiguration)(tree, modelProjectConfig.name, {
@@ -47,12 +67,6 @@ const tsSmithyApiGenerator = async (tree, options) => {
             backendProject: backendFullyQualifiedName,
         },
     });
-    // Generate the backend project
-    await (0, generator_1.default)(tree, {
-        name: options.name,
-        directory: dir,
-        subDirectory: 'backend',
-    });
     (0, nx_1.addGeneratorMetadata)(tree, backendFullyQualifiedName, exports.TS_SMITHY_API_GENERATOR_INFO, {
         apiName: options.name,
         auth: options.auth,
@@ -66,49 +80,51 @@ const tsSmithyApiGenerator = async (tree, options) => {
         apiNameClassName,
         port,
     });
-    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,
+    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,
+            });
+        }
+        // Add infrastructure
+        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
+        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
+            iac,
         });
-    }
-    // Add infrastructure
-    const iac = await (0, iac_1.resolveIac)(tree, options.iac);
-    await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-        iac,
-    });
-    await (0, api_constructs_1.addApiGatewayInfra)(tree, {
-        iac,
-        apiProjectName: backendFullyQualifiedName,
-        apiNameClassName,
-        apiNameKebabCase,
-        auth: options.auth,
-        constructType: 'rest', // While possible in theory, Smithy doesn't support HTTP APIs
-        backend: {
-            type: 'smithy',
-            bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendProjectConfig.root, 'bundle'),
-            integrationPattern,
-            ...(options.auth === 'custom' && {
-                authorizerBundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendProjectConfig.root, 'bundle', 'authorizer'),
-            }),
-        },
-    });
-    (0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
-        iac,
-        apiNameKebabCase,
-        specPath: (0, devkit_1.joinPathFragments)('dist', modelProjectConfig.root, 'build', 'openapi', 'openapi.json'),
-        specBuildTargetName: `${modelProjectConfig.name}:build`,
-    });
-    // Add bundle target using rolldown
-    await (0, bundle_1.addTypeScriptBundleTarget)(tree, backendProjectConfig, {
-        targetFilePath: 'src/handler.ts',
-        external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
-    });
-    if (options.auth === 'custom') {
+        await (0, api_constructs_1.addApiGatewayInfra)(tree, {
+            iac,
+            apiProjectName: backendFullyQualifiedName,
+            apiNameClassName,
+            apiNameKebabCase,
+            auth: options.auth,
+            constructType: 'rest',
+            backend: {
+                type: 'smithy',
+                bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendProjectConfig.root, 'bundle'),
+                integrationPattern,
+                ...(options.auth === 'custom' && {
+                    authorizerBundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendProjectConfig.root, 'bundle', 'authorizer'),
+                }),
+            },
+        });
+        (0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
+            iac,
+            apiNameKebabCase,
+            specPath: (0, devkit_1.joinPathFragments)('dist', modelProjectConfig.root, 'build', 'openapi', 'openapi.json'),
+            specBuildTargetName: `${modelProjectConfig.name}:build`,
+        });
+        // Add bundle target using rolldown
         await (0, bundle_1.addTypeScriptBundleTarget)(tree, backendProjectConfig, {
-            targetFilePath: 'src/authorizer.ts',
-            bundleOutputDir: 'authorizer',
-            external: [/@aws-sdk\/.*/],
+            targetFilePath: 'src/handler.ts',
+            external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
         });
+        if (options.auth === 'custom') {
+            await (0, bundle_1.addTypeScriptBundleTarget)(tree, backendProjectConfig, {
+                targetFilePath: 'src/authorizer.ts',
+                bundleOutputDir: 'authorizer',
+                external: [/@aws-sdk\/.*/],
+            });
+        }
     }
     const cmd = new fs_1.FsCommands(tree);
     const generatedSrcDirFromRoot = '{projectRoot}/src/generated';
@@ -152,8 +168,12 @@ const tsSmithyApiGenerator = async (tree, options) => {
         continuous: true,
         dependsOn: ['copy-ssdk', 'watch-copy-ssdk'],
     };
+    const existingServeLocalDependsOn = backendProjectConfig.targets['serve-local']?.dependsOn ?? [];
     backendProjectConfig.targets['serve-local'] = {
         ...backendProjectConfig.targets.serve,
+        // Own copy of dependsOn so adding serve-local dependencies below doesn't
+        // mutate the shared array referenced by the serve target.
+        dependsOn: [...(backendProjectConfig.targets.serve.dependsOn ?? [])],
         options: {
             ...backendProjectConfig.targets.serve.options,
             env: {
@@ -161,12 +181,15 @@ const tsSmithyApiGenerator = async (tree, options) => {
             },
         },
     };
+    // Preserve any dependencies added to serve-local by connection generators
+    for (const dependency of existingServeLocalDependsOn) {
+        (0, nx_1.addDependencyToTargetIfNotPresent)(backendProjectConfig, 'serve-local', 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)([
         '@aws-smithy/server-apigateway',
@@ -180,7 +203,7 @@ const tsSmithyApiGenerator = async (tree, options) => {
         ...(options.auth === 'custom'
             ? ['@aws-lambda-powertools/parser']
             : []),
-    ]), (0, versions_1.withVersions)(['@types/aws-lambda']));
+    ]), (0, versions_1.withVersions)(['@types/aws-lambda', 'tsx']));
     await (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_SMITHY_API_GENERATOR_INFO]);
     await (0, format_1.formatFilesInSubtree)(tree);
     return () => {

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,"file":"generator.js","sourceRoot":"","sources":["../../../../../../../packages/nx-plugin/src/smithy/ts/api/generator.ts"],"names":[],"mappings":"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"}

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

@@ -8,7 +8,7 @@ import { IacOption } from '../../../utils/iac';
 export interface TsSmithyApiGeneratorSchema {
   name: string;
   namespace?: string;
-  infra: 'rest-lambda';
+  infra: 'rest-lambda' | 'none';
   integrationPattern?: 'isolated' | 'shared';
   auth: 'iam' | 'cognito' | 'custom';
   directory?: TsProjectGeneratorSchema['directory'];

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

@@ -74,7 +74,7 @@
       "type": "string",
       "description": "The type of infrastructure to use to deploy this API.",
       "default": "rest-lambda",
-      "enum": ["rest-lambda"],
+      "enum": ["rest-lambda", "none"],
       "x-prompt": "What infrastructure would you like to deploy your API with?",
       "x-priority": "internal"
     }

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;

package/src/terraform/project/generator.js

@@ -7,17 +7,17 @@ exports.terraformProjectGenerator = terraformProjectGenerator;
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const generator_1 = require("../../ts/lib/generator");
 const path_1 = require("path");
-const object_1 = require("../../utils/object");
-const nx_1 = require("../../utils/nx");
+const generator_1 = require("../../ts/lib/generator");
 const git_1 = require("../../utils/git");
-const versions_1 = require("../../utils/versions");
 const metrics_1 = require("../../utils/metrics");
-const shared_constructs_1 = require("../../utils/shared-constructs");
+const names_1 = require("../../utils/names");
+const nx_1 = require("../../utils/nx");
+const object_1 = require("../../utils/object");
 const py_1 = require("../../utils/py");
+const shared_constructs_1 = require("../../utils/shared-constructs");
 const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
-const names_1 = require("../../utils/names");
+const versions_1 = require("../../utils/versions");
 const NX_EXTEND_PLUGIN = '@nx-extend/terraform';
 exports.TERRAFORM_PROJECT_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 async function terraformProjectGenerator(tree, schema) {
@@ -178,7 +178,7 @@ async function terraformProjectGenerator(tree, schema) {
             dependsOn: ['init'],
         },
     };
-    (0, devkit_1.addProjectConfiguration)(tree, lib.fullyQualifiedName, {
+    const projectConfiguration = {
         root: lib.dir,
         projectType: schema.type,
         sourceRoot: (0, devkit_1.joinPathFragments)(lib.dir, 'src'),
@@ -186,7 +186,12 @@ async function terraformProjectGenerator(tree, schema) {
             ...libTargets,
             ...(schema.type === 'application' ? applicationTargets : {}),
         }),
-    });
+    };
+    // Only create the project configuration on first run; skip it on re-run so
+    // existing project.json customisations are preserved.
+    if (!(0, nx_1.projectExists)(tree, lib.fullyQualifiedName)) {
+        (0, devkit_1.addProjectConfiguration)(tree, lib.fullyQualifiedName, projectConfiguration);
+    }
     (0, nx_1.addGeneratorMetadata)(tree, lib.fullyQualifiedName, exports.TERRAFORM_PROJECT_GENERATOR_INFO);
     (0, devkit_1.generateFiles)(tree, // the virtual file system
     (0, devkit_1.joinPathFragments)(__dirname, `./files/${schema.type}`), // path to the file templates

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

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

package/src/trpc/backend/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 } from '@nx/devkit';
-import { TsTrpcApiGeneratorSchema } from './schema';
-import { NxGeneratorInfo } from '../../utils/nx';
+import { type Tree } from '@nx/devkit';
+import { type NxGeneratorInfo } from '../../utils/nx';
+import type { TsTrpcApiGeneratorSchema } from './schema';
 export declare const TRPC_BACKEND_GENERATOR_INFO: NxGeneratorInfo;
 export declare function tsTrpcApiGenerator(tree: Tree, options: TsTrpcApiGeneratorSchema): Promise<() => void>;
 export default tsTrpcApiGenerator;

package/src/trpc/backend/generator.js

@@ -8,43 +8,53 @@ const tslib_1 = require("tslib");
  * SPDX-License-Identifier: Apache-2.0
  */
 const devkit_1 = require("@nx/devkit");
-const shared_constructs_1 = require("../../utils/shared-constructs");
 const generator_1 = tslib_1.__importDefault(require("../../ts/lib/generator"));
-const npm_scope_1 = require("../../utils/npm-scope");
-const versions_1 = require("../../utils/versions");
-const names_1 = require("../../utils/names");
+const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
+const bundle_1 = require("../../utils/bundle/bundle");
 const format_1 = require("../../utils/format");
-const pkg_manager_1 = require("../../utils/pkg-manager");
-const object_1 = require("../../utils/object");
-const nx_1 = require("../../utils/nx");
+const iac_1 = require("../../utils/iac");
 const metrics_1 = require("../../utils/metrics");
-const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
+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 port_1 = require("../../utils/port");
-const iac_1 = require("../../utils/iac");
-const bundle_1 = require("../../utils/bundle/bundle");
+const shared_constructs_1 = require("../../utils/shared-constructs");
+const versions_1 = require("../../utils/versions");
 exports.TRPC_BACKEND_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 const VALID_TRPC_INTEGRATION_PERMUTATIONS = new Set([
     'rest-lambda::isolated',
     'rest-lambda::shared',
     'http-lambda::isolated',
     'http-lambda::shared',
+    'none::isolated',
+    'none::shared',
 ]);
 async function tsTrpcApiGenerator(tree, options) {
-    validateTrpcInfraAndIntegrationPatternCombination(options);
-    const iac = await (0, iac_1.resolveIac)(tree, options.iac);
-    await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
-        iac,
-    });
+    if (options.infra !== 'none') {
+        validateTrpcInfraAndIntegrationPatternCombination(options);
+    }
     const apiNamespace = (0, npm_scope_1.getNpmScopePrefix)(tree);
     const apiNameKebabCase = (0, names_1.kebabCase)(options.name);
     const apiNameClassName = (0, names_1.toClassName)(options.name);
     const backendName = apiNameKebabCase;
     const backendProjectName = `${apiNamespace}${backendName}`;
-    await (0, generator_1.default)(tree, {
-        name: backendName,
-        directory: options.directory,
-        subDirectory: options.subDirectory,
-    });
+    let projectExists;
+    try {
+        (0, nx_1.readProjectConfigurationUnqualified)(tree, backendProjectName);
+        projectExists = true;
+    }
+    catch {
+        projectExists = false;
+    }
+    if (!projectExists) {
+        await (0, generator_1.default)(tree, {
+            name: backendName,
+            directory: options.directory,
+            subDirectory: options.subDirectory,
+        });
+    }
     const projectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, backendProjectName);
     const backendRoot = projectConfig.root;
     const port = (0, port_1.assignPort)(tree, projectConfig, 2022);
@@ -59,23 +69,29 @@ async function tsTrpcApiGenerator(tree, options) {
         port,
         ...options,
     };
-    await (0, api_constructs_1.addApiGatewayInfra)(tree, {
-        apiProjectName: backendProjectName,
-        apiNameClassName,
-        apiNameKebabCase,
-        constructType: options.infra === 'http-lambda' ? 'http' : 'rest',
-        backend: {
-            type: 'trpc',
-            projectAlias: enhancedOptions.backendProjectAlias,
-            bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle'),
-            integrationPattern: getIntegrationPattern(options),
-            ...(options.auth === 'custom' && {
-                authorizerBundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle', 'authorizer'),
-            }),
-        },
-        auth: options.auth,
-        iac,
-    });
+    if (options.infra !== 'none') {
+        const iac = await (0, iac_1.resolveIac)(tree, options.iac);
+        await (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
+            iac,
+        });
+        await (0, api_constructs_1.addApiGatewayInfra)(tree, {
+            apiProjectName: backendProjectName,
+            apiNameClassName,
+            apiNameKebabCase,
+            constructType: options.infra === 'http-lambda' ? 'http' : 'rest',
+            backend: {
+                type: 'trpc',
+                projectAlias: enhancedOptions.backendProjectAlias,
+                bundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle'),
+                integrationPattern: getIntegrationPattern(options),
+                ...(options.auth === 'custom' && {
+                    authorizerBundleOutputDir: (0, devkit_1.joinPathFragments)('dist', backendRoot, 'bundle', 'authorizer'),
+                }),
+            },
+            auth: options.auth,
+            iac,
+        });
+    }
     projectConfig.metadata = {
         ...projectConfig.metadata,
         apiName: options.name,
@@ -93,6 +109,7 @@ async function tsTrpcApiGenerator(tree, options) {
         continuous: true,
     };
     projectConfig.targets['serve-local'] = {
+        ...projectConfig.targets['serve-local'],
         ...projectConfig.targets.serve,
         options: {
             ...projectConfig.targets.serve.options,
@@ -101,32 +118,34 @@ async function tsTrpcApiGenerator(tree, options) {
             },
         },
     };
-    await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
-        targetFilePath: 'src/handler.ts',
-        external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
-    });
-    if (options.auth === 'custom') {
+    if (options.infra !== 'none') {
         await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
-            targetFilePath: 'src/authorizer.ts',
-            bundleOutputDir: 'authorizer',
-            external: [/@aws-sdk\/.*/],
+            targetFilePath: 'src/handler.ts',
+            external: [/@aws-sdk\/.*/], // lambda runtime provides aws sdk
         });
+        if (options.auth === 'custom') {
+            await (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
+                targetFilePath: 'src/authorizer.ts',
+                bundleOutputDir: 'authorizer',
+                external: [/@aws-sdk\/.*/],
+            });
+        }
+        (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'bundle');
     }
-    (0, nx_1.addDependencyToTargetIfNotPresent)(projectConfig, 'build', 'bundle');
     projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
     (0, devkit_1.updateProjectConfiguration)(tree, projectConfig.name, projectConfig);
     (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files'), backendRoot, enhancedOptions, {
         overwriteStrategy: devkit_1.OverwriteStrategy.Overwrite,
     });
     tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'src', 'lib'));
-    if (options.auth === 'custom') {
+    if (options.infra !== 'none' && options.auth === 'custom') {
         const authorizerType = options.infra === 'http-lambda' ? 'http' : 'rest';
         (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, '..', '..', 'utils', 'api-constructs', 'files', 'cdk', 'authorizer', authorizerType), (0, devkit_1.joinPathFragments)(backendRoot, 'src'), {}, {
             overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting,
         });
     }
     // Remove streaming schema helper for HTTP APIs (API Gateway HTTP API doesn't support streaming)
-    if (options.infra !== 'rest-lambda') {
+    if (options.infra !== 'rest-lambda' && options.infra !== 'none') {
         tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'src', 'schema', 'z-async-iterable.ts'));
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([

package/src/trpc/backend/generator.js.map

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

package/src/trpc/backend/schema.d.ts

@@ -2,13 +2,13 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { Linter } from '@nx/eslint';
-import { IacOption } from '../../utils/iac';
+
 import { TsProjectGeneratorSchema } from '../../ts/lib/schema';
+import { IacOption } from '../../utils/iac';
 
 export interface TsTrpcApiGeneratorSchema {
   name: string;
-  infra: 'rest-lambda' | 'http-lambda';
+  infra: 'rest-lambda' | 'http-lambda' | 'none';
   integrationPattern?: 'isolated' | 'shared';
   auth: 'iam' | 'cognito' | 'custom';
   directory?: TsProjectGeneratorSchema['directory'];

package/src/trpc/backend/schema.json

@@ -66,9 +66,9 @@
     },
     "infra": {
       "type": "string",
-      "description": "The type of infrastructure to use to deploy this API. Choose between rest-lambda (default) or http-lambda.",
+      "description": "The type of infrastructure to use to deploy this API.",
       "default": "rest-lambda",
-      "enum": ["rest-lambda", "http-lambda"],
+      "enum": ["rest-lambda", "http-lambda", "none"],
       "x-prompt": "What infrastructure would you like to deploy your API with?",
       "x-priority": "important"
     }