Re-generate fastly-world with wit-bindgen 0.6 (#528)

Author: elliottt

package.json

@@ -45,7 +45,7 @@
     "typescript": "^5.0"
   },
   "dependencies": {
-    "@bytecodealliance/jco": "^0.6.1",
+    "@bytecodealliance/jco": "^0.7.0",
     "@bytecodealliance/wizer": "^1.6.1-beta.4",
     "acorn": "^8.8.2",
     "acorn-walk": "^8.2.0",

runtime/js-compute-runtime/.gitignore

@@ -2,6 +2,7 @@
 /compile_commands.json
 /.cache
 
+!/fastly-world/*.o
 /js-compute-runtime*.wasm
 /build
-/shared
+/shared

runtime/js-compute-runtime/Makefile

@@ -326,6 +326,10 @@ $(eval $(call compile_c,$(FSM_SRC)/fastly-world/fastly_world.c))
 # that script for more information about why we do this.
 $(OBJ_DIR)/js-compute-runtime-component.wasm: $(FSM_OBJ) $(SM_OBJ) $(RUST_URL_LIB) $(RUST_ENCODING_LIB)
 $(OBJ_DIR)/js-compute-runtime-component.wasm: $(OBJ_DIR)/impl/main_component.o
+# NOTE: we don't currently link in the component type object because we
+# explicitly reference fastly.wit when building the component. If this changes,
+# uncommenting this line will link the component type object in.
+# $(OBJ_DIR)/js-compute-runtime-component.wasm: $(FSM_SRC)/fastly-world/fastly_world_component_type.o
 $(OBJ_DIR)/js-compute-runtime-component.wasm: $(OBJ_DIR)/fastly-world/fastly_world.o
 	$(call cmd_format,WASI_LD,$@) PATH="$(FSM_SRC)/scripts:$$PATH" \
 	$(WASI_CXX) $(LD_FLAGS) $(OPENSSL_LIBS) -o $@ $^

runtime/js-compute-runtime/builtins/client-info.cpp

@@ -22,7 +22,7 @@ JSString *geo_info(JSObject *obj) {
 static JSString *retrieve_address(JSContext *cx, JS::HandleObject self) {
   JS::RootedString address(cx);
 
-  fastly_list_u8_t octets;
+  fastly_world_list_u8_t octets;
   fastly_error_t err;
   if (!fastly_http_req_downstream_client_ip_addr(&octets, &err)) {
     HANDLE_ERROR(cx, err);

runtime/js-compute-runtime/builtins/config-store.cpp

@@ -27,7 +27,7 @@ bool ConfigStore::get(JSContext *cx, unsigned argc, JS::Value *vp) {
     return false;
   }
 
-  fastly_option_string_t ret;
+  fastly_world_option_string_t ret;
   fastly_error_t err;
   // Ensure that we throw an exception for all unexpected host errors.
   if (!fastly_dictionary_get(ConfigStore::config_store_handle(self), &key_str, &ret, &err)) {

runtime/js-compute-runtime/builtins/dictionary.cpp

@@ -33,7 +33,7 @@ bool Dictionary::get(JSContext *cx, unsigned argc, JS::Value *vp) {
     return false;
   }
 
-  fastly_option_string_t ret;
+  fastly_world_option_string_t ret;
   fastly_error_t err;
 
   // Ensure that we throw an exception for all unexpected host errors.

runtime/js-compute-runtime/builtins/kv-store.cpp

@@ -202,7 +202,7 @@ bool KVStore::get(JSContext *cx, unsigned argc, JS::Value *vp) {
   if (!parse_and_validate_key(cx, &key_chars, key_str.len))
     return ReturnPromiseRejectedWithPendingError(cx, args);
 
-  fastly_option_body_handle_t ret;
+  fastly_world_option_body_handle_t ret;
   fastly_error_t err;
   if (!fastly_object_store_lookup(kv_store_handle(self), &key_str, &ret, &err)) {
     HANDLE_ERROR(cx, err);

runtime/js-compute-runtime/builtins/secret-store.cpp

@@ -11,7 +11,7 @@ fastly_secret_handle_t SecretStoreEntry::secret_handle(JSObject *obj) {
 bool SecretStoreEntry::plaintext(JSContext *cx, unsigned argc, JS::Value *vp) {
   METHOD_HEADER(0)
 
-  fastly_option_string_t ret;
+  fastly_world_option_string_t ret;
   fastly_error_t err;
   // Ensure that we throw an exception for all unexpected host errors.
   if (!fastly_secret_store_plaintext(SecretStoreEntry::secret_handle(self), &ret, &err)) {
@@ -110,7 +110,7 @@ bool SecretStore::get(JSContext *cx, unsigned argc, JS::Value *vp) {
   fastly_world_string_t key_str;
   key_str.len = length;
   key_str.ptr = key.get();
-  fastly_option_secret_handle_t secret;
+  fastly_world_option_secret_handle_t secret;
   fastly_error_t err;
   // Ensure that we throw an exception for all unexpected host errors.
   if (!fastly_secret_store_get(SecretStore::secret_store_handle(self), &key_str, &secret, &err)) {

runtime/js-compute-runtime/core/geo_ip.cpp

@@ -34,7 +34,7 @@ JSString *get_geo_info(JSContext *cx, JS::HandleString address_str) {
     return nullptr;
   }
 
-  fastly_list_u8_t octets_list = {const_cast<uint8_t *>(&octets[0]), octets_len};
+  fastly_world_list_u8_t octets_list = {const_cast<uint8_t *>(&octets[0]), octets_len};
 
   fastly_world_string_t ret;
   fastly_error_t err;