chore: wasm/warg namespace cleanup

ipvm-wg · Mar 27, 2024 · c14efac · c14efac
1 parent c2092b2
commit c14efac
Show file tree

Hide file tree

Showing 48 changed files with 147 additions and 204 deletions.
diff --git a/examples/websocket-relay/example_test.wasm b/examples/websocket-relay/example_test.wasm
diff --git a/examples/websocket-relay/relay-app/src/lib/workflow.ts b/examples/websocket-relay/relay-app/src/lib/workflow.ts
@@ -256,7 +256,7 @@ export const workflowOnePromised = WorkflowBuilder.workflow({
       WorkflowBuilder.crop({
         name: "crop",
         resource:
-          "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
+          "ipfs://bafybeibk42jwhq7w2zcpe6q3wgtleugp3ymfs3pa5gerjmnakqihhqx4zq",
         args: {
           data: "{{ cid:bafybeiejevluvtoevgk66plh5t6xiy3ikyuuxg3vgofuvpeckb6eadresm }}",
           x: 150,
@@ -268,15 +268,15 @@ export const workflowOnePromised = WorkflowBuilder.workflow({
       WorkflowBuilder.rotate90({
         name: "rotate90",
         resource:
-          "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
+          "ipfs://bafybeibk42jwhq7w2zcpe6q3wgtleugp3ymfs3pa5gerjmnakqihhqx4zq",
         args: {
           data: "{{needs.crop.output}}",
         },
       }),
       WorkflowBuilder.blur({
         name: "blur",
         resource:
-          "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
+          "ipfs://bafybeibk42jwhq7w2zcpe6q3wgtleugp3ymfs3pa5gerjmnakqihhqx4zq",
         args: {
           data: "{{needs.rotate90.output}}",
           sigma: 20.2,
@@ -293,7 +293,7 @@ export const workflowTwoPromised = WorkflowBuilder.workflow({
       WorkflowBuilder.crop({
         name: "crop",
         resource:
-          "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
+          "ipfs://bafybeibk42jwhq7w2zcpe6q3wgtleugp3ymfs3pa5gerjmnakqihhqx4zq",
         args: {
           data: "{{ cid:bafybeiejevluvtoevgk66plh5t6xiy3ikyuuxg3vgofuvpeckb6eadresm }}",
           x: 150,
@@ -305,15 +305,15 @@ export const workflowTwoPromised = WorkflowBuilder.workflow({
       WorkflowBuilder.rotate90({
         name: "rotate90",
         resource:
-          "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
+          "ipfs://bafybeibk42jwhq7w2zcpe6q3wgtleugp3ymfs3pa5gerjmnakqihhqx4zq",
         args: {
           data: "{{needs.crop.output}}",
         },
       }),
       WorkflowBuilder.grayscale({
         name: "grayscale",
         resource:
-          "ipfs://bafybeia32q3oy6u47x624rmsmgrrlpn7ulruissmz5z2ap6alv7goe7h3q",
+          "ipfs://bafybeibk42jwhq7w2zcpe6q3wgtleugp3ymfs3pa5gerjmnakqihhqx4zq",
         args: {
           data: "{{needs.rotate90.output}}",
         },

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -101,6 +101,9 @@
           twiggy
           unstable.cargo-component
           unstable.wasm-tools
+          # TODO: Return to this
+          # unstable.warg
+          # unstable.wit
         ];
 
         ci = pkgs.writeScriptBin "ci" ''
@@ -237,6 +240,7 @@
           cp target/wasm32-wasi/release-wasm-fn/homestar_functions_test.wasm homestar-wasm/fixtures/example_test_wasi.wasm
           wasm-tools component new homestar-wasm/fixtures/example_test_wasi.wasm -o homestar-wasm/fixtures/example_test_wasi_component.wasm --adapt homestar-functions/wasi_snapshot_preview1.wasm
           cp homestar-wasm/fixtures/example_test.wasm examples/websocket-relay/example_test.wasm
+          wasm-tools component wit homestar-wasm/wit -o homestar-wasm/fixtures/host.wasm --wasm
         '';
 
         wasmAdd = pkgs.writeScriptBin "wasm-ex-add" ''

diff --git a/homestar-functions/add/src/bindings.rs b/homestar-functions/add/src/bindings.rs
@@ -1,13 +1,11 @@
-// Generated by `wit-bindgen` 0.20.0. DO NOT EDIT!
+// Generated by `wit-bindgen` 0.21.0. DO NOT EDIT!
 // Options used:
-
 #[doc(hidden)]
 #[allow(non_snake_case)]
 pub unsafe fn _export_add_one_cabi<T: Guest>(arg0: i32) -> i32 {
     let result0 = T::add_one(arg0);
     _rt::as_i32(result0)
 }
-
 #[doc(hidden)]
 #[allow(non_snake_case)]
 pub unsafe fn _export_add_two_cabi<T: Guest>(arg0: i32) -> i32 {
@@ -23,12 +21,10 @@ pub trait Guest {
 macro_rules! __export_world_add_cabi{
   ($ty:ident with_types_in $($path_to_types:tt)*) => (const _: () = {
 
-
     #[export_name = "add-one"]
     unsafe extern "C" fn export_add_one(arg0: i32,) -> i32 {
       $($path_to_types)*::_export_add_one_cabi::<$ty>(arg0)
     }
-
     #[export_name = "add-two"]
     unsafe extern "C" fn export_add_two(arg0: i32,) -> i32 {
       $($path_to_types)*::_export_add_two_cabi::<$ty>(arg0)
@@ -139,13 +135,13 @@ macro_rules! __export_add_impl {
 pub(crate) use __export_add_impl as export;
 
 #[cfg(target_arch = "wasm32")]
-#[link_section = "component-type:wit-bindgen:0.20.0:add:encoded world"]
+#[link_section = "component-type:wit-bindgen:0.21.0:add:encoded world"]
 #[doc(hidden)]
-pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 194] = *b"\
-\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07I\x01A\x02\x01A\x03\x01\
-@\x01\x05inputz\0z\x04\0\x07add-one\x01\0\x04\0\x07add-two\x01\0\x04\x01\x1ahome\
-star-functions:add/add\x04\0\x0b\x09\x01\0\x03add\x03\0\0\0G\x09producers\x01\x0c\
-processed-by\x02\x0dwit-component\x070.201.0\x10wit-bindgen-rust\x060.20.0";
+pub static __WIT_BINDGEN_COMPONENT_TYPE: [u8; 190] = *b"\
+\0asm\x0d\0\x01\0\0\x19\x16wit-component-encoding\x04\0\x07E\x01A\x02\x01A\x03\x01\
+@\x01\x05inputz\0z\x04\0\x07add-one\x01\0\x04\0\x07add-two\x01\0\x04\x01\x16home\
+star:add/add@0.1.1\x04\0\x0b\x09\x01\0\x03add\x03\0\0\0G\x09producers\x01\x0cpro\
+cessed-by\x02\x0dwit-component\x070.201.0\x10wit-bindgen-rust\x060.21.0";
 
 #[inline(never)]
 #[doc(hidden)]

diff --git a/homestar-functions/add/wit/world.wit b/homestar-functions/add/wit/world.wit
@@ -1,4 +1,4 @@
-package homestar-functions:add;
+package homestar:add@0.1.1;
 
 world add {
     export add-one: func(input: s32) -> s32;