Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 32 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ impl<R: AsyncRead + Unpin> AsyncJsonStreamReader<R> {
}

/// Peek at the next JSON token without consuming it.
async fn peek_token(&mut self) -> Result<Option<JsonToken>, AsyncJsonStreamReaderError> {
pub async fn peek_token(&mut self) -> Result<Option<JsonToken>, AsyncJsonStreamReaderError> {
let saved_position = self.position;
let saved_depth = self.depth;
let saved_state = self.state;
Expand Down Expand Up @@ -706,7 +706,7 @@ impl<R: AsyncRead + Unpin> AsyncJsonStreamReader<R> {
}
}

async fn skip_value(&mut self) -> Result<(), AsyncJsonStreamReaderError> {
pub async fn skip_value(&mut self) -> Result<(), AsyncJsonStreamReaderError> {
let value_start_depth = self.depth;
let token =
self.next_token()
Expand Down Expand Up @@ -741,6 +741,7 @@ impl<R: AsyncRead + Unpin> AsyncJsonStreamReader<R> {
});
}
}
self.state = ReaderState::Object;
Ok(())
}

Expand Down Expand Up @@ -1081,6 +1082,35 @@ mod tests {
assert!(reader.next_object_entry().await.unwrap().is_none());
}

#[tokio::test]
async fn test_skip_value_resets_state_for_next_entry() {
let mut reader = create_reader(r#"{"a": {"x": 1}, "b": 2}"#);

let key = reader.next_object_entry().await.unwrap().unwrap();
assert_eq!(key, "a");

// Explicitly skip the value for "a".
reader.skip_value().await.unwrap();

let key = reader.next_object_entry().await.unwrap().unwrap();
assert_eq!(key, "b");
assert_eq!(reader.read_number::<i32>().await.unwrap(), 2);
}

#[tokio::test]
async fn test_peek_token_does_not_consume() {
let mut reader = create_reader(r#"{"a": 1}"#);

assert_eq!(
reader.peek_token().await.unwrap(),
Some(JsonToken::StartObject)
);
assert_eq!(
reader.next_token().await.unwrap(),
Some(JsonToken::StartObject)
);
}

#[tokio::test]
async fn test_skip_value_object() {
let mut reader = create_reader(r#"{"name": {"first": "John", "last": "Doe"}, "age": 30}"#);
Expand Down