feat: jsonc and json5 imports

Cargo.toml

@@ -53,23 +53,28 @@ members = [
 ]
 exclude = ["tests/util/std/hash/_wasm"]
 
+[patch.crates-io]
+deno_graph = { path = "../deno_graph" }
+eszip = { path = "../eszip" }
+deno_doc = { path = "../deno_doc" }
+
 [workspace.package]
 authors = ["the Deno authors"]
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/denoland/deno"
 
 [workspace.dependencies]
-deno_ast = { version = "=0.50.3", features = ["transpiling"] }
+deno_ast = { version = "=0.51.0", features = ["transpiling"] }
 deno_core = { version = "0.367.0" }
 
-deno_cache_dir = "=0.25.0"
+deno_cache_dir = "=0.26.1"
 deno_doc = "=0.186.0"
 deno_error = "=0.7.0"
 deno_graph = { version = "=0.103.1", default-features = false }
-deno_lint = "=0.80.0"
+deno_lint = "=0.81.0"
 deno_lockfile = "=0.32.2"
-deno_media_type = { version = "=0.2.9", features = ["module_specifier"] }
+deno_media_type = { version = "=0.3.2", features = ["module_specifier"] }
 deno_native_certs = "0.3.0"
 deno_npm = "=0.42.0"
 deno_path_util = "=0.6.4"
@@ -196,6 +201,7 @@ indexmap = { version = "2", features = ["serde"] }
 ipnet = "2.3"
 ipnetwork = "0.20.0"
 itertools = "0.14"
+json5 = "0.4.1"
 jsonc-parser = { version = "0.27.0", features = ["serde"] }
 jupyter_runtime = "=0.19.0"
 lazy-regex = "3"
@@ -308,7 +314,7 @@ dprint-core = "=0.67.4"
 dprint-plugin-json = "=0.21.0"
 dprint-plugin-jupyter = "=0.2.1"
 dprint-plugin-markdown = "=0.20.0"
-dprint-plugin-typescript = "=0.95.11"
+dprint-plugin-typescript = "=0.95.12"
 env_logger = "=0.11.6"
 fancy-regex = "=0.14.0"
 libsui = "0.10.0"

cli/Cargo.toml

@@ -133,6 +133,7 @@ http-body.workspace = true
 http-body-util.workspace = true
 import_map.workspace = true
 indexmap.workspace = true
+json5.workspace = true
 jsonc-parser = { workspace = true, features = ["cst", "serde"] }
 jupyter-protocol = "0.8.0"
 jupyter_runtime = { package = "runtimelib", version = "=0.28.0", default-features = false, features = ["tokio-runtime", "aws-lc-rs"] }

cli/cache/module_info.rs

@@ -305,12 +305,14 @@ fn serialize_media_type(media_type: MediaType) -> i64 {
     Dcts => 10,
     Tsx => 11,
     Json => 12,
-    Wasm => 13,
-    Css => 14,
-    Html => 15,
-    SourceMap => 16,
-    Sql => 17,
-    Unknown => 18,
+    Jsonc => 13,
+    Json5 => 14,
+    Wasm => 15,
+    Css => 16,
+    Html => 17,
+    SourceMap => 18,
+    Sql => 19,
+    Unknown => 20,
   }
 }
 

cli/lib/loader.rs

@@ -16,13 +16,12 @@ pub fn module_type_from_media_and_requested_type(
   match requested_module_type {
     RequestedModuleType::Text => ModuleType::Text,
     RequestedModuleType::Bytes => ModuleType::Bytes,
-    RequestedModuleType::None
-    | RequestedModuleType::Other(_)
-    | RequestedModuleType::Json => match media_type {
+    RequestedModuleType::None | RequestedModuleType::Json => match media_type {
       MediaType::Json => ModuleType::Json,
       MediaType::Wasm => ModuleType::Wasm,
       _ => ModuleType::JavaScript,
     },
+    RequestedModuleType::Other(t) => ModuleType::Other(t.clone()),
   }
 }
 
@@ -67,6 +66,12 @@ pub fn as_deno_resolver_requested_module_type(
     RequestedModuleType::Bytes => {
       deno_resolver::loader::RequestedModuleType::Bytes
     }
+    RequestedModuleType::Other(Cow::Borrowed("jsonc")) => {
+      deno_resolver::loader::RequestedModuleType::Jsonc
+    }
+    RequestedModuleType::Other(Cow::Borrowed("json5")) => {
+      deno_resolver::loader::RequestedModuleType::Json5
+    }
     RequestedModuleType::Other(text) => {
       deno_resolver::loader::RequestedModuleType::Other(text)
     }

cli/lib/standalone/binary.rs

@@ -243,12 +243,14 @@ fn serialize_media_type(media_type: MediaType) -> u8 {
     MediaType::Dcts => 9,
     MediaType::Tsx => 10,
     MediaType::Json => 11,
-    MediaType::Wasm => 12,
-    MediaType::Css => 13,
-    MediaType::Html => 14,
-    MediaType::SourceMap => 15,
-    MediaType::Sql => 16,
-    MediaType::Unknown => 17,
+    MediaType::Jsonc => 12,
+    MediaType::Json5 => 13,
+    MediaType::Wasm => 14,
+    MediaType::Css => 15,
+    MediaType::Html => 16,
+    MediaType::SourceMap => 17,
+    MediaType::Sql => 18,
+    MediaType::Unknown => 19,
   }
 }
 

cli/lsp/config.rs

@@ -1053,6 +1053,8 @@ impl Config {
       | MediaType::Dcts
       | MediaType::Tsx => Some(&workspace_settings.typescript),
       MediaType::Json
+      | MediaType::Jsonc
+      | MediaType::Json5
       | MediaType::Wasm
       | MediaType::Css
       | MediaType::Html

cli/lsp/diagnostics.rs

@@ -935,7 +935,7 @@ fn diagnose_resolution(
           if module.media_type == MediaType::Json {
             match maybe_assert_type {
               // The module has the correct assertion type, no diagnostic
-              Some("json" | "text" | "bytes") => (),
+              Some("json" | "jsonc" | "json5" | "text" | "bytes") => (),
               // The dynamic import statement is missing an attribute type, which
               // we might not be able to statically detect, therefore we will
               // not provide a potentially incorrect diagnostic.

cli/lsp/documents.rs

@@ -145,6 +145,10 @@ impl OpenDocument {
     self.language_id.is_diagnosable()
   }
 
+  pub fn is_diagnosable_or_typed(&self) -> bool {
+    self.language_id.is_diagnosable_or_typed()
+  }
+
   pub fn is_file_like(&self) -> bool {
     uri_is_file_like(&self.uri)
   }
@@ -1714,7 +1718,8 @@ pub enum LanguageId {
   TypeScript,
   Tsx,
   Json,
-  JsonC,
+  Jsonc,
+  Json5,
   Markdown,
   Html,
   Css,
@@ -1739,7 +1744,8 @@ impl LanguageId {
       LanguageId::TypeScript => Some("ts"),
       LanguageId::Tsx => Some("tsx"),
       LanguageId::Json => Some("json"),
-      LanguageId::JsonC => Some("jsonc"),
+      LanguageId::Jsonc => Some("jsonc"),
+      LanguageId::Json5 => Some("json5"),
       LanguageId::Markdown => Some("md"),
       LanguageId::Html => Some("html"),
       LanguageId::Css => Some("css"),
@@ -1759,14 +1765,16 @@ impl LanguageId {
 
   pub fn as_content_type(&self) -> Option<&'static str> {
     match self {
-      LanguageId::JavaScript => Some("application/javascript"),
-      LanguageId::Jsx => Some("text/jsx"),
-      LanguageId::TypeScript => Some("application/typescript"),
-      LanguageId::Tsx => Some("text/tsx"),
-      LanguageId::Json | LanguageId::JsonC => Some("application/json"),
+      LanguageId::JavaScript => MediaType::JavaScript.as_content_type(),
+      LanguageId::Jsx => MediaType::Jsx.as_content_type(),
+      LanguageId::TypeScript => MediaType::TypeScript.as_content_type(),
+      LanguageId::Tsx => MediaType::Tsx.as_content_type(),
+      LanguageId::Json => MediaType::Json.as_content_type(),
+      LanguageId::Jsonc => MediaType::Jsonc.as_content_type(),
+      LanguageId::Json5 => MediaType::Json5.as_content_type(),
       LanguageId::Markdown => Some("text/markdown"),
-      LanguageId::Html => Some("text/html"),
-      LanguageId::Css => Some("text/css"),
+      LanguageId::Html => MediaType::Html.as_content_type(),
+      LanguageId::Css => MediaType::Css.as_content_type(),
       LanguageId::Scss => None,
       LanguageId::Sass => None,
       LanguageId::Less => None,
@@ -1787,6 +1795,19 @@ impl LanguageId {
       Self::JavaScript | Self::Jsx | Self::TypeScript | Self::Tsx
     )
   }
+
+  fn is_diagnosable_or_typed(&self) -> bool {
+    matches!(
+      self,
+      Self::JavaScript
+        | Self::Jsx
+        | Self::TypeScript
+        | Self::Tsx
+        | Self::Json
+        | Self::Jsonc
+        | Self::Json5
+    )
+  }
 }
 
 impl FromStr for LanguageId {
@@ -1799,7 +1820,8 @@ impl FromStr for LanguageId {
       "typescript" => Ok(Self::TypeScript),
       "typescriptreact" | "tsx" => Ok(Self::Tsx),
       "json" => Ok(Self::Json),
-      "jsonc" => Ok(Self::JsonC),
+      "jsonc" => Ok(Self::Jsonc),
+      "json5" => Ok(Self::Json5),
       "markdown" => Ok(Self::Markdown),
       "html" => Ok(Self::Html),
       "css" => Ok(Self::Css),