fix(spa): changes (revert for wp 0.5)

Gir.toml

@@ -282,7 +282,7 @@ trust_return_value_nullability = true
 	pattern = "(.*valist|new_array|new_object|object_get|parse_array|parse_object)"
 	ignore = true
 	[[object.function]]
-	pattern = "(new_wrap|new_from_string|new_wrap_string|new_wrap_stringn|get_spa_json|get_data)"
+	pattern = "(new_wrap|new_from_string|get_spa_json|get_data)"
 	manual = true
 	[[object.function]]
 	name = "new_from_stringn"

src/spa/json/parser.rs

@@ -422,7 +422,7 @@ mod serde_impl {
 			let mut parser = if self.is_array() {
 				SpaJsonParser::new_array(&self)
 			} else {
-				SpaJsonParser::new_undefined(&self)
+				return Err(error_expected(self, SpaType::ARRAY))
 			};
 			let res = visitor.visit_seq(&mut parser)?;
 			parse_end(parser).map(|()| res)
@@ -445,7 +445,7 @@ mod serde_impl {
 			let mut parser = if self.is_object() {
 				SpaJsonParser::new_object(&self)
 			} else {
-				SpaJsonParser::new_undefined(&self)
+				return Err(error_expected(self, SpaType::OBJECT))
 			};
 			let res = visitor.visit_map(&mut parser)?;
 			parse_end(parser).map(|()| res)
@@ -468,12 +468,11 @@ mod serde_impl {
 		) -> Result<V::Value, Self::Error> {
 			let mut parser = match peek_type(self)? {
 				SpaType::OBJECT => SpaJsonParser::new_object(&self),
-				found @ SpaType::ARRAY =>
+				found =>
 					return Err(ParseError::TypeMismatch {
 						expected: SpaType::CHOICE,
 						found: Some(found),
 					}),
-				_ => SpaJsonParser::new_undefined(&self),
 			};
 			let res = visitor.visit_enum(&mut parser)?;
 			parse_end(parser).map(|()| res)