@aws/nx-plugin 0.33.1 → 0.35.0

package/generators.json

@@ -59,6 +59,12 @@
       "metric": "g8",
       "guidePages": ["typescript-infrastructure"]
     },
+    "ts#lambda-function": {
+      "factory": "./src/ts/lambda-function/generator",
+      "schema": "./src/ts/lambda-function/schema.json",
+      "description": "Generate a TypeScript lambda function",
+      "metric": "g21"
+    },
     "ts#trpc-api": {
       "factory": "./src/trpc/backend/generator",
       "schema": "./src/trpc/backend/schema.json",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws/nx-plugin",
-  "version": "0.33.1",
+  "version": "0.35.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/awslabs/nx-plugin-for-aws.git",

package/src/mcp-server/tools/create-workspace-command.js

@@ -17,14 +17,7 @@ const addCreateWorkspaceCommandTool = (server) => {
 npx create-nx-workspace@~21.0.3 ${workspaceName} --pm=${packageManager} --preset=@aws/nx-plugin --ci=skip
 \`\`\`
 
-Note that this will create a workspace in a new directory named ${workspaceName}. If you are already working in the directory
-you would like for your workspace, you can move all the files up one level and delete the empty directory afterwards, eg:
-
-\`\`\`bash
-mv ${workspaceName}/{*,.*} ./ && rm -rf ${workspaceName}
-\`\`\`
-
-(Note that the above command will complain about moving . and .. but that is expected and ok!)
+This will create a new workspace within the ${workspaceName} directory.
   `,
             },
         ],

package/src/mcp-server/tools/create-workspace-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"create-workspace-command.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/create-workspace-command.ts"],"names":[],"mappings":";;;AAKA,6BAAwB;AACxB,sCAAiD;AAEjD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,oEAAoE,EACpE,EAAE,aAAa,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,6BAAoB,EAAE,EACnE,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;;;kCAGkB,aAAa,SAAS,cAAc;;;kEAGJ,aAAa;;;;KAI1E,aAAa,wBAAwB,aAAa;;;;GAIpD;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AA5BW,QAAA,6BAA6B,iCA4BxC"}
+{"version":3,"file":"create-workspace-command.js","sourceRoot":"","sources":["../../../../../../packages/nx-plugin/src/mcp-server/tools/create-workspace-command.ts"],"names":[],"mappings":";;;AAKA,6BAAwB;AACxB,sCAAiD;AAEjD;;GAEG;AACI,MAAM,6BAA6B,GAAG,CAAC,MAAiB,EAAE,EAAE;IACjE,MAAM,CAAC,IAAI,CACT,0BAA0B,EAC1B,oEAAoE,EACpE,EAAE,aAAa,EAAE,OAAC,CAAC,MAAM,EAAE,EAAE,cAAc,EAAE,6BAAoB,EAAE,EACnE,CAAC,EAAE,aAAa,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACtC,OAAO,EAAE;YACP;gBACE,IAAI,EAAE,MAAM;gBACZ,IAAI,EAAE;;;kCAGkB,aAAa,SAAS,cAAc;;;8CAGxB,aAAa;GACxD;aACM;SACF;KACF,CAAC,CACH,CAAC;AACJ,CAAC,CAAC;AArBW,QAAA,6BAA6B,iCAqBxC"}

package/src/open-api/ts-hooks/generator.spec.tsx

@@ -6,10 +6,6 @@ import { Tree } from '@nx/devkit';
 import { createTreeUsingTsSolutionSetup } from '../../utils/test';
 import { Spec } from '../utils/types';
 import { openApiTsHooksGenerator } from './generator';
-import {
-  expectTypeScriptToCompile,
-  TypeScriptVerifier,
-} from '../ts-client/generator.utils.spec';
 import { importTypeScriptModule } from '../../utils/js';
 import { waitFor, render, fireEvent } from '@testing-library/react';
 import {
@@ -25,6 +21,7 @@ import {
 import React from 'react';
 import { Mock } from 'vitest';
 import { PET_STORE_SPEC } from '../ts-client/generator.petstore.spec';
+import { TypeScriptVerifier } from '../../utils/test/ts.spec';
 
 describe('openApiTsHooksGenerator', () => {
   let tree: Tree;

package/src/preset/__snapshots__/generator.spec.ts.snap

@@ -42,6 +42,8 @@ The following list of generators are what is currently available in the \`@aws/n
 
 - **ts#infra**: Generates a cdk application
 
+- **ts#lambda-function**: Generate a TypeScript lambda function
+
 - **ts#trpc-api**: creates a trpc backend
 
 - **api-connection**: Integrates a source project with a target API project

package/src/py/lambda-function/schema.json

@@ -8,10 +8,6 @@
     "project": {
       "type": "string",
       "description": "The project to add the lambda function to",
-      "$default": {
-        "$source": "argv",
-        "index": 0
-      },
       "x-prompt": "Select the project to add the lambda function to",
       "x-dropdown": "projects"
     },
@@ -33,6 +29,7 @@
     "eventSource": {
       "type": "string",
       "description": "Optional event source model to use for the lambda function",
+      "x-priority": "important",
       "enum": [
         "Any",
         "AlbModel",
@@ -79,5 +76,5 @@
       "x-prompt": "Enter the event source model to use for the lambda function"
     }
   },
-  "required": ["project", "functionName", "eventSource"]
+  "required": ["project", "functionName"]
 }

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

@@ -0,0 +1,134 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`ts-lambda-function generator > should create CDK construct > cdk-construct.ts 1`] = `
+"import { Construct } from 'constructs';
+import * as url from 'url';
+import { Code, Function, Runtime, Tracing } from 'aws-cdk-lib/aws-lambda';
+import { Duration } from 'aws-cdk-lib';
+
+export class TestProjectTestFunction extends Function {
+  constructor(scope: Construct, id: string) {
+    super(scope, id, {
+      timeout: Duration.seconds(30),
+      runtime: Runtime.NODEJS_LATEST,
+      handler: 'index.handler',
+      code: Code.fromAsset(
+        url.fileURLToPath(
+          new URL(
+            '../../../../../../dist/packages/test-project/bundle-test-function',
+            import.meta.url,
+          ),
+        ),
+      ),
+      tracing: Tracing.ACTIVE,
+      environment: {
+        AWS_CONNECTION_REUSE_ENABLED: '1',
+      },
+    });
+  }
+}
+"
+`;
+
+exports[`ts-lambda-function generator > should create lambda function file with Any event source > lambda-handler-any.ts 1`] = `
+"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';
+
+process.env.POWERTOOLS_METRICS_NAMESPACE = 'TestFunction';
+process.env.POWERTOOLS_SERVICE_NAME = 'TestFunction';
+
+const tracer = new Tracer();
+const logger = new Logger();
+const metrics = new Metrics();
+
+export const testFunction = async (event: any): Promise<any> => {
+  logger.info('Received event', event);
+
+  // TODO: implement
+};
+
+export const handler = middy()
+  .use(captureLambdaHandler(tracer))
+  .use(injectLambdaContext(logger))
+  .use(logMetrics(metrics))
+  .handler(testFunction);
+"
+`;
+
+exports[`ts-lambda-function generator > should create lambda function file with EventBridge schema > lambda-handler-eventbridge.ts 1`] = `
+"import { parser } from '@aws-lambda-powertools/parser/middleware';
+import { EventBridgeSchema } from '@aws-lambda-powertools/parser/schemas';
+import { z } from 'zod';
+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';
+
+process.env.POWERTOOLS_METRICS_NAMESPACE = 'TestFunction';
+process.env.POWERTOOLS_SERVICE_NAME = 'TestFunction';
+
+const tracer = new Tracer();
+const logger = new Logger();
+const metrics = new Metrics();
+
+export const testFunction = async (
+  event: z.infer<typeof EventBridgeSchema>,
+): Promise<void> => {
+  logger.info('Received event', event);
+
+  // TODO: implement
+};
+
+export const handler = middy()
+  .use(captureLambdaHandler(tracer))
+  .use(injectLambdaContext(logger))
+  .use(logMetrics(metrics))
+  .use(parser({ schema: EventBridgeSchema }))
+  .handler(testFunction);
+"
+`;
+
+exports[`ts-lambda-function generator > should create lambda function file with SQS schema > lambda-handler-sqs.ts 1`] = `
+"import { parser } from '@aws-lambda-powertools/parser/middleware';
+import { SqsSchema } from '@aws-lambda-powertools/parser/schemas';
+import { z } from 'zod';
+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 type { SQSBatchResponse } from 'aws-lambda';
+
+process.env.POWERTOOLS_METRICS_NAMESPACE = 'TestFunction';
+process.env.POWERTOOLS_SERVICE_NAME = 'TestFunction';
+
+const tracer = new Tracer();
+const logger = new Logger();
+const metrics = new Metrics();
+
+export const testFunction = async (
+  event: z.infer<typeof SqsSchema>,
+): Promise<SQSBatchResponse | void> => {
+  logger.info('Received event', event);
+
+  // TODO: implement
+};
+
+export const handler = middy()
+  .use(captureLambdaHandler(tracer))
+  .use(injectLambdaContext(logger))
+  .use(logMetrics(metrics))
+  .use(parser({ schema: SqsSchema }))
+  .handler(testFunction);
+"
+`;

package/src/ts/lambda-function/files/common/constructs/src/app/lambda-functions/__constructFunctionNameKebabCase__.ts.template

@@ -0,0 +1,24 @@
+import { Construct } from 'constructs';
+import * as url from 'url';
+import { Code, Function, Runtime, Tracing } from 'aws-cdk-lib/aws-lambda';
+import { Duration } from 'aws-cdk-lib';
+
+export class <%= constructFunctionClassName %> extends Function {
+  constructor(scope: Construct, id: string) {
+    super(scope, id, {
+        timeout: Duration.seconds(30),
+        runtime: Runtime.NODEJS_LATEST,
+        handler: 'index.handler',
+        code: Code.fromAsset(url.fileURLToPath(
+          new URL(
+            '../../../../../../dist/<%= dir %>/<%= bundleTargetName %>',
+            import.meta.url
+          )
+        )),
+        tracing: Tracing.ACTIVE,
+        environment: {
+          AWS_CONNECTION_REUSE_ENABLED: '1',
+        },
+    });
+  }
+}

package/src/ts/lambda-function/files/handler/__lambdaFunctionKebabCase__.ts.template

@@ -0,0 +1,72 @@
+<%_ if (eventSource !== 'Any') { _%>
+import { parser } from '@aws-lambda-powertools/parser/middleware';
+import { <%= eventSource %> } from '@aws-lambda-powertools/parser/schemas';
+import { z } from 'zod';
+<%_ } _%>
+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';
+<%_ if (returnType.imports.length > 0) { _%>
+import type { <%= returnType.imports.join(', ') %> } from 'aws-lambda';
+<%_ } _%>
+
+process.env.POWERTOOLS_METRICS_NAMESPACE = "<%= lambdaFunctionClassName %>";
+process.env.POWERTOOLS_SERVICE_NAME = "<%= lambdaFunctionClassName %>";
+
+const tracer = new Tracer();
+const logger = new Logger();
+const metrics = new Metrics();
+<%_ const inputType = eventSource === 'Any' ? 'any' : `z.infer<typeof ${eventSource}>`; _%>
+<%_ const outputType = `Promise<${returnType.type}>`; %>
+
+export const <%= lambdaFunctionCamelCase %> = async (event: <%- inputType %>): <%- outputType %> => {
+  logger.info("Received event", event);
+
+  // TODO: implement
+<%_ if (['APIGatewayProxyEventSchema', 'APIGatewayProxyEventV2Schema', 'APIGatewayProxyWebsocketEventSchema', 'AlbSchema', 'LambdaFunctionUrlSchema'].includes(eventSource)) { _%>
+  return {
+    statusCode: 200,
+    body: ''
+  };
+<%_ } else if (['APIGatewayRequestAuthorizerEventSchema', 'APIGatewayTokenAuthorizerEventSchema', 'APIGatewayRequestAuthorizerEventV2Schema'].includes(eventSource)) { _%>
+  return {
+    principalId: 'user',
+    policyDocument: {
+      Version: '2012-10-17',
+      Statement: [
+        {
+          Action: 'execute-api:Invoke',
+          Effect: 'Allow',
+          Resource: '*'
+        }
+      ]
+    }
+  };
+<%_ } else if (['KinesisFirehoseSchema', 'KinesisFirehoseSqsSchema'].includes(eventSource)) { _%>
+  return {
+    records: []
+  };
+<%_ } else if (eventSource === 'TransferFamilySchema') { _%>
+  return {
+    Role: '',
+    Policy: '',
+    HomeDirectory: '/'
+  };
+<%_ } else if (['PreSignupTriggerSchema', 'PostConfirmationTriggerSchema', 'CustomMessageTriggerSchema', 'MigrateUserTriggerSchema', 'CustomSMSSenderTriggerSchema', 'CustomEmailSenderTriggerSchema', 'DefineAuthChallengeTriggerSchema', 'CreateAuthChallengeTriggerSchema', 'VerifyAuthChallengeTriggerSchema', 'PreTokenGenerationTriggerSchemaV1', 'PreTokenGenerationTriggerSchemaV2AndV3'].includes(eventSource)) { _%>
+  return event;
+<%_ } else { /* Event sources which don't need to return a response */ _%>
+<%_ } _%>
+};
+
+export const handler = middy()
+  .use(captureLambdaHandler(tracer))
+  .use(injectLambdaContext(logger))
+  .use(logMetrics(metrics))
+<%_ if (eventSource !== 'Any') { _%>
+  .use(parser({ schema: <%= eventSource %> }))
+<%_ } _%>
+  .handler(<%= lambdaFunctionCamelCase %>);

package/src/ts/lambda-function/generator.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { GeneratorCallback, Tree } from '@nx/devkit';
+import { TsLambdaFunctionGeneratorSchema } from './schema';
+import { NxGeneratorInfo } from '../../utils/nx';
+export declare const TS_LAMBDA_FUNCTION_GENERATOR_INFO: NxGeneratorInfo;
+/**
+ * Generates a TypeScript Lambda Function to add to a TypeScript project
+ */
+export declare const tsLambdaFunctionGenerator: (tree: Tree, schema: TsLambdaFunctionGeneratorSchema) => Promise<GeneratorCallback>;
+export default tsLambdaFunctionGenerator;

package/src/ts/lambda-function/generator.js

@@ -0,0 +1,133 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.tsLambdaFunctionGenerator = exports.TS_LAMBDA_FUNCTION_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 shared_constructs_1 = require("../../utils/shared-constructs");
+const shared_constructs_constants_1 = require("../../utils/shared-constructs-constants");
+const names_1 = require("../../utils/names");
+const ast_1 = require("../../utils/ast");
+const format_1 = require("../../utils/format");
+const object_1 = require("../../utils/object");
+const nx_1 = require("../../utils/nx");
+const metrics_1 = require("../../utils/metrics");
+const versions_1 = require("../../utils/versions");
+const lodash_camelcase_1 = tslib_1.__importDefault(require("lodash.camelcase"));
+const io_1 = require("./io");
+exports.TS_LAMBDA_FUNCTION_GENERATOR_INFO = (0, nx_1.getGeneratorInfo)(__filename);
+/**
+ * Generates a TypeScript Lambda Function to add to a TypeScript project
+ */
+const tsLambdaFunctionGenerator = (tree, schema) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
+    var _a, _b, _c, _d, _e, _f;
+    const projectConfig = (0, nx_1.readProjectConfigurationUnqualified)(tree, schema.project);
+    const tsconfigPath = (0, devkit_1.joinPathFragments)(projectConfig.root, 'tsconfig.json');
+    // Check if the project has a tsconfig.json file
+    if (!tree.exists(tsconfigPath)) {
+        throw new Error(`This generator does not support selected project ${schema.project}. The project must be a typescript project (ie contain a tsconfig.json)`);
+    }
+    if (!projectConfig.sourceRoot) {
+        throw new Error(`This project does not have a source root. Please add a source root to the project configuration before running this generator.`);
+    }
+    const dir = projectConfig.root;
+    const projectNameWithOutScope = projectConfig.name.split('/').pop();
+    const projectNameKebabCase = (0, names_1.toKebabCase)(projectNameWithOutScope);
+    const functionNameKebabCase = (0, names_1.toKebabCase)(schema.functionName);
+    const constructFunctionNameKebabCase = `${projectNameKebabCase}-${functionNameKebabCase}`;
+    const constructFunctionClassName = (0, names_1.toClassName)(constructFunctionNameKebabCase);
+    const lambdaFunctionCamelCase = (0, lodash_camelcase_1.default)(schema.functionName);
+    const lambdaFunctionClassName = (0, names_1.pascalCase)(schema.functionName);
+    const lambdaFunctionKebabCase = (0, names_1.toKebabCase)(schema.functionName);
+    const functionPath = (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, (_a = schema.functionPath) !== null && _a !== void 0 ? _a : '', `${lambdaFunctionKebabCase}.ts`);
+    // Check that the project does not already have a lambda handler
+    if (tree.exists(functionPath)) {
+        throw new Error(`This project already has a lambda function with the name ${functionNameKebabCase}. Please remove the lambda function before running this generator or use a different name.`);
+    }
+    yield (0, shared_constructs_1.sharedConstructsGenerator)(tree);
+    // Add bundle-<name> target for this specific lambda function
+    const bundleTargetName = `bundle-${lambdaFunctionKebabCase}`;
+    const enhancedOptions = Object.assign(Object.assign({}, schema), { dir,
+        constructFunctionClassName,
+        constructFunctionNameKebabCase,
+        lambdaFunctionCamelCase,
+        lambdaFunctionClassName,
+        lambdaFunctionKebabCase,
+        bundleTargetName, returnType: io_1.TS_HANDLER_RETURN_TYPES[schema.eventSource] });
+    if (!projectConfig.targets) {
+        projectConfig.targets = {};
+    }
+    // Add the specific bundle target for this lambda function
+    projectConfig.targets[bundleTargetName] = {
+        cache: true,
+        executor: 'nx:run-commands',
+        outputs: [`{workspaceRoot}/dist/${dir}/${bundleTargetName}`],
+        options: {
+            commands: [
+                `esbuild ${functionPath} --bundle --platform=node --target=node22 --format=cjs --outfile=dist/${dir}/${bundleTargetName}/index.js --external:@aws-sdk/*`,
+            ],
+            parallel: false,
+        },
+        dependsOn: ['compile'],
+    };
+    // Add the bundle target if it doesn't exist
+    projectConfig.targets.bundle = (_b = projectConfig.targets.bundle) !== null && _b !== void 0 ? _b : {
+        cache: true,
+        dependsOn: [],
+    };
+    // Add the lambda's bundle target to the main bundle target's dependsOn
+    projectConfig.targets.bundle.dependsOn = [
+        ...((_c = projectConfig.targets.bundle.dependsOn) !== null && _c !== void 0 ? _c : []).filter((d) => d !== bundleTargetName),
+        bundleTargetName,
+    ];
+    if (!((_d = projectConfig.targets) === null || _d === void 0 ? void 0 : _d.build)) {
+        projectConfig.targets.build = {};
+    }
+    projectConfig.targets.build.dependsOn = [
+        ...((_e = projectConfig.targets.build.dependsOn) !== null && _e !== void 0 ? _e : []).filter((t) => t !== 'bundle'),
+        'bundle',
+    ];
+    projectConfig.targets = (0, object_1.sortObjectKeys)(projectConfig.targets);
+    (0, devkit_1.updateProjectConfiguration)(tree, projectConfig.name, projectConfig);
+    // Generate the lambda handler file
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', 'handler'), (0, devkit_1.joinPathFragments)(projectConfig.sourceRoot, (_f = schema.functionPath) !== null && _f !== void 0 ? _f : ''), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    (0, devkit_1.generateFiles)(tree, (0, devkit_1.joinPathFragments)(__dirname, 'files', shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app'), (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app'), enhancedOptions, { overwriteStrategy: devkit_1.OverwriteStrategy.KeepExisting });
+    (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'index.ts'), './lambda-functions/index.js');
+    (0, ast_1.addStarExport)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'src', 'app', 'lambda-functions', 'index.ts'), `./${constructFunctionNameKebabCase}.js`);
+    // Ensure common constructs builds after our lambda function project
+    (0, devkit_1.updateJson)(tree, (0, devkit_1.joinPathFragments)(shared_constructs_constants_1.PACKAGES_DIR, shared_constructs_constants_1.SHARED_CONSTRUCTS_DIR, 'project.json'), (config) => {
+        var _a;
+        if (!config.targets) {
+            config.targets = {};
+        }
+        if (!config.targets.build) {
+            config.targets.build = {};
+        }
+        config.targets.build.dependsOn = [
+            ...((_a = config.targets.build.dependsOn) !== null && _a !== void 0 ? _a : []).filter((t) => t !== `${projectConfig.name}:build`),
+            `${projectConfig.name}:build`,
+        ];
+        return config;
+    });
+    (0, devkit_1.addDependenciesToPackageJson)(tree, (0, versions_1.withVersions)([
+        '@aws-lambda-powertools/tracer',
+        '@aws-lambda-powertools/logger',
+        '@aws-lambda-powertools/metrics',
+        '@aws-lambda-powertools/parser',
+        '@middy/core',
+        'zod',
+    ]), (0, versions_1.withVersions)(['esbuild', '@types/aws-lambda']));
+    yield (0, metrics_1.addGeneratorMetricsIfApplicable)(tree, [
+        exports.TS_LAMBDA_FUNCTION_GENERATOR_INFO,
+    ]);
+    yield (0, format_1.formatFilesInSubtree)(tree);
+    return () => {
+        (0, devkit_1.installPackagesTask)(tree);
+    };
+});
+exports.tsLambdaFunctionGenerator = tsLambdaFunctionGenerator;
+exports.default = exports.tsLambdaFunctionGenerator;
+//# sourceMappingURL=generator.js.map

package/src/ts/lambda-function/generator.js.map

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

package/src/ts/lambda-function/io.d.ts

@@ -0,0 +1,178 @@
+/**
+ * Mapping of EventSource to the corresponding return type from @types/aws-lambda
+ * @see https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/aws-lambda/trigger
+ */
+export declare const TS_HANDLER_RETURN_TYPES: {
+    Any: {
+        type: string;
+        imports: any[];
+    };
+    AlbSchema: {
+        type: string;
+        imports: string[];
+    };
+    APIGatewayProxyEventSchema: {
+        type: string;
+        imports: string[];
+    };
+    APIGatewayRequestAuthorizerEventSchema: {
+        type: string;
+        imports: string[];
+    };
+    APIGatewayTokenAuthorizerEventSchema: {
+        type: string;
+        imports: string[];
+    };
+    APIGatewayProxyEventV2Schema: {
+        type: string;
+        imports: string[];
+    };
+    APIGatewayProxyWebsocketEventSchema: {
+        type: string;
+        imports: string[];
+    };
+    APIGatewayRequestAuthorizerEventV2Schema: {
+        type: string;
+        imports: string[];
+    };
+    CloudFormationCustomResourceCreateSchema: {
+        type: string;
+        imports: any[];
+    };
+    CloudFormationCustomResourceUpdateSchema: {
+        type: string;
+        imports: any[];
+    };
+    CloudFormationCustomResourceDeleteSchema: {
+        type: string;
+        imports: any[];
+    };
+    CloudWatchLogsSchema: {
+        type: string;
+        imports: any[];
+    };
+    DynamoDBStreamSchema: {
+        type: string;
+        imports: string[];
+    };
+    EventBridgeSchema: {
+        type: string;
+        imports: any[];
+    };
+    KafkaMskEventSchema: {
+        type: string;
+        imports: any[];
+    };
+    KafkaSelfManagedEventSchema: {
+        type: string;
+        imports: any[];
+    };
+    KinesisDataStreamSchema: {
+        type: string;
+        imports: string[];
+    };
+    KinesisFirehoseSchema: {
+        type: string;
+        imports: string[];
+    };
+    KinesisDynamoDBStreamSchema: {
+        type: string;
+        imports: string[];
+    };
+    KinesisFirehoseSqsSchema: {
+        type: string;
+        imports: string[];
+    };
+    LambdaFunctionUrlSchema: {
+        type: string;
+        imports: string[];
+    };
+    S3EventNotificationEventBridgeSchema: {
+        type: string;
+        imports: any[];
+    };
+    S3Schema: {
+        type: string;
+        imports: any[];
+    };
+    S3ObjectLambdaEventSchema: {
+        type: string;
+        imports: any[];
+    };
+    S3SqsEventNotificationSchema: {
+        type: string;
+        imports: string[];
+    };
+    SesSchema: {
+        type: string;
+        imports: any[];
+    };
+    SnsSchema: {
+        type: string;
+        imports: any[];
+    };
+    SqsSchema: {
+        type: string;
+        imports: string[];
+    };
+    TransferFamilySchema: {
+        type: string;
+        imports: string[];
+    };
+    VpcLatticeSchema: {
+        type: string;
+        imports: any[];
+    };
+    VpcLatticeV2Schema: {
+        type: string;
+        imports: any[];
+    };
+    /**
+     * The below Cognito triggers must return the same type as the input event.
+     * Due to mismatches between @types/aws-lambda and powertools schemas, we choose the zod input type.
+     */
+    PreSignupTriggerSchema: {
+        type: string;
+        imports: any[];
+    };
+    PostConfirmationTriggerSchema: {
+        type: string;
+        imports: any[];
+    };
+    CustomMessageTriggerSchema: {
+        type: string;
+        imports: any[];
+    };
+    MigrateUserTriggerSchema: {
+        type: string;
+        imports: any[];
+    };
+    CustomSMSSenderTriggerSchema: {
+        type: string;
+        imports: any[];
+    };
+    CustomEmailSenderTriggerSchema: {
+        type: string;
+        imports: any[];
+    };
+    DefineAuthChallengeTriggerSchema: {
+        type: string;
+        imports: any[];
+    };
+    CreateAuthChallengeTriggerSchema: {
+        type: string;
+        imports: any[];
+    };
+    VerifyAuthChallengeTriggerSchema: {
+        type: string;
+        imports: any[];
+    };
+    PreTokenGenerationTriggerSchemaV1: {
+        type: string;
+        imports: any[];
+    };
+    PreTokenGenerationTriggerSchemaV2AndV3: {
+        type: string;
+        imports: any[];
+    };
+};