Merge branch 'main' into union

Author: Mossaka

README.md

@@ -8,6 +8,13 @@ release.
 In the future, this repository will additionally contain a [formal spec],
 reference interpreter and test suite.
 
+## Milestones
+
+The Component Model is being incrementally developed and stabilized as part of
+the overall [WASI preview process]. The current contents of this repo reflect
+the "Preview 2" milestone. The "Preview 3" milestone will be primarily
+concerned with the addition of [async support].
+
 ## Contributing
 
 All Component Model work is done as part of the [W3C WebAssembly Community Group].
@@ -26,3 +33,5 @@ To contribute to any of these repositories, see the Community Group's
 [formal spec]: spec/
 [W3C WebAssembly Community Group]: https://www.w3.org/community/webassembly/
 [Contributing Guidelines]: https://webassembly.org/community/contributing/
+[WASI preview process]: https://github.com/WebAssembly/meetings/blob/main/wasi/2023/presentations/2023-02-09-gohman-wasi-roadmap.pdf
+[Async Support]: https://docs.google.com/presentation/d/1MNVOZ8hdofO3tI0szg_i-Yoy0N2QPU2C--LzVuoGSlE/edit?usp=share_link

design/mvp/Binary.md

@@ -109,8 +109,10 @@ Notes:
   to the actual type.
 * The indices in `sortidx` are validated according to their `sort`'s index
   spaces, which are built incrementally as each definition is validated.
-* Validation requires that all annotated `name`s only occur on `func` `export`s
-  and that the `r` `label` matches the `name` of a preceding `resource` export.
+* Validation requires that annotated `name`s only occur on `func` imports or
+  exports and that the `r:<label>` matches the `name` of a preceding `resource`
+  import or export, respectively, in the same scope (component, component type
+  or instance type).
 * Validation of `[constructor]` names requires that the `func` returns a
   `(result (own $R))`, where `$R` is the resource labeled `r`.
 * Validation of `[method]` names requires the first parameter of the function