foster/deno
0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-03-03 17:34:47 -05:00
Code Issues Packages 1 Wiki Activity

Remove extension hack in ResolveModule.

Browse source
This commit is contained in:
Ryan Dahl 2018-05-30 18:05:23 +02:00
parent e401d9e21b
commit 4f00218d6d
4 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
os.go
View file

@ -76,11 +76,6 @@ func ResolveModule(moduleSpecifier string, containingFile string) (
containingFile = SrcFileToUrl(containingFile) containingFile = SrcFileToUrl(containingFile)
moduleSpecifier = SrcFileToUrl(moduleSpecifier) moduleSpecifier = SrcFileToUrl(moduleSpecifier)
// Hack: If there is no extension, just add .ts
if path.Ext(moduleSpecifier) == "" {
moduleSpecifier = moduleSpecifier + ".ts"
}
logDebug("os.go ResolveModule after moduleSpecifier %s containingFile %s", logDebug("os.go ResolveModule after moduleSpecifier %s containingFile %s",
moduleSpecifier, containingFile) moduleSpecifier, containingFile)

7
os_test.go
View file

@ -72,9 +72,8 @@ func TestResolveModule4(t *testing.T) {
path.Join(SrcDir, "unpkg.com/liltest@0.0.5/index.ts")) path.Join(SrcDir, "unpkg.com/liltest@0.0.5/index.ts"))
} }
func TestResolveModule5(t *testing.T) { func TestResolveModuleExtensionsAintSpecial(t *testing.T) {
createDirs() createDirs()
// Files in SrcDir should resolve to URLs.
moduleName, filename, err := ResolveModule( moduleName, filename, err := ResolveModule(
"./util", "./util",
path.Join(SrcDir, "unpkg.com/liltest@0.0.5/index.ts")) path.Join(SrcDir, "unpkg.com/liltest@0.0.5/index.ts"))
@ -82,7 +81,7 @@ func TestResolveModule5(t *testing.T) {
t.Fatalf(err.Error()) t.Fatalf(err.Error())
} }
AssertEqual(t, moduleName, AssertEqual(t, moduleName,
"http://unpkg.com/liltest@0.0.5/util.ts") "http://unpkg.com/liltest@0.0.5/util")
AssertEqual(t, filename, AssertEqual(t, filename,
path.Join(SrcDir, "unpkg.com/liltest@0.0.5/util.ts")) path.Join(SrcDir, "unpkg.com/liltest@0.0.5/util"))
} }

2
testing/testing.ts
View file

@ -13,7 +13,7 @@
limitations under the License. limitations under the License.
*/ */
export { assert, assertEqual, equal } from "./util"; export { assert, assertEqual, equal } from "./util.ts";
export type TestFunction = () => void | Promise<void>; export type TestFunction = () => void | Promise<void>;

6
testing/util_test.ts
View file

@ -13,9 +13,9 @@
limitations under the License. limitations under the License.
*/ */
import { test } from "./index"; import { test } from "./index.ts";
import { assert } from "./util"; import { assert } from "./util.ts";
import * as util from "./util"; import * as util from "./util.ts";
test(async function util_equal() { test(async function util_equal() {
assert(util.equal("world", "world")); assert(util.equal("world", "world"));