@downdraft/cli 0.1.2-alpha.5 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@downdraft/cli",
-  "version": "0.1.2-alpha.5",
+  "version": "0.3.0",
   "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.1.2-alpha.5",
+    "@downdraft/engine": "^0.3.0",
     "eta": "^3.5.0",
     "jimp": "^1.6.1",
     "resedit": "3.1.0"

package/scripts/engine-source.mjs

@@ -0,0 +1,45 @@
+// engine-source.mjs — decides whether bundling resolves @downdraft/* via
+// the "downdraft-source" export condition (TypeScript src/) or the default
+// condition (pre-built dist/).
+//
+// Published packages ship dist/ so standalone consumers bundle fast-built
+// ESM. In the engine monorepo (or any install where dist/ hasn't been
+// generated) the default target doesn't exist — without this the packager
+// fails with "Could not resolve: @downdraft/...". Mirrors `draft dev`'s
+// rule: monorepo defaults to source, everything else defaults to dist,
+// --engine-source / --engine-dist override.
+import { existsSync } from "node:fs";
+import { createRequire } from "node:module";
+import { dirname, join, resolve, sep } from "node:path";
+import { fileURLToPath } from "node:url";
+
+export const SOURCE_CONDITION = "downdraft-source";
+
+const monorepoRoot = resolve(dirname(fileURLToPath(import.meta.url)), "../../..");
+
+function enginePkgRoot(fromFile) {
+  try {
+    const req = createRequire(resolve(fromFile));
+    return dirname(req.resolve("@downdraft/engine/package.json"));
+  } catch {
+    return null;
+  }
+}
+
+/**
+ * @param {string[]} argv raw flag list (process.argv.slice(2))
+ * @param {string} fromFile file to anchor @downdraft/engine resolution at
+ *   (typically the game entry — covers workspace links and standalone repos)
+ * @returns {string[] | undefined} Bun.build `conditions` override
+ */
+export function engineConditions(argv, fromFile) {
+  if (argv.includes("--engine-dist")) return undefined;
+  if (argv.includes("--engine-source")) return [SOURCE_CONDITION];
+  const pkg = enginePkgRoot(fromFile);
+  // Workspace-linked engine → always source (a stale dist/ would silently
+  // package old code). Standalone consumer → dist when it exists.
+  if (!pkg || pkg.startsWith(monorepoRoot + sep) || !existsSync(join(pkg, "dist"))) {
+    return [SOURCE_CONDITION];
+  }
+  return undefined;
+}

package/scripts/package-desktop.mjs

@@ -69,6 +69,7 @@ import {
 import { tmpdir } from "node:os";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { engineConditions } from "./engine-source.mjs";
 import { resolvePlatLibDir } from "./native-lib-fetch.mjs";
 
 // ── Args ──
@@ -101,7 +102,7 @@ if (!["bun", "node", "deno"].includes(runtime)) {
 const formats = (flagValue("format") ?? (Array.isArray(linuxCfg.target) ? linuxCfg.target.join(",") : linuxCfg.target) ?? "dir")
   .split(",").map((s) => s.trim().toLowerCase()).filter(Boolean);
 const KNOWN_FORMATS = new Set(["dir", "deb", "appimage", "flatpak"]);
-for (const f of formats) {
+for (const f of formats.values()) {
   if (!KNOWN_FORMATS.has(f)) {
     console.error(`unknown --format "${f}" — expected dir, deb, appimage, or flatpak`);
     process.exit(1);
@@ -209,7 +210,7 @@ function assetRel(absPath) {
 function walkDir(dir, results = []) {
   let entries;
   try { entries = readdirSync(dir); } catch { return results; }
-  for (const e of entries) {
+  for (const e of entries.values()) {
     const full = `${dir}/${e}`;
     let st;
     try { st = statSync(full); } catch { continue; }
@@ -462,6 +463,7 @@ const makeEmitPlugin = (collectWorkers) => ({
 
 // ── Scan pass: discover Worker entrypoints to a fixpoint ──
 
+const engineConds = engineConditions(argv, resolve(entry));
 const scanOutdir = mkdtempSync(join(tmpdir(), "dd-scan-"));
 let prevCount = -1;
 while (workerEntries.size !== prevCount) {
@@ -469,6 +471,7 @@ while (workerEntries.size !== prevCount) {
   const scan = await Bun.build({
     entrypoints: [resolve(entry), ...workerEntries],
     target: "node",
+    conditions: engineConds,
     plugins: [makeEmitPlugin(true)],
     splitting: false,
     sourcemap: "none",
@@ -546,7 +549,7 @@ async function stageEngineLibs(nativeDir) {
         join(engineRoot, pkgRel, "dist", file),
       ] : []),
     ];
-    for (const p of candidates) {
+    for (const p of candidates.values()) {
       if (existsSync(p)) { copyFileSync(p, join(nativeDir, file)); break; }
     }
   }
@@ -592,6 +595,7 @@ if (runtime === "bun") {
     entrypoints,
     target: "node",
     root: repoRoot,
+    conditions: engineConds,
     naming: { entry: "[dir]/[name].mjs" },
     plugins: [makeEmitPlugin(false)],
     splitting: false,
@@ -669,7 +673,7 @@ stageGameNative(nativeDir);
   let grew = true;
   while (grew) {
     grew = false;
-    for (const f of [...assetFiles]) {
+    for (const f of [...assetFiles].values()) {
       if (!/\.(mjs|cjs|js)$/.test(f)) continue;
       let src;
       try { src = readFileSync(f, "utf-8"); } catch { continue; }
@@ -700,7 +704,7 @@ if (runtime !== "bun") {
 }
 
 // build.files — electron-builder-style extra files into the appdir root.
-for (const f of Array.isArray(build.files) ? build.files : []) {
+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)));
   if (!existsSync(src)) { console.warn(`[package-desktop] files entry missing: ${src}`); continue; }
@@ -742,7 +746,7 @@ async function iconSet(destDir) {
     const { Jimp } = await import("jimp");
     img = await Jimp.read(iconPath);
   } catch { /* unreadable — verbatim fallback below */ }
-  for (const s of sizes) {
+  for (const s of sizes.values()) {
     const dir = join(destDir, `${s}x${s}`, "apps");
     mkdirSync(dir, { recursive: true });
     const dest = join(dir, `${exeName}.png`);
@@ -934,4 +938,4 @@ async function fetchKoffiPrebuild(pkgName, ver) {
 }
 
 console.log(`[package-desktop] done (${runtime}):`);
-for (const a of artifacts) console.log(`  ${a}`);
+for (const a of artifacts.values()) console.log(`  ${a}`);

package/scripts/package-mobile.mjs

@@ -39,6 +39,7 @@ import {
 import { tmpdir } from "node:os";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { engineConditions } from "./engine-source.mjs";
 
 // ── args ──
 
@@ -77,11 +78,12 @@ if (!entry || !outfileArg) {
 const ABIS = { "arm64-v8a": "aarch64-linux-android", "x86_64": "x86_64-linux-android" };
 const KOFFI_PKGS = { "arm64-v8a": "@koromix/koffi-android-arm64", "x86_64": "@koromix/koffi-android-x64" };
 const abis = abiArg === "all" ? Object.keys(ABIS) : abiArg.split(",").map((s) => s.trim());
-for (const a of abis) {
+for (const a of abis.values()) {
   if (!ABIS[a]) throw new Error(`unknown --abi "${a}" — expected: ${Object.keys(ABIS).join(", ")}, all`);
 }
 
 const repoRoot = process.cwd();
+const engineConds = engineConditions(argv, resolve(entry));
 const scriptDir = dirname(fileURLToPath(import.meta.url));
 const monorepoRoot = resolve(scriptDir, "../../..");
 const gameDir = dirname(dirname(resolve(entry)));
@@ -117,7 +119,7 @@ const btVer = readdirSync(btRoot).sort().pop();
 const bt = join(btRoot, btVer);
 const platformDir = readdirSync(join(sdkRoot, "platforms")).sort().pop();
 const androidJar = join(sdkRoot, "platforms", platformDir, "android.jar");
-for (const tool of ["aapt2", "zipalign", "apksigner"]) {
+for (const tool of ["aapt2", "zipalign", "apksigner"].values()) {
   if (!existsSync(join(bt, tool))) throw new Error(`missing build-tool ${tool} in ${bt}`);
 }
 const adb = join(sdkRoot, "platform-tools", "adb");
@@ -185,7 +187,7 @@ function assetRel(absPath) {
 function walkDir(dir, results = []) {
   let entries;
   try { entries = readdirSync(dir); } catch { return results; }
-  for (const e of entries) {
+  for (const e of entries.values()) {
     const full = `${dir}/${e}`;
     let st;
     try { st = statSync(full); } catch { continue; }
@@ -443,6 +445,7 @@ while (workerEntries.size !== prevCount) {
   const scan = await Bun.build({
     entrypoints: [resolve(entry), ...workerEntries],
     target: "node",
+    conditions: engineConds,
     plugins: [makePlugin(true)],
     splitting: false,
     sourcemap: "none",
@@ -466,6 +469,7 @@ const build = await Bun.build({
   // No `compile` — libnode executes the extracted ESM files.
   target: "node",
   root: repoRoot,
+  conditions: engineConds,
   naming: { entry: "[dir]/[name].mjs" },
   plugins: [makePlugin(false)],
   splitting: false,
@@ -500,7 +504,7 @@ if (!koffiRoot) {
   const nm = join(bundleDir, "node_modules");
   cpSync(koffiRoot, join(nm, "koffi"), { recursive: true });
   const koffiVer = JSON.parse(readFileSync(join(koffiRoot, "package.json"), "utf-8")).version;
-  for (const abi of abis) {
+  for (const abi of abis.values()) {
     const pkgName = KOFFI_PKGS[abi];
     // The @koromix prebuild pkgs carry no importable entry — probe the dir
     // beside koffi (same layout koffi's loader expects), else fetch npm.
@@ -544,7 +548,7 @@ async function fetchKoffiPrebuild(pkgName, ver) {
   let grew = true;
   while (grew) {
     grew = false;
-    for (const f of [...assetFiles]) {
+    for (const f of [...assetFiles].values()) {
       if (!/\.(mjs|cjs|js)$/.test(f)) continue;
       let src;
       try { src = readFileSync(f, "utf-8"); } catch { continue; }
@@ -573,7 +577,7 @@ for (const f of assetFiles.values()) {
 // dd-env.txt — optional process env for the JS thread (debug probes like
 // DD_BENCH_TEST; Android has no launch-env channel).
 if (envPairs.length) {
-  for (const p of envPairs) {
+  for (const p of envPairs.values()) {
     if (!/^[A-Za-z_][A-Za-z0-9_]*=/.test(p)) {
       throw new Error(`--env "${p}" must be KEY=VALUE (KEY: [A-Za-z_][A-Za-z0-9_]*)`);
     }
@@ -591,7 +595,7 @@ if (envPairs.length) {
 // (.so siblings are handled per-ABI in the native-libs section below.)
 {
   let staged = 0;
-  for (const abi of abis) {
+  for (const abi of abis.values()) {
     const platDir = join(gameDir, "native", "dist",
       `android-${abi.startsWith("arm64") ? "arm64" : "x64"}`);
     if (!existsSync(platDir)) continue;
@@ -661,7 +665,7 @@ const bundleText = walkDir(bundleDir)
   .map((f) => readFileSync(f, "utf-8"))
   .join("\n");
 
-for (const abi of abis) {
+for (const abi of abis.values()) {
   const triple = ABIS[abi];
   const libDir = join(nativeStage, abi);
   mkdirSync(libDir, { recursive: true });
@@ -717,7 +721,7 @@ for (const abi of abis) {
   // --libs= forces). JS resolves them by soname via the app lib dir.
   const crates = await import(fileURLToPath(new URL("../../../scripts/native-crates.mjs", import.meta.url)));
   const nodePlat = `android-${abi.startsWith("arm64") ? "arm64" : "x64"}`;
-  for (const crate of crates.CRATES) {
+  for (const crate of crates.CRATES.values()) {
     if (crate.androidOnly || crate.noAndroid) continue;
     const name = crate.lib.replace(/^downdraft_/, "");
     if (excludeLibs.includes(name) || excludeLibs.includes(crate.lib)) continue;

package/scripts/package-native.mjs

@@ -46,6 +46,7 @@ import { createRequire } from "node:module";
 import { tmpdir } from "node:os";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { fileURLToPath } from "node:url";
+import { engineConditions } from "./engine-source.mjs";
 import { resolvePlatLibDir } from "./native-lib-fetch.mjs";
 
 // CRATES is shared with the repo's scripts/native-crates.mjs when this file
@@ -101,6 +102,7 @@ let outfile = outfileArg;
 if (target.exe && !outfile.endsWith(".exe")) outfile += ".exe";
 
 const repoRoot = process.cwd();
+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;
 const ASSET_URL_RE = /new\s+URL\(\s*["'`]([^"'`]+)["'`]\s*,\s*import\.meta\.url\s*\)/g;
@@ -398,6 +400,7 @@ while (workerEntries.size !== prevCount) {
   const scan = await Bun.build({
     entrypoints: [resolve(entry), ...workerEntries],
     target: "bun",
+    conditions: engineConds,
     plugins: [makePlugin(true)],
     splitting: false,
     sourcemap: "none",
@@ -420,6 +423,7 @@ const result = await Bun.build({
   entrypoints,
   compile: { outfile: resolve(outfile), ...(target.bun ? { target: target.bun } : {}) },
   target: "bun",
+  conditions: engineConds,
   plugins: [makePlugin(false)],
   splitting: false,
   sourcemap: "none",

package/src/release.ts

@@ -235,7 +235,7 @@ function packageNative(
   const requested = opts.runtime ?? info.build.runtime
     ?? (readGameConfig(gameDir).runtime as string | undefined) ?? "bun";
   const runtimes = requested === "all" ? RUNTIMES : [requested];
-  for (const r of runtimes) {
+  for (const r of runtimes.values()) {
     if (!RUNTIMES.includes(r)) {
       log.error("release:package", `Unknown runtime "${r}" — expected bun, node, deno, or all.`);
       return false;
@@ -250,7 +250,7 @@ function packageNative(
 
   let ok = true;
   targets.forEach((target) => {
-    for (const runtime of runtimes) {
+    for (const runtime of runtimes.values()) {
       if (target === "linux") {
         // Linux: package-desktop.mjs owns the format matrix (dir, deb,
         // appimage, flatpak). Formats come from --format → build.linux.target