removes arg gql from genned schema #102

Author: roryc89

Diff for: gen-schema-bundled.mjs

@@ -42141,7 +42141,7 @@ var template2 = function(v) {
   var enumImports = intercalate6("\n")(mapFlipped3(v.enums)(function(v1) {
     return "import " + (v.modulePrefix + ("Schema." + (v.name + (".Enum." + (v1 + (" (" + (v1 + ")")))))));
   }));
-  return "module " + (v.modulePrefix + ("Schema." + (v.name + (" where\n\nimport Data.Maybe (Maybe)\nimport Data.Newtype (class Newtype)\nimport GraphQL.Client.Args (class ArgGql, class RecordArg, NotNull)\nimport GraphQL.Client.Union (GqlUnion)\nimport " + (maybe("GraphQL.Client.ID (ID)")(getImport)(v.idImport) + ("\n" + (enumImports + ("\n\n" + (v.mainSchemaCode + "\n")))))))));
+  return "module " + (v.modulePrefix + ("Schema." + (v.name + (" where\n\nimport Data.Maybe (Maybe)\nimport Data.Newtype (class Newtype)\nimport GraphQL.Client.Args (NotNull)\nimport GraphQL.Client.Union (GqlUnion)\nimport " + (maybe("GraphQL.Client.ID (ID)")(getImport)(v.idImport) + ("\n" + (enumImports + ("\n\n" + (v.mainSchemaCode + "\n")))))))));
 };
 
 // output/GraphQL.Client.CodeGen.Schema/index.js
@@ -42385,7 +42385,7 @@ var gqlToPursMainSchemaCode = function(v) {
         return notNullTypeToPurs(v1.value0);
       }
       ;
-      throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 429, column 16 - line 432, column 72): " + [v1.constructor.name]);
+      throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 416, column 16 - line 419, column 72): " + [v1.constructor.name]);
     };
     var notNullTypeToPurs = function(v1) {
       if (v1 instanceof NonNullType_NamedType) {
@@ -42396,7 +42396,7 @@ var gqlToPursMainSchemaCode = function(v) {
         return listTypeToPurs(v1.value0);
       }
       ;
-      throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 443, column 23 - line 445, column 51): " + [v1.constructor.name]);
+      throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 430, column 23 - line 432, column 51): " + [v1.constructor.name]);
     };
     var listTypeToPursNullable = function(t) {
       return wrapMaybe(listTypeToPurs(t));
@@ -42450,7 +42450,7 @@ var gqlToPursMainSchemaCode = function(v) {
         return wrapNotNull(argNotNullTypeToPurs(v1.value0));
       }
       ;
-      throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 413, column 19 - line 416, column 89): " + [v1.constructor.name]);
+      throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 400, column 19 - line 403, column 89): " + [v1.constructor.name]);
     };
     var argNotNullTypeToPurs = function(v1) {
       if (v1 instanceof NonNullType_NamedType) {
@@ -42461,7 +42461,7 @@ var gqlToPursMainSchemaCode = function(v) {
         return argListTypeToPurs(v1.value0);
       }
       ;
-      throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 419, column 26 - line 421, column 54): " + [v1.constructor.name]);
+      throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 406, column 26 - line 408, column 54): " + [v1.constructor.name]);
     };
     var argListTypeToPurs = function(v1) {
       return "(Array " + (argTypeToPurs(v1) + ")");
@@ -42486,7 +42486,7 @@ var gqlToPursMainSchemaCode = function(v) {
             return v2.value0.moduleName + ("." + v2.value0.typeName);
           }
           ;
-          throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 402, column 10 - line 407, column 53): " + [v2.constructor.name]);
+          throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 389, column 10 - line 394, column 53): " + [v2.constructor.name]);
         }()));
       };
     };
@@ -42499,7 +42499,7 @@ var gqlToPursMainSchemaCode = function(v) {
       var tName = typeName_(v1.name);
       return docComment3(v1.description) + ("newtype " + (tName + (" = " + (tName + (maybe("{}")(function(v2) {
         return inputValueToFieldsDefinitionToPurs(tName)(v2);
-      })(v1.inputFieldsDefinition) + ("\nderive instance newtype" + (tName + (" :: Newtype " + (tName + (" _" + ("\ninstance argToGql" + (tName + (" :: (Newtype " + (tName + (" {| p},  RecordArg p a u) => ArgGql " + (tName + " { | a }"))))))))))))))));
+      })(v1.inputFieldsDefinition) + ("\nderive instance newtype" + (tName + (" :: Newtype " + (tName + " _")))))))));
     };
     var inputValueDefinitionsToPurs = function(v1) {
       return inlineComment(v1.description) + (safeFieldname(v1.name) + (" :: " + argTypeToPurs(v1.type)));
@@ -42527,7 +42527,7 @@ var gqlToPursMainSchemaCode = function(v) {
             return wrapMaybe(v2.value0.moduleName + ("." + v2.value0.typeName));
           }
           ;
-          throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 292, column 10 - line 297, column 65): " + [v2.constructor.name]);
+          throw new Error("Failed pattern match at GraphQL.Client.CodeGen.Schema (line 285, column 10 - line 290, column 65): " + [v2.constructor.name]);
         }())));
       };
     };
@@ -42540,7 +42540,7 @@ var gqlToPursMainSchemaCode = function(v) {
       var tName = typeName_(v1.name);
       return docComment3(v1.description) + function() {
         if (v.useNewtypesForRecords) {
-          return "newtype " + (typeName_(v1.name) + (" = " + (typeName_(v1.name) + (" " + (maybe("{}")(fieldsDefinitionToPurs(tName))(v1.fieldsDefinition) + ("\nderive instance newtype" + (tName + (" :: Newtype " + (tName + (" _" + ("\ninstance argToGql" + (tName + (" :: (Newtype " + (tName + (" {| p},  RecordArg p a u) => ArgGql " + (tName + " { | a }"))))))))))))))));
+          return "newtype " + (typeName_(v1.name) + (" = " + (typeName_(v1.name) + (" " + (maybe("{}")(fieldsDefinitionToPurs(tName))(v1.fieldsDefinition) + ("\nderive instance newtype" + (tName + (" :: Newtype " + (tName + " _")))))))));
         }
         ;
         return "type " + (typeName_(v1.name) + foldMap5(function(fd) {

Diff for: src/GraphQL/Client/Args.purs

@@ -6,6 +6,7 @@ import Data.Bifunctor (class Bifunctor)
 import Data.Date (Date)
 import Data.DateTime (DateTime)
 import Data.Maybe (Maybe)
+import Data.Newtype (class Newtype)
 import Data.Symbol (class IsSymbol)
 import Data.Time (Time)
 import GraphQL.Client.Variable (Var)
@@ -73,7 +74,8 @@ else instance argToGqlMaybe :: ArgGql param arg => ArgGql param (Maybe arg)
 else instance argToGqlArray :: ArgGql param arg => ArgGql (Array param) (Array arg)
 else instance argToGqlArrayOne :: ArgGql param arg => ArgGql (Array param) arg
 else instance argVar :: ArgGql param arg => ArgGql param (Var sym arg)
-
+else instance argToGqlRecord :: RecordArg p a u => ArgGql { | p } { | a }
+else instance argToGqlNewtypeRecord :: (Newtype n {| p},  RecordArg p a u) => ArgGql n { | a }
 class IsNotNull :: forall k1 k2. k1 -> k2 -> Constraint
 class IsNotNull param arg 
 
@@ -125,7 +127,6 @@ instance argToGqlTime :: ArgGql Time Time
 
 instance argToGqlDateTime :: ArgGql DateTime DateTime
 
-instance argToGqlRecord :: RecordArg p a u => ArgGql { | p } { | a }
 
 class HMapWithIndex (ArgPropToGql p) { | a } u <= RecordArg p a u
 

Diff for: src/GraphQL/Client/CodeGen/Schema.purs

@@ -256,13 +256,6 @@ gqlToPursMainSchemaCode { gqlScalarsToPursTypes, externalTypes, fieldTypeOverrid
               <> " :: Newtype "
               <> tName
               <> " _"
-              <> "\ninstance argToGql"
-              <> tName
-              <> " :: (Newtype "
-              <> tName
-              <> " {| p},  RecordArg p a u) => ArgGql "
-              <> tName
-              <> " { | a }"
           else
             "type "
               <> typeName_ name
@@ -372,13 +365,7 @@ gqlToPursMainSchemaCode { gqlScalarsToPursTypes, externalTypes, fieldTypeOverrid
         <> " :: Newtype "
         <> tName
         <> " _"
-        <> "\ninstance argToGql"
-        <> tName
-        <> " :: (Newtype "
-        <> tName
-        <> " {| p},  RecordArg p a u) => ArgGql "
-        <> tName
-        <> " { | a }"
+
 
   inputValueToFieldsDefinitionToPurs :: String -> List AST.InputValueDefinition -> String
   inputValueToFieldsDefinitionToPurs objectName definitions =

Diff for: src/GraphQL/Client/CodeGen/Template/Schema.purs

@@ -18,7 +18,7 @@ template { name, enums, idImport, mainSchemaCode, modulePrefix } =
 
 import Data.Maybe (Maybe)
 import Data.Newtype (class Newtype)
-import GraphQL.Client.Args (class ArgGql, class RecordArg, NotNull)
+import GraphQL.Client.Args (NotNull)
 import GraphQL.Client.Union (GqlUnion)
 import """ <> maybe defaultIdImport getImport idImport <> """
 """ <> enumImports <> """

Diff for: test/GraphQL/Client/CodeGen/SchemaFromGqlToPurs.Test.purs

@@ -149,7 +149,6 @@ spec =
               , subscription: "\n  { prop :: Int\n  }"
               }
               <> "\n\nnewtype MyType = MyType \n  { prop :: (Maybe Int)\n  }\nderive instance newtypeMyType :: Newtype MyType _"
-              <> "\ninstance argToGqlMyType :: (Newtype MyType {| p},  RecordArg p a u) => ArgGql MyType { | a }"
         gql `shouldParseTo` result
       it "converts input types" do
         let
@@ -173,14 +172,12 @@ newtype QueryRoot = QueryRoot
     -> Int
   }
 derive instance newtypeQueryRoot :: Newtype QueryRoot _
-instance argToGqlQueryRoot :: (Newtype QueryRoot {| p},  RecordArg p a u) => ArgGql QueryRoot { | a }
 
 newtype MyInputType = MyInputType
   { id :: Int
   , username :: (NotNull String)
   }
-derive instance newtypeMyInputType :: Newtype MyInputType _
-instance argToGqlMyInputType :: (Newtype MyInputType {| p},  RecordArg p a u) => ArgGql MyInputType { | a }"""
+derive instance newtypeMyInputType :: Newtype MyInputType _"""
         gql `shouldParseTo` result
       it "converts enum types" do
         let
@@ -241,8 +238,7 @@ newtype Query = Query
   , my_type_b :: (Maybe MyModule.MyTypeB)
   , my_type_c :: (Array MyModule.MyTypeC)
   }
-derive instance newtypeQuery :: Newtype Query _
-instance argToGqlQuery :: (Newtype Query {| p},  RecordArg p a u) => ArgGql Query { | a }"""
+derive instance newtypeQuery :: Newtype Query _"""
         gql
           ` ( shouldParseToOpts
               defaultOpts
@@ -291,7 +287,6 @@ newtype Query = Query
   , my_type_c :: (Array AlsoUnkown)
   }
 derive instance newtypeQuery :: Newtype Query _
-instance argToGqlQuery :: (Newtype Query {| p},  RecordArg p a u) => ArgGql Query { | a }
 
 type SomethingUnknown = Data.Argonaut.Core.Json -- Unknown scalar type. Add SomethingUnknown to externalTypes in codegen options to override this behaviour
 
@@ -323,13 +318,11 @@ newtype Query = Query
   { int :: Int
   }
 derive instance newtypeQuery :: Newtype Query _
-instance argToGqlQuery :: (Newtype Query {| p},  RecordArg p a u) => ArgGql Query { | a }
 
 newtype X = X 
   { int :: Int
   }
-derive instance newtypeX :: Newtype X _
-instance argToGqlX :: (Newtype X {| p},  RecordArg p a u) => ArgGql X { | a }"""
+derive instance newtypeX :: Newtype X _"""
         gql `shouldParseTo` result
       it "handles unsafe fieldnames (some not to gql spec)" do
         let
@@ -389,7 +382,6 @@ type Query = QueryRoot
 newtype QueryRoot = QueryRoot """
     <> queryRoot
     <> "\nderive instance newtypeQueryRoot :: Newtype QueryRoot _"
-    <> "\ninstance argToGqlQueryRoot :: (Newtype QueryRoot {| p},  RecordArg p a u) => ArgGql QueryRoot { | a }"
 
 schemaGql :: { query :: String, mutation :: String, subscription :: String } -> String
 schemaGql { query, mutation, subscription } =
@@ -423,18 +415,15 @@ newtype QueryRoot = QueryRoot """
     <> query
     <> """
 derive instance newtypeQueryRoot :: Newtype QueryRoot _
-instance argToGqlQueryRoot :: (Newtype QueryRoot {| p},  RecordArg p a u) => ArgGql QueryRoot { | a }
 
 newtype MutationRoot = MutationRoot """
     <> mutation
     <> """
 derive instance newtypeMutationRoot :: Newtype MutationRoot _
-instance argToGqlMutationRoot :: (Newtype MutationRoot {| p},  RecordArg p a u) => ArgGql MutationRoot { | a }
 
 newtype SubscriptionRoot = SubscriptionRoot """
     <> subscription
     <> "\nderive instance newtypeSubscriptionRoot :: Newtype SubscriptionRoot _"
-    <> "\ninstance argToGqlSubscriptionRoot :: (Newtype SubscriptionRoot {| p},  RecordArg p a u) => ArgGql SubscriptionRoot { | a }"
 
 defaultOpts :: InputOptions
 defaultOpts =