Fixes + feedback

Author: arendjr

Cargo.lock

@@ -196,7 +196,7 @@ ignore               = "0.4.23"
 indexmap             = { version = "2.7.0" }
 insta                = "1.41.1"
 natord               = "1.0.9"
-oxc_resolver         = { git = "https://github.com/arendjr/oxc-resolver.git", branch = "manifest-traits" } # "3.0.3"
+oxc_resolver         = "4.0"
 papaya               = "0.1.8"
 proc-macro2          = "1.0.86"
 quickcheck           = "1.0.3"

Cargo.toml

@@ -0,0 +1,2 @@
+
+export function foo() {}

crates/biome_dependency_graph/fixtures/frontend/node_modules/shared

@@ -137,10 +137,6 @@ impl DeserializableValue for AnyJsonValue {
             AnyJsonValue::JsonStringValue(_) => Some(DeserializableType::Str),
         }
     }
-
-    fn into_json_value(self) -> Option<AnyJsonValue> {
-        Some(self)
-    }
 }
 
 #[cfg(feature = "serde")]
@@ -257,10 +253,6 @@ impl DeserializableValue for JsonMemberName {
     fn visitable_type(&self) -> Option<DeserializableType> {
         Some(DeserializableType::Str)
     }
-
-    fn into_json_value(self) -> Option<AnyJsonValue> {
-        None
-    }
 }
 
 /// Returns `text` with escape sequences processed.

crates/biome_dependency_graph/fixtures/shared/dist/index.js

@@ -36,7 +36,6 @@ mod merge;
 mod validator;
 
 use biome_diagnostics::{Error, Severity};
-use biome_json_syntax::AnyJsonValue;
 pub use biome_rowan::TextRange;
 pub use diagnostics::{
     DeserializableType, DeserializableTypes, DeserializationAdvice, DeserializationDiagnostic,
@@ -143,9 +142,6 @@ pub trait DeserializableValue: Sized {
 
     /// Returns the type of this value.
     fn visitable_type(&self) -> Option<DeserializableType>;
-
-    /// Returns a JSON representation of the value, if possible.
-    fn into_json_value(self) -> Option<AnyJsonValue>;
 }
 
 /// This trait represents a visitor that walks through a [DeserializableValue].

crates/biome_deserialize/src/json.rs

@@ -86,6 +86,18 @@ impl FileSystem for OsFileSystem {
         path.exists()
     }
 
+    fn path_is_file(&self, path: &Utf8Path) -> bool {
+        path.is_file()
+    }
+
+    fn path_is_dir(&self, path: &Utf8Path) -> bool {
+        path.is_dir()
+    }
+
+    fn path_is_symlink(&self, path: &Utf8Path) -> bool {
+        path.is_symlink()
+    }
+
     fn path_kind(&self, path: &Utf8Path) -> Result<PathKind, FileSystemDiagnostic> {
         match path.metadata() {
             Ok(metadata) => {

crates/biome_deserialize/src/lib.rs

@@ -279,8 +279,7 @@ impl Rule for NoUndeclaredDependencies {
             ));
         };
 
-        let mut manifest_path = package_path.clone();
-        manifest_path.push("package.json");
+        let manifest_path = package_path.clone();
 
         let diag = RuleDiagnostic::new(
             rule_category!(),

crates/biome_fs/src/fs/os.rs

@@ -12,8 +12,8 @@ use biome_rowan::{AstNode, AstNodeList, BatchMutationExt};
 declare_lint_rule! {
     /// Enforce the use of the directive `"use strict"` in script files.
     ///
-    /// The JavaScript [strict mode](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode) prohibits some obsolete JavaScript syntaxes and makes some slight semantic chnmages to allow more optimizations by JavaScript engines.
-    ///  EcmaScript modules are always in strict mode, while JavaScript scripts are by default in non-strict mode, also known as _sloppy mode_.
+    /// The JavaScript [strict mode](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Strict_mode) prohibits some obsolete JavaScript syntaxes and makes some slight semantic changes to allow more optimizations by JavaScript engines.
+    /// EcmaScript modules are always in strict mode, while JavaScript scripts are by default in non-strict mode, also known as _sloppy mode_.
     /// A developer can add the `"use strict"` directive at the start of a script file to enable the strict mode in that file.
     ///
     /// Biome considers a CommonJS (`.cjs`) file as a script file.

crates/biome_js_analyze/src/lint/correctness/no_undeclared_dependencies.rs

@@ -383,8 +383,8 @@ impl DeserializationVisitor for PackageJsonVisitor {
                     result.r#type = Deserializable::deserialize(ctx, &value, &key_text);
                 }
                 key => {
-                    if let Some(value) = value.into_json_value() {
-                        result.raw_json.insert(key.into(), value.into());
+                    if let Some(value) = JsonValue::deserialize(ctx, &value, &key_text) {
+                        result.raw_json.insert(key.into(), value);
                     }
                 }
             }
@@ -410,7 +410,9 @@ impl Deserializable for Version {
 #[derive(Clone, Copy, Debug, Default, Eq, PartialEq, biome_deserialize_macros::Deserializable)]
 pub enum PackageType {
     #[default]
+    #[deserializable(rename = "module")]
     Module,
+    #[deserializable(rename = "commonjs")]
     CommonJs,
 }
 

crates/biome_js_analyze/src/lint/nursery/use_strict_mode.rs

@@ -1,3 +1,5 @@
 {
-  "baseUrl": 1
-}
+  "compilerOptions": {
+    "baseUrl": 1
+  },
+}

crates/biome_package/src/node_js_package/package_json.rs

@@ -2,11 +2,13 @@
 source: crates/biome_package/tests/manifest_spec_tests.rs
 expression: tsconfig.invalid.baseUrl.json
 ---
-tsconfig.invalid.baseUrl.json:2:14 deserialize ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+tsconfig.invalid.baseUrl.json:3:16 deserialize ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 
   × baseUrl has an incorrect type, expected a string, but received a number.
 
     1 │ {
-  > 2 │   "baseUrl": 1
-      │              ^
-    3 │ }
+    2 │   "compilerOptions": {
+  > 3 │     "baseUrl": 1
+      │                ^
+    4 │   },
+    5 │ }

crates/biome_package/tests/tsconfig/invalid/tsconfig.invalid.baseUrl.json

@@ -1,3 +1,5 @@
 {
-  "baseUrl": "src"
-}
+  "compilerOptions": {
+    "baseUrl": "src"
+  },
+}

crates/biome_package/tests/tsconfig/invalid/tsconfig.invalid.baseUrl.json.snap

@@ -5,14 +5,24 @@ expression: tsconfig.valid.baseUrl.json
 ## Input
 
 {
-  "baseUrl": "src"
+  "compilerOptions": {
+    "baseUrl": "src"
+  },
 }
 
+
 ## Data structure
 
 TsConfigJson {
-    base_url: Some(
-        "src",
-    ),
-    paths: {},
+    root: false,
+    path: "",
+    extends: None,
+    compiler_options: CompilerOptions {
+        base_url: Some(
+            "src",
+        ),
+        paths: None,
+        paths_base: "",
+    },
+    references: [],
 }

crates/biome_package/tests/tsconfig/valid/tsconfig.valid.baseUrl.json

@@ -1,9 +1,11 @@
 {
-  "baseUrl": "src",
-  "paths": {
-    "@/services": [
-      "services",
-      "vendor/services"
-    ]
-  }
-}
+  "compilerOptions": {
+    "baseUrl": "src",
+    "paths": {
+      "@/services": [
+        "services",
+        "vendor/services"
+      ]
+    }
+  },
+}

crates/biome_package/tests/tsconfig/valid/tsconfig.valid.baseUrl.json.snap

@@ -5,25 +5,37 @@ expression: tsconfig.valid.paths.json
 ## Input
 
 {
-  "baseUrl": "src",
-  "paths": {
-    "@/services": [
-      "services",
-      "vendor/services"
-    ]
-  }
+  "compilerOptions": {
+    "baseUrl": "src",
+    "paths": {
+      "@/services": [
+        "services",
+        "vendor/services"
+      ]
+    }
+  },
 }
 
+
 ## Data structure
 
 TsConfigJson {
-    base_url: Some(
-        "src",
-    ),
-    paths: {
-        "@/services": [
-            "services",
-            "vendor/services",
-        ],
+    root: false,
+    path: "",
+    extends: None,
+    compiler_options: CompilerOptions {
+        base_url: Some(
+            "src",
+        ),
+        paths: Some(
+            {
+                "@/services": [
+                    "services",
+                    "vendor/services",
+                ],
+            },
+        ),
+        paths_base: "",
     },
+    references: [],
 }