Skip to content

Dot slash path fix #426

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

Merged
Perryvw merged 3 commits into from
Feb 21, 2019
Merged

Dot slash path fix #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9eb4278
Fixed ./ paths
hazzard993 Feb 20, 2019
156c39e
Added tests
hazzard993 Feb 20, 2019
7d6ed68
Changed statement to ternary
hazzard993 Feb 21, 2019
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
10 changes: 5 additions & 5 deletions src/LuaTransformer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3811,12 +3811,12 @@ export class LuaTransformer {
}

private getImportPath(relativePath: string): string {
const rootDir = this.options.rootDir || path.resolve(".");
const absoluteImportPath = this.formatPathToLuaPath(this.getAbsoluteImportPath(relativePath));
const absoluteRootDirPath = this.formatPathToLuaPath(rootDir);
const rootDir = this.options.rootDir ? path.resolve(this.options.rootDir) : path.resolve(".");
const absoluteImportPath = path.format(path.parse(this.getAbsoluteImportPath(relativePath)));
const absoluteRootDirPath = path.format(path.parse(rootDir));
if (absoluteImportPath.includes(absoluteRootDirPath)) {
const relativePathToRoot = absoluteImportPath.replace(absoluteRootDirPath, "").slice(1);
return relativePathToRoot;
return this.formatPathToLuaPath(
absoluteImportPath.replace(absoluteRootDirPath, "").slice(1));
} else {
throw TSTLErrors.UnresolvableRequirePath(undefined,
`Cannot create require path. Module does not exist within --rootDir`,
Expand Down
3 changes: 2 additions & 1 deletion test/unit/require.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ import { CompilerOptions } from "../../src/CompilerOptions";
export class RequireTests {

@TestCase("file.ts", "./folder/Module", "folder.Module", { rootDir: "." }, false)
@TestCase("file.ts", "./folder/Module", "folder.Module", { rootDir: "./" }, false)
@TestCase("src/file.ts", "./folder/Module", "src.folder.Module", { rootDir: "." }, false)
@TestCase("file.ts", "folder/Module", "folder.Module", { rootDir: ".", baseUrl: "." }, false)
@TestCase("file.ts", "folder/Module", "folder.Module", { rootDir: "./", baseUrl: "." }, false)
@TestCase("src/file.ts", "./folder/Module", "folder.Module", { rootDir: "src" }, false)
@TestCase("src/file.ts", "./folder/Module", "folder.Module", { rootDir: "./src" }, false)
@TestCase("file.ts", "../Module", "", { rootDir: "./src" }, true)
Expand All @@ -22,7 +24,6 @@ export class RequireTests {
options: CompilerOptions,
throwsError: boolean): void {
const regex = /require\("(.*?)"\)/; // This regex extracts `hello` from require("hello")
options.rootDir = path.resolve(options.rootDir); // This happens automatically from the command line
if (throwsError) {
Expect(() => util.transpileString(`import * from "${usedPath}";`, options, true, filePath)).toThrow();
} else {
Expand Down