schemurai 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163dbc9593611cce4f28183766bd5e17a08387a54883c17a502a198eb010ad36
-  data.tar.gz: aa3d5f90db227194179023b31043cf36b4597e4af5f1e2209b2846e9c36f9044
+  metadata.gz: c4620544f45920ada46eda1beff7cbb6461fb1633031f78d2964c4e963716d82
+  data.tar.gz: b0a66f4e369181d9182a10715d1622924ebac68cfe32a1169b844714a7b6a038
 SHA512:
-  metadata.gz: 5f5ba215dde91e1bf364ff6ebbbebb7ea40b284e3908cfcb578d48aad2174c34e5cf6d9fd121947bb54f8b2cf0fad626e629ed94d6b4a52ab41ba84ad7dfbc55
-  data.tar.gz: 4efa97250aad095e414eb230310ae580bbd029b834aa11322cab8da0b19df7a1fb6703240ee0439fd4abe788fcfa47c918ac92806bef174d38d0110bb35cc934
+  metadata.gz: b6dd9a631fa90e9600e0a60ba4e2ecfca492497a69376a11801cf1a4bfb799fb71eea3546f417b394279b7c3795ace0d2ff8422c8fa8c0b9c9cf6e7530ca8f86
+  data.tar.gz: b8b2e1bdaccdfc420b1aa2cec9fc2bef856157d450ccb547dcf230693b4b959baa77f9901b9df920c5c73bd6ef982b468249655397c0160e55c3b57772b1c2c5

data/lib/schemurai/version.rb

@@ -2,5 +2,5 @@
 
 module Schemurai
   # The installed Schemurai version.
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schemurai
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Kuya KOHARA (oakcask)
@@ -64,7 +64,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.2.3
   rubygems_mfa_required: 'true'
 rdoc_options:
 - "--main"