improve error reporting of JSON parsing #3676
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The latest updates on your projects. Learn more about Vercel for Git ↗︎
6 Ignored Deployments
|
sokra
force-pushed
the
sokra/web-504-serde_json-errors-are-very-bad
branch
from
68a3e46
to
bfc4c84
Compare
|
Benchmark for d409965Click to view benchmark
|
Benchmark for 23c75b8
Click to view full benchmark
|
jridgewell
approved these changes
Feb 7, 2023
Comment on lines
+1412
to
+1418
| let de = &mut serde_json::Deserializer::from_reader(file.read()); | ||
| match serde_path_to_error::deserialize(de) { | ||
| Ok(data) => FileJsonContent::Content(data), | ||
| Err(e) => FileJsonContent::Unparseable( | ||
| box UnparseableJson::from_serde_path_to_error(e), | ||
| ), | ||
| } |
There was a problem hiding this comment.
Should this be using parse_json_rope_with_source_context?
There was a problem hiding this comment.
No, since we don't want it wrapped in an anyhow error here, but return a structured error.
make source context generation more reusable
more visible marker spacing, marker, make it prettier
sokra
force-pushed
the
sokra/web-504-serde_json-errors-are-very-bad
branch
from
d4c1fbe
to
74b823c
Compare
sokra
added
the
pr: automerge
Benchmark for 3ea0f81
Click to view full benchmark
|
alexkirsz
reviewed
Feb 8, 2023
| pub fn write_with_content(&self, writer: &mut impl Write, text: &str) -> std::fmt::Result { | ||
| writeln!(writer, "{}", self.message)?; | ||
| if let Some(path) = &self.path { | ||
| writeln!(writer, " at {}", path)?; |
There was a problem hiding this comment.
I think the at is redundant here. We can remove it and the error would read more easily.
| FileJsonContent::Content(data) => { | ||
| let js_str_content = serde_json::to_string(data)?; | ||
| let inner_code = | ||
| format!("__turbopack_export_value__(JSON.parse({js_str_content}));"); |
There was a problem hiding this comment.
This is broken, it no longer "stringifies the string" and just puts the raw JSON into the file
timneutkens
pushed a commit
to vercel/next.js
that referenced
this pull request
Feb 10, 2023
…49736102+kodiakhq[bot]@users.noreply.github.com> # New Features - vercel/turbo#3540 - vercel/turbo#3549 - vercel/turbo#3465 - vercel/turbo#3550 - vercel/turbo#3495 - vercel/turbo#3624 - vercel/turbo#3600 - vercel/turbo#3676 - vercel/turbo#3689 # Fixes - vercel/turbo#3437 - vercel/turbo#3542 - vercel/turbo#3531 - vercel/turbo#3552 - vercel/turbo#3551 - vercel/turbo#3597 - vercel/turbo#3644 - vercel/turbo#3623 - vercel/turbo#3634 - vercel/turbo#3574 - vercel/turbo#3673 - vercel/turbo#3675 - vercel/turbo#3723 - vercel/turbo#3677 - vercel/turbo#3717 - vercel/turbo#3701 # Performance Improvements - vercel/turbo#3361 - vercel/turbo#3619 --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
jridgewell
pushed a commit
to vercel/next.js
that referenced
this pull request
Mar 10, 2023
also make source context generation more reusable
This adds a source context snippet of the JSON that failed parsing and
the json path to the error.
```
An error occurred while generating the chunk item [project]/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)
at Execution of module_factory failed
at Execution of JsonChunkItem::content failed
at Unable to make a module from invalid JSON: expected `,` or `}` at line 3 column 26
at nested.?
1 | {
2 | "nested": {
| v
3 | "this-is": "invalid" // lint-staged will remove trailing commas, so here's a comment
| ^
4 | }
5 | }
```
sokra
added a commit
to vercel/next.js
that referenced
this pull request
Mar 13, 2023
also make source context generation more reusable
This adds a source context snippet of the JSON that failed parsing and
the json path to the error.
```
An error occurred while generating the chunk item [project]/crates/turbopack-tests/tests/snapshot/imports/json/input/invalid.json (json)
at Execution of module_factory failed
at Execution of JsonChunkItem::content failed
at Unable to make a module from invalid JSON: expected `,` or `}` at line 3 column 26
at nested.?
1 | {
2 | "nested": {
| v
3 | "this-is": "invalid" // lint-staged will remove trailing commas, so here's a comment
| ^
4 | }
5 | }
```
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
also make source context generation more reusable
This adds a source context snippet of the JSON that failed parsing and the json path to the error.