Replace Extractible.query with CanBeQueried.query'

src/LinkedIn/CanBeQueried.purs

@@ -5,4 +5,4 @@ import LinkedIn.Queryable (class Queryable)
 import Web.DOM (Node)
 
 class Queryable root <= CanBeQueried root t where
-  query' :: QueryRunner' root (t Node)
+  query :: QueryRunner' root (t Node)

src/LinkedIn/Extractible.purs

@@ -2,10 +2,7 @@ module LinkedIn.Extractible where
 
 import Data.Either (Either)
 import LinkedIn.Output.Types (Output)
-import LinkedIn.QueryRunner (QueryRunner')
 import LinkedIn.UI.Elements.Types (UIElement)
-import Web.DOM (Document, Node)
 
 class Extractible t where
-  query :: QueryRunner' Document (t Node)
   extract ∷ t UIElement → Either String Output

src/LinkedIn/Output.purs

@@ -41,7 +41,7 @@ runToDetached :: forall root t.
   -> root
   -> ExceptT QueryError Effect (t DetachedNode)
 runToDetached _ dom = do
-  qRes <- CBQ.query' dom
+  qRes <- CBQ.query dom
   lift $ traverse toDetached qRes
 
 toOutput ∷ PageUrl → (Document → ExceptT OutputError Effect Output)

src/LinkedIn/Page/JobOffer.purs

@@ -36,13 +36,9 @@ instance Traversable JobOfferPage where
   traverse = \x -> traverseDefault x
 
 instance CanBeQueried Document JobOfferPage where
-  query' n = do
-    card <- subQueryOne queryJobsUnifiedTopCardElement "div.jobs-unified-top-card" n
-    pure $ JobOfferPage card
-
-instance Extractible JobOfferPage where
   query n = do
     card <- subQueryOne queryJobsUnifiedTopCardElement "div.jobs-unified-top-card" n
     pure $ JobOfferPage card
 
+instance Extractible JobOfferPage where
   extract (JobOfferPage tabs) = OutJobOffer <$> JJO.fromUI tabs

src/LinkedIn/Page/Projects.purs

@@ -41,13 +41,9 @@ instance Traversable ProjectsPage where
 
 
 instance CanBeQueried Document ProjectsPage where
-  query' n = do
-    cards <- subQueryMany queryArtDecoCard "section.artdeco-card > div ~ div > div > div > ul > li" n
-    pure $ ProjectsPage cards
-
-instance Extractible ProjectsPage where
   query n = do
     cards <- subQueryMany queryArtDecoCard "section.artdeco-card > div ~ div > div > div > ul > li" n
     pure $ ProjectsPage cards
 
+instance Extractible ProjectsPage where
   extract (ProjectsPage cards) = OutProjects <$> traverse PP.fromUI cards

src/LinkedIn/Page/Skills.purs

@@ -37,13 +37,9 @@ instance Traversable SkillsPage where
   traverse = \x -> traverseDefault x
 
 instance CanBeQueried Document SkillsPage where
-  query' n = do
-    tabs <- subQueryMany queryArtDecoTab "div.artdeco-tabs > div > div > div > div > ul > li" n
-    pure $ SkillsPage tabs
-
-instance Extractible SkillsPage where
   query n = do
     tabs <- subQueryMany queryArtDecoTab "div.artdeco-tabs > div > div > div > div > ul > li" n
     pure $ SkillsPage tabs
 
+instance Extractible SkillsPage where
   extract (SkillsPage tabs) = OutSkills <$> traverse PS.fromUI tabs

src/LinkedIn/Page/WorkExperiences.purs

@@ -37,13 +37,9 @@ instance Traversable WorkExperiencesPage where
   traverse = \x -> traverseDefault x
 
 instance CanBeQueried Document WorkExperiencesPage where
-  query' n = do
-    cards <- subQueryMany queryArtDecoCard "section.artdeco-card > div ~ div > div > div > ul > li" n
-    pure $ WorkExperiencesPage cards
-
-instance Extractible WorkExperiencesPage where
   query n = do
     cards <- subQueryMany queryArtDecoCard "section.artdeco-card > div ~ div > div > div > ul > li" n
     pure $ WorkExperiencesPage cards
 
+instance Extractible WorkExperiencesPage where
   extract (WorkExperiencesPage cards) = OutWorkExperiences <$> traverse PWE.fromUI cards

src/LinkedIn/UI/Components/ArtDeco.purs

@@ -59,7 +59,7 @@ instance Traversable ArtDecoPvsEntitySubComponent where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q ArtDecoPvsEntitySubComponent where
-  query' = queryArtDecoPvsEntitySubComponent
+  query = queryArtDecoPvsEntitySubComponent
 
 derive instance Generic (ArtDecoCenterContent a) _
 derive instance Eq a => Eq(ArtDecoCenterContent a)
@@ -81,7 +81,7 @@ instance Traversable ArtDecoCenterContent where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q ArtDecoCenterContent where
-  query' = queryArtDecoCenterContent
+  query = queryArtDecoCenterContent
 
 derive instance Generic (ArtDecoCenterHeader a) _
 derive instance Eq a => Eq(ArtDecoCenterHeader a)
@@ -105,7 +105,7 @@ instance Traversable ArtDecoCenterHeader where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q ArtDecoCenterHeader where
-  query' = queryArtDecoCenterHeader
+  query = queryArtDecoCenterHeader
 
 derive instance Generic (ArtDecoCenter a) _
 derive instance Eq a => Eq(ArtDecoCenter a)
@@ -128,7 +128,7 @@ instance Traversable ArtDecoCenter where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q ArtDecoCenter where
-  query' = queryArtDecoCenter
+  query = queryArtDecoCenter
 
 derive instance Generic (ArtDecoPvsEntity a) _
 derive instance Eq a => Eq(ArtDecoPvsEntity a)
@@ -151,7 +151,7 @@ instance Traversable ArtDecoPvsEntity where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q ArtDecoPvsEntity where
-  query' = queryArtDecoPvsEntity
+  query = queryArtDecoPvsEntity
 
 queryArtDecoPvsEntitySubComponent ∷ forall q. Queryable q=> QueryRunner' q (ArtDecoPvsEntitySubComponent Node)
 queryArtDecoPvsEntitySubComponent n = do

src/LinkedIn/UI/Components/ArtDecoCard.purs

@@ -45,7 +45,7 @@ instance Traversable ArtDecoCardElement where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q ArtDecoCardElement where
-  query' = queryArtDecoCard
+  query = queryArtDecoCard
 
 queryArtDecoCard :: forall q. Queryable q => QueryRunner' q (ArtDecoCardElement Node)
 queryArtDecoCard n = do

src/LinkedIn/UI/Components/ArtDecoTab.purs

@@ -45,7 +45,7 @@ instance Traversable ArtDecoTabElement where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q ArtDecoTabElement where
-  query' = queryArtDecoTab
+  query = queryArtDecoTab
 
 queryArtDecoTab :: forall q. Queryable q => QueryRunner' q (ArtDecoTabElement Node)
 queryArtDecoTab n = do

src/LinkedIn/UI/Components/JobsUnifiedTopCard.purs

@@ -103,7 +103,7 @@ instance Traversable TopCardPrimaryDescription where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q TopCardPrimaryDescription where
-  query' = queryTopCardPrimaryDescription
+  query = queryTopCardPrimaryDescription
 
 derive instance Generic (TopCardInsight a) _
 derive instance Eq a => Eq (TopCardInsight a)
@@ -126,7 +126,7 @@ instance Traversable TopCardInsight where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q TopCardInsight where
-  query' = queryTopCardInsight
+  query = queryTopCardInsight
 
 derive instance Generic (TopCardInsightContent a) _
 derive instance Eq a => Eq (TopCardInsightContent a)
@@ -153,7 +153,7 @@ instance Traversable TopCardInsightContent where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q TopCardInsightContent where
-  query' = queryTopCardInsightContent
+  query = queryTopCardInsightContent
 
 derive instance Generic (TopCardSecondaryInsight a) _
 derive instance Eq a => Eq (TopCardSecondaryInsight a)
@@ -175,7 +175,7 @@ instance Traversable TopCardSecondaryInsight where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q TopCardSecondaryInsight where
-  query' = queryTopCardSecondaryInsight
+  query = queryTopCardSecondaryInsight
 
 derive instance Generic (TopCardAction a) _
 derive instance Eq a => Eq (TopCardAction a)
@@ -197,7 +197,7 @@ instance Traversable TopCardAction where
   traverse = \x -> traverseDefault x
 
 instance Queryable q => CanBeQueried q TopCardAction where
-  query' = queryTopCardAction
+  query = queryTopCardAction
 
 queryTopCardAction :: forall q. Queryable q => QueryRunner' q (TopCardAction Node)
 queryTopCardAction n = do