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

Remove file extensions while resolving dependencies. #222

Merged
merged 1 commit into from
Sep 6, 2016
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
7 changes: 5 additions & 2 deletions src/deps.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { State } from './host';
import { withoutTypeScriptExtension } from './helpers';
import * as path from 'path';
type FileSet = {[fileName: string]: boolean};

Expand Down Expand Up @@ -74,7 +75,8 @@ export class FileAnalyzer {
imports.push.apply(imports, info.importedFiles
.map(file => file.fileName)
.map(depName => {
let { resolvedModule } = ts.resolveModuleName(depName, fileName, options, ts.sys);
let moduleName = withoutTypeScriptExtension(depName);
let { resolvedModule } = ts.resolveModuleName(moduleName, fileName, options, ts.sys);
if (resolvedModule) {
deps.addModuleResolution(fileName, depName, resolvedModule);
return resolvedModule.resolvedFileName;
Expand All @@ -91,7 +93,8 @@ export class FileAnalyzer {
return path.resolve(path.dirname(fileName), relative);
})
.map(depName => {
let { resolvedModule } = ts.resolveModuleName(depName, fileName, options, ts.sys);
let moduleName = withoutTypeScriptExtension(depName);
let { resolvedModule } = ts.resolveModuleName(moduleName, fileName, options, ts.sys);
if (resolvedModule) {
deps.addModuleResolution(fileName, depName, resolvedModule);
// return non-realpath name (symlinks not resolved)
Expand Down
6 changes: 6 additions & 0 deletions src/helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -113,3 +113,9 @@ export function loadLib(moduleId) {
text: text
};
}

const TYPESCRIPT_EXTENSION = /\.(d\.)?(t|j)s$/;

export function withoutTypeScriptExtension(fileName: string): string {
return fileName.replace(TYPESCRIPT_EXTENSION, '');
}
2 changes: 1 addition & 1 deletion src/host.ts
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ export class State {
loadTypesFromConfig() {
let { options } = this.compilerConfig;

const directives = this.ts.getAutomaticTypeDirectiveNames(options, [], this.compilerHost);
const directives = this.ts.getAutomaticTypeDirectiveNames(options, this.compilerHost);

if (directives) {
directives.forEach(type => {
Expand Down