@aws/nx-plugin 0.49.0 → 0.50.0

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

@@ -0,0 +1,12 @@
+import { Logger } from '@aws-lambda-powertools/logger';
+import { Metrics } from '@aws-lambda-powertools/metrics';
+import { Tracer } from '@aws-lambda-powertools/tracer';
+
+/**
+ * Context provided to all operations.
+ */
+export interface ServiceContext {
+  tracer: Tracer;
+  logger: Logger;
+  metrics: Metrics;
+}

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

@@ -0,0 +1,50 @@
+import {
+  convertEvent,
+  convertVersion1Response,
+} from '@aws-smithy/server-apigateway';
+import type { APIGatewayProxyEvent, APIGatewayProxyResult } from 'aws-lambda';
+import middy from '@middy/core';
+import { Tracer } from '@aws-lambda-powertools/tracer';
+import { captureLambdaHandler } from '@aws-lambda-powertools/tracer/middleware';
+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';
+
+process.env.POWERTOOLS_METRICS_NAMESPACE = '<%- apiNameClassName %>';
+process.env.POWERTOOLS_SERVICE_NAME = '<%- apiNameClassName %>';
+
+const tracer = new Tracer();
+const logger = new Logger();
+const metrics = new Metrics();
+
+const serviceHandler = get<%- apiNameClassName %>ServiceHandler(Service);
+
+export const lambdaHandler = async (
+  event: APIGatewayProxyEvent,
+): Promise<APIGatewayProxyResult> => {
+  const httpRequest = convertEvent(event);
+  const httpResponse = await serviceHandler.handle(httpRequest, {
+    tracer,
+    logger,
+    metrics,
+  });
+  const apiGatewayResponse = convertVersion1Response(httpResponse);
+
+  return {
+    ...apiGatewayResponse,
+    headers: {
+      'Access-Control-Allow-Origin': '*',
+      'Access-Control-Allow-Methods': '*',
+      ...apiGatewayResponse.headers,
+    },
+  };
+};
+
+export const handler = middy<APIGatewayProxyEvent, APIGatewayProxyResult>()
+  .use(captureLambdaHandler(tracer))
+  .use(injectLambdaContext(logger))
+  .use(logMetrics(metrics))
+  .handler(lambdaHandler);

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

@@ -0,0 +1,41 @@
+import { IncomingMessage, ServerResponse, createServer } from 'http';
+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';
+
+const PORT = <%- port %>;
+
+const tracer = new Tracer();
+const logger = new Logger();
+const metrics = new Metrics();
+
+const serviceHandler = get<%- apiNameClassName %>ServiceHandler(Service);
+
+const server = createServer(async function (
+  req: IncomingMessage,
+  res: ServerResponse<IncomingMessage> & { req: IncomingMessage },
+) {
+  res.setHeader('Access-Control-Allow-Origin', '*');
+  res.setHeader('Access-Control-Allow-Methods', '*');
+  res.setHeader('Access-Control-Allow-Headers', '*');
+
+	if (req.method === 'OPTIONS') {
+		res.writeHead(204);
+		res.end();
+		return;
+	}
+
+  const httpRequest = convertRequest(req);
+  const httpResponse = await serviceHandler.handle(httpRequest, {
+    tracer,
+    logger,
+    metrics,
+  });
+  return writeResponse(httpResponse, res);
+});
+
+server.listen(PORT);
+console.log(`Started server on port ${PORT}...`);

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

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

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

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

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

@@ -0,0 +1,10 @@
+/**
+ * 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';
+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

@@ -0,0 +1,154 @@
+"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 = (tree, options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    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
+    yield (0, generator_2.default)(tree, {
+        name: modelProjectName,
+        serviceName: apiNameClassName,
+        namespace: options.namespace,
+        directory: dir,
+        subDirectory: 'model',
+    });
+    // Add metadata to associate backend project with model project
+    const modelProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, modelProjectName);
+    (0, devkit_1.updateProjectConfiguration)(tree, modelProjectConfig.name, Object.assign(Object.assign({}, modelProjectConfig), { metadata: Object.assign(Object.assign({}, modelProjectConfig.metadata), { backendProject: backendFullyQualifiedName }) }));
+    // Generate the backend project
+    yield (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,
+        modelProject: modelProjectConfig.name,
+    });
+    const backendProjectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, backendFullyQualifiedName);
+    const port = (0, port_1.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, {
+        apiNameClassName,
+        port,
+    });
+    // Add infrastructure
+    const iacProvider = yield (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
+    yield (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
+        iacProvider,
+    });
+    (0, api_constructs_1.addApiGatewayInfra)(tree, {
+        iacProvider,
+        apiProjectName: backendFullyQualifiedName,
+        apiNameClassName,
+        apiNameKebabCase,
+        auth: options.auth,
+        constructType: 'rest', // While possible in theory, Smithy doesn't support HTTP APIs
+        backend: {
+            type: 'smithy',
+            dir: backendProjectConfig.root,
+        },
+    });
+    (0, open_api_metadata_1.addSharedConstructsOpenApiMetadataGenerateTarget)(tree, {
+        iacProvider,
+        apiNameKebabCase,
+        specPath: (0, devkit_1.joinPathFragments)('dist', modelProjectConfig.root, 'build', 'openapi', 'openapi.json'),
+        specBuildTargetName: `${modelProjectConfig.name}:build`,
+    });
+    // Add bundle target using rolldown
+    (0, bundle_1.addTypeScriptBundleTarget)(tree, backendProjectConfig, {
+        targetFilePath: 'src/handler.ts',
+    });
+    const cmd = new fs_1.FsCommands(tree);
+    const generatedSrcDirFromRoot = (0, devkit_1.joinPathFragments)(backendProjectConfig.sourceRoot, 'generated');
+    // Target for copying the ssdk built by the model
+    backendProjectConfig.targets['copy-ssdk'] = {
+        cache: true,
+        inputs: [
+            {
+                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')),
+            ],
+            parallel: false,
+        },
+        outputs: ['{projectRoot}/src/generated'],
+        dependsOn: [`${modelProjectConfig.name}:build`],
+    };
+    (0, nx_1.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,
+    };
+    // Add serve target for running the server locally
+    backendProjectConfig.targets.serve = {
+        executor: 'nx:run-commands',
+        options: {
+            command: 'tsx --watch src/local-server.ts',
+            cwd: '{projectRoot}',
+        },
+        continuous: true,
+        dependsOn: ['copy-ssdk', 'watch-copy-ssdk'],
+    };
+    // Ignore generated code
+    (0, git_1.updateGitIgnore)(tree, backendProjectConfig.root, (patterns) => [
+        ...patterns,
+        'src/generated',
+    ]);
+    (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',
+        '@aws-smithy/server-node',
+        '@middy/core',
+        '@aws-lambda-powertools/logger',
+        '@aws-lambda-powertools/tracer',
+        '@aws-lambda-powertools/metrics',
+    ]), (0, versions_1.withVersions)(['@types/aws-lambda']));
+    yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TS_SMITHY_API_GENERATOR_INFO]);
+    yield (0, format_1.formatFilesInSubtree)(tree);
+    return () => {
+        (0, devkit_1.installPackagesTask)(tree);
+    };
+});
+exports.tsSmithyApiGenerator = tsSmithyApiGenerator;
+exports.default = exports.tsSmithyApiGenerator;
+//# sourceMappingURL=generator.js.map

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

@@ -0,0 +1 @@
+{"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

@@ -0,0 +1,14 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export interface TsSmithyApiGeneratorSchema {
+  name: string;
+  namespace?: string;
+  // Only API Gateway REST APIs are supported by Smithy
+  // https://smithy.io/2.0/languages/typescript/ts-ssdk/supported-endpoints.html#amazon-api-gateway-rest-apis-and-aws-lambda
+  computeType: 'ServerlessApiGatewayRestApi';
+  auth: 'IAM' | 'Cognito' | 'None';
+  directory?: TsProjectGeneratorSchema['directory'];
+  iacProvider: IacProviderOption;
+}

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

@@ -0,0 +1,56 @@
+{
+  "$schema": "https://json-schema.org/schema",
+  "$id": "ts#smithy-api",
+  "title": "ts#smithy-api",
+  "description": "Create an API using Smithy and the Smithy TypeScript Server SDK",
+  "type": "object",
+  "properties": {
+    "name": {
+      "type": "string",
+      "description": "The name of the API (required). Used to generate class names and file paths.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "What name would you like your API to have? i.e: MyApi"
+    },
+    "namespace": {
+      "type": "string",
+      "description": "The namespace for the Smithy API. Defaults to your monorepo scope",
+      "x-prompt": "What namespace would you like your API to have? i.e: com.example"
+    },
+    "computeType": {
+      "type": "string",
+      "description": "The type of compute to use to deploy this API.",
+      "default": "ServerlessApiGatewayRestApi",
+      "enum": ["ServerlessApiGatewayRestApi"],
+      "x-prompt": "What compute type would you like to deploy your API with?",
+      "x-priority": "internal"
+    },
+    "auth": {
+      "type": "string",
+      "description": "The method used to authenticate with your API. Choose between IAM (default), Cognito or None.",
+      "default": "IAM",
+      "enum": ["IAM", "Cognito", "None"],
+      "x-prompt": "How would you like users to authenticate with your API?",
+      "x-priority": "important"
+    },
+    "directory": {
+      "description": "The directory to store the application in.",
+      "type": "string",
+      "alias": "dir",
+      "x-priority": "important",
+      "default": "packages",
+      "x-prompt": "What directory would you like to store your application in?"
+    },
+    "iacProvider": {
+      "type": "string",
+      "description": "The preferred IaC provider. By default this is inherited from your initial selection.",
+      "enum": ["Inherit", "CDK", "Terraform"],
+      "x-priority": "important",
+      "default": "Inherit",
+      "x-prompt": "Which provider would you like to manage your infrastructure? (default: Inherit)"
+    }
+  },
+  "required": ["name"]
+}

package/src/trpc/backend/__snapshots__/generator.spec.ts.snap

@@ -458,6 +458,9 @@ export class TestApi<
         allowOrigins: Cors.ALL_ORIGINS,
         allowMethods: Cors.ALL_METHODS,
       },
+      deployOptions: {
+        tracingEnabled: true,
+      },
       policy: new PolicyDocument({
         statements: [
           // Allow all callers to invoke the API in the resource policy, since auth is handled by Cognito
@@ -760,6 +763,9 @@ export class TestApi<
         allowOrigins: Cors.ALL_ORIGINS,
         allowMethods: Cors.ALL_METHODS,
       },
+      deployOptions: {
+        tracingEnabled: true,
+      },
       policy: new PolicyDocument({
         statements: [
           // Allow all callers to invoke the API in the resource policy
@@ -928,7 +934,11 @@ import {
   HttpApi as _HttpApi,
   HttpApiProps as _HttpApiProps,
   HttpMethod,
+  HttpStage,
+  LogGroupLogDestination,
 } from 'aws-cdk-lib/aws-apigatewayv2';
+import { LogGroup } from 'aws-cdk-lib/aws-logs';
+import { suppressRules } from '../checkov.js';
 
 /**
  * Properties for creating an HttpApi construct.
@@ -972,6 +982,9 @@ export class HttpApi<
   /** The underlying CDK HttpApi instance */
   public readonly api: _HttpApi;
 
+  /** Default auto-deployed stage */
+  public readonly defaultStage: HttpStage;
+
   /** Map of operation names to their API Gateway integrations */
   public readonly integrations: TIntegrations;
 
@@ -990,9 +1003,30 @@ export class HttpApi<
 
     // Create the API Gateway REST API
     this.api = new _HttpApi(this, 'Api', {
+      createDefaultStage: false,
       ...props,
     });
 
+    const accessLogGroup = new LogGroup(this, 'AccessLogs');
+    suppressRules(
+      accessLogGroup,
+      ['CKV_AWS_158'],
+      'Using default CloudWatch log encryption',
+    );
+    suppressRules(
+      accessLogGroup,
+      ['CKV_AWS_66', 'CKV_AWS_338'],
+      'Logs are retained forever',
+    );
+
+    this.defaultStage = new HttpStage(this, 'DefaultStage', {
+      httpApi: this.api,
+      autoDeploy: true,
+      accessLogSettings: {
+        destination: new LogGroupLogDestination(accessLogGroup),
+      },
+    });
+
     // Create API resources and methods for each operation
     (Object.entries(operations) as [TOperation, OperationDetails][]).map(
       ([op, details]) => {
@@ -1008,15 +1042,22 @@ export class HttpApi<
     );
 
     new CfnOutput(this, \`\${apiName}Url\`, {
-      value: this.api.url!,
+      value: this.defaultStage.url!,
     });
 
     // Register the API URL in runtime configuration for client discovery
     RuntimeConfig.ensure(this).config.apis = {
       ...RuntimeConfig.ensure(this).config.apis!,
-      [apiName]: this.api.url!,
+      [apiName]: this.defaultStage.url!,
     };
   }
+
+  /**
+   * Return the API url
+   */
+  public get url() {
+    return this.defaultStage.url;
+  }
 }
 "
 `;
@@ -1456,9 +1497,11 @@ import {
   RestApi as _RestApi,
   RestApiProps as _RestApiProps,
   IResource,
+  Stage,
 } from 'aws-cdk-lib/aws-apigateway';
 import { RuntimeConfig } from '../runtime-config.js';
 import { OperationDetails, RestApiIntegration } from './utils.js';
+import { suppressRules } from '../checkov.js';
 
 /**
  * Properties for creating a RestApi construct.
@@ -1521,6 +1564,19 @@ export class RestApi<
     // Create the API Gateway REST API
     this.api = new _RestApi(this, 'Api', props);
 
+    suppressRules(
+      this.api,
+      ['CKV_AWS_120'],
+      'Caching not required for this use case',
+      (c) => c instanceof Stage,
+    );
+    suppressRules(
+      this.api,
+      ['CKV_AWS_76'],
+      'API Gateway access logging disabled due to account-level CloudWatch Logs role ARN requirement',
+      (c) => c instanceof Stage,
+    );
+
     // Create API resources and methods for each operation
     (Object.entries(operations) as [TOperation, OperationDetails][]).map(
       ([op, details]) => {
@@ -1674,6 +1730,9 @@ export class TestApi<
         allowOrigins: Cors.ALL_ORIGINS,
         allowMethods: Cors.ALL_METHODS,
       },
+      deployOptions: {
+        tracingEnabled: true,
+      },
       policy: new PolicyDocument({
         statements: [
           // Here we grant any AWS credentials from the account that the project is deployed in to call the api.

package/src/trpc/backend/generator.js

@@ -20,10 +20,10 @@ const metrics_1 = require("../../utils/metrics");
 const api_constructs_1 = require("../../utils/api-constructs/api-constructs");
 const port_1 = require("../../utils/port");
 const iac_1 = require("../../utils/iac");
+const bundle_1 = require("../../utils/bundle/bundle");
 exports.TRPC_BACKEND_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
 function tsTrpcApiGenerator(tree, options) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a;
         const iacProvider = yield (0, iac_1.resolveIacProvider)(tree, options.iacProvider);
         yield (0, shared_constructs_1.sharedConstructsGenerator)(tree, {
             iacProvider,
@@ -65,18 +65,10 @@ function tsTrpcApiGenerator(tree, options) {
             },
             continuous: true,
         };
-        projectConfig.targets.bundle = {
-            cache: true,
-            executor: 'nx:run-commands',
-            outputs: [`{workspaceRoot}/dist/${backendRoot}/bundle`],
-            options: {
-                command: `esbuild ${backendRoot}/src/router.ts --bundle --outfile=dist/${backendRoot}/bundle/index.js --platform=node --format=cjs`,
-            },
-        };
-        projectConfig.targets.build.dependsOn = [
-            ...((_a = projectConfig.targets.build.dependsOn) !== null && _a !== void 0 ? _a : []),
-            'bundle',
-        ];
+        (0, bundle_1.addTypeScriptBundleTarget)(tree, projectConfig, {
+            targetFilePath: 'src/router.ts',
+        });
+        (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, {
@@ -93,13 +85,7 @@ function tsTrpcApiGenerator(tree, options) {
             '@trpc/client',
             'aws4fetch',
             '@aws-sdk/credential-providers',
-        ]), (0, versions_1.withVersions)([
-            '@types/aws-lambda',
-            'esbuild',
-            'tsx',
-            'cors',
-            '@types/cors',
-        ]));
+        ]), (0, versions_1.withVersions)(['@types/aws-lambda', 'tsx', 'cors', '@types/cors']));
         tree.delete((0, devkit_1.joinPathFragments)(backendRoot, 'package.json'));
         (0, nx_1.addGeneratorMetadata)(tree, backendName, exports.TRPC_BACKEND_GENERATOR_INFO);
         yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [exports.TRPC_BACKEND_GENERATOR_INFO]);

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

@@ -4,11 +4,12 @@
  */
 import { Linter } from '@nx/eslint';
 import { IacProviderOption } from '../../utils/iac';
+import { TsProjectGeneratorSchema } from '../../ts/lib/schema';
 
 export interface TsTrpcApiGeneratorSchema {
   name: string;
   computeType: 'ServerlessApiGatewayRestApi' | 'ServerlessApiGatewayHttpApi';
   auth: 'IAM' | 'Cognito' | 'None';
-  directory?: TsLibGeneratorSchema['directory'];
+  directory?: TsProjectGeneratorSchema['directory'];
   iacProvider: IacProviderOption;
 }

package/src/ts/lambda-function/__snapshots__/generator.spec.ts.snap

@@ -15,7 +15,7 @@ export class TestProjectTestFunction extends Function {
       code: Code.fromAsset(
         url.fileURLToPath(
           new URL(
-            '../../../../../../dist/packages/test-project/bundle-test-function',
+            '../../../../../../dist/packages/test-project/bundle/lambda/test-function',
             import.meta.url,
           ),
         ),
@@ -233,7 +233,7 @@ resource "aws_iam_role_policy_attachment" "lambda_policy_attachment" {
 
 data "archive_file" "lambda_zip" {
   type        = "zip"
-  source_dir  = "\${path.module}/../../../../../../../dist/packages/test-project/bundle-test-function"
+  source_dir  = "\${path.module}/../../../../../../../dist/packages/test-project/bundle/lambda/test-function"
   output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/lambda-functions/test-project-test-function/lambda.zip"
 }
 
@@ -388,7 +388,7 @@ resource "aws_iam_role_policy_attachment" "lambda_policy_attachment" {
 
 data "archive_file" "lambda_zip" {
   type        = "zip"
-  source_dir  = "\${path.module}/../../../../../../../dist/packages/test-project/bundle-snapshot-function"
+  source_dir  = "\${path.module}/../../../../../../../dist/packages/test-project/bundle/lambda/snapshot-function"
   output_path = "\${path.module}/../../../../../../../dist/packages/common/terraform/lambda-functions/test-project-snapshot-function/lambda.zip"
 }