fix: json parse error handle (#124)

Author: stormslowly

Cargo.lock

@@ -91,7 +91,7 @@ json-strip-comments = "1.0.2"
 rustc-hash          = { version = "2.0.0", default-features = false, features = ["std"] }
 thiserror           = "2.0.17"
 
-pnp = { version = "0.12.4", optional = true }
+pnp = { version = "0.12.5", optional = true }
 
 async-trait       = "0.1.84"
 document-features = { version = "0.2.8", optional = true }

Cargo.toml

@@ -9,7 +9,6 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "enhanced-resolve": "^5.17.1",
-    "oxc-resolver": "latest"
+    "enhanced-resolve": "^5.17.1"
   }
 }

fixtures/pnpm-workspace/package.json

@@ -1,5 +1,8 @@
 export default {
-  "*.rs": () => "cargo fmt",
+  "*.rs": [
+    () => "cargo fmt",
+    () => "cargo clippy  --all-features -- -D warnings"
+  ],
   "*.{ts,tsx,js,mjs,yml,yaml}": "pnpm exec prettier --write",
   "package.json": "pnpm exec prettier --write",
   "*.toml": "pnpm exec taplo format"

lint-staged.config.mjs

@@ -39,6 +39,6 @@
   "packageManager": "pnpm@9.11.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/oxc-project/oxc-resolver.git"
+    "url": "git+https://web-infra-dev/rspack-resolver.git"
   }
 }

package.json

@@ -331,16 +331,25 @@ impl CachedPathImpl {
                 return Err(ResolveError::from(io_err));
               }
             };
-
-            let (line, column) = off_to_location(&package_json_string, parse_err.index());
-
-            Err(ResolveError::JSON(JSONError {
-              path: package_json_path,
-              message: format!("Parsing error: {:?}", parse_err.error()),
-              line,
-              column,
-              content: Some(package_json_string),
-            }))
+            let serde_err = serde_json::from_str::<serde_json::Value>(&package_json_string).err();
+
+            if let Some(err) = serde_err {
+              Err(ResolveError::from_serde_json_error(
+                package_json_path,
+                &err,
+                Some(package_json_string),
+              ))
+            } else {
+              let (line, column) = off_to_location(&package_json_string, parse_err.index());
+
+              Err(ResolveError::JSON(JSONError {
+                path: package_json_path,
+                message: parse_err.error().to_string(),
+                line,
+                column,
+                content: Some(package_json_string),
+              }))
+            }
           }
         }
       })