Merge pull request #61 from Shopify/ap.rename-provider

Rename `shopify_function_wasm_api_provider` to `shopify_function_provider`

Author: adampetro

.github/workflows/publish.yml

@@ -24,14 +24,14 @@ jobs:
       - name: Extract provider version
         id: provider_version
         run: |
-          VERSION=$(cargo metadata --format-version=1 --locked | jq '.packages[] | select(.name == "shopify_function_wasm_api_provider") | .version' -r)
+          VERSION=$(cargo metadata --format-version=1 --locked | jq '.packages[] | select(.name == "shopify_function_provider") | .version' -r)
           echo "version=$VERSION" >> $GITHUB_OUTPUT
 
       - name: Build provider asset
-        run: cargo build --release --target wasm32-wasip1 --package shopify_function_wasm_api_provider
+        run: cargo build --release --target wasm32-wasip1 --package shopify_function_provider
 
       - name: Archive asset
-        run: gzip -k -f target/wasm32-wasip1/release/shopify_function_wasm_api_provider.wasm && mv target/wasm32-wasip1/release/shopify_function_wasm_api_provider.wasm.gz shopify_function_v${{ steps.provider_version.outputs.version }}.wasm.gz
+        run: gzip -k -f target/wasm32-wasip1/release/shopify_function_provider.wasm && mv target/wasm32-wasip1/release/shopify_function_provider.wasm.gz shopify_function_v${{ steps.provider_version.outputs.version }}.wasm.gz
 
       - name: Generate asset hash
         run: sha256sum shopify_function_v${{ steps.provider_version.outputs.version }}.wasm.gz | awk '{ print $1 }' > shopify_function_v${{ steps.provider_version.outputs.version }}.wasm.gz.sha256

api/Cargo.toml

@@ -12,7 +12,7 @@ shopify_function_wasm_api_core = { path = "../core", version = "0.0.1" }
 thiserror = "2.0"
 
 [target.'cfg(not(target_family = "wasm"))'.dependencies]
-shopify_function_wasm_api_provider = { path = "../provider", version = "1.0.0" }
+shopify_function_provider = { path = "../provider", version = "1.0.0" }
 serde_json = "1.0"
 rmp-serde = "1.3"
 

api/src/lib.rs

@@ -96,13 +96,13 @@ mod provider_fallback {
 
     // Read API.
     pub(crate) unsafe fn shopify_function_input_get(context: ContextPtr) -> Val {
-        shopify_function_wasm_api_provider::read::shopify_function_input_get(context)
+        shopify_function_provider::read::shopify_function_input_get(context)
     }
     pub(crate) unsafe fn shopify_function_input_get_val_len(
         context: ContextPtr,
         scope: Val,
     ) -> usize {
-        shopify_function_wasm_api_provider::read::shopify_function_input_get_val_len(context, scope)
+        shopify_function_provider::read::shopify_function_input_get_val_len(context, scope)
     }
     pub(crate) unsafe fn shopify_function_input_read_utf8_str(
         context: ContextPtr,
@@ -111,9 +111,7 @@ mod provider_fallback {
         len: usize,
     ) {
         let src =
-            shopify_function_wasm_api_provider::read::shopify_function_input_get_utf8_str_addr(
-                context, src,
-            );
+            shopify_function_provider::read::shopify_function_input_get_utf8_str_addr(context, src);
         std::ptr::copy(src as _, out, len);
     }
     pub(crate) unsafe fn shopify_function_input_get_obj_prop(
@@ -122,7 +120,7 @@ mod provider_fallback {
         ptr: *const u8,
         len: usize,
     ) -> Val {
-        shopify_function_wasm_api_provider::read::shopify_function_input_get_obj_prop(
+        shopify_function_provider::read::shopify_function_input_get_obj_prop(
             context, scope, ptr as _, len,
         )
     }
@@ -131,7 +129,7 @@ mod provider_fallback {
         scope: Val,
         interned_string_id: shopify_function_wasm_api_core::InternedStringId,
     ) -> Val {
-        shopify_function_wasm_api_provider::read::shopify_function_input_get_interned_obj_prop(
+        shopify_function_provider::read::shopify_function_input_get_interned_obj_prop(
             context,
             scope,
             interned_string_id,
@@ -142,16 +140,14 @@ mod provider_fallback {
         scope: Val,
         index: usize,
     ) -> Val {
-        shopify_function_wasm_api_provider::read::shopify_function_input_get_at_index(
-            context, scope, index,
-        )
+        shopify_function_provider::read::shopify_function_input_get_at_index(context, scope, index)
     }
     pub(crate) unsafe fn shopify_function_input_get_obj_key_at_index(
         context: ContextPtr,
         scope: Val,
         index: usize,
     ) -> Val {
-        shopify_function_wasm_api_provider::read::shopify_function_input_get_obj_key_at_index(
+        shopify_function_provider::read::shopify_function_input_get_obj_key_at_index(
             context, scope, index,
         )
     }
@@ -161,35 +157,33 @@ mod provider_fallback {
         context: ContextPtr,
         bool: u32,
     ) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_new_bool(context, bool)
+        shopify_function_provider::write::shopify_function_output_new_bool(context, bool)
     }
     pub(crate) unsafe fn shopify_function_output_new_null(context: ContextPtr) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_new_null(context)
+        shopify_function_provider::write::shopify_function_output_new_null(context)
     }
     pub(crate) unsafe fn shopify_function_output_finalize(context: ContextPtr) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_finalize(context)
+        shopify_function_provider::write::shopify_function_output_finalize(context)
     }
     pub(crate) unsafe fn shopify_function_output_new_i32(
         context: ContextPtr,
         int: i32,
     ) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_new_i32(context, int)
+        shopify_function_provider::write::shopify_function_output_new_i32(context, int)
     }
     pub(crate) unsafe fn shopify_function_output_new_f64(
         context: ContextPtr,
         float: f64,
     ) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_new_f64(context, float)
+        shopify_function_provider::write::shopify_function_output_new_f64(context, float)
     }
     pub(crate) unsafe fn shopify_function_output_new_utf8_str(
         context: ContextPtr,
         ptr: *const u8,
         len: usize,
     ) -> WriteResult {
         let result =
-            shopify_function_wasm_api_provider::write::shopify_function_output_new_utf8_str(
-                context, len,
-            );
+            shopify_function_provider::write::shopify_function_output_new_utf8_str(context, len);
         let write_result =
             WriteResult::from_repr((result >> usize::BITS) as usize).expect("Invalid write result");
         let dst = result as usize;
@@ -202,27 +196,25 @@ mod provider_fallback {
         context: ContextPtr,
         id: shopify_function_wasm_api_core::InternedStringId,
     ) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_new_interned_utf8_str(
-            context, id,
-        )
+        shopify_function_provider::write::shopify_function_output_new_interned_utf8_str(context, id)
     }
     pub(crate) unsafe fn shopify_function_output_new_object(
         context: ContextPtr,
         len: usize,
     ) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_new_object(context, len)
+        shopify_function_provider::write::shopify_function_output_new_object(context, len)
     }
     pub(crate) unsafe fn shopify_function_output_finish_object(context: ContextPtr) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_finish_object(context)
+        shopify_function_provider::write::shopify_function_output_finish_object(context)
     }
     pub(crate) unsafe fn shopify_function_output_new_array(
         context: ContextPtr,
         len: usize,
     ) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_new_array(context, len)
+        shopify_function_provider::write::shopify_function_output_new_array(context, len)
     }
     pub(crate) unsafe fn shopify_function_output_finish_array(context: ContextPtr) -> WriteResult {
-        shopify_function_wasm_api_provider::write::shopify_function_output_finish_array(context)
+        shopify_function_provider::write::shopify_function_output_finish_array(context)
     }
 
     // Other.
@@ -231,8 +223,7 @@ mod provider_fallback {
         ptr: *const u8,
         len: usize,
     ) -> usize {
-        let result =
-            shopify_function_wasm_api_provider::shopify_function_intern_utf8_str(context, len);
+        let result = shopify_function_provider::shopify_function_intern_utf8_str(context, len);
         let id = (result >> usize::BITS) as usize;
         let dst = result as usize;
         std::ptr::copy(ptr as _, dst as _, len);
@@ -498,11 +489,7 @@ impl Context {
     #[cfg(not(target_family = "wasm"))]
     pub fn new_with_input(input: serde_json::Value) -> Self {
         let bytes = rmp_serde::to_vec(&input).unwrap();
-        Self(
-            shopify_function_wasm_api_provider::shopify_function_context_new_from_msgpack_bytes(
-                bytes,
-            ),
-        )
+        Self(shopify_function_provider::shopify_function_context_new_from_msgpack_bytes(bytes))
     }
 
     /// Get the top-level value of the input.

api/src/write.rs

@@ -119,7 +119,7 @@ impl Context {
     /// Finalize the output and return the serialized value as a `serde_json::Value`.
     /// This is only available in non-WASM targets, and therefore only recommended for use in tests.
     pub fn finalize_output_and_return(self) -> Result<serde_json::Value, Error> {
-        let (result, bytes) = shopify_function_wasm_api_provider::write::shopify_function_output_finalize_and_return_msgpack_bytes(self.0 as _);
+        let (result, bytes) = shopify_function_provider::write::shopify_function_output_finalize_and_return_msgpack_bytes(self.0 as _);
         map_result(result).and_then(|_| rmp_serde::from_slice(&bytes).map_err(|_| Error::IoError))
     }
 }

integration_tests/Cargo.toml

@@ -11,4 +11,4 @@ deterministic-wasi-ctx = "1.0.0"
 rmp-serde = "1.3"
 serde_json = "1.0"
 shopify_function_trampoline = { path = "../trampoline" }
-shopify_function_wasm_api_provider = { path = "../provider" }
+shopify_function_provider = { path = "../provider" }

integration_tests/src/lib.rs

@@ -16,7 +16,7 @@ fn build_provider() -> Result<()> {
             "--target",
             "wasm32-wasip1",
             "-p",
-            "shopify_function_wasm_api_provider",
+            "shopify_function_provider",
         ])
         .status()?;
     if !status.success() {

integration_tests/tests/integration_test.rs

@@ -19,7 +19,7 @@ fn run_example_with_input(example: &str, input: serde_json::Value) -> Result<Vec
     )?;
     let provider = Module::from_file(
         &engine,
-        workspace_root.join("target/wasm32-wasip1/release/shopify_function_wasm_api_provider.wasm"),
+        workspace_root.join("target/wasm32-wasip1/release/shopify_function_provider.wasm"),
     )?;
 
     let input = rmp_serde::to_vec(&input)?;
@@ -50,7 +50,7 @@ fn run_example_with_input(example: &str, input: serde_json::Value) -> Result<Vec
     let provider_instance = linker.instantiate(&mut store, &provider)?;
     linker.instance(
         &mut store,
-        shopify_function_wasm_api_provider::PROVIDER_MODULE_NAME,
+        shopify_function_provider::PROVIDER_MODULE_NAME,
         provider_instance,
     )?;
 

provider/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "shopify_function_wasm_api_provider"
+name = "shopify_function_provider"
 version = "1.0.0"
 edition = "2021"
 license = "MIT"