Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change encoding of WIT definitions into Component Model types #248

Merged
merged 4 commits into from
Oct 19, 2023
Merged

Change encoding of WIT definitions into Component Model types #248

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8ab0150
Change encoding of WIT definitions into Component Model types
lukewagner Sep 15, 2023
623dd57
Fix explanation of world encoding
lukewagner Sep 20, 2023
e60d8e4
Export interfaces and worlds as instances/components, not types
lukewagner Oct 16, 2023
15a9af9
Update dangling use of 'instance type' to 'instance' missed by last c…
lukewagner Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions design/mvp/WIT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,7 @@ can be packaged into a component as:
```wasm
(component
(type (export "types") (component
(type (export (interface "local:demo/types")) (instance
(export (interface "local:demo/types") (instance
(export $file "file" (type (sub resource)))
(export "[method]file.read" (func
(param "self" (borrow $file)) (param "off" u32) (param "n" u32)
Expand All @@ -1440,7 +1440,7 @@ can be packaged into a component as:
(export "file" (type (sub resource)))
))
(alias export $types "file" (type $file))
(type (export (interface "local:demo/namespace")) (instance
(export (interface "local:demo/namespace") (instance
(export "open" (func (param "name" string) (result (own $file))))
))
))
Expand All @@ -1450,7 +1450,7 @@ This example illustrates the basic structure of interfaces:
* Each top-level WIT definition (in this example: `types` and `namespace`)
turns into a type export of the same kebab-name.
* Each WIT interface is mapped to a component-type that exports an
instance-type with a fully-qualified interface name (in this example:
instance with a fully-qualified interface name (in this example:
`local:demo/types` and `local:demo/namespace`). Note that this nested
scheme allows a single component to both define and implement a WIT interface
without name conflict.
Expand Down Expand Up @@ -1494,17 +1494,16 @@ is encoded as:
(export "request" (type (sub resource)))
))
(alias export $types "request" (type $request))
(type $foo' (instance
(export (interface "local:demo/foo") (instance
(export "frob" (func (param "r" (own $request)) (result (own $request))))
))
(export (interface "local:demo/foo") (type (eq $foo')))
))
(export "foo" (type $foo))
)
```

Worlds are encoded similarly to interfaces, but replace the inner exported
instance-type with an inner exported *component*-type. For example, this WIT:
instance-type with an inner exported *component*. For example, this WIT:
lukewagner marked this conversation as resolved.
Show resolved Hide resolved
```wit
package local:demo;

Expand All @@ -1517,11 +1516,10 @@ is encoded as:
```wasm
(component
(type $the-world (component
(type $the-world' (component
(export (interface "local:demo/the-world") (component
(export "test" (func))
(export "run" (func))
))
(export (interface "local:demo/the-world") (type (eq $the-world')))
))
(export "the-world" (type $the-world))
)
Expand Down Expand Up @@ -1549,19 +1547,17 @@ is encoded as:
```wasm
(component
(type $the-world (component
(type $the-world' (component
(export (interface "local:demo/the-world") (component
(import (interface "local:demo/console") (instance
(export "log" (func (param "arg" string)))
))
))
(export (interface "local:demo/the-world") (type (eq $the-world')))
))
(export "the-world" (type $the-world))
(type $console (component
(type $console' (instance
(export (interface "local:demo/console") (instance
(export "log" (func (param "arg" string)))
))
(export (interface "local:demo/console") (type (eq $console')))
))
(export "console" (type $console))
)
Expand Down Expand Up @@ -1599,12 +1595,11 @@ are encoded as:
```wasm
(component
(type $types (component
(type $types' (instance
(export (interface "wasi:http/types") (instance
(export "request" (type (sub resource)))
(export "response" (type (sub resource)))
...
))
(export (interface "wasi:http/types") (type (eq $types')))
))
(export "types" (type $types))
(type $handler (component
Expand All @@ -1614,14 +1609,13 @@ are encoded as:
))
(alias export $http-types "request" (type $request))
(alias export $http-types "response" (type $response))
(type $handler' (instance
(export (interface "wasi:http/handler") (instance
(export "handle" (func (param "r" (own $request)) (result (own $response))))
))
(export (interface "wasi:http/handler") (type (eq $handler')))
))
(export "handler" (type $handler))
(type $proxy (component
(type $proxy' (component
(export (interface "wasi:http/proxy") (component
(import (interface "wasi:logging/logger") (instance
...
))
Expand All @@ -1639,7 +1633,6 @@ are encoded as:
(export "handle" (func (param "r" (own $request)) (result (own $response))))
))
))
(export (interface "wasi:http/proxy") (type (eq $proxy')))
))
(export "proxy" (type $proxy))
)
Expand Down