Fix JS tests, discover bug

5 files changed, 14 insertions, 18 deletions

diff --git a/package.json b/package.json
deleted file mode 100644
index 0e087bf..0000000
--- a/package.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "type": "module",
-  "scripts": {
-    "test": "sh bin/test.sh"
-  }
-}
diff --git a/src/gleam_stdlib.mjs b/src/gleam_stdlib.mjs
index 5ec4d45..dd25832 100644
--- a/src/gleam_stdlib.mjs
+++ b/src/gleam_stdlib.mjs
@@ -8,13 +8,13 @@ import {
   inspect,
   stringBits,
   toBitString,
-} from "./gleam.js";
+} from "./gleam.mjs";
 import {
   CompileError as RegexCompileError,
   Match as RegexMatch,
-} from "./gleam/regex.js";
-import { DecodeError } from "./gleam/dynamic.js";
-import { Some, None } from "./gleam/option.js";
+} from "./gleam/regex.mjs";
+import { DecodeError } from "./gleam/dynamic.mjs";
+import { Some, None } from "./gleam/option.mjs";
 
 const HASHCODE_CACHE = new WeakMap();
 
diff --git a/test/gleam/should.gleam b/test/gleam/should.gleam
index 3cedbcd..792a4b4 100644
--- a/test/gleam/should.gleam
+++ b/test/gleam/should.gleam
@@ -22,7 +22,7 @@ if javascript {
   import gleam/string
 
   external fn stringify(anything) -> String =
-    "../gleam.js" "inspect"
+    "../gleam.mjs" "inspect"
 
   external fn crash(String) -> anything =
     "../gleam_stdlib.mjs" "crash"
diff --git a/test/gleam_stdlib_test.gleam b/test/gleam_stdlib_test.gleam
index 04635a2..3528ddd 100644
--- a/test/gleam_stdlib_test.gleam
+++ b/test/gleam_stdlib_test.gleam
@@ -2,3 +2,8 @@ if erlang {
   pub external fn main() -> Nil =
     "gleam_stdlib_test_ffi" "main"
 }
+
+if javascript {
+  pub external fn main() -> Nil =
+    "./gleam_stdlib_test_ffi.mjs" "main"
+}
diff --git a/bin/run-tests.js b/test/gleam_stdlib_test_ffi.mjs
index 3eaba7c..e948e0f 100755
--- a/bin/run-tests.js
+++ b/test/gleam_stdlib_test_ffi.mjs
@@ -1,17 +1,16 @@
 import { opendir } from "fs/promises";
 
-const dir = "gen/javascript/gleam/";
+const dir = "build/dev/javascript/gleam_stdlib/dist/gleam/";
 
-async function main() {
+export async function main() {
   console.log("Running tests...");
 
   let passes = 0;
   let failures = 0;
 
   for await (let entry of await opendir(dir)) {
-    if (!entry.name.endsWith("_test.js")) continue;
-    let path = "../" + dir + entry.name;
-    let module = await import(path);
+    if (!entry.name.endsWith("_test.mjs")) continue;
+    let module = await import("./gleam/" + entry.name);
 
     for (let fnName of Object.keys(module)) {
       if (!fnName.endsWith("_test")) continue;
@@ -34,5 +33,3 @@ ${passes} passes
 ${failures} failures`);
   process.exit(failures ? 1 : 0);
 }
-
-main();