feat: support outdir as prefix for rendered files

README.md

@@ -118,7 +118,10 @@ The package exports four different types of constructs:
  Force the asset to use Docker bundling and skip local bundling. This can be useful in CI environments. The `projectRoot` path will be mounted into the container as context.
 
 - `buildOptions` as per esbuild [(reference)](https://esbuild.github.io/getting-started/#build-scripts) \
- Regular defaults apply, with a few changes as noted below. Generally speaking overwriting entrypoint or output options is not supported, as these are inferred from cdk.
+ Regular defaults apply, with a few changes as noted below. Generally speaking usage of entry and output options are limited, as these are inferred from cdk.
+
+- `buildOptions.outdir` \
+ The path for the outdir is defined by cdk. However setting this option allows to write files into a subdirectory. For example `{ outdir: 'js' }` will create an asset that has a single directory called `js`, which contains all build files. This approach can be useful for static website deployments, where JavaScript code should go into a sub-directory.
 
 ### `TypeScriptCode`, `JavaScriptCode`
 

lib/bundlers.ts

@@ -8,9 +8,12 @@ export class LocalBundler implements ILocalBundling {
 
  tryBundle(outputDir: string, _options: BundlingOptions): boolean {
  try {
+ const outdir = join(
+ ...([outputDir, this.options.outdir].filter(Boolean) as string[])
+ );
  buildSync({
  ...this.options,
- outdir: outputDir,
+ outdir,
  });
 
  return true;
@@ -47,9 +50,11 @@ export class DockerBundler implements BundlingOptions {
  public readonly options: BuildOptions;
 
  public constructor(options: BuildOptions) {
+ const outdir = ["/asset-output", options.outdir].filter(Boolean).join("/");
+
  this.options = {
  ...options,
- outdir: "/asset-output",
+ outdir,
  };
  }
 }

lib/bundling.ts

@@ -3,26 +3,26 @@ import { BuildOptions as EsbuildBuildOptions } from "esbuild";
 import { DockerBundler, LocalBundler } from "./bundlers";
 import { getAbsolutePath } from "./util";
 
-export type BuildOptions = Omit<EsbuildBuildOptions, "outfile" | "outdir">;
+export type BuildOptions = Omit<EsbuildBuildOptions, "outfile">;
 
 export class EsbuildBundling extends DockerBundler implements BundlingOptions {
  public readonly local?: LocalBundler;
 
  public constructor(
  projectRoot: string,
- entry: string,
+ entryPoint: string,
  options: BuildOptions,
  tryLocalBundling = true
  ) {
  super({
  ...options,
- entryPoints: [entry],
+ entryPoints: [entryPoint],
  });
 
  if (tryLocalBundling) {
  this.local = new LocalBundler({
  ...options,
- entryPoints: [getAbsolutePath(projectRoot, entry)],
+ entryPoints: [getAbsolutePath(projectRoot, entryPoint)],
  });
  }
  }

test/bundling.test.ts

@@ -1,4 +1,6 @@
 import "@aws-cdk/assert/jest";
+import { buildSync } from "esbuild";
+import { mocked } from "ts-jest/utils";
 import { EsbuildBundling } from "../lib/bundling";
 
 jest.mock("esbuild", () => ({
@@ -19,4 +21,27 @@ describe("Bundling", () => {
  expect(bundler?.options?.entryPoints).toContain("index.ts");
  });
  });
+
+ describe("Given an outdir", () => {
+ it("should append outdir behind the cdk asset directory", () => {
+ const bundler = new EsbuildBundling(
+ "/project",
+ "index.ts",
+ {
+ outdir: "js",
+ },
+ true
+ );
+ // expect(bundler.local?.options?.outdir).toMatch(/cdk.out\/.*\/js$/);
+ expect(bundler.options?.outdir).toBe("/asset-output/js");
+
+ bundler.local?.tryBundle("cdk.out/123456", bundler);
+
+ expect(mocked(buildSync)).toHaveBeenCalledWith(
+ expect.objectContaining({
+ outdir: "cdk.out/123456/js",
+ })
+ );
+ });
+ });
 });