dry-types-json-schema 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67e63d34a8b81578fef86941bd3f448062ddf6357f5ea66751882f424a52bd28
-  data.tar.gz: 732938510bbdfa5490421cebfff6de06b57108819bdc0f7f7806f03ad4c8131b
+  metadata.gz: 36b8f47842c070aa29dd71b77d9b8b3e1a47cb1ca9949b803d38e61d209dd694
+  data.tar.gz: 0e232109de9548c377afb214ea99b675a54b8d98f6f828b47ffee829d8a8cdc8
 SHA512:
-  metadata.gz: a0133a959fe532c4f5c75a5084c674a2e83553af6e6abb6580a1809fba8f5dd15c748640c786f4d22cd04a00303582ddc3ef957b707ec00d17281621bf4e6ad7
-  data.tar.gz: 05b90642aa10bce11add57b7591fa466a0102f9c5d62e4fa29b8a2f0a1318908d0a10baf9c36531fadf5584764d740b0beb3a7e21b540be63eb03a4b23f03ba0
+  metadata.gz: 62ada56d637bbf63bf2564fe67abf89c7a1072dc1bafbfbdfcff1cdb61d02a1db54d8c16dedb03fdfe268d1686440351b64853b0dc4ecc13bc78fc8a539d5574
+  data.tar.gz: 1c2f9adc03ae8f18235e2b1fd2df5d02ba6ff86d66f52d31d8d785dbf62bd35853014f26f7afcf1ff0bf3e5af89a3fde1ebd6b6cc61f41068d557bee76a94383

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dry-types-json-schema (0.0.4)
+    dry-types-json-schema (0.0.5)
       dry-types (~> 1.7.2)
 
 GEM

data/dry-types-json-schema.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name              = "dry-types-json-schema"
-  s.version           = "0.0.4"
+  s.version           = "0.0.5"
   s.summary           = "Generate JSON Schema from dry-types"
   s.authors           = ["elcuervo"]
   s.licenses          = %w[MIT]
@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.add_dependency("dry-types", "~> 1.7.2")
 
   s.add_development_dependency("dry-struct", "~> 1.6.0")
+  s.add_development_dependency("json_schemer", "~> 2.2.1")
   s.add_development_dependency("minitest", "~> 5.22.3")
   s.add_development_dependency("pry", "~> 0.14.2")
-  s.add_development_dependency("json_schemer", "~> 2.2.1")
-  s.add_development_dependency("simplecov", "~> 0.22.0")
   s.add_development_dependency("rubocop", "~> 1.62.1")
   s.add_development_dependency("rubocop-minitest", "~> 0.35.0")
+  s.add_development_dependency("simplecov", "~> 0.22.0")
   s.add_development_dependency("super_diff", "~> 0.11.0")
 end

data/lib/dry/types/extensions/json_schema.rb

@@ -85,6 +85,7 @@ module Dry
       def initialize(root: false, loose: false)
         @keys = EMPTY_HASH.dup
         @required = Set.new
+
         @root = root
         @loose = loose
       end
@@ -139,10 +140,14 @@ module Dry
       def visit_nominal(node, opts = EMPTY_HASH)
         type, meta = node
 
-        if opts.fetch(:key, false)
+        if opts.key?(:key)
           visit_nominal_with_key(node, opts)
         else
-          @keys.merge!(type: CLASS_TO_TYPE[type.to_s.to_sym])
+          if opts.key?(:array)
+            @keys.merge!(items: { type: CLASS_TO_TYPE[type.to_s.to_sym] })
+          else
+            @keys.merge!(type: CLASS_TO_TYPE[type.to_s.to_sym])
+          end
           @keys.merge!(meta.slice(*ALLOWED_TYPES_META_OVERRIDES)) if meta.any?
         end
       end
@@ -187,7 +192,7 @@ module Dry
         *types, _ = node
 
         result = types
-          .map { |type| compile_value(type, opts.merge(sum: true)) }
+          .map { |type| compile_value(type, { sum: true }.merge(opts)) }
           .uniq
 
         return @keys[opts[:key]] = result.first if result.count == 1
@@ -205,7 +210,7 @@ module Dry
         (_, (_, ((_, left_type),))) = left
 
         visit(left, opts)
-        visit(right, opts.merge(left_type: left_type))
+        visit(right, { left_type: left_type }.merge(opts))
       end
 
       def visit_hash(node, opts = EMPTY_HASH)
@@ -225,7 +230,7 @@ module Dry
       def visit_array(node, opts = EMPTY_HASH)
         type, meta = node
 
-        visit(type, opts.merge(array: true))
+        visit(type, { array: true }.merge(opts))
 
         @keys[opts[:key]].merge!(meta.slice(*ANNOTATIONS)) if meta.any?
       end
@@ -255,7 +260,7 @@ module Dry
 
         @required << name if required
 
-        visit(rest, opts.merge(key: name))
+        visit(rest, { key: name }.merge(opts))
       end
 
       private

data/spec/extensions/json_schema_spec.rb

@@ -59,6 +59,25 @@ describe Dry::Types::JSONSchema do
     end
   end
 
+  describe "array" do
+    it_conforms_definition do
+      let(:type) do
+        Dry::Types["array"]
+          .of(Dry::Types["integer"])
+          .constrained(min_size: 1, max_size: 100)
+      end
+
+      let(:definition) do
+        {
+          type: :array,
+          minItems: 1,
+          maxItems: 100,
+          items: { type: :integer }
+        }
+      end
+    end
+  end
+
   describe "struct" do
     class StructTest < Dry::Struct
       schema schema.meta(title: "Title", description: "description")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-types-json-schema
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - elcuervo
@@ -39,89 +39,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: json_schemer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.3
+        version: 2.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.3
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 5.22.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.2
+        version: 5.22.3
 - !ruby/object:Gem::Dependency
-  name: json_schemer
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 0.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 0.14.2
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 1.62.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.22.0
+        version: 1.62.1
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.62.1
+        version: 0.35.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.62.1
+        version: 0.35.0
 - !ruby/object:Gem::Dependency
-  name: rubocop-minitest
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: super_diff
   requirement: !ruby/object:Gem::Requirement