cdk-booster 1.2.5 → 1.3.0-alpha.1

package/dist/cdk-booster.mjs

@@ -14,6 +14,7 @@ import * as path from 'path';
 import { pathToFileURL } from 'url';
 import { outputFolder } from './constants.mjs';
 import { findPackageJson } from './utils/findPackageJson.mjs';
+import { getAwsCdkLibVersionForLog } from './utils/getAwsCdkLibVersionForLog.mjs';
 import { Worker } from 'node:worker_threads';
 import { spawn } from 'node:child_process';
 import crypto from 'node:crypto';
@@ -28,6 +29,10 @@ async function run() {
     let copyAgainFunction;
     const version = await getVersion();
     Logger.log(`Welcome to CDK Booster 🚀 version ${version}.`);
+    const cdkVersion = getAwsCdkLibVersionForLog();
+    if (cdkVersion) {
+        Logger.log(`CDK version: ${cdkVersion}`);
+    }
     await Configuration.readConfig();
     Logger.setVerbose(Configuration.config.verbose === true);
     Logger.verbose(`Parameters: ${Object.entries(Configuration.config)
@@ -412,10 +417,14 @@ async function compileCdk({ rootDir, entryFile, tsconfig, }) {
                     : fileExtension;
                 // Inject code to extract Lambda function configurations
                 if (args.path.includes(path.join('aws-cdk-lib', 'aws-lambda-nodejs', 'lib', 'bundling.'))) {
-                    contents = contents.replace('return chain([...this.props.commandHooks', 'const command = chain([...this.props.commandHooks');
+                    const codeToFind2 = 'return chain([...this.props.commandHooks';
+                    if (!contents.includes(codeToFind2)) {
+                        throw new Error(`Can not find '${codeToFind2.substring(0, 30)}...' in ${args.path}`);
+                    }
+                    contents = contents.replace(codeToFind2, 'const command = chain([...this.props.commandHooks');
                     const codeToFind = 'afterBundling(options.inputDir,options.outputDir)??[]])';
                     if (!contents.includes(codeToFind)) {
-                        throw new Error(`Can not find code to inject in ${args.path}`);
+                        throw new Error(`Can not find '${codeToFind.substring(0, 30)}...' in ${args.path}`);
                     }
                     // Inject code to get the file path of the Lambda function and CDK hierarchy
                     // path to match it with the Lambda function. Store data in the global variable.
@@ -466,8 +475,76 @@ async function compileCdk({ rootDir, entryFile, tsconfig, }) {
               }
               return command;
               `);
-                    const codeToFind3 = 'return(0,util_1().exec)(osPlatform==="win32"?"cmd":"bash",[osPlatform==="win32"?"/c":"-c",localCommand],{env:{...process.env,...environment},stdio:["ignore",process.stderr,"inherit"],cwd,windowsVerbatimArguments:osPlatform==="win32"}),!0';
-                    contents = contents.replace(codeToFind3, `return (process.env.CDK_BOOSTER_INSPECT === 'true') ? true : (${codeToFind3.replace('return', '')})`);
+                    // For newer CDK versions: inject lambda info capture into createLocalBundlingSteps
+                    // (the old injection via codeToFind/codeToFind2 only covers createBundleCommand
+                    // which is only used for Docker bundling in newer CDK versions)
+                    const codeToFind5 = 'createLocalBundlingSteps(scope,outputDir,esbuild,tsc){const steps=[];';
+                    if (contents.includes(codeToFind5)) {
+                        contents = contents.replace(codeToFind5, codeToFind5 +
+                            `
+                if (process.env.CDK_BOOSTER_INSPECT === 'true') {
+                  global.lambdas = global.lambdas ?? [];
+
+                  const outFile = this.props.format === types_1().OutputFormat.ESM ? 'index.mjs' : 'index.js';
+                  const out = path().join(outputDir, outFile);
+                  const sourceMapEnabled = this.props.sourceMapMode ?? this.props.sourceMap;
+                  const sourcesContent = this.props.sourcesContent ?? true;
+
+                  const lambdaInfo = {
+                    entryPoint: path().join(this.projectRoot, this.relativeEntryPath),
+                    out,
+                    target: this.props.target ?? toTarget(scope, this.props.runtime),
+                    format: this.props.format,
+                    minify: this.props.minify,
+                    sourcemap: sourceMapEnabled ? ((this.props.sourceMapMode === 'default' || !this.props.sourceMapMode) ? true : this.props.sourceMapMode) : false,
+                    sourcesContent,
+                    external: this.externals,
+                    loader: this.props.loader,
+                    define: this.props.define,
+                    logLevel: this.props.logLevel,
+                    keepNames: this.props.keepNames,
+                    tsconfig: this.relativeTsconfigPath ? path().join(this.projectRoot, this.relativeTsconfigPath) : undefined,
+                    banner: this.props.banner ? { js: this.props.banner } : undefined,
+                    footer: this.props.footer ? { js: this.props.footer } : undefined,
+                    mainFields: this.props.mainFields,
+                    inject: this.props.inject,
+                    esbuildArgs: this.props.esbuildArgs,
+                    commandBeforeBundling: chain([...this.props.commandHooks?.beforeBundling(this.projectRoot, outputDir) ?? []]),
+                    commandAfterBundling: chain([...this.props.commandHooks?.afterBundling(this.projectRoot, outputDir) ?? []]),
+                    environment: this.environment,
+                    projectRoot: this.projectRoot,
+                  };
+
+                  global.lambdas.push(lambdaInfo);
+
+                  const _fs = require('fs');
+                  const dir = path().dirname(out);
+                  _fs.mkdirSync(dir, { recursive: true });
+                  _fs.writeFileSync(out, '');
+
+                  return steps;
+                }
+                `);
+                    }
+                    const codeToFind3old = 'return(0,util_1().exec)(osPlatform==="win32"?"cmd":"bash",[osPlatform==="win32"?"/c":"-c",localCommand],{env:{...process.env,...environment},stdio:["ignore",process.stderr,"inherit"],cwd,windowsVerbatimArguments:osPlatform==="win32"}),!0';
+                    const codeToFind3new = 'for(const step of steps)switch(step.type){';
+                    if (contents.includes(codeToFind3old)) {
+                        contents = contents.replace(codeToFind3old, `return (process.env.CDK_BOOSTER_INSPECT === 'true') ? true : (${codeToFind3old.replace('return', '')})`);
+                    }
+                    else if (contents.includes(codeToFind3new)) {
+                        contents = contents.replace(codeToFind3new, `if(process.env.CDK_BOOSTER_INSPECT!=='true')${codeToFind3new}`);
+                    }
+                    else {
+                        throw new Error(`Can not find '${codeToFind3old.substring(0, 30)}...' or '${codeToFind3new.substring(0, 30)}...' in ${args.path}`);
+                    }
+                    // In worker threads, process.stderr may be a WritableWorkerStdio object.
+                    // Node child_process stdio does not accept that object, so use 'pipe'
+                    // and forward the output manually after execution.
+                    const codeToFind4 = '["ignore",process.stderr,"inherit"]';
+                    if (!contents.includes(codeToFind4)) {
+                        throw new Error(`Can not find '${codeToFind4.substring(0, 30)}...' in ${args.path}`);
+                    }
+                    contents = contents.replace(codeToFind4, '(process.env.CDK_BOOSTER_INSPECT===\'true\'?["ignore",process.stderr,"inherit"]:["ignore","pipe","pipe"])');
                     Logger.verbose(`Injected code into ${args.path}`);
                 }
                 else if (args.path.includes(path.join('aws-cdk-lib', 'aws-s3-deployment', 'lib', 'bucket-deployment.'))) {
@@ -477,16 +554,17 @@ async function compileCdk({ rootDir, entryFile, tsconfig, }) {
                         codeToFind = 'super(scope,id);';
                     }
                     if (!contents.includes(codeToFind)) {
-                        throw new Error(`Can not find code to inject in ${args.path}`);
+                        throw new Error(`Can not find '${codeToFind.substring(0, 30)}...' in ${args.path}`);
                     }
-                    // Inject code to prevent deploying the assets
-                    contents = contents.replace(codeToFind, codeToFind + `return;`);
+                    // Inject code to prevent deploying the assets during inspect pass
+                    contents = contents.replace(codeToFind, codeToFind +
+                        `if(process.env.CDK_BOOSTER_INSPECT==='true'){return;}`);
                     Logger.verbose(`Injected code into ${args.path}`);
                 }
                 else if (args.path.includes(path.join('aws-cdk-lib', 'core', 'lib', 'app.'))) {
                     const codeToFind = ',policyValidationBeta1:props.policyValidationBeta1});';
                     if (!contents.includes(codeToFind)) {
-                        throw new Error(`Can not find code to inject in ${args.path}`);
+                        throw new Error(`Can not find '${codeToFind.substring(0, 30)}...' in ${args.path}`);
                     }
                     // make CDK app available
                     contents = contents.replace(codeToFind, codeToFind + `global.cdkApp = this;`);
@@ -495,7 +573,7 @@ async function compileCdk({ rootDir, entryFile, tsconfig, }) {
                 else if (args.path.includes(path.join('aws-cdk-lib', 'core', 'lib', 'asset-staging.'))) {
                     const codeToFind = 'if(fs().existsSync(bundleDir))return;';
                     if (!contents.includes(codeToFind)) {
-                        throw new Error(`Can not find code to inject in ${args.path}`);
+                        throw new Error(`Can not find '${codeToFind.substring(0, 30)}...' in ${args.path}`);
                     }
                     // Inject code to get the file path of the Lambda function and CDK hierarchy
                     contents = contents.replace(codeToFind, `

package/dist/utils/getAwsCdkLibVersionForLog.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Version of aws-cdk-lib for logs. Must resolve from the CDK app directory
+ * (cwd), not from cdk-booster's dist/ — otherwise in a monorepo the hoisted
+ * root copy wins and masks pinned versions in workspace packages.
+ */
+export declare function getAwsCdkLibVersionForLog(): string | undefined;

package/dist/utils/getAwsCdkLibVersionForLog.mjs

@@ -0,0 +1,29 @@
+import { createRequire } from 'module';
+import { existsSync } from 'fs';
+import * as path from 'path';
+/**
+ * Version of aws-cdk-lib for logs. Must resolve from the CDK app directory
+ * (cwd), not from cdk-booster's dist/ — otherwise in a monorepo the hoisted
+ * root copy wins and masks pinned versions in workspace packages.
+ */
+export function getAwsCdkLibVersionForLog() {
+    try {
+        const projectPkg = path.join(process.cwd(), 'package.json');
+        if (existsSync(projectPkg)) {
+            const projectRequire = createRequire(projectPkg);
+            return projectRequire('aws-cdk-lib/package.json')
+                .version;
+        }
+    }
+    catch {
+        // not resolvable from project tree
+    }
+    try {
+        const moduleRequire = createRequire(import.meta.url);
+        return moduleRequire('aws-cdk-lib/package.json')
+            .version;
+    }
+    catch {
+        return undefined;
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdk-booster",
-  "version": "1.2.5",
+  "version": "1.3.0-alpha.1",
   "type": "module",
   "description": "Speed up AWS CDK's bundling of TypeScript/JavaScript Lambda handlers",
   "homepage": "https://www.cdkbooster.com",
@@ -47,14 +47,15 @@
     "build": "tsc -p tsconfig.build.json && cp src/cdkFrameworkWorker.mjs dist && node fix-imports.js && npm run add-bang",
     "deploy-github-role": "aws cloudformation deploy --stack-name cdk-booster-deploy-role --template-file cloudformation/gitHubDeployRole.yaml --capabilities CAPABILITY_IAM CAPABILITY_NAMED_IAM --profile cdkbooster",
     "deploy-tests": "npm run deploy --workspaces --if-present --parallel",
+    "test:prepare-bucket": "cd test/cdk-basic && npx tsx ../../scripts/prepare-bucket-test.ts cdk-outputs.json assets",
     "test:deploy-original": "cd test/cdk-basic && npx tsx ../../scripts/modify-cdk-json.ts ../../test/cdk-basic/cdk.json \"npx ts-node --prefer-ts-exts bin/cdk-basic.ts\" && npm run deploy 2>&1 | tee cdk-original.log",
     "test:check-bundling": "cd test/cdk-basic && ../../scripts/check-bundling.sh cdk-original.log true",
     "test:save-original-state": "cd test/cdk-basic && npx tsx ../../scripts/export-state.ts cdk-outputs.json cdk-original-function-files.json",
-    "test:deploy-booster": "cd test/cdk-basic && npx tsx ../../scripts/modify-cdk-json.ts ../../test/cdk-basic/cdk.json \"node ../../dist/cdk-booster.mjs bin/cdk-basic.ts\" && npm run deploy 2>&1 | tee cdk-booster.log",
+    "test:deploy-booster": "cd test/cdk-basic && npx tsx ../../scripts/modify-cdk-json.ts ../../test/cdk-basic/cdk.json \"node ../../dist/cdk-booster.mjs bin/cdk-basic.ts -v\" && npm run deploy 2>&1 | tee cdk-booster.log",
     "test:check-no-bundling": "cd test/cdk-basic && ../../scripts/check-bundling.sh cdk-booster.log false",
     "test:save-booster-state": "cd test/cdk-basic && npx tsx ../../scripts/export-state.ts cdk-outputs.json cdk-booster-function-files.json",
     "test:compare-states": "cd test/cdk-basic && npx tsx ../../scripts/compare-states.ts cdk-original-function-files.json cdk-booster-function-files.json",
-    "test": "npm run build && npm run test:deploy-original && npm run test:check-bundling && npm run test:save-original-state && npm run test:deploy-booster && npm run test:check-no-bundling && npm run test:save-booster-state && npm run test:compare-states",
+    "test": "npm run build && npm run test:prepare-bucket && npm run test:deploy-original && npm run test:check-bundling && npm run test:save-original-state && npm run test:prepare-bucket && npm run test:deploy-booster && npm run test:check-no-bundling && npm run test:save-booster-state && npm run test:compare-states",
     "docs:dev": "vitepress dev",
     "docs:build": "vitepress build",
     "docs:preview": "vitepress preview"
@@ -63,27 +64,28 @@
     "@eslint/js": "^10.0.1",
     "@tsconfig/node22": "^22.0.5",
     "@types/eslint-config-prettier": "^6.11.3",
-    "@types/node": "^25.3.0",
-    "aws-cdk": "2.1106.1",
-    "aws-cdk-lib": "2.239.0",
-    "constructs": "^10.5.1",
-    "eslint": "^10.0.1",
+    "@types/node": "^25.5.0",
+    "aws-cdk": "2.1115.1",
+    "aws-cdk-lib": "2.246.0",
+    "constructs": "^10.6.0",
+    "eslint": "^10.1.0",
     "eslint-config-prettier": "^10.1.8",
-    "globals": "^17.3.0",
+    "globals": "^17.4.0",
     "husky": "^9.1.7",
     "prettier": "^3.8.1",
     "semantic-release": "^25.0.3",
     "tsx": "^4.21.0",
-    "typescript-eslint": "^8.56.0",
+    "typescript-eslint": "^8.58.0",
     "vitepress": "^1.6.4",
-    "@aws-sdk/client-lambda": "^3.995.0",
+    "@aws-sdk/client-lambda": "^3.1021.0",
+    "@aws-sdk/client-s3": "^3.1021.0",
     "adm-zip": "^0.5.16",
-    "@types/adm-zip": "^0.5.7"
+    "@types/adm-zip": "^0.5.8"
   },
   "dependencies": {
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
-    "typescript": "~5.9.3"
+    "typescript": "~6.0.2"
   },
   "peerDependencies": {
     "esbuild": "^0"