fix(scalar): custom scalars should return data as is (#1844)

src/blueprint/schema.rs

@@ -51,7 +51,7 @@ pub fn validate_field_has_resolver(
                 let type_name = &field.type_of;
                 if let Some(ty) = types.get(type_name) {
                     // It's an enum
-                    if ty.variants.is_some() {
+                    if ty.variants.is_some() || ty.scalar {
                         return true;
                     }
                     let res = validate_type_has_resolvers(type_name, ty, types);

src/config/config_module.rs

@@ -117,6 +117,10 @@ fn get_input_types(config: &Config) -> HashSet<String> {
                     .filter(|(_, arg)| !scalar::is_scalar(&arg.type_of))
                 {
                     if let Some(t) = config.find_type(&arg.type_of) {
+                        if t.scalar {
+                            continue;
+                        }
+
                         t.fields.iter().for_each(|(_, f)| {
                             types.insert(f.type_of.clone());
                             recurse_type(config, &f.type_of, &mut types)

tests/core/snapshots/test-scalars.md_4.snap

@@ -8,20 +8,11 @@ expression: response
     "content-type": "application/json"
   },
   "body": {
-    "data": null,
-    "errors": [
-      {
-        "message": "internal: invalid value for scalar \"Email\", expected \"FieldValue::Value\"",
-        "locations": [
-          {
-            "line": 1,
-            "column": 3
-          }
-        ],
-        "path": [
-          "email"
-        ]
-      }
-    ]
+    "data": {
+      "any1": {
+        "test": "abc"
+      },
+      "any2": "string-value"
+    }
   }
 }

tests/core/snapshots/test-scalars.md_5.snap

@@ -11,15 +11,15 @@ expression: response
     "data": null,
     "errors": [
       {
-        "message": "internal: invalid value for scalar \"PhoneNumber\", expected \"FieldValue::Value\"",
+        "message": "internal: invalid value for scalar \"Email\", expected \"FieldValue::Value\"",
         "locations": [
           {
             "line": 1,
             "column": 3
           }
         ],
         "path": [
-          "phone"
+          "email"
         ]
       }
     ]

tests/core/snapshots/test-scalars.md_7.snap

@@ -11,15 +11,15 @@ expression: response
     "data": null,
     "errors": [
       {
-        "message": "internal: invalid value for scalar \"Date\", expected \"FieldValue::Value\"",
+        "message": "internal: invalid value for scalar \"PhoneNumber\", expected \"FieldValue::Value\"",
         "locations": [
           {
             "line": 1,
             "column": 3
           }
         ],
         "path": [
-          "date"
+          "phone"
         ]
       }
     ]

tests/core/snapshots/test-scalars.md_8.snap

@@ -11,15 +11,15 @@ expression: response
     "data": null,
     "errors": [
       {
-        "message": "internal: invalid value for scalar \"Url\", expected \"FieldValue::Value\"",
+        "message": "internal: invalid value for scalar \"Date\", expected \"FieldValue::Value\"",
         "locations": [
           {
             "line": 1,
             "column": 3
           }
         ],
         "path": [
-          "url"
+          "date"
         ]
       }
     ]

tests/core/snapshots/test-scalars.md_9.snap

@@ -0,0 +1,27 @@
+---
+source: tests/core/spec.rs
+expression: response
+---
+{
+  "status": 200,
+  "headers": {
+    "content-type": "application/json"
+  },
+  "body": {
+    "data": null,
+    "errors": [
+      {
+        "message": "internal: invalid value for scalar \"Url\", expected \"FieldValue::Value\"",
+        "locations": [
+          {
+            "line": 1,
+            "column": 3
+          }
+        ],
+        "path": [
+          "url"
+        ]
+      }
+    ]
+  }
+}

tests/core/snapshots/test-scalars.md_client.snap

@@ -2,6 +2,8 @@
 source: tests/core/spec.rs
 expression: client
 ---
+scalar AnyScalar
+
 scalar Date
 
 scalar Email
@@ -13,6 +15,7 @@ scalar JSON
 scalar PhoneNumber
 
 type Query {
+  any(value: AnyScalar!): AnyScalar
   date(value: Date!): Date!
   email(value: Email!): Email!
   phone(value: PhoneNumber!): PhoneNumber!

tests/core/snapshots/test-scalars.md_merged.snap

@@ -6,15 +6,12 @@ schema @server(hostname: "localhost", port: 8000) @upstream {
   query: Query
 }
 
-scalar Date
+scalar AnyScalar
 
 scalar Email
 
-scalar PhoneNumber
-
-scalar Url
-
 type Query {
+  any(value: AnyScalar!): AnyScalar @expr(body: "{{.args.value}}")
   date(value: Date!): Date! @expr(body: "{{.args.value}}")
   email(value: Email!): Email! @expr(body: "{{.args.value}}")
   phone(value: PhoneNumber!): PhoneNumber! @expr(body: "{{.args.value}}")

tests/execution/test-scalars.md

@@ -1,10 +1,11 @@
 # test-scalar-email
 
 ```graphql @server
+# this is already defined scalars in tailcall
 scalar Email
-scalar PhoneNumber
-scalar Date
-scalar Url
+
+# this is custom scalars in config
+scalar AnyScalar
 
 schema @server(port: 8000, hostname: "localhost") {
   query: Query
@@ -15,6 +16,7 @@ type Query {
   phone(value: PhoneNumber!): PhoneNumber! @expr(body: "{{.args.value}}")
   date(value: Date!): Date! @expr(body: "{{.args.value}}")
   url(value: Url!): Url! @expr(body: "{{.args.value}}")
+  any(value: AnyScalar!): AnyScalar @expr(body: "{{.args.value}}")
 }
 ```
 
@@ -39,6 +41,11 @@ type Query {
   body:
     query: '{ url(value: "https://tailcall.run/") }'
 
+- method: POST
+  url: http://localhost:8000/graphql
+  body:
+    query: '{ any1: any(value: { test: "abc" } ), any2: any(value: "string-value") }'
+
 # Invalid value test
 
 - method: POST