Skip to content

Commit 1c86517

Browse files
committed
Rewrite more transcripts to work with new UCM
1 parent 1873362 commit 1c86517

File tree

8 files changed

+53
-35
lines changed

8 files changed

+53
-35
lines changed

transcripts/share-apis/contribution-diffs/out/contribution-diff.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8964,9 +8964,9 @@
89648964
"tag": "ok"
89658965
},
89668966
"newRef": "diff-end",
8967-
"newRefHash": "#ftf626em106d5kc99j1g6r5u9kpo0d9mln7u1f968rv7t83p0fomoqb7a05ig2fdsehr8seejvpkdv7pjpva93cgq5tsnaaaube1fd0",
8967+
"newRefHash": "#au4jv6ae12tar9pg2tkicp6srth0op1v1n6s63l8uj87vlitl0g9espc2rkk7pitmeqncvja3hjq53e91ukt42mcqds49q7eg0g1rd8",
89688968
"oldRef": "diff-start",
8969-
"oldRefHash": "#vkms68pgk50a0p5rmel9eq5euoi072a1qbbtf0oosd4kel0hgf7kivss3rh6v9e8b6g4kn8bhtl2tosch4g12kuhn2gq7d0o4lck258",
8969+
"oldRefHash": "#2abb8mucf3spdg0ias7bf44upbmki26r4jptnvn6gvht07peo7p6al2urcvks3irtrn6cbsb47ikhm08v4imj8pcj3clchltcu995d8",
89708970
"project": "@transcripts/contribution-diff",
89718971
"tag": "done"
89728972
},

transcripts/share-apis/contribution-diffs/out/namespace-diff.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8964,9 +8964,9 @@
89648964
"tag": "ok"
89658965
},
89668966
"newRef": "diff-end",
8967-
"newRefHash": "#ftf626em106d5kc99j1g6r5u9kpo0d9mln7u1f968rv7t83p0fomoqb7a05ig2fdsehr8seejvpkdv7pjpva93cgq5tsnaaaube1fd0",
8967+
"newRefHash": "#au4jv6ae12tar9pg2tkicp6srth0op1v1n6s63l8uj87vlitl0g9espc2rkk7pitmeqncvja3hjq53e91ukt42mcqds49q7eg0g1rd8",
89688968
"oldRef": "diff-start",
8969-
"oldRefHash": "#vkms68pgk50a0p5rmel9eq5euoi072a1qbbtf0oosd4kel0hgf7kivss3rh6v9e8b6g4kn8bhtl2tosch4g12kuhn2gq7d0o4lck258",
8969+
"oldRefHash": "#2abb8mucf3spdg0ias7bf44upbmki26r4jptnvn6gvht07peo7p6al2urcvks3irtrn6cbsb47ikhm08v4imj8pcj3clchltcu995d8",
89708970
"project": "@transcripts/contribution-diff",
89718971
"tag": "done"
89728972
},

transcripts/share-apis/contribution-diffs/prelude.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,8 @@ contribution-diff/diff-start> branch /diff-end
5757
contribution-diff/diff-end> alias.term termAliasMe aTermAlias
5858
contribution-diff/diff-end> delete.term termDeleteMe
5959
contribution-diff/diff-end> alias.type DataAliasMe ATypeAlias
60-
contribution-diff/diff-end> alias.term DataAliasMe.B ATypeAlias.B
6160
contribution-diff/diff-end> delete.type DataDeleteMe
6261
contribution-diff/diff-end> alias.type AbilityAliasMe AbilityAlias
63-
contribution-diff/diff-end> alias.term AbilityAliasMe.abilityAliasMe AbilityAlias.abilityAliasMe
6462
contribution-diff/diff-end> delete.type AbilityDeleteMe
6563
contribution-diff/diff-end> delete.term a.definition.at.path1
6664
contribution-diff/diff-end> delete.term a.definition.at.path2

transcripts/share-apis/projects-flow/out/project-browse-definition-in-dependency.json

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,20 @@
99
{
1010
"annotation": {
1111
"contents": "##Nat",
12-
"tag": "HashQualifier"
12+
"fqn": "lib.dep.builtin.Nat",
13+
"tag": "TypeReference"
1314
},
14-
"segment": "##Nat"
15+
"segment": "Nat"
1516
}
1617
],
1718
"termDefinition": {
1819
"contents": [
1920
{
2021
"annotation": {
21-
"contents": "lib.someLib.depNum",
22+
"contents": "lib.dep.depNum",
2223
"tag": "HashQualifier"
2324
},
24-
"segment": "lib.someLib.depNum"
25+
"segment": "lib.dep.depNum"
2526
},
2627
{
2728
"annotation": {
@@ -36,20 +37,21 @@
3637
{
3738
"annotation": {
3839
"contents": "##Nat",
39-
"tag": "HashQualifier"
40+
"fqn": "lib.dep.builtin.Nat",
41+
"tag": "TypeReference"
4042
},
41-
"segment": "##Nat"
43+
"segment": "Nat"
4244
},
4345
{
4446
"annotation": null,
4547
"segment": "\n"
4648
},
4749
{
4850
"annotation": {
49-
"contents": "lib.someLib.depNum",
51+
"contents": "lib.dep.depNum",
5052
"tag": "HashQualifier"
5153
},
52-
"segment": "lib.someLib.depNum"
54+
"segment": "lib.dep.depNum"
5355
},
5456
{
5557
"annotation": {
@@ -63,17 +65,18 @@
6365
},
6466
{
6567
"annotation": {
66-
"contents": "#gjmq673r1v",
67-
"tag": "HashQualifier"
68+
"contents": "#gjmq673r1vrurfotlnirv7vutdhm6sa3s02em5g22kk606mv6duvv8be402dv79312i4a0onepq5bo7citsodvq2g720nttj0ee9p0g",
69+
"fqn": "lib.dep.lib.transitiveDep.transitiveDepNum",
70+
"tag": "TermReference"
6871
},
69-
"segment": "#gjmq673r1v"
72+
"segment": "transitiveDepNum"
7073
}
7174
],
7275
"tag": "UserObject"
7376
},
7477
"termDocs": [],
7578
"termNames": [
76-
"lib.someLib.depNum"
79+
"lib.dep.depNum"
7780
]
7881
}
7982
},

transcripts/share-apis/projects-flow/out/project-browse-definition.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
{
1010
"annotation": {
1111
"contents": "##Nat",
12-
"tag": "HashQualifier"
12+
"fqn": "builtin.Nat",
13+
"tag": "TypeReference"
1314
},
14-
"segment": "##Nat"
15+
"segment": "Nat"
1516
}
1617
],
1718
"termDefinition": {
@@ -36,9 +37,10 @@
3637
{
3738
"annotation": {
3839
"contents": "##Nat",
39-
"tag": "HashQualifier"
40+
"fqn": "builtin.Nat",
41+
"tag": "TypeReference"
4042
},
41-
"segment": "##Nat"
43+
"segment": "Nat"
4244
},
4345
{
4446
"annotation": null,
@@ -64,7 +66,7 @@
6466
{
6567
"annotation": {
6668
"contents": "#1apeg4vfn6t5jm65ldj9h8j4340u2uvqq62ih99fi80nqrrqj76vgb694fpcaci2c2t95bcupljq8b04m4vu70qq85mhr777i39i3jg",
67-
"fqn": "lib.someLib.depNum",
69+
"fqn": "lib.dep.depNum",
6870
"tag": "TermReference"
6971
},
7072
"segment": "depNum"

transcripts/share-apis/projects-flow/out/project-list.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"name": "The Transcript User",
2525
"type": "user"
2626
},
27-
"slug": "transcriptproject",
27+
"slug": "app",
2828
"summary": null,
2929
"tags": [],
3030
"updatedAt": "<TIMESTAMP>",
Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,30 @@
11
```ucm
2-
scratch/main> builtins.mergeio
2+
transitiveDep/main> builtins.mergeio
3+
dep/main> builtins.mergeio
4+
app/main> builtins.mergeio
35
```
46

57
```unison
6-
-- Dependencies depend on transitive dependencies
7-
lib.someLib.depNum = lib.dep.lib.transitiveDep.transitiveDepNum
8-
lib.dep.lib.transitiveDep.transitiveDepNum = 1
8+
transitiveDepNum = 1
9+
```
10+
11+
```ucm
12+
transitiveDep/main> update
13+
dep/main> lib.install.local transitiveDep/main transitiveDep
14+
```
915

16+
```unison
17+
depNum = lib.transitiveDep.transitiveDepNum
18+
```
19+
20+
```ucm
21+
dep/main> update
22+
app/main> lib.install.local dep/main dep
23+
```
24+
25+
```unison
1026
-- Definitions can depend on dependencies
11-
someTerm = lib.someLib.depNum
27+
someTerm = lib.dep.depNum
1228
1329
README = {{
1430
## Title
@@ -18,7 +34,6 @@ References {someTerm}
1834
```
1935

2036
```ucm
21-
scratch/main> project.create-empty transcriptproject
22-
transcriptproject/main> update
23-
transcriptproject/main> push
37+
app/main> update
38+
app/main> push
2439
```

transcripts/share-apis/projects-flow/run.zsh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ transcript_ucm transcript prelude.md
99
fetch "$unauthenticated_user" GET project-get-simple '/users/test/projects/publictestproject'
1010

1111

12-
fetch "$transcripts_user" GET project-readme "/users/transcripts/projects/transcriptproject/readme"
13-
fetch "$transcripts_user" GET project-browse-definition "/users/transcripts/projects/transcriptproject/branches/main/definitions/by-name/someTerm"
14-
fetch "$transcripts_user" GET project-browse-definition-in-dependency "/users/transcripts/projects/transcriptproject/branches/main/definitions/by-name/lib.someLib.depNum"
12+
fetch "$transcripts_user" GET project-readme "/users/transcripts/projects/app/readme"
13+
fetch "$transcripts_user" GET project-browse-definition "/users/transcripts/projects/app/branches/main/definitions/by-name/someTerm"
14+
fetch "$transcripts_user" GET project-browse-definition-in-dependency "/users/transcripts/projects/app/branches/main/definitions/by-name/lib.dep.depNum"
1515

1616
fetch "$transcripts_user" POST project-create '/users/transcripts/projects/containers' '{
1717
"summary": "This is my project",

0 commit comments

Comments
 (0)