Dedupe more asListOf's

Author: ChrisPenner

src/Share/Backend.hs

@@ -44,6 +44,7 @@ import Share.Postgres qualified as PG
 import Share.Postgres.Causal.Conversions (namespaceStatsPgToV2)
 import Share.Postgres.Causal.Queries qualified as CausalQ
 import Share.Prelude
+import Share.Utils.Lens (asListOfDeduped)
 import U.Codebase.Branch qualified as V2Branch
 import U.Codebase.Causal qualified as Causal
 import U.Codebase.Causal qualified as V2Causal
@@ -220,7 +221,7 @@ getTypeTag r = do
 displayTermsOf :: (QueryM m) => Codebase.CodebaseEnv -> Traversal s t Reference (DisplayObject (Type Symbol Ann) (V1.Term Symbol Ann)) -> s -> m t
 displayTermsOf codebase trav s =
   s
-    & asListOf trav %%~ \refs -> do
+    & asListOfDeduped trav %%~ \refs -> do
       let partitionedRefs =
             refs <&> \case
               ref@(Reference.Builtin _) -> do

src/Share/Codebase.hs

@@ -88,6 +88,7 @@ import Share.Prelude
 import Share.Project (Project (..))
 import Share.Utils.Caching (Cached)
 import Share.Utils.Caching qualified as Caching
+import Share.Utils.Lens (asListOfDeduped)
 import Share.Utils.Logging
 import Share.Utils.Logging qualified as Logging
 import Share.Web.App
@@ -240,7 +241,7 @@ convertTerms2to1Of trav s = do
 
 expectTermsByRefIdsOf :: (QueryM m) => CodebaseEnv -> Traversal s t TermReferenceId (V1.Term Symbol Ann, V1.Type Symbol Ann) -> s -> m t
 expectTermsByRefIdsOf codebase trav s = do
-  s & asListOf trav \refIds -> do
+  s & asListOfDeduped trav \refIds -> do
     termsAndTypes <- loadTermAndTypeByRefIdsOf codebase traversed refIds
     for (zip refIds termsAndTypes) \case
       (refId, Nothing) -> unrecoverableError (MissingTerm refId)

src/Share/NamespaceDiffs.hs

@@ -51,6 +51,7 @@ import Share.Postgres.NameLookups.Types qualified as NL
 import Share.Postgres.NamesPerspective.Ops qualified as NPOps
 import Share.Postgres.NamesPerspective.Types (NamesPerspective)
 import Share.Prelude
+import Share.Utils.Lens (asListOfDeduped)
 import Unison.Codebase.Path (Path)
 import Unison.Codebase.Path qualified as Path
 import Unison.Codebase.SqliteCodebase.Conversions qualified as Cv
@@ -268,7 +269,7 @@ computeThreeWayNamespaceDiff codebaseEnvs2 branchHashIds3 nameLookupReceipts3 =
           PG.Transaction e t
         hydrateTermsOf codebase trav s = PG.transactionSpan "hydrateTerms" mempty do
           s
-            & asListOf trav %%~ \refs -> do
+            & asListOfDeduped trav %%~ \refs -> do
               v2Terms <- DefnsQ.expectTermsByRefIdsOf codebase traversed refs
               let v2TermsWithRef = zip refs v2Terms
               let refHashes = v2TermsWithRef <&> \(refId, (term, typ)) -> (refId, ((Reference.idToHash refId), term, typ))

src/Share/Postgres/Definitions/Queries.hs

@@ -57,6 +57,7 @@ import Share.Postgres.Definitions.Types qualified as DefnTypes
 import Share.Postgres.Hashes.Queries qualified as HashQ
 import Share.Postgres.IDs
 import Share.Prelude
+import Share.Utils.Lens (asListOfDeduped)
 import Share.Utils.Logging qualified as Logging
 import Share.Utils.Postgres (OrdBy, RawBytes (..), ordered)
 import Share.Web.Errors (ErrorID (..), InternalServerError (InternalServerError), ToServerError (..))
@@ -162,7 +163,7 @@ expectTermIdsByRefIdsOf trav s =
 
 expectTermsByRefIdsOf :: (HasCallStack, QueryM m) => CodebaseEnv -> Traversal s t TermReferenceId (V2.Term Symbol, V2.Type Symbol) -> s -> m t
 expectTermsByRefIdsOf codebase trav s = do
-  s & asListOf trav \termRefs -> do
+  s & asListOfDeduped trav \termRefs -> do
     termIds <- expectTermIdsByRefIdsOf traversed termRefs
     expectTermsByIdsOf codebase traversed termIds
 
@@ -243,7 +244,7 @@ loadTermsByIdsOf ::
   s ->
   m t
 loadTermsByIdsOf codebase trav s = do
-  s & asListOf trav \termIds -> do
+  s & asListOfDeduped trav \termIds -> do
     zipWith combine
       <$> (loadTermComponentElementByTermIdsOf codebase traversed termIds)
       <*> (termLocalReferencesOf traversed termIds)
@@ -267,7 +268,7 @@ loadTermsByRefIdsOf ::
   s ->
   m t
 loadTermsByRefIdsOf codebase trav s = do
-  s & asListOf trav \termRefs -> do
+  s & asListOfDeduped trav \termRefs -> do
     termIds <- loadTermIdsByRefIdsOf traversed termRefs
     terms <- loadTermsByIdsOf codebase (traversed . _Just) termIds
     -- Flatten the nested maybes.
@@ -480,7 +481,7 @@ loadTypeComponentElementsAndTypeIdsOf (CodebaseEnv codebaseUser) trav s = do
 expectTypeComponentElementsAndTypeIdsOf :: (QueryA m) => CodebaseEnv -> Traversal s t TypeReferenceId (TypeComponentElement, TypeId) -> s -> m t
 expectTypeComponentElementsAndTypeIdsOf codebase trav s =
   s
-    & asListOf trav %%~ \refs -> do
+    & asListOfDeduped trav %%~ \refs -> do
       unrecoverableEitherMap
         ( \elems -> for (zip refs elems) \case
             (refId, Nothing) -> Left (expectedTypeError $ Right refId)