jsonschema_rs 0.49.6 → 0.49.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc5dcd36cc01a2cb2ef7c933f7f3334090a41e16a12b1609fed9a70bdffbb5ec
-  data.tar.gz: e0756f39279f4c2be57811ed001623859264b4068e23817ee7e4c59d9efceb94
+  metadata.gz: 2b3388bbb4302ddf7e4c108df32d945f68074c7baac52e85aa19964bbd8d8cec
+  data.tar.gz: 9a833159377a6b7673007129536b9d3997f01b1d1cd4226a51efa358c5ef6daa
 SHA512:
-  metadata.gz: 6596557fed8063bfb880120ff5a9e8fa7df17995af3cbcad630a6b3839be3cf7d2de5ea57e4bc12f66f34da4dde189129b4a033aeb5b81e602caf278667be511
-  data.tar.gz: 9766e90b8b0d157ba2820d57c127091455a44920667bda2c6bc5716ca2d3df02969baf1e34a0a8d626f0cae73c2e81a78a24754e28ed767f600e99939fa387ec
+  metadata.gz: dec67420394656cbbaf899553338fa8525680018f548ba94470713bb66a057f6361cc4d93b98763b3c739233eab7df7bfb954eae2d9745fffd41a300df361b9a
+  data.tar.gz: 418f555ee5c68ed4a4932e6c9230ee0a8e3e5e8b5c92739d9007c959b305d99f68e272fc5cda0b2114751e50146528d478bf9c3cfaefb44399ddb97677fa8c23

data/CHANGELOG.md

@@ -2,6 +2,41 @@
 
 ## [Unreleased]
 
+## [0.49.7] - 2026-08-08
+
+### Added
+
+- `retriever`, `registry`, and `base_uri` keyword arguments to `JSONSchema.canonicalize`.
+- Canonicalization of a `oneOf` whose branches name disjoint targets, which degrades to a union.
+- Canonicalization of a vacuous `patternProperties` entry beside schema-valued `additionalProperties`, where matching keys escape its value constraint.
+- Canonicalization of a Draft 4 closed pattern map with a reference nested under a property.
+- Canonicalization of Draft 4 closed pattern maps that meet through an applicator.
+- The complement of a reference back to a target already being negated, which stays symbolic instead of declining.
+- `CanonicalSchema#definition` resolving `#` to the document the schema was read against.
+
+### Performance
+
+- Up to 150x faster canonicalization of `not` over a union of many branches.
+- 2% faster emission of canonical schemas, which no longer formats copied string values.
+- 5% faster emission of canonical schemas, which no longer formats object keys while copying them.
+- Up to 12% faster canonicalization of schemas that repeatedly intersect the same branches.
+- 13% faster canonicalization of a non-dynamic OpenAPI document, which no longer scans every schema object for dynamic references.
+- Faster canonicalization of schemas with local `$defs` references, which avoid decoding unescaped definition names.
+- 23% faster canonicalization of an object whose keys a finite property-name set spells.
+- 3% faster intersection of schemas where one side constrains nothing.
+- Up to 31x faster canonicalization of a `oneOf` whose many branches overlap.
+- Up to 14x faster canonicalization of a union whose object branches share no values.
+- 7% faster canonicalization of schemas that reach the same pair of nodes repeatedly.
+- 5% faster canonicalization of objects, whose property maps no longer reach the allocator.
+- Up to 8% faster canonicalization of schemas that reach `true` and `false` subschemas repeatedly.
+- 2% faster canonicalization of schemas that assert known string formats.
+
+### Fixed
+
+- `CanonicalSchema#definition` and `CanonicalSchema#definitions` handing out a target that names the document root without that document, where `#` points at the target instead.
+- An `items` tail beyond an array's length ceiling surviving canonicalization, where it governs no element.
+- `CanonicalSchema#to_json_schema` leaving the document root out of a node emitted below it, where `#` points at that node instead.
+
 ## [0.49.6] - 2026-08-06
 
 ### Added
@@ -327,7 +362,8 @@
 
 - Initial public release
 
-[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.6...HEAD
+[Unreleased]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.7...HEAD
+[0.49.7]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.6...ruby-v0.49.7
 [0.49.6]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.5...ruby-v0.49.6
 [0.49.5]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.4...ruby-v0.49.5
 [0.49.4]: https://github.com/Stranger6667/jsonschema/compare/ruby-v0.49.3...ruby-v0.49.4

data/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonschema-rb"
-version = "0.49.6"
+version = "0.49.7"
 edition = "2021"
 authors = ["Dmitry Dygalo <dmitry@dygalo.dev>"]
 license = "MIT"
@@ -13,7 +13,7 @@ publish = false
 crate-type = ["cdylib"]
 
 [dependencies]
-jsonschema = { version = "0.49.6", default-features = false, features = ["magnus", "arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros"] }
+jsonschema = { version = "0.49.7", 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.6"
+version = "0.49.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e17384278234b10419a63c93fc85695ac9fc2da0833e3c59167f9986499590c"
+checksum = "ca4b985be36e5b3d15162b16ca94ac18c2a0514f5598b23b9d769895cb56bc3c"
 dependencies = [
  "ahash",
  "bytecount",
@@ -726,9 +726,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros"
-version = "0.49.6"
+version = "0.49.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c76669fda3185c230671e06740af90404301d31ee5f8375cc0baea4b1d53f01a"
+checksum = "de1ff79046715d10fe5fd795c0f562d8f2e41f470bed5fcad74a0c9f5fd5a6b8"
 dependencies = [
  "jsonschema-macros-core",
  "proc-macro2",
@@ -736,9 +736,9 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-macros-core"
-version = "0.49.6"
+version = "0.49.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "398e6baeee7f5a5825f80945cc324a385fdec9812516cfd37703822ef46cf80b"
+checksum = "8888005b18cbb6b61b4cb5fb4ae5f20b45dde81ab59baf37897b4668ba58a6f3"
 dependencies = [
  "fancy-regex",
  "indexmap",
@@ -755,7 +755,7 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-rb-ext"
-version = "0.49.6"
+version = "0.49.7"
 dependencies = [
  "jsonschema",
  "magnus",
@@ -768,18 +768,18 @@ dependencies = [
 
 [[package]]
 name = "jsonschema-regex"
-version = "0.49.6"
+version = "0.49.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac634e339e73bf9629f6fb207f7b064d872253ae3b3f5c6e0ce8fd762b16e40f"
+checksum = "614c05e01260d4532d9ad28d66185fa1d93d015c5d610cde70d4b7143d7fb98f"
 dependencies = [
  "regex-syntax",
 ]
 
 [[package]]
 name = "jsonschema-value"
-version = "0.49.6"
+version = "0.49.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92b8e258eb4515a3fc912a9c46e3987040dc07280592280097ea2085527870b8"
+checksum = "8602a6850f24cf05c518f58c9b8d08e32a28b9848115c8e193693db0952353f6"
 dependencies = [
  "ahash",
  "bytecount",
@@ -1132,9 +1132,9 @@ dependencies = [
 
 [[package]]
 name = "referencing"
-version = "0.49.6"
+version = "0.49.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42902112f88a27e9afd5683e2ba31956fed2a5d43395f166dd26775ae9c0dedb"
+checksum = "0753550862a089302b186486dfb843f2d547415257d78c32ae0d169e4d6784d1"
 dependencies = [
  "ahash",
  "fluent-uri",

data/ext/jsonschema/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "jsonschema-rb-ext"
-version = "0.49.6"
+version = "0.49.7"
 edition = "2021"
 publish = false
 
@@ -10,10 +10,10 @@ name = "jsonschema_rb"
 path = "../../src/lib.rs"
 
 [dependencies]
-jsonschema = { version = "0.49.6", default-features = false, features = ["magnus", "arbitrary-precision", "resolve-http", "resolve-file", "tls-ring", "macros"] }
+jsonschema = { version = "0.49.7", 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.6"
+referencing = "0.49.7"
 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.6"
+  VERSION = "0.49.7"
 end

data/sig/jsonschema.rbs

@@ -202,7 +202,10 @@ module JSONSchema
     untyped schema,
     ?draft: draft?,
     ?validate_formats: bool?,
-    ?pattern_options: (RegexOptions | FancyRegexOptions)?
+    ?pattern_options: (RegexOptions | FancyRegexOptions)?,
+    ?retriever: (^(String) -> untyped)?,
+    ?registry: Registry?,
+    ?base_uri: String?
   ) -> Canonical::CanonicalSchema
 
   # Create a validator with auto-detected draft version.

data/src/canonical.rs

@@ -15,7 +15,12 @@ use magnus::{
 };
 
 use crate::{
-    options::{extract_pattern_options, parse_draft_symbol, RbPatternOptions},
+    options::{
+        extract_pattern_options, parse_draft_symbol, RbPatternOptions, KW_BASE_URI, KW_REGISTRY,
+        KW_RETRIEVER,
+    },
+    registry::Registry,
+    retriever::make_retriever,
     ser::{to_schema_value, value_to_ruby},
     static_id::define_rb_intern,
 };
@@ -24,8 +29,18 @@ define_rb_intern!(static CANONICAL_KW_DRAFT: "draft");
 define_rb_intern!(static CANONICAL_KW_VALIDATE_FORMATS: "validate_formats");
 define_rb_intern!(static CANONICAL_KW_PATTERN_OPTIONS: "pattern_options");
 
-type CanonicalKwArgs =
-    magnus::scan_args::KwArgs<(), (Option<Value>, Option<bool>, Option<Value>), ()>;
+type CanonicalKwArgs = magnus::scan_args::KwArgs<
+    (),
+    (
+        Option<Value>,
+        Option<bool>,
+        Option<Value>,
+        Option<Value>,
+        Option<Value>,
+        Option<String>,
+    ),
+    (),
+>;
 
 macro_rules! canonical_error_class {
     ($static_name:ident, $class_name:literal) => {
@@ -1274,9 +1289,13 @@ fn canonicalize(ruby: &Ruby, args: &[Value]) -> Result<Value, Error> {
             *CANONICAL_KW_DRAFT,
             *CANONICAL_KW_VALIDATE_FORMATS,
             *CANONICAL_KW_PATTERN_OPTIONS,
+            *KW_RETRIEVER,
+            *KW_REGISTRY,
+            *KW_BASE_URI,
         ],
     )?;
-    let (draft_val, validate_formats, pattern_options) = base_kwargs.optional;
+    let (draft_val, validate_formats, pattern_options, retriever_val, registry_val, base_uri) =
+        base_kwargs.optional;
 
     let schema_value = to_schema_value(ruby, schema_arg)?;
     let mut options = jsonschema::canonical::options();
@@ -1292,6 +1311,34 @@ fn canonicalize(ruby: &Ruby, args: &[Value]) -> Result<Value, Error> {
             RbPatternOptions::Regex(inner) => options = options.with_pattern_options(inner),
         }
     }
+    let mut has_retriever = false;
+    if let Some(val) = retriever_val {
+        if let Some(retriever) = make_retriever(ruby, val)? {
+            options = options.with_retriever(retriever);
+            has_retriever = true;
+        }
+    }
+    if let Some(val) = registry_val {
+        if !val.is_nil() {
+            let registry: &Registry = TryConvert::try_convert(val).map_err(|_| {
+                Error::new(
+                    ruby.exception_type_error(),
+                    "registry must be a JSONSchema::Registry instance",
+                )
+            })?;
+            if !has_retriever {
+                if let Some(value) = registry.retriever_value(ruby) {
+                    if let Some(retriever) = make_retriever(ruby, value)? {
+                        options = options.with_retriever(retriever);
+                    }
+                }
+            }
+            options = options.with_registry(registry.inner.as_ref());
+        }
+    }
+    if let Some(base_uri) = base_uri {
+        options = options.with_base_uri(base_uri);
+    }
     options
         .canonicalize(&schema_value)
         .map(|inner| ruby.obj_wrap(RbCanonicalSchema { inner }).as_value())

data/src/options.rs

@@ -30,8 +30,8 @@ define_rb_intern!(static KW_DRAFT: "draft");
 define_rb_intern!(static KW_VALIDATE_FORMATS: "validate_formats");
 define_rb_intern!(static KW_IGNORE_UNKNOWN_FORMATS: "ignore_unknown_formats");
 define_rb_intern!(static KW_MASK: "mask");
-define_rb_intern!(static KW_BASE_URI: "base_uri");
-define_rb_intern!(static KW_RETRIEVER: "retriever");
+define_rb_intern!(pub(crate) static KW_BASE_URI: "base_uri");
+define_rb_intern!(pub(crate) static KW_RETRIEVER: "retriever");
 define_rb_intern!(static KW_FORMATS: "formats");
 define_rb_intern!(static KW_KEYWORDS: "keywords");
 define_rb_intern!(pub(crate) static KW_REGISTRY: "registry");

metadata

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