@arkstack/console 0.17.16 → 0.17.18

package/dist/{app-Ek2hTWvh.js → app-CJ5PtXEI.js}

@@ -1,7 +1,9 @@
+import { r as resolveStubsDir } from "./helpers-BfDN6Q79.js";
 import { existsSync } from "node:fs";
-import path, { isAbsolute, join } from "node:path";
+import path, { join } from "node:path";
 import { Arkstack } from "@arkstack/contract";
 import { CliApp } from "resora";
+import { disposeArkormRuntime } from "arkormx";
 
 //#region dist/config.js
 const defaultConfig = (app) => {
@@ -21,17 +23,6 @@ const defaultConfig = (app) => {
 
 //#endregion
 //#region dist/app.js
-const resolveStubsDir = (config, options, core) => {
-	const configuredDir = config?.localStubsDir;
-	if (configuredDir) return isAbsolute(configuredDir) ? configuredDir : join(Arkstack.rootDir(), configuredDir);
-	if (!options?.stubsDir) {
-		const driver = core?.getDriver().name ?? "h3";
-		let stubsDir = path.resolve(Arkstack.rootDir(), `node_modules/@arkstack/driver-${driver}/stubs`);
-		if (!existsSync(stubsDir)) stubsDir = path.resolve(Arkstack.rootDir(), "stubs");
-		return stubsDir;
-	}
-	return options?.stubsDir;
-};
 var ArkstackConsoleApp = class extends CliApp {
 	core;
 	options;
@@ -41,11 +32,19 @@ var ArkstackConsoleApp = class extends CliApp {
 		this.options = options;
 		this.mergeConfig();
 	}
+	registerMusketListeners(musket) {
+		musket.afterHandle.on(async () => {
+			await disposeArkormRuntime();
+			process.exit(0);
+		});
+	}
 	makeController = (name, opts) => {
 		this.mergeConfig();
 		const normalized = name.endsWith("Controller") ? name.replace(/controller/i, "") : name;
 		let controllerName = normalized.endsWith("Controller") ? normalized : `${normalized}Controller`;
-		const outputPath = join(path.resolve(Arkstack.rootDir(), "src", "app/http/controllers"), `${controllerName}.${opts?.ext ?? "ts"}`);
+		const controllersDir = path.resolve(Arkstack.rootDir(), "src", "app/http/controllers");
+		const fileName = `${controllerName}.${opts?.ext ?? "ts"}`;
+		const outputPath = join(controllersDir, fileName);
 		const stubsDir = resolveStubsDir(this.config, this.options, this.core);
 		if (!stubsDir) {
 			console.error("Error: stubsDir is not configured. Set stubsDir in resora.config.js.");
@@ -92,4 +91,4 @@ var ArkstackConsoleApp = class extends CliApp {
 };
 
 //#endregion
-export { resolveStubsDir as n, ArkstackConsoleApp as t };
+export { ArkstackConsoleApp as t };

package/dist/app.d.ts

@@ -1,14 +1,12 @@
 import { n as Core, t as ConsoleAppOptions } from "./types-C5drRyQu.js";
 import { CliApp } from "resora";
-
+import { Musket } from "@h3ravel/musket";
 //#region src/app.d.ts
-declare const resolveStubsDir: (config: {
-  localStubsDir?: string;
-} | undefined, options?: ConsoleAppOptions, core?: Core) => string;
 declare class ArkstackConsoleApp<TCore extends Core> extends CliApp {
   core: TCore;
   private readonly options;
   constructor(core: TCore, options: ConsoleAppOptions);
+  registerMusketListeners(musket: Musket<this>): void;
   makeController: (name: string, opts: any) => string;
   /**
    * Normalize a file path by removing the current working directory from it.
@@ -24,4 +22,4 @@ declare class ArkstackConsoleApp<TCore extends Core> extends CliApp {
   mergeConfig: () => void;
 }
 //#endregion
-export { ArkstackConsoleApp, resolveStubsDir };
+export { ArkstackConsoleApp };

package/dist/app.js

@@ -1,3 +1,3 @@
-import { n as resolveStubsDir, t as ArkstackConsoleApp } from "./app-Ek2hTWvh.js";
+import { t as ArkstackConsoleApp } from "./app-CJ5PtXEI.js";
 
-export { ArkstackConsoleApp, resolveStubsDir };
+export { ArkstackConsoleApp };

package/dist/{helpers-CjopNM66.js → helpers-BfDN6Q79.js}

@@ -1,7 +1,7 @@
 import { Publisher } from "@arkstack/common";
 import { existsSync, readdirSync } from "node:fs";
 import { pathToFileURL } from "node:url";
-import { join } from "node:path";
+import { isAbsolute, join, resolve } from "node:path";
 import { Arkstack } from "@arkstack/contract";
 
 //#region dist/helpers.js
@@ -44,6 +44,17 @@ function groupPublishables(groupBy = "tag") {
 		description: groupBy === "package" ? `${g.name} has ${g.tags.size} tag${g.tags.size === 1 ? "" : "s"} and ${g.entries} publishable${g.entries === 1 ? "" : "s"}` : g.name === "untagged" ? `These publishables have no tag and include ${g.entries} publishable${g.entries === 1 ? "" : "s"} from ${g.packages.size} package${g.packages.size === 1 ? "" : "s"}` : `This tag exists in ${g.packages.size} package${g.packages.size === 1 ? "" : "s"} and has ${g.entries} publishable${g.entries === 1 ? "" : "s"}`
 	}));
 }
+const resolveStubsDir = (config, options, core) => {
+	const configuredDir = config?.localStubsDir;
+	if (configuredDir) return isAbsolute(configuredDir) ? configuredDir : join(Arkstack.rootDir(), configuredDir);
+	if (!options?.stubsDir) {
+		const driver = core?.getDriver().name ?? "h3";
+		let stubsDir = resolve(Arkstack.rootDir(), `node_modules/@arkstack/driver-${driver}/stubs`);
+		if (!existsSync(stubsDir)) stubsDir = resolve(Arkstack.rootDir(), "stubs");
+		return stubsDir;
+	}
+	return options?.stubsDir;
+};
 
 //#endregion
-export { loadPackageSetups as n, groupPublishables as t };
+export { loadPackageSetups as n, resolveStubsDir as r, groupPublishables as t };

package/dist/helpers.d.ts

@@ -1,5 +1,4 @@
-import { r as GroupedOption } from "./types-C5drRyQu.js";
-
+import { n as Core, r as GroupedOption, t as ConsoleAppOptions } from "./types-C5drRyQu.js";
 //#region src/helpers.d.ts
 /**
  * Import the `setup` module of every installed `@arkstack/*` package so its
@@ -8,5 +7,8 @@ import { r as GroupedOption } from "./types-C5drRyQu.js";
  */
 declare const loadPackageSetups: () => Promise<void>;
 declare function groupPublishables(groupBy?: 'tag' | 'package'): GroupedOption[];
+declare const resolveStubsDir: (config: {
+  localStubsDir?: string;
+} | undefined, options?: ConsoleAppOptions, core?: Core) => string;
 //#endregion
-export { groupPublishables, loadPackageSetups };
+export { groupPublishables, loadPackageSetups, resolveStubsDir };

package/dist/helpers.js

@@ -1,3 +1,3 @@
-import { n as loadPackageSetups, t as groupPublishables } from "./helpers-CjopNM66.js";
+import { n as loadPackageSetups, r as resolveStubsDir, t as groupPublishables } from "./helpers-BfDN6Q79.js";
 
-export { groupPublishables, loadPackageSetups };
+export { groupPublishables, loadPackageSetups, resolveStubsDir };

package/dist/index.d.ts

@@ -38,10 +38,10 @@ declare class BuildInterfaces {
   private static resolveEnvFile;
   /**
    * Parse `KEY=VALUE` lines, skipping blanks, comments and invalid names.
-  *
-  * @param contents
-  * @returns
-  */
+   *
+   * @param contents
+   * @returns
+   */
   private static parseEnvFile;
   /**
    * Infer a TS type from a value, mirroring env()'s runtime coercion.

package/dist/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { t as ArkstackConsoleApp } from "./app-Ek2hTWvh.js";
-import { n as loadPackageSetups, t as groupPublishables } from "./helpers-CjopNM66.js";
+import { t as ArkstackConsoleApp } from "./app-CJ5PtXEI.js";
+import { n as loadPackageSetups, t as groupPublishables } from "./helpers-BfDN6Q79.js";
 import { n as BaseTCConfig, r as TSConfig, t as BuildInterfaces } from "./BuildInterfaces-BeMseJhx.js";
 import { createRequire } from "node:module";
 import { Publisher, abort, abortIf, assertFound, config, discoverCommands, env, importFile, initializeGlobalContext, loadPrototypes, outputDir, rebuildOutput } from "@arkstack/common";
@@ -11,8 +11,9 @@ import { Arkstack } from "@arkstack/contract";
 import { MakeResource, applyRuntimeConfig, getDefaultConfig } from "resora";
 import { Command, Kernel } from "@h3ravel/musket";
 import { spawn } from "node:child_process";
+import ngrok from "@ngrok/ngrok";
 import { randomBytes } from "node:crypto";
-import { resolve } from "path";
+import { resolve as resolve$1 } from "path";
 import { writeFile } from "fs/promises";
 import chalk from "chalk";
 import { str } from "@h3ravel/support";
@@ -25,7 +26,8 @@ var BuildCommand = class extends Command {
 	description = "Build the application for production";
 	async handle() {
 		await new Promise((resolve, reject) => {
-			const child = spawn(process.platform === "win32" ? "pnpm.cmd" : "pnpm", ["exec", "tsdown"], {
+			const command = process.platform === "win32" ? "pnpm.cmd" : "pnpm";
+			const child = spawn(command, ["exec", "tsdown"], {
 				cwd: Arkstack.rootDir(),
 				stdio: "inherit",
 				env: Object.assign(process.env, {
@@ -60,6 +62,19 @@ var DevCommand = class DevCommand extends Command {
 		const vars = DevCommand.devServerEnv(this.options());
 		const rootDir = Arkstack.rootDir();
 		const bin = DevCommand.resolveTsdownBin(rootDir);
+		let tunnel;
+		if (this.option?.("tunnel")) {
+			tunnel = await ngrok.forward({
+				addr: Number(env("APP_PORT", env("PORT", 3e3))),
+				authtoken: env("NGROK_AUTHTOKEN"),
+				domain: env("NGROK_DOMAIN")
+			});
+			const url = tunnel.url();
+			if (url) {
+				vars.TUNNEL_URL = url;
+				console.log(`Traffic has been tunnelled to ${url}`);
+			}
+		}
 		const [command, args] = bin ? [process.execPath, [
 			bin,
 			"--log-level",
@@ -70,23 +85,27 @@ var DevCommand = class DevCommand extends Command {
 			"--log-level",
 			"silent"
 		]];
-		await new Promise((resolve, reject) => {
-			const child = spawn(command, args, {
-				cwd: rootDir,
-				stdio: "inherit",
-				env: Object.assign(process.env, vars)
-			});
-			child.on("error", (error) => {
-				reject(error);
-			});
-			child.on("exit", (code) => {
-				if (code === 0 || code === null) {
-					resolve();
-					return;
-				}
-				reject(/* @__PURE__ */ new Error(`tsdown exited with code ${code}`));
+		try {
+			await new Promise((resolve, reject) => {
+				const child = spawn(command, args, {
+					cwd: rootDir,
+					stdio: "inherit",
+					env: Object.assign({}, process.env, vars)
+				});
+				child.on("error", (error) => {
+					reject(error);
+				});
+				child.on("exit", (code) => {
+					if (code === 0 || code === null) {
+						resolve();
+						return;
+					}
+					reject(/* @__PURE__ */ new Error(`tsdown exited with code ${code}`));
+				});
 			});
-		});
+		} finally {
+			await tunnel?.close();
+		}
 	}
 	/**
 	* Resolve the absolute path to tsdown's executable so it can be run directly
@@ -111,7 +130,8 @@ var DevCommand = class DevCommand extends Command {
 	*
 	* The dev server binds `127.0.0.1` by default so it is local-only; `--host`
 	* switches it to `0.0.0.0` to expose it on the local network. `--secure` flags
-	* the driver to serve HTTPS, and `--tunnel` enables the Ngrok tunnel.
+	* the driver to serve HTTPS. The command itself owns the Ngrok tunnel so
+	* watcher-driven application restarts cannot replace its public URL.
 	* 
 	* @param options 
 	* @returns 
@@ -119,9 +139,9 @@ var DevCommand = class DevCommand extends Command {
 	static devServerEnv(options) {
 		const vars = {
 			NODE_ENV: "development",
-			APP_HOST: options.host ? "0.0.0.0" : "127.0.0.1"
+			APP_HOST: options.host ? "0.0.0.0" : "127.0.0.1",
+			ARKSTACK_ENV_RELOAD: "true"
 		};
-		if (options.tunnel) vars.TUNNEL = "true";
 		if (options.secure) vars.APP_SECURE = "true";
 		return vars;
 	}
@@ -206,7 +226,7 @@ var MakeCommand = class extends Command {
 		const name = String(this.argument("name")).replace(/\s+/g, "").replace(/\.js$/, "").trim();
 		if (!name) return void this.error("Command name is required");
 		const stubContent = this.stub(name);
-		const filePath = resolve(Arkstack.rootDir(), "src", `app/console/commands/${name}.js`);
+		const filePath = resolve$1(Arkstack.rootDir(), "src", `app/console/commands/${name}.js`);
 		await writeFile(filePath, stubContent, { flag: "wx" });
 		this.success(`Command ${name} created successfully at ${filePath}`);
 	}

package/dist/prepare.d.ts

@@ -1 +1 @@
-export { };
+export {}

package/dist/prepare.js

@@ -82,7 +82,8 @@ BuildInterfaces.tsconfig();
 await ArkormArtifacts.sync();
 const LOG_LEVEL = parseInt(process.env.VERBOSITY ?? "0") > 0 ? [] : ["--log-level=silent"];
 const NODE_ENV = process.env.NODE_ENV || "development";
-const child = spawn(process.platform === "win32" ? "pnpm.cmd" : "pnpm", [
+const command = process.platform === "win32" ? "pnpm.cmd" : "pnpm";
+const child = spawn(command, [
 	"exec",
 	"tsdown",
 	...LOG_LEVEL

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/console",
-  "version": "0.17.16",
+  "version": "0.17.18",
   "type": "module",
   "description": "Console module for Arkstack, providing the command-line runtime and console integration layer.",
   "homepage": "https://arkstack.toneflix.net/guide/cli",
@@ -40,18 +40,19 @@
     "access": "public"
   },
   "peerDependencies": {
-    "arkormx": "^2.12.0",
-    "clear-router": "^2.9.2",
-    "@arkstack/database": "^0.17.16"
+    "arkormx": "^2.12.8",
+    "clear-router": "^2.9.3",
+    "@arkstack/database": "^0.17.18"
   },
   "dependencies": {
-    "@h3ravel/musket": "^2.2.2",
-    "@h3ravel/support": "^2.2.4",
+    "@ngrok/ngrok": "^1.7.0",
+    "@h3ravel/musket": "^2.2.13",
+    "@h3ravel/support": "^2.2.7",
     "chalk": "^5.6.2",
-    "resora": "^1.3.32",
+    "resora": "^1.3.34",
     "ts-morph": "^28.0.0",
-    "@arkstack/common": "^0.17.16",
-    "@arkstack/contract": "^0.17.16"
+    "@arkstack/common": "^0.17.18",
+    "@arkstack/contract": "^0.17.18"
   },
   "peerDependenciesMeta": {
     "@arkstack/database": {