@downdraft/cli 0.4.2 → 0.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@downdraft/cli",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/knackstedt/downdraft.git",
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@aws-sdk/client-s3": "^3.700.0",
-    "@downdraft/engine": "^0.4.2",
+    "@downdraft/engine": "^0.4.3",
     "eta": "^3.5.0",
     "jimp": "^1.6.1",
     "resedit": "3.1.0"

package/scripts/native-lib-fetch.mjs

@@ -10,7 +10,7 @@
 // ============================================================================
 
 import { execFileSync } from "node:child_process";
-import { cpSync, existsSync, mkdirSync, mkdtempSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import { cpSync, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { dirname, join } from "node:path";
 
@@ -31,7 +31,14 @@ export async function resolvePlatLibDir(platKey, candidates, cacheRoot, version)
 
   const pkgName = `@downdraft/native-${platKey}`;
   const cacheDir = join(cacheRoot, "downdraft-native", platKey, "lib");
-  if (existsSync(cacheDir) && readdirSync(cacheDir).length > 0) return cacheDir;
+  const marker = join(cacheRoot, "downdraft-native", platKey, ".version");
+  // Cache hit is only valid if it holds the lockstep version — a versionless
+  // cache would silently ship stale cdylibs after an engine bump. No marker
+  // (pre-versioning cache) → refetch.
+  if (existsSync(cacheDir) && readdirSync(cacheDir).length > 0) {
+    const cached = existsSync(marker) ? readFileSync(marker, "utf8").trim() : null;
+    if (!version || cached === version) return cacheDir;
+  }
 
   try {
     const meta = await (await fetch(
@@ -51,6 +58,7 @@ export async function resolvePlatLibDir(platKey, candidates, cacheRoot, version)
       mkdirSync(dirname(cacheDir), { recursive: true });
       // cpSync not renameSync: TMPDIR may be a different filesystem.
       cpSync(libDir, cacheDir, { recursive: true });
+      writeFileSync(marker, ver);
       console.log(`[package] fetched ${pkgName}@${ver} from npm → ${cacheDir}`);
       return cacheDir;
     } finally {

package/scripts/package-desktop.mjs

@@ -184,6 +184,14 @@ const META_DIR_RE = new RegExp(IMPORT_META.source + String.raw`\.(?:dir|dirname)
 const META_URL_RE = new RegExp(IMPORT_META.source + String.raw`\.url\b`, "g");
 const REQUIRE_GLOB_RE = /require\(\s*["'`]@downdraft\/engine\/platform\/glob-polyfill["'`]\s*\)/g;
 const GLOB_CALLEE_RE = new RegExp(IMPORT_META.source + String.raw`\.glob`);
+// globAssets(pattern, import.meta, opts?) — the meta OBJECT escapes the
+// META_DIR_RE/META_URL_RE token rewrites (its .dir/.url are read inside
+// the engine helper). For emit runtimes the real import.meta points into
+// the bundle tree, not dd-assets; for bun-compiled binaries it flattens
+// to /$bunfs/root — either way every asset glob misses. The meta argument
+// is swapped for a synthetic object bound to the module's staged dir.
+const GLOB_ASSETS_META_RE = new RegExp(
+  `\\bglobAssets\\(\\s*(["'\`][^"'\`]*["'\`])\\s*,\\s*${IMPORT_META.source}(\\s*,)?`, "g");
 const SCRIPT_EXT_RE = /\.(ts|tsx|js|jsx|mts|cts|cjs)$/i; // .mjs staged as an asset (execArgv loaders)
 const DYN_IMPORT_RE = /import\(\s*([a-zA-Z_$][\w$]*)\s*\)/g;
 
@@ -433,6 +441,12 @@ const makeEmitPlugin = (collectWorkers) => ({
         needsGlob = true;
         out = out.replace(REQUIRE_GLOB_RE, "({ createGlob: __ddCreateGlob })");
       }
+      // 3c. globAssets(pattern, import.meta, ...) — bind the meta object to
+      // the staged dir so caller-relative globs resolve under dd-assets.
+      out = out.replace(GLOB_ASSETS_META_RE, (m, p1, comma) => {
+        needsGlob = true;
+        return `globAssets(${p1}, { dir: __ddModDir, url: __ddModUrl, glob: __ddGlob }${comma ?? ""}`;
+      });
       // 4. import.meta.dir/.url/__dirname → module's staged dir under
       //    dd-assets (real FS).
       const metaOut = out
@@ -660,6 +674,8 @@ if (runtime === "bun") {
     `SELF="$(readlink -f "$0" 2>/dev/null || realpath "$0" 2>/dev/null || echo "$0")"\n` +
     `DIR="$(dirname "$SELF")"\n` +
     `export DD_APP_ID="${appId}"\n` +
+    `export DOWNDRAFT_PACKAGED=1\n` +
+    `export DOWNDRAFT_BUNDLE_DIR="$DIR"\n` +
     (iconPath ? `export DD_APP_ICON="$DIR/icon.png"\n` : "") +
     `exec "$DIR/${runtime}" ${rtArgs} "$DIR/bundle/index.js" "$@"\n`);
   chmodSync(join(appdir, exeName), 0o755);
@@ -713,9 +729,13 @@ if (runtime !== "bun") {
 }
 
 // build.files — electron-builder-style extra files into the appdir root.
+// `dir/**/*` entries resolve to the dir itself (matched files keep their
+// repo-relative structure under <appdir>/dir/).
 for (const f of (Array.isArray(build.files) ? build.files : []).values()) {
-  const src = resolve(gameDir, typeof f === "string" ? f : f.from);
-  const dest = join(appdir, typeof f === "string" ? basename(f) : (f.to ?? basename(f.from)));
+  const from = typeof f === "string" ? f : f.from;
+  const rel = from.replace(/\/\*\*?\/\*?$/, "").replace(/\/+$/, "");
+  const src = resolve(gameDir, rel);
+  const dest = join(appdir, typeof f === "string" ? rel : (f.to ?? rel));
   if (!existsSync(src)) { console.warn(`[package-desktop] files entry missing: ${src}`); continue; }
   cpSync(src, dest, { recursive: true });
 }

package/scripts/package-mobile.mjs

@@ -163,6 +163,13 @@ const META_DIR_RE = new RegExp(IMPORT_META.source + String.raw`\.(?:dir|dirname)
 const META_URL_RE = new RegExp(IMPORT_META.source + String.raw`\.url\b`, "g");
 const REQUIRE_GLOB_RE = /require\(\s*["'`]@downdraft\/engine\/platform\/glob-polyfill["'`]\s*\)/g;
 const GLOB_CALLEE_RE = new RegExp(IMPORT_META.source + String.raw`\.glob`);
+// globAssets(pattern, import.meta, opts?) — the meta OBJECT escapes the
+// META_DIR_RE/META_URL_RE token rewrites (its .dir/.url are read inside
+// the engine helper); the real import.meta points into the bundle tree,
+// not dd-assets, so every asset glob would miss. The meta argument is
+// swapped for a synthetic object bound to the module's staged dir.
+const GLOB_ASSETS_META_RE = new RegExp(
+  `\\bglobAssets\\(\\s*(["'\`][^"'\`]*["'\`])\\s*,\\s*${IMPORT_META.source}(\\s*,)?`, "g");
 const SCRIPT_EXT_RE = /\.(ts|tsx|js|jsx|mts|cts|cjs)$/i; // .mjs staged as an asset (execArgv loaders)
 const DYN_IMPORT_RE = /import\(\s*([a-zA-Z_$][\w$]*)\s*\)/g;
 
@@ -410,6 +417,12 @@ const makePlugin = (collectWorkers) => ({
         needsGlob = true;
         out = out.replace(REQUIRE_GLOB_RE, "({ createGlob: __ddCreateGlob })");
       }
+      // 3c. globAssets(pattern, import.meta, ...) — bind the meta object to
+      // the staged dir so caller-relative globs resolve under dd-assets.
+      out = out.replace(GLOB_ASSETS_META_RE, (m, p1, comma) => {
+        needsGlob = true;
+        return `globAssets(${p1}, { dir: __ddModDir, url: __ddModUrl, glob: __ddGlob }${comma ?? ""}`;
+      });
       // 4. import.meta.dir/.url/__dirname → module's staged dir under
       //    dd-assets (real FS after extraction).
       const metaOut = out

package/scripts/package-native.mjs

@@ -107,6 +107,13 @@ let outfile = outfileArg;
 if (target.exe && !outfile.endsWith(".exe")) outfile += ".exe";
 
 const repoRoot = process.cwd();
+// Bun embeds compile-mode modules keyed relative to the common ancestor of
+// all ENTRYPOINT paths — which is NOT necessarily cwd (a game inside games/
+// whose deps resolve under its own dir gets game-dir keys even when this
+// script runs from the monorepo root). Baked $bunfs specifiers must be
+// relative to that same root or workers/dynamic imports miss the embedded FS.
+// Set after the worker-discovery fixpoint, before the compile pass.
+let embedRoot = repoRoot;
 const engineConds = engineConditions(argv, resolve(entry));
 const QUERY_RE = /\?(raw|url|json)$/;
 const WORKER_RE = /new\s+Worker\(\s*new\s+URL\(\s*["'`]([^"'`]+)["'`]\s*,\s*import\.meta\.url\s*\)/g;
@@ -130,6 +137,14 @@ const META_URL_RE = new RegExp(IMPORT_META.source + String.raw`\.url\b`, "g");
 // injected __ddCreateGlob binding.
 const REQUIRE_GLOB_RE = /require\(\s*["'`]@downdraft\/engine\/platform\/glob-polyfill["'`]\s*\)/g;
 const GLOB_CALLEE_RE = new RegExp(IMPORT_META.source + String.raw`\.glob`);
+// globAssets(pattern, import.meta, opts?) — the meta OBJECT escapes the
+// META_DIR_RE/META_URL_RE token rewrites (its .dir/.url are read inside
+// the engine helper), and in compiled binaries import.meta.dir flattens
+// to /$bunfs/root for every module — the helper would glob a nonexistent
+// root and return {} for every asset query. The meta argument is swapped
+// for a synthetic object bound to the module's staged dir.
+const GLOB_ASSETS_META_RE = new RegExp(
+  `\\bglobAssets\\(\\s*(["'\`][^"'\`]*["'\`])\\s*,\\s*${IMPORT_META.source}(\\s*,)?`, "g");
 const SCRIPT_EXT_RE = /\.(ts|tsx|js|jsx|mts|mjs|cts|cjs)$/i;
 const DYN_IMPORT_RE = /import\(\s*([a-zA-Z_$][\w$]*)\s*\)/g;
 
@@ -146,7 +161,7 @@ function resolveSpec(spec, importer) {
 
 /** repo-rel path of a module file as embedded in the binary (.js suffix). */
 function bunfsPath(absPath) {
-  const rel = relative(repoRoot, absPath).replace(/\\/g, "/").replace(/\.[jt]sx?$/, ".js");
+  const rel = relative(embedRoot, absPath).replace(/\\/g, "/").replace(/\.[jt]sx?$/, ".js");
   // Emitted inside a quoted literal for dynamic import() — Windows needs the
   // B:\~BUN drive path (with escaped separators); /$bunfs doesn't resolve.
   return isWin
@@ -338,7 +353,7 @@ const makePlugin = (collectWorkers) => ({
       let out = src;
       // 1. Worker URLs first — before import.meta.url is rewritten.
       out = out.replace(WORKER_RE, (m, spec) => {
-        const rel = relative(repoRoot, resolve(modDir, spec))
+        const rel = relative(embedRoot, resolve(modDir, spec))
           .replace(/\\/g, "/").replace(/\.[jt]sx?$/, ".js");
         // Lands inside new URL(...) — Windows wants a file: URL into the
         // B:\~BUN embedded root; the /$bunfs POSIX form misses it.
@@ -368,6 +383,12 @@ const makePlugin = (collectWorkers) => ({
         needsGlob = true;
         out = out.replace(REQUIRE_GLOB_RE, "({ createGlob: __ddCreateGlob })");
       }
+      // 3c. globAssets(pattern, import.meta, ...) — bind the meta object to
+      // the staged dir so caller-relative globs resolve under dd-assets.
+      out = out.replace(GLOB_ASSETS_META_RE, (m, p1, comma) => {
+        needsGlob = true;
+        return `globAssets(${p1}, { dir: __ddModDir, url: __ddModUrl, glob: __ddGlob }${comma ?? ""}`;
+      });
       // 4. import.meta.dir / .url / bare __dirname → the module's location
       // inside the staged dd-assets tree (real FS — sibling asset reads,
       // glob enumeration, and wasm/binary loads all resolve there).
@@ -428,6 +449,17 @@ while (workerEntries.size !== prevCount) {
 }
 
 const entrypoints = [resolve(entry), ...workerEntries];
+// Bun's embedded-FS root is the common ancestor of the input paths —
+// reproduce it so baked module paths land under the same keys.
+embedRoot = entrypoints
+  .map((p) => dirname(p))
+  .reduce((lca, dir) => {
+    if (!lca) return dir;
+    const a = lca.split("/"), b = dir.split("/");
+    let i = 0;
+    while (i < a.length && a[i] === b[i]) i++;
+    return a.slice(0, i).join("/") || "/";
+  }, null);
 if (workerEntries.size) {
   console.log(`workers: ${[...workerEntries].map((p) => p.split("/").pop()).join(", ")}`);
 }

package/src/release.ts

@@ -256,7 +256,12 @@ function packageNative(
         // appimage, flatpak). Formats come from --format → build.linux.target
         // → "dir".
         const format = opts.format
-          ?? (Array.isArray(info.build.linux?.target) ? info.build.linux.target.join(",") : info.build.linux?.target)
+          ?? (Array.isArray(info.build.linux?.target)
+            ? info.build.linux.target
+                .map((t: unknown) => (typeof t === "string" ? t : (t as { target?: string }).target ?? ""))
+                .filter(Boolean)
+                .join(",")
+            : info.build.linux?.target)
           ?? "dir";
         const argv = [
           scriptDesktop,