Merge pull request #75 from Shopify/ap.improve-len-error-case

Improve length get error cases

Author: adampetro

Cargo.lock

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

api/Cargo.toml

@@ -409,7 +409,11 @@ impl Value {
                 } else {
                     len
                 };
-                Some(len)
+                if len == usize::MAX {
+                    None
+                } else {
+                    Some(len)
+                }
             }
             _ => None,
         }
@@ -429,7 +433,11 @@ impl Value {
                 } else {
                     len
                 };
-                Some(len)
+                if len == usize::MAX {
+                    None
+                } else {
+                    Some(len)
+                }
             }
             _ => None,
         }
@@ -569,4 +577,48 @@ mod tests {
         let id3 = cached_interned_string_id.load_from_context(&context2);
         assert_ne!(id, id3);
     }
+
+    #[test]
+    fn test_array_len_with_null_ptr() {
+        let context = Context::new_with_input(serde_json::json!({}));
+        let value = Value {
+            context: NonNull::new(context.0 as _).unwrap(),
+            nan_box: NanBox::array(0, NanBox::MAX_VALUE_LENGTH),
+        };
+        let len = value.array_len();
+        assert_eq!(len, None);
+    }
+
+    #[test]
+    fn test_array_len_with_non_length_eligible_nan_box() {
+        let context = Context::new_with_input(serde_json::json!({}));
+        let value = Value {
+            context: NonNull::new(context.0 as _).unwrap(),
+            nan_box: NanBox::null(),
+        };
+        let len = value.array_len();
+        assert_eq!(len, None);
+    }
+
+    #[test]
+    fn test_obj_len_with_null_ptr() {
+        let context = Context::new_with_input(serde_json::json!({}));
+        let value = Value {
+            context: NonNull::new(context.0 as _).unwrap(),
+            nan_box: NanBox::obj(0, NanBox::MAX_VALUE_LENGTH),
+        };
+        let len = value.obj_len();
+        assert_eq!(len, None);
+    }
+
+    #[test]
+    fn test_obj_len_with_non_length_eligible_nan_box() {
+        let context = Context::new_with_input(serde_json::json!({}));
+        let value = Value {
+            context: NonNull::new(context.0 as _).unwrap(),
+            nan_box: NanBox::null(),
+        };
+        let len = value.obj_len();
+        assert_eq!(len, None);
+    }
 }

api/src/lib.rs

@@ -42,7 +42,7 @@
   ;;   - Array: number of elements.
   ;;   - String: number of utf8-encoded bytes.
   ;;   - Object: number of entries.
-  ;;   - 0 for all other values.
+  ;;   - -1 for all other values.
   ;;
   ;; Note that calling this function is not required in all cases, if
   ;; the length value is equal or less than (2^14) - 1, the length

api/src/shopify_function.wat

@@ -1,6 +1,6 @@
 [package]
 name = "shopify_function_provider"
-version = "1.0.0"
+version = "1.0.1"
 edition = "2021"
 license = "MIT"
 repository = "https://github.com/Shopify/shopify-function-wasm-api"

provider/Cargo.toml

@@ -172,14 +172,14 @@ decorate_for_target! {
                 match v.try_decode() {
                     Ok(NanBoxValueRef::String { ptr, .. } | NanBoxValueRef::Array { ptr, .. } | NanBoxValueRef::Object { ptr, .. }) => {
                         let Ok(value) = LazyValueRef::mut_from_raw(ptr as _) else {
-                            return 0;
+                            return usize::MAX;
                         };
                         value.get_value_length()
                     }
-                    _ => 0,
+                    _ => usize::MAX,
                 }
             }
-            Err(_) => 0,
+            Err(_) => usize::MAX,
         }
     }
 }