Fix smithy-json spec and rbs

Author: Matt Muller

gems/smithy-client/lib/smithy-client/param_converter.rb

@@ -86,8 +86,8 @@ def structure(ref, values)
       def union(ref, values)
         values = c(ref, values)
         if values.is_a?(Schema::Union)
-          member_shape = ref.shape.member_by_type(values.class)
-          member(member_shape, values)
+          member_ref = ref.shape.member_by_type(values.class)
+          member(member_ref, values)
         else
           key, value = values.first
           values[key] = member(ref.shape.member(key), value)

gems/smithy-json/lib/smithy-json/deserializer.rb

@@ -13,21 +13,22 @@ def initialize(options = {})
       def deserialize(shape, bytes, target)
         return {} if bytes.empty?
 
-        shape(shape, ::JSON.parse(bytes), target)
+        ref = shape.is_a?(ShapeRef) ? shape : ShapeRef.new(shape: shape)
+        shape(ref, ::JSON.parse(bytes), target)
       end
 
       private
 
-      def shape(shape, value, target = nil) # rubocop:disable Metrics/CyclomaticComplexity
-        case shape
+      def shape(ref, value, target = nil) # rubocop:disable Metrics/CyclomaticComplexity
+        case ref.shape
         when BlobShape then Base64.decode64(value)
         when BooleanShape then value.to_s == 'true'
         when FloatShape then float(value)
-        when ListShape then list(shape, value, target)
-        when MapShape then map(shape, value, target)
-        when StructureShape then structure(shape, value, target)
+        when ListShape then list(ref, value, target)
+        when MapShape then map(ref, value, target)
+        when StructureShape then structure(ref, value, target)
         when TimestampShape then timestamp(value)
-        when UnionShape then union(shape, value, target)
+        when UnionShape then union(ref, value, target)
         else value
         end
       end
@@ -42,35 +43,35 @@ def float(value)
         end
       end
 
-      def list(shape, values, target = nil)
+      def list(ref, values, target = nil)
         target = [] if target.nil?
         values.each do |value|
-          next if value.nil? && !sparse?(shape)
+          next if value.nil? && !sparse?(ref.shape)
 
-          target << (value.nil? ? nil : shape(shape.member.shape, value))
+          target << (value.nil? ? nil : shape(ref.shape.member, value))
         end
         target
       end
 
-      def map(shape, values, target = nil)
+      def map(ref, values, target = nil)
         target = {} if target.nil?
         values.each do |key, value|
-          next if value.nil? && !sparse?(shape)
+          next if value.nil? && !sparse?(ref.shape)
 
-          target[key] = value.nil? ? nil : shape(shape.value.shape, value)
+          target[key] = value.nil? ? nil : shape(ref.shape.value, value)
         end
         target
       end
 
-      def structure(shape, values, target = nil)
-        return Smithy::Schema::EmptyStructure.new if shape == Prelude::Unit
+      def structure(ref, values, target = nil) # rubocop:disable Metrics/AbcSize
+        return Smithy::Schema::EmptyStructure.new if ref.shape == Prelude::Unit
 
-        target = shape.type.new if target.nil?
-        shape.members.each do |member_name, member_shape|
-          key = member_shape.traits['smithy.api#jsonName'] || member_shape.name
+        target = ref.shape.type.new if target.nil?
+        ref.shape.members.each do |member_name, member_ref|
+          key = member_ref.traits['smithy.api#jsonName'] || member_ref.location_name
           next unless values.key?(key)
 
-          target[member_name] = shape(member_shape.shape, values[key])
+          target[member_name] = shape(member_ref, values[key])
         end
         target
       end
@@ -90,29 +91,29 @@ def timestamp(value)
         end
       end
 
-      def union(shape, values, target = nil) # rubocop:disable Metrics/AbcSize
-        sanitize_union!(shape, values)
+      def union(ref, values, target = nil) # rubocop:disable Metrics/AbcSize
+        sanitize_union!(ref, values)
 
         key, value = values.first
         return nil if key.nil?
 
-        shape.members.each do |member_name, member_shape|
-          name = member_shape.traits['smithy.api#jsonName'] || member_shape.name
+        ref.shape.members.each do |member_name, member_ref|
+          name = member_ref.traits['smithy.api#jsonName'] || member_ref.location_name
           next unless values.key?(name)
 
-          target = shape.member_type(member_name) if target.nil?
-          return target.new(shape(member_shape.shape, values[name]))
+          target = ref.shape.member_type(member_name) if target.nil?
+          return target.new(shape(member_ref, values[name]))
         end
-        shape.member_type(:unknown).new(key, value)
+        ref.shape.member_type(:unknown).new(key, value)
       end
 
-      def sanitize_union!(shape, values) # rubocop:disable Metrics/CyclomaticComplexity
+      def sanitize_union!(ref, values) # rubocop:disable Metrics/CyclomaticComplexity
         return unless values.size > 1
 
         # __type should be ignored unless it's a jsonName for a member
         type_as_name = false
-        shape.members.each_value do |member_shape|
-          name = member_shape.traits['smithy.api#jsonName'] || member_shape.name
+        ref.shape.members.each_value do |member_ref|
+          name = member_ref.traits['smithy.api#jsonName'] || member_ref.location_name
           type_as_name = true if name == '__type'
         end
 

gems/smithy-json/lib/smithy-json/serializer.rb

@@ -13,22 +13,22 @@ def initialize(options = {})
       def serialize(shape, data)
         return nil if shape == Prelude::Unit
 
-        shape = MemberShape.new('Dummy', shape) # TODO: this is pretty bad probably
-        ::JSON.dump(shape(shape, data))
+        ref = shape.is_a?(ShapeRef) ? shape : ShapeRef.new(shape: shape)
+        ::JSON.dump(shape(ref, data))
       end
 
       private
 
-      def shape(member_shape, value) # rubocop:disable Metrics/CyclomaticComplexity
-        shape = member_shape.shape
+      def shape(ref, value) # rubocop:disable Metrics/CyclomaticComplexity
+        shape = ref.shape
         case shape
         when BlobShape then blob(value)
         when FloatShape then float(value)
-        when ListShape then list(shape, value)
-        when MapShape then map(shape, value)
-        when StructureShape then structure(shape, value)
-        when TimestampShape then timestamp(member_shape, shape, value)
-        when UnionShape then union(shape, value)
+        when ListShape then list(ref, value)
+        when MapShape then map(ref, value)
+        when StructureShape then structure(ref, value)
+        when TimestampShape then timestamp(ref, value)
+        when UnionShape then union(ref, value)
         else value
         end
       end
@@ -49,37 +49,37 @@ def float(value)
         end
       end
 
-      def list(shape, values)
+      def list(ref, values)
         values.collect do |value|
-          next if value.nil? && !sparse?(shape)
+          next if value.nil? && !sparse?(ref.shape)
 
-          value.nil? ? nil : shape(shape.member, value)
+          value.nil? ? nil : shape(ref.shape.member, value)
         end
       end
 
-      def map(shape, values)
+      def map(ref, values)
         values.each.with_object({}) do |(key, value), data|
-          next if value.nil? && !sparse?(shape)
+          next if value.nil? && !sparse?(ref.shape)
 
-          data[key] = value.nil? ? nil : shape(shape.value, value)
+          data[key] = value.nil? ? nil : shape(ref.shape.value, value)
         end
       end
 
-      def structure(shape, values)
+      def structure(ref, values)
         return nil if values.nil?
 
         values.each_pair.with_object({}) do |(key, value), data|
-          if shape.member?(key) && !value.nil?
-            member_shape = shape.member(key)
-            member_name = member_shape.traits['smithy.api#jsonName'] || member_shape.name
-            data[member_name] = shape(member_shape, value)
+          if ref.shape.member?(key) && !value.nil?
+            member_ref = ref.shape.member(key)
+            member_name = member_ref.traits['smithy.api#jsonName'] || member_ref.location_name
+            data[member_name] = shape(member_ref, value)
           end
         end
       end
 
-      def timestamp(member_shape, shape, value)
+      def timestamp(ref, value)
         trait = 'smithy.api#timestampFormat'
-        case member_shape.traits[trait] || shape.traits[trait]
+        case ref.traits[trait] || ref.shape.traits[trait]
         when 'date-time' then value.utc.iso8601
         when 'http-date' then value.utc.httpdate
         else
@@ -88,18 +88,18 @@ def timestamp(member_shape, shape, value)
         end
       end
 
-      def union(shape, values) # rubocop:disable Metrics/AbcSize
+      def union(ref, values) # rubocop:disable Metrics/AbcSize
         data = {}
         if values.is_a?(Smithy::Schema::Union)
-          member_shape = shape.member_by_type(values.class)
-          member_name = member_shape.traits['smithy.api#jsonName'] || member_shape.name
-          data[member_name] = shape(member_shape, values)
+          member_ref = ref.shape.member_by_type(values.class)
+          member_name = member_ref.traits['smithy.api#jsonName'] || member_ref.location_name
+          data[member_name] = shape(member_ref, values)
         else
           key, value = values.first
-          if shape.member?(key)
-            member_shape = shape.member(key)
-            member_name = member_shape.traits['smithy.api#jsonName'] || member_shape.name
-            data[member_name] = shape(member_shape, value)
+          if ref.shape.member?(key)
+            member_ref = ref.shape.member(key)
+            member_name = member_ref.traits['smithy.api#jsonName'] || member_ref.location_name
+            data[member_name] = shape(member_ref, value)
           end
         end
         data

…ithy-json/spec/smithy-cbor/codec_spec.rb …ithy-json/spec/smithy-json/codec_spec.rbgems/smithy-json/spec/smithy-cbor/codec_spec.rb renamed to gems/smithy-json/spec/smithy-json/codec_spec.rb gems/smithy-json/spec/smithy-cbor/codec_spec.rb renamed to gems/smithy-json/spec/smithy-json/codec_spec.rb

@@ -14,7 +14,7 @@ module Smithy
         def initialize: (?Hash[Symbol, untyped]) -> void
 
         attr_accessor shape: Shape
-        attr_accessor location_name: String
+        attr_accessor location_name: String?
         attr_accessor traits: Hash[String, untyped]
         def []: (Symbol) -> Object
         def []=: (Symbol, Object) -> void