projen 0.42.0 → 0.42.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (106) hide show
  1. package/.jsii +182 -372
  2. package/API.md +32 -165
  3. package/lib/awscdk/auto-discover.d.ts +0 -7
  4. package/lib/awscdk/auto-discover.js +4 -5
  5. package/lib/awscdk/awscdk-app-ts.d.ts +28 -7
  6. package/lib/awscdk/awscdk-app-ts.js +37 -30
  7. package/lib/awscdk/awscdk-construct.d.ts +93 -13
  8. package/lib/awscdk/awscdk-construct.js +87 -49
  9. package/lib/awscdk/cdk-config.js +1 -1
  10. package/lib/awscdk/cdk-tasks.js +1 -1
  11. package/lib/awscdk/index.d.ts +0 -1
  12. package/lib/awscdk/index.js +1 -2
  13. package/lib/awscdk/integration-test.js +1 -1
  14. package/lib/awscdk/java-app.js +1 -1
  15. package/lib/awscdk/lambda-function.d.ts +1 -8
  16. package/lib/awscdk/lambda-function.js +5 -14
  17. package/lib/cdk/construct-lib.js +1 -1
  18. package/lib/cdk/jsii-docgen.js +1 -1
  19. package/lib/cdk/jsii-project.js +1 -1
  20. package/lib/cdk8s/cdk8s-app-ts.js +1 -1
  21. package/lib/cdk8s/cdk8s-construct.js +1 -1
  22. package/lib/cdktf/cdktf-construct.js +1 -1
  23. package/lib/component.js +1 -1
  24. package/lib/dependencies.js +1 -1
  25. package/lib/dev-env.js +1 -1
  26. package/lib/docker-compose.js +2 -2
  27. package/lib/file.js +1 -1
  28. package/lib/gitattributes.js +1 -1
  29. package/lib/github/auto-approve.js +1 -1
  30. package/lib/github/auto-merge.js +1 -1
  31. package/lib/github/dependabot.js +1 -1
  32. package/lib/github/github-project.js +1 -1
  33. package/lib/github/github.js +1 -1
  34. package/lib/github/mergify.js +1 -1
  35. package/lib/github/pr-template.js +1 -1
  36. package/lib/github/pull-request-lint.js +1 -1
  37. package/lib/github/stale.js +1 -1
  38. package/lib/github/task-workflow.js +1 -1
  39. package/lib/github/workflows.js +1 -1
  40. package/lib/gitpod.js +1 -1
  41. package/lib/ignore-file.js +1 -1
  42. package/lib/ini.js +1 -1
  43. package/lib/java/java-project.js +1 -1
  44. package/lib/java/junit.js +1 -1
  45. package/lib/java/maven-compile.js +1 -1
  46. package/lib/java/maven-packaging.js +1 -1
  47. package/lib/java/maven-sample.js +1 -1
  48. package/lib/java/pom.js +1 -1
  49. package/lib/java/projenrc.js +1 -1
  50. package/lib/javascript/bundler.js +1 -1
  51. package/lib/javascript/eslint.js +1 -1
  52. package/lib/javascript/jest.js +1 -1
  53. package/lib/javascript/node-package.js +1 -1
  54. package/lib/javascript/node-project.js +1 -1
  55. package/lib/javascript/npm-config.js +1 -1
  56. package/lib/javascript/projenrc.js +1 -1
  57. package/lib/javascript/typescript-config.js +1 -1
  58. package/lib/javascript/upgrade-dependencies.js +2 -2
  59. package/lib/json.js +1 -1
  60. package/lib/license.js +1 -1
  61. package/lib/logger.js +1 -1
  62. package/lib/makefile.js +1 -1
  63. package/lib/object-file.js +1 -1
  64. package/lib/project-build.js +1 -1
  65. package/lib/project.js +1 -1
  66. package/lib/projects.js +1 -1
  67. package/lib/projenrc-json.js +1 -1
  68. package/lib/python/pip.js +1 -1
  69. package/lib/python/poetry.js +2 -2
  70. package/lib/python/projenrc.js +1 -1
  71. package/lib/python/pytest.js +1 -1
  72. package/lib/python/python-project.js +1 -1
  73. package/lib/python/python-sample.js +1 -1
  74. package/lib/python/requirements-file.js +1 -1
  75. package/lib/python/setuppy.js +1 -1
  76. package/lib/python/setuptools.js +1 -1
  77. package/lib/python/venv.js +1 -1
  78. package/lib/readme.js +1 -1
  79. package/lib/release/publisher.js +1 -1
  80. package/lib/release/release-trigger.js +1 -1
  81. package/lib/release/release.js +1 -1
  82. package/lib/sample-file.js +2 -2
  83. package/lib/semver.js +1 -1
  84. package/lib/source-code.js +1 -1
  85. package/lib/task-runtime.js +1 -1
  86. package/lib/task.js +1 -1
  87. package/lib/tasks.js +1 -1
  88. package/lib/testing.js +1 -1
  89. package/lib/textfile.js +1 -1
  90. package/lib/toml.js +1 -1
  91. package/lib/typescript/projenrc.js +1 -1
  92. package/lib/typescript/typescript-typedoc.js +1 -1
  93. package/lib/typescript/typescript.js +3 -3
  94. package/lib/version.js +1 -1
  95. package/lib/vscode/devcontainer.js +1 -1
  96. package/lib/vscode/launch-config.js +1 -1
  97. package/lib/vscode/vscode.js +1 -1
  98. package/lib/web/next.js +3 -3
  99. package/lib/web/postcss.js +1 -1
  100. package/lib/web/react.js +4 -4
  101. package/lib/web/tailwind.js +1 -1
  102. package/lib/xmlfile.js +1 -1
  103. package/lib/yaml.js +1 -1
  104. package/package.json +1 -1
  105. package/lib/awscdk/awscdk-deps.d.ts +0 -157
  106. package/lib/awscdk/awscdk-deps.js +0 -163
@@ -5,11 +5,10 @@ exports.AwsCdkTypeScriptApp = void 0;
5
5
  const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
6
6
  const path = require("path");
7
7
  const fs = require("fs-extra");
8
+ const semver = require("semver");
8
9
  const component_1 = require("../component");
9
- const dependencies_1 = require("../dependencies");
10
10
  const typescript_1 = require("../typescript");
11
11
  const auto_discover_1 = require("./auto-discover");
12
- const awscdk_deps_1 = require("./awscdk-deps");
13
12
  const cdk_config_1 = require("./cdk-config");
14
13
  const cdk_tasks_1 = require("./cdk-tasks");
15
14
  /**
@@ -23,7 +22,7 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
23
22
  * @experimental
24
23
  */
25
24
  constructor(options) {
26
- var _b, _c, _d, _e, _f, _g;
25
+ var _b, _c, _d, _e, _f, _g, _h, _j, _k;
27
26
  super({
28
27
  ...options,
29
28
  sampleCode: false,
@@ -34,25 +33,35 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
34
33
  addToPreCompile: false,
35
34
  },
36
35
  });
37
- this.cdkDeps = new awscdk_deps_1.AwsCdkDeps(this, {
38
- dependencyType: dependencies_1.DependencyType.RUNTIME,
39
- ...options,
40
- });
41
36
  this.appEntrypoint = (_b = options.appEntrypoint) !== null && _b !== void 0 ? _b : 'main.ts';
37
+ this.cdkVersion = options.cdkVersionPinning ? options.cdkVersion : `^${options.cdkVersion}`;
42
38
  // CLI
43
- this.addDevDeps(`aws-cdk@${this.cdkDeps.cdkVersion}`);
39
+ this.addDevDeps(this.formatModuleSpec('aws-cdk'));
40
+ this.addCdkDependency('@aws-cdk/assert');
41
+ if (!this.cdkVersion) {
42
+ throw new Error('Required field cdkVersion is not specified.');
43
+ }
44
+ const cdkMajorVersion = (_d = (_c = semver.minVersion(this.cdkVersion)) === null || _c === void 0 ? void 0 : _c.major) !== null && _d !== void 0 ? _d : 1;
45
+ if (cdkMajorVersion < 2) {
46
+ this.addCdkDependency('@aws-cdk/core');
47
+ }
48
+ else {
49
+ this.addCdkDependency('aws-cdk-lib');
50
+ this.addDeps('constructs@^10.0.5');
51
+ }
52
+ this.addCdkDependency(...(_e = options.cdkDependencies) !== null && _e !== void 0 ? _e : []);
44
53
  // no compile step because we do all of it in typescript directly
45
54
  this.compileTask.reset();
46
55
  this.cdkTasks = new cdk_tasks_1.CdkTasks(this);
47
56
  // add synth to the build
48
57
  this.postCompileTask.spawn(this.cdkTasks.synth);
49
- const tsConfigFile = (_c = this.tsconfig) === null || _c === void 0 ? void 0 : _c.fileName;
58
+ const tsConfigFile = (_f = this.tsconfig) === null || _f === void 0 ? void 0 : _f.fileName;
50
59
  if (!tsConfigFile) {
51
60
  throw new Error('Expecting tsconfig.json');
52
61
  }
53
62
  this.cdkConfig = new cdk_config_1.CdkConfig(this, {
54
63
  app: `npx ts-node -P ${tsConfigFile} --prefer-ts-exts ${path.posix.join(this.srcdir, this.appEntrypoint)}`,
55
- featureFlags: this.cdkDeps.cdkMajorVersion < 2,
64
+ featureFlags: cdkMajorVersion < 2,
56
65
  buildCommand: this.runTaskCommand(this.bundler.bundleTask),
57
66
  watchIncludes: [
58
67
  `${this.srcdir}/**/*.ts`,
@@ -71,32 +80,25 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
71
80
  ...options,
72
81
  });
73
82
  this.gitignore.exclude('.parcel-cache/');
74
- (_d = this.npmignore) === null || _d === void 0 ? void 0 : _d.exclude(`${this.cdkConfig.cdkout}/`);
75
- (_e = this.npmignore) === null || _e === void 0 ? void 0 : _e.exclude('.cdk.staging/');
83
+ (_g = this.npmignore) === null || _g === void 0 ? void 0 : _g.exclude(`${this.cdkConfig.cdkout}/`);
84
+ (_h = this.npmignore) === null || _h === void 0 ? void 0 : _h.exclude('.cdk.staging/');
76
85
  if (this.tsconfig) {
77
86
  this.tsconfig.exclude.push(this.cdkConfig.cdkout);
78
87
  }
79
88
  this.addDevDeps('ts-node@^9');
80
- if ((_f = options.sampleCode) !== null && _f !== void 0 ? _f : true) {
81
- new SampleCode(this, this.cdkDeps.cdkMajorVersion);
89
+ if ((_j = options.sampleCode) !== null && _j !== void 0 ? _j : true) {
90
+ new SampleCode(this, cdkMajorVersion);
82
91
  }
83
- const lambdaAutoDiscover = (_g = options.lambdaAutoDiscover) !== null && _g !== void 0 ? _g : true;
92
+ const lambdaAutoDiscover = (_k = options.lambdaAutoDiscover) !== null && _k !== void 0 ? _k : true;
84
93
  if (lambdaAutoDiscover) {
85
94
  new auto_discover_1.AutoDiscover(this, {
86
95
  srcdir: this.srcdir,
87
96
  testdir: this.testdir,
88
97
  lambdaOptions: options.lambdaOptions,
89
98
  tsconfigPath: this.tsconfigDev.fileName,
90
- cdkDeps: this.cdkDeps,
91
99
  });
92
100
  }
93
101
  }
94
- /**
95
- * (experimental) The CDK version this app is using.
96
- *
97
- * @experimental
98
- */
99
- get cdkVersion() { return this.cdkDeps.cdkVersion; }
100
102
  /**
101
103
  * (experimental) Adds an AWS CDK module dependencies.
102
104
  *
@@ -104,12 +106,18 @@ class AwsCdkTypeScriptApp extends typescript_1.TypeScriptAppProject {
104
106
  * @experimental
105
107
  */
106
108
  addCdkDependency(...modules) {
107
- return this.cdkDeps.addV1Dependencies(...modules);
109
+ if (modules.length === 0) {
110
+ return;
111
+ }
112
+ this.addDeps(...modules.map(m => this.formatModuleSpec(m)));
113
+ }
114
+ formatModuleSpec(module) {
115
+ return `${module}@${this.cdkVersion}`;
108
116
  }
109
117
  }
110
118
  exports.AwsCdkTypeScriptApp = AwsCdkTypeScriptApp;
111
119
  _a = JSII_RTTI_SYMBOL_1;
112
- AwsCdkTypeScriptApp[_a] = { fqn: "projen.awscdk.AwsCdkTypeScriptApp", version: "0.42.0" };
120
+ AwsCdkTypeScriptApp[_a] = { fqn: "projen.awscdk.AwsCdkTypeScriptApp", version: "0.42.1" };
113
121
  class SampleCode extends component_1.Component {
114
122
  constructor(project, cdkMajorVersion) {
115
123
  super(project);
@@ -161,25 +169,24 @@ app.synth();`;
161
169
  const testImports = new Array();
162
170
  if (this.cdkMajorVersion < 2) {
163
171
  testImports.push('import { App } from \'@aws-cdk/core\';');
164
- testImports.push('import { Template } from \'@aws-cdk/assertions\';');
165
172
  }
166
173
  else {
167
174
  testImports.push('import { App } from \'aws-cdk-lib\';');
168
- testImports.push('import { Template } from \'aws-cdk-lib/assertions\';');
169
175
  }
170
176
  const appEntrypointName = path.basename(this.appProject.appEntrypoint, '.ts');
171
- const testCode = `${testImports.join('\n')}
177
+ const testCode = `import '@aws-cdk/assert/jest';
178
+ ${testImports.join('\n')}
172
179
  import { MyStack } from '../src/${appEntrypointName}';
173
180
 
174
181
  test('Snapshot', () => {
175
182
  const app = new App();
176
183
  const stack = new MyStack(app, 'test');
177
184
 
178
- const template = Template.fromStack(stack);
179
- expect(template.toJSON()).toMatchSnapshot();
185
+ expect(stack).not.toHaveResource('AWS::S3::Bucket');
186
+ expect(app.synth().getStackArtifact(stack.artifactId).template).toMatchSnapshot();
180
187
  });`;
181
188
  fs.mkdirpSync(testdir);
182
189
  fs.writeFileSync(path.join(testdir, `${appEntrypointName}.test.ts`), testCode);
183
190
  }
184
191
  }
185
- //# 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"]}
192
+ //# 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"]}
@@ -1,12 +1,83 @@
1
1
  import { ConstructLibrary, ConstructLibraryOptions } from '../cdk';
2
- import { AwsCdkDeps, AwsCdkDepsCommonOptions } from './awscdk-deps';
3
2
  import { LambdaFunctionCommonOptions } from './lambda-function';
4
3
  /**
5
- * (experimental) Options for `AwsCdkConstructLibrary`.
4
+ * (experimental) Options for the construct-lib-aws project.
6
5
  *
7
6
  * @experimental
8
7
  */
9
- export interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions, AwsCdkDepsCommonOptions {
8
+ export interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions {
9
+ /**
10
+ * (experimental) Minimum target version this library is tested against.
11
+ *
12
+ * @default "2.0.0"
13
+ * @experimental
14
+ * @featured true
15
+ */
16
+ readonly cdkVersion: string;
17
+ /**
18
+ * (experimental) Minimum target version of constructs being tested against. If not provided, the default value depends on the configured `cdkVersion`:.
19
+ *
20
+ * - For CDK 1.x, the default is "3.2.27"
21
+ * - For CDK 2.x, the default is "10.0.5"
22
+ * - Otherwise, the default is "*"
23
+ *
24
+ * @default - When the default behavior is used, the dependency on `constructs` will
25
+ * be added as both a `peerDependency` and a `devDependency`.
26
+ * @experimental
27
+ */
28
+ readonly constructsVersion?: string;
29
+ /**
30
+ * (experimental) Use pinned version instead of caret version for CDK.
31
+ *
32
+ * You can use this to prevent yarn to mix versions for your CDK dependencies and to prevent auto-updates.
33
+ * If you use experimental features this will let you define the moment you include breaking changes.
34
+ *
35
+ * @default false
36
+ * @experimental
37
+ */
38
+ readonly cdkVersionPinning?: boolean;
39
+ /**
40
+ * (deprecated) Which AWS CDK modules (those that start with "@aws-cdk/") does this library require when consumed?
41
+ *
42
+ * @deprecated - For CDK 2.x use 'peerDeps' instead
43
+ */
44
+ readonly cdkDependencies?: string[];
45
+ /**
46
+ * (deprecated) If this is enabled (default), all modules declared in `cdkDependencies` will be also added as normal `dependencies` (as well as `peerDependencies`).
47
+ *
48
+ * This is to ensure that downstream consumers actually have your CDK dependencies installed
49
+ * when using npm < 7 or yarn, where peer dependencies are not automatically installed.
50
+ * If this is disabled, `cdkDependencies` will be added to `devDependencies` to ensure
51
+ * they are present during development.
52
+ *
53
+ * @default true
54
+ * @deprecated - Not used for CDK 2.x
55
+ */
56
+ readonly cdkDependenciesAsDeps?: boolean;
57
+ /**
58
+ * (deprecated) Install the @aws-cdk/assert library?
59
+ *
60
+ * @default false
61
+ * @deprecated - use cdkAssertions instead
62
+ */
63
+ readonly cdkAssert?: boolean;
64
+ /**
65
+ * (experimental) Install the @aws-cdk/assertions library?
66
+ *
67
+ * Only needed for CDK 1.x. If using CDK 2.x then
68
+ * assertions is already included in 'aws-cdk-lib'
69
+ *
70
+ * @default true
71
+ * @experimental
72
+ */
73
+ readonly cdkAssertions?: boolean;
74
+ /**
75
+ * (deprecated) AWS CDK modules required for testing.
76
+ *
77
+ * @deprecated - For CDK 2.x use 'devDeps' instead
78
+ * @featured true
79
+ */
80
+ readonly cdkTestDependencies?: string[];
10
81
  /**
11
82
  * (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.
12
83
  *
@@ -34,39 +105,48 @@ export interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions,
34
105
  */
35
106
  export declare class AwsCdkConstructLibrary extends ConstructLibrary {
36
107
  /**
108
+ * (experimental) The target CDK version for this library.
109
+ *
37
110
  * @experimental
38
111
  */
39
- readonly cdkDeps: AwsCdkDeps;
112
+ readonly cdkVersion: string;
40
113
  /**
114
+ * (experimental) Whether CDK dependencies are added as normal dependencies (and peer dependencies).
115
+ *
41
116
  * @experimental
42
117
  */
43
- constructor(options: AwsCdkConstructLibraryOptions);
118
+ readonly cdkDependenciesAsDeps: boolean;
44
119
  /**
45
- * (experimental) The target CDK version for this library.
46
- *
47
120
  * @experimental
48
121
  */
49
- get cdkVersion(): string;
122
+ constructor(options: AwsCdkConstructLibraryOptions);
50
123
  /**
51
124
  * @deprecated use `cdkVersion`
52
125
  */
53
126
  get version(): string;
54
127
  /**
55
- * (deprecated) Adds dependencies to AWS CDK modules.
128
+ * (experimental) Adds CDK modules as runtime dependencies.
56
129
  *
57
- * Since this is a library project, dependencies will be added as peer dependencies.
130
+ * Modules are currently by default added with a caret CDK version both as "dependencies"
131
+ * and "peerDependencies". This is because currently npm would not
132
+ * automatically install peer dependencies that are not declared as concerete
133
+ * dependencies by the consumer, so this is a little npm "hack" so that
134
+ * consumers will not need to depend on them directly if they don't interact
135
+ * with them.
136
+ * See `cdkDependenciesAsDeps` for changing the default behavior.
58
137
  *
59
138
  * @param deps names of cdk modules (e.g. `@aws-cdk/aws-lambda`).
60
- * @deprecated Not supported in v2. For v1, use `project.cdkDeps.addV1Dependencies()`
139
+ * @experimental
61
140
  */
62
141
  addCdkDependencies(...deps: string[]): void;
63
142
  /**
64
- * (deprecated) Adds AWS CDK modules as dev dependencies.
143
+ * (experimental) Adds CDK modules as test dependencies.
65
144
  *
66
145
  * @param deps names of cdk modules (e.g. `@aws-cdk/aws-lambda`).
67
- * @deprecated Not supported in v2. For v1, use `project.cdkDeps.addV1DevDependencies()`
146
+ * @experimental
68
147
  */
69
148
  addCdkTestDependencies(...deps: string[]): void;
149
+ private formatModuleSpec;
70
150
  }
71
151
  /**
72
152
  * @deprecated use `AwsCdkConstructLibraryOptions`
@@ -5,9 +5,7 @@ exports.ConstructLibraryAws = exports.AwsCdkConstructLibrary = void 0;
5
5
  const JSII_RTTI_SYMBOL_1 = Symbol.for("jsii.rtti");
6
6
  const semver = require("semver");
7
7
  const cdk_1 = require("../cdk");
8
- const dependencies_1 = require("../dependencies");
9
8
  const auto_discover_1 = require("./auto-discover");
10
- const awscdk_deps_1 = require("./awscdk-deps");
11
9
  /**
12
10
  * (experimental) AWS CDK construct library project.
13
11
  *
@@ -23,37 +21,80 @@ class AwsCdkConstructLibrary extends cdk_1.ConstructLibrary {
23
21
  * @experimental
24
22
  */
25
23
  constructor(options) {
26
- var _c, _d, _e;
27
- const cdkVersion = options.cdkVersion;
24
+ var _c, _d, _e, _f, _g, _h, _j, _k, _l;
25
+ const cdkVersion = options.cdkVersionPinning ? options.cdkVersion : `^${options.cdkVersion}`;
28
26
  const cdkMajorVersion = (_d = (_c = semver.minVersion(cdkVersion)) === null || _c === void 0 ? void 0 : _c.major) !== null && _d !== void 0 ? _d : 2;
29
27
  super({
30
- workflowContainerImage: determineWorkflowContainerImage(options, cdkMajorVersion),
28
+ peerDependencyOptions: cdkMajorVersion === 1 ? {
29
+ pinnedDevDependency: false,
30
+ } : undefined,
31
31
  ...options,
32
32
  });
33
- this.cdkDeps = new awscdk_deps_1.AwsCdkDeps(this, {
34
- // since this we are a library, dependencies should be added a peers
35
- dependencyType: dependencies_1.DependencyType.PEER,
36
- ...options,
37
- });
38
- const lambdaAutoDiscover = (_e = options.lambdaAutoDiscover) !== null && _e !== void 0 ? _e : true;
33
+ this.cdkVersion = cdkVersion;
34
+ this.cdkDependenciesAsDeps = (_e = options.cdkDependenciesAsDeps) !== null && _e !== void 0 ? _e : true;
35
+ switch (cdkMajorVersion) {
36
+ case 1:
37
+ if (options.cdkAssert) {
38
+ this.addDevDeps(this.formatModuleSpec('@aws-cdk/assert'));
39
+ }
40
+ if ((_f = options.cdkAssertions) !== null && _f !== void 0 ? _f : true) {
41
+ this.addDevDeps(this.formatModuleSpec('@aws-cdk/assertions'));
42
+ }
43
+ // CDK 1.x is built on constructs 3.x
44
+ if (options.constructsVersion) {
45
+ const constructsMajorVersion = (_g = semver.minVersion(options.constructsVersion)) === null || _g === void 0 ? void 0 : _g.major;
46
+ if (constructsMajorVersion !== undefined && constructsMajorVersion >= 10) {
47
+ throw new Error('CDK 1.x requires constructs version < 10');
48
+ }
49
+ this.addPeerDeps(`constructs@^${options.constructsVersion}`);
50
+ }
51
+ else {
52
+ this.addPeerDeps('constructs@^3.2.27');
53
+ }
54
+ this.addCdkDependencies(...(_h = options.cdkDependencies) !== null && _h !== void 0 ? _h : []);
55
+ this.addCdkTestDependencies(...(_j = options.cdkTestDependencies) !== null && _j !== void 0 ? _j : []);
56
+ break;
57
+ case 2:
58
+ if (options.cdkAssert !== undefined) {
59
+ throw new Error('cdkAssert is not used for CDK 2.x. Use the assertions library that is provided in aws-cdk-lib');
60
+ }
61
+ if (options.cdkDependencies !== undefined) {
62
+ throw new Error('cdkDependencies is not used for CDK 2.x. Use "peerDeps" instead');
63
+ }
64
+ if (options.cdkDependenciesAsDeps !== undefined) {
65
+ throw new Error('cdkDependenciesAsDeps is not used for CDK 2.x');
66
+ }
67
+ if (options.cdkTestDependencies !== undefined) {
68
+ throw new Error('cdkTestDependencies is not used for CDK 2.x. Use "devDeps" instead');
69
+ }
70
+ // CDK 2.x is built on constructs 10.x
71
+ if (options.constructsVersion) {
72
+ const constructsMajorVersion = (_k = semver.minVersion(options.constructsVersion)) === null || _k === void 0 ? void 0 : _k.major;
73
+ if (constructsMajorVersion !== undefined && constructsMajorVersion < 10) {
74
+ throw new Error('CDK 2.x requires constructs version >= 10');
75
+ }
76
+ this.addPeerDeps(`constructs@^${options.constructsVersion}`);
77
+ }
78
+ else {
79
+ this.addPeerDeps('constructs@^10.0.5');
80
+ }
81
+ this.addPeerDeps(`aws-cdk-lib@${this.cdkVersion}`);
82
+ break;
83
+ default:
84
+ // Otherwise, let the user manage which version they use
85
+ this.addPeerDeps('constructs');
86
+ break;
87
+ }
88
+ const lambdaAutoDiscover = (_l = options.lambdaAutoDiscover) !== null && _l !== void 0 ? _l : true;
39
89
  if (lambdaAutoDiscover) {
40
90
  new auto_discover_1.AutoDiscover(this, {
41
91
  srcdir: this.srcdir,
42
92
  testdir: this.testdir,
43
93
  lambdaOptions: options.lambdaOptions,
44
94
  tsconfigPath: this.tsconfigDev.fileName,
45
- cdkDeps: this.cdkDeps,
46
95
  });
47
96
  }
48
97
  }
49
- /**
50
- * (experimental) The target CDK version for this library.
51
- *
52
- * @experimental
53
- */
54
- get cdkVersion() {
55
- return this.cdkDeps.cdkVersion;
56
- }
57
98
  /**
58
99
  * @deprecated use `cdkVersion`
59
100
  */
@@ -61,48 +102,45 @@ class AwsCdkConstructLibrary extends cdk_1.ConstructLibrary {
61
102
  return this.cdkVersion;
62
103
  }
63
104
  /**
64
- * (deprecated) Adds dependencies to AWS CDK modules.
105
+ * (experimental) Adds CDK modules as runtime dependencies.
65
106
  *
66
- * Since this is a library project, dependencies will be added as peer dependencies.
107
+ * Modules are currently by default added with a caret CDK version both as "dependencies"
108
+ * and "peerDependencies". This is because currently npm would not
109
+ * automatically install peer dependencies that are not declared as concerete
110
+ * dependencies by the consumer, so this is a little npm "hack" so that
111
+ * consumers will not need to depend on them directly if they don't interact
112
+ * with them.
113
+ * See `cdkDependenciesAsDeps` for changing the default behavior.
67
114
  *
68
115
  * @param deps names of cdk modules (e.g. `@aws-cdk/aws-lambda`).
69
- * @deprecated Not supported in v2. For v1, use `project.cdkDeps.addV1Dependencies()`
116
+ * @experimental
70
117
  */
71
118
  addCdkDependencies(...deps) {
72
- return this.cdkDeps.addV1Dependencies(...deps);
119
+ // this ugliness will go away in cdk v2.0
120
+ this.addPeerDeps(...deps.map(m => this.formatModuleSpec(m)));
121
+ if (this.cdkDependenciesAsDeps) {
122
+ this.addDeps(...deps.map(m => this.formatModuleSpec(m)));
123
+ }
124
+ else {
125
+ this.addDevDeps(...deps.map(m => this.formatModuleSpec(m)));
126
+ }
73
127
  }
74
128
  /**
75
- * (deprecated) Adds AWS CDK modules as dev dependencies.
129
+ * (experimental) Adds CDK modules as test dependencies.
76
130
  *
77
131
  * @param deps names of cdk modules (e.g. `@aws-cdk/aws-lambda`).
78
- * @deprecated Not supported in v2. For v1, use `project.cdkDeps.addV1DevDependencies()`
132
+ * @experimental
79
133
  */
80
134
  addCdkTestDependencies(...deps) {
81
- return this.cdkDeps.addV1DevDependencies(...deps);
135
+ this.addDevDeps(...deps.map(m => this.formatModuleSpec(m)));
136
+ }
137
+ formatModuleSpec(module) {
138
+ return `${module}@${this.cdkVersion}`;
82
139
  }
83
140
  }
84
141
  exports.AwsCdkConstructLibrary = AwsCdkConstructLibrary;
85
142
  _a = JSII_RTTI_SYMBOL_1;
86
- AwsCdkConstructLibrary[_a] = { fqn: "projen.awscdk.AwsCdkConstructLibrary", version: "0.42.0" };
87
- function determineWorkflowContainerImage(options, cdkMajorVersion) {
88
- // if the user specifies the workflow container image explicitly, use that
89
- if (options.workflowContainerImage) {
90
- return options.workflowContainerImage;
91
- }
92
- // if the user specifies minimum node version, then JsiiProject will take care of
93
- // determining the workflow container image from that, so we return "undefined"
94
- if (options.minNodeVersion) {
95
- return undefined;
96
- }
97
- // otherwise, choose a workflow container image based on the CDK version
98
- if (cdkMajorVersion === 1) {
99
- return 'jsii/superchain:1-buster-slim';
100
- }
101
- if (cdkMajorVersion === 2) {
102
- return 'jsii/superchain:1-buster-slim-node14';
103
- }
104
- return undefined;
105
- }
143
+ AwsCdkConstructLibrary[_a] = { fqn: "projen.awscdk.AwsCdkConstructLibrary", version: "0.42.1" };
106
144
  /**
107
145
  * @deprecated use `AwsCdkConstructLibrary`
108
146
  */
@@ -110,5 +148,5 @@ class ConstructLibraryAws extends AwsCdkConstructLibrary {
110
148
  }
111
149
  exports.ConstructLibraryAws = ConstructLibraryAws;
112
150
  _b = JSII_RTTI_SYMBOL_1;
113
- ConstructLibraryAws[_b] = { fqn: "projen.awscdk.ConstructLibraryAws", version: "0.42.0" };
114
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awscdk-construct.js","sourceRoot":"","sources":["../../src/awscdk/awscdk-construct.ts"],"names":[],"mappings":";;;;;AAAA,iCAAiC;AACjC,gCAAmE;AACnE,kDAAiD;AACjD,mDAA+C;AAC/C,+CAAoE;;;;;;;;;;;AAapE,MAAa,sBAAuB,SAAQ,sBAAgB;;;;IAG1D,YAAY,OAAsC;;QAChD,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,MAAM,eAAe,eAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,0CAAE,KAAK,mCAAI,CAAC,CAAC;QAElE,KAAK,CAAC;YACJ,sBAAsB,EAAE,+BAA+B,CAAC,OAAO,EAAE,eAAe,CAAC;YACjF,GAAG,OAAO;SACX,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,GAAG,IAAI,wBAAU,CAAC,IAAI,EAAE;YAClC,oEAAoE;YACpE,cAAc,EAAE,6BAAc,CAAC,IAAI;YACnC,GAAG,OAAO;SACX,CAAC,CAAC;QAEH,MAAM,kBAAkB,SAAG,OAAO,CAAC,kBAAkB,mCAAI,IAAI,CAAC;QAC9D,IAAI,kBAAkB,EAAE;YACtB,IAAI,4BAAY,CAAC,IAAI,EAAE;gBACrB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,aAAa,EAAE,OAAO,CAAC,aAAa;gBACpC,YAAY,EAAE,IAAI,CAAC,WAAW,CAAC,QAAQ;gBACvC,OAAO,EAAE,IAAI,CAAC,OAAO;aACtB,CAAC,CAAC;SACJ;IACH,CAAC;;;;;;IAGD,IAAW,UAAU;QACnB,OAAO,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC;IACjC,CAAC;;;;IAGD,IAAW,OAAO;QAChB,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;;;;;;;;;IAGM,kBAAkB,CAAC,GAAG,IAAc;QACzC,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,IAAI,CAAC,CAAC;IACjD,CAAC;;;;;;;IAGM,sBAAsB,CAAC,GAAG,IAAc;QAC7C,OAAO,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,GAAG,IAAI,CAAC,CAAC;IACpD,CAAC;;AAhDH,wDAiDC;;;AAED,SAAS,+BAA+B,CAAC,OAAsC,EAAE,eAAuB;IACtG,0EAA0E;IAC1E,IAAI,OAAO,CAAC,sBAAsB,EAAE;QAClC,OAAO,OAAO,CAAC,sBAAsB,CAAC;KACvC;IAED,iFAAiF;IACjF,+EAA+E;IAC/E,IAAI,OAAO,CAAC,cAAc,EAAE;QAC1B,OAAO,SAAS,CAAC;KAClB;IAED,wEAAwE;IACxE,IAAI,eAAe,KAAK,CAAC,EAAE;QACzB,OAAO,+BAA+B,CAAC;KACxC;IAED,IAAI,eAAe,KAAK,CAAC,EAAE;QACzB,OAAO,sCAAsC,CAAC;KAC/C;IAED,OAAO,SAAS,CAAC;AACnB,CAAC;;;;AAMD,MAAa,mBAAoB,SAAQ,sBAAsB;;AAA/D,kDAAmE","sourcesContent":["import * as semver from 'semver';\nimport { ConstructLibrary, ConstructLibraryOptions } from '../cdk';\nimport { DependencyType } from '../dependencies';\nimport { AutoDiscover } from './auto-discover';\nimport { AwsCdkDeps, AwsCdkDepsCommonOptions } from './awscdk-deps';\nimport { LambdaFunctionCommonOptions } from './lambda-function';\n\n                                                \nexport interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions, AwsCdkDepsCommonOptions {\n                                                                                                                                                                                                                                                                                                             \n  readonly lambdaAutoDiscover?: boolean;\n\n                                                                                                      \n  readonly lambdaOptions?: LambdaFunctionCommonOptions;\n}\n\n                                                                                                                                                                                                                                                                     \nexport class AwsCdkConstructLibrary extends ConstructLibrary {\n  public readonly cdkDeps: AwsCdkDeps;\n\n  constructor(options: AwsCdkConstructLibraryOptions) {\n    const cdkVersion = options.cdkVersion;\n    const cdkMajorVersion = semver.minVersion(cdkVersion)?.major ?? 2;\n\n    super({\n      workflowContainerImage: determineWorkflowContainerImage(options, cdkMajorVersion),\n      ...options,\n    });\n\n    this.cdkDeps = new AwsCdkDeps(this, {\n      // since this we are a library, dependencies should be added a peers\n      dependencyType: DependencyType.PEER,\n      ...options,\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 get cdkVersion() {\n    return this.cdkDeps.cdkVersion;\n  }\n\n                                             \n  public get version() {\n    return this.cdkVersion;\n  }\n\n                                                                                                                                                                                                                                                                                                                   \n  public addCdkDependencies(...deps: string[]) {\n    return this.cdkDeps.addV1Dependencies(...deps);\n  }\n\n                                                                                                                                                                                                                              \n  public addCdkTestDependencies(...deps: string[]) {\n    return this.cdkDeps.addV1DevDependencies(...deps);\n  }\n}\n\nfunction determineWorkflowContainerImage(options: AwsCdkConstructLibraryOptions, cdkMajorVersion: number): string | undefined {\n  // if the user specifies the workflow container image explicitly, use that\n  if (options.workflowContainerImage) {\n    return options.workflowContainerImage;\n  }\n\n  // if the user specifies minimum node version, then JsiiProject will take care of\n  // determining the workflow container image from that, so we return \"undefined\"\n  if (options.minNodeVersion) {\n    return undefined;\n  }\n\n  // otherwise, choose a workflow container image based on the CDK version\n  if (cdkMajorVersion === 1) {\n    return 'jsii/superchain:1-buster-slim';\n  }\n\n  if (cdkMajorVersion === 2) {\n    return 'jsii/superchain:1-buster-slim-node14';\n  }\n\n  return undefined;\n}\n\n                                                      \nexport interface ConstructLibraryAwsOptions extends AwsCdkConstructLibraryOptions { }\n\n                                               \nexport class ConstructLibraryAws extends AwsCdkConstructLibrary { }\n\n\n"]}
151
+ ConstructLibraryAws[_b] = { fqn: "projen.awscdk.ConstructLibraryAws", version: "0.42.1" };
152
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"awscdk-construct.js","sourceRoot":"","sources":["../../src/awscdk/awscdk-construct.ts"],"names":[],"mappings":"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","sourcesContent":["import * as semver from 'semver';\nimport { ConstructLibrary, ConstructLibraryOptions } from '../cdk';\nimport { AutoDiscover } from './auto-discover';\nimport { LambdaFunctionCommonOptions } from './lambda-function';\n\n                                                     \nexport interface AwsCdkConstructLibraryOptions extends ConstructLibraryOptions {\n                                                                                                                 \n  readonly cdkVersion: string;\n\n                                                                                                                                                                                                                                                                                                                                                                                                                                                         \n  readonly constructsVersion?: string;\n\n                                                                                                                                                                                                                                                                                                                        \n  readonly cdkVersionPinning?: boolean;\n\n                                                                                                                                                                                   \n  readonly cdkDependencies?: string[];\n\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           \n  readonly cdkDependenciesAsDeps?: boolean;\n\n                                                                                                                           \n  readonly cdkAssert?: boolean;\n\n                                                                                                                                                                                               \n  readonly cdkAssertions?: boolean;\n\n                                                                                                                                         \n  readonly cdkTestDependencies?: string[];\n\n                                                                                                                                                                                                                                                                                                             \n  readonly lambdaAutoDiscover?: boolean;\n\n                                                                                                      \n  readonly lambdaOptions?: LambdaFunctionCommonOptions;\n}\n\n                                                                                                                                                                                                                                                                     \nexport class AwsCdkConstructLibrary extends ConstructLibrary {\n                                                         \n  public readonly cdkVersion: string;\n\n                                                                                                   \n  public readonly cdkDependenciesAsDeps: boolean;\n\n  constructor(options: AwsCdkConstructLibraryOptions) {\n    const cdkVersion = options.cdkVersionPinning ? options.cdkVersion : `^${options.cdkVersion}`;\n    const cdkMajorVersion = semver.minVersion(cdkVersion)?.major ?? 2;\n    super({\n      peerDependencyOptions: cdkMajorVersion === 1 ? {\n        pinnedDevDependency: false,\n      } : undefined,\n      ...options,\n    });\n\n    this.cdkVersion = cdkVersion;\n\n    this.cdkDependenciesAsDeps = options.cdkDependenciesAsDeps ?? true;\n\n    switch (cdkMajorVersion) {\n      case 1:\n        if (options.cdkAssert) {\n          this.addDevDeps(this.formatModuleSpec('@aws-cdk/assert'));\n        }\n        if (options.cdkAssertions ?? true) {\n          this.addDevDeps(this.formatModuleSpec('@aws-cdk/assertions'));\n        }\n        // CDK 1.x is built on constructs 3.x\n        if (options.constructsVersion) {\n          const constructsMajorVersion = semver.minVersion(options.constructsVersion)?.major;\n          if (constructsMajorVersion !== undefined && constructsMajorVersion >= 10) {\n            throw new Error('CDK 1.x requires constructs version < 10');\n          }\n          this.addPeerDeps(`constructs@^${options.constructsVersion}`);\n        } else {\n          this.addPeerDeps('constructs@^3.2.27');\n        }\n        this.addCdkDependencies(...options.cdkDependencies ?? []);\n        this.addCdkTestDependencies(...options.cdkTestDependencies ?? []);\n        break;\n      case 2:\n        if (options.cdkAssert !== undefined) {\n          throw new Error('cdkAssert is not used for CDK 2.x. Use the assertions library that is provided in aws-cdk-lib');\n        }\n        if (options.cdkDependencies !== undefined) {\n          throw new Error('cdkDependencies is not used for CDK 2.x. Use \"peerDeps\" instead');\n        }\n        if (options.cdkDependenciesAsDeps !== undefined) {\n          throw new Error('cdkDependenciesAsDeps is not used for CDK 2.x');\n        }\n        if (options.cdkTestDependencies !== undefined) {\n          throw new Error('cdkTestDependencies is not used for CDK 2.x. Use \"devDeps\" instead');\n        }\n        // CDK 2.x is built on constructs 10.x\n        if (options.constructsVersion) {\n          const constructsMajorVersion = semver.minVersion(options.constructsVersion)?.major;\n          if (constructsMajorVersion !== undefined && constructsMajorVersion < 10) {\n            throw new Error('CDK 2.x requires constructs version >= 10');\n          }\n          this.addPeerDeps(`constructs@^${options.constructsVersion}`);\n        } else {\n          this.addPeerDeps('constructs@^10.0.5');\n        }\n        this.addPeerDeps(`aws-cdk-lib@${this.cdkVersion}`);\n\n        break;\n      default:\n        // Otherwise, let the user manage which version they use\n        this.addPeerDeps('constructs');\n        break;\n    }\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 get version() {\n    return this.cdkVersion;\n  }\n\n                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      \n  public addCdkDependencies(...deps: string[]) {\n    // this ugliness will go away in cdk v2.0\n    this.addPeerDeps(...deps.map(m => this.formatModuleSpec(m)));\n\n    if (this.cdkDependenciesAsDeps) {\n      this.addDeps(...deps.map(m => this.formatModuleSpec(m)));\n    } else {\n      this.addDevDeps(...deps.map(m => this.formatModuleSpec(m)));\n    }\n  }\n\n                                                                                                                                \n  public addCdkTestDependencies(...deps: string[]) {\n    this.addDevDeps(...deps.map(m => this.formatModuleSpec(m)));\n  }\n\n  private formatModuleSpec(module: string): string {\n    return `${module}@${this.cdkVersion}`;\n  }\n}\n\n                                                      \nexport interface ConstructLibraryAwsOptions extends AwsCdkConstructLibraryOptions { }\n\n                                               \nexport class ConstructLibraryAws extends AwsCdkConstructLibrary { }\n"]}
@@ -46,7 +46,7 @@ class CdkConfig extends component_1.Component {
46
46
  }
47
47
  exports.CdkConfig = CdkConfig;
48
48
  _a = JSII_RTTI_SYMBOL_1;
49
- CdkConfig[_a] = { fqn: "projen.awscdk.CdkConfig", version: "0.42.0" };
49
+ CdkConfig[_a] = { fqn: "projen.awscdk.CdkConfig", version: "0.42.1" };
50
50
  /**
51
51
  * (experimental) Which approval is required when deploying CDK apps.
52
52
  *
@@ -46,5 +46,5 @@ class CdkTasks extends component_1.Component {
46
46
  }
47
47
  exports.CdkTasks = CdkTasks;
48
48
  _a = JSII_RTTI_SYMBOL_1;
49
- CdkTasks[_a] = { fqn: "projen.awscdk.CdkTasks", version: "0.42.0" };
49
+ CdkTasks[_a] = { fqn: "projen.awscdk.CdkTasks", version: "0.42.1" };
50
50
  //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2RrLXRhc2tzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F3c2Nkay9jZGstdGFza3MudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7QUFBQSw0Q0FBeUM7Ozs7OztBQUt6QyxNQUFhLFFBQVMsU0FBUSxxQkFBUzs7OztJQWdCckMsWUFBWSxPQUFnQjs7UUFDMUIsS0FBSyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRWYsSUFBSSxDQUFDLEtBQUssR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sRUFBRTtZQUNwQyxXQUFXLEVBQUUsOERBQThEO1lBQzNFLElBQUksRUFBRSx1QkFBdUI7U0FDOUIsQ0FBQyxDQUFDO1FBRUgsSUFBSSxDQUFDLE1BQU0sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLFFBQVEsRUFBRTtZQUN0QyxXQUFXLEVBQUUsdUNBQXVDO1lBQ3BELElBQUksRUFBRSxZQUFZO1NBQ25CLENBQUMsQ0FBQztRQUVILElBQUksQ0FBQyxPQUFPLEdBQUcsT0FBTyxDQUFDLE9BQU8sQ0FBQyxTQUFTLEVBQUU7WUFDeEMsV0FBVyxFQUFFLHdDQUF3QztZQUNyRCxJQUFJLEVBQUUsYUFBYTtTQUNwQixDQUFDLENBQUM7UUFFSCxJQUFJLENBQUMsSUFBSSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFO1lBQ2xDLFdBQVcsRUFBRSxvREFBb0Q7WUFDakUsSUFBSSxFQUFFLFVBQVU7U0FDakIsQ0FBQyxDQUFDO1FBRUgsMkVBQTJFO1FBQzNFLE1BQU0sS0FBSyxTQUFHLE9BQU8sQ0FBQyxLQUFLLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxtQ0FBSSxPQUFPLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBRXpFLEtBQUssQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNkLEtBQUssQ0FBQyxXQUFXLEdBQUcscUZBQXFGLENBQUM7UUFFMUcsaUVBQWlFO1FBQ2pFLGtEQUFrRDtRQUNsRCxLQUFLLENBQUMsSUFBSSxDQUFDLHNCQUFzQixDQUFDLENBQUM7UUFFbkMsNEJBQTRCO1FBQzVCLEtBQUssQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLENBQUM7UUFFeEIsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7SUFDckIsQ0FBQzs7QUFyREgsNEJBc0RDIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgQ29tcG9uZW50IH0gZnJvbSAnLi4vY29tcG9uZW50JztcbmltcG9ydCB7IFByb2plY3QgfSBmcm9tICcuLi9wcm9qZWN0JztcbmltcG9ydCB7IFRhc2sgfSBmcm9tICcuLi90YXNrJztcblxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuZXhwb3J0IGNsYXNzIENka1Rhc2tzIGV4dGVuZHMgQ29tcG9uZW50IHtcbiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXG4gIHB1YmxpYyByZWFkb25seSBzeW50aDogVGFzaztcblxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICBwdWJsaWMgcmVhZG9ubHkgZGVwbG95OiBUYXNrO1xuXG4gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFxuICBwdWJsaWMgcmVhZG9ubHkgZGVzdHJveTogVGFzaztcblxuICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgcHVibGljIHJlYWRvbmx5IGRpZmY6IFRhc2s7XG5cbiAgICAgICAgICAgICAgICAgICAgICAgICAgICBcbiAgcHVibGljIHJlYWRvbmx5IHdhdGNoOiBUYXNrO1xuXG4gIGNvbnN0cnVjdG9yKHByb2plY3Q6IFByb2plY3QpIHtcbiAgICBzdXBlcihwcm9qZWN0KTtcblxuICAgIHRoaXMuc3ludGggPSBwcm9qZWN0LmFkZFRhc2soJ3N5bnRoJywge1xuICAgICAgZGVzY3JpcHRpb246ICdTeW50aGVzaXplcyB5b3VyIGNkayBhcHAgaW50byBjZGsub3V0IChwYXJ0IG9mIFwieWFybiBidWlsZFwiKScsXG4gICAgICBleGVjOiAnY2RrIHN5bnRoID4gL2Rldi9udWxsJywgLy8gcmVkaXJlY3QgdG8gL2Rldi9udWxsIHRvIGhpZGUgdGVtcGxhdGVcbiAgICB9KTtcblxuICAgIHRoaXMuZGVwbG95ID0gcHJvamVjdC5hZGRUYXNrKCdkZXBsb3knLCB7XG4gICAgICBkZXNjcmlwdGlvbjogJ0RlcGxveXMgeW91ciBDREsgYXBwIHRvIHRoZSBBV1MgY2xvdWQnLFxuICAgICAgZXhlYzogJ2NkayBkZXBsb3knLFxuICAgIH0pO1xuXG4gICAgdGhpcy5kZXN0cm95ID0gcHJvamVjdC5hZGRUYXNrKCdkZXN0cm95Jywge1xuICAgICAgZGVzY3JpcHRpb246ICdEZXN0cm95cyB5b3VyIGNkayBhcHAgaW4gdGhlIEFXUyBjbG91ZCcsXG4gICAgICBleGVjOiAnY2RrIGRlc3Ryb3knLFxuICAgIH0pO1xuXG4gICAgdGhpcy5kaWZmID0gcHJvamVjdC5hZGRUYXNrKCdkaWZmJywge1xuICAgICAgZGVzY3JpcHRpb246ICdEaWZmcyB0aGUgY3VycmVudGx5IGRlcGxveWVkIGFwcCBhZ2FpbnN0IHlvdXIgY29kZScsXG4gICAgICBleGVjOiAnY2RrIGRpZmYnLFxuICAgIH0pO1xuXG4gICAgLy8gdHlwZXNjcmlwdCBwcm9qZWN0cyBhbHJlYWR5IGhhdmUgYSBcIndhdGNoXCIgdGFzaywgd2Ugd2Ugd2lsbCByZXB1cnBvc2UgaXRcbiAgICBjb25zdCB3YXRjaCA9IHByb2plY3QudGFza3MudHJ5RmluZCgnd2F0Y2gnKSA/PyBwcm9qZWN0LmFkZFRhc2soJ3dhdGNoJyk7XG5cbiAgICB3YXRjaC5yZXNldCgpO1xuICAgIHdhdGNoLmRlc2NyaXB0aW9uID0gJ1dhdGNoZXMgY2hhbmdlcyBpbiB5b3VyIHNvdXJjZSBjb2RlIGFuZCByZWJ1aWxkcyBhbmQgZGVwbG95cyB0byB0aGUgY3VycmVudCBhY2NvdW50JztcblxuICAgIC8vIGRlcGxveSBmaXJzdCBiZWNhdXNlIHN1cnByaXNpbmdseSB3YXRjaCBpcyBub3QgZGVwbG95aW5nIGZpcnN0XG4gICAgLy8gc2VlIGh0dHBzOi8vZ2l0aHViLmNvbS9hd3MvYXdzLWNkay9pc3N1ZXMvMTc3NzZcbiAgICB3YXRjaC5leGVjKCdjZGsgZGVwbG95IC0taG90c3dhcCcpO1xuXG4gICAgLy8gbm93IHdlIGFyZSByZWFkeSB0byB3YXRjaFxuICAgIHdhdGNoLmV4ZWMoJ2NkayB3YXRjaCcpO1xuXG4gICAgdGhpcy53YXRjaCA9IHdhdGNoO1xuICB9XG59Il19