fix: allow npm: specifiers in import.meta.resolve (#21716)

Closes https://github.com/denoland/deno/issues/21298.

"npm:" specifiers are matched against import map entries
and if no match is found they are passed through.
This commit is contained in:
Bartek Iwańczuk 2023-12-28 20:37:10 +01:00 committed by GitHub
parent f85d65e066
commit 576b20aa00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 36 additions and 8 deletions

View file

@ -6,6 +6,7 @@
"1": "https://example.com/PASS-1", "1": "https://example.com/PASS-1",
"null": "https://example.com/PASS-null", "null": "https://example.com/PASS-null",
"undefined": "https://example.com/PASS-undefined", "undefined": "https://example.com/PASS-undefined",
"[object Object]": "https://example.com/PASS-object" "[object Object]": "https://example.com/PASS-object",
"npm:preact": "https://example.com/preact"
} }
} }

View file

@ -7,5 +7,6 @@ Resolving without a value from import map https://example.com/PASS-undefined
Resolving 1 from import map https://example.com/PASS-1 Resolving 1 from import map https://example.com/PASS-1
Resolving null from import map https://example.com/PASS-null Resolving null from import map https://example.com/PASS-null
Resolving object from import map https://example.com/PASS-object Resolving object from import map https://example.com/PASS-object
TypeError: "npm:" specifiers are currently not supported in import.meta.resolve() Resolving npm:cowsay npm:cowsay
at file:///[WILDCARD]testdata/run/import_meta/main.ts:36:15 Resolving npm:cowsay@1 npm:cowsay@1
Resolving npm:preact from import map https://example.com/preact

View file

@ -32,8 +32,15 @@ assertThrows(() => {
assertThrows(() => { assertThrows(() => {
import.meta.resolve("://malformed/url?asdf"); import.meta.resolve("://malformed/url?asdf");
}, TypeError); }, TypeError);
try { console.log(
import.meta.resolve("npm:cowsay"); "Resolving npm:cowsay",
} catch (e) { import.meta.resolve("npm:cowsay"),
console.log(e); );
} console.log(
"Resolving npm:cowsay@1",
import.meta.resolve("npm:cowsay@1"),
);
console.log(
"Resolving npm:preact from import map",
import.meta.resolve("npm:preact"),
);

View file

@ -5,6 +5,7 @@ use crate::ops;
use crate::permissions::PermissionsContainer; use crate::permissions::PermissionsContainer;
use crate::shared::runtime; use crate::shared::runtime;
use crate::tokio_util::create_and_run_current_thread; use crate::tokio_util::create_and_run_current_thread;
use crate::worker::import_meta_resolve_callback;
use crate::worker::FormatJsErrorFn; use crate::worker::FormatJsErrorFn;
use crate::BootstrapOptions; use crate::BootstrapOptions;
use deno_broadcast_channel::InMemoryBroadcastChannel; use deno_broadcast_channel::InMemoryBroadcastChannel;
@ -536,6 +537,9 @@ impl WebWorker {
inspector: options.maybe_inspector_server.is_some(), inspector: options.maybe_inspector_server.is_some(),
feature_checker: Some(options.feature_checker.clone()), feature_checker: Some(options.feature_checker.clone()),
op_metrics_factory_fn, op_metrics_factory_fn,
import_meta_resolve_callback: Some(Box::new(
import_meta_resolve_callback,
)),
..Default::default() ..Default::default()
}); });

View file

@ -50,6 +50,18 @@ use crate::BootstrapOptions;
pub type FormatJsErrorFn = dyn Fn(&JsError) -> String + Sync + Send; pub type FormatJsErrorFn = dyn Fn(&JsError) -> String + Sync + Send;
pub fn import_meta_resolve_callback(
loader: &dyn deno_core::ModuleLoader,
specifier: String,
referrer: String,
) -> Result<ModuleSpecifier, AnyError> {
loader.resolve(
&specifier,
&referrer,
deno_core::ResolutionKind::DynamicImport,
)
}
#[derive(Clone, Default)] #[derive(Clone, Default)]
pub struct ExitCode(Arc<AtomicI32>); pub struct ExitCode(Arc<AtomicI32>);
@ -447,6 +459,9 @@ impl MainWorker {
wait_for_inspector_disconnect_callback: Some( wait_for_inspector_disconnect_callback: Some(
wait_for_inspector_disconnect_callback, wait_for_inspector_disconnect_callback,
), ),
import_meta_resolve_callback: Some(Box::new(
import_meta_resolve_callback,
)),
..Default::default() ..Default::default()
}); });