Merge pull request #150 from purefunctor/justin/and-or-args-variables

Add instance for AndArgs

Author: roryc89

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 _ _ = ""
 
@@ -256,7 +265,27 @@ else instance varsTypeCheckedSpread ::
 class GetGqlQueryVars :: Type -> Type -> Type -> Constraint
 class GetGqlQueryVars schema query vars | schema query -> vars
 
-instance queryVarsAsGqlVar ::
+instance queryVarsOrArg ::
+  ( GetGqlQueryVars schema l { | varsL }
+  , GetGqlQueryVars schema r { | varsR }
+  , Row.Union varsL varsR trash
+  , Row.Union varsR varsL trash
+  , Row.Nub trash vars
+  )
+  -- Since this matches over _any_ schema, this must come before the pattern
+  -- match for AsGql such that the schema is preserved through l and r.
+  => GetGqlQueryVars schema (OrArg l r) { | vars }
+
+else instance queryVarsAndArgs ::
+  ( GetGqlQueryVars schema l { | varsL }
+  , GetGqlQueryVars schema r { | varsR }
+  , Row.Union varsL varsR trash
+  , Row.Union varsR varsL trash
+  , Row.Nub trash vars
+  )
+  => GetGqlQueryVars schema (AndArgs l r) { | vars }
+
+else instance queryVarsAsGqlVar ::
   ( Row.Cons name (Proxy gqlName) () result
   , IsSymbol gqlName
   ) =>

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(..), andArg, guardArg, (++), (+++), (=>>))
 import GraphQL.Client.AsGql (AsGql)
 import GraphQL.Client.Variable (Var(..))
 import GraphQL.Client.Variables (class GetGqlQueryVars, getQueryVars, getVarsTypeNames, withVars)
@@ -237,6 +237,82 @@ testGqlVarsCreatedAt =
       , created_at_lt: 3
       }
 
+testGqlVarsOrArg
+  :: Proxy
+       { created_at_eq :: Proxy "Int"
+       , created_at_lt :: Proxy "Int"
+       , myVar :: Proxy "customId"
+       }
+testGqlVarsOrArg =
+  getGqlQueryVars $
+    { users:
+        { where: { created_at: { eq: guardArg false $ Var @"created_at_eq" @Int, lt: guardArg false $ Var @"created_at_lt" @Int } }
+        }
+          =>> { id: guardArg false $ Var @"myVar" @Int }
+    }
+
+testGqlVarsAndArg
+  :: Proxy
+       { created_at_eq :: Proxy "Int"
+       , created_at_lt :: Proxy "Int"
+       , id1 :: Proxy "customId"
+       , id2 :: Proxy "customId"
+       }
+testGqlVarsAndArg =
+  getGqlQueryVars $
+    { users:
+        { where:
+            { created_at:
+                andArg
+                  { eq: Var @"created_at_eq" @Int }
+                  { lt: Var @"created_at_lt" @Int }
+            }
+        }
+          =>>
+            andArg
+              { id: Var @"id1" @Int }
+              { id: Var @"id2" @Int }
+    }
+
+testGqlVarsComplex
+  :: Proxy
+       { created_at_eq :: Proxy "Int"
+       , created_at_eq_2 :: Proxy "Int"
+       , created_at_lt :: Proxy "Int"
+       , created_at_lt_2 :: Proxy "Int"
+       , id1 :: Proxy "customId"
+       , id2 :: Proxy "customId"
+       , id3 :: Proxy "customId"
+       , id4 :: Proxy "customId"
+       }
+testGqlVarsComplex =
+  getGqlQueryVars $
+    { users:
+        { where:
+            { created_at:
+                andArg
+                  { eq:
+                      if true then ArgL $ Var @"created_at_eq" @Int
+                      else ArgR $ Var @"created_at_eq_2" @Int
+                  }
+                  { lt:
+                      if true then ArgL $ Var @"created_at_lt" @Int
+                      else ArgR $ Var @"created_at_lt_2" @Int
+                  }
+            }
+        }
+          =>>
+            andArg
+              { id:
+                  if true then ArgL $ Var @"id1" @Int
+                  else ArgR $ Var @"id2" @Int
+              }
+              { id:
+                  if true then ArgL $ Var @"id3" @Int
+                  else ArgR $ Var @"id4" @Int
+              }
+    }
+
 testBasic
   :: Proxy
        { var1 :: Int
@@ -284,6 +360,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 +384,7 @@ testAndArgs =
     ( { a:
           Var :: _ "aVar" Int
       }
-        ++ { b: Var :: _ "bVar" Number }
+        +++ { b: Var :: _ "bVar" Number }
         =>> { name: unit }
     )