@incajs/cli 0.0.18 → 0.0.19

package/dist/cli.js

@@ -5,9 +5,9 @@ import f, { existsSync as p, lstatSync as m, readFileSync as h, realpathSync as
 import y, { resolve as b } from "node:path";
 import * as ee from "node:util";
 import { parseArgs as x, styleText as S } from "node:util";
-import { chmod as C, cp as w, link as T, mkdir as E, readFile as D, readdir as te, rm as O, writeFile as k } from "node:fs/promises";
-import { fileURLToPath as ne, pathToFileURL as re } from "node:url";
-import { homedir as ie } from "node:os";
+import { chmod as C, cp as w, link as te, mkdir as T, readFile as E, readdir as ne, rm as D, writeFile as O } from "node:fs/promises";
+import { fileURLToPath as re, pathToFileURL as ie } from "node:url";
+import { homedir as k } from "node:os";
 import { createRequire as ae } from "node:module";
 import { spawn as oe } from "node:child_process";
 import { once as A } from "node:events";
@@ -365,7 +365,7 @@ function Re(e, t, n, r) {
 }
 //#endregion
 //#region package.json
-var ze = "0.0.18", Be = "Commands to develop, bundle, and package Incarnative.js apps.";
+var ze = "0.0.19", Be = "Commands to develop, bundle, and package Incarnative.js apps.";
 //#endregion
 //#region ../../node_modules/.pnpm/rc9@3.1.0/node_modules/rc9/dist/_chunks/libs/flat.mjs
 function Ve(e) {
@@ -510,7 +510,7 @@ function q(e) {
 	return e = nt(e), it(b(e.dir, e.name), e);
 }
 function at() {
-	return process.env.XDG_CONFIG_HOME || b(ie(), ".config");
+	return process.env.XDG_CONFIG_HOME || b(k(), ".config");
 }
 function ot(e) {
 	return e = nt(e), e.dir = at(), q(e);
@@ -703,7 +703,7 @@ async function xt(e) {
 				dir: r
 			})), t.push(ot({ name: e.rcFile })), t.push(q({
 				name: e.rcFile,
-				dir: ie()
+				dir: k()
 			}));
 		}
 		i.rc = n({}, ...t);
@@ -780,9 +780,9 @@ async function Tt(e, o, s = {}) {
 		let { downloadTemplate: n } = await import("./chunks/__vite-optional-peer-dep_giget_c12-BYcrHYBM.js").catch((t) => {
 			throw Error(`Extending config from \`${e}\` requires \`giget\` peer dependency to be installed.\n\nInstall it with: \`npx nypm i giget\``, { cause: t });
 		}), { digest: c } = await import("./chunks/ohash-Cc4pJh84.js").then((e) => e.dist_exports), l = e.replace(/\W+/g, "_").split("_").splice(0, 3).join("_") + "_" + c(e).slice(0, 10).replace(/[-_]/g, ""), u, d = t(o.cwd, "node_modules"), f = a(o.cwd);
-		u = r(f) === ".c12" ? i(f, l) : p(d) ? i(d, ".c12", l) : process.env.XDG_CACHE_HOME ? t(process.env.XDG_CACHE_HOME, "c12", l) : t(ie(), ".cache/c12", l);
+		u = r(f) === ".c12" ? i(f, l) : p(d) ? i(d, ".c12", l) : process.env.XDG_CACHE_HOME ? t(process.env.XDG_CACHE_HOME, "c12", l) : t(k(), ".cache/c12", l);
 		let m = s.install ? K(s.install === !0 ? {} : s.install, { ignoreWorkspace: !0 }) : !1;
-		p(u) && !m && await O(u, { recursive: !0 }), e = (await n(e, {
+		p(u) && !m && await D(u, { recursive: !0 }), e = (await n(e, {
 			dir: u,
 			install: m,
 			force: !!m,
@@ -804,12 +804,12 @@ async function Tt(e, o, s = {}) {
 	if (h.configFile = J(t(m, e), o) || J(t(m, ".config", e.replace(/\.config$/, "")), o) || J(t(m, ".config", e), o) || e, !p(h.configFile)) return h;
 	h._configFile = h.configFile;
 	let g = n(h.configFile) || "";
-	if (g in yt) h.config = (await yt[g]())(await D(h.configFile, "utf8"));
+	if (g in yt) h.config = (await yt[g]())(await E(h.configFile, "utf8"));
 	else {
 		let e = o.resolveModule || ((e) => e.default || e);
 		if (o.import) h.config = e(await o.import(h.configFile));
 		else {
-			let t = re(h.configFile);
+			let t = ie(h.configFile);
 			t.search = `_${++vt}`, h.config = await import(t.href).then(e, async (t) => {
 				let { createJiti: n } = await import("./chunks/__vite-optional-peer-dep_jiti_c12-DZVJNj6v.js").catch(() => {
 					throw Error(`Failed to load config file \`${h.configFile}\`: ${t?.message}.  Hint install \`jiti\` for compatibility.`, { cause: t });
@@ -842,7 +842,7 @@ async function Et(e, t) {
 function J(e, t) {
 	let n = s(e, {
 		try: !0,
-		from: re(i(t.cwd || ".", t.configFile || "/")),
+		from: ie(i(t.cwd || ".", t.configFile || "/")),
 		suffixes: ["", "/index"],
 		extensions: bt,
 		cache: !1
@@ -936,7 +936,7 @@ async function zt(e) {
 async function Bt(e) {
 	let t = y.join(e, "package.json"), n;
 	try {
-		n = await D(t, "utf8");
+		n = await E(t, "utf8");
 	} catch {
 		throw new Y("ERR_INCA_PACKAGE_JSON_NOT_FOUND", `no package.json found at ${t}`);
 	}
@@ -967,7 +967,7 @@ function Vt(e) {
 	};
 }
 async function Ht(e) {
-	let { config: t } = await Rt(e), n = y.join(e, "package.json"), r = await D(n, "utf8").catch(() => void 0), i = r === void 0 ? {} : Lt(r, n), a = t.productName ?? u(i.name);
+	let { config: t } = await Rt(e), n = y.join(e, "package.json"), r = await E(n, "utf8").catch(() => void 0), i = r === void 0 ? {} : Lt(r, n), a = t.productName ?? u(i.name);
 	a && jt(a);
 	let o = {
 		name: a,
@@ -1412,7 +1412,7 @@ function En(e) {
 	return y.join(e, "node_modules/.inca/hmr");
 }
 function Dn() {
-	let e = y.dirname(ne(import.meta.url));
+	let e = y.dirname(re(import.meta.url));
 	for (; !p(y.join(e, "package.json"));) {
 		let t = y.dirname(e);
 		if (t === e) throw Error("could not locate @incajs/cli's own package.json");
@@ -1434,7 +1434,7 @@ function An(e) {
 }
 async function jn(e, t, n, r) {
 	let i = En(e), a = y.join(i, "entry.js"), o = On(i, r ?? Dn()), s = t.split(y.sep).join("/");
-	return await k(a, wn`
+	return await O(a, wn`
       import { start } from ${JSON.stringify(o)};
       await start(${JSON.stringify(s)}, ${JSON.stringify(n)});
     `), a;
@@ -1452,7 +1452,8 @@ function Pn(e, t, n, r, i) {
 	let a = /* @__PURE__ */ new Map(), o = { send: s };
 	function s(a) {
 		if (a.type === "full-reload") {
-			t();
+			let e = i.current;
+			i.current = void 0, t(e);
 			return;
 		}
 		let o = Mn(a);
@@ -1507,9 +1508,9 @@ function In(e) {
 	};
 }
 async function Ln(e, t, { entry: n, cwd: r, runtimeConfig: i, runtimePath: a, stdout: o = process.stdout, stderr: s = process.stderr, quiet: c = !1, notify: l, reload: u, onError: d, onUpdate: f = () => {} }) {
-	await E(En(r), { recursive: !0 });
+	await T(En(r), { recursive: !0 });
 	let p = pn(i), m = y.join(En(r), fn);
-	p ? await k(m, p) : await O(m, { force: !0 });
+	p ? await O(m, p) : await D(m, { force: !0 });
 	let h = { current: void 0 }, { channel: g, dispatch: _ } = Pn(l, u, (t) => d(Tn(e, t)), f, h), v = await fe({
 		configFile: !1,
 		root: y.dirname(n),
@@ -1610,9 +1611,9 @@ async function Hn(e) {
 }
 async function Un(e, t) {
 	let n = y.join(t, "node_modules/.inca");
-	await E(n, { recursive: !0 });
+	await T(n, { recursive: !0 });
 	let r = y.join(n, "entry.mts"), i = JSON.stringify(e.split(y.sep).join("/"));
-	return await k(r, wn`
+	return await O(r, wn`
       import { createIncaApp } from "incajs/vue";
       import App from ${i};
       createIncaApp(App).mount();
@@ -1651,30 +1652,30 @@ function Jn(e) {
 }
 async function Yn(e) {
 	let t = Gn(e), n = `${String(process.pid)}:${qn}`, r = `${t}.${me()}`;
-	await E(y.dirname(t), { recursive: !0 }), await k(r, n);
+	await T(y.dirname(t), { recursive: !0 }), await O(r, n);
 	let i = process.pid;
 	try {
 		for (let e = 0; e < 5; e++) {
 			try {
-				return await T(r, t), Xn(t, n);
+				return await te(r, t), Xn(t, n);
 			} catch (e) {
 				if (e.code !== "EEXIST") throw e;
 			}
-			let e = await D(t, "utf8").catch(() => ""), a = Number.parseInt(e, 10);
+			let e = await E(t, "utf8").catch(() => ""), a = Number.parseInt(e, 10);
 			if (a === process.pid) {
 				if (e === n) throw Jn(a);
 			} else if (Number.isSafeInteger(a) && a > 0 && Kn(a)) throw Jn(a);
-			i = Number.isSafeInteger(a) && a > 0 ? a : i, await O(t, { force: !0 });
+			i = Number.isSafeInteger(a) && a > 0 ? a : i, await D(t, { force: !0 });
 		}
 		throw Jn(i);
 	} finally {
-		await O(r, { force: !0 });
+		await D(r, { force: !0 });
 	}
 }
 function Xn(e, t) {
 	let n = !1;
 	return async () => {
-		n || (n = !0, await D(e, "utf8").catch(() => "") === t && await O(e, { force: !0 }));
+		n || (n = !0, await E(e, "utf8").catch(() => "") === t && await D(e, { force: !0 }));
 	};
 }
 //#endregion
@@ -1700,14 +1701,14 @@ function $n(e) {
 //#region src/macosApp.mts
 async function er(e) {
 	let { appPath: t, metadata: n, hostBin: r } = e;
-	await O(t, {
+	await D(t, {
 		recursive: !0,
 		force: !0
 	});
 	let i = y.join(t, "Contents"), a = y.join(i, "MacOS"), o = y.join(i, "Resources");
-	await E(a, { recursive: !0 }), await E(o, { recursive: !0 });
+	await T(a, { recursive: !0 }), await T(o, { recursive: !0 });
 	let s = y.join(a, n.productName);
-	e.link ? await T(r, s).catch(() => w(r, s)) : await w(r, s), await C(s, 493);
+	e.link ? await te(r, s).catch(() => w(r, s)) : await w(r, s), await C(s, 493);
 	let c = {
 		CFBundleName: n.productName,
 		CFBundleDisplayName: n.productName,
@@ -1723,7 +1724,7 @@ async function er(e) {
 		let e = y.basename(n.icon);
 		await w(n.icon, y.join(o, e)), c.CFBundleIconFile = e;
 	}
-	return await k(y.join(i, "Info.plist"), $n(c)), await k(y.join(i, "PkgInfo"), "APPL????"), {
+	return await O(y.join(i, "Info.plist"), $n(c)), await O(y.join(i, "PkgInfo"), "APPL????"), {
 		appPath: t,
 		executablePath: s,
 		resourcesDir: o
@@ -1829,14 +1830,14 @@ async function lr(e, t, n, r) {
 async function ur(e, t) {
 	let n = new Set(t), r;
 	try {
-		r = await te(e, {
+		r = await ne(e, {
 			recursive: !0,
 			withFileTypes: !0
 		});
 	} catch {
 		return;
 	}
-	await Promise.all(r.filter((e) => e.isFile()).map((t) => y.relative(e, y.join(t.parentPath, t.name))).filter((e) => !n.has(e)).map((t) => O(y.join(e, t), { force: !0 })));
+	await Promise.all(r.filter((e) => e.isFile()).map((t) => y.relative(e, y.join(t.parentPath, t.name))).filter((e) => !n.has(e)).map((t) => D(y.join(e, t), { force: !0 })));
 }
 function dr(e) {
 	let { NO_COLOR: t, FORCE_COLOR: n } = process.env;
@@ -1880,7 +1881,12 @@ async function fr(e) {
 				return $(a, "reload failed", Q(e), X), !1;
 			}
 		}
-		async function C(e, t) {
+		function C(e) {
+			if (!e) return;
+			let n = S("dim", y.relative(t, e.file), { stream: i }), r = Date.now() - e.at;
+			Z(i, `${S("green", "reload")} ${n} (${r}ms)`, X);
+		}
+		async function w(e, t) {
 			let n = new Qt({
 				entryFile: e,
 				hostBin: f,
@@ -1906,13 +1912,8 @@ async function fr(e) {
 			}
 			p = n;
 		}
-		async function w(e) {
-			if (await ur(e.outDir, e.files), !p) await C(e.entryFile);
-			else if (!m) h = !0;
-			else if (await x() && e.changed) {
-				let n = S("dim", y.relative(t, e.changed.file), { stream: i }), r = Date.now() - e.changed.at;
-				Z(i, `${S("green", "reload")} ${n} (${r}ms)`, X);
-			}
+		async function te(e) {
+			await ur(e.outDir, e.files), p ? m ? await x() && C(e.changed) : h = !0 : await w(e.entryFile);
 		}
 		let T;
 		if (o) {
@@ -1923,8 +1924,10 @@ async function fr(e) {
 				stdout: i,
 				stderr: a,
 				notify: (e) => p?.notify("vite", e),
-				reload: () => {
-					m ? x() : h = !0;
+				reload: (e) => {
+					m ? x().then((t) => {
+						t && C(e);
+					}) : h = !0;
 				},
 				onError: (e) => $(a, "build failed", e, X),
 				onUpdate: ({ file: e, took: n }) => {
@@ -1933,7 +1936,7 @@ async function fr(e) {
 					Z(i, `${S("green", "update")} ${r} (${n}ms)`, X);
 				}
 			});
-			await C(e.entryFile, { vite: (t) => e.dispatch(t) }), T = e, p || b();
+			await w(e.entryFile, { vite: (t) => e.dispatch(t) }), T = e, p || b();
 		} else T = await r.watch({
 			entry: l,
 			outDir: c,
@@ -1942,7 +1945,7 @@ async function fr(e) {
 			stdout: i,
 			stderr: a,
 			onBuild: (e) => {
-				v = v.then(() => w(e));
+				v = v.then(() => te(e));
 			},
 			onError: (e) => {
 				$(a, "build failed", e, X);
@@ -1967,7 +1970,7 @@ function pr() {
 async function mr(e, t) {
 	await Promise.all(e.files.map(async (n) => {
 		let r = y.join(t, n);
-		await E(y.dirname(r), { recursive: !0 }), await w(y.join(e.outDir, n), r);
+		await T(y.dirname(r), { recursive: !0 }), await w(y.join(e.outDir, n), r);
 	}));
 }
 function hr(e, t) {
@@ -1986,10 +1989,10 @@ async function _r({ metadata: e, output: t, hostBin: n }) {
 	let r = c(e.productName);
 	hr(t, r);
 	let i = y.join(t.outDir, r);
-	await O(i, {
+	await D(i, {
 		recursive: !0,
 		force: !0
-	}), await E(i, { recursive: !0 });
+	}), await T(i, { recursive: !0 });
 	let a = y.join(i, r);
 	return await w(n, a), await C(a, 493), await mr(t, i), i;
 }

package/dist/types.d.mts

@@ -85,8 +85,14 @@ export interface HmrOptions {
     quiet?: boolean;
     /** Delivers a bundler payload to the running app over the dev channel. */
     notify: (payload: unknown) => void;
-    /** Called in place of forwarding a whole-app reload payload to the app. */
-    reload: () => void;
+    /**
+     * Called in place of forwarding a whole-app reload payload to the app, with
+     * the edit that caused it when one was waiting.
+     */
+    reload: (changed?: {
+        file: string;
+        at: number;
+    }) => void;
     /** Called when an update the app fetched failed to compile. */
     onError: (error: BuildFailure) => void;
     /** Called after a successful update, with the file that changed and how long it took. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@incajs/cli",
-  "version": "0.0.18",
+  "version": "0.0.19",
   "description": "Commands to develop, bundle, and package Incarnative.js apps.",
   "keywords": [
     "bundler",
@@ -72,10 +72,10 @@
     }
   },
   "optionalDependencies": {
-    "@incajs/host-darwin-arm64": "0.0.18",
-    "@incajs/host-darwin-x64": "0.0.18",
-    "@incajs/host-linux-arm64": "0.0.18",
-    "@incajs/host-linux-x64": "0.0.18"
+    "@incajs/host-darwin-arm64": "0.0.19",
+    "@incajs/host-darwin-x64": "0.0.19",
+    "@incajs/host-linux-arm64": "0.0.19",
+    "@incajs/host-linux-x64": "0.0.19"
   },
   "engines": {
     "node": ">=22.18"