Skip to content
Merged
Changes from 1 commit
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
27 changes: 26 additions & 1 deletion packages/jsii-kernel/lib/kernel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,7 @@ export class Kernel {
// have an object id, so we need to allocate one for it.
this._debug('creating objref for', v);
const fqn = this._fqnForObject(v);
if (!targetType || !spec.isNamedTypeReference(targetType) || fqn === targetType.fqn) {
if (!targetType || !spec.isNamedTypeReference(targetType) || this._isAssignable(fqn, targetType)) {
return this._createObjref(v, fqn);
}
}
Expand Down Expand Up @@ -1029,6 +1029,31 @@ export class Kernel {
return v;
}

/**
* Tests whether a given type (by it's FQN) can be assigned to a named type reference.
*
* @param actualTypeFqn the FQN of the type that is being tested.
* @param requiredType the required reference type.
*
* @returns true if ``requiredType`` is a super-type (base class or implemented interface) of the type designated by
* ``actualTypeFqn``.
*/
private _isAssignable(actualTypeFqn: string, requiredType: spec.NamedTypeReference): boolean {
if (requiredType.fqn === actualTypeFqn) {
return true;
}
const actualType = this._typeInfoForFqn(actualTypeFqn);
if (spec.isClassType(actualType) && actualType.base) {
if (this._isAssignable(actualType.base.fqn, requiredType)) {
return true;
}
}
if (spec.isClassOrInterfaceType(actualType) && actualType.interfaces) {
return actualType.interfaces.find(iface => this._isAssignable(iface.fqn, requiredType)) != null;
}
return false;
}

private _toSandboxValues(args: any[]) {
return args.map(v => this._toSandbox(v));
}
Expand Down