Skip to content

Commit 1c54887

Browse files
committed
Merge branch 'main' into presence-type-branding
2 parents 653320a + a343f04 commit 1c54887

File tree

1,154 files changed

+16827
-7243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,154 files changed

+16827
-7243
lines changed

.changeset/afraid-rice-feel.md

Lines changed: 0 additions & 12 deletions
This file was deleted.

.changeset/eight-ears-feel.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
"@fluidframework/tree": minor
3+
"fluid-framework": minor
4+
"__section": tree
5+
---
6+
Fix Tree.key and Tree.parent for Unhydrated nodes after edits
7+
8+
In some cases, editing [Unhydrated](https://fluidframework.com/docs/api/fluid-framework/unhydrated-typealias) nodes could result in incorrect results being returned from [Tree.key](https://fluidframework.com/docs/data-structures/tree/nodes#treekey) and [Tree.parent](https://fluidframework.com/docs/data-structures/tree/nodes#treeparent).
9+
This has been fixed.

.changeset/gentle-eggs-heal.md

Lines changed: 0 additions & 8 deletions
This file was deleted.

.changeset/old-bees-itch.md

Lines changed: 0 additions & 17 deletions
This file was deleted.

.changeset/social-bears-deny.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
"@fluidframework/tree": minor
3+
"fluid-framework": minor
4+
"__section": tree
5+
---
6+
Name collisions from structurally named schema now error
7+
8+
It is legal to have multiple [TreeNodeSchema](https://fluidframework.com/docs/api/fluid-framework/treenodeschema-typealias) with the same name so long as they are not used together in the same tree.
9+
Using different schema with the same name when building otherwise identical [structurally named](https://fluidframework.com/docs/api/fluid-framework/schemafactory-class#schemafactory-remarks) in the same [SchemaFactory](https://fluidframework.com/docs/api/fluid-framework/schemafactory-class) is not valid, however.
10+
Previously doing this would not error, and instead return the first structurally named schema with that name.
11+
Now this case throws an informative error:
12+
13+
```typescript
14+
const factory = new SchemaFactory(undefined);
15+
class Child1 extends factory.object("Child", {}) {}
16+
class Child2 extends factory.object("Child", {}) {}
17+
18+
const a = factory.map(Child1);
19+
20+
// Throws a UsageError with the message:
21+
// "Structurally named schema collision: two schema named "Array<["Child"]>" were defined with different input schema."
22+
const b = factory.array(Child2);
23+
```

.vale/config/vocabularies/fluid/accept.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ JavaScript
66
SharedTree
77
TypeScript
88
namespace
9+
UUID
10+
UUIDs

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
"mocharc",
5454
"multinomial",
5555
"nonfinite",
56+
"privateremarks",
5657
"pseudorandomly",
5758
"reconnections",
5859
"Routerlicious",

0 commit comments

Comments
 (0)