Add instance for AndArgs

Author: purefunctor

src/GraphQL/Client/Variables.purs

@@ -36,7 +36,7 @@ import Data.String.CodeUnits (charAt)
 import Data.Symbol (class IsSymbol, reflectSymbol)
 import GraphQL.Client.Alias (Alias)
 import GraphQL.Client.Alias.Dynamic (Spread)
-import GraphQL.Client.Args (AndArg, Args, NotNull, OrArg)
+import GraphQL.Client.Args (AndArg, AndArgs, Args, NotNull, OrArg)
 import GraphQL.Client.AsGql (AsGql)
 import GraphQL.Client.Directive (ApplyDirective(..))
 import GraphQL.Client.ErrorBoundary (ErrorBoundary)
@@ -126,6 +126,15 @@ else instance getVarAndArg ::
   ) =>
   GetVar (AndArg l r) { | var } where
   getVar _ = Proxy
+else instance getVarAndArgs ::
+  ( GetVar l { | varL }
+  , GetVar r { | varR }
+  , Row.Union varR varL trash
+  , Row.Union varL varR trash -- keep both union directions to make sure value type is the same
+  , Row.Nub trash var
+  ) =>
+  GetVar (AndArgs l r) { | var } where
+  getVar _ = Proxy
 else instance getVarOrArg ::
   ( GetVar l { | varL }
   , GetVar r { | varR }
@@ -229,19 +238,19 @@ else instance varsTypeCheckedWithoutVars ::
 
 else instance varsTypeCheckedIdentity ::
   GetVar query {} =>
-  VarsTypeChecked schema (Identity query)  where
+  VarsTypeChecked schema (Identity query) where
   getVarsJson _ _ = jsonEmptyObject
   getVarsTypeNames _ _ = ""
 
 else instance varsTypeCheckedErrorBoundary ::
   GetVar query {} =>
   VarsTypeChecked schema (ErrorBoundary query) where
   getVarsJson _ _ = jsonEmptyObject
-  getVarsTypeNames _ _ = ""  
+  getVarsTypeNames _ _ = ""
 
 else instance varsTypeCheckedUnion ::
   GetVar { | query } {} =>
-  VarsTypeChecked schema (GqlUnion query)  where
+  VarsTypeChecked schema (GqlUnion query) where
   getVarsJson _ _ = jsonEmptyObject
   getVarsTypeNames _ _ = ""
 

test/GraphQL/Client/Variable.Test.purs

@@ -5,7 +5,7 @@ import Prelude
 import Data.Maybe (Maybe(..))
 import GraphQL.Client.Alias ((:))
 import GraphQL.Client.Alias.Dynamic (Spread(..))
-import GraphQL.Client.Args (OrArg(..), (++), (=>>))
+import GraphQL.Client.Args (OrArg(..), (++), (=>>), (+++))
 import GraphQL.Client.AsGql (AsGql)
 import GraphQL.Client.Variable (Var(..))
 import GraphQL.Client.Variables (class GetGqlQueryVars, getQueryVars, getVarsTypeNames, withVars)
@@ -284,6 +284,20 @@ testArgs
        }
 testArgs = getQueryVars ((Var :: _ "idVar" Int) =>> { name: unit })
 
+testAndArg
+  :: Proxy
+       { aVar :: Int
+       , bVar :: Number
+       }
+testAndArg =
+  getQueryVars
+    ( { a:
+          Var :: _ "aVar" Int
+      }
+        ++ { b: Var :: _ "bVar" Number }
+        =>> { name: unit }
+    )
+
 testAndArgs
   :: Proxy
        { aVar :: Int
@@ -294,7 +308,7 @@ testAndArgs =
     ( { a:
           Var :: _ "aVar" Int
       }
-        ++ { b: Var :: _ "bVar" Number }
+        +++ { b: Var :: _ "bVar" Number }
         =>> { name: unit }
     )