Allow Returning Error Reference Types and Intersection Types in Input…

… Objects

* Fix not allowing to return error reference types from resolvers

* Fix service crashing when intersection types are used as Input Objects

* Add test for returning graphql:Error

ballerina-tests/Dependencies.toml

@@ -121,7 +121,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.10.7"
+version = "2.10.12"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},

ballerina-tests/tests/31_intersection_types.bal

@@ -39,6 +39,20 @@ function dataProviderIntersectionType() returns map<[string, string, json]> {
         }
     };
 
+    json variableGetOwnerName = {
+        pet: {
+            name: "Dingi",
+            ownerName: "Ruwangi",
+            animal: {
+                commonName: "Common House Cat",
+                species: {
+                    genus: "Felis",
+                    specificName: "catus"
+                }
+            }
+        }
+    };
+
     map<[string, string, json]> dataSet = {
         "1": ["input_with_intersection_parameter", "getName", ()],
         "2": ["input_with_intersection_parameter_reference", "getCity", ()],
@@ -49,7 +63,8 @@ function dataProviderIntersectionType() returns map<[string, string, json]> {
         "7": ["output_with_intersection_parameter_array", "getProfiles", ()],
         "8": ["output_with_intersection_parameter_reference_array", "getBooks", ()],
         "9": ["input_with_intersection_referring_non_intersection_type", "getCommonName", variableGetCommonName],
-        "10": ["input_with_non_intersection_type_referring_intersection_type", "getOwnerName", ()]
+        "10": ["input_with_non_intersection_type_referring_intersection_type", "getOwnerName", ()],
+        "11": ["input_with_non_intersection_type_referring_intersection_type_as_a_variable", "getOwnerNameWithVariable", variableGetOwnerName]
     };
     return dataSet;
 }

ballerina-tests/tests/resources/documents/intersection_types.graphql

@@ -75,3 +75,7 @@ query getOwnerName {
     }
   )
 }
+
+query getOwnerNameWithVariable($pet: Pet!) {
+  ownerName(pet: $pet)
+}

ballerina-tests/tests/resources/expected_results/input_with_non_intersection_type_referring_intersection_type_as_a_variable.json

@@ -0,0 +1,5 @@
+{
+    "data": {
+        "ownerName": "Ruwangi"
+    }
+}

ballerina/Dependencies.toml

@@ -105,7 +105,7 @@ modules = [
 [[package]]
 org = "ballerina"
 name = "http"
-version = "2.10.7"
+version = "2.10.12"
 dependencies = [
 	{org = "ballerina", name = "auth"},
 	{org = "ballerina", name = "cache"},

changelog.md

@@ -6,6 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+### Fixed
+- [[#4848] Fix Resolvers not Able to Return Error Reference Types](https://github.com/ballerina-platform/ballerina-library/issues/4848)
+- [[#4859] Fix Service Crashing when Intersection Types are Used as Input Objects](https://github.com/ballerina-platform/ballerina-library/issues/4859)
+
 ## [1.11.0] - 2023-02-21
 
 ### Added

compiler-plugin-tests/src/test/resources/ballerina_sources/validator_tests/01_valid_return_types/service.bal

@@ -20,6 +20,8 @@ type Person record {
     string name;
 };
 
+type Error distinct error;
+
 service graphql:Service on new graphql:Listener(4000) {
     resource function get greeting() returns string {
         return "Hello";
@@ -74,6 +76,18 @@ service graphql:Service on new graphql:Listener(4000) {
     }
 }
 
+service graphql:Service on new graphql:Listener(4000) {
+    resource function get profile() returns Person|Error {
+        return {name: "John"};
+    }
+}
+
+service graphql:Service on new graphql:Listener(4000) {
+    resource function get profile() returns Person|graphql:Error {
+        return {name: "John"};
+    }
+}
+
 service graphql:Service on new graphql:Listener(4000) {
     resource function get greet() returns GeneralGreeting {
         return new;

compiler-plugin/src/main/java/io/ballerina/stdlib/graphql/compiler/Utils.java

@@ -132,7 +132,13 @@ public static boolean isGraphqlListener(Symbol listenerSymbol) {
     }
 
     public static boolean isIgnoreType(TypeSymbol typeSymbol) {
-        return typeSymbol.typeKind() == TypeDescKind.NIL || typeSymbol.typeKind() == TypeDescKind.ERROR;
+        if (typeSymbol.typeKind() == TypeDescKind.NIL || typeSymbol.typeKind() == TypeDescKind.ERROR) {
+            return true;
+        }
+        if (typeSymbol.typeKind() == TypeDescKind.TYPE_REFERENCE) {
+            return isIgnoreType(((TypeReferenceTypeSymbol) typeSymbol).typeDescriptor());
+        }
+        return false;
     }
 
     public static List<TypeSymbol> getEffectiveTypes(UnionTypeSymbol unionTypeSymbol) {

gradle.properties

@@ -38,7 +38,7 @@ stdlibJwtVersion=2.10.0
 stdlibOAuth2Version=2.10.0
 
 # Level 05
-stdlibHttpVersion=2.10.0
+stdlibHttpVersion=2.10.12
 
 # Level 06
 stdlibWebsocketVersion=2.10.0

native/src/main/java/io/ballerina/stdlib/graphql/runtime/engine/ArgumentHandler.java

@@ -356,7 +356,7 @@ private BMap<BString, Object> getInputObjectArgument(BObject argumentNode, Recor
         BMap<BString, Object> recordValue = recordType.getZeroValue();
         if (argumentNode.getBooleanValue(VARIABLE_DEFINITION)) {
             BMap<BString, Object> variablesMap = argumentNode.getMapValue(VARIABLE_VALUE_FIELD);
-            return JsonUtils.convertJSONToRecord(variablesMap, recordType);
+            return ValueCreator.createRecordValue(recordType.getPackage(), recordType.getName(), variablesMap);
         }
         BArray inputObjectFields = argumentNode.getArrayValue(VALUE_FIELD);
         for (int i = 0; i < inputObjectFields.size(); i++) {