@codemation/cli 0.0.22 → 0.0.24

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @codemation/cli
 
+## 0.0.24
+
+### Patch Changes
+
+- Updated dependencies [[`a72444e`](https://github.com/MadeRelevant/codemation/commit/a72444e25c4e744a9a90e231a59c93f8d90346e5), [`a72444e`](https://github.com/MadeRelevant/codemation/commit/a72444e25c4e744a9a90e231a59c93f8d90346e5)]:
+  - @codemation/host@0.1.2
+  - @codemation/next-host@0.1.2
+
+## 0.0.23
+
+### Patch Changes
+
+- Updated dependencies [[`cbfe843`](https://github.com/MadeRelevant/codemation/commit/cbfe843ef2363e400a219f4d0bcd05b091ab83b4)]:
+  - @codemation/host@0.1.1
+  - @codemation/next-host@0.1.1
+
 ## 0.0.22
 
 ### Patch Changes

package/dist/{CliBin-PdQvm7od.js → CliBin-CWXW_92Y.js}

@@ -16,6 +16,7 @@ import { PrismaMigrationDeployer } from "@codemation/host/persistence";
 import boxen from "boxen";
 import chalk from "chalk";
 import figlet from "figlet";
+import { createInterface } from "node:readline";
 import { createServer } from "node:http";
 import httpProxy from "http-proxy";
 import { WebSocket, WebSocketServer } from "ws";
@@ -128,7 +129,7 @@ var DbMigrateCommand = class {
 //#region src/commands/DevCommand.ts
 var DevCommand = class {
 	require = createRequire(import.meta.url);
-	constructor(pathResolver, tsRuntime, devLockFactory, devSourceWatcherFactory, cliLogger, session, databaseMigrationsApplyService, consumerOutputBuilderFactory, pluginDiscovery, consumerBuildArtifactsPublisher, devBootstrapSummaryFetcher, devCliBannerRenderer, consumerEnvDotenvFilePredicate, devTrackedProcessTreeKiller, nextHostConsumerServerCommandFactory, devApiRuntimeFactory, cliDevProxyServerFactory, devRebuildQueueFactory) {
+	constructor(pathResolver, tsRuntime, devLockFactory, devSourceWatcherFactory, cliLogger, session, databaseMigrationsApplyService, consumerOutputBuilderFactory, pluginDiscovery, consumerBuildArtifactsPublisher, devBootstrapSummaryFetcher, devCliBannerRenderer, consumerEnvDotenvFilePredicate, devTrackedProcessTreeKiller, nextHostConsumerServerCommandFactory, devApiRuntimeFactory, cliDevProxyServerFactory, devRebuildQueueFactory, devNextChildProcessOutputFilter) {
 		this.pathResolver = pathResolver;
 		this.tsRuntime = tsRuntime;
 		this.devLockFactory = devLockFactory;
@@ -147,6 +148,7 @@ var DevCommand = class {
 		this.devApiRuntimeFactory = devApiRuntimeFactory;
 		this.cliDevProxyServerFactory = cliDevProxyServerFactory;
 		this.devRebuildQueueFactory = devRebuildQueueFactory;
+		this.devNextChildProcessOutputFilter = devNextChildProcessOutputFilter;
 	}
 	async execute(args) {
 		const paths = await this.pathResolver.resolve(args.consumerRoot);
@@ -185,11 +187,11 @@ var DevCommand = class {
 			await this.startPackagedUiWhenNeeded(prepared, processState, uiProxyBase);
 			this.bindShutdownSignalsToChildProcesses(processState, proxyServer);
 			await this.spawnDevUiWhenNeeded(prepared, processState, gatewayBaseUrl);
+			this.devCliBannerRenderer.renderGatewayListeningHint(prepared.devMode === "watch-framework" ? prepared.nextPort : prepared.gatewayPort, commandName, prepared.devMode, prepared.devMode === "watch-framework" ? prepared.gatewayPort : void 0);
 			await this.startWatcherForSourceRestart(prepared, processState, watcher, devMode, gatewayBaseUrl, proxyServer, {
 				commandName,
 				configPathOverride: args.configPathOverride
 			});
-			this.logPackagedUiDevHintWhenNeeded(devMode, gatewayPort, commandName);
 			await stopPromise;
 		} finally {
 			if (previousDevelopmentServerToken === void 0) delete process$1.env.CODEMATION_DEV_SERVER_TOKEN;
@@ -265,9 +267,10 @@ var DevCommand = class {
 		});
 		state.currentPackagedUi = spawn(nextHostCommand.command, nextHostCommand.args, {
 			cwd: nextHostCommand.cwd,
-			...this.devDetachedChildSpawnOptions(),
+			...this.devDetachedChildSpawnPipeOptions(),
 			env: nextHostEnvironment
 		});
+		this.devNextChildProcessOutputFilter.attach(state.currentPackagedUi);
 		state.currentPackagedUi.on("error", (error) => {
 			if (state.stopRequested || state.isRestartingUi) return;
 			state.stopRequested = true;
@@ -296,13 +299,25 @@ var DevCommand = class {
 		});
 		proxyServer.setBuildStatus("idle");
 	}
-	devDetachedChildSpawnOptions() {
+	/**
+	* Next startup lines are filtered (see {@link DevNextChildProcessOutputFilter}) so the CLI can
+	* own the primary “open this URL” message without the internal loopback port dominating stdout.
+	*/
+	devDetachedChildSpawnPipeOptions() {
 		return process$1.platform === "win32" ? {
-			stdio: "inherit",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
 			detached: true,
 			windowsHide: true
 		} : {
-			stdio: "inherit",
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			],
 			detached: true
 		};
 	}
@@ -349,9 +364,10 @@ var DevCommand = class {
 			"dev"
 		], {
 			cwd: nextHostRoot,
-			...this.devDetachedChildSpawnOptions(),
+			...this.devDetachedChildSpawnPipeOptions(),
 			env: nextHostEnvironment
 		});
+		this.devNextChildProcessOutputFilter.attach(state.currentDevUi);
 		state.currentDevUi.on("exit", (code) => {
 			const normalizedCode = code ?? 0;
 			if (state.stopRequested || state.isRestartingUi) return;
@@ -496,10 +512,6 @@ var DevCommand = class {
 		await this.consumerBuildArtifactsPublisher.publish(snapshot, discoveredPlugins);
 		this.cliLogger.debug(`Dev: consumer output published (${snapshot.buildVersion}).`);
 	}
-	logPackagedUiDevHintWhenNeeded(devMode, gatewayPort, commandName) {
-		if (devMode !== "packaged-ui") return;
-		this.cliLogger.info(`codemation ${commandName}: open http://127.0.0.1:${gatewayPort} — this uses the packaged @codemation/next-host UI. Use \`codemation ${commandName} --watch-framework\` only when working on the framework UI itself.`);
-	}
 };
 
 //#endregion
@@ -1505,6 +1517,37 @@ var DevCliBannerRenderer = class {
 		this.renderRuntimeSummary(summary);
 	}
 	/**
+	* URL to open in the browser: packaged UI uses the CLI gateway port; watch-framework uses the
+	* Next.js dev port (PORT). When they differ, {@link devGatewayPort} is shown in the footer.
+	*/
+	renderGatewayListeningHint(browserPort, commandName, devMode, devGatewayPort) {
+		const url = `http://127.0.0.1:${browserPort}`;
+		const footer = devMode === "watch-framework" ? chalk.dim(devGatewayPort !== void 0 && devGatewayPort !== browserPort ? `The dev gateway (API + runtime) is at http://127.0.0.1:${devGatewayPort}. Open the URL above for the Next.js UI (HMR).` : "Open the URL above for the Next.js UI.") : chalk.dim(`The UI is served through this URL (not the internal Next port). Framework UI work in the monorepo: \`codemation ${commandName} --watch-framework\`.`);
+		const box = boxen([
+			chalk.whiteBright.bold("Codemation is running"),
+			"",
+			`${chalk.hex("#9ca3af")("Open in your browser:")}  ${chalk.greenBright.underline(url)}`,
+			"",
+			footer
+		].join("\n"), {
+			padding: {
+				top: 0,
+				bottom: 0,
+				left: 1,
+				right: 1
+			},
+			margin: {
+				top: 1,
+				bottom: 0
+			},
+			borderStyle: "double",
+			borderColor: "green",
+			title: chalk.bold("Codemation dev"),
+			titleAlignment: "center"
+		});
+		process.stdout.write(`${box}\n`);
+	}
+	/**
 	* Shown after hot reload / watcher restarts (no figlet).
 	*/
 	renderCompact(summary) {
@@ -1586,6 +1629,50 @@ var DevCliBannerRenderer = class {
 	}
 };
 
+//#endregion
+//#region src/dev/DevNextChildProcessOutputFilter.ts
+/**
+* Attaches to a spawned Next child process and forwards streams while dropping
+* {@link DevNextStartupBannerLineFilter} matches (startup banner only).
+*/
+var DevNextChildProcessOutputFilter = class {
+	constructor(lineFilter) {
+		this.lineFilter = lineFilter;
+	}
+	attach(child) {
+		this.pipeFilteredStream(child.stdout, process.stdout);
+		this.pipeFilteredStream(child.stderr, process.stderr);
+	}
+	pipeFilteredStream(source, sink) {
+		if (!source) return;
+		createInterface({
+			input: source,
+			crlfDelay: Infinity
+		}).on("line", (line) => {
+			if (this.lineFilter.shouldSuppress(line)) return;
+			sink.write(`${line}\n`);
+		});
+	}
+};
+
+//#endregion
+//#region src/dev/DevNextStartupBannerLineFilter.ts
+/**
+* Filters noisy Next.js `next start` / `next dev` startup lines so the CLI can
+* surface the Codemation gateway URL as the primary “where to browse” signal.
+*/
+var DevNextStartupBannerLineFilter = class {
+	shouldSuppress(line) {
+		const t = line.replace(/\r$/, "").trimEnd();
+		if (t.length === 0) return false;
+		if (/^\s*▲\s+Next\.js/.test(t)) return true;
+		if (/^\s*-\s+Local:\s+/.test(t)) return true;
+		if (/^\s*-\s+Network:\s+/.test(t)) return true;
+		if (/^\s*✓\s+Ready\b/.test(t)) return true;
+		return false;
+	}
+};
+
 //#endregion
 //#region src/dev/CliDevProxyServer.ts
 var CliDevProxyServer = class {
@@ -3331,7 +3418,7 @@ var CliProgramFactory = class {
 		const buildOptionsParser = new ConsumerBuildOptionsParser();
 		const consumerOutputBuilderFactory = new ConsumerOutputBuilderFactory();
 		const consumerBuildArtifactsPublisher = new ConsumerBuildArtifactsPublisher();
-		const devCommand = new DevCommand(pathResolver, tsRuntime, new DevLockFactory(), new DevSourceWatcherFactory(), cliLogger, devSessionServices, databaseMigrationsApplyService, consumerOutputBuilderFactory, pluginDiscovery, consumerBuildArtifactsPublisher, new DevBootstrapSummaryFetcher(), new DevCliBannerRenderer(), new ConsumerEnvDotenvFilePredicate(), new DevTrackedProcessTreeKiller(), nextHostConsumerServerCommandFactory, new DevApiRuntimeFactory(devSessionServices.loopbackPortAllocator, appConfigLoader, pluginDiscovery), new CliDevProxyServerFactory(), new DevRebuildQueueFactory());
+		const devCommand = new DevCommand(pathResolver, tsRuntime, new DevLockFactory(), new DevSourceWatcherFactory(), cliLogger, devSessionServices, databaseMigrationsApplyService, consumerOutputBuilderFactory, pluginDiscovery, consumerBuildArtifactsPublisher, new DevBootstrapSummaryFetcher(), new DevCliBannerRenderer(), new ConsumerEnvDotenvFilePredicate(), new DevTrackedProcessTreeKiller(), nextHostConsumerServerCommandFactory, new DevApiRuntimeFactory(devSessionServices.loopbackPortAllocator, appConfigLoader, pluginDiscovery), new CliDevProxyServerFactory(), new DevRebuildQueueFactory(), new DevNextChildProcessOutputFilter(new DevNextStartupBannerLineFilter()));
 		return new CliProgram(buildOptionsParser, new BuildCommand(cliLogger, pathResolver, consumerOutputBuilderFactory, pluginDiscovery, consumerBuildArtifactsPublisher, tsRuntime), devCommand, new DevPluginCommand(new PluginDevConfigFactory(), devCommand), new ServeWebCommand(pathResolver, new CodemationConsumerConfigLoader(), tsRuntime, sourceMapNodeOptions, new ConsumerEnvLoader(), new ListenPortResolver(), nextHostConsumerServerCommandFactory), new ServeWorkerCommand(pathResolver, appConfigLoader, new AppContainerFactory()), new DbMigrateCommand(databaseMigrationsApplyService), new UserCreateCommand(new LocalUserCreator(userAdminBootstrap), userAdminCliOptionsParser), new UserListCommand(cliLogger, userAdminBootstrap, new CliDatabaseUrlDescriptor(), userAdminCliOptionsParser));
 	}
 };

package/dist/bin.js

@@ -1,4 +1,4 @@
-import { t as CliBin } from "./CliBin-PdQvm7od.js";
+import { t as CliBin } from "./CliBin-CWXW_92Y.js";
 import process from "node:process";
 import "reflect-metadata";