Add graphqlIsFunction configuration

Author: jfrolich

src/base/generator_utils.re

@@ -23,6 +23,7 @@ type output_config = {
   full_document: Graphql_ast.document,
   template_tag: (option(string), option(string), option(string)),
   template_tag_return_type: option(string),
+  template_tag_is_function: option(bool),
   records: bool,
   inline: bool,
   future_added_value: bool,

src/base/ppx_config.re

@@ -19,6 +19,7 @@ type config = {
   template_tag_location: option(string),
   template_tag_import: option(string),
   template_tag_return_type: option(string),
+  template_tag_is_function: option(bool),
   custom_fields: Hashtbl.t(string, string),
   future_added_value: bool,
   extend_query: option(string),
@@ -62,6 +63,9 @@ let template_tag_location = () =>
 let template_tag_return_type = () =>
   (config_ref^ |> Option.unsafe_unwrap).template_tag_return_type;
 
+let template_tag_is_function = () =>
+  (config_ref^ |> Option.unsafe_unwrap).template_tag_is_function;
+
 let verbose_error_handling = () =>
   (config_ref^ |> Option.unsafe_unwrap).verbose_error_handling;
 

src/base/result_decoder.re

@@ -817,6 +817,7 @@ type query_config = {
   template_tag_import: option(string),
   template_tag_return_type: option(string),
   tagged_template: option(bool),
+  template_tag_is_function: option(bool),
   future_added_value: option(bool),
   extend: option(string),
   fragment_in_query: option(Ppx_config.fragment_in_query),
@@ -930,6 +931,10 @@ let config_arguments_to_config =
                ...config,
                tagged_template: Some(value),
              }
+           | ({item: "templateTagIsFunction"}, {item: Iv_boolean(value)}) => {
+               ...config,
+               template_tag_is_function: Some(value),
+             }
            | ({item: "futureAddedValue"}, {item: Iv_boolean(value)}) => {
                ...config,
                future_added_value: Some(value),
@@ -1013,6 +1018,11 @@ let to_output_config =
           query_config.template_tag_return_type,
           Ppx_config.template_tag_return_type(),
         ),
+      template_tag_is_function:
+        get_with_default(
+          query_config.template_tag_is_function,
+          Ppx_config.template_tag_is_function(),
+        ),
       extend: query_config.extend,
       fragment_in_query:
         switch (query_config.fragment_in_query) {

src/base/result_decoder.rei

@@ -8,6 +8,7 @@ type query_config = {
   template_tag_import: option(string),
   template_tag_return_type: option(string),
   tagged_template: option(bool),
+  template_tag_is_function: option(bool),
   future_added_value: option(bool),
   extend: option(string),
   fragment_in_query: option(Ppx_config.fragment_in_query),

src/bucklescript/bucklescript_config.re

@@ -63,6 +63,7 @@ let defaultConfig =
     template_tag_location: None,
     template_tag_import: None,
     template_tag_return_type: None,
+    template_tag_is_function: None,
     custom_fields: Hashtbl.create(0),
     future_added_value: true,
     extend_query: None,
@@ -282,6 +283,14 @@ let read_config = () => {
         }
       );
     };
+    let handleTemplateTagIsFunction = template_tag_is_function => {
+      Ppx_config.update_config(current =>
+        {
+          ...current,
+          template_tag_is_function: Some(template_tag_is_function),
+        }
+      );
+    };
 
     let configBool = (key, value) =>
       ppxConfig |> JsonHelper.mapBool(key, value);
@@ -342,6 +351,7 @@ let read_config = () => {
     configString("templateTagLocation", handleTemplateTagLocation);
     configString("template-tag-return-type", handleTemplateTagReturnType);
     configString("templateTagReturnType", handleTemplateTagReturnType);
+    configBool("template-tag-is-function", handleTemplateTagIsFunction);
 
     ppxConfig |> read_custom_fields;
   };

src/bucklescript/graphql_ppx.re

@@ -289,6 +289,8 @@ let get_query_config_from_trailing_record = fields =>
         extend: extract_extend_from_config(fields),
         fragment_in_query: extract_fragment_in_query_from_config(fields),
         apollo_mode: extract_apollo_mode_from_config(fields),
+        // do not support these new options in the trailing record
+        template_tag_is_function: None,
       };
     }
   );
@@ -304,6 +306,7 @@ let empty_query_config =
     template_tag_location: None,
     template_tag_import: None,
     template_tag_return_type: None,
+    template_tag_is_function: None,
     future_added_value: None,
     extend: None,
     fragment_in_query: None,

src/bucklescript/output_bucklescript_module.re

@@ -280,8 +280,11 @@ let make_printed_query = (config, document) => {
     |> emit_json(config)
 
   | Ppx_config.String =>
-    switch (config.template_tag) {
-    | (template_tag, location, import)
+    switch (config.template_tag_is_function, config.template_tag) {
+    | (Some(true), (_, location, _)) when location != None =>
+      %expr
+      graphql([%e emit_printed_query(source, config)])
+    | (_, (template_tag, location, import))
         when template_tag != None || location != None =>
       open Graphql_printer;
       // the only way to emit a template literal for now, using the bs.raw
@@ -331,7 +334,7 @@ let make_printed_query = (config, document) => {
         config.template_tag_return_type,
       );
 
-    | (_, _, _) => emit_printed_query(source, config)
+    | _ => emit_printed_query(source, config)
     }
   };
 };
@@ -645,6 +648,44 @@ function back to the original JSON compatible data */
   |> List.concat;
 };
 
+let graphql_external = (config: output_config) => {
+  switch (config) {
+  | {
+      template_tag: (import, Some(location), _),
+      template_tag_return_type,
+      template_tag_is_function: Some(true),
+    } =>
+    let return_type =
+      switch (template_tag_return_type) {
+      | None => "string"
+      | Some(return_type) => return_type
+      };
+    let import =
+      switch (import) {
+      | None => "default"
+      | Some(import) => import
+      };
+    [
+      Ast_helper.(
+        Str.primitive(
+          Val.mk(
+            ~attrs=[
+              Ast_helper.Attr.mk(
+                {txt: "bs.module", loc: Location.none},
+                PStr([Str.eval(const_str_expr(location))]),
+              ),
+            ],
+            ~prim=[import],
+            {txt: "graphql", loc: Location.none},
+            [%type: string => [%t base_type_name(return_type)]],
+          ),
+        )
+      ),
+    ];
+  | _ => []
+  };
+};
+
 let generate_operation_implementation =
     (config, variable_defs, _has_error, operation, res_structure) => {
   let parse_fn =
@@ -719,6 +760,7 @@ let generate_operation_implementation =
         ],
         types,
         arg_types,
+        graphql_external(config),
         [
           [%stri let query = [%e printed_query]],
           [%stri let parse: Raw.t => t = value => [%e parse_fn]],
@@ -1040,6 +1082,7 @@ let generate_fragment_implementation =
       [[%stri [@ocaml.warning "-32"]]],
       [wrap_module(~loc=Location.none, "Raw", raw_types)],
       types,
+      graphql_external(config),
       [
         [%stri let query = [%e printed_query]],
         [%stri let parse: Raw.t => [%t type_name] = value => [%e parse_fn]],

src/native/graphql_ppx.re

@@ -99,6 +99,7 @@ let empty_query_config =
     template_tag_location: None,
     template_tag_import: None,
     template_tag_return_type: None,
+    template_tag_is_function: None,
     future_added_value: None,
     extend: None,
     fragment_in_query: None,
@@ -249,6 +250,7 @@ let () =
       template_tag_location: None,
       template_tag_import: None,
       template_tag_return_type: None,
+      template_tag_is_function: None,
       custom_fields: Hashtbl.create(0),
       future_added_value: true,
       extend_query: None,