dry-types-json-schema 0.0.2 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d53a441b9ed9f57e185e971538b1a3b3f81038527e9f071c7af8fbfb8cd10a3c
-  data.tar.gz: d6693481b3aaa1d6b5b81b34ae91c90eea58758f094681b68ea11f9fca5ea34c
+  metadata.gz: 67e63d34a8b81578fef86941bd3f448062ddf6357f5ea66751882f424a52bd28
+  data.tar.gz: 732938510bbdfa5490421cebfff6de06b57108819bdc0f7f7806f03ad4c8131b
 SHA512:
-  metadata.gz: 939497ac477bdc404b3ab166f3af9d2f42260617f96f145e73921d0dc721a57cea618d48b4738958b322be5c549268829fda68bd7309487db1e1695f47da3b16
-  data.tar.gz: 4e86da1db6970398e73fb22ee6d7dd3e1505198705bdcc0cddf28d7df849afcd521703043e6a550e42ee75bd526d30ecf5077d81b048498f914251554095ff26
+  metadata.gz: a0133a959fe532c4f5c75a5084c674a2e83553af6e6abb6580a1809fba8f5dd15c748640c786f4d22cd04a00303582ddc3ef957b707ec00d17281621bf4e6ad7
+  data.tar.gz: 05b90642aa10bce11add57b7591fa466a0102f9c5d62e4fa29b8a2f0a1318908d0a10baf9c36531fadf5584764d740b0beb3a7e21b540be63eb03a4b23f03ba0

data/.github/workflows/test.yml

@@ -0,0 +1,12 @@
+name: Test
+on: [push, pull_request]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: '3.3'
+        bundler-cache: true
+    - run: bundle exec make test

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dry-types-json-schema (0.0.2)
+    dry-types-json-schema (0.0.4)
       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.2"
+  s.version           = "0.0.4"
   s.summary           = "Generate JSON Schema from dry-types"
   s.authors           = ["elcuervo"]
   s.licenses          = %w[MIT]

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

@@ -17,7 +17,7 @@ module Dry
       IDENTITY = ->(v, _) { v }.freeze
       INSPECT = ->(v, _) { v.inspect }.freeze
       TO_INTEGER = ->(v, _) { v.to_i }.freeze
-      TO_ARRAY = ->(v, _) { v.to_a }.freeze
+      TO_ARRAY = ->(v, _) { Array(v) }.freeze
       TO_TYPE = ->(v, _) { CLASS_TO_TYPE.fetch(v.to_s.to_sym) }.freeze
 
       # Metadata annotations and allowed types overrides for schema generation.
@@ -161,21 +161,33 @@ module Dry
 
         definition.transform_values! { |v| v.call(type, ctx) }
 
-        return unless definition.any? && ctx
+        return unless definition.any?
 
         if (extra = EXTRA_PROPS_FOR_TYPE[type.to_s.to_sym])
           definition = definition.merge(extra)
         end
 
-        @keys[ctx] ||= {}
-        @keys[ctx].merge!(definition)
+        if ctx.nil?
+          @keys.merge!(definition)
+        else
+          @keys[ctx] ||= {}
+          @keys[ctx].merge!(definition)
+        end
+      end
+
+      def visit_intersection(node, opts = EMPTY_HASH)
+        *types, _ = node
+
+        result = types.map { |type| compile_type(type) }
+
+        @keys[opts[:key]] = deep_merge_items(result)
       end
 
       def visit_sum(node, opts = EMPTY_HASH)
         *types, _ = node
 
         result = types
-          .map { |type| single_type(type, opts.merge(sum: true)) }
+          .map { |type| compile_value(type, opts.merge(sum: true)) }
           .uniq
 
         return @keys[opts[:key]] = result.first if result.count == 1
@@ -205,14 +217,9 @@ module Dry
       def visit_struct(node, opts = EMPTY_HASH)
         _, schema = node
 
-        if opts[:key]
-          target = self.class.new
-          target.visit(schema)
+        return visit(schema, opts) unless opts[:key]
 
-          @keys[opts[:key]] = target.to_hash
-        else
-          visit(schema, opts)
-        end
+        @keys[opts[:key]] = compile_type(schema)
       end
 
       def visit_array(node, opts = EMPTY_HASH)
@@ -253,12 +260,29 @@ module Dry
 
       private
 
-      # FIXME: cleaner way to generate individual types
-      #
-      def single_type(type, opts)
+      def deep_merge_items(items)
+        items.reduce({}) do |current, target|
+          current.merge(target) do |_, from, to|
+            case [from.class, to.class]
+            when [::Hash, ::Hash]
+              deep_merge_items([from, to])
+            when [::Array, ::Array]
+              from | to
+            else
+              to
+            end
+          end
+        end
+      end
+
+      def compile_type(type, opts = EMPTY_HASH)
         self.class.new
           .tap { |target| target.visit(type, opts) }
           .to_hash
+      end
+
+      def compile_value(type, opts = EMPTY_HASH)
+        compile_type(type, opts)
           .values
           .first
       end

data/spec/extensions/json_schema_spec.rb

@@ -16,6 +16,14 @@ describe Dry::Types::JSONSchema do
         { type: :string, format: :email, title: title }
       end
     end
+
+    it_conforms_definition do
+      let(:type) { Dry::Types["string"].enum(*%w[a b]) }
+
+      let(:definition) do
+        { type: :string, enum: %w[a b] }
+      end
+    end
   end
 
   describe "hash" do
@@ -70,6 +78,9 @@ describe Dry::Types::JSONSchema do
         .of(Types::String)
         .constrained(min_size: 1)
 
+      BasicHash = Types::Hash.schema(name: Types::String)
+      ExtendedHash = Types::Hash.schema(age: Types::Integer) & BasicHash
+
       attribute  :data,   Types::String | Types::Hash
       attribute  :string, Types::String.constrained(min_size: 1, max_size: 255)
       attribute  :list,   VariableList
@@ -81,6 +92,8 @@ describe Dry::Types::JSONSchema do
       attribute? :meta,   Types::String.meta(format: :email)
       attribute? :enum,   Types::String.enum(*%w[draft published archived])
       attribute? :array,  ArrayOfStrings
+      attribute? :inter,  ExtendedHash
+
       attribute? :nested do
         attribute :deep, Types::Integer
       end
@@ -162,6 +175,15 @@ describe Dry::Types::JSONSchema do
               items: { type: :string }
             },
 
+            inter: {
+              type: :object,
+              properties: {
+                age: { type: :integer },
+                name: { type: :string }
+              },
+              required: %i[age name]
+            },
+
             nested: {
               type: :object,
               properties: {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dry-types-json-schema
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
 platform: ruby
 authors:
 - elcuervo
@@ -143,6 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - Gemfile