@beesolve/cdk-constructs 0.1.2 → 0.1.4

package/dist/index.d.ts

@@ -210,12 +210,35 @@ interface SqsWithDlqLambdaInputProps extends SqsWithDlqProps {
 	readonly disabled?: boolean;
 }
 type BatchingConfig = Pick<SqsEventSourceProps, "batchSize" | "maxBatchingWindow" | "reportBatchItemFailures" | "maxConcurrency">;
+import { Architecture, Function as Function3, LoggingFormat, Runtime } from "aws-cdk-lib/aws-lambda";
 import { NodejsFunctionProps } from "aws-cdk-lib/aws-lambda-nodejs";
 import { LogGroupProps } from "aws-cdk-lib/aws-logs";
 import { Construct as Construct4 } from "constructs";
-declare const nodejsFunctionDefaultConfig: {
-	runtime: Pick<NodejsFunctionProps, "architecture" | "runtime">;
-	bundling: NodejsFunctionProps["bundling"];
-	logging: (scope: Construct4, id: string, props?: LogGroupProps) => Pick<NodejsFunctionProps, "logFormat" | "logGroup">;
+type Nodejs24FunctionProps = Omit<NodejsFunctionProps, "runtime" | "architecture" | "logGroup" | "entry" | "handler" | "code" | "bundling" | "awsSdkConnectionReuse"> & {
+	entry: `${string}.ts`;
+	logGroupProps?: LogGroupProps;
+	loggingFormat?: LoggingFormat;
+	runtime?: typeof Runtime.NODEJS_24_X;
+	architecture?: typeof Architecture.ARM_64;
+	handler?: string;
+	/**
+	* When function is being built the source maps are bundled without content for better performance.
+	* You should provide revision which is added to the description automatically for easier debugging.
+	*
+	* You can use cached `getRevision()` function which is exported in this file in order to get git commit id.
+	*/
+	revision: string;
 };
-export { nodejsFunctionDefaultConfig, SqsWithDlqProps, SqsWithDlqLambdaInputProps, SqsWithDlq, EmailAlarms, CloudFrontAccessLoggingSettingsProps, CloudFrontAccessLoggingSettings };
+/**
+* This construct provides easy way of deploying Node.js function with opinionated defaults.
+*
+* You need to provide `entry` - TypeScript file which exports `handler` function.
+*
+* Entry file is being transpiled by `esbuild` to ESM format compatible with Node.js 24.
+*
+*/
+declare class Nodejs24Function extends Function3 {
+	constructor(scope: Construct4, id: string, props: Nodejs24FunctionProps);
+}
+declare function getRevision(enforceGit: boolean): string;
+export { getRevision, SqsWithDlqProps, SqsWithDlqLambdaInputProps, SqsWithDlq, Nodejs24Function, EmailAlarms, CloudFrontAccessLoggingSettingsProps, CloudFrontAccessLoggingSettings };

package/dist/index.js

@@ -242,54 +242,123 @@ class SqsWithDlq extends Construct3 {
 }
 // packages/cdk-constructs/src/nodejsFunction.ts
 import { RemovalPolicy } from "aws-cdk-lib";
-import { Architecture, LoggingFormat, Runtime } from "aws-cdk-lib/aws-lambda";
 import {
-  Charset,
-  OutputFormat,
-  SourceMapMode
+  Architecture,
+  Code,
+  Function,
+  LoggingFormat,
+  Runtime
+} from "aws-cdk-lib/aws-lambda";
+import {
+  Charset
 } from "aws-cdk-lib/aws-lambda-nodejs";
 import {
   LogGroup,
   RetentionDays
 } from "aws-cdk-lib/aws-logs";
-var nodejsFunctionDefaultConfig = {
-  runtime: {
-    architecture: Architecture.ARM_64,
-    runtime: Runtime.NODEJS_24_X
-  },
-  bundling: {
-    banner: `/* CommonJS polyfills */import { fileURLToPath } from 'node:url';import { createRequire } from 'node:module';const __filename = fileURLToPath(import.meta.url);const __dirname = fileURLToPath(new URL('.', import.meta.url));const require = createRequire(import.meta.url);/* end of CommonJS polyfills */`,
-    charset: Charset.UTF8,
-    bundleAwsSDK: true,
-    externalModules: [],
-    format: OutputFormat.ESM,
-    keepNames: true,
-    mainFields: ["module", "main"],
-    minify: true,
-    sourceMap: true,
-    sourceMapMode: SourceMapMode.EXTERNAL,
-    sourcesContent: false,
-    target: "node24",
-    esbuildArgs: {
-      "--resolve-extensions": ".ts,.js,.mjs,.json",
-      "--bundle": "",
-      "--legal-comments": "none",
-      "--splitting": "",
-      "--tree-shaking": "true"
+import { buildSync } from "esbuild";
+import { execSync } from "node:child_process";
+var __dirname = "/Users/ivan/data/work/github.com/beesolve/p/packages/packages/cdk-constructs/src";
+
+class Nodejs24Function extends Function {
+  constructor(scope, id, props) {
+    const {
+      entry,
+      handler,
+      description = "",
+      logGroupProps = {
+        retention: RetentionDays.TWO_WEEKS,
+        removalPolicy: RemovalPolicy.DESTROY
+      },
+      loggingFormat = LoggingFormat.JSON,
+      revision = true,
+      ...rest
+    } = props;
+    const outDir = `${__dirname}/cdk.out/bundling.${id}.beesolve-nodejs.${Date.now()}`;
+    const buildResult = buildSync({
+      entryPoints: [entry],
+      banner: {
+        js: `/* CommonJS polyfills */import { fileURLToPath } from 'node:url';import { createRequire } from 'node:module';const __filename = fileURLToPath(import.meta.url);const __dirname = fileURLToPath(new URL('.', import.meta.url));const require = createRequire(import.meta.url);/* end of CommonJS polyfills */`
+      },
+      charset: Charset.UTF8,
+      bundle: true,
+      external: [],
+      format: "esm",
+      keepNames: true,
+      mainFields: ["module", "main"],
+      minify: true,
+      sourcemap: "external",
+      target: "node24",
+      platform: "node",
+      resolveExtensions: [".ts", ".js", ".mjs", ".json"],
+      legalComments: "none",
+      splitting: true,
+      treeShaking: true,
+      outdir: outDir
+    });
+    if (buildResult.errors.length !== 0) {
+      throw new BuildError(buildResult.errors);
     }
-  },
-  logging: (scope, id, props) => ({
-    logGroup: new LogGroup(scope, `${id}LogGroup`, {
-      retention: RetentionDays.TWO_WEEKS,
-      removalPolicy: RemovalPolicy.DESTROY,
-      ...props
-    }),
-    loggingFormat: LoggingFormat.JSON
-  })
-};
+    const fileName = entry.split("/").at(-1)?.replace(".ts", "");
+    const handlerName = `${fileName}.${handler ?? "handler"}`;
+    super(scope, id, {
+      ...rest,
+      code: Code.fromAsset(outDir),
+      architecture: Architecture.ARM_64,
+      runtime: Runtime.NODEJS_24_X,
+      handler: handlerName,
+      logGroup: new LogGroup(scope, `${id}LogGroup`, logGroupProps),
+      loggingFormat,
+      description: `${description} (${revision})`
+    });
+  }
+}
+
+class BuildError extends Error {
+  constructor(messages) {
+    super(`Couldn't build the code.
+
+${messages.map((message) => message.text).join(`
+`)}`);
+  }
+}
+var revisionCache;
+function getRevision(enforceGit) {
+  if (revisionCache == null) {
+    revisionCache = _getRevision();
+  }
+  return revisionCache;
+  function _getRevision() {
+    try {
+      const buffer = execSync("git rev-parse --short HEAD");
+      const shortCommitId = buffer.toString("utf-8").trim();
+      return `${shortCommitId}${isDirty() ? " - dirty" : ""}`;
+    } catch (error) {
+      if (enforceGit) {
+        throw new NotAGitRepositoryError;
+      }
+      return "cannot parse revision";
+    }
+  }
+  function isDirty() {
+    try {
+      execSync("git diff --quiet && git diff --cached --quiet");
+      return false;
+    } catch (error) {
+      return true;
+    }
+  }
+}
+
+class NotAGitRepositoryError extends Error {
+  constructor() {
+    super(`Cannot deploy without using git.`);
+  }
+}
 export {
-  nodejsFunctionDefaultConfig,
+  getRevision,
   SqsWithDlq,
+  Nodejs24Function,
   EmailAlarms,
   CloudFrontAccessLoggingSettings
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beesolve/cdk-constructs",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "",
   "homepage": "https://github.com/beesolve/packages/tree/main/packages/cdk-constructs#readme",
   "license": "MIT",
@@ -23,9 +23,10 @@
     }
   },
   "dependencies": {
-    "aws-cdk-lib": "^2.236.0",
+    "@beesolve/helpers": "0.1.4",
+    "aws-cdk-lib": "^2.238.0",
     "constructs": "^10.4.5",
-    "@beesolve/helpers": "0.1.3"
+    "esbuild": "^0.27.3"
   },
   "type": "module",
   "exports": {