Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions wasip2/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ WASI Preview 2 contains the following APIs:

| Proposal | Version |
|-------------------|---------|
| [wasi-io] | 0.2.6 |
| [wasi-clocks] | 0.2.6 |
| [wasi-random] | 0.2.6 |
| [wasi-filesystem] | 0.2.6 |
| [wasi-sockets] | 0.2.6 |
| [wasi-cli] | 0.2.6 |
| [wasi-http] | 0.2.6 |
| [wasi-io] | 0.2.7 |
| [wasi-clocks] | 0.2.7 |
| [wasi-random] | 0.2.7 |
| [wasi-filesystem] | 0.2.7 |
| [wasi-sockets] | 0.2.7 |
| [wasi-cli] | 0.2.7 |
| [wasi-http] | 0.2.7 |

[wasi-io]: https://github.com/WebAssembly/wasi-io
[wasi-clocks]: https://github.com/WebAssembly/wasi-clocks
Expand Down
2 changes: 1 addition & 1 deletion wasip2/cli/command.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@since(version = 0.2.0)
world command {
Expand Down
12 changes: 6 additions & 6 deletions wasip2/cli/imports.wit
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@since(version = 0.2.0)
world imports {
@since(version = 0.2.0)
include wasi:clocks/[email protected].6;
include wasi:clocks/[email protected].7;
@since(version = 0.2.0)
include wasi:filesystem/[email protected].6;
include wasi:filesystem/[email protected].7;
@since(version = 0.2.0)
include wasi:sockets/[email protected].6;
include wasi:sockets/[email protected].7;
@since(version = 0.2.0)
include wasi:random/[email protected].6;
include wasi:random/[email protected].7;
@since(version = 0.2.0)
include wasi:io/[email protected].6;
include wasi:io/[email protected].7;

@since(version = 0.2.0)
import environment;
Expand Down
6 changes: 3 additions & 3 deletions wasip2/cli/stdio.wit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@since(version = 0.2.0)
interface stdin {
@since(version = 0.2.0)
use wasi:io/[email protected].6.{input-stream};
use wasi:io/[email protected].7.{input-stream};

@since(version = 0.2.0)
get-stdin: func() -> input-stream;
Expand All @@ -10,7 +10,7 @@ interface stdin {
@since(version = 0.2.0)
interface stdout {
@since(version = 0.2.0)
use wasi:io/[email protected].6.{output-stream};
use wasi:io/[email protected].7.{output-stream};

@since(version = 0.2.0)
get-stdout: func() -> output-stream;
Expand All @@ -19,7 +19,7 @@ interface stdout {
@since(version = 0.2.0)
interface stderr {
@since(version = 0.2.0)
use wasi:io/[email protected].6.{output-stream};
use wasi:io/[email protected].7.{output-stream};

@since(version = 0.2.0)
get-stderr: func() -> output-stream;
Expand Down
4 changes: 2 additions & 2 deletions wasip2/clocks/monotonic-clock.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;
/// WASI Monotonic Clock is a clock API intended to let users measure elapsed
/// time.
///
Expand All @@ -10,7 +10,7 @@ package wasi:[email protected];
@since(version = 0.2.0)
interface monotonic-clock {
@since(version = 0.2.0)
use wasi:io/[email protected].6.{pollable};
use wasi:io/[email protected].7.{pollable};

/// An instant in time, in nanoseconds. An instant is relative to an
/// unspecified initial value, and can only be compared to instances from
Expand Down
2 changes: 1 addition & 1 deletion wasip2/clocks/timezone.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@unstable(feature = clocks-timezone)
interface timezone {
Expand Down
2 changes: 1 addition & 1 deletion wasip2/clocks/wall-clock.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;
/// WASI Wall Clock is a clock API intended to let users query the current
/// time. The name "wall" makes an analogy to a "clock on the wall", which
/// is not necessarily monotonic as it may be reset.
Expand Down
2 changes: 1 addition & 1 deletion wasip2/clocks/world.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@since(version = 0.2.0)
world imports {
Expand Down
2 changes: 1 addition & 1 deletion wasip2/filesystem/preopens.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@since(version = 0.2.0)
interface preopens {
Expand Down
6 changes: 3 additions & 3 deletions wasip2/filesystem/types.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;
/// WASI filesystem is a filesystem API primarily intended to let users run WASI
/// programs that access their files on their existing filesystems, without
/// significant overhead.
Expand Down Expand Up @@ -26,9 +26,9 @@ package wasi:[email protected];
@since(version = 0.2.0)
interface types {
@since(version = 0.2.0)
use wasi:io/[email protected].6.{input-stream, output-stream, error};
use wasi:io/[email protected].7.{input-stream, output-stream, error};
@since(version = 0.2.0)
use wasi:clocks/[email protected].6.{datetime};
use wasi:clocks/[email protected].7.{datetime};

/// File size or length of a region within a file.
@since(version = 0.2.0)
Expand Down
2 changes: 1 addition & 1 deletion wasip2/filesystem/world.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@since(version = 0.2.0)
world imports {
Expand Down
14 changes: 7 additions & 7 deletions wasip2/http/proxy.wit
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

/// The `wasi:http/imports` world imports all the APIs for HTTP proxies.
/// It is intended to be `include`d in other worlds.
@since(version = 0.2.0)
world imports {
/// HTTP proxies have access to time and randomness.
@since(version = 0.2.0)
import wasi:clocks/[email protected].6;
import wasi:clocks/[email protected].7;
@since(version = 0.2.0)
import wasi:clocks/[email protected].6;
import wasi:clocks/[email protected].7;
@since(version = 0.2.0)
import wasi:random/[email protected].6;
import wasi:random/[email protected].7;

/// Proxies have standard output and error streams which are expected to
/// terminate in a developer-facing console provided by the host.
@since(version = 0.2.0)
import wasi:cli/[email protected].6;
import wasi:cli/[email protected].7;
@since(version = 0.2.0)
import wasi:cli/[email protected].6;
import wasi:cli/[email protected].7;

/// TODO: this is a temporary workaround until component tooling is able to
/// gracefully handle the absence of stdin. Hosts must return an eof stream
/// for this import, which is what wasi-libc + tooling will do automatically
/// when this import is properly removed.
@since(version = 0.2.0)
import wasi:cli/[email protected].6;
import wasi:cli/[email protected].7;

/// This is the default handler to use when user code simply wants to make an
/// HTTP request (e.g., via `fetch()`).
Expand Down
8 changes: 4 additions & 4 deletions wasip2/http/types.wit
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
@since(version = 0.2.0)
interface types {
@since(version = 0.2.0)
use wasi:clocks/[email protected].6.{duration};
use wasi:clocks/[email protected].7.{duration};
@since(version = 0.2.0)
use wasi:io/[email protected].6.{input-stream, output-stream};
use wasi:io/[email protected].7.{input-stream, output-stream};
@since(version = 0.2.0)
use wasi:io/[email protected].6.{error as io-error};
use wasi:io/[email protected].7.{error as io-error};
@since(version = 0.2.0)
use wasi:io/[email protected].6.{pollable};
use wasi:io/[email protected].7.{pollable};

/// This type corresponds to HTTP standard Methods.
@since(version = 0.2.0)
Expand Down
2 changes: 1 addition & 1 deletion wasip2/io/error.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@since(version = 0.2.0)
interface error {
Expand Down
2 changes: 1 addition & 1 deletion wasip2/io/poll.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:io@0.2.6;
package wasi:io@0.2.7;

/// A poll API intended to let users wait for I/O events on multiple handles
/// at once.
Expand Down
52 changes: 10 additions & 42 deletions wasip2/io/streams.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

/// WASI I/O is an I/O abstraction API which is currently focused on providing
/// stream types.
Expand Down Expand Up @@ -154,27 +154,13 @@ interface streams {
/// Perform a write of up to 4096 bytes, and then flush the stream. Block
/// until all of these operations are complete, or an error occurs.
///
/// This is a convenience wrapper around the use of `check-write`,
/// `subscribe`, `write`, and `flush`, and is implemented with the
/// following pseudo-code:
///
/// ```text
/// let pollable = this.subscribe();
/// while !contents.is_empty() {
/// // Wait for the stream to become writable
/// pollable.block();
/// let Ok(n) = this.check-write(); // eliding error handling
/// let len = min(n, contents.len());
/// let (chunk, rest) = contents.split_at(len);
/// this.write(chunk ); // eliding error handling
/// contents = rest;
/// }
/// this.flush();
/// // Wait for completion of `flush`
/// pollable.block();
/// // Check for any errors that arose during `flush`
/// let _ = this.check-write(); // eliding error handling
/// ```
/// Returns success when all of the contents written are successfully
/// flushed to output. If an error occurs at any point before all
/// contents are successfully flushed, that error is returned as soon as
/// possible. If writing and flushing the complete contents causes the
/// stream to become closed, this call should return success, and
/// subsequent calls to check-write or other interfaces should return
/// stream-error::closed.
@since(version = 0.2.0)
blocking-write-and-flush: func(
contents: list<u8>
Expand Down Expand Up @@ -227,26 +213,8 @@ interface streams {
/// Block until all of these operations are complete, or an error
/// occurs.
///
/// This is a convenience wrapper around the use of `check-write`,
/// `subscribe`, `write-zeroes`, and `flush`, and is implemented with
/// the following pseudo-code:
///
/// ```text
/// let pollable = this.subscribe();
/// while num_zeroes != 0 {
/// // Wait for the stream to become writable
/// pollable.block();
/// let Ok(n) = this.check-write(); // eliding error handling
/// let len = min(n, num_zeroes);
/// this.write-zeroes(len); // eliding error handling
/// num_zeroes -= len;
/// }
/// this.flush();
/// // Wait for completion of `flush`
/// pollable.block();
/// // Check for any errors that arose during `flush`
/// let _ = this.check-write(); // eliding error handling
/// ```
/// Functionality is equivelant to `blocking-write-and-flush` with
/// contents given as a list of len containing only zeroes.
@since(version = 0.2.0)
blocking-write-zeroes-and-flush: func(
/// The number of zero-bytes to write
Expand Down
2 changes: 1 addition & 1 deletion wasip2/io/world.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@since(version = 0.2.0)
world imports {
Expand Down
2 changes: 1 addition & 1 deletion wasip2/random/insecure-seed.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;
/// The insecure-seed interface for seeding hash-map DoS resistance.
///
/// It is intended to be portable at least between Unix-family platforms and
Expand Down
2 changes: 1 addition & 1 deletion wasip2/random/insecure.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;
/// The insecure interface for insecure pseudo-random numbers.
///
/// It is intended to be portable at least between Unix-family platforms and
Expand Down
2 changes: 1 addition & 1 deletion wasip2/random/random.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;
/// WASI Random is a random data API.
///
/// It is intended to be portable at least between Unix-family platforms and
Expand Down
2 changes: 1 addition & 1 deletion wasip2/random/world.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@since(version = 0.2.0)
world imports {
Expand Down
2 changes: 1 addition & 1 deletion wasip2/sockets/ip-name-lookup.wit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@since(version = 0.2.0)
interface ip-name-lookup {
@since(version = 0.2.0)
use wasi:io/[email protected].6.{pollable};
use wasi:io/[email protected].7.{pollable};
@since(version = 0.2.0)
use network.{network, error-code, ip-address};

Expand Down
2 changes: 1 addition & 1 deletion wasip2/sockets/network.wit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@since(version = 0.2.0)
interface network {
@unstable(feature = network-error-code)
use wasi:io/[email protected].6.{error};
use wasi:io/[email protected].7.{error};

/// An opaque resource that represents access to (a subset of) the network.
/// This enables context-based security for networking.
Expand Down
6 changes: 3 additions & 3 deletions wasip2/sockets/tcp.wit
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@since(version = 0.2.0)
interface tcp {
@since(version = 0.2.0)
use wasi:io/[email protected].6.{input-stream, output-stream};
use wasi:io/[email protected].7.{input-stream, output-stream};
@since(version = 0.2.0)
use wasi:io/[email protected].6.{pollable};
use wasi:io/[email protected].7.{pollable};
@since(version = 0.2.0)
use wasi:clocks/[email protected].6.{duration};
use wasi:clocks/[email protected].7.{duration};
@since(version = 0.2.0)
use network.{network, error-code, ip-socket-address, ip-address-family};

Expand Down
2 changes: 1 addition & 1 deletion wasip2/sockets/udp.wit
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@since(version = 0.2.0)
interface udp {
@since(version = 0.2.0)
use wasi:io/[email protected].6.{pollable};
use wasi:io/[email protected].7.{pollable};
@since(version = 0.2.0)
use network.{network, error-code, ip-socket-address, ip-address-family};

Expand Down
2 changes: 1 addition & 1 deletion wasip2/sockets/world.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:[email protected].6;
package wasi:[email protected].7;

@since(version = 0.2.0)
world imports {
Expand Down