jsonschema_rs 0.46.10 → 0.47.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f602cda016a40d57191148d7552e7df55349dc5ce714cef366d91167ce8330e0
-  data.tar.gz: 656d8ad04dc3303b4057b644be51e33edc387ca595028efe9e4c1ffcc946cd37
+  metadata.gz: 6ac8c8fefbc1cb61a17c20ff939d639db9da1dfdd5fdc232847259b28495dc4e
+  data.tar.gz: 9ce91dc23dab850146636a4cb5aa5f3dea8ad62b1a045b93052c9ad5459baadd
 SHA512:
-  metadata.gz: 0c76e865059ff45b73b3d522b765d8da5fea2f6728e7e486a1b10051ecfc9382a411d7f08cd7eca161f2d3d51ab3cec492423f30b0231e2df5637acbfe8fcb06
-  data.tar.gz: 35ba6635cd492e6ff420ede329eef28d2e4027f466d7061f91579921ead262c0a72c70266ec6673b0188d48d15505ea96f96b625a0cca145bd548d023b1bc615
+  metadata.gz: e073285344d71b2179d2a63b4c6cfec6ade151baa84360a3015538fe148afd5223b1ca0cde689bf6ae3fce4b0060c1a0ab8b6ee49f0cfb49d573b1a8c2250ac1
+  data.tar.gz: 10fe811cf88137cfb5d195b76ae1fed97ed56b821b2e0ca502836211dacbfa4ecf92a4d96cc1def8a3c72a32230d7181112423372fb2a2e62b72bf5138e50674

data/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## [Unreleased]
 
+## [0.47.0] - 2026-07-08
+
+### Added
+
+- Optional `iter_errors(instance)` method on custom keyword validators for reporting multiple errors from a single keyword. [#1071](https://github.com/Stranger6667/jsonschema/discussions/1071)
+
+### Performance
+
+- Faster validator construction, via compile-time meta-schema validators.
+
+### Fixed
+
+- `type` under `items` asserted with the Validation vocabulary disabled.
+- Disabled vocabularies ignored for `$ref` targets without their own `$schema` (e.g. `$defs` entries).
+
 ## [0.46.10] - 2026-07-05
 
 ### Fixed
@@ -149,7 +164,8 @@
 
 - Initial public release
 
-[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.46.10...HEAD
+[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.47.0...HEAD
+[0.47.0]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.46.10...ruby-v0.47.0
 [0.46.10]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.46.9...ruby-v0.46.10
 [0.46.9]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.46.8...ruby-v0.46.9
 [0.46.8]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.46.7...ruby-v0.46.8

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonschema-rb"
-version = "0.46.10"
+version = "0.47.0"
 edition = "2021"
 authors = ["Dmitry Dygalo <dmitry@dygalo.dev>"]
 license = "MIT"
@@ -13,7 +13,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-jsonschema = { version = "0.46.10", default-features = false, features = ["arbitrary-precision", "resolve-http", "resolve-file", "tls-ring"] }
+jsonschema = { version = "0.47.0", default-features = false, features = ["arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros"] }
 magnus = { version = "0.8", features = ["rb-sys"] }
 rb-sys = "0.9"
 serde = { workspace = true }

data/README.md

@@ -148,7 +148,26 @@ Each custom keyword class must implement:
 - `initialize(parent_schema, value, schema_path)` - called during schema compilation
 - `validate(instance)` - raise on failure, return normally on success
 
-When `validate` raises, the original exception is preserved as the `cause` of the `ValidationError`, so callers can inspect it:
+A class may also implement `iter_errors(instance)`, returning an array of exceptions, to report several problems from one keyword. `each_error` then surfaces each of them; when the method is absent it falls back to the single error from `validate`:
+
+```ruby
+class AllPositive
+  def initialize(parent_schema, value, schema_path); end
+
+  def validate(instance)
+    first_error = iter_errors(instance).first
+    raise first_error if first_error
+  end
+
+  def iter_errors(instance)
+    return [] unless instance.is_a?(Array)
+    instance.each_index.select { |i| instance[i].negative? }
+            .map { |i| ArgumentError.new("item #{i} is negative") }
+  end
+end
+```
+
+When `validate` raises, the original exception is preserved as the `cause` of the `ValidationError`, so callers can inspect it (errors from `iter_errors` keep their exception as `cause` in the same way):
 
 ```ruby
 begin

data/ext/jsonschema/Cargo.lock

@@ -378,21 +378,15 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.16.1"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100"
+checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
 dependencies = [
  "allocator-api2",
  "equivalent",
  "foldhash",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f467dd6dccf739c208452f8014c75c18bb8301b050ad1cfb27153803edb0f51"
-
 [[package]]
 name = "http"
 version = "1.4.0"
@@ -601,7 +595,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9"
 dependencies = [
  "equivalent",
- "hashbrown 0.17.0",
+ "hashbrown",
 ]
 
 [[package]]
@@ -693,9 +687,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.46.10"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0a699d3e77675e6aa4bfffe3b907c8b5f7ed3241f9965bffb25475ad4b08d05"
+checksum = "281c43ff06dcb331e9356d30e38853d559ce3d0a3f693e0b0e102667dec14fb1"
 dependencies = [
  "ahash",
  "bytecount",
@@ -706,6 +700,7 @@ dependencies = [
  "getrandom 0.3.4",
  "idna",
  "itoa",
+ "jsonschema-macros",
  "jsonschema-regex",
  "num-bigint",
  "num-cmp",
@@ -721,9 +716,38 @@ dependencies = [
  "uuid-simd",
 ]
 
+[[package]]
+name = "jsonschema-macros"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33814349f9eb1e2f5814207c40d92413098d4d57d0fb5b5972b1c47d63a79137"
+dependencies = [
+ "jsonschema-macros-core",
+ "proc-macro2",
+]
+
+[[package]]
+name = "jsonschema-macros-core"
+version = "0.47.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bc971df1f0042bff8020f1db975da867b56e11c519821e6e573f489dd909a94"
+dependencies = [
+ "fancy-regex",
+ "indexmap",
+ "jsonschema-regex",
+ "percent-encoding",
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "referencing",
+ "regex",
+ "serde_json",
+ "syn",
+]
+
 [[package]]
 name = "jsonschema-rb-ext"
-version = "0.46.10"
+version = "0.47.0"
 dependencies = [
  "jsonschema",
  "magnus",
@@ -735,9 +759,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-regex"
-version = "0.46.10"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dbd1086b01b9349fd4ef9a07433965af64c8ce8159abe633a189e4ff817bd13"
+checksum = "ee0b351864e7ffbc5db9273daf7fa1b4d5177b0946713d667ca571b83c0b4045"
 dependencies = [
  "regex-syntax",
 ]
@@ -988,6 +1012,15 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f"
+dependencies = [
+ "toml_edit",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.106"
@@ -1073,14 +1106,14 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.46.10"
+version = "0.47.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fbf332a2f81899f6836f22c03da73dae8a664c32e3016b84692c23cddadc95d"
+checksum = "348e860aeb0b7bd035778fd11dd9cd5290d32e4aed3b8f2274a00287a9fd362b"
 dependencies = [
  "ahash",
  "fluent-uri",
  "getrandom 0.3.4",
- "hashbrown 0.16.1",
+ "hashbrown",
  "itoa",
  "micromap",
  "parking_lot",
@@ -1495,6 +1528,36 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "1.1.1+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.25.12+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2153edc6955a6c354fad8f5efd38b6a8769bdccf9fe50f8e1329f81b0baa5d7"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "toml_parser",
+ "winnow",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.1.2+spec-1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526"
+dependencies = [
+ "winnow",
+]
+
 [[package]]
 name = "tower"
 version = "0.5.3"
@@ -1894,6 +1957,15 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "winnow"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0592e1c9d151f854e6fd382574c3a0855250e1d9b2f99d9281c6e6391af352f1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "wit-bindgen"
 version = "0.57.1"

data/ext/jsonschema/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonschema-rb-ext"
-version = "0.46.10"
+version = "0.47.0"
 edition = "2021"
 publish = false
 
@@ -10,10 +10,10 @@ name = "jsonschema_rb"
 path = "../../src/lib.rs"
 
 [dependencies]
-jsonschema = { version = "0.46.10", default-features = false, features = ["arbitrary-precision", "resolve-http", "resolve-file", "tls-ring"] }
+jsonschema = { version = "0.47.0", default-features = false, features = ["arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros"] }
 magnus = { version = "0.8", features = ["rb-sys"] }
 rb-sys = "0.9"
-referencing = "0.46.10"
+referencing = "0.47.0"
 serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["arbitrary_precision"] }
 

data/lib/jsonschema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONSchema
-  VERSION = "0.46.10"
+  VERSION = "0.47.0"
 end

data/src/lib.rs

@@ -29,6 +29,7 @@ use magnus::{
 use referencing::unescape_segment;
 use std::{
     cell::RefCell,
+    collections::VecDeque,
     panic::{self, AssertUnwindSafe},
     sync::Arc,
 };
@@ -198,13 +199,36 @@ fn build_parsed_options(
 
 thread_local! {
     static LAST_CALLBACK_ERROR: RefCell<Option<Error>> = const { RefCell::new(None) };
-    // Stores the original Ruby exception from a custom keyword's validate() call so it can be
-    // set as the `cause` on the resulting ValidationError.
-    pub(crate) static CUSTOM_KEYWORD_CAUSE: RefCell<Option<Error>> = const { RefCell::new(None) };
+    // Stores the original Ruby exceptions from a custom keyword's validate()/iter_errors() calls so
+    // each can be set as the `cause` on the resulting ValidationError, in FIFO order.
+    pub(crate) static CUSTOM_KEYWORD_CAUSE: RefCell<VecDeque<Error>> = const { RefCell::new(VecDeque::new()) };
     /// When `true`, the custom panic hook suppresses output (inside `catch_unwind` blocks).
     static SUPPRESS_PANIC_OUTPUT: RefCell<bool> = const { RefCell::new(false) };
 }
 
+// RAII scope giving each surfacing call its own keyword-cause queue and restoring the caller's on
+// exit. This discards causes a call leaves unconsumed (`evaluate`, an abandoned enumeration, a
+// panic — the drop still runs) and lets a keyword re-enter validation without clobbering the outer
+// call's pending causes.
+pub(crate) struct KeywordCauseScope {
+    saved: VecDeque<Error>,
+}
+
+impl KeywordCauseScope {
+    pub(crate) fn enter() -> Self {
+        Self {
+            saved: CUSTOM_KEYWORD_CAUSE.with(|cell| std::mem::take(&mut *cell.borrow_mut())),
+        }
+    }
+}
+
+impl Drop for KeywordCauseScope {
+    fn drop(&mut self) {
+        let saved = std::mem::take(&mut self.saved);
+        CUSTOM_KEYWORD_CAUSE.with(|cell| *cell.borrow_mut() = saved);
+    }
+}
+
 static VALIDATION_ERROR_CLASS: Lazy<ExceptionClass> = Lazy::new(|ruby| {
     let module: RModule = ruby
         .class_object()
@@ -431,7 +455,7 @@ fn into_ruby_error(
     exc.ivar_set(*ID_AT_ABSOLUTE_KEYWORD_LOCATION, absolute_location)?;
 
     if is_custom {
-        if let Some(cause) = CUSTOM_KEYWORD_CAUSE.with(|cell| cell.borrow_mut().take()) {
+        if let Some(cause) = CUSTOM_KEYWORD_CAUSE.with(|cell| cell.borrow_mut().pop_front()) {
             if let ErrorType::Exception(cause_exc) = cause.error_type() {
                 exc.ivar_set(*ID_CAUSE, cause_exc.as_value())?;
             }
@@ -654,6 +678,7 @@ impl Validator {
 
     #[allow(unsafe_code)]
     fn validate(ruby: &Ruby, rb_self: &Self, instance: Value) -> Result<(), Error> {
+        let _scope = KeywordCauseScope::enter();
         let json_instance = to_value(ruby, instance)?;
 
         if rb_self.has_ruby_callbacks {
@@ -687,6 +712,7 @@ impl Validator {
 
     #[allow(unsafe_code)]
     fn iter_errors(ruby: &Ruby, rb_self: &Self, instance: Value) -> Result<Value, Error> {
+        let _scope = KeywordCauseScope::enter();
         let json_instance = to_value(ruby, instance)?;
 
         if ruby.block_given() {
@@ -773,6 +799,7 @@ impl Validator {
 
     #[allow(unsafe_code)]
     fn evaluate(ruby: &Ruby, rb_self: &Self, instance: Value) -> Result<Evaluation, Error> {
+        let _scope = KeywordCauseScope::enter();
         let json_instance = to_value(ruby, instance)?;
 
         if rb_self.has_ruby_callbacks {
@@ -1027,6 +1054,7 @@ fn is_valid(ruby: &Ruby, args: &[Value]) -> Result<bool, Error> {
 
 #[allow(unsafe_code)]
 fn validate(ruby: &Ruby, args: &[Value]) -> Result<(), Error> {
+    let _scope = KeywordCauseScope::enter();
     let parsed_args = scan_args::<(Value, Value), (), (), (), _, ()>(args)?;
     let (schema, instance) = parsed_args.required;
     let kw = extract_kwargs(ruby, parsed_args.keywords)?;
@@ -1079,6 +1107,7 @@ fn validate(ruby: &Ruby, args: &[Value]) -> Result<(), Error> {
 
 #[allow(unsafe_code)]
 fn each_error(ruby: &Ruby, args: &[Value]) -> Result<Value, Error> {
+    let _scope = KeywordCauseScope::enter();
     let parsed_args = scan_args::<(Value, Value), (), (), (), _, ()>(args)?;
     let (schema, instance) = parsed_args.required;
     let kw = extract_kwargs(ruby, parsed_args.keywords)?;
@@ -1175,6 +1204,7 @@ fn each_error(ruby: &Ruby, args: &[Value]) -> Result<Value, Error> {
 
 #[allow(unsafe_code)]
 fn evaluate(ruby: &Ruby, args: &[Value]) -> Result<Evaluation, Error> {
+    let _scope = KeywordCauseScope::enter();
     let parsed_args = scan_args::<(Value, Value), (), (), (), _, ()>(args)?;
     let (schema, instance) = parsed_args.required;
     let kw = extract_evaluate_kwargs(ruby, parsed_args.keywords)?;

data/src/options.rs

@@ -12,7 +12,7 @@ use magnus::{
     prelude::*,
     scan_args::{get_kwargs, scan_args, KwArgs},
     value::Opaque,
-    Error, RHash, RModule, Ruby, TryConvert, Value,
+    Error, Exception, RArray, RHash, RModule, Ruby, TryConvert, Value,
 };
 
 use crate::{
@@ -388,7 +388,7 @@ impl jsonschema::Keyword for RubyKeyword {
             Err(e) => {
                 let msg = e.to_string();
                 CUSTOM_KEYWORD_CAUSE.with(|cell| {
-                    *cell.borrow_mut() = Some(e);
+                    cell.borrow_mut().push_back(e);
                 });
                 Err(jsonschema::ValidationError::custom(msg))
             }
@@ -404,6 +404,67 @@ impl jsonschema::Keyword for RubyKeyword {
         let result: Result<Value, _> = inst.funcall("validate", (rb_instance,));
         result.is_ok()
     }
+
+    fn iter_errors<'i>(
+        &self,
+        instance: &'i serde_json::Value,
+    ) -> Box<dyn Iterator<Item = jsonschema::ValidationError<'i>> + 'i> {
+        let ruby = Ruby::get().expect("Ruby VM should be initialized");
+        let keyword = ruby.get_inner(self.instance);
+        // Without an `iter_errors` method, fall back to the single-error `validate` path.
+        if !keyword.respond_to("iter_errors", false).unwrap_or(false) {
+            return Box::new(self.validate(instance).err().into_iter());
+        }
+        let rb_instance = match value_to_ruby(&ruby, instance) {
+            Ok(rb_instance) => rb_instance,
+            Err(error) => return Box::new(std::iter::once(custom_error_from_ruby(error))),
+        };
+        let array = keyword
+            .funcall::<_, _, Value>("iter_errors", (rb_instance,))
+            .and_then(|result| result.funcall::<_, _, RArray>("to_a", ()));
+        let array = match array {
+            Ok(array) => array,
+            Err(error) => return Box::new(std::iter::once(custom_error_from_ruby(error))),
+        };
+        let mut errors: Vec<jsonschema::ValidationError<'i>> = Vec::with_capacity(array.len());
+        for index in 0..array.len() {
+            // `entry` (not `as_slice`) because `ruby_value_to_error` calls back into Ruby.
+            let item = isize::try_from(index)
+                .map_err(|_| {
+                    Error::new(
+                        ruby.exception_arg_error(),
+                        "Array index exceeds supported range",
+                    )
+                })
+                .and_then(|index| array.entry::<Value>(index));
+            let error = match item {
+                Ok(item) => ruby_value_to_error(&ruby, item),
+                Err(error) => error,
+            };
+            errors.push(custom_error_from_ruby(error));
+        }
+        Box::new(errors.into_iter())
+    }
+}
+
+// Wrap a yielded Ruby value as an `Error`, preserving exception instances so they surface as
+// `#cause`; a non-exception is reported through a generic `RuntimeError`.
+fn ruby_value_to_error(ruby: &Ruby, value: Value) -> Error {
+    if let Ok(exception) = Exception::try_convert(value) {
+        return Error::from(exception);
+    }
+    let message = value
+        .funcall::<_, _, String>("to_s", ())
+        .unwrap_or_else(|_| "custom keyword error".to_string());
+    Error::new(ruby.exception_runtime_error(), message)
+}
+
+// Build a custom `ValidationError` from a Ruby error, queuing the exception as the error's cause so
+// it surfaces as `#cause`, exactly like the single `validate` path.
+fn custom_error_from_ruby<'i>(error: Error) -> jsonschema::ValidationError<'i> {
+    let message = error.to_string();
+    CUSTOM_KEYWORD_CAUSE.with(|cell| cell.borrow_mut().push_back(error));
+    jsonschema::ValidationError::custom(message)
 }
 
 #[allow(clippy::too_many_arguments)]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonschema_rs
 version: !ruby/object:Gem::Version
-  version: 0.46.10
+  version: 0.47.0
 platform: ruby
 authors:
 - Dmitry Dygalo