chore: use c-at-e as the identifier

Author: Jake Champion

.github/workflows/main.yml

@@ -294,7 +294,7 @@ jobs:
         name: engine-release
     - name: Locate component resources
       run: |
-        cp c-dependencies/js-compute-runtime/xqd.wit .
+        cp c-dependencies/js-compute-runtime/c-at-e.wit .
         cp c-dependencies/js-compute-runtime/wasi_snapshot_preview1.wasm .
     - run: yarn
       shell: bash

.gitignore

@@ -15,11 +15,11 @@ node_modules/
 /js-compute-runtime-component.wasm
 /c-dependencies/js-compute-runtime/obj
 tests/wpt-harness/wpt-test-runner.js
-/xqd.wit
+/c-at-e.wit
 /wasi_snapshot_preview1.wasm
 wpt-runtime.wasm
 docs-app/bin/main.wasm
 docs-app/pkg/*.tar.gz
-c-dependencies/js-compute-runtime/xqd-world/xqd_world_component_type.o
+c-dependencies/js-compute-runtime/c-at-e-world/c_at_e_world_component_type.o
 
 *.a

.vscode/settings.json

@@ -1,9 +1,10 @@
 {
     "files.associations": {
+        "*.mdx": "mdx",
         "cstddef": "c",
         "limits": "c",
         "type_traits": "c",
-        "xqd.h": "c",
+        "c-at-e.h": "c",
         "algorithm": "cpp",
         "memory": "cpp",
         "__functional_base": "cpp",
@@ -87,7 +88,8 @@
         "__functional_03": "cpp",
         "__functional_base_03": "cpp",
         "memory_resource": "cpp",
-        "numeric": "cpp"
+        "numeric": "cpp",
+        "c_at_e_world.h": "c"
     },
     "git.ignoreLimitWarning": true
 }

CHANGELOG.md

@@ -52,7 +52,7 @@
 
 ### Changed
 
-* ensure CacheOverride bitflags are the same value as defined in xqd ([#386](https://github.com/fastly/js-compute-runtime/issues/386)) ([8a1c215](https://github.com/fastly/js-compute-runtime/commit/8a1c2158505e8ed1ebb424fc97866da155601d1f))
+* ensure CacheOverride bitflags are the same value as defined in c-at-e ([#386](https://github.com/fastly/js-compute-runtime/issues/386)) ([8a1c215](https://github.com/fastly/js-compute-runtime/commit/8a1c2158505e8ed1ebb424fc97866da155601d1f))
 
 ## 1.3.0 (2023-01-24)
 

c-dependencies/js-compute-runtime/Makefile

@@ -93,7 +93,7 @@ CFLAGS += --sysroot=$(WASI_SDK)/share/wasi-sysroot
 
 # Includes for compiling c++
 INCLUDES := -I$(FSM_SRC)
-INCLUDES += -I$(FSM_SRC)/xqd-world
+INCLUDES += -I$(FSM_SRC)/c-at-e-world
 INCLUDES += -I$(SM_SRC)/include
 INCLUDES += -I$(BUILD)/openssl/include
 
@@ -139,7 +139,7 @@ $(BUILD):
 $(OBJ_DIR):
 	$(call cmd,mkdir,$@)
 
-$(OBJ_DIR)/xqd-world:
+$(OBJ_DIR)/c-at-e-world:
 	$(call cmd,mkdir,$@)
 
 $(OBJ_DIR)/builtins:
@@ -244,7 +244,7 @@ regenerate-world:
 	@exit 1
 else
 regenerate-world:
-	$(WIT_BINDGEN) c xqd.wit --no-helpers --out-dir xqd-world
+	$(WIT_BINDGEN) c c-at-e.wit --no-helpers --out-dir c-at-e-world
 endif
 
 
@@ -259,29 +259,29 @@ FSM_OBJ := $(patsubst $(FSM_SRC)/%.cpp,$(OBJ_DIR)/%.o,$(FSM_CPP))
 
 # Build all the above object files
 $(foreach source,$(FSM_CPP),$(eval $(call compile_cxx,$(source))))
-$(eval $(call compile_cxx,$(FSM_SRC)/xqd-world/xqd_world_adapter.cpp))
-$(eval $(call compile_c,$(FSM_SRC)/xqd-world/xqd_world.c))
+$(eval $(call compile_cxx,$(FSM_SRC)/c-at-e-world/c_at_e_world_adapter.cpp))
+$(eval $(call compile_c,$(FSM_SRC)/c-at-e-world/c_at_e_world.c))
 
-# Special build of xqd_world_adapter.cpp for the component model.
-$(OBJ_DIR)/xqd-world/xqd_world_adapter_component.o: $(FSM_SRC)/xqd-world/xqd_world_adapter.cpp
-$(OBJ_DIR)/xqd-world/xqd_world_adapter_component.o: DEFINES += -DCOMPONENT
-$(OBJ_DIR)/xqd-world/xqd_world_adapter_component.o: | $(OBJ_DIR)/xqd-world
+# Special build of c_at_e_world_adapter.cpp for the component model.
+$(OBJ_DIR)/c-at-e-world/c_at_e_world_adapter_component.o: $(FSM_SRC)/c-at-e-world/c_at_e_world_adapter.cpp
+$(OBJ_DIR)/c-at-e-world/c_at_e_world_adapter_component.o: DEFINES += -DCOMPONENT
+$(OBJ_DIR)/c-at-e-world/c_at_e_world_adapter_component.o: | $(OBJ_DIR)/c-at-e-world
 	$(call cmd,wasi_cxx,$@)
 
 # NOTE: we shadow wasm-opt by adding $(FSM_SRC)/scripts to the path, which
 # includes a script called wasm-opt that immediately exits successfully. See
 # that script for more information about why we do this.
 
 $(OBJ_DIR)/js-compute-runtime.wasm: $(FSM_OBJ) $(SM_OBJ) $(RUST_URL_LIB)
-$(OBJ_DIR)/js-compute-runtime.wasm: $(OBJ_DIR)/xqd-world/xqd_world.o
-$(OBJ_DIR)/js-compute-runtime.wasm: $(OBJ_DIR)/xqd-world/xqd_world_adapter.o
+$(OBJ_DIR)/js-compute-runtime.wasm: $(OBJ_DIR)/c-at-e-world/c_at_e_world.o
+$(OBJ_DIR)/js-compute-runtime.wasm: $(OBJ_DIR)/c-at-e-world/c_at_e_world_adapter.o
 	$(call cmd_format,WASI_LD,$@) PATH="$(FSM_SRC)/scripts:$$PATH" \
 	$(WASI_CXX) $(LD_FLAGS) $(OPENSSL_LIBS) -o $@ $^
 	$(call cmd_format,WASM_STRIP,$@) $(call WASM_STRIP,$@)
 
 $(OBJ_DIR)/js-compute-runtime-component.wasm: $(FSM_OBJ) $(SM_OBJ) $(RUST_URL_LIB)
-$(OBJ_DIR)/js-compute-runtime-component.wasm: $(OBJ_DIR)/xqd-world/xqd_world.o
-$(OBJ_DIR)/js-compute-runtime-component.wasm: $(OBJ_DIR)/xqd-world/xqd_world_adapter_component.o
+$(OBJ_DIR)/js-compute-runtime-component.wasm: $(OBJ_DIR)/c-at-e-world/c_at_e_world.o
+$(OBJ_DIR)/js-compute-runtime-component.wasm: $(OBJ_DIR)/c-at-e-world/c_at_e_world_adapter_component.o
 	$(call cmd_format,WASI_LD,$@) PATH="$(FSM_SRC)/scripts:$$PATH" \
 	$(WASI_CXX) $(LD_FLAGS) $(OPENSSL_LIBS) -o $@ $^
 	$(call cmd_format,WASM_STRIP,$@) $(call WASM_STRIP,$@)

c-dependencies/js-compute-runtime/builtins/backend.cpp

@@ -712,12 +712,12 @@ bool Backend::isCipherSuiteSupportedByFastly(std::string_view cipherSpec) {
 JS::Result<mozilla::Ok> Backend::register_dynamic_backend(JSContext *cx, JS::HandleObject backend) {
   MOZ_ASSERT(is_instance(backend));
 
-  xqd_world_string_t name_str;
+  c_at_e_world_string_t name_str;
   JS::RootedString name(cx, JS::GetReservedSlot(backend, Backend::Slots::Name).toString());
   JS::UniqueChars nameChars = encode(cx, name, &name_str.len);
   name_str.ptr = nameChars.get();
 
-  xqd_world_string_t target_str;
+  c_at_e_world_string_t target_str;
   JS::RootedString target(cx, JS::GetReservedSlot(backend, Backend::Slots::Target).toString());
   JS::UniqueChars targetChars = encode(cx, target, &target_str.len);
   target_str.ptr = targetChars.get();
@@ -813,8 +813,8 @@ JS::Result<mozilla::Ok> Backend::register_dynamic_backend(JSContext *cx, JS::Han
   }
 
   fastly_error_t err;
-  if (!xqd_fastly_http_req_register_dynamic_backend(&name_str, &target_str, &backend_config,
-                                                    &err)) {
+  if (!c_at_e_fastly_http_req_register_dynamic_backend(&name_str, &target_str, &backend_config,
+                                                       &err)) {
     HANDLE_ERROR(cx, err);
     return JS::Result<mozilla::Ok>(JS::Error());
   }

c-dependencies/js-compute-runtime/builtins/cache-override.h

@@ -13,7 +13,7 @@ class CacheOverride : public BuiltinImpl<CacheOverride> {
   static const int ctor_length = 1;
 
   // The values stored in these slots are ultimately passed to the host
-  // via the xqd_req_cache_override_v2_set hostcall.
+  // via the c_at_e_req_cache_override_v2_set hostcall.
   //
   // If `Mode` is not `Override`, all other values are ignored.
   //

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

@@ -1,6 +1,6 @@
 #include "builtins/client-info.h"
+#include "c-at-e-world/c_at_e_world_adapter.h"
 #include "core/geo_ip.h"
-#include "xqd-world/xqd_world_adapter.h"
 
 #include "js/JSON.h"
 #include <arpa/inet.h>
@@ -24,7 +24,7 @@ static JSString *retrieve_address(JSContext *cx, JS::HandleObject self) {
 
   fastly_list_u8_t octets;
   fastly_error_t err;
-  if (!xqd_fastly_http_req_downstream_client_ip_addr(&octets, &err)) {
+  if (!c_at_e_fastly_http_req_downstream_client_ip_addr(&octets, &err)) {
     HANDLE_ERROR(cx, err);
     return nullptr;
   }

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

@@ -11,7 +11,7 @@ fastly_dictionary_handle_t ConfigStore::config_store_handle(JSObject *obj) {
 bool ConfigStore::get(JSContext *cx, unsigned argc, JS::Value *vp) {
   METHOD_HEADER(1)
 
-  xqd_world_string_t key_str;
+  c_at_e_world_string_t key_str;
   JS::UniqueChars key = encode(cx, args[0], &key_str.len);
   // If the converted string has a length of 0 then we throw an Error
   // because Dictionary keys have to be at-least 1 character.
@@ -30,7 +30,7 @@ bool ConfigStore::get(JSContext *cx, unsigned argc, JS::Value *vp) {
   fastly_option_string_t ret;
   fastly_error_t err;
   // Ensure that we throw an exception for all unexpected host errors.
-  if (!xqd_fastly_dictionary_get(ConfigStore::config_store_handle(self), &key_str, &ret, &err)) {
+  if (!c_at_e_fastly_dictionary_get(ConfigStore::config_store_handle(self), &key_str, &ret, &err)) {
     HANDLE_ERROR(cx, err);
     return false;
   }
@@ -58,7 +58,7 @@ bool ConfigStore::constructor(JSContext *cx, unsigned argc, JS::Value *vp) {
   REQUEST_HANDLER_ONLY("The ConfigStore builtin");
   CTOR_HEADER("ConfigStore", 1);
 
-  xqd_world_string_t name_str;
+  c_at_e_world_string_t name_str;
   JS::UniqueChars name_chars = encode(cx, args[0], &name_str.len);
   name_str.ptr = name_chars.get();
 
@@ -99,7 +99,7 @@ bool ConfigStore::constructor(JSContext *cx, unsigned argc, JS::Value *vp) {
   JS::RootedObject config_store(cx, JS_NewObjectForConstructor(cx, &class_, args));
   fastly_dictionary_handle_t dict_handle = INVALID_HANDLE;
   fastly_error_t err;
-  if (!xqd_fastly_dictionary_open(&name_str, &dict_handle, &err)) {
+  if (!c_at_e_fastly_dictionary_open(&name_str, &dict_handle, &err)) {
     if (err == FASTLY_ERROR_BAD_HANDLE) {
       JS_ReportErrorNumberASCII(cx, GetErrorMessage, nullptr, JSMSG_CONFIG_STORE_DOES_NOT_EXIST,
                                 name.data());

c-dependencies/js-compute-runtime/builtins/crypto.cpp

@@ -6,7 +6,7 @@
 #pragma clang diagnostic pop
 
 #include "crypto.h"
-#include "host_interface/xqd.h"
+#include "host_interface/c-at-e.h"
 #include "subtle-crypto.h"
 
 bool is_int_typed_array(JSObject *obj) {