Merge pull request #7 from unisoncomputing/cp/transcript-update

Fix up transcripts for ucm changes
unisoncomputing · Jul 1, 2024 · 4479ebc · 4479ebc
2 parents d33cca3 + b60a406
commit 4479ebc
Show file tree

Hide file tree

Showing 41 changed files with 270 additions and 291 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -237,7 +237,7 @@ jobs:
 
           # Install ucm
           mkdir ucm
-          curl -L https://github.com/unisonweb/unison/releases/download/release%2F0.5.19/ucm-linux.tar.gz | tar -xz -C ucm
+          curl -L https://github.com/unisonweb/unison/releases/download/release%2F0.5.23/ucm-linux.tar.gz | tar -xz -C ucm
           export PATH=$PWD/ucm:$PATH
 
           # Clean up old postgres data if it exists.

diff --git a/src/Share/Codebase/Types.hs b/src/Share/Codebase/Types.hs
@@ -16,13 +16,13 @@ import Share.Prelude
 import Unison.Codebase.CodeLookup qualified as CL
 import Unison.Codebase.Path qualified as Path
 import Unison.Codebase.Runtime qualified as Rt
+import Unison.NameSegment.Internal (NameSegment (..))
 import Unison.Parser.Ann (Ann)
 import Unison.Reference qualified as Reference
 import Unison.Symbol (Symbol)
-import Unison.NameSegment.Internal (NameSegment (..))
 
 publicRoot :: Path.Path
-publicRoot = Path.singleton $ NameSegment "public"
+publicRoot = Path.singleton (NameSegment "public")
 
 -- | The scope of a given codebase transaction.
 data CodebaseEnv = CodebaseEnv

diff --git a/src/Share/Postgres/Causal/Queries.hs b/src/Share/Postgres/Causal/Queries.hs
@@ -56,7 +56,7 @@ import Unison.Codebase.Path qualified as Path
 import Unison.Hash (Hash)
 import Unison.Hash32 (Hash32)
 import Unison.Hashing.V2 qualified as H
-import Unison.NameSegment.Internal (NameSegment (..))
+import Unison.NameSegment.Internal as NameSegment
 import Unison.Reference qualified as Reference
 import Unison.Util.Map qualified as Map
 
@@ -765,16 +765,16 @@ saveV2BranchShallow v2Branch = do
     expectV2BranchDependencies V2.Branch {terms, types, patches, children} = do
       terms' <-
         terms
-          & Map.bitraverse (pure . coerce @NameSegment @Text) (traverse (fmap mdValuesToMetadataSetFormat))
+          & Map.bitraverse (pure . NameSegment.toUnescapedText) (traverse (fmap mdValuesToMetadataSetFormat))
       types' <-
         types
-          & Map.bitraverse (pure . coerce @NameSegment @Text) (traverse (fmap mdValuesToMetadataSetFormat))
+          & Map.bitraverse (pure . NameSegment.toUnescapedText) (traverse (fmap mdValuesToMetadataSetFormat))
       let patches' =
             patches
-              & Map.bimap (coerce @NameSegment @Text) fst
+              & Map.bimap NameSegment.toUnescapedText fst
       let children' =
             children
-              & Map.bimap (coerce @NameSegment @Text) Causal.causalHash
+              & Map.bimap NameSegment.toUnescapedText Causal.causalHash
       let hashBranchFull :: BranchFull.Branch' Text Hash PatchHash CausalHash =
             BranchFull.Branch
               { terms = terms',

diff --git a/src/Share/Postgres/Sync/Conversions.hs b/src/Share/Postgres/Sync/Conversions.hs
@@ -35,7 +35,7 @@ branchV2ToBF (V2.Branch {terms, types, patches, children}) = do
   where
     convertTerms :: Map NameSegment (Map V2.Referent (m V2.MdValues)) -> m (Map Text (Map (BranchFull.Referent'' Text Hash) (BranchFull.MetadataSetFormat' Text Hash)))
     convertTerms m = do
-      Map.mapKeys (coerce @NameSegment @Text) m
+      Map.mapKeys NameSegment.toUnescapedText m
         & traversed . traversed
           %%~ \mdM -> do
             V2.MdValues md <- mdM

diff --git a/src/Share/Web/Authorization.hs b/src/Share/Web/Authorization.hs
@@ -70,6 +70,7 @@ import Data.Set.NonEmpty (NESet)
 import Data.Set.NonEmpty qualified as NESet
 import Data.Text.Encoding qualified as Text
 import Data.Time qualified as Time
+import Servant
 import Share.Branch
 import Share.Contribution (Contribution (..), ContributionStatus (..))
 import Share.IDs
@@ -91,7 +92,6 @@ import Share.Web.Errors qualified as Errors
 import Share.Web.Share.Comments
 import Share.Web.Share.Contributions.Types (UpdateContributionRequest (..))
 import Share.Web.Share.Tickets.Types
-import Servant
 import Unison.Codebase.Path (Path)
 import Unison.Codebase.Path qualified as Path
 import Unison.NameSegment.Internal (NameSegment (..))

diff --git a/src/Unison/PrettyPrintEnvDecl/Postgres.hs b/src/Unison/PrettyPrintEnvDecl/Postgres.hs
@@ -13,8 +13,6 @@ import Share.Prelude
 import Unison.HashQualified' qualified as HQ'
 import Unison.LabeledDependency (LabeledDependency)
 import Unison.Name (Name)
-import Unison.Name qualified as Name
-import Unison.NameSegment.Internal (NameSegment (..))
 import Unison.PrettyPrintEnv qualified as PPE
 import Unison.PrettyPrintEnvDecl qualified as PPED
 import Unison.Reference qualified as V1
@@ -31,11 +29,11 @@ ppedForReferences namesPerspective refs = do
     namesForReference :: Either (V1.Referent, PGReferent) (V1.Reference, PGReference) -> m ([(Name, Name, V1.Referent)], [(Name, Name, V1.Reference)])
     namesForReference = \case
       Left (ref, pgref) -> do
-        termNames <- fmap (bothMap $ Name.fromReverseSegments . fmap NameSegment . coerce @NameLookups.ReversedName @(NonEmpty Text)) <$> NameLookupOps.termNamesForRefWithinNamespace namesPerspective pgref Nothing
+        termNames <- fmap (bothMap NameLookups.reversedNameToName) <$> NameLookupOps.termNamesForRefWithinNamespace namesPerspective pgref Nothing
         let termNames' = termNames <&> \(fqn, suffixed) -> (fqn, suffixed, ref)
         pure $ (termNames', [])
       Right (ref, pgref) -> do
-        typeNames <- fmap (bothMap $ Name.fromReverseSegments . coerce) <$> NameLookupOps.typeNamesForRefWithinNamespace namesPerspective pgref Nothing
+        typeNames <- fmap (bothMap NameLookups.reversedNameToName) <$> NameLookupOps.typeNamesForRefWithinNamespace namesPerspective pgref Nothing
         let typeNames' = typeNames <&> \(fqn, suffixed) -> (fqn, suffixed, ref)
         pure $ ([], typeNames')
 

diff --git a/src/Unison/Server/NameSearch/Postgres.hs b/src/Unison/Server/NameSearch/Postgres.hs
@@ -17,6 +17,7 @@ import Unison.HashQualified' qualified as HQ'
 import Unison.Name (Name)
 import Unison.Name qualified as Name
 import Unison.NameSegment.Internal (NameSegment (..))
+import Unison.NameSegment.Internal qualified as NameSegment
 import Unison.NamesWithHistory (SearchType (..))
 import Unison.Reference qualified as V1
 import Unison.Reference qualified as V1Reference
@@ -123,4 +124,4 @@ nameSearchForPerspective namesPerspective =
 
     -- Fully qualify a name by prepending the current namespace perspective's path
     fullyQualifyName :: Name -> Name
-    fullyQualifyName name = fromMaybe name $ Path.maybePrefixName (Path.AbsolutePath' . Path.Absolute $ (Path.fromList . fmap NameSegment . coerce @PathSegments @[Text] $ pathToMountedNameLookup namesPerspective)) name
+    fullyQualifyName name = fromMaybe name $ Path.maybePrefixName (Path.AbsolutePath' $ Path.Absolute (Path.fromList . (fmap NameSegment.NameSegment) . into @[Text] $ pathToMountedNameLookup namesPerspective)) name
diff --git a/src/Unison/Server/Share/NamespaceDetails.hs b/src/Unison/Server/Share/NamespaceDetails.hs
@@ -28,4 +28,4 @@ namespaceDetails runtime namespacePath rootCausalId mayWidth = runMaybeT $ do
   mayReadme <- lift $ RenderDoc.findAndRenderDoc readmeNames runtime namespacePath rootCausalId mayWidth
   pure $ NamespaceDetails namespacePath ("#" <> from @CausalHash @UnisonHash causalHashAtPath) mayReadme
   where
-    readmeNames = Set.fromList $ fmap NameSegment ["README", "Readme", "ReadMe", "readme"]
+    readmeNames = Set.fromList . fmap NameSegment $ ["README", "Readme", "ReadMe", "readme"]
diff --git a/transcripts/run-transcripts.zsh b/transcripts/run-transcripts.zsh
@@ -18,11 +18,11 @@ transcripts=(
     contributions transcripts/share-apis/contributions/
     projects-flow transcripts/share-apis/projects-flow/
     project-maintainers transcripts/share-apis/project-maintainers/
-    release transcripts/share-apis/releases
-    branche transcripts/share-apis/branches
-    branch-brows transcripts/share-apis/branch-browse
-    loose-code transcripts/share-apis/loose-code/
-    sync-apis transcripts/sync-apis
+    release transcripts/share-apis/releases/
+    branche transcripts/share-apis/branches/
+    branch-browse transcripts/share-apis/branch-browse/
+    code-browse transcripts/share-apis/code-browse/
+    sync-apis transcripts/sync-apis/
 )
 
 for transcript dir in "${(@kv)transcripts}"; do

diff --git a/...cripts/share-apis/loose-code/account.json → ...ripts/share-apis/code-browse/account.json b/...cripts/share-apis/loose-code/account.json → ...ripts/share-apis/code-browse/account.json
diff --git a/...hare-apis/loose-code/codebase-browse.json → ...are-apis/code-browse/codebase-browse.json b/...hare-apis/loose-code/codebase-browse.json → ...are-apis/code-browse/codebase-browse.json
@@ -125,7 +125,7 @@
         "tag": "TermObject"
       }
     ],
-    "namespaceListingFQN": "public.names",
+    "namespaceListingFQN": "names",
     "namespaceListingHash": "#77bp25t820hpn7t6andan3evac2o5gon8ulggl3kq2galktlbo10jkpub3rli3teop6h5ikgjhuirk87hf58g7cir4pk0ra6a9r5rro"
   },
   "status": 200

diff --git a/...ebase-definition-by-hash-constructor.json → ...ebase-definition-by-hash-constructor.json b/...ebase-definition-by-hash-constructor.json → ...ebase-definition-by-hash-constructor.json
@@ -30,10 +30,10 @@
             },
             {
               "annotation": {
-                "contents": "public.names.Thing",
+                "contents": "names.Thing",
                 "tag": "HashQualifier"
               },
-              "segment": "public.names.Thing"
+              "segment": "names.Thing"
             },
             {
               "annotation": {
@@ -66,7 +66,7 @@
         },
         "typeDocs": [],
         "typeNames": [
-          "public.names.Thing"
+          "names.Thing"
         ]
       }
     }

diff --git a/...ode/codebase-definition-by-hash-term.json → ...wse/codebase-definition-by-hash-term.json b/...ode/codebase-definition-by-hash-term.json → ...wse/codebase-definition-by-hash-term.json
@@ -18,10 +18,10 @@
           "contents": [
             {
               "annotation": {
-                "contents": "public.external.two",
+                "contents": "external.two",
                 "tag": "HashQualifier"
               },
-              "segment": "public.external.two"
+              "segment": "external.two"
             },
             {
               "annotation": {
@@ -46,10 +46,10 @@
             },
             {
               "annotation": {
-                "contents": "public.external.two",
+                "contents": "external.two",
                 "tag": "HashQualifier"
               },
-              "segment": "public.external.two"
+              "segment": "external.two"
             },
             {
               "annotation": {
@@ -72,9 +72,9 @@
         },
         "termDocs": [],
         "termNames": [
-          "public.external.two",
-          "public.names.apples.two",
-          "public.names.oranges.two"
+          "external.two",
+          "names.apples.two",
+          "names.oranges.two"
         ]
       }
     },

diff --git a/.../codebase-definition-by-name-encoded.json → .../codebase-definition-by-name-encoded.json b/.../codebase-definition-by-name-encoded.json → .../codebase-definition-by-name-encoded.json
@@ -64,10 +64,10 @@
             },
             {
               "annotation": {
-                "contents": "public.names./+%",
+                "contents": "names./+%",
                 "tag": "HashQualifier"
               },
-              "segment": "public.names./+%"
+              "segment": "names./+%"
             },
             {
               "annotation": {
@@ -148,10 +148,10 @@
             },
             {
               "annotation": {
-                "contents": "public.names./+%",
+                "contents": "names./+%",
                 "tag": "HashQualifier"
               },
-              "segment": "public.names./+%"
+              "segment": "names./+%"
             },
             {
               "annotation": null,
@@ -184,7 +184,7 @@
         },
         "termDocs": [],
         "termNames": [
-          "public.names./+%"
+          "names./+%"
         ]
       }
     },

diff --git a/...y-name-should-minimally-suffix-again.json → ...y-name-should-minimally-suffix-again.json b/...y-name-should-minimally-suffix-again.json → ...y-name-should-minimally-suffix-again.json
@@ -18,10 +18,10 @@
           "contents": [
             {
               "annotation": {
-                "contents": "public.names.apples.two",
+                "contents": "names.apples.two",
                 "tag": "HashQualifier"
               },
-              "segment": "public.names.apples.two"
+              "segment": "names.apples.two"
             },
             {
               "annotation": {
@@ -46,10 +46,10 @@
             },
             {
               "annotation": {
-                "contents": "public.names.apples.two",
+                "contents": "names.apples.two",
                 "tag": "HashQualifier"
               },
-              "segment": "public.names.apples.two"
+              "segment": "names.apples.two"
             },
             {
               "annotation": {
@@ -72,9 +72,9 @@
         },
         "termDocs": [],
         "termNames": [
-          "public.names.apples.two",
-          "public.names.oranges.two",
-          "public.external.two"
+          "names.apples.two",
+          "names.oranges.two",
+          "external.two"
         ]
       }
     },

diff --git a/...tion-by-name-should-minimally-suffix.json → ...tion-by-name-should-minimally-suffix.json b/...tion-by-name-should-minimally-suffix.json → ...tion-by-name-should-minimally-suffix.json
@@ -18,10 +18,10 @@
           "contents": [
             {
               "annotation": {
-                "contents": "public.names.oranges.two",
+                "contents": "names.oranges.two",
                 "tag": "HashQualifier"
               },
-              "segment": "public.names.oranges.two"
+              "segment": "names.oranges.two"
             },
             {
               "annotation": {
@@ -46,10 +46,10 @@
             },
             {
               "annotation": {
-                "contents": "public.names.oranges.two",
+                "contents": "names.oranges.two",
                 "tag": "HashQualifier"
               },
-              "segment": "public.names.oranges.two"
+              "segment": "names.oranges.two"
             },
             {
               "annotation": {
@@ -72,9 +72,9 @@
         },
         "termDocs": [],
         "termNames": [
-          "public.names.oranges.two",
-          "public.names.apples.two",
-          "public.external.two"
+          "names.oranges.two",
+          "names.apples.two",
+          "external.two"
         ]
       }
     },

diff --git a/...d-not-find-names-in-other-namespaces.json → ...d-not-find-names-in-other-namespaces.json b/...d-not-find-names-in-other-namespaces.json → ...d-not-find-names-in-other-namespaces.json
@@ -1,7 +1,7 @@
 {
   "body": {
     "missingDefinitions": [
-      "public.names.externalName"
+      "names.externalName"
     ],
     "termDefinitions": {},
     "typeDefinitions": {}

diff --git a/...rint-external-names-if-no-local-name.json → ...rint-external-names-if-no-local-name.json b/...rint-external-names-if-no-local-name.json → ...rint-external-names-if-no-local-name.json
@@ -18,10 +18,10 @@
           "contents": [
             {
               "annotation": {
-                "contents": "public.names.referencesExternal",
+                "contents": "names.referencesExternal",
                 "tag": "HashQualifier"
               },
-              "segment": "public.names.referencesExternal"
+              "segment": "names.referencesExternal"
             },
             {
               "annotation": {
@@ -46,10 +46,10 @@
             },
             {
               "annotation": {
-                "contents": "public.names.referencesExternal",
+                "contents": "names.referencesExternal",
                 "tag": "HashQualifier"
               },
-              "segment": "public.names.referencesExternal"
+              "segment": "names.referencesExternal"
             },
             {
               "annotation": {
@@ -150,7 +150,7 @@
         },
         "termDocs": [],
         "termNames": [
-          "public.names.referencesExternal"
+          "names.referencesExternal"
         ]
       }
     },