projen 0.41.0 → 0.43.1

package/lib/awscdk/awscdk-app-ts.d.ts

@@ -1,36 +1,12 @@
 import { TypeScriptAppProject, TypeScriptProjectOptions } from '../typescript';
+import { AwsCdkDeps, AwsCdkDepsCommonOptions } from './awscdk-deps';
 import { CdkConfig, CdkConfigCommonOptions } from './cdk-config';
 import { CdkTasks } from './cdk-tasks';
 import { LambdaFunctionCommonOptions } from './lambda-function';
 /**
  * @experimental
  */
-export interface AwsCdkTypeScriptAppOptions extends TypeScriptProjectOptions, CdkConfigCommonOptions {
-    /**
-     * (experimental) AWS CDK version to use.
-     *
-     * @default "1.129.0"
-     * @experimental
-     * @featured true
-     */
-    readonly cdkVersion: string;
-    /**
-     * (experimental) Use pinned version instead of caret version for CDK.
-     *
-     * You can use this to prevent yarn to mix versions for your CDK dependencies and to prevent auto-updates.
-     * If you use experimental features this will let you define the moment you include breaking changes.
-     *
-     * @default false
-     * @experimental
-     */
-    readonly cdkVersionPinning?: boolean;
-    /**
-     * (experimental) Which AWS CDK modules (those that start with "@aws-cdk/") this app uses.
-     *
-     * @experimental
-     * @featured true
-     */
-    readonly cdkDependencies?: string[];
+export interface AwsCdkTypeScriptAppOptions extends TypeScriptProjectOptions, CdkConfigCommonOptions, AwsCdkDepsCommonOptions {
     /**
      * (experimental) The CDK app's entrypoint (relative to the source directory, which is "src" by default).
      *
@@ -65,7 +41,7 @@ export declare class AwsCdkTypeScriptApp extends TypeScriptAppProject {
      *
      * @experimental
      */
-    readonly cdkVersion: string;
+    get cdkVersion(): string;
     /**
      * (experimental) The CDK app entrypoint.
      *
@@ -84,6 +60,10 @@ export declare class AwsCdkTypeScriptApp extends TypeScriptAppProject {
      * @experimental
      */
     readonly cdkConfig: CdkConfig;
+    /**
+     * @experimental
+     */
+    readonly cdkDeps: AwsCdkDeps;
     /**
      * @experimental
      */
@@ -95,5 +75,4 @@ export declare class AwsCdkTypeScriptApp extends TypeScriptAppProject {
      * @experimental
      */
     addCdkDependency(...modules: string[]): void;
-    private formatModuleSpec;
 }

package/lib/awscdk/awscdk-app-ts.js

@@ -5,10 +5,11 @@ exports.AwsCdkTypeScriptApp = void 0;
 const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
 const path = require("path");
 const fs = require("fs-extra");
-const semver = require("semver");
 const component_1 = require("../component");
+const dependencies_1 = require("../dependencies");
 const typescript_1 = require("../typescript");
 const auto_discover_1 = require("./auto-discover");
+const awscdk_deps_1 = require("./awscdk-deps");
 const cdk_config_1 = require("./cdk-config");
 const cdk_tasks_1 = require("./cdk-tasks");
 /**
@@ -22,7 +23,7 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
      * @experimental
      */
     constructor(options) {
-        var _b, _c, _d, _e, _f, _g, _h, _j, _k;
+        var _b, _c, _d, _e, _f, _g;
         super({
             ...options,
             sampleCode: false,
@@ -33,35 +34,25 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
                 addToPreCompile: false,
             },
         });
+        this.cdkDeps = new awscdk_deps_1.AwsCdkDeps(this, {
+            dependencyType: dependencies_1.DependencyType.RUNTIME,
+            ...options,
+        });
         this.appEntrypoint = (_b = options.appEntrypoint) !== null && _b !== void 0 ? _b : 'main.ts';
-        this.cdkVersion = options.cdkVersionPinning ? options.cdkVersion : `^${options.cdkVersion}`;
         // CLI
-        this.addDevDeps(this.formatModuleSpec('aws-cdk'));
-        this.addCdkDependency('@aws-cdk/assert');
-        if (!this.cdkVersion) {
-            throw new Error('Required field cdkVersion is not specified.');
-        }
-        const cdkMajorVersion = (_d = (_c = semver.minVersion(this.cdkVersion)) === null || _c === void 0 ? void 0 : _c.major) !== null && _d !== void 0 ? _d : 1;
-        if (cdkMajorVersion < 2) {
-            this.addCdkDependency('@aws-cdk/core');
-        }
-        else {
-            this.addCdkDependency('aws-cdk-lib');
-            this.addDeps('constructs@^10.0.5');
-        }
-        this.addCdkDependency(...(_e = options.cdkDependencies) !== null && _e !== void 0 ? _e : []);
+        this.addDevDeps(`aws-cdk@${this.cdkDeps.cdkVersion}`);
         // no compile step because we do all of it in typescript directly
         this.compileTask.reset();
         this.cdkTasks = new cdk_tasks_1.CdkTasks(this);
         // add synth to the build
         this.postCompileTask.spawn(this.cdkTasks.synth);
-        const tsConfigFile = (_f = this.tsconfig) === null || _f === void 0 ? void 0 : _f.fileName;
+        const tsConfigFile = (_c = this.tsconfig) === null || _c === void 0 ? void 0 : _c.fileName;
         if (!tsConfigFile) {
             throw new Error('Expecting tsconfig.json');
         }
         this.cdkConfig = new cdk_config_1.CdkConfig(this, {
             app: `npx ts-node -P ${tsConfigFile} --prefer-ts-exts ${path.posix.join(this.srcdir, this.appEntrypoint)}`,
-            featureFlags: cdkMajorVersion < 2,
+            featureFlags: this.cdkDeps.cdkMajorVersion < 2,
             buildCommand: this.runTaskCommand(this.bundler.bundleTask),
             watchIncludes: [
                 `${this.srcdir}/**/*.ts`,
@@ -80,25 +71,32 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
             ...options,
         });
         this.gitignore.exclude('.parcel-cache/');
-        (_g = this.npmignore) === null || _g === void 0 ? void 0 : _g.exclude(`${this.cdkConfig.cdkout}/`);
-        (_h = this.npmignore) === null || _h === void 0 ? void 0 : _h.exclude('.cdk.staging/');
+        (_d = this.npmignore) === null || _d === void 0 ? void 0 : _d.exclude(`${this.cdkConfig.cdkout}/`);
+        (_e = this.npmignore) === null || _e === void 0 ? void 0 : _e.exclude('.cdk.staging/');
         if (this.tsconfig) {
             this.tsconfig.exclude.push(this.cdkConfig.cdkout);
         }
         this.addDevDeps('ts-node@^9');
-        if ((_j = options.sampleCode) !== null && _j !== void 0 ? _j : true) {
-            new SampleCode(this, cdkMajorVersion);
+        if ((_f = options.sampleCode) !== null && _f !== void 0 ? _f : true) {
+            new SampleCode(this, this.cdkDeps.cdkMajorVersion);
         }
-        const lambdaAutoDiscover = (_k = options.lambdaAutoDiscover) !== null && _k !== void 0 ? _k : true;
+        const lambdaAutoDiscover = (_g = options.lambdaAutoDiscover) !== null && _g !== void 0 ? _g : true;
         if (lambdaAutoDiscover) {
             new auto_discover_1.AutoDiscover(this, {
                 srcdir: this.srcdir,
                 testdir: this.testdir,
                 lambdaOptions: options.lambdaOptions,
                 tsconfigPath: this.tsconfigDev.fileName,
+                cdkDeps: this.cdkDeps,
             });
         }
     }
+    /**
+     * (experimental) The CDK version this app is using.
+     *
+     * @experimental
+     */
+    get cdkVersion() { return this.cdkDeps.cdkVersion; }
     /**
      * (experimental) Adds an AWS CDK module dependencies.
      *
@@ -106,18 +104,12 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
      * @experimental
      */
     addCdkDependency(...modules) {
-        if (modules.length === 0) {
-            return;
-        }
-        this.addDeps(...modules.map(m => this.formatModuleSpec(m)));
-    }
-    formatModuleSpec(module) {
-        return `${module}@${this.cdkVersion}`;
+        return this.cdkDeps.addV1Dependencies(...modules);
     }
 }
 exports.AwsCdkTypeScriptApp = AwsCdkTypeScriptApp;
 _a = JSII_RTTI_SYMBOL_1;
-AwsCdkTypeScriptApp[_a] = { fqn: "projen.awscdk.AwsCdkTypeScriptApp", version: "0.41.0" };
+AwsCdkTypeScriptApp[_a] = { fqn: "projen.awscdk.AwsCdkTypeScriptApp", version: "0.43.1" };
 class SampleCode extends component_1.Component {
     constructor(project, cdkMajorVersion) {
         super(project);
@@ -169,24 +161,25 @@ app.synth();`;
         const testImports = new Array();
         if (this.cdkMajorVersion < 2) {
             testImports.push('import { App } from \'@aws-cdk/core\';');
+            testImports.push('import { Template } from \'@aws-cdk/assertions\';');
         }
         else {
             testImports.push('import { App } from \'aws-cdk-lib\';');
+            testImports.push('import { Template } from \'aws-cdk-lib/assertions\';');
         }
         const appEntrypointName = path.basename(this.appProject.appEntrypoint, '.ts');
-        const testCode = `import '@aws-cdk/assert/jest';
-${testImports.join('\n')}
+        const testCode = `${testImports.join('\n')}
 import { MyStack } from '../src/${appEntrypointName}';
 
 test('Snapshot', () => {
   const app = new App();
   const stack = new MyStack(app, 'test');
 
-  expect(stack).not.toHaveResource('AWS::S3::Bucket');
-  expect(app.synth().getStackArtifact(stack.artifactId).template).toMatchSnapshot();
+  const template = Template.fromStack(stack);
+  expect(template.toJSON()).toMatchSnapshot();
 });`;
         fs.mkdirpSync(testdir);
         fs.writeFileSync(path.join(testdir, `${appEntrypointName}.test.ts`), testCode);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awscdk-app-ts.js","sourceRoot":"","sources":["../../src/awscdk/awscdk-app-ts.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport * as fs from 'fs-extra';\nimport * as semver from 'semver';\nimport { Component } from '../component';\nimport { TypeScriptAppProject, TypeScriptProjectOptions } from '../typescript';\nimport { AutoDiscover } from './auto-discover';\nimport { CdkConfig, CdkConfigCommonOptions } from './cdk-config';\nimport { CdkTasks } from './cdk-tasks';\nimport { LambdaFunctionCommonOptions } from './lambda-function';\n\nexport interface AwsCdkTypeScriptAppOptions extends TypeScriptProjectOptions, CdkConfigCommonOptions {\n                                                                                    \n  readonly cdkVersion: string;\n\n                                                                                                                                                                                                                                                                                                                        \n  readonly cdkVersionPinning?: boolean;\n\n                                                                                                        \n  readonly cdkDependencies?: string[];\n\n                                                                                                                                          \n  readonly appEntrypoint?: string;\n\n                                                                                                                                                                                                                                                 \n  readonly lambdaAutoDiscover?: boolean;\n\n                                                                                                  \n  readonly lambdaOptions?: LambdaFunctionCommonOptions;\n}\n\n                                                              \nexport class AwsCdkTypeScriptApp extends TypeScriptAppProject {\n                                                   \n  public readonly cdkVersion: string;\n\n                                       \n  public readonly appEntrypoint: string;\n\n                                  \n  public readonly cdkTasks: CdkTasks;\n\n                                        \n  public readonly cdkConfig: CdkConfig;\n\n  constructor(options: AwsCdkTypeScriptAppOptions) {\n    super({\n      ...options,\n      sampleCode: false,\n      bundlerOptions: {\n        ...options.bundlerOptions,\n\n        // we invoke the \"bundle\" task as part of the build step in cdk.json so\n        // we don't want it to be added to the pre-compile phase.\n        addToPreCompile: false,\n      },\n    });\n\n    this.appEntrypoint = options.appEntrypoint ?? 'main.ts';\n\n    this.cdkVersion = options.cdkVersionPinning ? options.cdkVersion : `^${options.cdkVersion}`;\n\n    // CLI\n    this.addDevDeps(this.formatModuleSpec('aws-cdk'));\n    this.addCdkDependency('@aws-cdk/assert');\n\n    if (!this.cdkVersion) {\n      throw new Error('Required field cdkVersion is not specified.');\n    }\n\n    const cdkMajorVersion = semver.minVersion(this.cdkVersion)?.major ?? 1;\n    if (cdkMajorVersion < 2) {\n      this.addCdkDependency('@aws-cdk/core');\n    } else {\n      this.addCdkDependency('aws-cdk-lib');\n      this.addDeps('constructs@^10.0.5');\n    }\n\n    this.addCdkDependency(...options.cdkDependencies ?? []);\n\n    // no compile step because we do all of it in typescript directly\n    this.compileTask.reset();\n\n    this.cdkTasks = new CdkTasks(this);\n\n    // add synth to the build\n    this.postCompileTask.spawn(this.cdkTasks.synth);\n\n    const tsConfigFile = this.tsconfig?.fileName;\n    if (!tsConfigFile) {\n      throw new Error('Expecting tsconfig.json');\n    }\n\n    this.cdkConfig = new CdkConfig(this, {\n      app: `npx ts-node -P ${tsConfigFile} --prefer-ts-exts ${path.posix.join(this.srcdir, this.appEntrypoint)}`,\n      featureFlags: cdkMajorVersion < 2,\n      buildCommand: this.runTaskCommand(this.bundler.bundleTask),\n      watchIncludes: [\n        `${this.srcdir}/**/*.ts`,\n        `${this.testdir}/**/*.ts`,\n      ],\n      watchExcludes: [\n        'README.md',\n        'cdk*.json',\n        '**/*.d.ts',\n        '**/*.js',\n        'tsconfig.json',\n        'package*.json',\n        'yarn.lock',\n        'node_modules',\n      ],\n      ...options,\n    });\n\n    this.gitignore.exclude('.parcel-cache/');\n\n    this.npmignore?.exclude(`${this.cdkConfig.cdkout}/`);\n    this.npmignore?.exclude('.cdk.staging/');\n\n    if (this.tsconfig) {\n      this.tsconfig.exclude.push(this.cdkConfig.cdkout);\n    }\n\n    this.addDevDeps('ts-node@^9');\n    if (options.sampleCode ?? true) {\n      new SampleCode(this, cdkMajorVersion);\n    }\n\n    const lambdaAutoDiscover = options.lambdaAutoDiscover ?? true;\n    if (lambdaAutoDiscover) {\n      new AutoDiscover(this, {\n        srcdir: this.srcdir,\n        testdir: this.testdir,\n        lambdaOptions: options.lambdaOptions,\n        tsconfigPath: this.tsconfigDev.fileName,\n      });\n    }\n  }\n\n                                                                                                         \n  public addCdkDependency(...modules: string[]) {\n    if (modules.length === 0) {\n      return;\n    }\n    this.addDeps(...modules.map(m => this.formatModuleSpec(m)));\n  }\n\n  private formatModuleSpec(module: string): string {\n    return `${module}@${this.cdkVersion}`;\n  }\n}\n\nclass SampleCode extends Component {\n  private readonly appProject: AwsCdkTypeScriptApp;\n\n  constructor(project: AwsCdkTypeScriptApp, private readonly cdkMajorVersion: number) {\n    super(project);\n    this.appProject = project;\n  }\n\n  public synthesize() {\n    const outdir = this.project.outdir;\n    const srcdir = path.join(outdir, this.appProject.srcdir);\n    if (fs.pathExistsSync(srcdir) && fs.readdirSync(srcdir).filter(x => x.endsWith('.ts'))) {\n      return;\n    }\n\n    const srcImports = new Array<string>();\n    if (this.cdkMajorVersion < 2) {\n      srcImports.push('import { App, Construct, Stack, StackProps } from \\'@aws-cdk/core\\';');\n    } else {\n      srcImports.push('import { App, Stack, StackProps } from \\'aws-cdk-lib\\';');\n      srcImports.push('import { Construct } from \\'constructs\\';');\n    }\n\n    const srcCode = `${srcImports.join('\\n')}\n\nexport class MyStack extends Stack {\n  constructor(scope: Construct, id: string, props: StackProps = {}) {\n    super(scope, id, props);\n\n    // define resources here...\n  }\n}\n\n// for development, use account/region from cdk cli\nconst devEnv = {\n  account: process.env.CDK_DEFAULT_ACCOUNT,\n  region: process.env.CDK_DEFAULT_REGION,\n};\n\nconst app = new App();\n\nnew MyStack(app, 'my-stack-dev', { env: devEnv });\n// new MyStack(app, 'my-stack-prod', { env: prodEnv });\n\napp.synth();`;\n\n    fs.mkdirpSync(srcdir);\n    fs.writeFileSync(path.join(srcdir, this.appProject.appEntrypoint), srcCode);\n\n    const testdir = path.join(outdir, this.appProject.testdir);\n    if (fs.pathExistsSync(testdir) && fs.readdirSync(testdir).filter(x => x.endsWith('.ts'))) {\n      return;\n    }\n\n    const testImports = new Array<string>();\n    if (this.cdkMajorVersion < 2) {\n      testImports.push('import { App } from \\'@aws-cdk/core\\';');\n    } else {\n      testImports.push('import { App } from \\'aws-cdk-lib\\';');\n    }\n\n\n    const appEntrypointName = path.basename(this.appProject.appEntrypoint, '.ts');\n    const testCode = `import '@aws-cdk/assert/jest';\n${testImports.join('\\n')}\nimport { MyStack } from '../src/${appEntrypointName}';\n\ntest('Snapshot', () => {\n  const app = new App();\n  const stack = new MyStack(app, 'test');\n\n  expect(stack).not.toHaveResource('AWS::S3::Bucket');\n  expect(app.synth().getStackArtifact(stack.artifactId).template).toMatchSnapshot();\n});`;\n\n    fs.mkdirpSync(testdir);\n    fs.writeFileSync(path.join(testdir, `${appEntrypointName}.test.ts`), testCode);\n  }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awscdk-app-ts.js","sourceRoot":"","sources":["../../src/awscdk/awscdk-app-ts.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport * as fs from 'fs-extra';\nimport { Component } from '../component';\nimport { DependencyType } from '../dependencies';\nimport { TypeScriptAppProject, TypeScriptProjectOptions } from '../typescript';\nimport { AutoDiscover } from './auto-discover';\nimport { AwsCdkDeps, AwsCdkDepsCommonOptions } from './awscdk-deps';\nimport { CdkConfig, CdkConfigCommonOptions } from './cdk-config';\nimport { CdkTasks } from './cdk-tasks';\nimport { LambdaFunctionCommonOptions } from './lambda-function';\n\nexport interface AwsCdkTypeScriptAppOptions extends TypeScriptProjectOptions, CdkConfigCommonOptions, AwsCdkDepsCommonOptions {\n                                                                                                                                          \n  readonly appEntrypoint?: string;\n\n                                                                                                                                                                                                                                                 \n  readonly lambdaAutoDiscover?: boolean;\n\n                                                                                                  \n  readonly lambdaOptions?: LambdaFunctionCommonOptions;\n}\n\n                                                              \nexport class AwsCdkTypeScriptApp extends TypeScriptAppProject {\n                                                   \n  public get cdkVersion() { return this.cdkDeps.cdkVersion; }\n\n                                       \n  public readonly appEntrypoint: string;\n\n                                  \n  public readonly cdkTasks: CdkTasks;\n\n                                        \n  public readonly cdkConfig: CdkConfig;\n\n  public readonly cdkDeps: AwsCdkDeps;\n\n  constructor(options: AwsCdkTypeScriptAppOptions) {\n    super({\n      ...options,\n      sampleCode: false,\n      bundlerOptions: {\n        ...options.bundlerOptions,\n\n        // we invoke the \"bundle\" task as part of the build step in cdk.json so\n        // we don't want it to be added to the pre-compile phase.\n        addToPreCompile: false,\n      },\n    });\n\n    this.cdkDeps = new AwsCdkDeps(this, {\n      dependencyType: DependencyType.RUNTIME,\n      ...options,\n    });\n    this.appEntrypoint = options.appEntrypoint ?? 'main.ts';\n\n    // CLI\n    this.addDevDeps(`aws-cdk@${this.cdkDeps.cdkVersion}`);\n\n    // no compile step because we do all of it in typescript directly\n    this.compileTask.reset();\n\n    this.cdkTasks = new CdkTasks(this);\n\n    // add synth to the build\n    this.postCompileTask.spawn(this.cdkTasks.synth);\n\n    const tsConfigFile = this.tsconfig?.fileName;\n    if (!tsConfigFile) {\n      throw new Error('Expecting tsconfig.json');\n    }\n\n    this.cdkConfig = new CdkConfig(this, {\n      app: `npx ts-node -P ${tsConfigFile} --prefer-ts-exts ${path.posix.join(this.srcdir, this.appEntrypoint)}`,\n      featureFlags: this.cdkDeps.cdkMajorVersion < 2,\n      buildCommand: this.runTaskCommand(this.bundler.bundleTask),\n      watchIncludes: [\n        `${this.srcdir}/**/*.ts`,\n        `${this.testdir}/**/*.ts`,\n      ],\n      watchExcludes: [\n        'README.md',\n        'cdk*.json',\n        '**/*.d.ts',\n        '**/*.js',\n        'tsconfig.json',\n        'package*.json',\n        'yarn.lock',\n        'node_modules',\n      ],\n      ...options,\n    });\n\n    this.gitignore.exclude('.parcel-cache/');\n\n    this.npmignore?.exclude(`${this.cdkConfig.cdkout}/`);\n    this.npmignore?.exclude('.cdk.staging/');\n\n    if (this.tsconfig) {\n      this.tsconfig.exclude.push(this.cdkConfig.cdkout);\n    }\n\n    this.addDevDeps('ts-node@^9');\n    if (options.sampleCode ?? true) {\n      new SampleCode(this, this.cdkDeps.cdkMajorVersion);\n    }\n\n    const lambdaAutoDiscover = options.lambdaAutoDiscover ?? true;\n    if (lambdaAutoDiscover) {\n      new AutoDiscover(this, {\n        srcdir: this.srcdir,\n        testdir: this.testdir,\n        lambdaOptions: options.lambdaOptions,\n        tsconfigPath: this.tsconfigDev.fileName,\n        cdkDeps: this.cdkDeps,\n      });\n    }\n  }\n\n                                                                                                         \n  public addCdkDependency(...modules: string[]) {\n    return this.cdkDeps.addV1Dependencies(...modules);\n  }\n}\n\nclass SampleCode extends Component {\n  private readonly appProject: AwsCdkTypeScriptApp;\n\n  constructor(project: AwsCdkTypeScriptApp, private readonly cdkMajorVersion: number) {\n    super(project);\n    this.appProject = project;\n  }\n\n  public synthesize() {\n    const outdir = this.project.outdir;\n    const srcdir = path.join(outdir, this.appProject.srcdir);\n    if (fs.pathExistsSync(srcdir) && fs.readdirSync(srcdir).filter(x => x.endsWith('.ts'))) {\n      return;\n    }\n\n    const srcImports = new Array<string>();\n    if (this.cdkMajorVersion < 2) {\n      srcImports.push('import { App, Construct, Stack, StackProps } from \\'@aws-cdk/core\\';');\n    } else {\n      srcImports.push('import { App, Stack, StackProps } from \\'aws-cdk-lib\\';');\n      srcImports.push('import { Construct } from \\'constructs\\';');\n    }\n\n    const srcCode = `${srcImports.join('\\n')}\n\nexport class MyStack extends Stack {\n  constructor(scope: Construct, id: string, props: StackProps = {}) {\n    super(scope, id, props);\n\n    // define resources here...\n  }\n}\n\n// for development, use account/region from cdk cli\nconst devEnv = {\n  account: process.env.CDK_DEFAULT_ACCOUNT,\n  region: process.env.CDK_DEFAULT_REGION,\n};\n\nconst app = new App();\n\nnew MyStack(app, 'my-stack-dev', { env: devEnv });\n// new MyStack(app, 'my-stack-prod', { env: prodEnv });\n\napp.synth();`;\n\n    fs.mkdirpSync(srcdir);\n    fs.writeFileSync(path.join(srcdir, this.appProject.appEntrypoint), srcCode);\n\n    const testdir = path.join(outdir, this.appProject.testdir);\n    if (fs.pathExistsSync(testdir) && fs.readdirSync(testdir).filter(x => x.endsWith('.ts'))) {\n      return;\n    }\n\n    const testImports = new Array<string>();\n    if (this.cdkMajorVersion < 2) {\n      testImports.push('import { App } from \\'@aws-cdk/core\\';');\n      testImports.push('import { Template } from \\'@aws-cdk/assertions\\';');\n    } else {\n      testImports.push('import { App } from \\'aws-cdk-lib\\';');\n      testImports.push('import { Template } from \\'aws-cdk-lib/assertions\\';');\n    }\n\n    const appEntrypointName = path.basename(this.appProject.appEntrypoint, '.ts');\n    const testCode = `${testImports.join('\\n')}\nimport { MyStack } from '../src/${appEntrypointName}';\n\ntest('Snapshot', () => {\n  const app = new App();\n  const stack = new MyStack(app, 'test');\n\n  const template = Template.fromStack(stack);\n  expect(template.toJSON()).toMatchSnapshot();\n});`;\n\n    fs.mkdirpSync(testdir);\n    fs.writeFileSync(path.join(testdir, `${appEntrypointName}.test.ts`), testCode);\n  }\n}\n"]}

package/lib/awscdk/awscdk-construct.d.ts

@@ -1,83 +1,12 @@
 import { ConstructLibrary, ConstructLibraryOptions } from '../cdk';
+import { AwsCdkDeps, AwsCdkDepsCommonOptions } from './awscdk-deps';
 import { LambdaFunctionCommonOptions } from './lambda-function';
 /**
- * (experimental) Options for the construct-lib-aws project.
+ * (experimental) Options for `AwsCdkConstructLibrary`.
  *
  * @experimental
  */
-export interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions {
-    /**
-     * (experimental) Minimum target version this library is tested against.
-     *
-     * @default "2.0.0"
-     * @experimental
-     * @featured true
-     */
-    readonly cdkVersion: string;
-    /**
-     * (experimental) Minimum target version of constructs being tested against. If not provided, the default value depends on the configured `cdkVersion`:.
-     *
-     * - For CDK 1.x, the default is "3.2.27"
-     * - For CDK 2.x, the default is "10.0.5"
-     * - Otherwise, the default is "*"
-     *
-     * @default - When the default behavior is used, the dependency on `constructs` will
-     * be added as both a `peerDependency` and a `devDependency`.
-     * @experimental
-     */
-    readonly constructsVersion?: string;
-    /**
-     * (experimental) Use pinned version instead of caret version for CDK.
-     *
-     * You can use this to prevent yarn to mix versions for your CDK dependencies and to prevent auto-updates.
-     * If you use experimental features this will let you define the moment you include breaking changes.
-     *
-     * @default false
-     * @experimental
-     */
-    readonly cdkVersionPinning?: boolean;
-    /**
-     * (deprecated) Which AWS CDK modules (those that start with "@aws-cdk/") does this library require when consumed?
-     *
-     * @deprecated - For CDK 2.x use 'peerDeps' instead
-     */
-    readonly cdkDependencies?: string[];
-    /**
-     * (deprecated) If this is enabled (default), all modules declared in `cdkDependencies` will be also added as normal `dependencies` (as well as `peerDependencies`).
-     *
-     * This is to ensure that downstream consumers actually have your CDK dependencies installed
-     * when using npm < 7 or yarn, where peer dependencies are not automatically installed.
-     * If this is disabled, `cdkDependencies` will be added to `devDependencies` to ensure
-     * they are present during development.
-     *
-     * @default true
-     * @deprecated - Not used for CDK 2.x
-     */
-    readonly cdkDependenciesAsDeps?: boolean;
-    /**
-     * (deprecated) Install the @aws-cdk/assert library?
-     *
-     * @default false
-     * @deprecated - use cdkAssertions instead
-     */
-    readonly cdkAssert?: boolean;
-    /**
-     * (experimental) Install the @aws-cdk/assertions library?
-     *
-     * Only needed for CDK 1.x. If using CDK 2.x then
-     * assertions is already included in 'aws-cdk-lib'
-     *
-     * @default true
-     * @experimental
-     */
-    readonly cdkAssertions?: boolean;
-    /**
-     * (deprecated) AWS CDK modules required for testing.
-     *
-     * @deprecated - For CDK 2.x use 'devDeps' instead
-     * @featured true
-     */
-    readonly cdkTestDependencies?: string[];
+export interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions, AwsCdkDepsCommonOptions {
     /**
      * (experimental) Automatically adds an `aws_lambda.Function` for each `.lambda.ts` handler in your source tree. If this is disabled, you either need to explicitly call `aws_lambda.Function.autoDiscover()` or define a `new aws_lambda.Function()` for each handler.
      *
@@ -105,48 +34,39 @@ export interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions {
  */
 export declare class AwsCdkConstructLibrary extends ConstructLibrary {
     /**
-     * (experimental) The target CDK version for this library.
-     *
      * @experimental
      */
-    readonly cdkVersion: string;
+    readonly cdkDeps: AwsCdkDeps;
     /**
-     * (experimental) Whether CDK dependencies are added as normal dependencies (and peer dependencies).
-     *
      * @experimental
      */
-    readonly cdkDependenciesAsDeps: boolean;
+    constructor(options: AwsCdkConstructLibraryOptions);
     /**
+     * (experimental) The target CDK version for this library.
+     *
      * @experimental
      */
-    constructor(options: AwsCdkConstructLibraryOptions);
+    get cdkVersion(): string;
     /**
      * @deprecated use `cdkVersion`
      */
     get version(): string;
     /**
-     * (experimental) Adds CDK modules as runtime dependencies.
+     * (deprecated) Adds dependencies to AWS CDK modules.
      *
-     * Modules are currently by default added with a caret CDK version both as "dependencies"
-     * and "peerDependencies". This is because currently npm would not
-     * automatically install peer dependencies that are not declared as concerete
-     * dependencies by the consumer, so this is a little npm "hack" so that
-     * consumers will not need to depend on them directly if they don't interact
-     * with them.
-     * See `cdkDependenciesAsDeps` for changing the default behavior.
+     * Since this is a library project, dependencies will be added as peer dependencies.
      *
      * @param deps names of cdk modules (e.g. `@aws-cdk/aws-lambda`).
-     * @experimental
+     * @deprecated Not supported in v2. For v1, use `project.cdkDeps.addV1Dependencies()`
      */
     addCdkDependencies(...deps: string[]): void;
     /**
-     * (experimental) Adds CDK modules as test dependencies.
+     * (deprecated) Adds AWS CDK modules as dev dependencies.
      *
      * @param deps names of cdk modules (e.g. `@aws-cdk/aws-lambda`).
-     * @experimental
+     * @deprecated Not supported in v2. For v1, use `project.cdkDeps.addV1DevDependencies()`
      */
     addCdkTestDependencies(...deps: string[]): void;
-    private formatModuleSpec;
 }
 /**
  * @deprecated use `AwsCdkConstructLibraryOptions`