Skip to content

Commit

Permalink
Merge pull request #267 from timocov/fix265-merged-symbols
Browse files Browse the repository at this point in the history
Added resolving merged symbols
  • Loading branch information
timocov committed Oct 26, 2023
2 parents 6ca52e0 + 4b1389f commit 7481f0b
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/helpers/typescript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,18 @@ function getNodeName(node: ts.Node): NodeName | undefined {
return nodeName;
}

interface TypeCheckerCompat extends ts.TypeChecker {
// this method will be added in the further typescript releases
// see https://github.com/microsoft/TypeScript/pull/56193
getMergedSymbol(symbol: ts.Symbol): ts.Symbol;
}

export function getActualSymbol(symbol: ts.Symbol, typeChecker: ts.TypeChecker): ts.Symbol {
if (symbol.flags & ts.SymbolFlags.Alias) {
symbol = typeChecker.getAliasedSymbol(symbol);
}

return symbol;
return (typeChecker as TypeCheckerCompat).getMergedSymbol(symbol);
}

function getDeclarationNameSymbol(name: NodeName, typeChecker: ts.TypeChecker): ts.Symbol | null {
Expand Down
2 changes: 1 addition & 1 deletion tests/e2e/test-cases/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
!/**/output.d.ts
!/node_modules/
!/**/node_modules/
9 changes: 9 additions & 0 deletions tests/e2e/test-cases/merged-symbols/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { TestCaseConfig } from '../test-case-config';

const config: TestCaseConfig = {
libraries: {
inlinedLibraries: ['extensions-package'],
},
};

export = config;
1 change: 1 addition & 0 deletions tests/e2e/test-cases/merged-symbols/input.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from 'extensions-package';
1 change: 1 addition & 0 deletions tests/e2e/test-cases/merged-symbols/output.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export {};

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

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

11 changes: 11 additions & 0 deletions tests/e2e/test-cases/node_modules/extensions-package/plugins.d.ts

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

0 comments on commit 7481f0b

Please sign in to comment.