Skip to content

Commit

Permalink
deps: latest StarlingMonkey, toolchain (#149)
Browse files Browse the repository at this point in the history
  • Loading branch information
guybedford authored Oct 29, 2024
1 parent c05c09b commit 8995b35
Show file tree
Hide file tree
Showing 39 changed files with 334 additions and 315 deletions.
167 changes: 74 additions & 93 deletions Cargo.lock

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ edition = "2021"
version = "0.1.0"

[workspace.dependencies]
anyhow = "1.0.86"
anyhow = "1.0.91"
heck = "0.5"
js-component-bindgen = "1.6.0"
js-component-bindgen = "1.7.1"
rand = "0.8"
wasm-encoder = "0.217.0"
wasm-encoder = "0.218.0"
wasmparser = "0.217.0"
wit-bindgen = "0.32.0"
wit-bindgen-core = "0.32.0"
wit-component = { version = "0.217.0", features = ["dummy-module"] }
wit-parser = "0.217.0"
wit-bindgen = "0.33.0"
wit-bindgen-core = "0.33.0"
wit-component = { version = "0.218.0", features = ["dummy-module"] }
wit-parser = "0.218.0"
orca-wasm = "0.1.4"
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,20 @@ target/wasm32-wasi/release/spidermonkey_embedding_splicer.wasm: Cargo.toml crate
lib/starlingmonkey_embedding.wasm: StarlingMonkey/cmake/* embedding/* StarlingMonkey/runtime/* StarlingMonkey/builtins/* StarlingMonkey/builtins/*/* StarlingMonkey/builtins/*/*/* StarlingMonkey/include/* | lib
cmake -B build-release -DCMAKE_BUILD_TYPE=Release
make -j16 -C build-release
@cp build-release/starling.wasm/starling.wasm $@
@cp build-release/starling-raw.wasm/starling-raw.wasm $@

lib/starlingmonkey_embedding_weval.wasm: StarlingMonkey/cmake/* embedding/* StarlingMonkey/runtime/* StarlingMonkey/builtins/* StarlingMonkey/builtins/*/* StarlingMonkey/builtins/*/*/* StarlingMonkey/include/* | lib
cmake -B build-release-weval -DCMAKE_BUILD_TYPE=Release -DWEVAL=ON
make -j16 -C build-release-weval
@cp build-release-weval/starling.wasm/starling.wasm $@
@cp build-release-weval/starling-raw.wasm/starling-raw.wasm $@

lib/starlingmonkey_ics.wevalcache: lib/starlingmonkey_embedding_weval.wasm
@cp build-release-weval/starling.wasm/starling-ics.wevalcache $@
@cp build-release-weval/starling-raw.wasm/starling-ics.wevalcache $@

lib/starlingmonkey_embedding.debug.wasm: StarlingMonkey/cmake/* embedding/* StarlingMonkey/runtime/* StarlingMonkey/builtins/* StarlingMonkey/builtins/*/* StarlingMonkey/builtins/*/*/* StarlingMonkey/include/* | lib
cmake -B build-debug -DCMAKE_BUILD_TYPE=RelWithDebInfo
make -j16 -C build-debug
@cp build-debug/starling.wasm/starling.wasm $@
@cp build-debug/starling-raw.wasm/starling-raw.wasm $@

obj:
mkdir -p obj
Expand Down
2 changes: 1 addition & 1 deletion StarlingMonkey
73 changes: 40 additions & 33 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"mocha": "^10.2.0"
},
"dependencies": {
"@bytecodealliance/jco": "^1.5.0",
"@bytecodealliance/jco": "^1.7.0",
"@bytecodealliance/weval": "^0.3.2",
"@bytecodealliance/wizer": "^7.0.5",
"es-module-lexer": "^1.5.4"
Expand Down
12 changes: 6 additions & 6 deletions test/cases/floats/world.wit
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package local:floats;

interface floats {
float32-param: func(x: float32);
float64-param: func(x: float64);
float32-result: func() -> float32;
float64-result: func() -> float64;
float64-result2: func() -> float64;
float32-result2: func() -> float32;
float32-param: func(x: f32);
float64-param: func(x: f64);
float32-result: func() -> f32;
float64-result: func() -> f64;
float64-result2: func() -> f64;
float32-result2: func() -> f32;
}

world the-world {
Expand Down
4 changes: 2 additions & 2 deletions test/cases/http-request/source.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { handle } from 'wasi:http/outgoing-handler@0.2.1';
import { Fields, OutgoingRequest } from 'wasi:http/types@0.2.1';
import { handle } from 'wasi:http/outgoing-handler@0.2.2';
import { Fields, OutgoingRequest } from 'wasi:http/types@0.2.2';

const encoder = new TextEncoder();
const decoder = new TextDecoder();
Expand Down
12 changes: 6 additions & 6 deletions test/cases/lists/world.wit
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ interface lists {
list-s16-param: func(x: list<s16>);
list-s32-param: func(x: list<s32>);
list-s64-param: func(x: list<s64>);
list-float32-param: func(x: list<float32>);
list-float64-param: func(x: list<float64>);
list-float32-param: func(x: list<f32>);
list-float64-param: func(x: list<f64>);

list-u8-ret: func() -> list<u8>;
list-u16-ret: func() -> list<u16>;
Expand All @@ -20,8 +20,8 @@ interface lists {
list-s16-ret: func() -> list<s16>;
list-s32-ret: func() -> list<s32>;
list-s64-ret: func() -> list<s64>;
list-float32-ret: func() -> list<float32>;
list-float64-ret: func() -> list<float64>;
list-float32-ret: func() -> list<f32>;
list-float64-ret: func() -> list<f64>;

tuple-list: func(x: list<tuple<u8, s8>>) -> list<tuple<s64, u32>>;
string-list-arg: func(a: list<string>);
Expand Down Expand Up @@ -72,8 +72,8 @@ interface lists {
s32,
u64,
s64,
float32,
float64,
f32,
f64,
char,
>>;
load-store-everything: func(a: load-store-all-sizes) -> load-store-all-sizes;
Expand Down
16 changes: 8 additions & 8 deletions test/cases/resource-floats/world.wit
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package test:test;

interface resource-floats {
resource float {
constructor(v: float64);
get: func() -> float64;
constructor(v: f64);
get: func() -> f64;
}
}

Expand All @@ -12,17 +12,17 @@ world test {

export resource-floats-exports: interface {
resource float {
constructor(v: float64);
get: func() -> float64;
add: static func(a: float, b: float64) -> float;
constructor(v: f64);
get: func() -> f64;
add: static func(a: float, b: f64) -> float;
}
}

import resource-floats-imports: interface {
resource float {
constructor(v: float64);
get: func() -> float64;
add: static func(a: float, b: float64) -> float;
constructor(v: f64);
get: func() -> f64;
add: static func(a: float, b: f64) -> float;
}
}

Expand Down
16 changes: 8 additions & 8 deletions test/cases/variants/world.wit
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ interface variants {
b: option<tuple<bool>>,
c: option<u32>,
d: option<e1>,
e: option<float32>,
e: option<f32>,
f: option<e1>,
g: option<option<bool>>,
);
Expand All @@ -42,23 +42,23 @@ interface variants {
option<tuple<bool>>,
option<u32>,
option<e1>,
option<float32>,
option<f32>,
option<e1>,
option<option<bool>>,
>;

variant casts1 {
a(s32),
b(float32),
b(f32),
}

variant casts2 {
a(float64),
b(float32),
a(f64),
b(f32),
}

variant casts3 {
a(float64),
a(f64),
b(u64),
}

Expand All @@ -68,12 +68,12 @@ interface variants {
}

variant casts5 {
a(float32),
a(f32),
b(s64),
}

variant casts6 {
a(tuple<float32, u32>),
a(tuple<f32, u32>),
b(tuple<u32, u32>),
}

Expand Down
4 changes: 2 additions & 2 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ suite('WASI', () => {

const { component } = await componentize(
`
import { now } from 'wasi:clocks/wall-clock@0.2.1';
import { getRandomBytes } from 'wasi:random/random@0.2.1';
import { now } from 'wasi:clocks/wall-clock@0.2.2';
import { getRandomBytes } from 'wasi:random/random@0.2.2';
let result;
export const run = {
Expand Down
2 changes: 1 addition & 1 deletion test/wit/deps/cli/command.wit
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package wasi:cli@0.2.1;
package wasi:cli@0.2.2;

@since(version = 0.2.0)
world command {
Expand Down
Loading

0 comments on commit 8995b35

Please sign in to comment.