refactor: extract out `runtime::colors` to `deno_terminal::colors` (#22324)

15 files changed, 17 insertions, 16 deletions

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
index 145544f58..a60e56a4f 100644
--- a/cli/Cargo.toml
+++ b/cli/Cargo.toml
@@ -66,6 +66,7 @@ deno_npm = "=0.16.0"
 deno_runtime = { workspace = true, features = ["include_js_files_for_snapshotting"] }
 deno_semver = "=0.5.4"
 deno_task_shell = "=0.14.3"
+deno_terminal.workspace = true
 eszip = "=0.60.0"
 napi_sym.workspace = true
 
diff --git a/cli/args/mod.rs b/cli/args/mod.rs
index 6af39ff45..419066fba 100644
--- a/cli/args/mod.rs
+++ b/cli/args/mod.rs
@@ -42,7 +42,6 @@ use deno_core::normalize_path;
 use deno_core::parking_lot::Mutex;
 use deno_core::serde_json;
 use deno_core::url::Url;
-use deno_runtime::colors;
 use deno_runtime::deno_node::PackageJson;
 use deno_runtime::deno_tls::deno_native_certs::load_native_certs;
 use deno_runtime::deno_tls::rustls;
@@ -51,6 +50,7 @@ use deno_runtime::deno_tls::rustls_pemfile;
 use deno_runtime::deno_tls::webpki_roots;
 use deno_runtime::inspector_server::InspectorServer;
 use deno_runtime::permissions::PermissionsOptions;
+use deno_terminal::colors;
 use dotenvy::from_filename;
 use once_cell::sync::Lazy;
 use once_cell::sync::OnceCell;
diff --git a/cli/diagnostics.rs b/cli/diagnostics.rs
index f6f68e1d0..7eff66d76 100644
--- a/cli/diagnostics.rs
+++ b/cli/diagnostics.rs
@@ -11,7 +11,7 @@ use deno_ast::SourcePos;
 use deno_ast::SourceRange;
 use deno_ast::SourceRanged;
 use deno_ast::SourceTextInfo;
-use deno_runtime::colors;
+use deno_terminal::colors;
 use unicode_width::UnicodeWidthStr;
 
 use crate::cache::LazyGraphSourceParser;
diff --git a/cli/main.rs b/cli/main.rs
index 3f49677d8..9d0ade085 100644
--- a/cli/main.rs
+++ b/cli/main.rs
@@ -42,9 +42,9 @@ use deno_core::error::JsError;
 use deno_core::futures::FutureExt;
 use deno_core::unsync::JoinHandle;
 use deno_npm::resolution::SnapshotFromLockfileError;
-use deno_runtime::colors;
 use deno_runtime::fmt_errors::format_js_error;
 use deno_runtime::tokio_util::create_and_run_current_thread_with_maybe_metrics;
+use deno_terminal::colors;
 use factory::CliFactory;
 use std::env;
 use std::env::current_exe;
diff --git a/cli/module_loader.rs b/cli/module_loader.rs
index 0058b9be0..4b120796b 100644
--- a/cli/module_loader.rs
+++ b/cli/module_loader.rs
@@ -52,10 +52,10 @@ use deno_graph::JsonModule;
 use deno_graph::Module;
 use deno_graph::Resolution;
 use deno_lockfile::Lockfile;
-use deno_runtime::colors;
 use deno_runtime::deno_fs;
 use deno_runtime::permissions::PermissionsContainer;
 use deno_semver::npm::NpmPackageReqReference;
+use deno_terminal::colors;
 use std::borrow::Cow;
 use std::collections::HashSet;
 use std::pin::Pin;
diff --git a/cli/tools/bundle.rs b/cli/tools/bundle.rs
index 33ec78fc9..4099ad41a 100644
--- a/cli/tools/bundle.rs
+++ b/cli/tools/bundle.rs
@@ -4,7 +4,7 @@ use std::path::PathBuf;
 
 use deno_core::error::AnyError;
 use deno_graph::Module;
-use deno_runtime::colors;
+use deno_terminal::colors;
 
 use crate::args::BundleFlags;
 use crate::args::CliOptions;
diff --git a/cli/tools/check.rs b/cli/tools/check.rs
index 90a1d0299..6e14d09f5 100644
--- a/cli/tools/check.rs
+++ b/cli/tools/check.rs
@@ -9,8 +9,8 @@ use deno_ast::ModuleSpecifier;
 use deno_core::error::AnyError;
 use deno_graph::Module;
 use deno_graph::ModuleGraph;
-use deno_runtime::colors;
 use deno_runtime::deno_node::NodeResolver;
+use deno_terminal::colors;
 use once_cell::sync::Lazy;
 use regex::Regex;
 
diff --git a/cli/tools/compile.rs b/cli/tools/compile.rs
index a97ddcdf8..70baed669 100644
--- a/cli/tools/compile.rs
+++ b/cli/tools/compile.rs
@@ -11,7 +11,7 @@ use deno_core::error::generic_error;
 use deno_core::error::AnyError;
 use deno_core::resolve_url_or_path;
 use deno_graph::GraphKind;
-use deno_runtime::colors;
+use deno_terminal::colors;
 use std::path::Path;
 use std::path::PathBuf;
 use std::sync::Arc;
diff --git a/cli/tools/info.rs b/cli/tools/info.rs
index a9d6a8c59..30ceb98e4 100644
--- a/cli/tools/info.rs
+++ b/cli/tools/info.rs
@@ -20,10 +20,10 @@ use deno_graph::Resolution;
 use deno_npm::resolution::NpmResolutionSnapshot;
 use deno_npm::NpmPackageId;
 use deno_npm::NpmResolutionPackage;
-use deno_runtime::colors;
 use deno_semver::npm::NpmPackageNvReference;
 use deno_semver::npm::NpmPackageReqReference;
 use deno_semver::package::PackageNv;
+use deno_terminal::colors;
 
 use crate::args::Flags;
 use crate::args::InfoFlags;
diff --git a/cli/tools/jupyter/mod.rs b/cli/tools/jupyter/mod.rs
index c74b29586..ea58328bb 100644
--- a/cli/tools/jupyter/mod.rs
+++ b/cli/tools/jupyter/mod.rs
@@ -13,11 +13,11 @@ use deno_core::located_script_name;
 use deno_core::resolve_url_or_path;
 use deno_core::serde::Deserialize;
 use deno_core::serde_json;
-use deno_runtime::colors;
 use deno_runtime::deno_io::Stdio;
 use deno_runtime::deno_io::StdioPipe;
 use deno_runtime::permissions::Permissions;
 use deno_runtime::permissions::PermissionsContainer;
+use deno_terminal::colors;
 use tokio::sync::mpsc;
 use tokio::sync::mpsc::unbounded_channel;
 use tokio::sync::mpsc::UnboundedSender;
diff --git a/cli/tools/registry/mod.rs b/cli/tools/registry/mod.rs
index 22f53dab4..5f03fa6fd 100644
--- a/cli/tools/registry/mod.rs
+++ b/cli/tools/registry/mod.rs
@@ -15,8 +15,8 @@ use deno_core::futures::FutureExt;
 use deno_core::serde_json;
 use deno_core::serde_json::json;
 use deno_core::unsync::JoinSet;
-use deno_runtime::colors;
 use deno_runtime::deno_fetch::reqwest;
+use deno_terminal::colors;
 use import_map::ImportMap;
 use lsp_types::Url;
 use serde::Serialize;
diff --git a/cli/tools/run/hmr.rs b/cli/tools/run/hmr.rs
index bfed22d07..88f90f680 100644
--- a/cli/tools/run/hmr.rs
+++ b/cli/tools/run/hmr.rs
@@ -11,7 +11,7 @@ use deno_core::serde_json::json;
 use deno_core::serde_json::{self};
 use deno_core::url::Url;
 use deno_core::LocalInspectorSession;
-use deno_runtime::colors;
+use deno_terminal::colors;
 use std::collections::HashMap;
 use std::path::PathBuf;
 use std::sync::Arc;
diff --git a/cli/tsc/diagnostics.rs b/cli/tsc/diagnostics.rs
index 2030b5ba2..362385c07 100644
--- a/cli/tsc/diagnostics.rs
+++ b/cli/tsc/diagnostics.rs
@@ -2,7 +2,7 @@
 
 use deno_ast::ModuleSpecifier;
 use deno_graph::ModuleGraph;
-use deno_runtime::colors;
+use deno_terminal::colors;
 
 use deno_core::serde::Deserialize;
 use deno_core::serde::Deserializer;
diff --git a/cli/util/progress_bar/renderer.rs b/cli/util/progress_bar/renderer.rs
index aed4c54b9..a8eb07636 100644
--- a/cli/util/progress_bar/renderer.rs
+++ b/cli/util/progress_bar/renderer.rs
@@ -2,7 +2,7 @@
 
 use std::time::Duration;
 
-use deno_runtime::colors;
+use deno_terminal::colors;
 
 use crate::util::display::human_download_size;
 
diff --git a/cli/worker.rs b/cli/worker.rs
index 4423f3228..e5a750597 100644
--- a/cli/worker.rs
+++ b/cli/worker.rs
@@ -23,7 +23,6 @@ use deno_core::PollEventLoopOptions;
 use deno_core::SharedArrayBufferStore;
 use deno_core::SourceMapGetter;
 use deno_lockfile::Lockfile;
-use deno_runtime::colors;
 use deno_runtime::deno_broadcast_channel::InMemoryBroadcastChannel;
 use deno_runtime::deno_fs;
 use deno_runtime::deno_node;
@@ -44,6 +43,7 @@ use deno_runtime::BootstrapOptions;
 use deno_runtime::WorkerLogLevel;
 use deno_semver::npm::NpmPackageReqReference;
 use deno_semver::package::PackageReqReference;
+use deno_terminal::colors;
 use tokio::select;
 
 use crate::args::package_json::PackageJsonDeps;
@@ -583,7 +583,7 @@ impl CliMainWorkerFactory {
         locale: deno_core::v8::icu::get_language_tag(),
         location: shared.options.location.clone(),
         no_color: !colors::use_color(),
-        is_tty: colors::is_tty(),
+        is_tty: deno_terminal::is_stdout_tty(),
         unstable: shared.options.unstable,
         unstable_features,
         user_agent: version::get_user_agent().to_string(),
@@ -789,7 +789,7 @@ fn create_web_worker_callback(
         locale: deno_core::v8::icu::get_language_tag(),
         location: Some(args.main_module.clone()),
         no_color: !colors::use_color(),
-        is_tty: colors::is_tty(),
+        is_tty: deno_terminal::is_stdout_tty(),
         unstable: shared.options.unstable,
         unstable_features,
         user_agent: version::get_user_agent().to_string(),