babl-json 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e01613db4c4f669f2f64a0bdbc324bfe38074b44
-  data.tar.gz: 62b10c1b72ad3f2773f3e655099d90453d3f6b1d
+  metadata.gz: f5116d890ae716b94f6fcb09fd90591313beb68d
+  data.tar.gz: 4bba953360594c5f46ad6160870a2ab469a932af
 SHA512:
-  metadata.gz: 3ca13bb367880694af386e52197753e1e4a1a85aa624bc59c05af691fe98227e840ea5c54e0124eb5401988aa01393657c90c92abd278c3230664046ff638406
-  data.tar.gz: bcbecaa3869e2c8f2c04c4fc565eef473ae5219a39d92c2d6c5dd950eaeaba2d03f66017df98859ecef1ee48e6da9ff919452a76965644ddad32324035553960
+  metadata.gz: 4467e3975a1f2f3130f68dc8fed5327b608838f2bcf8eebe61fae29fd5608ecc9de328192a2a2c5797ad54cce7ea68b6e9dc684c7c11ccf1c4a479f0147c54b9
+  data.tar.gz: effc3f204316f2d67f0e74a8f6704fedae840b03ff41129697316c06f169d3a7363a2ccd3f0bfa9042f9398e5fe450b209290d7a1b7c38b1620aff426d086634

data/lib/babl/schema/any_of.rb

@@ -12,12 +12,7 @@ module Babl
             end
 
             def json
-                primitives, complex = choice_set.partition { |choice| Primitive === choice }
-
-                simple_enum = { enum: primitives.map(&:value) }
-                return simple_enum if complex.empty?
-
-                { anyOf: complex.map(&:json) + (primitives.empty? ? [] : [simple_enum]) }
+                json_only_primitives || json_coalesced_types || json_general_case
             end
 
             # Perform simple transformations in order to reduce the size of the generated
@@ -42,6 +37,34 @@ module Babl
 
             private
 
+            def json_only_primitives
+                return { enum: choice_set.map(&:value) } if choice_set.all? { |c| Primitive === c }
+            end
+
+            def json_coalesced_types
+                remaining = choice_set.dup
+                json_types = []
+
+                [Primitive::NULL, Typed::INTEGER, Typed::BOOLEAN, Typed::NUMBER, Typed::STRING].each do |coalescible|
+                    if remaining.include?(coalescible)
+                        json_types << coalescible.json[:type]
+                        remaining.delete(coalescible)
+                    end
+                end
+
+                # Note: ideally, we would like to turn :
+                #   {"anyOf": [{"type": "null"},{"type": "object", ...}]}
+                # into
+                #   {"type": ["null", "object"], ...}
+                # but https://github.com/bcherny/json-schema-to-typescript has trouble converting
+                # from the latter format and that's an issue for us.
+                return { type: json_types.uniq } if remaining.empty?
+            end
+
+            def json_general_case
+                { anyOf: choice_set.map(&:json) }
+            end
+
             def simplify_integer_is_number
                 return unless choice_set.include?(Typed::INTEGER) && choice_set.include?(Typed::NUMBER)
                 AnyOf.canonicalized(choice_set - [Typed::INTEGER])

data/lib/babl/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Babl
-    VERSION = '0.5.1'
+    VERSION = '0.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: babl-json
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Frederic Terrazzoni