fastly · cfallin · May 12, 2023 · May 26, 2023 · Jun 2, 2023 · Jun 2, 2023
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -119,8 +119,11 @@ jobs:
       with:
         name: engine-${{ matrix.profile }}
         path: |
-          js-compute-runtime.wasm
+          js-compute-runtime-component-normal.wasm
+          js-compute-runtime-component-weval.wasm
           js-compute-runtime-component.wasm
+          js-compute-runtime-normal.wasm
+          js-compute-runtime-weval.wasm
 
   ensure_cargo_installs:
     name: Ensure that all required "cargo install" commands are run, or we have a cache hit
@@ -152,7 +155,14 @@ jobs:
       matrix:
         include:
           - profile: debug
+            weval: false
+          - profile: debug
+            weval: true
+          - profile: release
+            weval: false
+          - profile: release
           - profile: release
+            weval: true
     needs: [build, ensure_cargo_installs]
     runs-on: ubuntu-latest
     steps:
@@ -193,7 +203,7 @@ jobs:
 
     - name: Build WPT runtime
       run: |
-        bash ./tests/wpt-harness/build-wpt-runtime.sh
+        WEVAL=${{matrix.weval}} bash ./tests/wpt-harness/build-wpt-runtime.sh
 
     - name: Prepare WPT hosts
       run: |

diff --git a/.gitignore b/.gitignore
@@ -11,8 +11,8 @@ node_modules/
 # *.d
 /rusturl/
 # compiler_flags
-/js-compute-runtime.wasm
-/js-compute-runtime-component.wasm
+/js-compute-runtime-*.wasm
+/js-compute-runtime-component-*.wasm
 /runtime/js-compute-runtime/obj
 tests/wpt-harness/wpt-test-runner.js
 /fastly.wit

diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md
@@ -18,7 +18,7 @@ to pull down or update submodules.
 
 To build from source, you need to ensure that the headers and object files for the [SpiderMonkey JavaScript engine](https://spidermonkey.dev/) are available. It's recommended to download pre-built object files:
 ```sh
-(cd runtime/spidermonkey && bash download-engine.sh)
+(cd runtime/spidermonkey && bash download-engine.sh release normal)
 ```
 
 

diff --git a/integration-tests/js-compute/fixtures/backend/fastly.toml.in b/integration-tests/js-compute/fixtures/backend/fastly.toml.in
@@ -9,7 +9,7 @@ name = "compute-sdk-test-backend"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
 

diff --git a/integration-tests/js-compute/fixtures/btoa/fastly.toml.in b/integration-tests/js-compute/fixtures/btoa/fastly.toml.in
@@ -9,5 +9,5 @@ name = "btoa"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
diff --git a/integration-tests/js-compute/fixtures/byob/fastly.toml.in b/integration-tests/js-compute/fixtures/byob/fastly.toml.in
@@ -9,4 +9,4 @@ name = "byob"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/byte-repeater/fastly.toml.in b/integration-tests/js-compute/fixtures/byte-repeater/fastly.toml.in
@@ -9,7 +9,7 @@ name = "byte-repeater"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
 

diff --git a/integration-tests/js-compute/fixtures/cache-override/fastly.toml.in b/integration-tests/js-compute/fixtures/cache-override/fastly.toml.in
@@ -9,7 +9,7 @@ name = "cache-override"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
   [local_server.backends]

diff --git a/integration-tests/js-compute/fixtures/config-store/fastly.toml.in b/integration-tests/js-compute/fixtures/config-store/fastly.toml.in
@@ -9,7 +9,7 @@ name = "config-store"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
   [local_server.dictionaries]

diff --git a/integration-tests/js-compute/fixtures/console/fastly.toml.in b/integration-tests/js-compute/fixtures/console/fastly.toml.in
@@ -9,4 +9,4 @@ name = "console"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/crypto/fastly.toml.in b/integration-tests/js-compute/fixtures/crypto/fastly.toml.in
@@ -9,4 +9,4 @@ name = "crypto"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/dynamic-backend/fastly.toml.in b/integration-tests/js-compute/fixtures/dynamic-backend/fastly.toml.in
@@ -9,4 +9,4 @@ name = "dynamic-backend"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/edge-dictionary/fastly.toml.in b/integration-tests/js-compute/fixtures/edge-dictionary/fastly.toml.in
@@ -9,7 +9,7 @@ name = "edge-dictionary"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
   [local_server.dictionaries]

diff --git a/integration-tests/js-compute/fixtures/env/fastly.toml.in b/integration-tests/js-compute/fixtures/env/fastly.toml.in
@@ -9,4 +9,4 @@ name = "env"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/error/fastly.toml.in b/integration-tests/js-compute/fixtures/error/fastly.toml.in
@@ -9,5 +9,5 @@ name = "error"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
diff --git a/integration-tests/js-compute/fixtures/extend-from-builtins/fastly.toml.in b/integration-tests/js-compute/fixtures/extend-from-builtins/fastly.toml.in
@@ -9,7 +9,7 @@ name = "extend-from-builtins"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 
 [local_server]

diff --git a/integration-tests/js-compute/fixtures/extend-from-request/fastly.toml.in b/integration-tests/js-compute/fixtures/extend-from-request/fastly.toml.in
@@ -9,4 +9,4 @@ name = "extend-from-request"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/fanout/fastly.toml.in b/integration-tests/js-compute/fixtures/fanout/fastly.toml.in
@@ -9,4 +9,4 @@ name = "fanout"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/geoip/fastly.toml.in b/integration-tests/js-compute/fixtures/geoip/fastly.toml.in
@@ -9,7 +9,7 @@ name = "geoip"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
   [local_server.geolocation]

diff --git a/integration-tests/js-compute/fixtures/hello-world/fastly.toml.in b/integration-tests/js-compute/fixtures/hello-world/fastly.toml.in
@@ -9,4 +9,4 @@ name = "hello-world"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/includeBytes/fastly.toml.in b/integration-tests/js-compute/fixtures/includeBytes/fastly.toml.in
@@ -9,4 +9,4 @@ name = "includeBytes"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/kv-store/fastly.toml.in b/integration-tests/js-compute/fixtures/kv-store/fastly.toml.in
@@ -9,7 +9,7 @@ name = "kv-store"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
   # TODO: update this to the kv api when it is ready

diff --git a/integration-tests/js-compute/fixtures/log/fastly.toml.in b/integration-tests/js-compute/fixtures/log/fastly.toml.in
@@ -9,7 +9,7 @@ name = "log"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
 

diff --git a/integration-tests/js-compute/fixtures/missing-backend/fastly.toml.in b/integration-tests/js-compute/fixtures/missing-backend/fastly.toml.in
@@ -9,7 +9,7 @@ name = "missing-backend"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
 

diff --git a/integration-tests/js-compute/fixtures/multiple-set-cookie/fastly.toml.in b/integration-tests/js-compute/fixtures/multiple-set-cookie/fastly.toml.in
@@ -9,7 +9,7 @@ name = "multiple-set-cookie"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
   [local_server.backends]

diff --git a/integration-tests/js-compute/fixtures/random/fastly.toml.in b/integration-tests/js-compute/fixtures/random/fastly.toml.in
@@ -9,4 +9,4 @@ name = "random"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/react-byob/fastly.toml.in b/integration-tests/js-compute/fixtures/react-byob/fastly.toml.in
@@ -9,4 +9,4 @@ name = "react-byob"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/regex/fastly.toml.in b/integration-tests/js-compute/fixtures/regex/fastly.toml.in
@@ -9,4 +9,4 @@ name = "includeBytes"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/request-cache-key/fastly.toml.in b/integration-tests/js-compute/fixtures/request-cache-key/fastly.toml.in
@@ -9,4 +9,4 @@ name = "request-cache-key"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/request-clone/fastly.toml.in b/integration-tests/js-compute/fixtures/request-clone/fastly.toml.in
@@ -9,4 +9,4 @@ name = "request-clone"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/request-downstream/fastly.toml.in b/integration-tests/js-compute/fixtures/request-downstream/fastly.toml.in
@@ -9,4 +9,4 @@ name = "request-downstream"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/request-headers/fastly.toml.in b/integration-tests/js-compute/fixtures/request-headers/fastly.toml.in
@@ -9,7 +9,7 @@ name = "request-headers"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
   [local_server.backends]

diff --git a/integration-tests/js-compute/fixtures/request-limits/fastly.toml.in b/integration-tests/js-compute/fixtures/request-limits/fastly.toml.in
@@ -9,7 +9,7 @@ name = "request-limits"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
 

diff --git a/integration-tests/js-compute/fixtures/request-upstream/fastly.toml.in b/integration-tests/js-compute/fixtures/request-upstream/fastly.toml.in
@@ -9,7 +9,7 @@ name = "request-upstream"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
 

diff --git a/integration-tests/js-compute/fixtures/response-headers/fastly.toml.in b/integration-tests/js-compute/fixtures/response-headers/fastly.toml.in
@@ -9,4 +9,4 @@ name = "response-headers"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/response-json/fastly.toml.in b/integration-tests/js-compute/fixtures/response-json/fastly.toml.in
@@ -9,4 +9,4 @@ name = "response-json"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/response-redirect/fastly.toml.in b/integration-tests/js-compute/fixtures/response-redirect/fastly.toml.in
@@ -9,4 +9,4 @@ name = "response-redirect"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/response/fastly.toml.in b/integration-tests/js-compute/fixtures/response/fastly.toml.in
@@ -9,4 +9,4 @@ name = "response"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/secret-store/fastly.toml.in b/integration-tests/js-compute/fixtures/secret-store/fastly.toml.in
@@ -9,7 +9,7 @@ name = "secret-store"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
   [local_server.secret_stores]

diff --git a/integration-tests/js-compute/fixtures/status/fastly.toml.in b/integration-tests/js-compute/fixtures/status/fastly.toml.in
@@ -9,4 +9,4 @@ name = "status"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/streaming-close/fastly.toml.in b/integration-tests/js-compute/fixtures/streaming-close/fastly.toml.in
@@ -9,7 +9,7 @@ name = "streaming-close"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
 

diff --git a/integration-tests/js-compute/fixtures/streaming-error/fastly.toml.in b/integration-tests/js-compute/fixtures/streaming-error/fastly.toml.in
@@ -9,4 +9,4 @@ name = "streaming-error"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/tee/fastly.toml.in b/integration-tests/js-compute/fixtures/tee/fastly.toml.in
@@ -9,7 +9,7 @@ name = "tee"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
 
 [local_server]
 

diff --git a/integration-tests/js-compute/fixtures/timers/fastly.toml.in b/integration-tests/js-compute/fixtures/timers/fastly.toml.in
@@ -9,4 +9,4 @@ name = "timers"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/integration-tests/js-compute/fixtures/urlsearchparams/fastly.toml.in b/integration-tests/js-compute/fixtures/urlsearchparams/fastly.toml.in
@@ -9,4 +9,4 @@ name = "urlsearchparams"
 service_id = ""
 
 [scripts]
-  build = "node ../../../../js-compute-runtime-cli.js"
+  build = "node ../../../../js-compute-runtime-cli.js --enable-weval"
diff --git a/js-compute-runtime-cli.js b/js-compute-runtime-cli.js
@@ -7,6 +7,7 @@ import { addSdkMetadataField } from "./src/addSdkMetadataField.js";
 
 const {
   enableExperimentalHighResolutionTimeMethods,
+  enableWeval,
   wasmEngine,
   input,
   component,
@@ -27,7 +28,7 @@ if (version) {
   // it could be that the user is using an older version of js-compute-runtime
   // and a newer version does not support the platform they are using.
   const {compileApplicationToWasm} = await import('./src/compileApplicationToWasm.js')
-  await compileApplicationToWasm(input, output, wasmEngine, enableExperimentalHighResolutionTimeMethods);
+  await compileApplicationToWasm(input, output, wasmEngine, enableExperimentalHighResolutionTimeMethods, enableWeval);
   if (component) {
     const {compileComponent} = await import('./src/component.js');
     await compileComponent(output);

diff --git a/package.json b/package.json
@@ -31,8 +31,8 @@
     "test": "npm run test:types && npm run test:cli",
     "test:cli": "brittle --bail integration-tests/cli/**.test.js",
     "test:types": "tsd",
-    "build": "make -j8 -C runtime/js-compute-runtime && cp runtime/js-compute-runtime/*.wasm runtime/js-compute-runtime/fastly.wit .",
-    "build:debug": "DEBUG=true make -j8 -C runtime/js-compute-runtime && cp runtime/js-compute-runtime/*.wasm runtime/js-compute-runtime/fastly.wit .",
+    "build": "make -j8 -C runtime/js-compute-runtime && make -j8 -C runtime/js-compute-runtime VARIANT=-weval && cp runtime/js-compute-runtime/*.wasm runtime/js-compute-runtime/fastly.wit .",
+    "build:debug": "DEBUG=true make -j8 -C runtime/js-compute-runtime && make -j8 -C runtime/js-compute-runtime VARIANT=-weval && cp runtime/js-compute-runtime/*.wasm runtime/js-compute-runtime/fastly.wit .",
     "check-changelog": "cae-release-notes-format-checker CHANGELOG.md"
   },
   "devDependencies": {
@@ -47,6 +47,7 @@
   "dependencies": {
     "@bytecodealliance/jco": "^0.7.0",
     "@bytecodealliance/wizer": "^3.0.1",
+    "@cfallin/weval": "^0.1.3",
     "acorn": "^8.8.2",
     "acorn-walk": "^8.2.0",
     "esbuild": "^0.17.18",