cdk-booster 1.3.0 → 1.3.2

package/dist/cdk-booster.mjs

@@ -417,28 +417,91 @@ 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.'))) {
-                    const codeToFind2 = 'return chain([...this.props.commandHooks';
-                    if (!contents.includes(codeToFind2)) {
-                        throw new Error(`Can not find '${codeToFind2.substring(0, 30)}...' in ${args.path}`);
+                    // Detect which CDK bundling.js layout we're dealing with.
+                    // - Pre-2.252: separate `createBundlingCommand` (with inline
+                    //   `chain([...this.props.commandHooks...])`) and
+                    //   `createLocalBundlingSteps` methods.
+                    // - 2.252+: unified `createBundlingSteps` and a new
+                    //   `executeBundlingSteps` invoked from `tryBundle` via
+                    //   `return this.executeBundlingSteps(scope,steps),!0`.
+                    const oldCdkAnchor = 'return chain([...this.props.commandHooks';
+                    const newCdkAnchor = 'return this.executeBundlingSteps(scope,steps),!0';
+                    const isOldCdkStyle = contents.includes(oldCdkAnchor);
+                    const isNewCdkStyle = contents.includes(newCdkAnchor);
+                    if (!isOldCdkStyle && !isNewCdkStyle) {
+                        throw new Error(`Can not find a known CDK bundling.js anchor (neither '${oldCdkAnchor.substring(0, 30)}...' nor '${newCdkAnchor.substring(0, 30)}...') in ${args.path}. The CDK version may not be supported.`);
                     }
-                    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 '${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.
-                    //NOTE: This handles diferent versions of CDK. Newer versions use scope
-                    // target: this.props.target ?? (typeof scope !== "undefined" ? toTarget(scope,this.props.runtime): toTarget(this.props.runtime)),
-                    contents = contents.replace(codeToFind, codeToFind +
-                        `;
+                    // Inspect-mode block used by both the old `createLocalBundlingSteps`
+                    // and the new `tryBundle` injection points. Both contexts have
+                    // access to: this.props, this.projectRoot, this.relativeEntryPath,
+                    // this.externals, this.relativeTsconfigPath, this.environment,
+                    // scope, outputDir, and the module-scope helpers `path()`,
+                    // `types_1()`, `toTarget`, `chain`.
+                    const captureLambdaInfo = (returnStatement) => `
+            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;
+
+              global.lambdas.push({
+                entryPoint: path().join(this.projectRoot, this.relativeEntryPath),
+                out: __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: __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,
+              });
+
+              const __fs = require('fs');
+              const __dir = path().dirname(__out);
+              __fs.mkdirSync(__dir, { recursive: true });
+              __fs.writeFileSync(__out, '');
+
+              ${returnStatement}
+            }
+          `;
+                    // ----------------------------------------------------------
+                    // Pre-2.252 CDK: inject into createBundlingCommand
+                    // (and createLocalBundlingSteps when present)
+                    // ----------------------------------------------------------
+                    if (isOldCdkStyle) {
+                        contents = contents.replace(oldCdkAnchor, 'const command = chain([...this.props.commandHooks');
+                        const codeToFind = 'afterBundling(options.inputDir,options.outputDir)??[]])';
+                        if (!contents.includes(codeToFind)) {
+                            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.
+                        //NOTE: This handles diferent versions of CDK. Newer versions use scope
+                        // target: this.props.target ?? (typeof scope !== "undefined" ? toTarget(scope,this.props.runtime): toTarget(this.props.runtime)),
+                        contents = contents.replace(codeToFind, codeToFind +
+                            `;
               if (process.env.CDK_BOOSTER_INSPECT === 'true') {
                 if (!options.outputDir.startsWith('/asset-output')) {
                   global.lambdas = global.lambdas ?? [];
 
                   const out = pathJoin(options.outputDir,outFile);
 
-                  const lambdaInfo = {
+                  global.lambdas.push({
                     command: command,
                     entryPoint: relativeEntryPath,
                     out,
@@ -462,9 +525,7 @@ async function compileCdk({ rootDir, entryFile, tsconfig, }) {
                     commandAfterBundling: chain([...(this.props.nodeModules && this.props.commandHooks?.beforeInstall(options.inputDir, options.outputDir)) ?? [], depsCommand, ...this.props.commandHooks?.afterBundling(options.inputDir, options.outputDir) ?? []]),
                     environment: this.environment,
                     projectRoot: this.projectRoot,
-                  };
-
-                  global.lambdas.push(lambdaInfo);
+                  });
 
                   const fs = require('fs');
                   const path = require('path');
@@ -475,56 +536,23 @@ async function compileCdk({ rootDir, entryFile, tsconfig, }) {
               }
               return command;
               `);
-                    // 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;
-                }
-                `);
+                        // Active local-bundling injection in pre-2.252 CDK:
+                        // `createLocalBundlingSteps` returns the list of bundling
+                        // steps. In inspect mode we skip building those steps and
+                        // return an empty array so nothing executes.
+                        const localStepsAnchor = 'createLocalBundlingSteps(scope,outputDir,esbuild,tsc){const steps=[];';
+                        if (contents.includes(localStepsAnchor)) {
+                            contents = contents.replace(localStepsAnchor, localStepsAnchor + captureLambdaInfo('return steps;'));
+                        }
+                    }
+                    // ----------------------------------------------------------
+                    // CDK 2.252+: inject into getLocalBundlingProvider().tryBundle
+                    // (the unified createBundlingSteps/executeBundlingSteps flow).
+                    // We short-circuit before executeBundlingSteps in inspect mode
+                    // to capture the Lambda configuration and skip the actual build.
+                    // ----------------------------------------------------------
+                    if (isNewCdkStyle) {
+                        contents = contents.replace(newCdkAnchor, `${captureLambdaInfo('return true;')}\n${newCdkAnchor}`);
                     }
                     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){';
@@ -562,12 +590,19 @@ async function compileCdk({ rootDir, entryFile, tsconfig, }) {
                     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 '${codeToFind.substring(0, 30)}...' in ${args.path}`);
+                    // CDK ≤2.250 passed policyValidationBeta1 into Stage's super(); 2.251+ calls
+                    // _addValidationPlugins instead. Anchor on APP_SYMBOL registration (unchanged).
+                    const codeToFindLegacy = ',policyValidationBeta1:props.policyValidationBeta1});';
+                    const codeToFindStable = 'Object.defineProperty(this,APP_SYMBOL,{value:!0}),this.loadContext';
+                    if (contents.includes(codeToFindLegacy)) {
+                        contents = contents.replace(codeToFindLegacy, codeToFindLegacy + 'global.cdkApp = this;');
+                    }
+                    else if (contents.includes(codeToFindStable)) {
+                        contents = contents.replace(codeToFindStable, 'Object.defineProperty(this,APP_SYMBOL,{value:!0}),global.cdkApp=this,this.loadContext');
+                    }
+                    else {
+                        throw new Error(`Can not find App constructor injection anchor (legacy policyValidationBeta1 or APP_SYMBOL) in ${args.path}`);
                     }
-                    // make CDK app available
-                    contents = contents.replace(codeToFind, codeToFind + `global.cdkApp = this;`);
                     Logger.verbose(`Injected code into ${args.path}`);
                 }
                 else if (args.path.includes(path.join('aws-cdk-lib', 'core', 'lib', 'asset-staging.'))) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdk-booster",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "type": "module",
   "description": "Speed up AWS CDK's bundling of TypeScript/JavaScript Lambda handlers",
   "homepage": "https://www.cdkbooster.com",
@@ -64,28 +64,28 @@
     "@eslint/js": "^10.0.1",
     "@tsconfig/node22": "^22.0.5",
     "@types/eslint-config-prettier": "^6.11.3",
-    "@types/node": "^25.5.0",
-    "aws-cdk": "2.1116.0",
-    "aws-cdk-lib": "2.246.0",
+    "@types/node": "^25.6.0",
+    "aws-cdk": "2.1120.0",
+    "aws-cdk-lib": "2.252.0",
     "constructs": "^10.6.0",
-    "eslint": "^10.1.0",
+    "eslint": "^10.3.0",
     "eslint-config-prettier": "^10.1.8",
-    "globals": "^17.4.0",
+    "globals": "^17.6.0",
     "husky": "^9.1.7",
-    "prettier": "^3.8.1",
+    "prettier": "^3.8.3",
     "semantic-release": "^25.0.3",
     "tsx": "^4.21.0",
-    "typescript-eslint": "^8.58.0",
+    "typescript-eslint": "^8.59.1",
     "vitepress": "^1.6.4",
-    "@aws-sdk/client-lambda": "^3.1022.0",
-    "@aws-sdk/client-s3": "^3.1022.0",
+    "@aws-sdk/client-lambda": "^3.1041.0",
+    "@aws-sdk/client-s3": "^3.1041.0",
     "adm-zip": "^0.5.17",
     "@types/adm-zip": "^0.5.8"
   },
   "dependencies": {
     "chalk": "^5.6.2",
     "commander": "^14.0.3",
-    "typescript": "~6.0.2"
+    "typescript": "~6.0.3"
   },
   "peerDependencies": {
     "esbuild": "^0"