fixup error

Author: Guy Bedford

src/componentize.js

@@ -46,11 +46,23 @@ export async function componentize(jsSource, witWorld, opts) {
     worldName,
     disableFeatures = [],
     enableFeatures = [],
-    aotCache = fileURLToPath(new URL(`../lib/starlingmonkey_ics.wevalcache`, import.meta.url))
+    aotCache = fileURLToPath(
+      new URL(`../lib/starlingmonkey_ics.wevalcache`, import.meta.url)
+    ),
   } = opts;
 
-  const engine = opts.engine || fileURLToPath(
-    new URL(opts.enableAot ? `../lib/starlingmonkey_embedding_weval.wasm` : `../lib/starlingmonkey_embedding${DEBUG_BUILD ? '.debug' : ''}.wasm`, import.meta.url));
+  const engine =
+    opts.engine ||
+    fileURLToPath(
+      new URL(
+        opts.enableAot
+          ? `../lib/starlingmonkey_embedding_weval.wasm`
+          : `../lib/starlingmonkey_embedding${
+              DEBUG_BUILD ? '.debug' : ''
+            }.wasm`,
+        import.meta.url
+      )
+    );
 
   await lexerInit;
   let jsImports = [];
@@ -132,11 +144,22 @@ export async function componentize(jsSource, witWorld, opts) {
   // rewrite the JS source import specifiers to reference import wrappers
   let source = '',
     curIdx = 0;
+  const importSpecifiers = new Set([...imports.map(([impt]) => impt)]);
   for (const jsImpt of jsImports) {
     if (jsImpt.t !== 1 && jsImpt.t !== 2) continue;
     if (!jsImpt.n) continue;
-    if (!imports.some(([impt]) => jsImpt.n === impt)) {
-      throw new Error(`Import '${jsImpt.n}' is not defined by the WIT world. Make sure to use a bundler for JS dependencies such as esbuild or RollupJS. Future ComponentizeJS versions may include Node.js builtins and bundling.`);
+    if (!importSpecifiers.has(jsImpt.n)) {
+      throw new Error(
+        `Import '${
+          jsImpt.n
+        }' is not defined by the WIT world. Available imports are: ${[
+          ...importSpecifiers,
+        ]
+          .map((impt) => `'${impt}'`)
+          .join(
+            ', '
+          )}.\nMake sure to use a bundler for JS dependencies such as esbuild or RollupJS.`
+      );
     }
     const specifier = jsSource.slice(jsImpt.s, jsImpt.e);
     source += jsSource.slice(curIdx, jsImpt.s);
@@ -169,10 +192,8 @@ export async function componentize(jsSource, witWorld, opts) {
   let hostenv = {};
 
   if (opts.env) {
-    hostenv = (typeof opts.env === 'object')
-      ? opts.env
-      : process.env;
-  };
+    hostenv = typeof opts.env === 'object' ? opts.env : process.env;
+  }
 
   const env = {
     ...hostenv,
@@ -221,7 +242,7 @@ export async function componentize(jsSource, witWorld, opts) {
           '--init-func',
           'componentize.wizer',
           `-i ${input}`,
-          `-o ${output}`
+          `-o ${output}`,
         ],
         {
           stdio: [null, stdout, stderr],

test/cases/bad-binding/test.js

@@ -1,5 +1,5 @@
 import { strictEqual } from 'node:assert';
 
 export function err (error) {
-  strictEqual(error.message, "Import 'not:world-defined' is not defined by the WIT world. Make sure to use a bundler for JS dependencies such as esbuild or RollupJS. Future ComponentizeJS versions may include Node.js builtins and bundling.");
+  strictEqual(error.message, "Import 'not:world-defined' is not defined by the WIT world. Available imports are: 'local:char/chars'.\nMake sure to use a bundler for JS dependencies such as esbuild or RollupJS.");
 }