jsonschema_rs 0.49.3 → 0.49.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48dc9cf6305e242c8a686a6e1439fcc2d05ce1b2738bfdf1eb42394e05f16d03
-  data.tar.gz: 9e828ed439bb3180094d3c2cdc1cbc0723ea71d385c2861278c7347493dfd900
+  metadata.gz: 1f9c13c1388f5e57ffff9783a04a15144954e15c0078414321bb7f699a7ebe6a
+  data.tar.gz: 866810b923d5654fc09def7495882a7e82bed9ac248594304885df21a9fb2699
 SHA512:
-  metadata.gz: d41807f218f18e5435a4ec6e01326f5459076c78afd126844dcd03a982e1006514ec613333eac241853e8b83859410ab723f53ffa185f959cfd6209f8a4c6399
-  data.tar.gz: 768c332d2d735999f58bde2a4947568d9e4e7c7cbf818e6ed8ae4177d890810490cf2494b5bfcea547fe7a0c7827775ba83192e465f77207581a9e40d6d21f1f
+  metadata.gz: 31bb5ae7145e6dec76c88ad04e38f354abd7cb8853df576e260503d783c324da7cdd921e5472a647354247cd8b370fa79c6ea1c8e653164349b35f13f8ef81e4
+  data.tar.gz: ea2c1a7ec8afed706a4d05504b3f69e58c2ee574b373b64eb828ff1f6c2b977b539bbe4aa45966250e4ea6bab234f9e86cfbd974b72d34c4bc3738f94c3836cd

data/CHANGELOG.md

@@ -2,6 +2,30 @@
 
 ## [Unreleased]
 
+## [0.49.4] - 2026-08-04
+
+### Added
+
+- Canonicalization of `not` a string format, which the string leaf carries as barred formats.
+- Canonicalization of `not` an existential demand, which an array fails exactly when no element matches.
+- Canonicalization of `not` a string value set, which the string leaf carries as excluded values.
+- Canonicalization of `unevaluatedItems` beside `contains`, where the elements it matches are evaluated and the tail admits either.
+- Canonicalization of `unevaluated*` beside `anyOf` or `oneOf`, where every branch evaluating the same keys or indexes pins what is left over.
+- Canonicalization of `not` an array element schema, which an array fails exactly when one element violates it.
+- `CanonicalSchema#intersect`, the values both schemas admit.
+- `CanonicalSchema#negate`, the values a schema rejects.
+- `CanonicalSchema#definition`, one reference target by URI.
+
+### Fixed
+
+- An integer past `i64` admitted by a fractional bound `f64` rounds it onto, such as `-10000000000000000000000000` under `{"maximum": -10000000000000000000000000.1}`.
+- An integer past `2^53` admitted by a bound `f64` rounds onto it, such as `9007199254740992` under `{"minimum": 9007199254740993}`.
+- A `contains` subschema beside both `minContains` and `maxContains` overwriting a sibling keyword of the same name, such as `items`.
+
+### Performance
+
+- `CanonicalSchema` hashing and equality cost the node instead of the whole document.
+
 ## [0.49.3] - 2026-08-02
 
 ### Added
@@ -262,7 +286,8 @@
 
 - Initial public release
 
-[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.3...HEAD
+[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.4...HEAD
+[0.49.4]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.3...ruby-v0.49.4
 [0.49.3]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.2...ruby-v0.49.3
 [0.49.2]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.1...ruby-v0.49.2
 [0.49.1]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.0...ruby-v0.49.1

data/Cargo.toml

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

data/ext/jsonschema/Cargo.lock

@@ -693,9 +693,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema"
-version = "0.49.3"
+version = "0.49.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "508004a5500f2e1f68af048f70feea2de86d35ab115d85716530860822aef397"
+checksum = "257549c093d8f3d043337ba0d507e8eeace2447dfae3f0ee37eb0f57d3df7655"
 dependencies = [
  "ahash",
  "bytecount",
@@ -726,9 +726,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros"
-version = "0.49.3"
+version = "0.49.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4e131231bc18676df289bd7634d4353d5b36bced191928bfa2a2dcae91e44a0"
+checksum = "b043434e5e987e02043a6fd8d0c2686c8db4fe31a37b373ef9b2a9b1f27b96c6"
 dependencies = [
  "jsonschema-macros-core",
  "proc-macro2",
@@ -736,9 +736,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros-core"
-version = "0.49.3"
+version = "0.49.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75803a5014f912d5a8f3c8cc24531d19ea06dfadda75ddf1d15af629f7c8468c"
+checksum = "892e0b0739e173cce25aef424366940b20eebe7dd29304a4b8484bbd1461cc8b"
 dependencies = [
  "fancy-regex",
  "indexmap",
@@ -755,7 +755,7 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-rb-ext"
-version = "0.49.3"
+version = "0.49.4"
 dependencies = [
  "jsonschema",
  "magnus",
@@ -768,18 +768,18 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-regex"
-version = "0.49.3"
+version = "0.49.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a8b30cafa78358ae6cd1494a7d6410b89530e28bf567f862c869c667e900d9f"
+checksum = "474790e948498099d61ec85c10dc72d459d61298b7975eda7fb163af1934b134"
 dependencies = [
  "regex-syntax",
 ]
 
 [[package]]
 name = "jsonschema-value"
-version = "0.49.3"
+version = "0.49.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5526bd381d230af94908d07e6835a33fd82a465e12f5f1e9c81f5c2aa23b3c21"
+checksum = "8212315eb8e0bc44959d1af653cd5ec515771a3cdca966cfc0a10999bff144b9"
 dependencies = [
  "ahash",
  "bytecount",
@@ -1132,9 +1132,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.49.3"
+version = "0.49.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7af3eb523cce0df0af3c30d624b829b2dabd233172b5bc2615fcd03ceae8f746"
+checksum = "2bf1a74e036be2546c0c81cdfad6b2def6a25bf31c4e34a468037058d3bd05c6"
 dependencies = [
  "ahash",
  "fluent-uri",

data/ext/jsonschema/Cargo.toml

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

data/lib/jsonschema/version.rb

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

data/sig/jsonschema.rbs

@@ -32,12 +32,21 @@ module JSONSchema
     class InvalidPattern < CanonicalizationError
     end
 
+    class IncompatibleOperands < CanonicalizationError
+    end
+
+    class UnmodeledOperand < CanonicalizationError
+    end
+
     # A schema reduced to canonical form: schemas accepting the same values share one form.
     class CanonicalSchema
       def to_json_schema: () -> untyped
       def draft: () -> JSONSchema::draft
       def kind: () -> kind
       def view: () -> view
+      def intersect: (CanonicalSchema other) -> CanonicalSchema
+      def negate: () -> CanonicalSchema?
+      def definition: (String uri) -> CanonicalSchema?
       def definitions: () -> Hash[String, CanonicalSchema]
       def satisfiable?: () -> bool
       def inspect: () -> String
@@ -77,6 +86,7 @@ module JSONSchema
       def formats: () -> Array[String]
       def content_media_types: () -> Array[String]
       def content_encodings: () -> Array[String]
+      def excluded: () -> Array[String]
       def inspect: () -> String
       def deconstruct_keys: (untyped keys) -> Hash[Symbol, untyped]
     end

data/src/canonical.rs

@@ -47,6 +47,8 @@ macro_rules! canonical_error_class {
 canonical_error_class!(CANONICALIZATION_ERROR_CLASS, "CanonicalizationError");
 canonical_error_class!(INVALID_SCHEMA_TYPE_CLASS, "InvalidSchemaType");
 canonical_error_class!(INVALID_PATTERN_CLASS, "InvalidPattern");
+canonical_error_class!(INCOMPATIBLE_OPERANDS_CLASS, "IncompatibleOperands");
+canonical_error_class!(UNMODELED_OPERAND_CLASS, "UnmodeledOperand");
 
 fn canonicalization_error(ruby: &Ruby, error: CanonicalizationError) -> Error {
     if let CanonicalizationError::ValidationError(validation_error) = error {
@@ -60,6 +62,12 @@ fn canonicalization_error(ruby: &Ruby, error: CanonicalizationError) -> Error {
         CanonicalizationError::InvalidPattern { .. } => {
             Error::new(ruby.get_inner(&INVALID_PATTERN_CLASS), message)
         }
+        CanonicalizationError::IncompatibleOperands(_) => {
+            Error::new(ruby.get_inner(&INCOMPATIBLE_OPERANDS_CLASS), message)
+        }
+        CanonicalizationError::UnmodeledOperand => {
+            Error::new(ruby.get_inner(&UNMODELED_OPERAND_CLASS), message)
+        }
         // `ValidationError` returns above; future variants fall back to the base canonical error.
         _ => Error::new(ruby.get_inner(&CANONICALIZATION_ERROR_CLASS), message),
     }
@@ -141,8 +149,10 @@ impl RbCanonicalSchema {
                     max_length: view.max_length,
                     patterns: view.patterns,
                     formats: view.formats,
+                    excluded_formats: view.excluded_formats,
                     content_media_types: view.content_media_types,
                     content_encodings: view.content_encodings,
+                    excluded: view.excluded,
                 })
                 .as_value(),
             CanonicalView::Number(view) => ruby
@@ -191,6 +201,29 @@ impl RbCanonicalSchema {
         }
     }
 
+    fn intersect(ruby: &Ruby, rb_self: &Self, other: &Self) -> Result<Value, Error> {
+        rb_self
+            .inner
+            .intersect(&other.inner)
+            .map(|inner| ruby.obj_wrap(RbCanonicalSchema { inner }).as_value())
+            .map_err(|error| canonicalization_error(ruby, error))
+    }
+
+    fn negate(ruby: &Ruby, rb_self: &Self) -> Option<Value> {
+        rb_self
+            .inner
+            .negate()
+            .map(|inner| ruby.obj_wrap(RbCanonicalSchema { inner }).as_value())
+    }
+
+    #[allow(clippy::needless_pass_by_value)]
+    fn definition(ruby: &Ruby, rb_self: &Self, uri: String) -> Option<Value> {
+        rb_self
+            .inner
+            .definition(&uri)
+            .map(|inner| ruby.obj_wrap(RbCanonicalSchema { inner }).as_value())
+    }
+
     fn definitions(ruby: &Ruby, rb_self: &Self) -> Result<RHash, Error> {
         let hash = ruby.hash_new();
         for (uri, target) in rb_self.inner.definitions() {
@@ -363,8 +396,10 @@ pub struct StringView {
     max_length: Option<serde_json::Number>,
     patterns: Vec<String>,
     formats: Vec<String>,
+    excluded_formats: Vec<String>,
     content_media_types: Vec<String>,
     content_encodings: Vec<String>,
+    excluded: Vec<String>,
 }
 
 impl DataTypeFunctions for StringView {}
@@ -386,6 +421,10 @@ impl StringView {
         strings_to_ruby(ruby, &rb_self.formats)
     }
 
+    fn excluded_formats(ruby: &Ruby, rb_self: &Self) -> Result<Value, Error> {
+        strings_to_ruby(ruby, &rb_self.excluded_formats)
+    }
+
     fn content_media_types(ruby: &Ruby, rb_self: &Self) -> Result<Value, Error> {
         strings_to_ruby(ruby, &rb_self.content_media_types)
     }
@@ -394,15 +433,21 @@ impl StringView {
         strings_to_ruby(ruby, &rb_self.content_encodings)
     }
 
+    fn excluded(ruby: &Ruby, rb_self: &Self) -> Result<Value, Error> {
+        strings_to_ruby(ruby, &rb_self.excluded)
+    }
+
     fn inspect(ruby: &Ruby, rb_self: &Self) -> Result<String, Error> {
         Ok(format!(
-            "#<JSONSchema::Canonical::StringView min_length={} max_length={} patterns={} formats={} content_media_types={} content_encodings={}>",
+            "#<JSONSchema::Canonical::StringView min_length={} max_length={} patterns={} formats={} excluded_formats={} content_media_types={} content_encodings={} excluded={}>",
             Self::min_length(ruby, rb_self)?.inspect(),
             Self::max_length(ruby, rb_self)?.inspect(),
             Self::patterns(ruby, rb_self)?.inspect(),
             Self::formats(ruby, rb_self)?.inspect(),
+            Self::excluded_formats(ruby, rb_self)?.inspect(),
             Self::content_media_types(ruby, rb_self)?.inspect(),
-            Self::content_encodings(ruby, rb_self)?.inspect()
+            Self::content_encodings(ruby, rb_self)?.inspect(),
+            Self::excluded(ruby, rb_self)?.inspect()
         ))
     }
 
@@ -412,6 +457,10 @@ impl StringView {
         hash.aset(ruby.sym_new("max_length"), Self::max_length(ruby, rb_self)?)?;
         hash.aset(ruby.sym_new("patterns"), Self::patterns(ruby, rb_self)?)?;
         hash.aset(ruby.sym_new("formats"), Self::formats(ruby, rb_self)?)?;
+        hash.aset(
+            ruby.sym_new("excluded_formats"),
+            Self::excluded_formats(ruby, rb_self)?,
+        )?;
         hash.aset(
             ruby.sym_new("content_media_types"),
             Self::content_media_types(ruby, rb_self)?,
@@ -420,6 +469,7 @@ impl StringView {
             ruby.sym_new("content_encodings"),
             Self::content_encodings(ruby, rb_self)?,
         )?;
+        hash.aset(ruby.sym_new("excluded"), Self::excluded(ruby, rb_self)?)?;
         Ok(hash)
     }
 }
@@ -1083,6 +1133,8 @@ pub(crate) fn init_canonical(ruby: &Ruby, module: &RModule) -> Result<(), Error>
         canonical_module.define_error("CanonicalizationError", ruby.exception_standard_error())?;
     canonical_module.define_error("InvalidSchemaType", base_error)?;
     canonical_module.define_error("InvalidPattern", base_error)?;
+    canonical_module.define_error("IncompatibleOperands", base_error)?;
+    canonical_module.define_error("UnmodeledOperand", base_error)?;
 
     let canonical_schema = canonical_module.define_class("CanonicalSchema", ruby.class_object())?;
     canonical_schema.define_method(
@@ -1102,6 +1154,9 @@ pub(crate) fn init_canonical(ruby: &Ruby, module: &RModule) -> Result<(), Error>
         method!(<RbCanonicalSchema as typed_data::Hash>::hash, 0),
     )?;
     canonical_schema.define_method("view", method!(RbCanonicalSchema::view, 0))?;
+    canonical_schema.define_method("intersect", method!(RbCanonicalSchema::intersect, 1))?;
+    canonical_schema.define_method("negate", method!(RbCanonicalSchema::negate, 0))?;
+    canonical_schema.define_method("definition", method!(RbCanonicalSchema::definition, 1))?;
     canonical_schema.define_method("definitions", method!(RbCanonicalSchema::definitions, 0))?;
     canonical_schema.define_method("satisfiable?", method!(RbCanonicalSchema::satisfiable, 0))?;
 
@@ -1142,6 +1197,7 @@ pub(crate) fn init_canonical(ruby: &Ruby, module: &RModule) -> Result<(), Error>
     string_view.define_method("max_length", method!(StringView::max_length, 0))?;
     string_view.define_method("patterns", method!(StringView::patterns, 0))?;
     string_view.define_method("formats", method!(StringView::formats, 0))?;
+    string_view.define_method("excluded_formats", method!(StringView::excluded_formats, 0))?;
     string_view.define_method(
         "content_media_types",
         method!(StringView::content_media_types, 0),
@@ -1150,6 +1206,7 @@ pub(crate) fn init_canonical(ruby: &Ruby, module: &RModule) -> Result<(), Error>
         "content_encodings",
         method!(StringView::content_encodings, 0),
     )?;
+    string_view.define_method("excluded", method!(StringView::excluded, 0))?;
     string_view.define_method("inspect", method!(StringView::inspect, 0))?;
     string_view.define_method("deconstruct_keys", method!(StringView::deconstruct_keys, 1))?;
 

metadata

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