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
15 changes: 14 additions & 1 deletion src/assembler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ export class Assembler implements Emitter {
jsiiVersion,
bin: this.projectInfo.bin,
fingerprint: '<TBD>',
usedFeatures: this.usedFeatures.size > 0 ? Array.from(this.usedFeatures) : undefined,
usedFeatures: _assemblyFeatures(this.usedFeatures), // might be appended later
};

if (this.deprecatedRemover) {
Expand All @@ -249,6 +249,15 @@ export class Assembler implements Emitter {

const validator = new Validator(this.projectInfo, assembly);
const validationResult = validator.emit();

// Inject detected features
if (validationResult.usedFeatures) {
for (const item of validationResult.usedFeatures) {
this.usedFeatures.add(item);
}
assembly.usedFeatures = _assemblyFeatures(this.usedFeatures);
}

if (!validationResult.emitSkipped) {
const zipped = writeAssembly(this.projectInfo.projectRoot, _fingerprint(assembly), {
compress: this.compressAssembly ?? false,
Expand All @@ -269,6 +278,10 @@ export class Assembler implements Emitter {
this._afterEmit();
}

function _assemblyFeatures(usedFeatures: Set<spec.JsiiFeature>): spec.JsiiFeature[] | undefined {
return usedFeatures.size > 0 ? Array.from(usedFeatures).sort() : undefined;
}

function _loadReadme(this: Assembler) {
// Search for `README.md` in a case-insensitive way
const fileName = fs
Expand Down
2 changes: 1 addition & 1 deletion src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export type MultipleSourceFiles = {
/**
* Assembly features supported by this compiler
*/
export const ASSEMBLY_FEATURES_SUPPORTED: spec.JsiiFeature[] = ['intersection-types'];
export const ASSEMBLY_FEATURES_SUPPORTED: spec.JsiiFeature[] = ['intersection-types', 'class-covariant-overrides'];

/**
* Compile a piece of source and return the JSII assembly for it
Expand Down
Loading