romdevtools 0.71.1 → 0.84.0

package/src/toolchains/dasm/dasm.js

@@ -3,32 +3,26 @@
 // Runs in an isolated child worker for crash isolation.
 
 import { fileURLToPath } from "node:url";
-import { existsSync } from "node:fs";
 import path from "node:path";
 
 import { runIsolated, textFile, getOutputBytes, getOutputText } from "../_worker/run.js";
+import { resolveGlueFile } from "../common/wasm-tool.js";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-// dasm's WASM ships in romdev-platform-atari2600 (the only platform that
-// uses it). Resolve from that package; fall back to a local copy under src/
-// if present (transition / dev). The package is a hard dep of romdev.
-function resolveDasmGlue() {
-  try {
-    const u = import.meta.resolve("romdev-platform-atari2600");
-    const p = path.join(path.dirname(fileURLToPath(u)), "wasm", "dasm.js");
-    if (existsSync(p)) return p;
-  } catch { /* package not resolvable — fall through to local */ }
-  const local = path.join(__dirname, "wasm", "dasm.js");
-  if (existsSync(local)) return local;
-  throw new Error("dasm WASM not found — install romdev-platform-atari2600");
-}
-// Lazy + memoized: resolve (and possibly throw "not installed") only on the
-// FIRST dasm build, not at module load — so booting the server never touches
-// this package unless an Atari 2600 ROM is actually built.
+// dasm's WASM ships in romdev-platform-atari2600 (the only platform that uses
+// it); a local src/ copy is the dev fallback. Lazy + memoized: resolve only on
+// the FIRST dasm build, not at boot — so booting the server never touches this
+// package unless an Atari 2600 ROM is actually built.
 let _gluePath;
-const gluePath = () => (_gluePath ??= resolveDasmGlue());
+const gluePath = () =>
+  (_gluePath ??= resolveGlueFile({
+    pkg: "romdev-platform-atari2600",
+    file: "dasm.js",
+    localDir: __dirname,
+    label: "dasm",
+  }));
 
 /**
  * Run dasm on a source program in-memory.