schemurai 2.2.2 → 2.3.0

data/lib/schemurai/vm/evaluator.rb

@@ -2,6 +2,7 @@
 
 require "base64"
 require "json"
+require "set" # rubocop:disable Lint/RedundantRequireStatement -- Required on Ruby 3.4.
 require_relative "../evaluation"
 require_relative "../error_message"
 require_relative "../unique_items"
@@ -13,8 +14,10 @@ module Schemurai
       attr_reader :evaluated_properties, :evaluated_items
 
       def initialize
-        @evaluated_properties = []
-        @evaluated_items = []
+        # Applicators can overlap. Array membership makes collecting and merging
+        # their annotations quadratic in the number of instance locations.
+        @evaluated_properties = Set.new
+        @evaluated_items = Set.new
       end
 
       def valid? = true
@@ -26,26 +29,24 @@ module Schemurai
       end
 
       def record_property(name)
-        @evaluated_properties << name unless @evaluated_properties.include?(name)
+        @evaluated_properties.add(name)
         self
       end
 
       def record_item(index)
-        @evaluated_items << index unless @evaluated_items.include?(index)
+        @evaluated_items.add(index)
         self
       end
 
       def merge(other)
         return Evaluation.invalid unless other.valid?
 
-        merge_locations(@evaluated_properties, other.evaluated_properties)
-        merge_locations(@evaluated_items, other.evaluated_items)
+        properties = other.evaluated_properties
+        items = other.evaluated_items
+        @evaluated_properties.merge(properties) unless properties.empty?
+        @evaluated_items.merge(items) unless items.empty?
         self
       end
-
-      private def merge_locations(target, locations)
-        locations.each { |location| target << location unless target.include?(location) }
-      end
     end
     private_constant :EvaluationBuffer
 
@@ -652,7 +653,7 @@ module Schemurai
           matched = nil
           index = 0
           while index < value.length
-            (matched ||= []) << index if trial_at(contains, value[index], index, "contains").valid?
+            (matched ||= []) << index if trial(contains, value[index]).valid?
             index += 1
           end
           matched_count = matched ? matched.length : 0
@@ -873,7 +874,7 @@ module Schemurai
           matches = 0
           index = 0
           while index < operand.length
-            result = trial_at(operand[index], value, MISSING_SEGMENT, "anyOf", index)
+            result = trial(operand[index], value)
             if result.valid?
               matches += 1
               evaluation = evaluation.merge(result)
@@ -886,7 +887,7 @@ module Schemurai
           matched_evaluation = nil
           index = 0
           while index < operand.length
-            result = trial_at(operand[index], value, MISSING_SEGMENT, "oneOf", index)
+            result = trial(operand[index], value)
             if result.valid?
               matches += 1
               matched_evaluation = result
@@ -899,9 +900,9 @@ module Schemurai
             add_error("oneOf") { Internal::ErrorMessage.one_of(matches) }
           end
         when :not
-          add_error("not") { Internal::ErrorMessage.not } if trial_at(operand, value, MISSING_SEGMENT, "not").valid?
+          add_error("not") { Internal::ErrorMessage.not } if trial(operand, value).valid?
         when :conditional
-          condition = trial_at(operand.condition, value, MISSING_SEGMENT, "if")
+          condition = trial(operand.condition, value)
           condition_valid = condition.valid?
           evaluation = evaluation.merge(condition) if condition_valid
           if condition_valid && operand.then_branch
@@ -916,12 +917,24 @@ module Schemurai
       private def trial(program, value)
         saved_errors = @errors
         saved_count = @error_count
+        saved_instance_path = @instance_path
         @errors = nil
         @error_count = 0
+        # Trials retain annotations, but discard errors. Descendants therefore
+        # need neither instance nor schema paths until the trial has returned.
+        if saved_instance_path
+          saved_schema_path = @schema_path
+          @instance_path = nil
+          @schema_path = nil
+        end
         evaluate(program, value)
       ensure
         @errors = saved_errors
         @error_count = saved_count
+        if saved_instance_path
+          @instance_path = saved_instance_path
+          @schema_path = saved_schema_path
+        end
       end
 
       private def evaluate_at(program, instance, instance_segment, schema_segment, child_segment = MISSING_SEGMENT)
@@ -949,23 +962,6 @@ module Schemurai
         @instance_path.pop unless instance_segment.equal?(MISSING_SEGMENT)
       end
 
-      private def trial_at(program, instance, instance_segment, schema_segment, child_segment = MISSING_SEGMENT)
-        return trial(program, instance) unless @instance_path
-
-        trial_at_with_path(program, instance, instance_segment, schema_segment, child_segment)
-      end
-
-      private def trial_at_with_path(program, instance, instance_segment, schema_segment, child_segment)
-        @instance_path << instance_segment unless instance_segment.equal?(MISSING_SEGMENT)
-        @schema_path << schema_segment
-        @schema_path << child_segment unless child_segment.equal?(MISSING_SEGMENT)
-        trial(program, instance)
-      ensure
-        @schema_path.pop unless child_segment.equal?(MISSING_SEGMENT)
-        @schema_path.pop
-        @instance_path.pop unless instance_segment.equal?(MISSING_SEGMENT)
-      end
-
       private def add_error(keyword, message = nil, append_keyword: true)
         @error_count += 1
         return false unless @errors

data/lib/schemurai.rb

@@ -72,19 +72,19 @@ module Schemurai
   # Register every external schema with +schemas:+ before compiling. A registry
   # can be made shareable once registration and compilation are complete.
   class SchemaRegistry
-    # The selected backend, either +:ruby+ or +:vm+.
+    # The selected backend, +:ruby+, +:vm+, or +:native+.
     attr_reader :backend
 
     # Creates a registry.
     #
     # +schemas+ maps absolute URI strings to JSON-shaped Ruby schemas. Pass
     # +validate_schema: true+ to validate every registered and compiled schema
-    # against its meta-schema. +backend+ accepts +:ruby+, +:vm+, or +:default+.
+    # against its meta-schema. +backend+ accepts +:ruby+, +:vm+, +:native+, or +:default+.
     def initialize(schemas: {}, validate_schema: false, backend: Backend.requested)
       @backend = Backend.resolve(backend)
       @validate_schema = validate_schema
       @graph = Internal::SchemaGraph.new(schemas: schemas)
-      @compiler = VM::Compiler.new(@graph) if @backend == :vm
+      @compiler = VM::Compiler.new(@graph) if %i[vm native].include?(@backend)
       schemas.each_value { |schema| validate_schema!(schema) } if validate_schema?
     end
 
@@ -150,7 +150,8 @@ module Schemurai
     private def build_validator(root, content:, format:)
       evaluator = if @compiler
         program = @compiler.compile(root)
-        VM::Evaluator.new(@graph, @compiler, program, content: content, format: format)
+        evaluator_class = (@backend == :native) ? Native::Evaluator : VM::Evaluator
+        evaluator_class.new(@graph, @compiler, program, content: content, format: format)
       else
         Internal::Evaluator.new(@graph, root, content: content, format: format)
       end
@@ -177,7 +178,7 @@ module Schemurai
       @evaluator = evaluator
     end
 
-    # The backend reported by the evaluator, either +:ruby+ or +:vm+.
+    # The backend reported by the evaluator, +:ruby+, +:vm+, or +:native+.
     def backend
       @evaluator.backend
     end
@@ -193,7 +194,7 @@ module Schemurai
     end
   end
 
-  # Returns the backend selected by SCHEMURAI_BACKEND, either +:ruby+ or +:vm+.
+  # Returns the backend selected by SCHEMURAI_BACKEND, +:ruby+, +:vm+, or +:native+.
   module_function def backend
     Backend.resolve
   end
@@ -202,7 +203,7 @@ module Schemurai
   #
   # +schemas+ maps external URI strings to schemas. +base_uri+ supplies the
   # schema's base URI. Optional content and format assertions are disabled by
-  # default. +backend+ accepts +:ruby+, +:vm+, or +:default+.
+  # default. +backend+ accepts +:ruby+, +:vm+, +:native+, or +:default+.
   module_function def compile(schema, schemas: {}, base_uri: nil, content: false, format: false, validate_schema: false, backend: Backend.requested)
     SchemaRegistry.new(schemas: schemas, validate_schema: validate_schema, backend: backend).compile(
       schema,

data/sig/schemurai.rbs

@@ -9,7 +9,7 @@ module Schemurai
   type schemas = Hash[String, schema]
 
   # A resolved evaluator backend.
-  type backend = :ruby | :vm
+  type backend = :ruby | :vm | :native
 
   # A backend accepted when configuring a validator.
   type backend_selection = backend | :default

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemurai
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Kuya KOHARA (oakcask)
@@ -28,13 +28,29 @@ description: Validates Ruby values against JSON Schema Draft 7, 2019-09, and 202
 email:
 - kuya.kohara@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/schemurai_native/extconf.rb
 extra_rdoc_files:
 - LICENSE
 - README.md
 files:
 - LICENSE
 - README.md
+- ext/schemurai_native/Cargo.lock
+- ext/schemurai_native/Cargo.toml
+- ext/schemurai_native/build.rs
+- ext/schemurai_native/extconf.rb
+- ext/schemurai_native/glue.c
+- ext/schemurai_native/protocol.def
+- ext/schemurai_native/protocol.h
+- ext/schemurai_native/src/content.rs
+- ext/schemurai_native/src/diagnostics.rs
+- ext/schemurai_native/src/format.rs
+- ext/schemurai_native/src/lib.rs
+- ext/schemurai_native/src/number.rs
+- ext/schemurai_native/src/pattern.rs
+- ext/schemurai_native/src/scope.rs
+- ext/schemurai_native/src/tracking.rs
 - lib/schemurai.rb
 - lib/schemurai/backend.rb
 - lib/schemurai/dialect.rb
@@ -50,6 +66,8 @@ files:
 - lib/schemurai/meta_schemas/draft2019_09.rb
 - lib/schemurai/meta_schemas/draft2020_12.rb
 - lib/schemurai/meta_schemas/draft7.rb
+- lib/schemurai/native/diagnostics.rb
+- lib/schemurai/native/evaluator.rb
 - lib/schemurai/schema_domain.rb
 - lib/schemurai/schema_graph.rb
 - lib/schemurai/schema_node.rb
@@ -64,7 +82,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/oakcask/schemurai
   source_code_uri: https://github.com/oakcask/schemurai/tree/main
-  documentation_uri: https://rubydoc.info/gems/schemurai/2.2.2
+  documentation_uri: https://rubydoc.info/gems/schemurai/2.3.0
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--main"
@@ -90,5 +108,5 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 4.0.20
 specification_version: 4
-summary: A fast, Ractor-safe, pure Ruby JSON Schema Draft 7+ validator
+summary: A fast, Ractor-safe JSON Schema Draft 7+ validator
 test_files: []