@znight/cli 0.6.2 → 0.6.3

package/dist/{main-DUyElIVZ.mjs → main-CLoS12u4.mjs}

@@ -1241,6 +1241,12 @@ var AppSupervisor = class {
 	#debounce;
 	#queue = Promise.resolve();
 	#queued = false;
+	/** A restart is stopping the previous process before starting the next one. */
+	#restarting = false;
+	/** Bumped by {@link cancelRestart}: a restart requested in an older epoch does not start. */
+	#epoch = 0;
+	/** Epoch of the latest restart request. */
+	#requested = 0;
 	#closed = false;
 	#started = 0;
 	constructor(options) {
@@ -1271,14 +1277,18 @@ var AppSupervisor = class {
 		}, this.#debounceMs);
 	}
 	/**
-	* Cancels a restart scheduled by {@link scheduleRestart} and not started yet (the output it would
-	* run turned out to be broken, e.g. a failed compilation). Returns whether one was pending.
+	* Cancels the restarts that did not start their process yet (the output they would run turned out
+	* to be broken, e.g. a failed compilation): scheduled, queued, or stopping the previous process
+	* (which still stops). Returns whether one was pending.
 	*/
 	cancelRestart() {
-		if (this.#debounce === void 0) return false;
-		clearTimeout(this.#debounce);
-		this.#debounce = void 0;
-		return true;
+		const pending = this.#debounce !== void 0 || this.#queued || this.#restarting;
+		if (this.#debounce !== void 0) {
+			clearTimeout(this.#debounce);
+			this.#debounce = void 0;
+		}
+		this.#epoch++;
+		return pending;
 	}
 	/**
 	* Stops the current process (if any) and starts a new one. Restarts never overlap; a restart
@@ -1286,13 +1296,20 @@ var AppSupervisor = class {
 	*/
 	restart() {
 		if (this.#closed) return this.#queue;
+		this.#requested = this.#epoch;
 		if (this.#queued) return this.#queue;
 		this.#queued = true;
 		this.#queue = this.#queue.then(async () => {
 			this.#queued = false;
-			if (this.#closed) return;
-			await this.#stopCurrent("SIGTERM");
-			if (this.#closed) return;
+			if (this.#closed || this.#requested !== this.#epoch) return;
+			const epoch = this.#epoch;
+			this.#restarting = true;
+			try {
+				await this.#stopCurrent("SIGTERM");
+			} finally {
+				this.#restarting = false;
+			}
+			if (this.#closed || epoch !== this.#epoch) return;
 			this.#startNew();
 		}).catch((error) => {
 			this.#queued = false;
@@ -1300,7 +1317,11 @@ var AppSupervisor = class {
 		});
 		return this.#queue;
 	}
-	/** Stops the current process with `signal` (SIGKILL after the timeout) and refuses new starts. */
+	/**
+	* Stops the current process with `signal` (SIGKILL after the timeout) and refuses new starts.
+	* `null`: the process already received the signal (a console Ctrl+C on Windows, where `kill()` is
+	* a forced termination): it is only waited for, then SIGKILLed after the timeout.
+	*/
 	async stop(signal = "SIGTERM") {
 		this.#closed = true;
 		if (this.#debounce !== void 0) {
@@ -1341,7 +1362,7 @@ var AppSupervisor = class {
 		this.#current = void 0;
 		this.#stopping.add(child);
 		try {
-			child.kill(signal);
+			if (signal !== null) child.kill(signal);
 			let timer;
 			const timeout = new Promise((resolve) => {
 				timer = setTimeout(() => resolve("timeout"), this.#killTimeoutMs);
@@ -1817,18 +1838,33 @@ async function printDiagnostics$2(cli, root, diagnostics) {
 	}
 	cli.reporter.logError(text.trimEnd());
 }
+/**
+* The signal stopping the application when the CLI received `signal`. On Windows the application
+* shares the console: it received Ctrl+C and the console closing itself, and `kill()` would be a
+* forced termination, so it is only waited for (`null`).
+*/
+function stopSignal(cli, signal) {
+	if (cli.runtime.platform === "win32" && (signal === "SIGINT" || signal === "SIGHUP")) return null;
+	return signal === "SIGINT" ? "SIGINT" : "SIGTERM";
+}
 function waitForTermination(cli, watcher, supervisor) {
 	return new Promise((resolveExit) => {
 		const dispose = onTermination(cli, (signal) => {
 			if (signal !== "SIGHUP") cli.reporter.info(cli.colors.dim("Stopping... (press Ctrl+C again to force)"));
 			(async () => {
+				const stopped = supervisor.stop(stopSignal(cli, signal));
 				try {
 					await watcher.close();
-				} finally {
-					await supervisor.stop(signal === "SIGINT" ? "SIGINT" : "SIGTERM");
-					dispose();
-					resolveExit(0);
+				} catch (error) {
+					cli.reporter.error(`Cannot close the Vite build watcher: ${errorMessage(error)}`);
+				}
+				try {
+					await stopped;
+				} catch (error) {
+					cli.reporter.error(`Cannot stop the application: ${errorMessage(error)}`);
 				}
+				dispose();
+				resolveExit(0);
 			})();
 		}, () => {
 			supervisor.kill();
@@ -2032,9 +2068,11 @@ async function watch$1(cli, compiler, options) {
 		roots: []
 	};
 	let pending = /* @__PURE__ */ new Set();
-	let running = false;
+	let running;
+	let closed = false;
 	let timer;
 	const watchers = new TargetWatchers(cli.services.watch, (file) => {
+		if (closed) return;
 		const path = realPath(file);
 		if (!incremental.isRelevantChange(changeKind(path, state.known), path, state.known, state.roots)) return;
 		pending.add(path);
@@ -2044,42 +2082,46 @@ async function watch$1(cli, compiler, options) {
 			run(false);
 		}, 50);
 	});
-	const run = async (initial) => {
-		if (running) return;
-		running = true;
+	const run = (initial) => {
+		if (running !== void 0 || closed) return running ?? Promise.resolve();
+		running = generations(initial).finally(() => {
+			running = void 0;
+		});
+		return running;
+	};
+	const generations = async (initial) => {
 		let first = initial;
-		try {
-			do {
-				const files = pending;
-				pending = /* @__PURE__ */ new Set();
-				const started = performance.now();
-				let known = state.known;
-				try {
-					const result = await incremental.generate(first ? void 0 : classifyChanges(files, state.known));
-					if (result.watchFiles !== void 0) known = new Set(result.watchFiles.map((file) => toPosixPath(resolve(file))));
-					report(cli, compiler, result, root, performance.now() - started);
-				} catch (error) {
-					cli.reporter.error(`Generation failed: ${errorMessage(error)}`);
-				}
-				state = {
-					known,
-					roots: incremental.includeRoots().map(realPath)
-				};
-				watchers.update(watchTargets(realRoot, state.roots, state.known), files);
-				first = false;
-			} while (pending.size > 0);
-		} finally {
-			running = false;
-		}
+		do {
+			const files = pending;
+			pending = /* @__PURE__ */ new Set();
+			const started = performance.now();
+			let known = state.known;
+			try {
+				const result = await incremental.generate(first ? void 0 : classifyChanges(files, state.known));
+				if (result.watchFiles !== void 0) known = new Set(result.watchFiles.map((file) => toPosixPath(resolve(file))));
+				report(cli, compiler, result, root, performance.now() - started);
+			} catch (error) {
+				cli.reporter.error(`Generation failed: ${errorMessage(error)}`);
+			}
+			if (closed) return;
+			state = {
+				known,
+				roots: incremental.includeRoots().map(realPath)
+			};
+			watchers.update(watchTargets(realRoot, state.roots, state.known), files);
+			first = false;
+		} while (pending.size > 0 && !closed);
 	};
 	await run(true);
 	cli.reporter.info(cli.colors.dim("Watching for changes... (Ctrl+C to stop)"));
 	return new Promise((resolveExit) => {
 		const dispose = onTermination(cli, () => {
+			closed = true;
 			if (timer !== void 0) clearTimeout(timer);
 			watchers.close();
 			dispose();
-			resolveExit(0);
+			const exit = () => resolveExit(0);
+			(running ?? Promise.resolve()).then(exit, exit);
 		}, () => void 0);
 	});
 }
@@ -2091,10 +2133,10 @@ const PACKAGE_MANAGERS = [
 	"pnpm",
 	"yarn"
 ];
-/** Every HTTP adapter, in display order. */
+/** Every HTTP adapter, in display order (the default first). */
 const HTTP_ADAPTERS = [
-	"node",
 	"fastify",
+	"node",
 	"express",
 	"hono"
 ];
@@ -2104,14 +2146,18 @@ const FEATURES = [
 	"observability",
 	"messaging",
 	"schedule",
-	"openapi"
+	"openapi",
+	"graphql",
+	"websocket"
 ];
+/** Every OpenAPI reference UI, in display order (the default first). */
+const OPENAPI_UIS = ["scalar", "swagger"];
 /** Features selected when none are given. */
 const DEFAULT_FEATURES = ["config", "observability"];
 /** Labels shown by the prompts and the help. */
 const ADAPTER_LABELS = {
-	node: "node:http (built-in, zero dependency)",
 	fastify: "Fastify",
+	node: "node:http (built-in, zero dependency)",
 	express: "Express",
 	hono: "Hono"
 };
@@ -2121,7 +2167,14 @@ const FEATURE_LABELS = {
 	observability: "Observability: structured logs, metrics, tracing (@znight/observability)",
 	messaging: "Messaging: message consumers and publishing (@znight/messaging)",
 	schedule: "Schedule: cron, interval and timeout jobs (@znight/schedule)",
-	openapi: "OpenAPI: openapi.json and an API reference at /docs (@znight/openapi)"
+	openapi: "OpenAPI: openapi.json and an API reference at /docs (@znight/openapi)",
+	graphql: "GraphQL: code-first schema derived from the TypeScript types (@znight/graphql)",
+	websocket: "WebSocket: gateways served on the HTTP port (@znight/websocket)"
+};
+/** Labels shown by the prompts. */
+const OPENAPI_UI_LABELS = {
+	scalar: "Scalar",
+	swagger: "Swagger UI"
 };
 /**
 * Parses `--features` (`config,observability`, `none`, `all`). Returns the features in canonical
@@ -2223,11 +2276,13 @@ const DEPENDENCY_VERSIONS = {
 	"@types/node": "^24.0.0",
 	express: "^5.3.0",
 	fastify: "^5.12.7",
+	graphql: "^17.0.2",
 	hono: "^4.13.14",
 	"light-my-request": "^6.8.0",
 	typescript: "^7.0.0",
 	vite: "^8.0.0",
 	vitest: "^4.1.0",
+	ws: "^8.22.0",
 	zod: "^4.6.0"
 };
 /** Range of a third-party dependency. */
@@ -2240,11 +2295,16 @@ function versionOf(name) {
 function flagsOf(options) {
 	const has = (feature) => options.features.includes(feature);
 	return {
+		name: options.name,
 		config: has("config"),
 		observability: has("observability"),
 		messaging: has("messaging"),
 		schedule: has("schedule"),
 		openapi: has("openapi"),
+		openapiUi: options.openapiUi ?? "scalar",
+		graphql: has("graphql"),
+		websocket: has("websocket"),
+		docker: options.docker ?? true,
 		adapter: options.adapter,
 		pm: options.packageManager,
 		bun: options.packageManager === "bun"
@@ -2329,10 +2389,40 @@ function renderProject(options) {
 		path: "src/api.ts",
 		content: apiDocument(options)
 	});
+	if (flags.graphql) {
+		files.push({
+			path: "src/app/greeting.resolver.ts",
+			content: greetingResolver()
+		});
+		files.push({
+			path: "test/greeting.resolver.test.ts",
+			content: greetingResolverTest(flags)
+		});
+	}
+	if (flags.websocket) {
+		files.push({
+			path: "src/app/greeting.gateway.ts",
+			content: greetingGateway()
+		});
+		files.push({
+			path: "test/greeting.gateway.test.ts",
+			content: greetingGatewayTest(flags)
+		});
+	}
 	if (flags.bun) files.push({
 		path: "bunfig.toml",
 		content: bunfig(flags)
 	});
+	if (flags.docker) {
+		files.push({
+			path: "Dockerfile",
+			content: dockerfile(flags)
+		});
+		files.push({
+			path: ".dockerignore",
+			content: dockerignore()
+		});
+	}
 	if (flags.pm === "yarn") files.push({
 		path: ".yarnrc.yml",
 		content: "nodeLinker: node-modules\n"
@@ -2354,6 +2444,14 @@ function packageJson(options, flags) {
 	if (flags.messaging) dependencies["@znight/messaging"] = znight;
 	if (flags.schedule) dependencies["@znight/schedule"] = znight;
 	if (flags.openapi) dependencies["@znight/openapi"] = znight;
+	if (flags.graphql) {
+		dependencies["@znight/graphql"] = znight;
+		dependencies["graphql"] = versionOf("graphql");
+	}
+	if (flags.websocket) {
+		dependencies["@znight/websocket"] = znight;
+		dependencies["ws"] = versionOf("ws");
+	}
 	if (flags.adapter === "fastify") dependencies["fastify"] = versionOf("fastify");
 	if (flags.adapter === "express") dependencies["express"] = versionOf("express");
 	if (flags.adapter === "hono") {
@@ -2470,6 +2568,100 @@ coverage
 .env.*.local
 `;
 }
+function dockerSteps(pm) {
+	const corepack = (tool) => ["ENV COREPACK_ENABLE_DOWNLOAD_PROMPT=0", `RUN corepack enable && corepack install --global ${tool}`];
+	switch (pm) {
+		case "bun": return {
+			manifests: "package.json bun.lock",
+			setup: [],
+			install: "bun install --frozen-lockfile",
+			production: "bun install --frozen-lockfile --production --omit=peer",
+			build: "bun run build"
+		};
+		case "pnpm": return {
+			manifests: "package.json pnpm-lock.yaml",
+			setup: corepack("pnpm@10"),
+			install: "pnpm install --frozen-lockfile",
+			production: "pnpm install --frozen-lockfile --prod",
+			build: "pnpm run build"
+		};
+		case "yarn": return {
+			manifests: "package.json yarn.lock .yarnrc.yml",
+			setup: corepack("yarn@4"),
+			install: "yarn install --immutable",
+			production: "yarn workspaces focus --all --production",
+			build: "yarn build"
+		};
+		default: return {
+			manifests: "package.json package-lock.json",
+			setup: [],
+			install: "npm ci",
+			production: "npm pkg delete devDependencies && npm ci --omit=dev",
+			build: "npm run build"
+		};
+	}
+}
+/** A multi-stage image: build with every dependency, run the bundle with the production ones. */
+function dockerfile(flags) {
+	const steps = dockerSteps(flags.pm);
+	const runtime = flags.bun ? "bun" : "node";
+	const [baseImage, runImage] = flags.bun ? ["oven/bun:1", "oven/bun:1-slim"] : ["node:24-slim", "node:24-slim"];
+	const probe = "fetch('http://127.0.0.1:' + (process.env.PORT || 3000) + '/health').then(r => process.exit(r.ok ? 0 : 1), () => process.exit(1))";
+	const command = flags.bun ? "[\"bun\", \"--no-env-file\", \"dist/main.js\"]" : "[\"node\", \"--enable-source-maps\", \"dist/main.js\"]";
+	const envFiles = flags.bun ? "\n# --no-env-file: Bun would load .env files into process.env by itself, with its own precedence" : "";
+	return `# syntax=docker/dockerfile:1
+# Production image: docker build -t ${dockerTag(flags.name)} .
+# Installs are frozen: install the dependencies once (${flags.pm} install) so that the lockfile exists.
+
+FROM ${baseImage} AS base
+${steps.setup.map((line) => `${line}\n`).join("")}WORKDIR /app
+
+# --- production dependencies only, at the versions of the lockfile ----------------------------------
+FROM base AS deps
+COPY ${steps.manifests} ./
+RUN ${steps.production}
+
+# --- build: every dependency, since the Znight compiler, Vite and TypeScript run here ---------------
+FROM base AS build
+COPY ${steps.manifests} ./
+RUN ${steps.install}
+COPY . .
+# generates the DI container (src/.znight), fails on any wiring error, bundles dist/main.js
+RUN ${steps.build}
+
+# --- runtime: the bundle and the production dependencies, as a non-root user ----------------------
+FROM ${runImage}
+WORKDIR /app
+ENV NODE_ENV=production
+COPY --from=build /app/package.json ./
+COPY --from=deps /app/node_modules ./node_modules
+COPY --from=build /app/dist ./dist
+USER ${runtime}
+EXPOSE 3000
+HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \\
+  CMD ["${runtime}", "-e", "${probe}"]
+# exec form: the runtime is PID 1 and receives SIGTERM directly (graceful shutdown)${envFiles}
+CMD ${command}
+`;
+}
+/** A Docker image name for an npm package name (`@acme/api` -> `acme-api`). */
+function dockerTag(name) {
+	return name.replace(/^@/, "").replace("/", "-");
+}
+function dockerignore() {
+	return `# not part of the image: the build installs and generates everything itself
+node_modules
+dist
+coverage
+**/.znight
+*.log
+.git
+.env
+.env.*
+Dockerfile
+.dockerignore
+`;
+}
 function adapterImport(adapter) {
 	switch (adapter) {
 		case "fastify": return "import { fastifyAdapter } from '@znight/http/fastify'";
@@ -2485,17 +2677,19 @@ function mainTs(flags) {
 	const imports = [
 		flags.config ? "import { ConfigPlugin } from '@znight/config'" : void 0,
 		"import { Application } from '@znight/core'",
+		flags.graphql ? "import { GraphQLPlugin } from '@znight/graphql'" : void 0,
 		"import { HttpPlugin } from '@znight/http'",
 		adapterImport(flags.adapter),
 		flags.messaging ? "import { MessagingPlugin } from '@znight/messaging'" : void 0,
 		flags.messaging ? "import { memory } from '@znight/messaging/memory'" : void 0,
 		flags.observability ? "import { ObservabilityPlugin } from '@znight/observability'" : void 0,
 		flags.openapi ? "import { OpenApiPlugin } from '@znight/openapi'" : void 0,
-		flags.schedule ? "import { SchedulePlugin } from '@znight/schedule'" : void 0
+		flags.schedule ? "import { SchedulePlugin } from '@znight/schedule'" : void 0,
+		flags.websocket ? "import { WebSocketPlugin } from '@znight/websocket'" : void 0
 	].filter((line) => line !== void 0);
 	const localImports = ["import { __ZNIGHT_METADATA__ } from './.znight/container.generated.js'", flags.config ? "import { AppConfig } from './app/app.config.js'" : void 0].filter((line) => line !== void 0);
 	const plugins = [];
-	if (flags.observability) plugins.push("    // first, so that its hooks wrap everything: request logs, metrics (with prom-client), traces", "    ObservabilityPlugin.configure(),");
+	if (flags.observability) plugins.push("    // first, so that its hooks wrap everything: request logs, metrics (with prom-client), traces", "    ObservabilityPlugin.configure({", "      logging: {", `        name: ${quote(flags.name)},`, "      },", "      // metrics: {", "      //   // options of the metrics registry", "      // },", "      // tracing: {", "      //   // options of the tracer", "      // },", "    }),");
 	if (flags.config) plugins.push("    // loads .env files and the environment, validates every @Config class before anything starts", "    ConfigPlugin.configure(),");
 	if (flags.messaging) plugins.push("    // in-memory broker for development: use rabbitmq(), sqs() or kafka() in production", "    MessagingPlugin.configure({ driver: memory() }),");
 	if (flags.schedule) plugins.push("    // before HttpPlugin: plugins stop in reverse order, so HTTP stops first, then running jobs drain", "    SchedulePlugin.configure(),");
@@ -2505,7 +2699,9 @@ function mainTs(flags) {
 		const port = "port: Number(process.env.PORT ?? 3000)";
 		plugins.push(adapter === void 0 ? `    HttpPlugin.configure({ ${port} }),` : `    HttpPlugin.configure({ adapter: ${adapter}, ${port} }),`);
 	}
-	if (flags.openapi) plugins.push("    // GET /openapi.json and the API reference at /docs (document options: src/api.ts)", "    OpenApiPlugin.configure(),");
+	if (flags.openapi) plugins.push(`    // GET /openapi.json and the API reference at /docs, with ${OPENAPI_UI_LABELS[flags.openapiUi]} (document options: src/api.ts)`, `    OpenApiPlugin.configure({ ui: ${quote(flags.openapiUi)} }),`);
+	if (flags.graphql) plugins.push("    // POST /graphql, GET /graphql (GraphiQL in development): the schema is derived from the resolvers", "    GraphQLPlugin.configure(),");
+	if (flags.websocket) plugins.push("    // WebSocket gateways on the HTTP server's port (ws on Node.js, Bun's own WebSocket on Bun)", "    WebSocketPlugin.configure(),");
 	return `${imports.join("\n")}
 
 ${localImports.join("\n")}
@@ -2521,6 +2717,19 @@ ${plugins.join("\n")}
 await app.start()
 `;
 }
+/** A single-quoted TypeScript string literal of `value` (quotes, backslashes and line breaks escaped). */
+function quote(value) {
+	let out = "'";
+	for (const char of value) {
+		const code = char.codePointAt(0) ?? 0;
+		if (char === "'" || char === "\\") out += `\\${char}`;
+		else if (char === "\n") out += "\\n";
+		else if (char === "\r") out += "\\r";
+		else if (code < 32 || code === 8232 || code === 8233) out += `\\u${code.toString(16).padStart(4, "0")}`;
+		else out += char;
+	}
+	return `${out}'`;
+}
 function appConfig() {
 	return `import { Config, Env } from '@znight/config'
 
@@ -2696,6 +2905,58 @@ function apiDocument(options) {
 export class Api {}
 `;
 }
+function greetingResolver() {
+	return `import { Args, Query, Resolver } from '@znight/graphql'
+
+import { GreetingService } from './greeting.service.js'
+
+/** A greeting. */
+export interface Greeting {
+  readonly message: string
+}
+
+/**
+ * GraphQL resolver (code-first): the compiler derives the schema from the TypeScript types and the
+ * JSDoc, \`type Query { greeting(name: String!): Greeting! }\` here.
+ */
+@Resolver()
+export class GreetingResolver {
+  constructor(private readonly greetings: GreetingService) {}
+
+  /**
+   * Greets someone.
+   * @param name Who to greet.
+   */
+  @Query()
+  greeting(@Args('name') name: string): Greeting {
+    return { message: this.greetings.greet(name) }
+  }
+}
+`;
+}
+function greetingGateway() {
+	return `import { Gateway, OnMessage, Payload } from '@znight/websocket'
+
+import { CreateGreeting } from './greeting.schemas.js'
+import { GreetingService } from './greeting.service.js'
+
+/**
+ * WebSocket gateway on ws://localhost:3000/ws, served by the HTTP server. Frames are JSON: the
+ * request {"event": "greet", "data": {"name": "Ada"}, "id": 1} is answered with
+ * {"id": 1, "data": {"message": "Hello, Ada."}}.
+ */
+@Gateway('/ws')
+export class GreetingGateway {
+  constructor(private readonly greetings: GreetingService) {}
+
+  /** The payload is validated by the schema (a BAD_REQUEST error reply otherwise). */
+  @OnMessage('greet')
+  greet(@Payload(CreateGreeting) input: CreateGreeting): { message: string } {
+    return { message: this.greetings.greet(input.name, input.excited) }
+  }
+}
+`;
+}
 function heartbeatJobsTest(flags) {
 	return `${testImports(flags, "describe, expect, test")}
 import { SchedulePlugin, SchedulerRegistry } from '@znight/schedule'
@@ -2765,21 +3026,37 @@ describe('GreetingService', () => {
 })
 `;
 }
-function greetingControllerTest(flags) {
-	const imports = [testImports(flags, "afterEach, beforeEach, describe, expect, test"), "import { HttpPlugin } from '@znight/http'"];
+/** Imports and `plugins` array of a `TestApp` test, with the plugins the providers need. */
+function testAppPlugins(flags, names, extra = {}) {
+	const imports = [testImports(flags, names)];
+	if (extra.graphql === true) {
+		imports.push("import { GraphQLPlugin } from '@znight/graphql'");
+		imports.push("import { executeOperation } from '@znight/graphql/testing'");
+	}
+	imports.push("import { HttpPlugin } from '@znight/http'");
 	if (flags.messaging) {
 		imports.push("import { MessagingPlugin } from '@znight/messaging'");
 		imports.push("import { memory } from '@znight/messaging/memory'");
 	}
 	if (flags.observability) imports.push("import { ObservabilityPlugin } from '@znight/observability'");
 	imports.push("import { TestApp } from '@znight/testing'");
+	if (extra.websocket === true) imports.push("import { WebSocketPlugin } from '@znight/websocket'");
 	const plugins = [];
-	if (flags.observability) plugins.push("ObservabilityPlugin.configure({ logging: { level: 'silent' }, metrics: { server: false } })");
+	if (flags.observability) plugins.push("ObservabilityPlugin.configure({ logging: { level: 'silent' }, metrics: false })");
 	if (flags.messaging) plugins.push("MessagingPlugin.configure({ driver: memory() })");
 	plugins.push("HttpPlugin.configure({ port: 0 })");
-	const pluginList = plugins.length === 1 ? `[${plugins[0]}]` : `[\n${plugins.map((plugin) => `        ${plugin},`).join("\n")}\n      ]`;
+	if (extra.graphql === true) plugins.push("GraphQLPlugin.configure()");
+	if (extra.websocket === true) plugins.push("WebSocketPlugin.configure()");
+	const list = plugins.length === 1 ? `[${plugins[0]}]` : `[\n${plugins.map((plugin) => `        ${plugin},`).join("\n")}\n      ]`;
+	return {
+		imports: imports.join("\n"),
+		plugins: list
+	};
+}
+function greetingControllerTest(flags) {
+	const { imports, plugins: pluginList } = testAppPlugins(flags, "afterEach, beforeEach, describe, expect, test");
 	const greeting = "Hello";
-	return `${imports.join("\n")}
+	return `${imports}
 
 import { __ZNIGHT_METADATA__ as metadata } from '../src/.znight/container.generated.js'
 
@@ -2816,6 +3093,58 @@ describe('GreetingController', () => {
 })
 `;
 }
+function greetingResolverTest(flags) {
+	const { imports, plugins } = testAppPlugins(flags, "describe, expect, test", { graphql: true });
+	return `${imports}
+
+import { __ZNIGHT_METADATA__ as metadata } from '../src/.znight/container.generated.js'
+
+// executeOperation() sends the operation through the whole HTTP pipeline, in memory
+describe('GreetingResolver', () => {
+  test('query { greeting }', async () => {
+    const app = await TestApp.create({
+      metadata,
+      plugins: ${plugins},
+    })
+    try {
+      const response = await executeOperation(app, { query: '{ greeting(name: "Ada") { message } }' })
+
+      expect(response.status).toBe(200)
+      expect(response.errors).toBeUndefined()
+      expect(response.data).toEqual({ greeting: { message: 'Hello, Ada.' } })
+    } finally {
+      await app.close()
+    }
+  })
+})
+`;
+}
+function greetingGatewayTest(flags) {
+	const { imports, plugins } = testAppPlugins(flags, "describe, expect, test", { websocket: true });
+	return `${imports}
+
+import { __ZNIGHT_METADATA__ as metadata } from '../src/.znight/container.generated.js'
+
+// app.connect() opens an in-memory connection, through the real handshake
+describe('GreetingGateway', () => {
+  test('answers "greet" requests', async () => {
+    const app = await TestApp.create({
+      metadata,
+      plugins: ${plugins},
+    })
+    try {
+      const client = await app.connect('/ws')
+
+      expect(await client.request('greet', { name: 'Ada', excited: true })).toEqual({ message: 'Hello, Ada!' })
+      await expect(client.request('greet', { name: '' })).rejects.toMatchObject({ code: 'BAD_REQUEST' })
+      await client.close()
+    } finally {
+      await app.close()
+    }
+  })
+})
+`;
+}
 function readme(options, flags) {
 	const run = (script) => runScript(flags.pm, script);
 	const znight = execBinary(flags.pm, "znight");
@@ -2825,7 +3154,20 @@ function readme(options, flags) {
 		flags.observability ? "- **Observability** with `@znight/observability` (structured logs, metrics, traces)" : void 0,
 		flags.messaging ? "- **Messaging** with `@znight/messaging` (in-memory broker in `src/main.ts`)" : void 0,
 		flags.schedule ? "- **Scheduled jobs** with `@znight/schedule` (`src/app/heartbeat.jobs.ts`)" : void 0,
-		flags.openapi ? "- **OpenAPI** with `@znight/openapi` (`/openapi.json`, API reference at `/docs`, options in `src/api.ts`)" : void 0
+		flags.openapi ? `- **OpenAPI** with \`@znight/openapi\` (\`/openapi.json\`, ${OPENAPI_UI_LABELS[flags.openapiUi]} API reference at \`/docs\`, options in \`src/api.ts\`)` : void 0,
+		flags.graphql ? "- **GraphQL** with `@znight/graphql` (code-first: the schema is derived from `src/app/greeting.resolver.ts`)" : void 0,
+		flags.websocket ? "- **WebSocket** with `@znight/websocket` (`src/app/greeting.gateway.ts`, on the HTTP port at `/ws`)" : void 0
+	].filter((line) => line !== void 0);
+	const app = [
+		flags.config ? "app.config.ts            # @Config: settings read from the environment" : void 0,
+		flags.messaging ? "greeting.consumer.ts     # @Consumer: handles the \"greetings\" queue" : void 0,
+		"greeting.controller.ts   # @Controller: /greetings routes",
+		flags.websocket ? "greeting.gateway.ts      # @Gateway: the /ws WebSocket endpoint" : void 0,
+		flags.graphql ? "greeting.resolver.ts     # @Resolver: the greeting GraphQL query" : void 0,
+		"greeting.schemas.ts      # Zod schemas",
+		"greeting.service.ts      # @Injectable",
+		"health.controller.ts     # GET /health",
+		flags.schedule ? "heartbeat.jobs.ts        # @Cron: a job every minute" : void 0
 	].filter((line) => line !== void 0);
 	const tree = [
 		"src/",
@@ -2833,16 +3175,11 @@ function readme(options, flags) {
 		flags.openapi ? "├─ api.ts                     # @OpenApiDocument: title, tags, security of openapi.json" : void 0,
 		"├─ .znight/                   # generated DI container (git-ignored)",
 		"└─ app/",
-		flags.config ? "   ├─ app.config.ts            # @Config: settings read from the environment" : void 0,
-		flags.messaging ? "   ├─ greeting.consumer.ts     # @Consumer: handles the \"greetings\" queue" : void 0,
-		"   ├─ greeting.controller.ts   # @Controller: /greetings routes",
-		"   ├─ greeting.schemas.ts      # Zod schemas",
-		"   ├─ greeting.service.ts      # @Injectable",
-		flags.schedule ? "   ├─ health.controller.ts     # GET /health" : "   └─ health.controller.ts     # GET /health",
-		flags.schedule ? "   └─ heartbeat.jobs.ts        # @Cron: a job every minute" : void 0,
+		...app.map((line, index) => `   ${index === app.length - 1 ? "└─" : "├─"} ${line}`),
 		"test/                          # TestBed (unit) and TestApp (HTTP) tests",
 		"vite.config.ts                 # znight() plugin: generates the container, server build",
-		"znight.config.ts               # compiler options"
+		"znight.config.ts               # compiler options",
+		flags.docker ? "Dockerfile                     # production image (multi-stage, non-root)" : void 0
 	].filter((line) => line !== void 0);
 	const configNote = flags.config ? `
 ## Configuration
@@ -2853,6 +3190,20 @@ problem listed.${flags.bun ? `
 
 \`bunfig.toml\` turns Bun's own \`.env\` loading off (\`env = false\`): the files are read by
 \`@znight/config\`, the same way on Node.js and Bun.` : ""}
+` : "";
+	const image = dockerTag(options.name);
+	const dockerNote = flags.docker ? `
+## Docker
+
+\`\`\`sh
+docker build -t ${image} .
+docker run --rm -p 3000:3000 ${image}
+\`\`\`
+
+The \`Dockerfile\` builds with every dependency (the Znight compiler runs during the build), then
+ships \`dist/\` with the production dependencies only, on ${flags.bun ? "Bun" : "Node.js"}, as a non-root user, with
+\`NODE_ENV=production\` and a health check on \`GET /health\`. Installs are frozen: the lockfile of
+\`${flags.pm} install\` must exist.
 ` : "";
 	const testNote = flags.bun ? "`bun test` regenerates the container first (`bunfig.toml` preloads `@znight/compiler/bun`)." : "Vitest uses `vite.config.ts`, so the `znight()` plugin regenerates the container before the tests.";
 	const compilerNote = flags.bun ? "the `znight()` Vite plugin, the Bun preload of the tests and `znight generate`" : "the `znight()` Vite plugin (builds and Vitest) and `znight generate`";
@@ -2879,7 +3230,7 @@ ${flags.openapi ? `| \`${run("openapi")}\` | Write \`openapi.json\` (commit it;
 ${run("dev")}
 curl localhost:3000/health
 curl localhost:3000/greetings/Ada?excited=true
-curl -X POST localhost:3000/greetings -H 'content-type: application/json' -d '{"name":"Grace"}'${flags.openapi ? "\ncurl localhost:3000/openapi.json        # the API reference is at http://localhost:3000/docs" : ""}
+curl -X POST localhost:3000/greetings -H 'content-type: application/json' -d '{"name":"Grace"}'${flags.openapi ? "\ncurl localhost:3000/openapi.json        # the API reference is at http://localhost:3000/docs" : ""}${flags.graphql ? `\ncurl localhost:3000/graphql -H 'content-type: application/json' -d '{"query":"{ greeting(name: \\"Ada\\") { message } }"}'` : ""}
 \`\`\`
 
 ## Project structure
@@ -2896,7 +3247,7 @@ Add code with the generators:
 ${znight} g service users/user        # src/users/user.service.ts
 ${znight} g controller users/user     # src/users/user.controller.ts${flags.schedule ? `\n${znight} g job reports/digest        # src/reports/digest.jobs.ts` : ""}
 \`\`\`
-${configNote}
+${configNote}${dockerNote}
 ## Tests
 
 ${testNote}
@@ -2916,7 +3267,8 @@ const newCommand = defineCommand({
 		aliases: ["create", "init"],
 		examples: [
 			"znight new my-service",
-			"znight new my-service --yes --pm pnpm --adapter fastify --features config,observability,messaging",
+			"znight new my-service --yes --pm pnpm --adapter hono --features config,observability,messaging",
+			"znight new my-api --yes --features config,observability,openapi,graphql,websocket --openapi-ui swagger",
 			"znight new my-worker --yes --features config,schedule",
 			"znight new . --yes --no-install"
 		]
@@ -2945,17 +3297,27 @@ const newCommand = defineCommand({
 		adapter: {
 			type: "enum",
 			options: [
-				"node",
 				"fastify",
+				"node",
 				"express",
 				"hono"
 			],
-			description: "HTTP adapter (default: node, the built-in node:http server)"
+			description: "HTTP adapter (default: fastify; node is the built-in node:http server)"
 		},
 		features: {
 			type: "string",
 			valueHint: "list",
-			description: "Comma-separated features: config, observability, messaging, schedule, openapi, or \"all\" / \"none\" (default: config,observability)"
+			description: "Comma-separated features: config, observability, messaging, schedule, openapi, graphql, websocket, or \"all\" / \"none\" (default: config,observability)"
+		},
+		"openapi-ui": {
+			type: "enum",
+			options: ["scalar", "swagger"],
+			description: "API reference UI of the openapi feature, served at /docs (default: scalar)"
+		},
+		docker: {
+			type: "boolean",
+			default: true,
+			description: "Do not generate a Dockerfile"
 		},
 		install: {
 			type: "boolean",
@@ -3013,9 +3375,21 @@ const newCommand = defineCommand({
 				value,
 				label: ADAPTER_LABELS[value]
 			})),
-			initialValue: "node"
-		}) ?? "node";
+			initialValue: "fastify"
+		}) ?? "fastify";
 		const features = await chooseFeatures(options.features, prompts);
+		const openapiUi = options["openapi-ui"] ?? (features.includes("openapi") ? await prompts?.select({
+			message: "OpenAPI reference UI (served at /docs)?",
+			choices: OPENAPI_UIS.map((value) => ({
+				value,
+				label: OPENAPI_UI_LABELS[value]
+			})),
+			initialValue: "scalar"
+		}) : void 0) ?? "scalar";
+		const docker = prompts === void 0 || hasFlag(rawArgs, "docker") ? options.docker !== false : await prompts.confirm({
+			message: "Add a Dockerfile (production image)?",
+			initialValue: true
+		});
 		const install = prompts === void 0 || hasFlag(rawArgs, "install") ? options.install !== false : await prompts.confirm({
 			message: `Install the dependencies with ${packageManager}?`,
 			initialValue: true
@@ -3029,6 +3403,8 @@ const newCommand = defineCommand({
 			packageManager,
 			adapter,
 			features,
+			openapiUi,
+			docker,
 			znightVersion: cli.version
 		});
 		writeProject(directory, files);
@@ -3723,8 +4099,9 @@ const startCommand = defineCommand({
 			env,
 			detached: true
 		});
+		const consoleEvent = (signal) => cli.runtime.platform === "win32" && (signal === "SIGINT" || signal === "SIGHUP");
 		const forward = (signal) => () => {
-			child.kill(signal);
+			if (!consoleEvent(signal)) child.kill(signal);
 		};
 		const listeners = [
 			"SIGINT",
@@ -3885,4 +4262,4 @@ function stackOf(error) {
 }
 export { CancelledError as _, planSchematic as a, UsageError as b, FEATURES as c, AppSupervisor as d, createContext as f, defineCommand as g, loadCompiler as h, findSchematic as i, HTTP_ADAPTERS as l, adaptCompilerModule as m, main as n, renderProject as o, cliVersion as p, SCHEMATICS as r, DEFAULT_FEATURES as s, COMMANDS as t, PACKAGE_MANAGERS as u, CliError as v, ExitCode as y };
 
-//# sourceMappingURL=main-DUyElIVZ.mjs.map
+//# sourceMappingURL=main-CLoS12u4.mjs.map