Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1344,6 +1344,7 @@ new JsiiBuild(cliLibAlpha, {
packageName: 'awscdkclilibalpha',
},
rosettaStrict: true,
rosettaDependencies: ['aws-cdk-lib@^2'],
stability: Stability.DEPRECATED,
composite: true,
excludeTypescript: CLI_LIB_EXCLUDE_PATTERNS,
Expand Down
2 changes: 2 additions & 0 deletions packages/@aws-cdk/cli-lib-alpha/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions packages/@aws-cdk/cli-lib-alpha/.projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 6 additions & 7 deletions packages/@aws-cdk/cli-lib-alpha/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions packages/@aws-cdk/cloud-assembly-schema/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 15 additions & 1 deletion packages/@aws-cdk/cloud-assembly-schema/.projen/tasks.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -363,14 +363,15 @@ export interface KeyContextQuery extends ContextLookupRoleOptions {
* to generate a validly compiling example).
*
* @example
* import { CcApiContextQuery } from '@aws-cdk/cloud-assembly-schema';
*
* const x: CcApiContextQuery = {
* typeName: 'AWS::Some::Type',
* expectedMatchCount: 'exactly-one',
* propertiesToReturn: ['SomeProp'],
* account: '11111111111',
* region: 'us-east-1',
* };
* console.log(x);
*/
export interface CcApiContextQuery extends ContextLookupRoleOptions {
/**
Expand Down
1 change: 1 addition & 0 deletions packages/@aws-cdk/cloud-assembly-schema/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Fixture intentionally empty

/// here
47 changes: 26 additions & 21 deletions projenrc/jsii.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { yarn } from 'cdklabs-projen-project-types';
import { Rosetta, yarn } from 'cdklabs-projen-project-types';
import * as pj from 'projen';
import { Stability } from 'projen/lib/cdk';
import { WorkflowSteps } from 'projen/lib/github';
Expand Down Expand Up @@ -109,10 +109,19 @@ export interface JsiiBuildOptions {
/**
* Whether to turn on 'strict' mode for Rosetta
*
* @default false
* @default true
*/
readonly rosettaStrict?: boolean;

/**
* Additional example dependencies
*
* @see https://github.com/aws/jsii-rosetta?tab=readme-ov-file#dependencies
*
* @default []
*/
readonly rosettaDependencies?: string[];

/**
* Whether to turn on composite mode for the TypeScript project
*
Expand Down Expand Up @@ -320,19 +329,26 @@ export class JsiiBuild extends pj.Component {
this.addTargetToRelease('go', task, golang);
}

const jsiiSuffix =
options.jsiiVersion === '*'
? // If jsiiVersion is "*", don't specify anything so the user can manage.
''
: // Otherwise, use `jsiiVersion` or fall back to `5.7`
`@${options.jsiiVersion ?? '5.7'}`;
// If jsiiVersion is "*", don't specify anything so the user can manage.
// Otherwise, use `jsiiVersion` or fall back to `5.7`
const jsiiVersion = (options.jsiiVersion === '*' ? undefined : options.jsiiVersion) ?? '5.7';
const jsiiSuffix = jsiiVersion ? `@${jsiiVersion}` : '';

tsProject.addDevDeps(
`jsii${jsiiSuffix}`,
`jsii-rosetta${jsiiSuffix}`,
'jsii-diff',
'jsii-pacmak',
);

new Rosetta(project as any, {
strict: options.rosettaStrict ?? true,
version: jsiiVersion,
});
if (options.rosettaDependencies?.length) {
const deps = Object.fromEntries(options.rosettaDependencies.map(d => pj.Dependencies.parseDependency(d)).map(d => [d.name, d.version ?? '*']));
tsProject.package.file.addOverride('jsiiRosetta.exampleDependencies', deps);
}

tsProject.gitignore.exclude('.jsii', 'tsconfig.json');
tsProject.npmignore?.include('.jsii');

Expand All @@ -351,22 +367,11 @@ export class JsiiBuild extends pj.Component {
tsProject.npmignore.readonly = false;
}

const packageJson = tsProject.package.file;

if ((options.pypiClassifiers ?? []).length > 0) {
packageJson.patch(
tsProject.package.file.patch(
pj.JsonPatch.add('/jsii/targets/python/classifiers', options.pypiClassifiers),
);
}

if (options.rosettaStrict) {
packageJson.patch(
pj.JsonPatch.add('/jsii/metadata', {}),
pj.JsonPatch.add('/jsii/metadata/jsii', {}),
pj.JsonPatch.add('/jsii/metadata/jsii/rosetta', {}),
pj.JsonPatch.add('/jsii/metadata/jsii/rosetta/strict', true),
);
}
}

/**
Expand Down