Merge pull request #138 from Shopify/ap.array-reference-fix

Optional array reference fix

Author: adampetro

example_with_targets/b.graphql

@@ -1,4 +1,7 @@
 query Input {
   id
   targetAResult
+  optionalArray
+  optionalArrayOfArrays
+  optionalArrayOfOptionalArrays
 }

example_with_targets/schema.graphql

@@ -74,6 +74,9 @@ type Input {
   timeWithoutTimezone: TimeWithoutTimezone
   targetAResult: Int @restrictTarget(only: ["test.target-b"])
   country: CountryCode
+  optionalArray: [String!]
+  optionalArrayOfArrays: [[String!]!]
+  optionalArrayOfOptionalArrays: [[String!]]
 }
 
 """

shopify_function_macro/src/lib.rs

@@ -339,7 +339,7 @@ impl CodeGenerator for ShopifyFunctionCodeGenerator {
                 let field_type = Self::type_for_field(executable_struct, field.r#type(), true);
 
                 let properly_referenced_value =
-                    Self::reference_variable_for_type(field.r#type(), &format_ident!("value"));
+                    Self::reference_variable_for_type(field.r#type(), &format_ident!("value_ref"));
 
                 let description: Option<syn::Attribute> = field.description().map(|description| {
                     let description_lit_str = syn::LitStr::new(description, Span::mixed_site());
@@ -356,6 +356,7 @@ impl CodeGenerator for ShopifyFunctionCodeGenerator {
                             let value = self.__wasm_value.get_interned_obj_prop(interned_string_id);
                             shopify_function::wasm_api::Deserialize::deserialize(&value).unwrap()
                         });
+                        let value_ref = &value;
                         #properly_referenced_value
                     }
                 }
@@ -693,12 +694,16 @@ impl ShopifyFunctionCodeGenerator {
         variable: &syn::Ident,
     ) -> syn::Expr {
         match r#type {
-            WrappedExecutableType::Base(_) | WrappedExecutableType::Vec(_) => {
-                parse_quote! { &#variable }
+            WrappedExecutableType::Base(_) => {
+                parse_quote! { #variable }
+            }
+            WrappedExecutableType::Vec(_) => {
+                parse_quote! { #variable.as_slice()}
             }
             WrappedExecutableType::Optional(inner) => {
-                let inner_reference = Self::reference_variable_for_type(inner, variable);
-                parse_quote! { ::std::option::Option::as_ref(#inner_reference) }
+                let inner_variable = format_ident!("v_inner");
+                let inner_reference = Self::reference_variable_for_type(inner, &inner_variable);
+                parse_quote! { ::std::option::Option::as_ref(#variable).map(|#inner_variable| #inner_reference) }
             }
         }
     }