kizlo 0.2.0 → 0.2.1

package/README.md

@@ -41,7 +41,7 @@ Kizlo is a framework-agnostic toolkit for headless WordPress, built for a stack
 Set up Kizlo in your project:
 
 ```bash
-npx kizlo init
+npx kizlo@latest init
 ```
 
 Watch your extensions and regenerate the contract during development:

package/dist/cli/commands/dev.js

@@ -2,6 +2,7 @@ import { createStack } from "../wp/docker.js";
 import { ensureGitignored, envGroups, getVersion, groupDefault, mergeEnv, pickStackPort, withSpinner } from "../utils.js";
 import { palette, printBanner } from "../banner.js";
 import { resolveDevConfig } from "../daemon/config.js";
+import { startWatcher } from "../daemon/watch.js";
 import { bootstrapDev } from "../wp/dev.js";
 import { reapOrphans, registerSession, removeProjectContainers, spawnWatchdog, unregisterSession } from "../wp/session.js";
 import { syncSiteSettings } from "../wp/settings.js";
@@ -195,6 +196,8 @@ async function startForeground(cfg) {
 	const took = ms < 1e3 ? `${ms}ms` : `${(ms / 1e3).toFixed(1)}s`;
 	process.stdout.write(`\n   ${dim}Press ${reset}${bold}Ctrl+C${reset}${dim} (or close the terminal) to stop the development stack${reset}\n`);
 	process.stdout.write(`\n ${green}✓${reset} Ready in ${took}\n\n`);
+	const stopWatcher = await startWatcher(ready.configDir);
+	if (stopWatcher) process.on("exit", stopWatcher);
 	setInterval(() => {}, 1 << 30);
 	await new Promise(() => {});
 }

package/dist/cli/commands/init.js

@@ -2,12 +2,12 @@ import { composeStop, createStack, dockerAvailable } from "../wp/docker.js";
 import { addDependencyArgs, detectImportAlias, detectPackageManager, ensureGitignored, envGroups, envKeysPresent, getVersion, loadEnvFiles, mergeEnv, pickStackPort, resolveModuleImport, runCommand, writeFileIfAbsent } from "../utils.js";
 import { printBanner } from "../banner.js";
 import { DEFAULT_DEV_DB_PORT, DEFAULT_DEV_PORT, resolveStackName } from "../daemon/config.js";
+import { CONTRACT_BARREL } from "../daemon/generate.js";
 import { createAdminAppPassword } from "../wp/bootstrap.js";
 import { bootstrapDev } from "../wp/dev.js";
 import { removeProjectContainers } from "../wp/session.js";
 import { syncSiteSettings } from "../wp/settings.js";
 import { devStack } from "../wp/stack.js";
-import { CONTRACT_BARREL } from "../daemon/generate.js";
 import { PRESETS, detectPreset, getPreset } from "../presets/index.js";
 import z from "zod/v4";
 import { randomBytes } from "node:crypto";
@@ -375,9 +375,9 @@ const init = defineCommand({
 		if (!hasKizlo) {
 			const s = p.spinner();
 			s.start(`Installing kizlo with ${pm}`);
-			const ok = runCommand(addDependencyArgs(pm, "kizlo"), cwd, "ignore");
+			const ok = runCommand(addDependencyArgs(pm, "kizlo@latest"), cwd, "ignore");
 			s.stop(ok ? "Installed kizlo" : "Could not install kizlo automatically");
-			if (!ok) p.log.warn(`Install it yourself: ${addDependencyArgs(pm, "kizlo").join(" ")}`);
+			if (!ok) p.log.warn(`Install it yourself: ${addDependencyArgs(pm, "kizlo@latest").join(" ")}`);
 		}
 		if (preset.apiPath && setup.baseUrl) setup.baseUrl = withApiPath(setup.baseUrl, preset.apiPath);
 		let adminPassword;
@@ -487,13 +487,14 @@ const init = defineCommand({
 		}
 		p.note([
 			...setup.mode === "local" ? [
-				`Start your local WordPress dev stack:`,
+				`Start your local WordPress dev stack (also watches your extensions):`,
 				`  npx kizlo dev`,
 				``
-			] : [],
-			`Watch your extensions and regenerate the contract during development:`,
-			`  npx kizlo watch`,
-			``,
+			] : [
+				`Watch your extensions and regenerate the contract during development:`,
+				`  npx kizlo watch`,
+				``
+			],
 			`Generate the contract once for production builds:`,
 			`  npx kizlo generate`
 		].join("\n"), "Next steps");

package/dist/cli/commands/watch.js

@@ -1,10 +1,6 @@
-import { log } from "../daemon/logger.js";
 import { getVersion } from "../utils.js";
 import { printBanner } from "../banner.js";
-import { resolveConfig } from "../daemon/config.js";
-import { generateOnce } from "../daemon/generate.js";
-import { acquire, isLocked, lockPath, release } from "../daemon/lock.js";
-import { watch as watch$1 } from "../daemon/watch.js";
+import { startWatcher } from "../daemon/watch.js";
 import { defineCommand } from "citty";
 
 //#region src/cli/commands/watch.ts
@@ -13,32 +9,18 @@ const args = { dir: {
 	description: "Override the Kizlo directory (defaults to kizlo.config.ts)"
 } };
 async function run({ args: args$1 }) {
-	const cwd = process.cwd();
-	const lock = lockPath(cwd);
-	if (isLocked(lock)) {
-		log.info("Watcher already running — nothing to do.");
-		return;
-	}
 	printBanner(getVersion());
-	const cfg = await resolveConfig(cwd, { dir: args$1.dir });
-	acquire(lock);
-	const cleanup = () => release(lock);
-	process.on("exit", cleanup);
+	const stop = await startWatcher(process.cwd(), { dir: args$1.dir });
+	if (!stop) return;
+	process.on("exit", stop);
 	for (const signal of [
 		"SIGINT",
 		"SIGTERM",
 		"SIGHUP"
 	]) process.on(signal, () => {
-		cleanup();
+		stop();
 		process.exit(0);
 	});
-	try {
-		if (await generateOnce(cfg)) log.success("Contract generated");
-		else log.warn(`No Kizlo server found in ${cfg.serverEntry}`);
-	} catch (error) {
-		log.error("Failed to generate the Kizlo contract:", error);
-	}
-	await watch$1(cfg);
 }
 const watch = defineCommand({
 	meta: {

package/dist/cli/daemon/logger.js

@@ -3,6 +3,7 @@ import { consola } from "consola";
 //#region src/cli/daemon/logger.ts
 /** Tagged logger for the daemon — every line is prefixed with `kizlo`. */
 const log = consola.withTag("kizlo");
+log.options.formatOptions.date = false;
 
 //#endregion
 export { log };

package/dist/cli/daemon/watch.js

@@ -1,5 +1,7 @@
 import { log } from "./logger.js";
+import { resolveConfig } from "./config.js";
 import { generateOnce } from "./generate.js";
+import { acquire, isLocked, lockPath, release } from "./lock.js";
 import path from "node:path";
 import { FSWatcher } from "chokidar";
 
@@ -28,10 +30,41 @@ async function watch(cfg) {
 	});
 	const onChange = debounce(() => regenerate(cfg), 300);
 	watcher.add(path.resolve(cfg.cwd, cfg.serverDir));
-	watcher.on("ready", () => log.start("Watching for changes..."));
+	watcher.on("ready", () => log.start("Watching for contract changes..."));
 	watcher.on("all", () => void onChange());
 	return watcher;
 }
+/**
+* Acquire the single-instance lock, generate the contract once, and start the file
+* watcher. Returns a synchronous `stop()` that closes the watcher and releases the
+* lock — or `undefined` when another watcher already holds the lock (a standalone
+* `kizlo watch`, or a framework dev script), in which case the caller carries on
+* without watching. Shared by the standalone `kizlo watch` command and the
+* folded-in watcher of `kizlo dev`, so a single terminal covers both.
+*/
+async function startWatcher(cwd, opts) {
+	const lock = lockPath(cwd);
+	if (isLocked(lock)) {
+		log.info("Watcher already running — skipping the contract watcher.");
+		return;
+	}
+	const cfg = await resolveConfig(cwd, { dir: opts?.dir });
+	acquire(lock);
+	try {
+		if (await generateOnce(cfg)) log.success("Contract generated");
+		else log.warn(`No Kizlo server found in ${cfg.serverEntry}`);
+	} catch (error) {
+		log.error("Failed to generate the Kizlo contract:", error);
+	}
+	const watcher = await watch(cfg);
+	let stopped = false;
+	return () => {
+		if (stopped) return;
+		stopped = true;
+		release(lock);
+		watcher.close();
+	};
+}
 
 //#endregion
-export { watch };
+export { startWatcher };

package/dist/package.js

@@ -1,5 +1,5 @@
 //#region package.json
-var version = "0.2.0";
+var version = "0.2.1";
 
 //#endregion
 export { version };

package/dist/router.d.ts

@@ -21,7 +21,7 @@ declare const ROUTER_MAP: {
       excerpt: string | null;
       commentsEnabled: boolean;
       protected: boolean;
-      format: "standard" | "aside" | "chat" | "gallery" | "link" | "image" | "quote" | "status" | "video" | "audio";
+      format: "image" | "link" | "standard" | "aside" | "chat" | "gallery" | "quote" | "status" | "video" | "audio";
       sticky: boolean;
       author: {
         id: number;
@@ -150,7 +150,7 @@ declare const ROUTER_MAP: {
         include?: string | number | (string | number)[] | undefined;
         offset?: string | number | undefined;
         order?: "asc" | "desc" | undefined;
-        orderby?: "date" | "id" | "slug" | "title" | "author" | "include" | "parent" | "relevance" | "include_slugs" | undefined;
+        orderby?: "title" | "author" | "date" | "id" | "parent" | "slug" | "include" | "relevance" | "include_slugs" | undefined;
         searchColumns?: string[] | undefined;
         slug?: string | string[] | undefined;
         taxRelation?: "AND" | "OR" | undefined;
@@ -169,7 +169,7 @@ declare const ROUTER_MAP: {
         excerpt: string | null;
         commentsEnabled: boolean;
         protected: boolean;
-        format: "standard" | "aside" | "chat" | "gallery" | "link" | "image" | "quote" | "status" | "video" | "audio";
+        format: "image" | "link" | "standard" | "aside" | "chat" | "gallery" | "quote" | "status" | "video" | "audio";
         sticky: boolean;
         author: {
           id: number;
@@ -342,7 +342,7 @@ declare const ROUTER_MAP: {
           include?: string | number | (string | number)[] | undefined;
           offset?: string | number | undefined;
           order?: "asc" | "desc" | undefined;
-          orderby?: "date" | "id" | "slug" | "title" | "author" | "include" | "parent" | "relevance" | "include_slugs" | "menu_order" | undefined;
+          orderby?: "title" | "author" | "date" | "id" | "parent" | "slug" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
           searchColumns?: string[] | undefined;
           slug?: string | string[] | undefined;
           taxRelation?: "AND" | "OR" | undefined;
@@ -355,7 +355,7 @@ declare const ROUTER_MAP: {
           id: number;
           href: string;
           name: string;
-          type: "custom" | "post" | "page" | "category" | "product" | "product_cat" | "product_tag";
+          type: "custom" | "page" | "post" | "category" | "product" | "product_cat" | "product_tag";
           description: string;
           meta: {
             [x: string]: string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | (string | number | boolean | /*elided*/any | {
@@ -413,7 +413,7 @@ declare const ROUTER_MAP: {
           include?: string | number | (string | number)[] | undefined;
           offset?: string | number | undefined;
           order?: "asc" | "desc" | undefined;
-          orderby?: "date" | "id" | "slug" | "title" | "author" | "include" | "parent" | "relevance" | "include_slugs" | "menu_order" | undefined;
+          orderby?: "title" | "author" | "date" | "id" | "parent" | "slug" | "include" | "relevance" | "include_slugs" | "menu_order" | undefined;
           searchColumns?: string[] | undefined;
           slug?: string | string[] | undefined;
           taxRelation?: "AND" | "OR" | undefined;
@@ -503,7 +503,7 @@ declare const ROUTER_MAP: {
         include?: string | number | (string | number)[] | undefined;
         offset?: string | number | undefined;
         order?: "asc" | "desc" | undefined;
-        orderby?: "date" | "id" | "post" | "include" | "parent" | undefined;
+        orderby?: "date" | "id" | "parent" | "post" | "include" | undefined;
         parent?: string | number | (string | number)[] | undefined;
         parentExclude?: string | number | (string | number)[] | undefined;
         post?: string | number | (string | number)[] | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kizlo",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "A headless WordPress toolkit for TypeScript.",
   "keywords": [