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.

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

chore: update WIT dependencies #60

Closed
wants to merge 1 commit into from
Closed
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
29 changes: 12 additions & 17 deletions wit/deps.lock
Original file line number Diff line number Diff line change
@@ -1,34 +1,29 @@
[cli]
url = "https://github.com/WebAssembly/wasi-cli/archive/main.tar.gz"
sha256 = "f21b7722b9225b7ff4f040a67daacd4e412fe2c53c982568a2c25b97fc85d2a2"
sha512 = "ceec4b906f94ba53731dd9428e7e62b964de2284d6aa7cb3436cb856ca89405b0ca8b02e8a8d4575204b9e72dac0e3b29690221ca438324b89e0084117f1700f"
sha256 = "1bd33a5d8244e91bb8108bf692821dfb4a08b244eea383751657baf4a3dd52f7"
sha512 = "54e206c492059331782d7ef07cda036c7b6d74fd5852748f7573c5bcd0787c5fd0c43dd39680ad3c383df0dd16e945e8e1ea15af515d5523d75b82a2fd2b0733"

[clocks]
url = "https://github.com/WebAssembly/wasi-clocks/archive/main.tar.gz"
sha256 = "1ed7e35b3f9738663854f0dd92a95bfadc410ea07170501f5c2fec0cc24e3d57"
sha512 = "ef1e23704a8a8436fd3718593d4c4d8b6d1c64dad3595b7496c0888ca14b725046f2900109800faca1bc8c14f237cdcaca791dba8284e1ad50105ab2d036825b"
sha256 = "ea955af7a152f85941b651c5b07345c4f077ae7f9e996c909ab8cc0a68c0120e"
sha512 = "114bc4f583a487cf1ccfdd6efa25c4c60cf637d4501a189eebd4b1d52aec2c8eb63ae14ce494db53dfd25bc20f6c4b533dc6f2143537e5cd14ca80d5d4b6a49d"

[filesystem]
url = "https://github.com/WebAssembly/wasi-filesystem/archive/main.tar.gz"
sha256 = "dc170645d8aa52f2f94ab8f71093fa0c101e509ed1a07318995dc0395e9d6cf2"
sha512 = "3195a3e0f9ec52c3a91c4b4fde0547694236c7b29bceecb7f38634894fafd809c69ed1c1c9acbf225b2d5d00f5036d70371c9fed121d85028162b202035cabef"
sha256 = "f8602f2929fe149b0e2e904fe53b98e3a0ba0a42089253c9a738caf9ccb06c1d"
sha512 = "53f3d7c494ea6ad0687f91994f3af8c5f55bdddeb14cc47b30ff263cdb1ee6c7893ad425d1dc75a8da72d9bb5f82a46fcd566e0c2463fda102a22529e2d83f19"

[io]
url = "https://github.com/WebAssembly/wasi-io/archive/main.tar.gz"
sha256 = "6e18239b0e20d1a3e6343cb961ebfd2c663ba7feb4c1aa3744b756fbdd1fb5b8"
sha512 = "53169b6e4fba0b2cf5fcf808f76e7fbb7cabb6ed66ab53f77d0966e7448312ccbe8571880ef4fc2ee86fbd6ba19bc48d46e10d22dcac6c51d217e8d7127c32db"

[poll]
url = "https://github.com/WebAssembly/wasi-poll/archive/main.tar.gz"
sha256 = "d4c27124f4c137eb538b5c92ba5858ed9042e11b24a2eef85d14becd0b7f55de"
sha512 = "422c01b273b4b1377ece6f2e4ba0dfc609ca8ef30a3e0be0e172e1303fcf7b3ca4c470f4dea6c51bdf114b0f5c871ebc4934dfe3bf217d66ea689748df2b1e55"
sha256 = "a00c29dd57dc224e8ce28b793b19c1b1001dcdbdc229ed451c3df1db91841b34"
sha512 = "8558085eeb5689209101cdfbc9782953d559ad14ce77260fe2f7cc472482d568f65cad9e6a688d40c634c6c54c608f27e27e481633446114d6fdead93d4e34c5"

[random]
url = "https://github.com/WebAssembly/wasi-random/archive/main.tar.gz"
sha256 = "9b622463e597b9ca94f41e4eaae589a77be38f71b4723142b60246ffed8eaae4"
sha512 = "21f03ca1e595b80d7ced522de1a47446526b49b900e2fb26fcbf410ce6aa267dbf247aebf3fbfa8123b46fc1a828e2fd64fb1e0198b40161a3257e8d86fd4546"
sha256 = "2f718c9909fcc95dc8d7f9fc3a17a30d7da715eaa9fa70af3c89f0f9439abc8a"
sha512 = "7580d79d0f01d4fb65ff85f76d52d420fdbc7406959a34c2b1cad4398dc34d2610f8b6b4e22bcea9db2f3d70242d356e961d843bfc4d2c4956c4f5e5ca3811f9"

[sockets]
url = "https://github.com/WebAssembly/wasi-sockets/archive/main.tar.gz"
sha256 = "871c211b12d87a5da87c42353338b652260840897efcd37e2afba3b9290058fc"
sha512 = "e436a5ff3145ca85d702a086499c03488523483dd3addc8d71e4946e9c186355291551bb6d38b157173836fcc318182403e6dba970de4512f6cfb3374ccad6b9"
sha256 = "85b872b5af12d3010c20a5f4bf6d334a09c1a42ef7f7703c2949c0598ed8ebee"
sha512 = "238bbeea140eba0774cf5ce5abfdc93f03617a2fc30b497e104cc6a23fdf7bd496c61d3c962ca6718255ea5c96a9277bddae1fc4a6b6f7544de2be2649752eac"
1 change: 0 additions & 1 deletion wit/deps.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
io = "https://github.com/WebAssembly/wasi-io/archive/main.tar.gz"
cli = "https://github.com/WebAssembly/wasi-cli/archive/main.tar.gz"
poll = "https://github.com/WebAssembly/wasi-poll/archive/main.tar.gz"
random = "https://github.com/WebAssembly/wasi-random/archive/main.tar.gz"
clocks = "https://github.com/WebAssembly/wasi-clocks/archive/main.tar.gz"
# not used by http/proxy, but included to allow full contents of wasi-cli to validate
Expand Down
24 changes: 2 additions & 22 deletions wit/deps/cli/command.wit
Original file line number Diff line number Diff line change
@@ -1,27 +1,7 @@
package wasi:cli

world command {
import wasi:clocks/wall-clock
import wasi:clocks/monotonic-clock
import wasi:clocks/timezone
import wasi:filesystem/types
import wasi:sockets/instance-network
import wasi:sockets/ip-name-lookup
import wasi:sockets/network
import wasi:sockets/tcp-create-socket
import wasi:sockets/tcp
import wasi:sockets/udp-create-socket
import wasi:sockets/udp
import wasi:random/random
import wasi:random/insecure
import wasi:random/insecure-seed
import wasi:poll/poll
import wasi:io/streams
import environment
import preopens
import exit
import stdin
import stdout
import stderr
include reactor

export run
}
4 changes: 4 additions & 0 deletions wit/deps/cli/environment.wit
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,8 @@ interface environment {

/// Get the POSIX-style arguments to the program.
get-arguments: func() -> list<string>

/// Return a path that programs should use as their initial current working
/// directory, interpreting `.` as shorthand for this.
initial-cwd: func() -> option<string>
}
11 changes: 0 additions & 11 deletions wit/deps/cli/preopens.wit

This file was deleted.

30 changes: 30 additions & 0 deletions wit/deps/cli/reactor.wit
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
world reactor {
import wasi:clocks/wall-clock
import wasi:clocks/monotonic-clock
import wasi:clocks/timezone
import wasi:filesystem/types
import wasi:filesystem/preopens
import wasi:sockets/instance-network
import wasi:sockets/ip-name-lookup
import wasi:sockets/network
import wasi:sockets/tcp-create-socket
import wasi:sockets/tcp
import wasi:sockets/udp-create-socket
import wasi:sockets/udp
import wasi:random/random
import wasi:random/insecure
import wasi:random/insecure-seed
import wasi:io/poll
import wasi:io/streams
import environment
import exit
import stdin
import stdout
import stderr
import terminal-input
import terminal-output
import terminal-stdin
import terminal-stdout
import terminal-stderr
}

16 changes: 2 additions & 14 deletions wit/deps/cli/terminal.wit
Original file line number Diff line number Diff line change
@@ -1,31 +1,19 @@
interface terminal-input {
/// The input side of a terminal.
///
/// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
type terminal-input = u32
resource terminal-input

// In the future, this may include functions for disabling echoing,
// disabling input buffering so that keyboard events are sent through
// immediately, querying supported features, and so on.

/// Dispose of the specified terminal-input after which it may no longer
/// be used.
drop-terminal-input: func(this: terminal-input)
}

interface terminal-output {
/// The output side of a terminal.
///
/// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
type terminal-output = u32
resource terminal-output

// In the future, this may include functions for querying the terminal
// size, being notified of terminal size changes, querying supported
// features, and so on.

/// Dispose of the specified terminal-output, after which it may no longer
/// be used.
drop-terminal-output: func(this: terminal-output)
}

/// An interface providing an optional `terminal-input` for stdin as a
Expand Down
2 changes: 1 addition & 1 deletion wit/deps/clocks/monotonic-clock.wit
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
///
/// It is intended for measuring elapsed time.
interface monotonic-clock {
use wasi:poll/poll.{pollable}
use wasi:io/poll.{pollable}

/// A timestamp in nanoseconds.
type instant = u64
Expand Down
17 changes: 2 additions & 15 deletions wit/deps/clocks/timezone.wit
Original file line number Diff line number Diff line change
@@ -1,30 +1,17 @@
interface timezone {
use wall-clock.{datetime}

/// A timezone.
///
/// In timezones that recognize daylight saving time, also known as daylight
/// time and summer time, the information returned from the functions varies
/// over time to reflect these adjustments.
///
/// This [represents a resource](https://github.com/WebAssembly/WASI/blob/main/docs/WitInWasi.md#Resources).
type timezone = u32

/// Return information needed to display the given `datetime`. This includes
/// the UTC offset, the time zone name, and a flag indicating whether
/// daylight saving time is active.
///
/// If the timezone cannot be determined for the given `datetime`, return a
/// `timezone-display` for `UTC` with a `utc-offset` of 0 and no daylight
/// saving time.
display: func(this: timezone, when: datetime) -> timezone-display
display: func(when: datetime) -> timezone-display

/// The same as `display`, but only return the UTC offset.
utc-offset: func(this: timezone, when: datetime) -> s32

/// Dispose of the specified input-stream, after which it may no longer
/// be used.
drop-timezone: func(this: timezone)
utc-offset: func(when: datetime) -> s32

/// Information useful for displaying the timezone of a specific `datetime`.
///
Expand Down
2 changes: 1 addition & 1 deletion wit/deps/clocks/world.wit
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package wasi:clocks

world example-world {
world imports {
import monotonic-clock
import wall-clock
import timezone
Expand Down
Loading
Loading