Clean up error handling a little

peggyjs · Jul 7, 2024 · 21a9485 · 21a9485
1 parent a6539dd
commit 21a9485
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/bin/peggy-cli.js b/bin/peggy-cli.js
@@ -269,11 +269,15 @@ class PeggyCLI extends Command {
               if (typeof mod.use !== "function") {
                 mod = mod.default;
               }
+              if (typeof mod.use !== "function") {
+                this.error(`Invalid plugin "${id}", no \`use()\` function`);
+              }
             } catch (e) {
-              if (e.code !== "MODULE_NOT_FOUND") {
-                this.error(`requiring:\n${e.stack}`);
+              if ((e.code === "ERR_MODULE_NOT_FOUND")
+                  || (e.code === "MODULE_NOT_FOUND")) {
+                this.error(`importing: ${e.message}`);
               } else {
-                this.error(`requiring "${id}": ${e.message}`);
+                this.error(`importing "${id}":\n${e.stack}`);
               }
             }
             return mod;

diff --git a/test/cli/run.spec.ts b/test/cli/run.spec.ts
@@ -814,6 +814,7 @@ Options:
     const plugin2Mjs = path.join(fixtures, "plugin2.mjs");
     const pluginCjs = path.join(fixtures, "plugin.cjs");
     const bad = path.join(fixtures, "bad.js");
+    const optFileJS = path.join(fixtures, "options.js");
 
     await exec({
       args: [
@@ -889,7 +890,15 @@ Options:
       stdin: "foo = '1'",
       errorCode: "peggy.invalidArgument",
       exitCode: 1,
-      error: 'requiring "ERROR BAD MODULE DOES NOT EXIST"',
+      error: "Error importing: Cannot find module",
+    });
+
+    await exec({
+      args: ["--plugin", optFileJS],
+      stdin: "foo = '1'",
+      errorCode: "peggy.invalidArgument",
+      exitCode: 1,
+      error: "no `use()` function",
     });
 
     await exec({