Parcourir la source

Rename QueryRunner' into Query

jherve il y a 1 an
Parent
commit
ece08d3861
2 fichiers modifiés avec 9 ajouts et 11 suppressions
  1. 4 4
      src/LinkedIn/CanBeQueried.purs
  2. 5 7
      src/LinkedIn/QueryRunner.purs

+ 4 - 4
src/LinkedIn/CanBeQueried.purs

@@ -4,15 +4,15 @@ import Prelude
 
 import Data.List.Types (NonEmptyList)
 import Data.Traversable (traverse)
-import LinkedIn.QueryRunner (QueryRunner', queryAll, queryOne)
+import LinkedIn.QueryRunner (Query, queryAll, queryOne)
 import LinkedIn.Queryable (class Queryable)
 import Web.DOM (Node)
 
 class Queryable root <= CanBeQueried root t where
-  query :: QueryRunner' root (t Node)
+  query :: Query root (t Node)
 
-subQueryOne ∷ ∀ q t. CanBeQueried Node t ⇒ Queryable q ⇒ String → QueryRunner' q (t Node)
+subQueryOne ∷ ∀ q t. CanBeQueried Node t ⇒ Queryable q ⇒ String → Query q (t Node)
 subQueryOne selector n = query =<< queryOne selector n
 
-subQueryMany ∷ ∀ q t. CanBeQueried Node t ⇒ Queryable q ⇒ String → QueryRunner' q (NonEmptyList (t Node))
+subQueryMany ∷ ∀ q t. CanBeQueried Node t ⇒ Queryable q ⇒ String → Query q (NonEmptyList (t Node))
 subQueryMany selector n = traverse query =<< queryAll selector n

+ 5 - 7
src/LinkedIn/QueryRunner.purs

@@ -32,10 +32,7 @@ instance Show QueryError where
 instance Semigroup QueryError where
   append a _ = a
 
-type QueryRunner' q a = q → ExceptT QueryError Effect a
-
-type QueryRunner a = QueryRunner' Node a
+type Query q a = q → ExceptT QueryError Effect a
 
 runQuery ∷ ∀ a. ExceptT QueryError Effect a → Effect (Either QueryError a)
 runQuery = runExceptT
@@ -56,15 +53,15 @@ ignoreErrors = mapExceptT (map ignoreErrors')
       (Left _) -> Right Nothing
       (Right n') -> Right (Just n')
 
-querySelf ∷ forall q. Queryable q => QueryRunner' q Node
+querySelf ∷ forall q. Queryable q => Query q Node
 querySelf node = except $ Right $ toNode node
 
-queryOne ∷ forall q. Queryable q => String → QueryRunner' q Node
+queryOne ∷ forall q. Queryable q => String → Query q Node
 queryOne selector node = ExceptT $ do
   maybeNode <- queryOneNode selector node
   pure $ note (QNodeNotFoundError selector) maybeNode
 
-queryText ∷ forall q. Queryable q => Int -> QueryRunner' q Node
+queryText ∷ forall q. Queryable q => Int -> Query q Node
 queryText idx n = ExceptT $ do
   childrenArr <- getChildrenArray n
   let
@@ -75,7 +72,7 @@ queryText idx n = ExceptT $ do
 
   pure $ note QTextNotFoundError $ A.index allTexts idx
 
-queryAll ∷ forall q. Queryable q => String → QueryRunner' q (NonEmptyList Node)
+queryAll ∷ forall q. Queryable q => String → Query q (NonEmptyList Node)
 queryAll selector node = ExceptT $ do
   maybeNodes <- queryAllNodes selector node
   pure $ note (QNodeListNotFoundError selector) maybeNodes