From 999cbfb52bc42c58467e3592d5fead9c4ee8a2c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= Date: Mon, 18 Jul 2022 20:05:26 +0200 Subject: feat: import.meta.resolve() (#15074) This commit adds new "import.meta.resolve()" API which allows to resolve specifiers relative to the module the API is called in. This API supports resolving using import maps. --- cli/tests/testdata/import_meta.importmap.json | 11 ++++++++++ cli/tests/testdata/import_meta.ts | 31 +++++++++++++++++++++++++++ cli/tests/testdata/import_meta.ts.out | 7 ++++++ 3 files changed, 49 insertions(+) create mode 100644 cli/tests/testdata/import_meta.importmap.json (limited to 'cli/tests/testdata') diff --git a/cli/tests/testdata/import_meta.importmap.json b/cli/tests/testdata/import_meta.importmap.json new file mode 100644 index 000000000..f8c056afd --- /dev/null +++ b/cli/tests/testdata/import_meta.importmap.json @@ -0,0 +1,11 @@ +{ + "imports": { + "bare": "https://example.com/", + "https://example.com/rewrite": "https://example.com/rewritten", + + "1": "https://example.com/PASS-1", + "null": "https://example.com/PASS-null", + "undefined": "https://example.com/PASS-undefined", + "[object Object]": "https://example.com/PASS-object" + } +} diff --git a/cli/tests/testdata/import_meta.ts b/cli/tests/testdata/import_meta.ts index d111059ea..37af69020 100644 --- a/cli/tests/testdata/import_meta.ts +++ b/cli/tests/testdata/import_meta.ts @@ -1,3 +1,34 @@ +import { assertThrows } from "../../../test_util/std/testing/asserts.ts"; + console.log("import_meta", import.meta.url, import.meta.main); import "./import_meta2.ts"; + +console.log("Resolving ./foo.js", import.meta.resolve("./foo.js")); +console.log("Resolving bare from import map", import.meta.resolve("bare")); +console.log( + "Resolving https://example.com/rewrite from import map", + import.meta.resolve("https://example.com/rewrite"), +); +console.log( + "Resolving without a value from import map", + import.meta.resolve(), +); +console.log( + "Resolving 1 from import map", + import.meta.resolve(1), +); +console.log( + "Resolving null from import map", + import.meta.resolve(null), +); +console.log( + "Resolving object from import map", + import.meta.resolve({}), +); +assertThrows(() => { + import.meta.resolve("too", "many", "arguments"); +}, TypeError); +assertThrows(() => { + import.meta.resolve("://malformed/url?asdf"); +}, TypeError); diff --git a/cli/tests/testdata/import_meta.ts.out b/cli/tests/testdata/import_meta.ts.out index f38aa98ea..a431f61df 100644 --- a/cli/tests/testdata/import_meta.ts.out +++ b/cli/tests/testdata/import_meta.ts.out @@ -1,2 +1,9 @@ import_meta2 [WILDCARD]import_meta2.ts false import_meta [WILDCARD]import_meta.ts true +Resolving ./foo.js file:///[WILDCARD]/foo.js +Resolving bare from import map https://example.com/ +Resolving https://example.com/rewrite from import map https://example.com/rewritten +Resolving without a value from import map https://example.com/PASS-undefined +Resolving 1 from import map https://example.com/PASS-1 +Resolving null from import map https://example.com/PASS-null +Resolving object from import map https://example.com/PASS-object -- cgit v1.2.3