Optimization: update collect_annotations

skryukov · Oct 22, 2023 · bd76ebf · bd76ebf
1 parent 7b28708
commit bd76ebf
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 30 deletions.
diff --git a/lib/json_skooma/keywords/draft_2019_09/unevaluated_items.rb b/lib/json_skooma/keywords/draft_2019_09/unevaluated_items.rb
@@ -12,21 +12,16 @@ class UnevaluatedItems < Base
           if then else allOf anyOf oneOf not
         ]
 
+        LOOKUP_KEYWORDS = %w[items additionalItems unevaluatedItems].freeze
+
         def evaluate(instance, result)
           last_evaluated_item = -1
 
-          result.parent.collect_annotations(instance, "items") do |i|
+          result.parent.collect_annotations(instance, keys: LOOKUP_KEYWORDS) do |node|
+            i = node.annotation
             next result.discard if i == true
 
-            last_evaluated_item = i if i > last_evaluated_item
-          end
-
-          result.parent.collect_annotations(instance, "additionalItems") do |i|
-            next result.discard if i == true
-          end
-
-          result.parent.collect_annotations(instance, "unevaluatedItems") do |i|
-            next result.discard if i == true
+            last_evaluated_item = i if node.key == "items" && i > last_evaluated_item
           end
 
           annotation = nil

diff --git a/lib/json_skooma/keywords/unevaluated/unevaluated_items.rb b/lib/json_skooma/keywords/unevaluated/unevaluated_items.rb
@@ -12,25 +12,21 @@ class UnevaluatedItems < Base
           if then else allOf anyOf oneOf not
         ]
 
+        LOOKUP_KEYWORDS = %w[items unevaluatedItems prefixItems contains].freeze
+
         def evaluate(instance, result)
+          contains_indices = Set.new
           last_evaluated_item = -1
 
-          result.parent.collect_annotations(instance, "prefixItems") do |i|
-            next result.discard if i == true
-
-            last_evaluated_item = i if i > last_evaluated_item
-          end
+          result.parent.collect_annotations(instance, keys: LOOKUP_KEYWORDS) do |node|
+            next contains_indices += node.annotation if node.key == "contains"
 
-          result.parent.collect_annotations(instance, "items") do |i|
+            i = node.annotation
             next result.discard if i == true
-          end
 
-          result.parent.collect_annotations(instance, "unevaluatedItems") do |i|
-            next result.discard if i == true
+            last_evaluated_item = i if node.key == "prefixItems" && i > last_evaluated_item
           end
 
-          contains_indices = Set.new
-          result.parent.collect_annotations(instance, "contains") { |i| contains_indices += i }
           annotation = nil
           error = []
 

diff --git a/lib/json_skooma/keywords/unevaluated/unevaluated_properties.rb b/lib/json_skooma/keywords/unevaluated/unevaluated_properties.rb
@@ -12,12 +12,13 @@ class UnevaluatedProperties < Base
           if then else dependentSchemas allOf anyOf oneOf not
         ]
 
+        LOOKUP_KEYWORDS = %w[properties patternProperties additionalProperties unevaluatedProperties].freeze
+
         def evaluate(instance, result)
           evaluated_names = Set.new
-          result.parent.collect_annotations(instance, "properties") { |name| evaluated_names += name }
-          result.parent.collect_annotations(instance, "patternProperties") { |name| evaluated_names += name }
-          result.parent.collect_annotations(instance, "additionalProperties") { |name| evaluated_names += name }
-          result.parent.collect_annotations(instance, "unevaluatedProperties") { |name| evaluated_names += name }
+          result.parent.collect_annotations(instance, keys: LOOKUP_KEYWORDS) do |node|
+            evaluated_names += node.annotation
+          end
 
           annotation = []
           error = []

diff --git a/lib/json_skooma/result.rb b/lib/json_skooma/result.rb
@@ -118,18 +118,36 @@ def absolute_uri
       schema.canonical_uri.dup.tap { |u| u.fragment = path.to_s }
     end
 
-    def collect_annotations(instance = nil, key = nil)
+    def collect_annotations(instance, key: nil, keys: nil)
       return if !valid? || discard?
 
       if @annotation &&
           (key.nil? || key == @key) &&
-          (instance.nil? || instance.path == @instance.path)
-        yield @annotation
+          (keys.nil? || keys.include?(@key)) &&
+          (instance.path == @instance.path)
+        yield self
       end
 
       children[instance.path]&.each_value do |child|
-        child.collect_annotations(instance, key) do |annotation|
-          yield annotation
+        child.collect_annotations(instance, key: key, keys: keys) do |node|
+          yield node
+        end
+      end
+    end
+
+    def collect_errors(instance, key: nil, keys: nil)
+      return if valid? || discard?
+
+      if @error &&
+          (key.nil? || key == @key) &&
+          (keys.nil? || keys.include?(@key)) &&
+          (instance.path == @instance.path)
+        yield self
+      end
+
+      children[instance.path]&.each_value do |child|
+        child.collect_errors(instance, key: key, keys: keys) do |node|
+          yield node
         end
       end
     end