Rename query related functions to clearer names

src/LinkedIn/CanBeQueried.purs

@@ -5,7 +5,7 @@ import Prelude
 import Data.List (List)
 import Data.List.Types (NonEmptyList)
 import Data.Traversable (traverse)
-import LinkedIn.QueryRunner (Query, queryAll, queryAll', queryOne)
+import LinkedIn.QueryRunner (Query, queryNEL, queryList, queryOne)
 import LinkedIn.Queryable (class Queryable)
 import Web.DOM (Node)
 
@@ -15,8 +15,8 @@ class Queryable root <= CanBeQueried root t where
 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 → Query q (NonEmptyList (t Node))
-subQueryMany selector n = traverse query =<< queryAll selector n
+subQueryNEL ∷ ∀ q t. CanBeQueried Node t ⇒ Queryable q ⇒ String → Query q (NonEmptyList (t Node))
+subQueryNEL selector n = traverse query =<< queryNEL selector n
 
-subQueryMany' ∷ ∀ q t. CanBeQueried Node t ⇒ Queryable q ⇒ String → Query q (List (t Node))
-subQueryMany' selector n = traverse query =<< queryAll' selector n
+subQueryList ∷ ∀ q t. CanBeQueried Node t ⇒ Queryable q ⇒ String → Query q (List (t Node))
+subQueryList selector n = traverse query =<< queryList selector n

src/LinkedIn/Page/Projects.purs

@@ -7,7 +7,7 @@ import Data.Generic.Rep (class Generic)
 import Data.List.Types (NonEmptyList)
 import Data.Show.Generic (genericShow)
 import Data.Traversable (class Traversable, sequence, traverse, traverseDefault)
-import LinkedIn.CanBeQueried (class CanBeQueried, subQueryMany)
+import LinkedIn.CanBeQueried (class CanBeQueried, subQueryNEL)
 import LinkedIn.Extractible (class Extractible)
 import LinkedIn.Output.Types (Output(..))
 import LinkedIn.Profile.Project as PP
@@ -37,7 +37,7 @@ instance Traversable ProjectsPage where
 
 instance CanBeQueried Document ProjectsPage where
   query n = do
-    cards <- subQueryMany "section.artdeco-card > div ~ div > div > div > ul > li" n
+    cards <- subQueryNEL "section.artdeco-card > div ~ div > div > div > ul > li" n
     pure $ ProjectsPage cards
 
 instance Extractible ProjectsPage where

src/LinkedIn/Page/Skills.purs

@@ -7,7 +7,7 @@ import Data.Generic.Rep (class Generic)
 import Data.List.Types (NonEmptyList)
 import Data.Show.Generic (genericShow)
 import Data.Traversable (class Traversable, sequence, traverse, traverseDefault)
-import LinkedIn.CanBeQueried (class CanBeQueried, subQueryMany)
+import LinkedIn.CanBeQueried (class CanBeQueried, subQueryNEL)
 import LinkedIn.Extractible (class Extractible)
 import LinkedIn.Output.Types (Output(..))
 import LinkedIn.Profile.Skill as PS
@@ -37,7 +37,7 @@ instance Traversable SkillsPage where
 
 instance CanBeQueried Document SkillsPage where
   query n = do
-    tabs <- subQueryMany "div.artdeco-tabs > div > div > div > div > ul > li" n
+    tabs <- subQueryNEL "div.artdeco-tabs > div > div > div > div > ul > li" n
     pure $ SkillsPage tabs
 
 instance Extractible SkillsPage where

src/LinkedIn/Page/WorkExperiences.purs

@@ -7,7 +7,7 @@ import Data.Generic.Rep (class Generic)
 import Data.List.Types (NonEmptyList)
 import Data.Show.Generic (genericShow)
 import Data.Traversable (class Traversable, sequence, traverse, traverseDefault)
-import LinkedIn.CanBeQueried (class CanBeQueried, subQueryMany)
+import LinkedIn.CanBeQueried (class CanBeQueried, subQueryNEL)
 import LinkedIn.Extractible (class Extractible)
 import LinkedIn.Output.Types (Output(..))
 import LinkedIn.Profile.WorkExperience as PWE
@@ -37,7 +37,7 @@ instance Traversable WorkExperiencesPage where
 
 instance CanBeQueried Document WorkExperiencesPage where
   query n = do
-    cards <- subQueryMany "section.artdeco-card > div ~ div > div > div > ul > li" n
+    cards <- subQueryNEL "section.artdeco-card > div ~ div > div > div > ul > li" n
     pure $ WorkExperiencesPage cards
 
 instance Extractible WorkExperiencesPage where

src/LinkedIn/QueryRunner.purs

@@ -72,12 +72,12 @@ queryText idx n = ExceptT $ do
 
   pure $ note QTextNotFoundError $ A.index allTexts idx
 
-queryAll ∷ forall q. Queryable q => String → Query q (NonEmptyList Node)
-queryAll selector node = ExceptT $ do
+queryNEL ∷ forall q. Queryable q => String → Query q (NonEmptyList Node)
+queryNEL selector node = ExceptT $ do
   maybeNodes <- queryAllNodes selector node
   pure $ note (QNodeListNotFoundError selector) maybeNodes
 
-queryAll' ∷ forall q. Queryable q => String → Query q (List Node)
-queryAll' selector node = ExceptT $ do
+queryList ∷ forall q. Queryable q => String → Query q (List Node)
+queryList selector node = ExceptT $ do
   nodes <- queryAllNodes' selector node
   pure $ Right nodes

src/LinkedIn/UI/Components/ArtDeco.purs

@@ -12,8 +12,8 @@ import Data.Maybe (Maybe)
 import Data.Show.Generic (genericShow)
 import Data.Traversable (class Traversable, sequence, traverseDefault)
 import Data.Tuple (Tuple(..))
-import LinkedIn.CanBeQueried (class CanBeQueried, subQueryMany, subQueryOne)
-import LinkedIn.QueryRunner (ignoreNotFound, queryAll', queryOne)
+import LinkedIn.CanBeQueried (class CanBeQueried, subQueryNEL, subQueryOne)
+import LinkedIn.QueryRunner (ignoreNotFound, queryList, queryOne)
 import LinkedIn.Queryable (class Queryable)
 import Type.Proxy (Proxy(..))
 
@@ -84,7 +84,7 @@ instance Traversable ArtDecoCenterContent where
 
 instance Queryable q => CanBeQueried q ArtDecoCenterContent where
   query n = do
-    sc <- subQueryMany ":scope > ul > li" n
+    sc <- subQueryNEL ":scope > ul > li" n
     pure $ ArtDecoCenterContent sc
 
 derive instance Generic (ArtDecoCenterHeader a) _
@@ -115,7 +115,7 @@ instance Queryable q => CanBeQueried q ArtDecoCenterHeader where
       ignoreNotFound $
       queryOne ":scope span.t-normal:not(t-black--light) > span[aria-hidden=true]" n
     light <-
-      queryAll' ":scope span.t-black--light > span[aria-hidden=true]" n
+      queryList ":scope span.t-black--light > span[aria-hidden=true]" n
 
     pure $ ArtDecoCenterHeader {bold, normal, light}
 

src/LinkedIn/UI/Components/JobsUnifiedTopCard.purs

@@ -13,8 +13,8 @@ import Data.Maybe (Maybe(..))
 import Data.Show.Generic (genericShow)
 import Data.Traversable (class Traversable, sequence, traverseDefault)
 import Data.Tuple (Tuple(..))
-import LinkedIn.CanBeQueried (class CanBeQueried, subQueryMany, subQueryMany', subQueryOne)
-import LinkedIn.QueryRunner (QueryError(..), queryAll', queryOne, querySelf, queryText)
+import LinkedIn.CanBeQueried (class CanBeQueried, subQueryNEL, subQueryList, subQueryOne)
+import LinkedIn.QueryRunner (QueryError(..), queryList, queryOne, querySelf, queryText)
 import LinkedIn.Queryable (class Queryable, toNode)
 import Type.Proxy (Proxy(..))
 import Web.DOM.Node as N
@@ -80,8 +80,8 @@ instance Queryable q => CanBeQueried q JobsUnifiedTopCardElement where
   query n = do
     header <- queryOne "h1.job-details-jobs-unified-top-card__job-title" n
     primaryDescription <- subQueryOne "div.job-details-jobs-unified-top-card__primary-description-container > div" n
-    insights <- subQueryMany' "li.job-details-jobs-unified-top-card__job-insight" n
-    actions <- subQueryMany' ".mt5 button" n
+    insights <- subQueryList "li.job-details-jobs-unified-top-card__job-insight" n
+    actions <- subQueryList ".mt5 button" n
 
     pure $ JobsUnifiedTopCardElement {
       header,
@@ -115,7 +115,7 @@ instance Queryable q => CanBeQueried q TopCardPrimaryDescription where
   query n = do
     link <- queryOne ":scope > a" n
     text <- queryText 1 n
-    tvmText <- queryAll' "span.tvm__text" n
+    tvmText <- queryList "span.tvm__text" n
 
     pure $ TopCardPrimaryDescription {link, text, tvmText: tvmText}
 
@@ -192,7 +192,7 @@ instance Queryable q => CanBeQueried q TopCardInsightContent where
 
       queryTopCardInsightContentSecondary n = do
         primary <- queryOne ":scope > span:first-child span[aria-hidden=true]" n
-        secondary <- subQueryMany ":scope > span.job-details-jobs-unified-top-card__job-insight-view-model-secondary" n
+        secondary <- subQueryNEL ":scope > span.job-details-jobs-unified-top-card__job-insight-view-model-secondary" n
         pure $ TopCardInsightContentSecondary {primary, secondary}
 
 derive instance Generic (TopCardSecondaryInsight a) _