typed_data 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a692d748f21fdbfccf38620f4bb2a0845544e4d2b8dd27ac45ae18dd11c7565c
-  data.tar.gz: 2ed2ade4631169260f48100a5658a4ed4c8f79c25f664ea7ba75700de37cee4c
+  metadata.gz: fa8bfbb2363bcf13407a8bb1fdeed0099f16a5cda9296dd77489fb2b2d7bb024
+  data.tar.gz: 7c446db80a65cc04d22584f38d53c313092432e71ba64321c22d43967a976f8a
 SHA512:
-  metadata.gz: cef89670d16f7d370ca4e5dfe58a4d5e42eb72453e1649488dfccbfd0451602bf55468ab33e3343a274f4a63baddb589cdf82b92e8e7820354cd0489a7670e52
-  data.tar.gz: c3c1f4a9cfdf5b6833ea92129a981ceaa5e5576b18a62e0044242ffa5f50afd4931f23c1b9f16b1ebebdfd2983bab94d288f2bd3cf2eed75ae0f3f53066f5e75
+  metadata.gz: 8e783163ba498a893cacff761e9d502acf0e524e8f57790cf3500ee8e29b2310133dfacd76f017d47cf81bde4f9f0550d4bc78523e7213e7dbd80adae8864215
+  data.tar.gz: 31376d90ff56ab09b0a004b0d0bc8efaed10a6ec4d89cf8eee7c4fd2532c5f533507b96f29af365d6d413475f75d2be1a206d157ce3b19bc847ab24d2c52a17f

data/lib/typed_data/converter.rb

@@ -31,7 +31,7 @@ module TypedData
         when Schema::RecordType
           converted[key] = convert_record(subtype, value)
         when Schema::UnionType
-          converted[key] = convert_union(subtype, value)
+          converted[key] = convert_union(subtype, value, as_record_field: true)
         else
           converted[key] = subtype.coerce(value, formatter: union_type_key_formatter)
         end
@@ -82,24 +82,28 @@ module TypedData
     end
 
     # @param type [UnionType]
+    # @param as_record_field [Boolean]
     # @param map [Object]
-    def convert_union(type, value)
+    def convert_union(type, value, as_record_field: false)
       subtype = type.find_match(value)
       case subtype
       when Schema::ArrayType
-        type.default_value(union_type_key_formatter)
-          .merge!(union_type_key_formatter.call(subtype.to_s) => convert_array(subtype, value))
+        converted_value = convert_array(subtype, value)
       when Schema::MapType
-        type.default_value(union_type_key_formatter)
-          .merge!(union_type_key_formatter.call(subtype.to_s) => convert_map(subtype, value))
+        converted_value = convert_map(subtype, value)
       when Schema::RecordType
-        type.default_value(union_type_key_formatter)
-          .merge!(union_type_key_formatter.call(subtype.to_s) => convert_record(subtype, value))
+        converted_value = convert_record(subtype, value)
       when Schema::UnionType
-        type.default_value(union_type_key_formatter)
-          .merge!(union_type_key_formatter.call(subtype.to_s) => convert_union(subtype, value))
+        converted_value = convert_union(subtype, value)
       else
-        type.coerce(value, formatter: union_type_key_formatter)
+        return type.coerce(value, formatter: union_type_key_formatter)
+      end
+
+      if as_record_field
+        converted_value
+      else
+        type.default_value(union_type_key_formatter)
+          .merge!(union_type_key_formatter.call(subtype.to_s) => converted_value)
       end
     end
   end

data/lib/typed_data/schema/union_type.rb

@@ -6,13 +6,16 @@ module TypedData
       # @param types [Array<String>]
       def initialize(types)
         @types = types.map(&Schema.method(:build_type))
+        @nullable_primitive = @types.size == 2 && @types.any?(&:primitive?) && @types.any? { |t| t.is_a?(NullType) }
       end
 
       def to_s
-        "union_#{@types.map(&:to_s).join("_")}"
+        @nullable_primitive ? @types.first.to_s : "union_#{@types.map(&:to_s).join("_")}"
       end
 
       def coerce(value, formatter:)
+        return value if @nullable_primitive
+
         type = find_match(value)
         if type.is_a?(NullType)
           default_value(formatter)

data/lib/typed_data/version.rb

@@ -1,3 +1,3 @@
 module TypedData
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: typed_data
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - abicky