cdk-booster 1.0.1 → 1.1.0-alpha.2

package/dist/cdk-booster.mjs

@@ -90,56 +90,70 @@ async function bundle(lambdasEsBuildCommands) {
     const tempFolder = path.resolve(path.join(outputFolder, 'bundle'));
     let outputs = {};
     // Create build combinations grouped by identical build options to optimize bundling
-    const allBuildCombinations = createBuildCombinations(lambdasEsBuildCommands);
-    // Group by unique build option hashes to bundle functions with identical settings together
-    const uniqueBuildHashes = new Set(allBuildCombinations.map((b) => b.buildOptionsHash));
+    const buildBatches = createBuildCombinations(lambdasEsBuildCommands);
     // Bundle each group of functions with identical build options
-    await Promise.all(Array.from(uniqueBuildHashes).map(async (buildHash) => {
-        const buildCombinations = allBuildCombinations.filter((b) => b.buildOptionsHash === buildHash);
-        const buildOptions = buildCombinations[0].buildOptions;
-        const entryPoints = buildCombinations.map((b) => b.entryPoint);
-        const normalizedEsbuildArgs = normalizeEsbuildArgs(buildOptions.esbuildArgs);
-        const esBuildOpt = {
-            entryPoints,
-            bundle: true,
-            platform: 'node',
-            outdir: tempFolder,
-            target: buildOptions.target,
-            format: buildOptions.format,
-            minify: buildOptions.minify,
-            sourcemap: buildOptions.sourcemap,
-            sourcesContent: buildOptions.sourcesContent,
-            external: buildOptions.external,
-            loader: buildOptions.loader,
-            define: buildOptions.define,
-            logLevel: buildOptions.logLevel,
-            keepNames: buildOptions.keepNames,
-            tsconfig: buildOptions.tsconfig,
-            banner: buildOptions.banner,
-            footer: buildOptions.footer,
-            mainFields: buildOptions.mainFields,
-            inject: buildOptions.inject,
-            alias: normalizedEsbuildArgs?.alias,
-            drop: normalizedEsbuildArgs?.drop,
-            pure: normalizedEsbuildArgs?.pure,
-            logOverride: normalizedEsbuildArgs?.logOverride,
-            // I need this to properly output bundled files
-            entryNames: '[dir]/[name]-[hash]/index',
-            metafile: true,
-            outExtension: { '.js': '.mjs' },
+    const buildPromises = [];
+    let parallelCount = 0;
+    for (const buildBatch of buildBatches) {
+        const build = async () => {
+            parallelCount++;
+            try {
+                const buildOptions = buildBatch.buildOptions;
+                const entryPoints = buildBatch.entryPoints;
+                const normalizedEsbuildArgs = normalizeEsbuildArgs(buildOptions.esbuildArgs);
+                const esBuildOpt = {
+                    entryPoints,
+                    bundle: true,
+                    platform: 'node',
+                    outdir: tempFolder,
+                    target: buildOptions.target,
+                    format: buildOptions.format,
+                    minify: buildOptions.minify,
+                    sourcemap: buildOptions.sourcemap,
+                    sourcesContent: buildOptions.sourcesContent,
+                    external: buildOptions.external,
+                    loader: buildOptions.loader,
+                    define: buildOptions.define,
+                    logLevel: buildOptions.logLevel,
+                    keepNames: buildOptions.keepNames,
+                    tsconfig: buildOptions.tsconfig,
+                    banner: buildOptions.banner,
+                    footer: buildOptions.footer,
+                    mainFields: buildOptions.mainFields,
+                    inject: buildOptions.inject,
+                    alias: normalizedEsbuildArgs?.alias,
+                    drop: normalizedEsbuildArgs?.drop,
+                    pure: normalizedEsbuildArgs?.pure,
+                    logOverride: normalizedEsbuildArgs?.logOverride,
+                    // I need this to properly output bundled files
+                    entryNames: '[dir]/[name]-[hash]/index',
+                    metafile: true,
+                    outExtension: { '.js': '.mjs' },
+                };
+                if (Logger.isVerbose()) {
+                    Logger.verbose(`Bundling with options:`, JSON.stringify(esBuildOpt, null, 2), `following functions:\n - ${entryPoints.join('\n - ')}`);
+                }
+                else {
+                    Logger.log(`Bundling:\n - ${entryPoints.join('\n - ')}`);
+                }
+                const buildingResults = await esbuild.build(esBuildOpt);
+                outputs = {
+                    ...outputs,
+                    ...buildingResults.metafile?.outputs,
+                };
+            }
+            finally {
+                parallelCount--;
+            }
         };
-        if (Logger.isVerbose()) {
-            Logger.verbose(`Bundling with options:`, JSON.stringify(esBuildOpt, null, 2), `following functions:\n - ${entryPoints.join('\n - ')}`);
-        }
-        else {
-            Logger.log(`Bundling:\n - ${entryPoints.join('\n - ')}`);
+        const parallel = Configuration.config.parallel;
+        // if parallel is set, limit the number of parallel builds
+        if (parallel && parallel > 0 && parallelCount >= parallel) {
+            await Promise.race(buildPromises);
         }
-        const buildingResults = await esbuild.build(esBuildOpt);
-        outputs = {
-            ...outputs,
-            ...buildingResults.metafile?.outputs,
-        };
-    }));
+        buildPromises.push(build());
+    }
+    await Promise.all(buildPromises);
     Logger.log(`All functions have been bundled.`);
     return outputs;
 }
@@ -201,7 +215,7 @@ async function isSecondRun() {
  * @returns Array of build combinations with hashed build options
  */
 function createBuildCombinations(lambdasEsBuildCommands) {
-    return lambdasEsBuildCommands.map((lambdasEsBuildCommand) => {
+    const buildCombinations = lambdasEsBuildCommands.map((lambdasEsBuildCommand) => {
         // Create a copy of the command without non-build-related properties
         const copy = {
             ...lambdasEsBuildCommand,
@@ -226,6 +240,33 @@ function createBuildCombinations(lambdasEsBuildCommands) {
             buildOptionsHash,
         };
     });
+    const buildBatches = [];
+    const batchSize = Configuration.config.batch;
+    // Group by unique build option hashes to bundle functions with identical settings together
+    const uniqueBuildHashes = new Set(buildCombinations.map((b) => b.buildOptionsHash));
+    for (const buildHash of uniqueBuildHashes) {
+        const buildBatch = buildCombinations.filter((b) => b.buildOptionsHash === buildHash);
+        let entryPoints = buildBatch.map((b) => b.entryPoint);
+        // unique entry points
+        entryPoints = Array.from(new Set(entryPoints));
+        // if batch size is set and if each buildOptionsHash has more than batchSize entries, split them
+        if (batchSize && entryPoints.length > batchSize) {
+            for (let i = 0; i < entryPoints.length; i += batchSize) {
+                const chunk = entryPoints.slice(i, i + batchSize);
+                buildBatches.push({
+                    entryPoints: chunk,
+                    buildOptions: buildBatch[0].buildOptions,
+                });
+            }
+        }
+        else {
+            buildBatches.push({
+                entryPoints,
+                buildOptions: buildBatch[0].buildOptions,
+            });
+        }
+    }
+    return buildBatches;
 }
 /**
  * Convert esbuildArgs with CLI-style keys into esbuild options object.

package/dist/getConfigFromCliArgs.mjs

@@ -1,4 +1,4 @@
-import { Command } from 'commander';
+import { Command, InvalidArgumentError } from 'commander';
 import { getVersion } from './version.mjs';
 /**
  * Get configuration from CLI arguments
@@ -10,6 +10,8 @@ export async function getConfigFromCliArgs() {
     const program = new Command();
     program.name('cdk-booster').description('CDK Booster').version(version);
     program.option('-v, --verbose', 'Verbose logging');
+    program.option('-b, --batch <number>', 'Number of Lambdas bundled in a batch with ESBuild', parseInteger);
+    program.option('-p, --parallel <number>', 'Number of parallel ESBuild processes. You usually do not need to change this.', parseInteger);
     program.arguments('<string>');
     program.parse(process.argv);
     const args = program.opts();
@@ -21,3 +23,10 @@ export async function getConfigFromCliArgs() {
     args.entryFile = entryFile;
     return args;
 }
+function parseInteger(value) {
+    const parsedValue = parseInt(value, 10);
+    if (isNaN(parsedValue)) {
+        throw new InvalidArgumentError('Not a number.');
+    }
+    return parsedValue;
+}

package/dist/types/cbConfig.d.ts

@@ -4,5 +4,14 @@ export type CbConfig = {
      * @default false
      */
     verbose?: boolean;
+    /** Number of Lambdas bundled in a batch with ESBuild
+     */
+    batch?: number;
+    /** Number of parallel ESBuild processes
+     */
+    parallel?: number;
+    /**
+     * Entry file
+     */
     entryFile: string;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cdk-booster",
-  "version": "1.0.1",
+  "version": "1.1.0-alpha.2",
   "type": "module",
   "description": "Speed up AWS CDK's bundling of TypeScript/JavaScript Lambda handlers",
   "homepage": "https://www.cdkbooster.com",