Skip to content

Support paths that don't have wildcards in the tsconfig #4

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

Support paths that don't have wildcards in the tsconfig #4

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
34 changes: 23 additions & 11 deletions src/common/util.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,20 @@ export function resolveImport(importSpecifier: string, filePath: string): string
return path.resolve(path.dirname(filePath), importSpecifier) + '.ts';
}
if (config && config.config.compilerOptions && config.config.compilerOptions.paths) {
for (let p in config.config.compilerOptions.paths) {
const paths = config.config.compilerOptions.paths;

for (let p in paths) {
if (p.endsWith('*') && importSpecifier.startsWith(p.replace('*', ''))) {
if (config.config.compilerOptions.paths[p].length == 1) {
const mapped = config.config.compilerOptions.paths[p][0].replace('*', '');
if (paths[p].length == 1) {
const mapped = paths[p][0].replace('*', '');
const mappedDir = path.resolve(path.dirname(config.path), mapped);

const dirCheck = mappedDir + '/' + importSpecifier.substr(p.replace('*', '').length);
const isIndex = isDirectory(dirCheck);

return isIndex ? dirCheck : dirCheck + '.ts';
return mappedDir + '/' + importSpecifier.substr(p.replace('*', '').length) + '.ts';
}
} else if (p === importSpecifier && paths[p].length === 1) {
const mapped = paths[p][0];
const mappedDir = path.resolve(path.dirname(config.path), mapped);
return mappedDir;
}
}
}
Expand Down Expand Up @@ -71,10 +74,19 @@ export function getRelativePath(fromPath: string, specifier: string): string {
if (config && config.config && config.config.compilerOptions && config.config.compilerOptions.paths) {
for (let p in config.config.compilerOptions.paths) {
if (config.config.compilerOptions.paths[p].length == 1) {
const mapped = config.config.compilerOptions.paths[p][0].replace('*', '');
const mappedDir = path.resolve(path.dirname(config.path), mapped);
if (isInDir(mappedDir, specifier)) {
return p.replace('*', '') + path.relative(mappedDir, specifier);
if (p.indexOf('*') !== -1) {
const mapped = config.config.compilerOptions.paths[p][0].replace('*', '');
const mappedDir = path.resolve(path.dirname(config.path), mapped);
if (isInDir(mappedDir, specifier)) {
return p.replace('*', '') + path.relative(mappedDir, specifier);
}
} else {
const mapped = config.config.compilerOptions.paths[p][0];
const mappedDir = path.resolve(path.dirname(config.path), mapped);

if (mappedDir === specifier) {
return p;
}
}
}
}
Expand Down