chore: Improve naming

Signed-off-by: Dmitry Dygalo <[email protected]>
Stranger6667 · Oct 12, 2024 · 0aa7094 · 0aa7094
1 parent 5c08677
commit 0aa7094
Show file tree

Hide file tree

Showing 48 changed files with 258 additions and 246 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,11 @@
 - Improve error messages on URI resolving and parsing.
 - **BREAKING**: Replace `JsonPointer` in favor of `Location`.
 
+### Deprecated
+
+- `PathChunkRef` in favor of `LocationSegment`.
+- `JsonPointerNode` in favor of `LazyLocation`.
+
 ### Fixed
 
 - Resolving file references on Windows. [#441](https://github.com/Stranger6667/jsonschema-rs/issues/441)

diff --git a/crates/jsonschema-py/src/lib.rs b/crates/jsonschema-py/src/lib.rs
@@ -275,7 +275,7 @@ fn to_error_message(error: &jsonschema::ValidationError<'_>) -> String {
 /// If your workflow implies validating against the same schema, consider using `validator_for(...).is_valid`
 /// instead.
 #[pyfunction]
-#[allow(unused_variables)]
+#[allow(unused_variables, clippy::too_many_arguments)]
 #[pyo3(signature = (schema, instance, draft=None, with_meta_schemas=false, formats=None, validate_formats=None, ignore_unknown_formats=true))]
 fn is_valid(
     py: Python<'_>,
@@ -311,7 +311,7 @@ fn is_valid(
 /// If your workflow implies validating against the same schema, consider using `validator_for(...).validate`
 /// instead.
 #[pyfunction]
-#[allow(unused_variables)]
+#[allow(unused_variables, clippy::too_many_arguments)]
 #[pyo3(signature = (schema, instance, draft=None, with_meta_schemas=false, formats=None, validate_formats=None, ignore_unknown_formats=true))]
 fn validate(
     py: Python<'_>,
@@ -342,7 +342,7 @@ fn validate(
 /// If your workflow implies validating against the same schema, consider using `validator_for().iter_errors`
 /// instead.
 #[pyfunction]
-#[allow(unused_variables)]
+#[allow(unused_variables, clippy::too_many_arguments)]
 #[pyo3(signature = (schema, instance, draft=None, with_meta_schemas=false, formats=None, validate_formats=None, ignore_unknown_formats=true))]
 fn iter_errors(
     py: Python<'_>,
@@ -571,7 +571,7 @@ impl JSONSchema {
     ///
     /// Use it if you have your schema as a string and want to utilize Rust JSON parsing.
     #[classmethod]
-    #[allow(unused_variables)]
+    #[allow(unused_variables, clippy::too_many_arguments)]
     #[pyo3(signature = (string, draft=None, with_meta_schemas=false, formats=None, validate_formats=None, ignore_unknown_formats=true))]
     fn from_str(
         _: &Bound<'_, PyType>,

diff --git a/crates/jsonschema/src/compiler.rs b/crates/jsonschema/src/compiler.rs
@@ -9,7 +9,7 @@ use crate::{
     },
     node::SchemaNode,
     options::ValidationOptions,
-    paths::{Location, PathChunkRef},
+    paths::{Location, LocationSegment},
     primitive_type::{PrimitiveType, PrimitiveTypesBitMap},
     retriever::RetrieverAdapter,
     ValidationError, Validator,
@@ -88,7 +88,7 @@ impl<'a> Context<'a> {
     }
 
     #[inline]
-    pub(crate) fn new_at_location(&'a self, chunk: impl Into<PathChunkRef<'a>>) -> Self {
+    pub(crate) fn new_at_location(&'a self, chunk: impl Into<LocationSegment<'a>>) -> Self {
         let location = self.location.join(chunk);
         Context {
             config: Arc::clone(&self.config),

diff --git a/crates/jsonschema/src/keywords/additional_items.rs b/crates/jsonschema/src/keywords/additional_items.rs
@@ -3,7 +3,7 @@ use crate::{
     error::{error, no_error, ErrorIterator, ValidationError},
     keywords::{boolean::FalseValidator, CompilationResult},
     node::SchemaNode,
-    paths::{JsonPointerNode, Location},
+    paths::{LazyLocation, Location},
     primitive_type::{PrimitiveType, PrimitiveTypesBitMap},
     validator::Validate,
 };
@@ -43,7 +43,7 @@ impl Validate for AdditionalItemsObjectValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Array(items) = instance {
             let errors: Vec<_> = items
@@ -85,7 +85,7 @@ impl Validate for AdditionalItemsBooleanValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Array(items) = instance {
             if items.len() > self.items_count {

diff --git a/crates/jsonschema/src/keywords/additional_properties.rs b/crates/jsonschema/src/keywords/additional_properties.rs
@@ -12,7 +12,7 @@ use crate::{
     keywords::CompilationResult,
     node::SchemaNode,
     output::{Annotations, BasicOutput, OutputUnit},
-    paths::{JsonPointerNode, Location},
+    paths::{LazyLocation, Location},
     properties::*,
     validator::{PartialApplication, Validate},
 };
@@ -101,7 +101,7 @@ impl Validate for AdditionalPropertiesValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Object(item) = instance {
             let errors: Vec<_> = item
@@ -117,7 +117,7 @@ impl Validate for AdditionalPropertiesValidator {
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         if let Value::Object(item) = instance {
             let mut matched_props = Vec::with_capacity(item.len());
@@ -170,7 +170,7 @@ impl Validate for AdditionalPropertiesFalseValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Object(item) = instance {
             if let Some((_, value)) = item.iter().next() {
@@ -243,7 +243,7 @@ impl<M: PropertiesValidatorsMap> Validate for AdditionalPropertiesNotEmptyFalseV
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Object(item) = instance {
             let mut errors = vec![];
@@ -274,7 +274,7 @@ impl<M: PropertiesValidatorsMap> Validate for AdditionalPropertiesNotEmptyFalseV
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         if let Value::Object(item) = instance {
             let mut unexpected = Vec::with_capacity(item.len());
@@ -379,7 +379,7 @@ impl<M: PropertiesValidatorsMap> Validate for AdditionalPropertiesNotEmptyValida
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Object(map) = instance {
             let mut errors = vec![];
@@ -401,7 +401,7 @@ impl<M: PropertiesValidatorsMap> Validate for AdditionalPropertiesNotEmptyValida
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         if let Value::Object(map) = instance {
             let mut matched_propnames = Vec::with_capacity(map.len());
@@ -497,7 +497,7 @@ impl Validate for AdditionalPropertiesWithPatternsValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Object(item) = instance {
             let mut errors = vec![];
@@ -525,7 +525,7 @@ impl Validate for AdditionalPropertiesWithPatternsValidator {
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         if let Value::Object(item) = instance {
             let mut output = BasicOutput::default();
@@ -621,7 +621,7 @@ impl Validate for AdditionalPropertiesWithPatternsFalseValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Object(item) = instance {
             let mut errors = vec![];
@@ -658,7 +658,7 @@ impl Validate for AdditionalPropertiesWithPatternsFalseValidator {
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         if let Value::Object(item) = instance {
             let mut output = BasicOutput::default();
@@ -813,7 +813,7 @@ impl<M: PropertiesValidatorsMap> Validate for AdditionalPropertiesWithPatternsNo
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Object(item) = instance {
             let mut errors = vec![];
@@ -851,7 +851,7 @@ impl<M: PropertiesValidatorsMap> Validate for AdditionalPropertiesWithPatternsNo
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         if let Value::Object(item) = instance {
             let mut output = BasicOutput::default();
@@ -983,7 +983,7 @@ impl<M: PropertiesValidatorsMap> Validate
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if let Value::Object(item) = instance {
             let mut errors = vec![];
@@ -1031,7 +1031,7 @@ impl<M: PropertiesValidatorsMap> Validate
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         if let Value::Object(item) = instance {
             let mut output = BasicOutput::default();

diff --git a/crates/jsonschema/src/keywords/all_of.rs b/crates/jsonschema/src/keywords/all_of.rs
@@ -3,7 +3,7 @@ use crate::{
     error::{ErrorIterator, ValidationError},
     node::SchemaNode,
     output::BasicOutput,
-    paths::{JsonPointerNode, Location},
+    paths::{LazyLocation, Location},
     primitive_type::PrimitiveType,
     validator::{PartialApplication, Validate},
 };
@@ -41,7 +41,7 @@ impl Validate for AllOfValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         let errors: Vec<_> = self
             .schemas
@@ -54,7 +54,7 @@ impl Validate for AllOfValidator {
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         self.schemas
             .iter()
@@ -86,15 +86,15 @@ impl Validate for SingleValueAllOfValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         self.node.validate(instance, instance_path)
     }
 
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         self.node.apply_rooted(instance, instance_path).into()
     }

diff --git a/crates/jsonschema/src/keywords/any_of.rs b/crates/jsonschema/src/keywords/any_of.rs
@@ -2,7 +2,7 @@ use crate::{
     compiler,
     error::{error, no_error, ErrorIterator, ValidationError},
     node::SchemaNode,
-    paths::{JsonPointerNode, Location},
+    paths::{LazyLocation, Location},
     primitive_type::PrimitiveType,
     validator::{PartialApplication, Validate},
 };
@@ -49,7 +49,7 @@ impl Validate for AnyOfValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if self.is_valid(instance) {
             no_error()
@@ -65,7 +65,7 @@ impl Validate for AnyOfValidator {
     fn apply<'a>(
         &'a self,
         instance: &Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> PartialApplication<'a> {
         let mut successes = Vec::new();
         let mut failures = Vec::new();

diff --git a/crates/jsonschema/src/keywords/boolean.rs b/crates/jsonschema/src/keywords/boolean.rs
@@ -1,4 +1,4 @@
-use crate::paths::{JsonPointerNode, Location};
+use crate::paths::{LazyLocation, Location};
 
 use crate::{
     error::{error, ErrorIterator, ValidationError},
@@ -24,7 +24,7 @@ impl Validate for FalseValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         error(ValidationError::false_schema(
             self.location.clone(),

diff --git a/crates/jsonschema/src/keywords/const_.rs b/crates/jsonschema/src/keywords/const_.rs
@@ -7,7 +7,7 @@ use crate::{
 };
 use serde_json::{Map, Number, Value};
 
-use crate::paths::JsonPointerNode;
+use crate::paths::LazyLocation;
 
 struct ConstArrayValidator {
     value: Vec<Value>,
@@ -27,7 +27,7 @@ impl Validate for ConstArrayValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if self.is_valid(instance) {
             no_error()
@@ -66,7 +66,7 @@ impl Validate for ConstBooleanValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if self.is_valid(instance) {
             no_error()
@@ -104,7 +104,7 @@ impl Validate for ConstNullValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if self.is_valid(instance) {
             no_error()
@@ -147,7 +147,7 @@ impl Validate for ConstNumberValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if self.is_valid(instance) {
             no_error()
@@ -189,7 +189,7 @@ impl Validate for ConstObjectValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if self.is_valid(instance) {
             no_error()
@@ -231,7 +231,7 @@ impl Validate for ConstStringValidator {
     fn validate<'instance>(
         &self,
         instance: &'instance Value,
-        instance_path: &JsonPointerNode,
+        instance_path: &LazyLocation,
     ) -> ErrorIterator<'instance> {
         if self.is_valid(instance) {
             no_error()