summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
Diffstat (limited to 'cli')
-rw-r--r--cli/args/config_file.rs2
-rw-r--r--cli/args/flags_allow_net.rs4
-rw-r--r--cli/lsp/language_server.rs6
-rw-r--r--cli/lsp/tsc.rs8
-rw-r--r--cli/lsp/urls.rs18
-rw-r--r--cli/node/mod.rs2
-rw-r--r--cli/tests/integration/lsp_tests.rs8
-rw-r--r--cli/tests/testdata/run/error_009_extensions_error.js.out2
-rw-r--r--cli/tests/testdata/run/fetch_async_error_stack.ts.out2
-rw-r--r--cli/tests/testdata/run/queue_microtask_error.ts.out2
-rw-r--r--cli/tests/testdata/run/queue_microtask_error_handled.ts.out4
-rw-r--r--cli/tests/testdata/run/wasm_streaming_panic_test.js.out2
-rw-r--r--cli/tests/testdata/run/worker_drop_handle_race.js.out6
-rw-r--r--cli/tests/testdata/test/steps/failing_steps.out8
-rw-r--r--cli/tests/unit/opcall_test.ts4
-rw-r--r--cli/tools/coverage/mod.rs2
-rw-r--r--cli/tools/doc.rs2
-rw-r--r--cli/tools/test.rs6
-rw-r--r--cli/tsc/mod.rs24
19 files changed, 60 insertions, 52 deletions
diff --git a/cli/args/config_file.rs b/cli/args/config_file.rs
index 160b02317..7bf568d55 100644
--- a/cli/args/config_file.rs
+++ b/cli/args/config_file.rs
@@ -925,7 +925,7 @@ pub fn get_ts_config_for_emit(
"sourceMap": false,
"strict": true,
"target": "esnext",
- "tsBuildInfoFile": "deno:///.tsbuildinfo",
+ "tsBuildInfoFile": "internal:///.tsbuildinfo",
"useDefineForClassFields": true,
// TODO(@kitsonk) remove for Deno 2.0
"useUnknownInCatchVariables": false,
diff --git a/cli/args/flags_allow_net.rs b/cli/args/flags_allow_net.rs
index 88d9d3c02..94699cc8b 100644
--- a/cli/args/flags_allow_net.rs
+++ b/cli/args/flags_allow_net.rs
@@ -27,7 +27,7 @@ impl FromStr for BarePort {
}
pub fn validator(host_and_port: &str) -> Result<(), String> {
- if Url::parse(&format!("deno://{host_and_port}")).is_ok()
+ if Url::parse(&format!("internal://{host_and_port}")).is_ok()
|| host_and_port.parse::<IpAddr>().is_ok()
|| host_and_port.parse::<BarePort>().is_ok()
{
@@ -43,7 +43,7 @@ pub fn validator(host_and_port: &str) -> Result<(), String> {
pub fn parse(paths: Vec<String>) -> clap::Result<Vec<String>> {
let mut out: Vec<String> = vec![];
for host_and_port in paths.iter() {
- if Url::parse(&format!("deno://{host_and_port}")).is_ok()
+ if Url::parse(&format!("internal://{host_and_port}")).is_ok()
|| host_and_port.parse::<IpAddr>().is_ok()
{
out.push(host_and_port.to_owned())
diff --git a/cli/lsp/language_server.rs b/cli/lsp/language_server.rs
index 13eb61412..70bbb1210 100644
--- a/cli/lsp/language_server.rs
+++ b/cli/lsp/language_server.rs
@@ -1050,7 +1050,7 @@ impl Inner {
async fn did_close(&mut self, params: DidCloseTextDocumentParams) {
let mark = self.performance.mark("did_close", Some(&params));
- if params.text_document.uri.scheme() == "deno" {
+ if params.text_document.uri.scheme() == "internal" {
// we can ignore virtual text documents closing, as they don't need to
// be tracked in memory, as they are static assets that won't change
// already managed by the language service
@@ -2609,7 +2609,7 @@ impl tower_lsp::LanguageServer for LanguageServer {
}
async fn did_open(&self, params: DidOpenTextDocumentParams) {
- if params.text_document.uri.scheme() == "deno" {
+ if params.text_document.uri.scheme() == "internal" {
// we can ignore virtual text documents opening, as they don't need to
// be tracked in memory, as they are static assets that won't change
// already managed by the language service
@@ -3121,7 +3121,7 @@ impl Inner {
.performance
.mark("virtual_text_document", Some(&params));
let specifier = self.url_map.normalize_url(&params.text_document.uri);
- let contents = if specifier.as_str() == "deno:/status.md" {
+ let contents = if specifier.as_str() == "internal:/status.md" {
let mut contents = String::new();
let mut documents_specifiers = self
.documents
diff --git a/cli/lsp/tsc.rs b/cli/lsp/tsc.rs
index 2f66e2d2d..e6e2581a8 100644
--- a/cli/lsp/tsc.rs
+++ b/cli/lsp/tsc.rs
@@ -1154,11 +1154,15 @@ impl ImplementationLocation {
language_server: &language_server::Inner,
) -> lsp::Location {
let specifier = normalize_specifier(&self.document_span.file_name)
- .unwrap_or_else(|_| ModuleSpecifier::parse("deno://invalid").unwrap());
+ .unwrap_or_else(|_| {
+ ModuleSpecifier::parse("internal://invalid").unwrap()
+ });
let uri = language_server
.url_map
.normalize_specifier(&specifier)
- .unwrap_or_else(|_| ModuleSpecifier::parse("deno://invalid").unwrap());
+ .unwrap_or_else(|_| {
+ ModuleSpecifier::parse("internal://invalid").unwrap()
+ });
lsp::Location {
uri,
range: self.document_span.text_span.to_range(line_index),
diff --git a/cli/lsp/urls.rs b/cli/lsp/urls.rs
index 4fba0c9ff..1eb011c54 100644
--- a/cli/lsp/urls.rs
+++ b/cli/lsp/urls.rs
@@ -17,7 +17,7 @@ use std::sync::Arc;
/// Used in situations where a default URL needs to be used where otherwise a
/// panic is undesired.
pub static INVALID_SPECIFIER: Lazy<ModuleSpecifier> =
- Lazy::new(|| ModuleSpecifier::parse("deno://invalid").unwrap());
+ Lazy::new(|| ModuleSpecifier::parse("internal://invalid").unwrap());
/// Matches the `encodeURIComponent()` encoding from JavaScript, which matches
/// the component percent encoding set.
@@ -81,7 +81,7 @@ impl LspUrlMapInner {
}
/// A bi-directional map of URLs sent to the LSP client and internal module
-/// specifiers. We need to map internal specifiers into `deno:` schema URLs
+/// specifiers. We need to map internal specifiers into `internal:` schema URLs
/// to allow the Deno language server to manage these as virtual documents.
#[derive(Debug, Default, Clone)]
pub struct LspUrlMap(Arc<Mutex<LspUrlMapInner>>);
@@ -101,7 +101,7 @@ impl LspUrlMap {
specifier.clone()
} else {
let specifier_str = if specifier.scheme() == "asset" {
- format!("deno:/asset{}", specifier.path())
+ format!("internal:/asset{}", specifier.path())
} else if specifier.scheme() == "data" {
let data_url = DataUrl::process(specifier.as_str())
.map_err(|e| uri_error(format!("{e:?}")))?;
@@ -114,7 +114,7 @@ impl LspUrlMap {
media_type.as_ts_extension()
};
format!(
- "deno:/{}/data_url{}",
+ "internal:/{}/data_url{}",
hash_data_specifier(specifier),
extension
)
@@ -128,7 +128,7 @@ impl LspUrlMap {
})
.collect();
path.push_str(&parts.join("/"));
- format!("deno:/{path}")
+ format!("internal:/{path}")
};
let url = Url::parse(&specifier_str)?;
inner.put(specifier.clone(), url.clone());
@@ -138,7 +138,7 @@ impl LspUrlMap {
}
}
- /// Normalize URLs from the client, where "virtual" `deno:///` URLs are
+ /// Normalize URLs from the client, where "virtual" `internal:///` URLs are
/// converted into proper module specifiers, as well as handle situations
/// where the client encodes a file URL differently than Rust does by default
/// causing issues with string matching of URLs.
@@ -178,7 +178,7 @@ mod tests {
.normalize_specifier(&fixture)
.expect("could not handle specifier");
let expected_url =
- Url::parse("deno:/https/deno.land/x/pkg%401.0.0/mod.ts").unwrap();
+ Url::parse("internal:/https/deno.land/x/pkg%401.0.0/mod.ts").unwrap();
assert_eq!(actual_url, expected_url);
let actual_specifier = map.normalize_url(&actual_url);
@@ -193,7 +193,7 @@ mod tests {
let actual_url = map
.normalize_specifier(&fixture)
.expect("could not handle specifier");
- let expected_url = Url::parse("deno:/https/cdn.skypack.dev/-/postcss%40v8.2.9-E4SktPp9c0AtxrJHp8iV/dist%3Des2020%2Cmode%3Dtypes/lib/postcss.d.ts").unwrap();
+ let expected_url = Url::parse("internal:/https/cdn.skypack.dev/-/postcss%40v8.2.9-E4SktPp9c0AtxrJHp8iV/dist%3Des2020%2Cmode%3Dtypes/lib/postcss.d.ts").unwrap();
assert_eq!(actual_url, expected_url);
let actual_specifier = map.normalize_url(&actual_url);
@@ -207,7 +207,7 @@ mod tests {
let actual_url = map
.normalize_specifier(&fixture)
.expect("could not handle specifier");
- let expected_url = Url::parse("deno:/c21c7fc382b2b0553dc0864aa81a3acacfb7b3d1285ab5ae76da6abec213fb37/data_url.ts").unwrap();
+ let expected_url = Url::parse("internal:/c21c7fc382b2b0553dc0864aa81a3acacfb7b3d1285ab5ae76da6abec213fb37/data_url.ts").unwrap();
assert_eq!(actual_url, expected_url);
let actual_specifier = map.normalize_url(&actual_url);
diff --git a/cli/node/mod.rs b/cli/node/mod.rs
index 8d599923b..9ab593304 100644
--- a/cli/node/mod.rs
+++ b/cli/node/mod.rs
@@ -101,7 +101,7 @@ impl NodeResolution {
}
Some(resolution) => (resolution.into_url(), MediaType::Dts),
None => (
- ModuleSpecifier::parse("deno:///missing_dependency.d.ts").unwrap(),
+ ModuleSpecifier::parse("internal:///missing_dependency.d.ts").unwrap(),
MediaType::Dts,
),
}
diff --git a/cli/tests/integration/lsp_tests.rs b/cli/tests/integration/lsp_tests.rs
index bca327e96..128f9903b 100644
--- a/cli/tests/integration/lsp_tests.rs
+++ b/cli/tests/integration/lsp_tests.rs
@@ -1073,7 +1073,7 @@ fn lsp_hover_asset() {
"deno/virtualTextDocument",
json!({
"textDocument": {
- "uri": "deno:/asset/lib.deno.shared_globals.d.ts"
+ "uri": "internal:/asset/lib.deno.shared_globals.d.ts"
}
}),
)
@@ -1084,7 +1084,7 @@ fn lsp_hover_asset() {
"textDocument/hover",
json!({
"textDocument": {
- "uri": "deno:/asset/lib.es2015.symbol.wellknown.d.ts"
+ "uri": "internal:/asset/lib.es2015.symbol.wellknown.d.ts"
},
"position": {
"line": 109,
@@ -3103,7 +3103,7 @@ fn lsp_code_lens_non_doc_nav_tree() {
"deno/virtualTextDocument",
json!({
"textDocument": {
- "uri": "deno:/asset/lib.deno.shared_globals.d.ts"
+ "uri": "internal:/asset/lib.deno.shared_globals.d.ts"
}
}),
)
@@ -3115,7 +3115,7 @@ fn lsp_code_lens_non_doc_nav_tree() {
"textDocument/codeLens",
json!({
"textDocument": {
- "uri": "deno:/asset/lib.deno.shared_globals.d.ts"
+ "uri": "internal:/asset/lib.deno.shared_globals.d.ts"
}
}),
)
diff --git a/cli/tests/testdata/run/error_009_extensions_error.js.out b/cli/tests/testdata/run/error_009_extensions_error.js.out
index 8510980f6..558eedbe1 100644
--- a/cli/tests/testdata/run/error_009_extensions_error.js.out
+++ b/cli/tests/testdata/run/error_009_extensions_error.js.out
@@ -2,5 +2,5 @@
new Event();
^
at [WILDCARD]
- at new Event (deno:ext/web/[WILDCARD])
+ at new Event (internal:ext/web/[WILDCARD])
at [WILDCARD]
diff --git a/cli/tests/testdata/run/fetch_async_error_stack.ts.out b/cli/tests/testdata/run/fetch_async_error_stack.ts.out
index 0a7b353e2..8ca670847 100644
--- a/cli/tests/testdata/run/fetch_async_error_stack.ts.out
+++ b/cli/tests/testdata/run/fetch_async_error_stack.ts.out
@@ -1,5 +1,5 @@
error: Uncaught (in promise) TypeError: error sending request for url[WILDCARD]
await fetch("https://nonexistent.deno.land/");
^[WILDCARD]
- at async fetch (deno:[WILDCARD])
+ at async fetch (internal:[WILDCARD])
at async file:///[WILDCARD]/fetch_async_error_stack.ts:1:1
diff --git a/cli/tests/testdata/run/queue_microtask_error.ts.out b/cli/tests/testdata/run/queue_microtask_error.ts.out
index 6c4d41936..c1af4fec9 100644
--- a/cli/tests/testdata/run/queue_microtask_error.ts.out
+++ b/cli/tests/testdata/run/queue_microtask_error.ts.out
@@ -3,4 +3,4 @@ error: Uncaught Error: foo
throw new Error("foo");
^
at [WILDCARD]/queue_microtask_error.ts:2:9
- at deno:core/[WILDCARD]
+ at internal:core/[WILDCARD]
diff --git a/cli/tests/testdata/run/queue_microtask_error_handled.ts.out b/cli/tests/testdata/run/queue_microtask_error_handled.ts.out
index 7f3f7f84a..9105570b3 100644
--- a/cli/tests/testdata/run/queue_microtask_error_handled.ts.out
+++ b/cli/tests/testdata/run/queue_microtask_error_handled.ts.out
@@ -7,9 +7,9 @@
colno: 9,
error: Error: foo
at [WILDCARD]/queue_microtask_error_handled.ts:18:9
- at deno:core/[WILDCARD]
+ at internal:core/[WILDCARD]
}
onerror() called Error: foo
at [WILDCARD]/queue_microtask_error_handled.ts:18:9
- at deno:core/[WILDCARD]
+ at internal:core/[WILDCARD]
2
diff --git a/cli/tests/testdata/run/wasm_streaming_panic_test.js.out b/cli/tests/testdata/run/wasm_streaming_panic_test.js.out
index 3e93f643a..72237df6f 100644
--- a/cli/tests/testdata/run/wasm_streaming_panic_test.js.out
+++ b/cli/tests/testdata/run/wasm_streaming_panic_test.js.out
@@ -1,2 +1,2 @@
error: Uncaught (in promise) TypeError: Invalid WebAssembly content type.
- at handleWasmStreaming (deno:ext/fetch/26_fetch.js:[WILDCARD])
+ at handleWasmStreaming (internal:ext/fetch/26_fetch.js:[WILDCARD])
diff --git a/cli/tests/testdata/run/worker_drop_handle_race.js.out b/cli/tests/testdata/run/worker_drop_handle_race.js.out
index a81684bfa..afb522baa 100644
--- a/cli/tests/testdata/run/worker_drop_handle_race.js.out
+++ b/cli/tests/testdata/run/worker_drop_handle_race.js.out
@@ -2,7 +2,7 @@ error: Uncaught (in worker "") Error
throw new Error();
^
at [WILDCARD]/workers/drop_handle_race.js:2:9
- at Object.action (deno:ext/web/02_timers.js:[WILDCARD])
- at handleTimerMacrotask (deno:ext/web/02_timers.js:[WILDCARD])
+ at Object.action (internal:ext/web/02_timers.js:[WILDCARD])
+ at handleTimerMacrotask (internal:ext/web/02_timers.js:[WILDCARD])
error: Uncaught (in promise) Error: Unhandled error in child worker.
- at Worker.#pollControl (deno:runtime/js/11_workers.js:[WILDCARD])
+ at Worker.#pollControl (internal:runtime/js/11_workers.js:[WILDCARD])
diff --git a/cli/tests/testdata/test/steps/failing_steps.out b/cli/tests/testdata/test/steps/failing_steps.out
index 4df104bd7..998c70aa2 100644
--- a/cli/tests/testdata/test/steps/failing_steps.out
+++ b/cli/tests/testdata/test/steps/failing_steps.out
@@ -37,13 +37,13 @@ failing step in failing test ... FAILED ([WILDCARD])
nested failure => ./test/steps/failing_steps.ts:[WILDCARD]
error: Error: 1 test step failed.
- at runTest (deno:cli/js/40_testing.js:[WILDCARD])
- at async runTests (deno:cli/js/40_testing.js:[WILDCARD])
+ at runTest (internal:cli/js/40_testing.js:[WILDCARD])
+ at async runTests (internal:cli/js/40_testing.js:[WILDCARD])
multiple test step failures => ./test/steps/failing_steps.ts:[WILDCARD]
error: Error: 2 test steps failed.
- at runTest (deno:cli/js/40_testing.js:[WILDCARD])
- at async runTests (deno:cli/js/40_testing.js:[WILDCARD])
+ at runTest (internal:cli/js/40_testing.js:[WILDCARD])
+ at async runTests (internal:cli/js/40_testing.js:[WILDCARD])
failing step in failing test => ./test/steps/failing_steps.ts:[WILDCARD]
error: Error: Fail test.
diff --git a/cli/tests/unit/opcall_test.ts b/cli/tests/unit/opcall_test.ts
index 3f4f4472c..fb7766e4f 100644
--- a/cli/tests/unit/opcall_test.ts
+++ b/cli/tests/unit/opcall_test.ts
@@ -16,8 +16,8 @@ Deno.test(async function sendAsyncStackTrace() {
assertStringIncludes(s, "opcall_test.ts");
assertStringIncludes(s, "read");
assert(
- !s.includes("deno:core"),
- "opcall stack traces should NOT include deno:core internals such as unwrapOpResult",
+ !s.includes("internal:core"),
+ "opcall stack traces should NOT include internal:core internals such as unwrapOpResult",
);
}
});
diff --git a/cli/tools/coverage/mod.rs b/cli/tools/coverage/mod.rs
index 4b2bcd49d..1bd2779bf 100644
--- a/cli/tools/coverage/mod.rs
+++ b/cli/tools/coverage/mod.rs
@@ -594,7 +594,7 @@ fn filter_coverages(
coverages
.into_iter()
.filter(|e| {
- let is_internal = e.url.starts_with("deno:")
+ let is_internal = e.url.starts_with("internal:")
|| e.url.ends_with("__anonymous__")
|| e.url.ends_with("$deno$test.js")
|| e.url.ends_with(".snap");
diff --git a/cli/tools/doc.rs b/cli/tools/doc.rs
index e27e49570..3e19d6df2 100644
--- a/cli/tools/doc.rs
+++ b/cli/tools/doc.rs
@@ -26,7 +26,7 @@ pub async fn print_docs(
let mut doc_nodes = match doc_flags.source_file {
DocSourceFileFlag::Builtin => {
let source_file_specifier =
- ModuleSpecifier::parse("deno://lib.deno.d.ts").unwrap();
+ ModuleSpecifier::parse("internal://lib.deno.d.ts").unwrap();
let content = get_types_declaration_file_text(ps.options.unstable());
let mut loader = deno_graph::source::MemoryLoader::new(
vec![(
diff --git a/cli/tools/test.rs b/cli/tools/test.rs
index e680d5718..cd2ac6ba5 100644
--- a/cli/tools/test.rs
+++ b/cli/tools/test.rs
@@ -655,7 +655,8 @@ fn abbreviate_test_error(js_error: &JsError) -> JsError {
// check if there are any stack frames coming from user code
let should_filter = frames.iter().any(|f| {
if let Some(file_name) = &f.file_name {
- !(file_name.starts_with("[deno:") || file_name.starts_with("deno:"))
+ !(file_name.starts_with("[internal:")
+ || file_name.starts_with("internal:"))
} else {
true
}
@@ -667,7 +668,8 @@ fn abbreviate_test_error(js_error: &JsError) -> JsError {
.rev()
.skip_while(|f| {
if let Some(file_name) = &f.file_name {
- file_name.starts_with("[deno:") || file_name.starts_with("deno:")
+ file_name.starts_with("[internal:")
+ || file_name.starts_with("internal:")
} else {
false
}
diff --git a/cli/tsc/mod.rs b/cli/tsc/mod.rs
index 3e7fbfb15..d9f1bad9b 100644
--- a/cli/tsc/mod.rs
+++ b/cli/tsc/mod.rs
@@ -446,7 +446,7 @@ struct EmitArgs {
fn op_emit(state: &mut OpState, args: EmitArgs) -> bool {
let state = state.borrow_mut::<State>();
match args.file_name.as_ref() {
- "deno:///.tsbuildinfo" => state.maybe_tsbuildinfo = Some(args.data),
+ "internal:///.tsbuildinfo" => state.maybe_tsbuildinfo = Some(args.data),
_ => {
if cfg!(debug_assertions) {
panic!("Unhandled emit write: {}", args.file_name);
@@ -518,11 +518,11 @@ fn op_load(state: &mut OpState, args: Value) -> Result<Value, AnyError> {
let mut hash: Option<String> = None;
let mut media_type = MediaType::Unknown;
let graph_data = state.graph_data.read();
- let data = if &v.specifier == "deno:///.tsbuildinfo" {
+ let data = if &v.specifier == "internal:///.tsbuildinfo" {
state.maybe_tsbuildinfo.as_deref().map(Cow::Borrowed)
// in certain situations we return a "blank" module to tsc and we need to
// handle the request for that module here.
- } else if &v.specifier == "deno:///missing_dependency.d.ts" {
+ } else if &v.specifier == "internal:///missing_dependency.d.ts" {
hash = Some("1".to_string());
media_type = MediaType::Dts;
Some(Cow::Borrowed("declare const __: any;\nexport = __;\n"))
@@ -726,7 +726,7 @@ fn op_resolve(
(specifier_str, media_type.as_ts_extension().into())
}
None => (
- "deno:///missing_dependency.d.ts".to_string(),
+ "internal:///missing_dependency.d.ts".to_string(),
".d.ts".to_string(),
),
};
@@ -983,10 +983,10 @@ mod tests {
"lib": ["deno.window"],
"module": "esnext",
"noEmit": true,
- "outDir": "deno:///",
+ "outDir": "internal:///",
"strict": true,
"target": "esnext",
- "tsBuildInfoFile": "deno:///.tsbuildinfo",
+ "tsBuildInfoFile": "internal:///.tsbuildinfo",
}));
let request = Request {
config,
@@ -1075,7 +1075,7 @@ mod tests {
&mut state,
EmitArgs {
data: "some file content".to_string(),
- file_name: "deno:///.tsbuildinfo".to_string(),
+ file_name: "internal:///.tsbuildinfo".to_string(),
},
);
assert!(actual);
@@ -1146,9 +1146,11 @@ mod tests {
Some("some content".to_string()),
)
.await;
- let actual =
- op_load::call(&mut state, json!({ "specifier": "deno:///.tsbuildinfo"}))
- .expect("should have invoked op");
+ let actual = op_load::call(
+ &mut state,
+ json!({ "specifier": "internal:///.tsbuildinfo"}),
+ )
+ .expect("should have invoked op");
assert_eq!(
actual,
json!({
@@ -1217,7 +1219,7 @@ mod tests {
.expect("should have not errored");
assert_eq!(
actual,
- vec![("deno:///missing_dependency.d.ts".into(), ".d.ts".into())]
+ vec![("internal:///missing_dependency.d.ts".into(), ".d.ts".into())]
);
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 07:21:49 +0000