Skip to content

fix(TS): collecting dependencies from file with aliases included. #473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(TS): collecting dependencies from file with aliases included. #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion model-lowerings/src/org/jetbrains/dukat/commonLowerings/substituteTsStdLibEntities.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ private fun TypeValueModel.createStdType(name: String): TypeValueModel {
private enum class SubstitutedEntities(val value: IdentifierEntity) {
NON_NULLABLE(IdentifierEntity("NonNullable")),
EXCLUDE(IdentifierEntity("Exclude")),
PICK(IdentifierEntity("Pick")),
REQUIRED(IdentifierEntity("Required")),
READONLY_ARRAY(IdentifierEntity("ReadonlyArray")),
TEMPLATE_STRINGS_ARRAY(IdentifierEntity("TemplateStringsArray")),
Expand All @@ -59,7 +60,13 @@ private enum class SubstitutedEntities(val value: IdentifierEntity) {
private fun TypeValueModel.resolveAsSubstitution(): TypeValueModel? {
val isLibReference = isLibReference()

return if (value == SubstitutedEntities.NON_NULLABLE.value || value == SubstitutedEntities.EXCLUDE.value || value == SubstitutedEntities.REQUIRED.value || value == SubstitutedEntities.OBJECT.value) {
return if (
value == SubstitutedEntities.NON_NULLABLE.value ||
value == SubstitutedEntities.EXCLUDE.value ||
value == SubstitutedEntities.PICK.value ||
value == SubstitutedEntities.REQUIRED.value ||
value == SubstitutedEntities.OBJECT.value
) {
if (isLibReference) {
createStdType("Any")
} else null
Expand Down
8 changes: 5 additions & 3 deletions typescript/ts-converter/src/ExportContext.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ function resolveName(node: ts.Node): string | null {
}

export function resolveDeclarations(node: ts.Identifier, typeChecker: ts.TypeChecker): Array<ts.Node> {
let symbolAtLocation = typeChecker.getSymbolAtLocation(node);
if (symbolAtLocation) {
const symbolAtLocation = typeChecker.getSymbolAtLocation(node);

if (symbolAtLocation) {
if (symbolAtLocation.flags & ts.SymbolFlags.TypeParameter) {
return [];
}
Expand All @@ -44,7 +44,9 @@ export function resolveDeclarations(node: ts.Identifier, typeChecker: ts.TypeChe
}
}

let symbol = typeChecker.getTypeAtLocation(node).symbol;
const type = typeChecker.getTypeAtLocation(node)
const symbol = type.aliasSymbol || type.symbol;

if (symbol && Array.isArray(symbol.declarations)) {
return symbol.declarations;
}
Expand Down