update starlingmonkey dependency

Signed-off-by: Karthik Ganeshram <karthik.ganeshram@fermyon.com>

Author: karthik2804

.github/workflows/main.yml

@@ -87,7 +87,6 @@ jobs:
         build-type:
           - 'release'
           - 'debug'
-          - 'weval'
     steps:
       - uses: actions/checkout@v4
         with:
@@ -159,7 +158,6 @@ jobs:
         build-type:
           - 'release'
           - 'debug'
-          - 'weval'
     steps:
       - uses: actions/checkout@v4
 

.gitignore

@@ -10,7 +10,6 @@ examples/hello-world/guest/package-lock.json
 examples/hello-world/guest/hello.component.wasm
 /build-debug
 /build-release
-/build-release-weval
 .vscode
 /package-lock.json
 .idea

CMakeLists.txt

@@ -26,14 +26,10 @@ set(EMBEDDING_DEP "starling-raw.wasm")
 # Define output filenames based on build configuration
 set(OUTPUT_NAME_RELEASE "starlingmonkey_embedding.wasm")
 set(OUTPUT_NAME_DEBUG "starlingmonkey_embedding.debug.wasm")
-set(OUTPUT_NAME_WEVAL "starlingmonkey_embedding_weval.wasm")
 
 # Set the appropriate name based on current configuration
 if(CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
     set(OUTPUT_FILENAME ${OUTPUT_NAME_DEBUG})
-elseif(WEVAL)
-    set(OUTPUT_FILENAME ${OUTPUT_NAME_WEVAL})
-    set(EMBEDDING_DEP "starling-ics.wevalcache")
 else()
     set(OUTPUT_FILENAME ${OUTPUT_NAME_RELEASE})
 endif()

Makefile

@@ -15,7 +15,6 @@ STARLINGMONKEY_DEPS = $(STARLINGMONKEY_SRC)/cmake/* embedding/* $(STARLINGMONKEY
 all: release
 debug: lib/starlingmonkey_embedding.debug.wasm lib/spidermonkey-embedding-splicer.js
 release: lib/starlingmonkey_embedding.wasm lib/spidermonkey-embedding-splicer.js
-release-weval: lib/starlingmonkey_ics.wevalcache lib/spidermonkey-embedding-splicer.js
 
 lib/spidermonkey-embedding-splicer.js: target/wasm32-wasip1/release/splicer_component.wasm crates/spidermonkey-embedding-splicer/wit/spidermonkey-embedding-splicer.wit | obj lib
 	@$(JCO) new target/wasm32-wasip1/release/splicer_component.wasm -o obj/spidermonkey-embedding-splicer.wasm --wasi-reactor
@@ -28,12 +27,6 @@ lib/starlingmonkey_embedding.wasm: $(STARLINGMONKEY_DEPS) | lib
 	cmake -B build-release -DCMAKE_BUILD_TYPE=Release
 	make -j16 -C build-release starlingmonkey_embedding
 
-lib/starlingmonkey_embedding_weval.wasm: $(STARLINGMONKEY_DEPS) | lib
-	cmake -B build-release-weval -DCMAKE_BUILD_TYPE=Release -DUSE_WASM_OPT=OFF -DWEVAL=ON
-	make -j16 -C build-release-weval starlingmonkey_embedding
-
-lib/starlingmonkey_ics.wevalcache: lib/starlingmonkey_embedding_weval.wasm
-	@cp build-release-weval/starling-raw.wasm/starling-ics.wevalcache $@
 
 lib/starlingmonkey_embedding.debug.wasm: $(STARLINGMONKEY_DEPS) | lib
 	cmake -B build-debug -DCMAKE_BUILD_TYPE=RelWithDebInfo

README.md

@@ -49,9 +49,6 @@ As more components are written in JavaScript, and there exist scenarios where mu
 
 Establishing this initial prototype as a singular flexible engine foundation that can be turned into a shared library is therefore the focus for this project.
 
-### Weval AOT Compilation
-
-
 ## Platform APIs
 
 The following APIs are available:
@@ -106,23 +103,7 @@ See [types.d.ts](types.d.ts) for the full interface options.
 
 The component itself can be executed in any component runtime, see the [example](EXAMPLE.md) for an end to end workflow in Wasmtime.
 
-### AOT Compilation
-
-To enable AOT compilation, set the `enableAot: true` option to run [Weval][weval] ahead-of-time compilation.
-
-AOT compilation can also be configured with the following options:
-
-| Option                 | Type                                | Example         | Description                                                              |
-|------------------------|-------------------------------------|-----------------|--------------------------------------------------------------------------|
-| `aotMinStackSizeBytes` | `nubmer | Number | bigint | BigInt` | `2_007_846_092` | The minimum stack size (via `RUST_MIN_STACK` to set when running `weval` |
-
-[weval]: https://github.com/bytecodealliance/weval
-
-### Custom `weval` binary for AOT
-
-To use a custom (pre-downloaded) [`weval`][weval] binary, set the `wevalBin` option to the path to your desired weval binary.
-
-### Custom `wizer` binary when AOT is disabled
+### Custom `wizer` binary
 
 To use a custom (pre-downloaded) [`wizer`](https://github.com/bytecodealliance/wizer) binary, set the `wizerBin` option to the path to your desired wizer binary.
 
@@ -229,18 +210,6 @@ export function componentize(opts: {
    * Path to custom ComponentizeJS engine build to use
    */
   engine?: string;
-  /**
-   * Path to custom weval cache to use
-   */
-  aotCache?: string;
-  /**
-   * Enable AoT using weval
-   */
-  enableAot?: boolean;
-  /**
-   * Use a pre-existing path to the `weval` binary, if present
-   */
-  wevalBin?: string;
   /**
    * Use a pre-existing path to the `wizer` binary, if present
    */
@@ -266,7 +235,7 @@ export function componentize(opts: {
    */
   enableFeatures?: [];
   /**
-   * Pass environment variables to the spawned Wizer or Weval Process
+   * Pass environment variables to the spawned Wizer Process
    * If set to true, all host environment variables are passed
    * To pass only a subset, provide an object with the desired variables
    */
@@ -347,12 +316,6 @@ npm run build
 
 Before being able to use `componetize-js` (ex. via `npm link`, from `jco`), you'll need to run:
 
-```
-npm run build:weval
-```
-
-This will produce a few files, most importantly `lib/starlingmonkey_embedding_weval.wasm`.
-
 To clean up a local installation (i.e. remove the installation of StarlingMonkey):
 
 ```console

StarlingMonkey

@@ -3,14 +3,10 @@ import { resolve } from 'node:path';
 
 import { componentize } from '@bytecodealliance/componentize-js';
 
-// AoT compilation makes use of weval (https://github.com/bytecodealliance/weval)
-const enableAot = process.env.ENABLE_AOT == '1';
-
 const jsSource = await readFile('hello.js', 'utf8');
 
 const { component } = await componentize(jsSource, {
   witPath: resolve('hello.wit'),
-  enableAot
 });
 
 await writeFile('hello.component.wasm', component);

examples/hello-world/guest/componentize.js

@@ -22,7 +22,6 @@
   },
   "dependencies": {
     "@bytecodealliance/jco": "^1.9.1",
-    "@bytecodealliance/weval": "^0.3.4",
     "@bytecodealliance/wizer": "^7.0.5",
     "es-module-lexer": "^1.6.0",
     "oxc-parser": "^0.76.0"
@@ -31,13 +30,11 @@
   "scripts": {
     "clean": "npm run clean:starlingmonkey",
     "clean:starlingmonkey": "rm -rf build-release",
-    "build": "npm run build:release && npm run build:debug && npm run build:weval",
+    "build": "npm run build:release && npm run build:debug",
     "build:release": "make release",
-    "build:weval": "make release-weval",
     "build:debug": "make debug",
     "test": "vitest run -c test/vitest.ts",
     "test:release": "vitest run -c test/vitest.ts",
-    "test:weval": "cross-env WEVAL_TEST=1 vitest run -c test/vitest.ts",
     "test:debug": "cross-env DEBUG_TEST=1 vitest run -c test/vitest.ts",
     "prepack": "node scripts/prepack.mjs"
   },
@@ -46,12 +43,10 @@
     "lib/spidermonkey-*",
     "lib/starlingmonkey_embedding.wasm",
     "lib/starlingmonkey_embedding.debug.wasm",
-    "lib/starlingmonkey_embedding_weval.wasm",
-    "lib/starlingmonkey_ics.wevalcache",
     "src",
     "types.d.ts"
   ],
   "workspaces": [
     "."
   ]
-}
+}

package.json

@@ -11,7 +11,6 @@ export async function componentizeCmd(jsSource, opts) {
     witPath: resolve(opts.wit),
     worldName: opts.worldName,
     runtimeArgs: opts.runtimeArgs,
-    enableAot: opts.aot,
     disableFeatures: opts.disable,
     preview2Adapter: opts.preview2Adapter,
     debugBindings: opts.debugBindings,
@@ -29,7 +28,6 @@ program
   .requiredOption('-w, --wit <path>', 'WIT path to build with')
   .option('-n, --world-name <name>', 'WIT world to build')
   .option('--runtime-args <string>', 'arguments to pass to the runtime')
-  .option('--aot', 'enable AOT compilation')
   .addOption(
     new Option('-d, --disable <feature...>', 'disable WASI features').choices(
       DEFAULT_FEATURES,

src/cli.js

@@ -12,7 +12,6 @@ import { createHash } from 'node:crypto';
 
 import oxc from 'oxc-parser';
 import wizer from '@bytecodealliance/wizer';
-import getWeval from '@bytecodealliance/weval';
 import {
   componentNew,
   metadataAdd,
@@ -44,11 +43,6 @@ const CHECK_INIT_RETURN_FN_LIST = 1;
 /** Response code from check_init() that denotes being unable to parse core ABI export types */
 const CHECK_INIT_RETURN_TYPE_PARSE = 2;
 
-/** Default path to the AOT weval cache */
-const DEFAULT_AOT_CACHE = fileURLToPath(
-  new URL(`../lib/starlingmonkey_ics.wevalcache`, import.meta.url),
-);
-
 /** Default settings for debug options */
 const DEFAULT_DEBUG_SETTINGS = {
   bindings: false,
@@ -110,7 +104,6 @@ export async function componentize(
 
     runtimeArgs,
 
-    aotCache = DEFAULT_AOT_CACHE,
   } = opts;
 
   debugBindings = debugBindings || debug?.bindings;
@@ -247,100 +240,48 @@ export async function componentize(
   sourcePath = maybeWindowsPath(sourcePath);
   let workspacePrefix = dirname(sourcePath);
 
-  // If the source path is within the current working directory, strip the
-  // cwd as a prefix from the source path, and remap the paths seen by the
-  // component to be relative to the current working directory.
-  // This only works in wizer, not in weval, because the latter doesn't
-  // support --mapdir.
-  if (!opts.enableAot) {
-    if (!useOriginalSourceFile) {
-      workspacePrefix = sourcesDir;
-      sourcePath = sourceName;
-    }
-    let currentDir = maybeWindowsPath(cwd());
-    if (workspacePrefix.startsWith(currentDir)) {
-      workspacePrefix = currentDir;
-      sourcePath = sourcePath.slice(workspacePrefix.length + 1);
-    }
+
+  if (!useOriginalSourceFile) {
+    workspacePrefix = sourcesDir;
+    sourcePath = sourceName;
+  }
+  let currentDir = maybeWindowsPath(cwd());
+  if (workspacePrefix.startsWith(currentDir)) {
+    workspacePrefix = currentDir;
+    sourcePath = sourcePath.slice(workspacePrefix.length + 1);
   }
 
   let args = `--initializer-script-path ${initializerPath} --strip-path-prefix ${workspacePrefix}/ ${sourcePath}`;
   runtimeArgs = runtimeArgs ? `${runtimeArgs} ${args}` : args;
 
   let preopens = [`--dir ${sourcesDir}`];
-  if (opts.enableAot) {
-    preopens.push(`--dir ${workspacePrefix}`);
-  } else {
-    preopens.push(`--mapdir /::${workspacePrefix}`);
-  }
+  preopens.push(`--mapdir /::${workspacePrefix}`);
 
   let postProcess;
-  if (opts.enableAot) {
-    // Determine the weval bin path, possibly using a pre-downloaded version
-    let wevalBin;
-    if (opts.wevalBin && existsSync(opts.wevalBin)) {
-      wevalBin = opts.wevalBin;
-    } else {
-      wevalBin = await getWeval();
-    }
-
-    // Set the min stack size, if one was provided
-    if (opts.aotMinStackSizeBytes) {
-      if (!isNumeric(opts.aotMinStackSizeBytes)) {
-        throw new TypeError(
-          `aotMinStackSizeBytes must be a numeric value, received [${opts.aotMinStackSizeBytes}] (type ${typeof opts.aotMinStackSizeBytes})`,
-        );
-      }
-      env.RUST_MIN_STACK = opts.aotMinStackSizeBytes;
-    } else {
-      env.RUST_MIN_STACK = defaultMinStackSize();
-    }
 
-    postProcess = spawnSync(
-      wevalBin,
-      [
-        'weval',
-        `--cache-ro ${aotCache}`,
-        ...preopens,
-        '-w',
-        '--init-func',
-        'componentize.wizer',
-        `-i ${inputWasmPath}`,
-        `-o ${outputWasmPath}`,
-      ],
-      {
-        stdio: [null, stdout, 'pipe'],
-        env,
-        input: runtimeArgs,
-        shell: true,
-        encoding: 'utf-8',
-      },
-    );
-  } else {
-    const wizerBin = opts.wizerBin ?? wizer;
-    postProcess = spawnSync(
-      wizerBin,
-      [
-        '--allow-wasi',
-        '--init-func',
-        'componentize.wizer',
-        ...preopens,
-        `--wasm-bulk-memory=true`,
-        '--inherit-env=true',
-        `-o=${outputWasmPath}`,
-        inputWasmPath,
-      ],
-      {
-        stdio: [null, stdout, 'pipe'],
-        env,
-        input: runtimeArgs,
-        shell: true,
-        encoding: 'utf-8',
-      },
-    );
-  }
+  const wizerBin = opts.wizerBin ?? wizer;
+  postProcess = spawnSync(
+    wizerBin,
+    [
+      '--allow-wasi',
+      '--init-func',
+      'componentize.wizer',
+      ...preopens,
+      `--wasm-bulk-memory=true`,
+      '--inherit-env=true',
+      `-o=${outputWasmPath}`,
+      inputWasmPath,
+    ],
+    {
+      stdio: [null, stdout, 'pipe'],
+      env,
+      input: runtimeArgs,
+      shell: true,
+      encoding: 'utf-8',
+    },
+  );
 
-  // If the wizer (or weval) process failed, parse the output and display to the user
+  // If the wizer process failed, parse the output and display to the user
   if (postProcess.status !== 0) {
     let wizerErr = parseWizerStderr(postProcess.stderr);
     let err = `Failed to initialize component:\n${wizerErr}`;
@@ -451,7 +392,7 @@ function stripLinesPrefixes(input, prefixPatterns) {
 }
 
 /**
- * Parse output of post-processing step (whether Wizer or Weval)
+ * Parse output of post-processing Wizer step
  *
  * @param {Stream} stderr
  * @returns {string} String that can be printed to describe error output
@@ -493,9 +434,7 @@ function getEnginePath(opts) {
   }
   const debugSuffix = opts?.debugBuild ? '.debug' : '';
   let engineBinaryRelPath = `../lib/starlingmonkey_embedding${debugSuffix}.wasm`;
-  if (opts.enableAot) {
-    engineBinaryRelPath = '../lib/starlingmonkey_embedding_weval.wasm';
-  }
+
   return fileURLToPath(new URL(engineBinaryRelPath, import.meta.url));
 }