Skip to content
This repository was archived by the owner on Dec 1, 2019. It is now read-only.

Commit d834d9c

Browse files
committed
test: add tests to #224, fixes #224
1 parent c20cf54 commit d834d9c

File tree

16 files changed

+2913
-15
lines changed

16 files changed

+2913
-15
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"standard-version": "^2.4.0",
6666
"temp": "^0.8.3",
6767
"tslint": "^3.14.0",
68-
"typescript": "^2.0.0",
68+
"typescript": "^2.0.2",
6969
"webpack": "2.1.0-beta.4"
7070
}
7171
}

src/deps.ts

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ export class FileAnalyzer {
9494
})
9595
.map(depName => {
9696
let moduleName = withoutTypeScriptExtension(depName);
97-
let { resolvedModule } = ts.resolveModuleName(moduleName, fileName, options, ts.sys);
97+
let { resolvedModule } = ts.classicNameResolver(moduleName, fileName, options, ts.sys);
9898
if (resolvedModule) {
9999
deps.addModuleResolution(fileName, depName, resolvedModule);
100100
// return non-realpath name (symlinks not resolved)
@@ -126,17 +126,10 @@ export interface IDependencyGraphItem {
126126
}
127127

128128
export class DependencyManager {
129-
dependencies: {[fileName: string]: string[]};
130-
moduleResolutions: {[cacheKey: string]: ts.ResolvedModule};
131-
typeReferenceResolutions: {[cacheKey: string]: ts.ResolvedTypeReferenceDirective};
132-
compiledModules: {[fileName: string]: string[]};
133-
134-
constructor() {
135-
this.dependencies = {};
136-
this.compiledModules = {};
137-
this.moduleResolutions = {};
138-
this.typeReferenceResolutions = {};
139-
}
129+
dependencies: {[fileName: string]: string[]} = {};
130+
moduleResolutions: {[cacheKey: string]: ts.ResolvedModule} = {};
131+
typeReferenceResolutions: {[cacheKey: string]: ts.ResolvedTypeReferenceDirective} = {};
132+
compiledModules: {[fileName: string]: string[]} = {};
140133

141134
addModuleResolution(fileName: string, depName: string, resolvedModule: ts.ResolvedModule) {
142135
this.moduleResolutions[`${fileName}::${depName}`] = resolvedModule;

src/host.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,12 @@ export class Host implements ts.LanguageServiceHost {
8686
}
8787

8888
resolveModuleNames(moduleNames: string[], containingFile: string) {
89-
let deps = this.state.fileAnalyzer.dependencies;
90-
return moduleNames.map(moduleName => {
89+
const deps = this.state.fileAnalyzer.dependencies;
90+
const resolvedModules = moduleNames.map(moduleName => {
9191
return deps.getModuleResolution(containingFile, moduleName);
9292
});
93+
94+
return resolvedModules;
9395
}
9496

9597
getDefaultLibLocation(): string {

src/test/fixtures/react/index.tsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import * as React from 'react'
2+
import { renderToString } from 'react-dom/server'
3+
4+
renderToString(<div />)

src/test/fixtures/react/node_modules/@types/react-dom/README.md

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/test/fixtures/react/node_modules/@types/react-dom/index.d.ts

Lines changed: 64 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/test/fixtures/react/node_modules/@types/react-dom/package.json

Lines changed: 80 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/test/fixtures/react/node_modules/@types/react-dom/react-dom.server.d.ts

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/test/fixtures/react/node_modules/@types/react-dom/types-metadata.json

Lines changed: 28 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/test/fixtures/react/node_modules/@types/react/README.md

Lines changed: 18 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)