foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-25 15:29:32 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/node): handle URL in createRequire (#16682)

Browse source
This commit is contained in:
Yoshiya Hinosawa 2022-11-19 20:32:39 +09:00 committed by Bartek Iwańczuk
parent a44675cc2a
commit a20fd23949
No known key found for this signature in database
GPG key ID: 0C6BCDDC3B3AD750
6 changed files with 61 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cli/tests/integration/npm_tests.rs
View file

@ -1470,6 +1470,14 @@ itest!(info_peer_deps_json {
http_server: true,
});
itest!(create_require {
args: "run --reload npm/create_require/main.ts",
output: "npm/create_require/main.out",
exit_code: 0,
envs: env_vars(),
http_server: true,
});
fn env_vars_no_sync_download() -> Vec<(String, String)> {
vec![
("DENO_NODE_COMPAT_URL".to_string(), util::std_file_url()),

6
cli/tests/testdata/npm/create_require/main.out vendored Normal file
View file

@ -0,0 +1,6 @@
[WILDCARD]
function
function
The argument 'filename' must be a file URL object, file URL string, or absolute path string. Received https://example.com/
The argument 'filename' must be a file URL object, file URL string, or absolute path string. Received https://example.com/
The argument 'filename' must be a file URL object, file URL string, or absolute path string. Received 1

1
cli/tests/testdata/npm/create_require/main.ts vendored Normal file
View file

@ -0,0 +1 @@
import "npm:@denotest/create-require@1.0.0";

19
cli/tests/testdata/npm/registry/@denotest/create-require/1.0.0/index.js vendored Normal file
View file

@ -0,0 +1,19 @@
import { createRequire } from "module";
console.log(typeof createRequire(import.meta.url));
console.log(typeof createRequire(new URL(import.meta.url)));
try {
createRequire("https://example.com/");
} catch (e) {
console.log(e.message);
}
try {
createRequire(new URL("https://example.com/"));
} catch (e) {
console.log(e.message);
}
try {
createRequire(1);
} catch (e) {
console.log(e.message);
}

6
cli/tests/testdata/npm/registry/@denotest/create-require/1.0.0/package.json vendored Normal file
View file

@ -0,0 +1,6 @@
{
"name": "@denotest/create-require",
"version": "1.0.0",
"type": "module",
"main": "index.js"
}

23
ext/node/02_require.js
View file

@ -819,8 +819,27 @@
}
function createRequire(filenameOrUrl) {
// FIXME: handle URLs and validation
const filename = core.ops.op_require_as_file_path(filenameOrUrl);
let fileUrlStr;
if (filenameOrUrl instanceof URL) {
if (filenameOrUrl.protocol !== "file:") {
throw new Error(
`The argument 'filename' must be a file URL object, file URL string, or absolute path string. Received ${filenameOrUrl}`,
);
}
fileUrlStr = filenameOrUrl.toString();
} else if (typeof filenameOrUrl === "string") {
if (!filenameOrUrl.startsWith("file:")) {
throw new Error(
`The argument 'filename' must be a file URL object, file URL string, or absolute path string. Received ${filenameOrUrl}`,
);
}
fileUrlStr = filenameOrUrl;
} else {
throw new Error(
`The argument 'filename' must be a file URL object, file URL string, or absolute path string. Received ${filenameOrUrl}`,
);
}
const filename = core.ops.op_require_as_file_path(fileUrlStr);
return createRequireFromPath(filename);
}