openapi-spec-validator-rs 0.2.0__tar.gz → 0.2.1__tar.gz

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/Cargo.lock

@@ -848,7 +848,7 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
 [[package]]
 name = "openapi-spec-validator-rs"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "base64",
  "fancy-regex",
@@ -864,7 +864,7 @@ dependencies = [
 
 [[package]]
 name = "openapi-spec-validator-rs-cli"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "clap",
  "insta",
@@ -875,7 +875,7 @@ dependencies = [
 
 [[package]]
 name = "openapi-spec-validator-rs-py"
-version = "0.2.0"
+version = "0.2.1"
 dependencies = [
  "clap",
  "mimalloc",

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/Cargo.toml

@@ -3,7 +3,7 @@ resolver = "3"
 members = ["crates/*"]
 
 [workspace.package]
-version = "0.2.0"
+version = "0.2.1"
 edition = "2024"
 rust-version = "1.85"
 license = "Apache-2.0"
@@ -14,8 +14,8 @@ keywords = ["openapi", "swagger", "validation", "jsonschema"]
 categories = ["command-line-utilities", "development-tools", "web-programming"]
 
 [workspace.dependencies]
-openapi-spec-validator-rs = { path = "crates/openapi-spec-validator-rs", version = "0.2.0", default-features = false }
-openapi-spec-validator-rs-cli = { path = "crates/openapi-spec-validator-rs-cli", version = "0.2.0", default-features = false }
+openapi-spec-validator-rs = { path = "crates/openapi-spec-validator-rs", version = "0.2.1", default-features = false }
+openapi-spec-validator-rs-cli = { path = "crates/openapi-spec-validator-rs-cli", version = "0.2.1", default-features = false }
 
 anyhow = "1.0.104"
 base64 = "0.23.1"

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openapi-spec-validator-rs
-Version: 0.2.0
+Version: 0.2.1
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
@@ -28,7 +28,7 @@ Project-URL: Repository, https://github.com/Arjun-Aravind/openapi-spec-validator
 **A fast, drop-in Rust companion to [openapi-spec-validator](https://github.com/python-openapi/openapi-spec-validator).**
 
 It validates Swagger 2.0 and OpenAPI 3.0, 3.1 and 3.2 documents with the same rules as
-openapi-spec-validator, returns the same verdicts, and runs 40 to 145 times faster on large
+openapi-spec-validator, returns the same verdicts, and runs 37 to 143 times faster on large
 specs. It ships as a command-line tool, a Python package with the same API, and a pre-commit
 hook. It is an independent project, not affiliated with or endorsed by the maintainers of
 openapi-spec-validator.
@@ -39,10 +39,10 @@ with its default backend):
 
 | Spec | openapi-spec-validator-rs | openapi-spec-validator | Speed-up |
 |---|---:|---:|---:|
-| GitHub (OpenAPI 3.0, JSON, 13.5 MB) | **57 ms** | 6.41 s – 8.18 s | **113–144×** |
-| GitHub (OpenAPI 3.0, YAML, 10.3 MB) | **152 ms** | 6.45 s – 8.20 s | **42–54×** |
-| Stripe (OpenAPI 3.0, JSON, 8.3 MB) | **31 ms** | 1.80 s – 2.82 s | **59–92×** |
-| Kubernetes (Swagger 2.0, JSON, 4.3 MB) | **20 ms** | 762 ms – 2.13 s | **39–109×** |
+| GitHub (OpenAPI 3.0, JSON, 13.5 MB) | **57 ms** | 6.45 s – 8.21 s | **112–143×** |
+| GitHub (OpenAPI 3.0, YAML, 10.3 MB) | **150 ms** | 6.46 s – 8.23 s | **43–55×** |
+| Stripe (OpenAPI 3.0, JSON, 8.3 MB) | **31 ms** | 1.81 s – 2.85 s | **59–93×** |
+| Kubernetes (Swagger 2.0, JSON, 4.3 MB) | **20 ms** | 766 ms – 2.14 s | **37–104×** |
 
 The `pip`-installed command runs the same validator behind a Python entry point, which adds
 about 25 ms of interpreter start-up per run: 45 ms for Kubernetes and 80 ms for GitHub's
@@ -165,7 +165,7 @@ repos:
         name: openapi-spec-validator-rs
         entry: openapi-spec-validator-rs
         language: python
-        additional_dependencies: [openapi-spec-validator-rs==0.2.0]
+        additional_dependencies: [openapi-spec-validator-rs==0.2.1]
         files: .*(openapi|swagger).*\.(json|yaml|yml)$
 ```
 
@@ -184,12 +184,13 @@ validates FastAPI's `app.openapi()` does), median of 5 runs:
 
 | Spec | openapi-spec-validator-rs | openapi-spec-validator, jsonschema-rs backend | openapi-spec-validator, default backend |
 |---|---:|---:|---:|
-| GitHub (13.5 MB) | **33 ms** | 4.67 s (143× slower) | 6.38 s (196× slower) |
-| Stripe (8.3 MB) | **16 ms** | 0.89 s (55× slower) | 1.91 s (119× slower) |
-| Kubernetes (4.3 MB) | **11 ms** | 0.33 s (29× slower) | 1.70 s (149× slower) |
+| GitHub (13.5 MB) | **30 ms** | 4.66 s (158× slower) | 6.40 s (217× slower) |
+| Stripe (8.3 MB) | **15 ms** | 0.89 s (58× slower) | 1.92 s (126× slower) |
+| Kubernetes (4.3 MB) | **11 ms** | 0.33 s (30× slower) | 1.70 s (154× slower) |
 
-It also needs about a quarter of the memory on JSON specs: 81 MiB instead of 290 MiB for
-GitHub's (98 MiB through the `pip`-installed command).
+On the same machine it also needs about a quarter of the memory on JSON specs: 84 MiB
+instead of 289 MiB for GitHub's (98 MiB through the `pip`-installed command); the ratio
+varies with the platform's allocator and Python build.
 
 Validating every spec in the APIs.guru directory that openapi-spec-validator accepts (3,646
 files, 535 MB of YAML) takes 1.6 s instead of 202–332 s.

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/README.md

@@ -3,7 +3,7 @@
 **A fast, drop-in Rust companion to [openapi-spec-validator](https://github.com/python-openapi/openapi-spec-validator).**
 
 It validates Swagger 2.0 and OpenAPI 3.0, 3.1 and 3.2 documents with the same rules as
-openapi-spec-validator, returns the same verdicts, and runs 40 to 145 times faster on large
+openapi-spec-validator, returns the same verdicts, and runs 37 to 143 times faster on large
 specs. It ships as a command-line tool, a Python package with the same API, and a pre-commit
 hook. It is an independent project, not affiliated with or endorsed by the maintainers of
 openapi-spec-validator.
@@ -14,10 +14,10 @@ with its default backend):
 
 | Spec | openapi-spec-validator-rs | openapi-spec-validator | Speed-up |
 |---|---:|---:|---:|
-| GitHub (OpenAPI 3.0, JSON, 13.5 MB) | **57 ms** | 6.41 s – 8.18 s | **113–144×** |
-| GitHub (OpenAPI 3.0, YAML, 10.3 MB) | **152 ms** | 6.45 s – 8.20 s | **42–54×** |
-| Stripe (OpenAPI 3.0, JSON, 8.3 MB) | **31 ms** | 1.80 s – 2.82 s | **59–92×** |
-| Kubernetes (Swagger 2.0, JSON, 4.3 MB) | **20 ms** | 762 ms – 2.13 s | **39–109×** |
+| GitHub (OpenAPI 3.0, JSON, 13.5 MB) | **57 ms** | 6.45 s – 8.21 s | **112–143×** |
+| GitHub (OpenAPI 3.0, YAML, 10.3 MB) | **150 ms** | 6.46 s – 8.23 s | **43–55×** |
+| Stripe (OpenAPI 3.0, JSON, 8.3 MB) | **31 ms** | 1.81 s – 2.85 s | **59–93×** |
+| Kubernetes (Swagger 2.0, JSON, 4.3 MB) | **20 ms** | 766 ms – 2.14 s | **37–104×** |
 
 The `pip`-installed command runs the same validator behind a Python entry point, which adds
 about 25 ms of interpreter start-up per run: 45 ms for Kubernetes and 80 ms for GitHub's
@@ -140,7 +140,7 @@ repos:
         name: openapi-spec-validator-rs
         entry: openapi-spec-validator-rs
         language: python
-        additional_dependencies: [openapi-spec-validator-rs==0.2.0]
+        additional_dependencies: [openapi-spec-validator-rs==0.2.1]
         files: .*(openapi|swagger).*\.(json|yaml|yml)$
 ```
 
@@ -159,12 +159,13 @@ validates FastAPI's `app.openapi()` does), median of 5 runs:
 
 | Spec | openapi-spec-validator-rs | openapi-spec-validator, jsonschema-rs backend | openapi-spec-validator, default backend |
 |---|---:|---:|---:|
-| GitHub (13.5 MB) | **33 ms** | 4.67 s (143× slower) | 6.38 s (196× slower) |
-| Stripe (8.3 MB) | **16 ms** | 0.89 s (55× slower) | 1.91 s (119× slower) |
-| Kubernetes (4.3 MB) | **11 ms** | 0.33 s (29× slower) | 1.70 s (149× slower) |
+| GitHub (13.5 MB) | **30 ms** | 4.66 s (158× slower) | 6.40 s (217× slower) |
+| Stripe (8.3 MB) | **15 ms** | 0.89 s (58× slower) | 1.92 s (126× slower) |
+| Kubernetes (4.3 MB) | **11 ms** | 0.33 s (30× slower) | 1.70 s (154× slower) |
 
-It also needs about a quarter of the memory on JSON specs: 81 MiB instead of 290 MiB for
-GitHub's (98 MiB through the `pip`-installed command).
+On the same machine it also needs about a quarter of the memory on JSON specs: 84 MiB
+instead of 289 MiB for GitHub's (98 MiB through the `pip`-installed command); the ratio
+varies with the platform's allocator and Python build.
 
 Validating every spec in the APIs.guru directory that openapi-spec-validator accepts (3,646
 files, 535 MB of YAML) takes 1.6 s instead of 202–332 s.

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/crates/openapi-spec-validator-rs/README.md

@@ -3,7 +3,7 @@
 **A fast, drop-in Rust companion to [openapi-spec-validator](https://github.com/python-openapi/openapi-spec-validator).**
 
 It validates Swagger 2.0 and OpenAPI 3.0, 3.1 and 3.2 documents with the same rules as
-openapi-spec-validator, returns the same verdicts, and runs 40 to 145 times faster on large
+openapi-spec-validator, returns the same verdicts, and runs 37 to 143 times faster on large
 specs. It ships as a command-line tool, a Python package with the same API, and a pre-commit
 hook. It is an independent project, not affiliated with or endorsed by the maintainers of
 openapi-spec-validator.
@@ -14,10 +14,10 @@ with its default backend):
 
 | Spec | openapi-spec-validator-rs | openapi-spec-validator | Speed-up |
 |---|---:|---:|---:|
-| GitHub (OpenAPI 3.0, JSON, 13.5 MB) | **57 ms** | 6.41 s – 8.18 s | **113–144×** |
-| GitHub (OpenAPI 3.0, YAML, 10.3 MB) | **152 ms** | 6.45 s – 8.20 s | **42–54×** |
-| Stripe (OpenAPI 3.0, JSON, 8.3 MB) | **31 ms** | 1.80 s – 2.82 s | **59–92×** |
-| Kubernetes (Swagger 2.0, JSON, 4.3 MB) | **20 ms** | 762 ms – 2.13 s | **39–109×** |
+| GitHub (OpenAPI 3.0, JSON, 13.5 MB) | **57 ms** | 6.45 s – 8.21 s | **112–143×** |
+| GitHub (OpenAPI 3.0, YAML, 10.3 MB) | **150 ms** | 6.46 s – 8.23 s | **43–55×** |
+| Stripe (OpenAPI 3.0, JSON, 8.3 MB) | **31 ms** | 1.81 s – 2.85 s | **59–93×** |
+| Kubernetes (Swagger 2.0, JSON, 4.3 MB) | **20 ms** | 766 ms – 2.14 s | **37–104×** |
 
 The `pip`-installed command runs the same validator behind a Python entry point, which adds
 about 25 ms of interpreter start-up per run: 45 ms for Kubernetes and 80 ms for GitHub's
@@ -140,7 +140,7 @@ repos:
         name: openapi-spec-validator-rs
         entry: openapi-spec-validator-rs
         language: python
-        additional_dependencies: [openapi-spec-validator-rs==0.2.0]
+        additional_dependencies: [openapi-spec-validator-rs==0.2.1]
         files: .*(openapi|swagger).*\.(json|yaml|yml)$
 ```
 
@@ -159,12 +159,13 @@ validates FastAPI's `app.openapi()` does), median of 5 runs:
 
 | Spec | openapi-spec-validator-rs | openapi-spec-validator, jsonschema-rs backend | openapi-spec-validator, default backend |
 |---|---:|---:|---:|
-| GitHub (13.5 MB) | **33 ms** | 4.67 s (143× slower) | 6.38 s (196× slower) |
-| Stripe (8.3 MB) | **16 ms** | 0.89 s (55× slower) | 1.91 s (119× slower) |
-| Kubernetes (4.3 MB) | **11 ms** | 0.33 s (29× slower) | 1.70 s (149× slower) |
+| GitHub (13.5 MB) | **30 ms** | 4.66 s (158× slower) | 6.40 s (217× slower) |
+| Stripe (8.3 MB) | **15 ms** | 0.89 s (58× slower) | 1.92 s (126× slower) |
+| Kubernetes (4.3 MB) | **11 ms** | 0.33 s (30× slower) | 1.70 s (154× slower) |
 
-It also needs about a quarter of the memory on JSON specs: 81 MiB instead of 290 MiB for
-GitHub's (98 MiB through the `pip`-installed command).
+On the same machine it also needs about a quarter of the memory on JSON specs: 84 MiB
+instead of 289 MiB for GitHub's (98 MiB through the `pip`-installed command); the ratio
+varies with the platform's allocator and Python build.
 
 Validating every spec in the APIs.guru directory that openapi-spec-validator accepts (3,646
 files, 535 MB of YAML) takes 1.6 s instead of 202–332 s.

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/crates/openapi-spec-validator-rs/src/document.rs

@@ -123,6 +123,9 @@ pub(crate) struct Documents<'a> {
     externals: Arena<External>,
     /// Document index by URI (without fragment): 0 is the root, `n` is `externals[n - 1]`.
     by_uri: RefCell<HashMap<String, usize>>,
+    /// The one-character strings that pointers into strings resolve to: Python indexes
+    /// a `str` like a sequence and yields a new `str` each time.
+    characters: Arena<Value>,
 }
 
 impl<'a> Documents<'a> {
@@ -138,6 +141,7 @@ impl<'a> Documents<'a> {
             retriever,
             externals: Arena::new(),
             by_uri: RefCell::new(by_uri),
+            characters: Arena::new(),
         }
     }
 
@@ -296,10 +300,74 @@ impl<'a> Documents<'a> {
                 ),
             ));
         }
-        let value = pointer(contents, fragment)?;
+        let value = self.pointer(contents, fragment)?;
         Ok(Node { value, doc })
     }
 
+    /// `Resource.pointer` from `referencing`: each segment indexes a mapping by key or a
+    /// sequence by position. A Python `str` is a sequence too, so a pointer can reach
+    /// into a string and come out with one of its characters.
+    fn pointer<'d>(&'d self, document: &'d Value, pointer: &str) -> Result<&'d Value, LookupError> {
+        let nowhere = || {
+            let mut message = format!(
+                "{} does not exist within {}",
+                pyrepr::repr_str(pointer),
+                pyrepr::repr(document)
+            );
+            if pointer == "/" {
+                message.push_str(
+                    ". The pointer '/' is a valid JSON Pointer but it points to an empty string \
+                     property ''. If you intended to point to the entire resource, you should use '#'.",
+                );
+            }
+            LookupError::referencing("PointerToNowhere", message)
+        };
+        let invalid_index = |segment: &str| {
+            LookupError::from(Crash(format!(
+                "invalid literal for int() with base 10: {}",
+                pyrepr::repr_str(segment)
+            )))
+        };
+        // `int(segment)`, then Python's negative indexing.
+        let position = |segment: &str, len: usize| -> Result<Option<usize>, LookupError> {
+            let index = python_int(segment).ok_or_else(|| invalid_index(segment))?;
+            let index = if index < 0 {
+                i128::try_from(len).unwrap_or(i128::MAX) + index
+            } else {
+                index
+            };
+            Ok(usize::try_from(index).ok().filter(|&i| i < len))
+        };
+        let decoded = percent_decode_str(&pointer[1..]).decode_utf8_lossy();
+        let mut contents = document;
+        for segment in decoded.split('/') {
+            contents = match contents {
+                Value::Array(items) => position(segment, items.len())?
+                    .map(|i| &items[i])
+                    .ok_or_else(nowhere)?,
+                Value::Object(map) => {
+                    let key = segment.replace("~1", "/").replace("~0", "~");
+                    map.get(&key).ok_or_else(nowhere)?
+                }
+                Value::String(text) => {
+                    let character = position(segment, text.chars().count())?
+                        .and_then(|i| text.chars().nth(i))
+                        .ok_or_else(nowhere)?;
+                    let index = self.characters.push(Value::String(character.to_string()));
+                    self.characters.get(index)
+                }
+                other => {
+                    return Err(Crash(format!(
+                        "'{}' object is not subscriptable",
+                        python_type_name(other)
+                    ))
+                    .into());
+                }
+            };
+        }
+        Ok(contents)
+    }
+
     /// The child `key` of a mapping node, resolved (`path / key`).
     pub fn get<'d>(&'d self, node: Node<'d>, key: &str) -> Result<Option<Node<'d>>, Crash> {
         match node.value {
@@ -368,62 +436,6 @@ pub(crate) fn as_ref(value: &Value) -> Option<&str> {
     value.as_object()?.get("$ref")?.as_str()
 }
 
-/// `Resource.pointer` from `referencing`.
-fn pointer<'d>(document: &'d Value, pointer: &str) -> Result<&'d Value, LookupError> {
-    let nowhere = || {
-        let mut message = format!(
-            "{} does not exist within {}",
-            pyrepr::repr_str(pointer),
-            pyrepr::repr(document)
-        );
-        if pointer == "/" {
-            message.push_str(
-                ". The pointer '/' is a valid JSON Pointer but it points to an empty string \
-                 property ''. If you intended to point to the entire resource, you should use '#'.",
-            );
-        }
-        LookupError::referencing("PointerToNowhere", message)
-    };
-    let decoded = percent_decode_str(&pointer[1..]).decode_utf8_lossy();
-    let mut contents = document;
-    for segment in decoded.split('/') {
-        contents = match contents {
-            Value::Array(items) => {
-                let index = python_int(segment).ok_or_else(|| {
-                    Crash(format!(
-                        "invalid literal for int() with base 10: {}",
-                        pyrepr::repr_str(segment)
-                    ))
-                })?;
-                let index = if index < 0 {
-                    i128::try_from(items.len()).unwrap_or(i128::MAX) + index
-                } else {
-                    index
-                };
-                usize::try_from(index)
-                    .ok()
-                    .and_then(|i| items.get(i))
-                    .ok_or_else(nowhere)?
-            }
-            Value::Object(map) => {
-                let key = segment.replace("~1", "/").replace("~0", "~");
-                map.get(&key).ok_or_else(nowhere)?
-            }
-            // Strings are sequences in Python, so indexing them yields a new
-            // one-character string that has no address in the document.
-            Value::String(_) => return Err(nowhere()),
-            other => {
-                return Err(Crash(format!(
-                    "'{}' object is not subscriptable",
-                    python_type_name(other)
-                ))
-                .into());
-            }
-        };
-    }
-    Ok(contents)
-}
-
 /// Python `int(s)` for base-10 literals (ASCII digits, sign, underscores, whitespace).
 fn python_int(s: &str) -> Option<i128> {
     let s = s.trim();
@@ -526,6 +538,35 @@ mod tests {
         );
     }
 
+    #[test]
+    fn pointers_index_strings_like_python() {
+        let spec = json!({
+            "info": {"title": "tx"},
+            "a": {"$ref": "#/info/title/0"},
+            "b": {"$ref": "#/info/title/-1"},
+            "c": {"$ref": "#/info/title/x"},
+            "d": {"$ref": "#/info/title/2"},
+            "e": {"$ref": "#/info/title/1/0/0"},
+        });
+        let docs = Documents::new(&spec, "", None);
+        assert_eq!(docs.child(docs.root(), "a").unwrap().value, &json!("t"));
+        assert_eq!(docs.child(docs.root(), "b").unwrap().value, &json!("x"));
+        assert_eq!(docs.child(docs.root(), "e").unwrap().value, &json!("x"));
+        assert_eq!(
+            docs.child(docs.root(), "c").unwrap_err(),
+            Crash("invalid literal for int() with base 10: 'x'".to_owned())
+        );
+        assert!(
+            docs.child(docs.root(), "d")
+                .unwrap_err()
+                .0
+                .starts_with("'/info/title/2' does not exist within")
+        );
+        // Each resolution yields a new string, as in Python.
+        let first = docs.child(docs.root(), "a").unwrap().id();
+        assert_ne!(first, docs.child(docs.root(), "a").unwrap().id());
+    }
+
     #[test]
     fn ref_cycles_hit_the_recursion_limit() {
         let spec = json!({"a": {"$ref": "#/b"}, "b": {"$ref": "#/a"}});

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/crates/openapi-spec-validator-rs/src/loader/dump.rs

@@ -20,15 +20,33 @@ enum Frame {
         items: ListRef,
         next: usize,
         out: Vec<Value>,
+        /// Dry run: how many containers deep the children reach (see `Encoder::depths`).
+        below: usize,
     },
     Dict {
         id: u32,
         next: usize,
         out: Map<String, Value>,
         key: String,
+        below: usize,
     },
 }
 
+impl Frame {
+    fn note_child(&mut self, reaches: usize) {
+        let below = match self {
+            Self::List { below, .. } | Self::Dict { below, .. } => below,
+        };
+        *below = (*below).max(reaches);
+    }
+
+    fn below(&self) -> usize {
+        match self {
+            Self::List { below, .. } | Self::Dict { below, .. } => *below,
+        }
+    }
+}
+
 #[derive(Clone, Copy)]
 enum ListRef {
     List(u32),
@@ -38,6 +56,9 @@ enum ListRef {
 enum Opened {
     Leaf(Value),
     Frame(Frame),
+    /// Dry run: a shared container already traversed without error, whose contents
+    /// reach this many containers below it.
+    Known(usize),
 }
 
 struct Encoder<'a> {
@@ -48,14 +69,41 @@ struct Encoder<'a> {
     depth_limit: usize,
     /// Strings can be moved out of the nodes when no node is reachable twice.
     move_strings: bool,
+    /// Only look for the error the encoder would raise, building nothing.
+    dry: bool,
+    /// Dry run: for each list and dict traversed without error, how many containers deep
+    /// its contents reach (an empty container counts one, a scalar none). A node shared
+    /// through aliases is then not walked again: at a new depth it either fits, or its
+    /// first error in traversal order is the recursion limit (it holds no other error).
+    list_depths: Vec<Option<usize>>,
+    dict_depths: Vec<Option<usize>>,
 }
 
+/// `check_first` runs the traversal once without building anything, so that an error
+/// (the recursion limit above all) is found before any value is materialised: when
+/// nodes are shared through aliases, the value can be far larger than the node graph,
+/// and `json.dumps` raises while holding only the text written so far.
 pub(super) fn to_value(
     nodes: &mut [Node],
     graph: &Graph,
     root: Obj,
     depth_limit: usize,
     move_strings: bool,
+    check_first: bool,
+) -> Result<Value, String> {
+    if check_first {
+        encode(nodes, graph, root, depth_limit, false, true)?;
+    }
+    encode(nodes, graph, root, depth_limit, move_strings, false)
+}
+
+fn encode(
+    nodes: &mut [Node],
+    graph: &Graph,
+    root: Obj,
+    depth_limit: usize,
+    move_strings: bool,
+    dry: bool,
 ) -> Result<Value, String> {
     let mut enc = Encoder {
         nodes,
@@ -64,10 +112,14 @@ pub(super) fn to_value(
         dict_marks: vec![false; graph.dicts.len()],
         depth_limit,
         move_strings,
+        dry,
+        list_depths: vec![None; if dry { graph.lists.len() } else { 0 }],
+        dict_depths: vec![None; if dry { graph.dicts.len() } else { 0 }],
     };
     let mut stack: Vec<Frame> = Vec::new();
     match enc.open(root, 0)? {
         Opened::Leaf(v) => return Ok(v),
+        Opened::Known(_) => return Ok(Value::Null),
         Opened::Frame(f) => stack.push(f),
     }
     loop {
@@ -94,17 +146,34 @@ pub(super) fn to_value(
             }
         };
         match child {
-            Some(obj) => match enc.open(obj, depth)? {
-                Opened::Leaf(v) => attach(top, v),
-                Opened::Frame(f) => stack.push(f),
-            },
+            Some(obj) => {
+                let container = matches!(obj, Obj::List(_) | Obj::Tuple(_) | Obj::Dict(_));
+                match enc.open(obj, depth)? {
+                    Opened::Leaf(v) => {
+                        if enc.dry {
+                            top.note_child(usize::from(container));
+                        } else {
+                            attach(top, v);
+                        }
+                    }
+                    Opened::Known(below) => top.note_child(below + 1),
+                    Opened::Frame(f) => stack.push(f),
+                }
+            }
             None => {
                 let Some(done) = stack.pop() else {
                     return Ok(Value::Null);
                 };
+                let below = done.below();
                 let value = enc.close(done);
                 match stack.last_mut() {
-                    Some(parent) => attach(parent, value),
+                    Some(parent) => {
+                        if enc.dry {
+                            parent.note_child(below + 1);
+                        } else {
+                            attach(parent, value);
+                        }
+                    }
                     None => return Ok(value),
                 }
             }
@@ -152,6 +221,7 @@ impl Encoder<'_> {
             Obj::Int(i) => Value::Number(i.into()),
             Obj::BigInt(id) => big_value(&self.graph.bigints[id as usize])?,
             Obj::Float(f) => Number::from_f64(f).map_or(Value::Null, Value::Number),
+            Obj::Str(_) if self.dry => Value::Null,
             Obj::Str(id) => Value::String(self.string(id)),
             Obj::Bytes => return Err(type_error("bytes")),
             Obj::Date => return Err(type_error("date")),
@@ -162,6 +232,19 @@ impl Encoder<'_> {
                 if parent_depth + 1 > self.depth_limit {
                     return Err(RECURSION.to_owned());
                 }
+                if self.dry {
+                    let known = match obj {
+                        Obj::List(id) => self.list_depths[id as usize],
+                        Obj::Dict(id) => self.dict_depths[id as usize],
+                        _ => None,
+                    };
+                    if let Some(below) = known {
+                        if parent_depth + 1 + below > self.depth_limit {
+                            return Err(RECURSION.to_owned());
+                        }
+                        return Ok(Opened::Known(below));
+                    }
+                }
                 let opened = self.open_container(obj);
                 if let Opened::Frame(frame) = &opened {
                     self.enter(frame)?;
@@ -182,8 +265,9 @@ impl Encoder<'_> {
                 Opened::Frame(Frame::Dict {
                     id,
                     next: 0,
-                    out: Map::with_capacity(len),
+                    out: Map::with_capacity(if self.dry { 0 } else { len }),
                     key: String::new(),
+                    below: 0,
                 })
             }
             Obj::List(id) => {
@@ -194,7 +278,8 @@ impl Encoder<'_> {
                 Opened::Frame(Frame::List {
                     items: ListRef::List(id),
                     next: 0,
-                    out: Vec::with_capacity(len),
+                    out: Vec::with_capacity(if self.dry { 0 } else { len }),
+                    below: 0,
                 })
             }
             // Tuples (from !!omap / !!pairs) always hold two items and are never shared.
@@ -202,6 +287,7 @@ impl Encoder<'_> {
                 items: ListRef::Tuple(id),
                 next: 0,
                 out: Vec::with_capacity(2),
+                below: 0,
             }),
             _ => Opened::Leaf(Value::Null),
         }
@@ -209,14 +295,22 @@ impl Encoder<'_> {
 
     fn close(&mut self, frame: Frame) -> Value {
         match frame {
-            Frame::List { items, out, .. } => {
+            Frame::List {
+                items, out, below, ..
+            } => {
                 if let ListRef::List(id) = items {
                     self.list_marks[id as usize] = false;
+                    if self.dry {
+                        self.list_depths[id as usize] = Some(below);
+                    }
                 }
                 Value::Array(out)
             }
-            Frame::Dict { id, out, .. } => {
+            Frame::Dict { id, out, below, .. } => {
                 self.dict_marks[id as usize] = false;
+                if self.dry {
+                    self.dict_depths[id as usize] = Some(below);
+                }
                 Value::Object(out)
             }
         }
@@ -224,6 +318,7 @@ impl Encoder<'_> {
 
     fn key_string(&mut self, key: Obj) -> Result<String, String> {
         Ok(match key {
+            Obj::Str(_) if self.dry => String::new(),
             Obj::Str(id) => self.string(id),
             Obj::Float(f) => json_float(f),
             Obj::Nan(_) => "NaN".to_owned(),

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/crates/openapi-spec-validator-rs/src/loader.rs

@@ -97,7 +97,15 @@ fn load_yaml(
         drop(parser);
         let (graph, root) = construct::construct(&mut doc, stream_name)?;
         let move_strings = !doc.has_aliases;
-        dump::to_value(&mut doc.nodes, &graph, root, depth_limit, move_strings)
+        // With aliases the value can dwarf the node graph: find the encoder's error first.
+        dump::to_value(
+            &mut doc.nodes,
+            &graph,
+            root,
+            depth_limit,
+            move_strings,
+            doc.has_aliases,
+        )
     };
     run().map_err(|message| LoadError { message })
 }

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/crates/openapi-spec-validator-rs/src/retrieve.rs

@@ -97,6 +97,7 @@ mod http {
     #[derive(Clone)]
     pub struct HttpRetriever {
         timeout: Duration,
+        proxies: bool,
         agent: OnceLock<Agent>,
     }
 
@@ -110,10 +111,18 @@ mod http {
         pub fn with_timeout(timeout: Duration) -> Self {
             Self {
                 timeout,
+                proxies: true,
                 agent: OnceLock::new(),
             }
         }
 
+        /// The same retriever, ignoring the proxy environment variables (upstream's
+        /// `ProxyHandler({})`).
+        pub fn without_proxies(mut self) -> Self {
+            self.proxies = false;
+            self
+        }
+
         fn agent(&self) -> &Agent {
             self.agent.get_or_init(|| {
                 let tls = TlsConfig::builder()
@@ -145,7 +154,7 @@ mod http {
         /// `GET url` through the proxy the environment names for its scheme.
         fn get(&self, url: &str) -> Result<ureq::http::Response<ureq::Body>, RetrieveError> {
             let failed = |error: ureq::Error| RetrieveError::new(error.to_string());
-            let proxy = proxy_for(url)?;
+            let proxy = if self.proxies { proxy_for(url)? } else { None };
             let request = self.agent().get(url).config().proxy(proxy).build();
             request.call().map_err(failed)
         }

{openapi_spec_validator_rs-0.2.0 → openapi_spec_validator_rs-0.2.1}/crates/openapi-spec-validator-rs-cli/README.md

@@ -3,7 +3,7 @@
 **A fast, drop-in Rust companion to [openapi-spec-validator](https://github.com/python-openapi/openapi-spec-validator).**
 
 It validates Swagger 2.0 and OpenAPI 3.0, 3.1 and 3.2 documents with the same rules as
-openapi-spec-validator, returns the same verdicts, and runs 40 to 145 times faster on large
+openapi-spec-validator, returns the same verdicts, and runs 37 to 143 times faster on large
 specs. It ships as a command-line tool, a Python package with the same API, and a pre-commit
 hook. It is an independent project, not affiliated with or endorsed by the maintainers of
 openapi-spec-validator.
@@ -14,10 +14,10 @@ with its default backend):
 
 | Spec | openapi-spec-validator-rs | openapi-spec-validator | Speed-up |
 |---|---:|---:|---:|
-| GitHub (OpenAPI 3.0, JSON, 13.5 MB) | **57 ms** | 6.41 s – 8.18 s | **113–144×** |
-| GitHub (OpenAPI 3.0, YAML, 10.3 MB) | **152 ms** | 6.45 s – 8.20 s | **42–54×** |
-| Stripe (OpenAPI 3.0, JSON, 8.3 MB) | **31 ms** | 1.80 s – 2.82 s | **59–92×** |
-| Kubernetes (Swagger 2.0, JSON, 4.3 MB) | **20 ms** | 762 ms – 2.13 s | **39–109×** |
+| GitHub (OpenAPI 3.0, JSON, 13.5 MB) | **57 ms** | 6.45 s – 8.21 s | **112–143×** |
+| GitHub (OpenAPI 3.0, YAML, 10.3 MB) | **150 ms** | 6.46 s – 8.23 s | **43–55×** |
+| Stripe (OpenAPI 3.0, JSON, 8.3 MB) | **31 ms** | 1.81 s – 2.85 s | **59–93×** |
+| Kubernetes (Swagger 2.0, JSON, 4.3 MB) | **20 ms** | 766 ms – 2.14 s | **37–104×** |
 
 The `pip`-installed command runs the same validator behind a Python entry point, which adds
 about 25 ms of interpreter start-up per run: 45 ms for Kubernetes and 80 ms for GitHub's
@@ -140,7 +140,7 @@ repos:
         name: openapi-spec-validator-rs
         entry: openapi-spec-validator-rs
         language: python
-        additional_dependencies: [openapi-spec-validator-rs==0.2.0]
+        additional_dependencies: [openapi-spec-validator-rs==0.2.1]
         files: .*(openapi|swagger).*\.(json|yaml|yml)$
 ```
 
@@ -159,12 +159,13 @@ validates FastAPI's `app.openapi()` does), median of 5 runs:
 
 | Spec | openapi-spec-validator-rs | openapi-spec-validator, jsonschema-rs backend | openapi-spec-validator, default backend |
 |---|---:|---:|---:|
-| GitHub (13.5 MB) | **33 ms** | 4.67 s (143× slower) | 6.38 s (196× slower) |
-| Stripe (8.3 MB) | **16 ms** | 0.89 s (55× slower) | 1.91 s (119× slower) |
-| Kubernetes (4.3 MB) | **11 ms** | 0.33 s (29× slower) | 1.70 s (149× slower) |
+| GitHub (13.5 MB) | **30 ms** | 4.66 s (158× slower) | 6.40 s (217× slower) |
+| Stripe (8.3 MB) | **15 ms** | 0.89 s (58× slower) | 1.92 s (126× slower) |
+| Kubernetes (4.3 MB) | **11 ms** | 0.33 s (30× slower) | 1.70 s (154× slower) |
 
-It also needs about a quarter of the memory on JSON specs: 81 MiB instead of 290 MiB for
-GitHub's (98 MiB through the `pip`-installed command).
+On the same machine it also needs about a quarter of the memory on JSON specs: 84 MiB
+instead of 289 MiB for GitHub's (98 MiB through the `pip`-installed command); the ratio
+varies with the platform's allocator and Python build.
 
 Validating every spec in the APIs.guru directory that openapi-spec-validator accepts (3,646
 files, 535 MB of YAML) takes 1.6 s instead of 202–332 s.