@waniwani/kit 0.1.6 → 0.1.7

package/{cli/init.mjs → dist/cli/init.js}

@@ -26,46 +26,38 @@
  * alone. Only the app's own source files count as a collision, and those stop
  * the command until `--force` says otherwise.
  */
-
 import { spawn } from "node:child_process";
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { basename, dirname, join, relative } from "node:path";
 import { createInterface } from "node:readline/promises";
-import { fileURLToPath } from "node:url";
-import { bold, dim, green, red, yellow } from "./log.mjs";
-import { installable } from "./peers.mjs";
-
-const PACKAGE_ROOT = join(dirname(fileURLToPath(import.meta.url)), "..");
-const MANIFEST = JSON.parse(readFileSync(join(PACKAGE_ROOT, "package.json"), "utf-8"));
-
+import { bold, dim, green, red, yellow } from "./log.js";
+import { PACKAGE_VERSION } from "./manifest.js";
+import { installable } from "./peers.js";
 /** A directory name as an MCP server name: `My App` becomes `my-app`. */
 function slugify(input) {
-	const slug = input
-		.trim()
-		.toLowerCase()
-		.replace(/[^a-z0-9]+/g, "-")
-		.replace(/^-+|-+$/g, "");
-	return slug || "my-app";
+    const slug = input
+        .trim()
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-+|-+$/g, "");
+    return slug || "my-app";
 }
-
 /** `my-app` becomes `My app`, for the human-facing title. */
 function titleize(slug) {
-	const words = slug.replace(/[-_]+/g, " ");
-	return words.charAt(0).toUpperCase() + words.slice(1);
+    const words = slug.replace(/[-_]+/g, " ");
+    return words.charAt(0).toUpperCase() + words.slice(1);
 }
-
 /**
  * A title, made safe to drop into the generated TypeScript and Markdown.
  * Backticks, quotes, backslashes and `$` are the characters that would end a
  * string or a template literal early, and a product name needs none of them.
  */
 function cleanTitle(input) {
-	return input
-		.replace(/[`"'\\$]/g, "")
-		.replace(/\s+/g, " ")
-		.trim();
+    return input
+        .replace(/[`"'\\$]/g, "")
+        .replace(/\s+/g, " ")
+        .trim();
 }
-
 /**
  * What a new app depends on.
  *
@@ -82,45 +74,37 @@ function cleanTitle(input) {
  * than arriving because something else asked for it.
  */
 function dependencies() {
-	return {
-		"@waniwani/kit": `^${MANIFEST.version}`,
-		"@waniwani/sdk": installable("@waniwani/sdk"),
-		react: installable("react"),
-		"react-dom": installable("react-dom"),
-		zod: installable("zod"),
-	};
+    return {
+        "@waniwani/kit": `^${PACKAGE_VERSION}`,
+        "@waniwani/sdk": installable("@waniwani/sdk"),
+        react: installable("react"),
+        "react-dom": installable("react-dom"),
+        zod: installable("zod"),
+    };
 }
-
 // ------------------------------------------------------------ scaffold content
-
 /**
  * The tool name and the widget name the scaffold uses. They appear in five
  * files, including inside prose the model reads, so they are named once.
  */
 const TOOL = "search-products";
 const WIDGET = "product-list";
-
 function packageJson(app) {
-	return `${JSON.stringify(
-		{
-			name: app.name,
-			private: true,
-			type: "module",
-			scripts: {
-				check: "waniwani check",
-				dev: "waniwani dev",
-				build: "waniwani build",
-				start: "waniwani start",
-			},
-			dependencies: dependencies(),
-		},
-		null,
-		2,
-	)}\n`;
+    return `${JSON.stringify({
+        name: app.name,
+        private: true,
+        type: "module",
+        scripts: {
+            check: "waniwani check",
+            dev: "waniwani dev",
+            build: "waniwani build",
+            start: "waniwani start",
+        },
+        dependencies: dependencies(),
+    }, null, 2)}\n`;
 }
-
 function appConfig(app) {
-	return `import { defineApp } from "@waniwani/kit";
+    return `import { defineApp } from "@waniwani/kit";
 
 export default defineApp({
 	// The MCP server name. Hosts show \`title\` to humans and use this one as the id.
@@ -129,9 +113,8 @@ export default defineApp({
 });
 `;
 }
-
 function tool() {
-	return `import { defineTool } from "@waniwani/kit";
+    return `import { defineTool } from "@waniwani/kit";
 import { z } from "zod";
 
 /**
@@ -183,9 +166,8 @@ export default defineTool({
 });
 `;
 }
-
 function widgetContract() {
-	return `import { defineWidget } from "@waniwani/kit";
+    return `import { defineWidget } from "@waniwani/kit";
 import { z } from "zod";
 
 const product = z.object({
@@ -222,9 +204,8 @@ Wait for the shopper to pick one, then answer about that product.\`,
 });
 `;
 }
-
 function widgetUi() {
-	return `import { useLayout, useSendFollowUpMessage, useWidget } from "@waniwani/kit/web";
+    return `import { useLayout, useSendFollowUpMessage, useWidget } from "@waniwani/kit/web";
 import widget from "./widget.js";
 
 const euros = (value: number) =>
@@ -277,26 +258,23 @@ export default function ProductList() {
 }
 `;
 }
-
 function envExample() {
-	return `# Optional. Without it the app still runs: flows use MemoryKvStore and
+    return `# Optional. Without it the app still runs: flows use MemoryKvStore and
 # withWaniwani degrades to a no-op. With it, flow state is hosted and tracking
 # reaches app.waniwani.ai.
 WANIWANI_API_KEY=
 WANIWANI_PUBLIC_KEY=
 `;
 }
-
 function gitignore() {
-	return `node_modules/
+    return `node_modules/
 .waniwani/
 .env
 .env.local
 `;
 }
-
 function readme(app) {
-	return `# ${app.title}
+    return `# ${app.title}
 
 An MCP app built with [@waniwani/kit](https://www.npmjs.com/package/@waniwani/kit).
 You own the folders below. The server, the transport, the bundling and the deploy
@@ -322,7 +300,6 @@ npm run start      # run the production build
 and it stays out of git.
 `;
 }
-
 /**
  * The files a new app gets.
  *
@@ -331,27 +308,25 @@ and it stays out of git.
  * scaffold's contribution into what is there, and `keep` leaves it untouched.
  */
 function scaffold(app, { minimal }) {
-	const files = [
-		{ path: "package.json", contents: packageJson(app), whenPresent: "merge", merge: mergePackageJson },
-		{ path: ".gitignore", contents: gitignore(), whenPresent: "merge", merge: mergeGitignore },
-		{ path: ".env.example", contents: envExample(), whenPresent: "keep" },
-		{ path: "README.md", contents: readme(app), whenPresent: "keep" },
-		{ path: "waniwani.config.ts", contents: appConfig(app) },
-		{ path: `tools/${TOOL}.ts`, contents: tool() },
-	];
-
-	if (!minimal) {
-		files.push(
-			{ path: `widgets/${WIDGET}/widget.ts`, contents: widgetContract() },
-			{ path: `widgets/${WIDGET}/ui.tsx`, contents: widgetUi() },
-		);
-	}
-
-	return files;
+    const files = [
+        {
+            path: "package.json",
+            contents: packageJson(app),
+            whenPresent: "merge",
+            merge: mergePackageJson,
+        },
+        { path: ".gitignore", contents: gitignore(), whenPresent: "merge", merge: mergeGitignore },
+        { path: ".env.example", contents: envExample(), whenPresent: "keep" },
+        { path: "README.md", contents: readme(app), whenPresent: "keep" },
+        { path: "waniwani.config.ts", contents: appConfig(app) },
+        { path: `tools/${TOOL}.ts`, contents: tool() },
+    ];
+    if (!minimal) {
+        files.push({ path: `widgets/${WIDGET}/widget.ts`, contents: widgetContract() }, { path: `widgets/${WIDGET}/ui.tsx`, contents: widgetUi() });
+    }
+    return files;
 }
-
 // -------------------------------------------------------------------- merging
-
 /**
  * Add the scripts and dependencies an app needs to a manifest that is already
  * there, and touch nothing else. A key the repo already declares is the repo's
@@ -360,36 +335,34 @@ function scaffold(app, { minimal }) {
  * @returns the keys added, for the CLI to report
  */
 function mergePackageJson(file, contents) {
-	const existing = JSON.parse(readFileSync(file, "utf-8"));
-	const generated = JSON.parse(contents);
-	const added = [];
-
-	const fold = (section) => {
-		const merged = { ...existing[section] };
-		for (const [key, value] of Object.entries(generated[section])) {
-			if (merged[key]) continue;
-			merged[key] = value;
-			added.push(`${section}.${key}`);
-		}
-		return merged;
-	};
-
-	const next = {
-		...existing,
-		// App modules are ESM. A repo that says commonjs is warned about instead of
-		// rewritten, since flipping it changes how the rest of that repo loads.
-		type: existing.type ?? "module",
-		scripts: fold("scripts"),
-		dependencies: fold("dependencies"),
-	};
-	if (!existing.type) added.push("type");
-
-	if (added.length > 0) {
-		writeFileSync(file, `${JSON.stringify(next, null, 2)}\n`);
-	}
-	return added;
+    const existing = JSON.parse(readFileSync(file, "utf-8"));
+    const generated = JSON.parse(contents);
+    const added = [];
+    const fold = (section) => {
+        const merged = { ...existing[section] };
+        for (const [key, value] of Object.entries(generated[section] ?? {})) {
+            if (merged[key])
+                continue;
+            merged[key] = value;
+            added.push(`${section}.${key}`);
+        }
+        return merged;
+    };
+    const next = {
+        ...existing,
+        // App modules are ESM. A repo that says commonjs is warned about instead of
+        // rewritten, since flipping it changes how the rest of that repo loads.
+        type: existing.type ?? "module",
+        scripts: fold("scripts"),
+        dependencies: fold("dependencies"),
+    };
+    if (!existing.type)
+        added.push("type");
+    if (added.length > 0) {
+        writeFileSync(file, `${JSON.stringify(next, null, 2)}\n`);
+    }
+    return added;
 }
-
 /**
  * Add the lines the app does not ignore yet, leaving every line it wrote alone.
  * A trailing slash is not part of the comparison, so a repo ignoring
@@ -398,38 +371,34 @@ function mergePackageJson(file, contents) {
  * @returns the lines added, for the CLI to report
  */
 function mergeGitignore(file, contents) {
-	const existing = readFileSync(file, "utf-8");
-	const bare = (line) => line.trim().replace(/\/$/, "");
-	const known = new Set(existing.split("\n").map(bare));
-
-	const additions = contents
-		.split("\n")
-		.filter((line) => line.trim() && !line.trim().startsWith("#") && !known.has(bare(line)));
-
-	if (additions.length === 0) return [];
-	const prefix = !existing || existing.endsWith("\n") ? "" : "\n";
-	writeFileSync(file, `${existing}${prefix}${additions.join("\n")}\n`);
-	return additions;
+    const existing = readFileSync(file, "utf-8");
+    const bare = (line) => line.trim().replace(/\/$/, "");
+    const known = new Set(existing.split("\n").map(bare));
+    const additions = contents
+        .split("\n")
+        .filter((line) => line.trim() && !line.trim().startsWith("#") && !known.has(bare(line)));
+    if (additions.length === 0)
+        return [];
+    const prefix = !existing || existing.endsWith("\n") ? "" : "\n";
+    writeFileSync(file, `${existing}${prefix}${additions.join("\n")}\n`);
+    return additions;
 }
-
 // ------------------------------------------------------------------- the shell
-
 function write(file, contents) {
-	mkdirSync(dirname(file), { recursive: true });
-	writeFileSync(file, contents);
+    mkdirSync(dirname(file), { recursive: true });
+    writeFileSync(file, contents);
 }
-
 /** One question, with the default in parentheses and Enter taking it. */
 async function ask(question, fallback) {
-	const rl = createInterface({ input: process.stdin, output: process.stdout });
-	try {
-		const answer = await rl.question(`${question} ${dim(`(${fallback})`)} `);
-		return answer.trim() || fallback;
-	} finally {
-		rl.close();
-	}
+    const rl = createInterface({ input: process.stdin, output: process.stdout });
+    try {
+        const answer = await rl.question(`${question} ${dim(`(${fallback})`)} `);
+        return answer.trim() || fallback;
+    }
+    finally {
+        rl.close();
+    }
 }
-
 /**
  * The package manager that invoked this command, which npm, pnpm, yarn and bun
  * all announce in `npm_config_user_agent`. Nothing to detect from lockfiles: a
@@ -437,27 +406,30 @@ async function ask(question, fallback) {
  * typed with one of the four.
  */
 function packageManager() {
-	const agent = process.env.npm_config_user_agent ?? "";
-	return ["bun", "pnpm", "yarn", "npm"].find((name) => agent.startsWith(name)) ?? "npm";
+    const agent = process.env.npm_config_user_agent ?? "";
+    const names = ["bun", "pnpm", "yarn", "npm"];
+    return names.find((name) => agent.startsWith(name)) ?? "npm";
 }
-
 /** How each manager runs a binary out of node_modules, for the closing lines. */
-const RUNNERS = { npm: "npx", pnpm: "pnpm", yarn: "yarn", bun: "bunx" };
-
+const RUNNERS = {
+    npm: "npx",
+    pnpm: "pnpm",
+    yarn: "yarn",
+    bun: "bunx",
+};
 function install(root, manager) {
-	console.log(`\n${dim(`installing with ${manager}…`)}`);
-	return new Promise((resolvePromise) => {
-		const child = spawn(manager, ["install"], {
-			cwd: root,
-			stdio: "inherit",
-			// npm and yarn are .cmd shims on Windows, which execvp cannot run.
-			shell: process.platform === "win32",
-		});
-		child.on("close", (code) => resolvePromise(code === 0));
-		child.on("error", () => resolvePromise(false));
-	});
+    console.log(`\n${dim(`installing with ${manager}…`)}`);
+    return new Promise((resolvePromise) => {
+        const child = spawn(manager, ["install"], {
+            cwd: root,
+            stdio: "inherit",
+            // npm and yarn are .cmd shims on Windows, which execvp cannot run.
+            shell: process.platform === "win32",
+        });
+        child.on("close", (code) => resolvePromise(code === 0));
+        child.on("error", () => resolvePromise(false));
+    });
 }
-
 /**
  * Scaffold an app folder, install its dependencies, and say what to run.
  *
@@ -467,109 +439,96 @@ function install(root, manager) {
  * @returns a process exit code
  */
 export async function init(appRoot, flags, { targeted = true } = {}) {
-	const interactive = process.stdin.isTTY && !flags.yes && !flags.name;
-	const suggested = slugify(basename(appRoot));
-
-	// One question, and both fields come out of the answer: `Acme Shop` gives the
-	// server the name `acme-shop` and keeps `Acme Shop` as the title. An answer
-	// that is already a slug gets a title with a capital on the front.
-	const answer = flags.name ?? (interactive ? await ask("App name", suggested) : suggested);
-	const name = slugify(answer);
-	const typed = cleanTitle(answer);
-	const app = { name, title: typed && typed !== name ? typed : titleize(name) };
-
-	// A name typed at the prompt with no directory to put it in names the
-	// directory as well: `oney` in ~/Projects means ~/Projects/oney, which is how
-	// create-next-app's one question reads. Taking the offered default leaves
-	// everything where it is, since that default is the current folder's own name,
-	// and `waniwani init .` names the current folder outright.
-	const root = !targeted && interactive && name !== suggested ? join(appRoot, name) : appRoot;
-
-	const files = scaffold(app, { minimal: Boolean(flags.minimal) });
-
-	// Nothing is written until every collision is known, so a refusal leaves the
-	// directory exactly as it was.
-	const clashes = files.filter((file) => !file.whenPresent && existsSync(join(root, file.path)));
-	if (clashes.length > 0 && !flags.force) {
-		console.error(`\n${red("✗")} ${bold("already an app folder here")}\n`);
-		for (const file of clashes) {
-			console.error(`  ${file.path}`);
-		}
-		console.error(`\n${dim("pass --force to overwrite, or init into a new directory")}`);
-		return 1;
-	}
-
-	mkdirSync(root, { recursive: true });
-
-	const actions = [];
-	for (const file of files) {
-		const target = join(root, file.path);
-
-		if (!existsSync(target)) {
-			write(target, file.contents);
-			actions.push([green("+"), file.path, null]);
-			continue;
-		}
-		if (file.whenPresent === "keep") {
-			actions.push([dim("·"), file.path, "yours, left alone"]);
-			continue;
-		}
-		if (file.whenPresent === "merge") {
-			const changed = file.merge(target, file.contents);
-			actions.push([
-				changed.length > 0 ? yellow("~") : dim("·"),
-				file.path,
-				changed.length > 0 ? `+ ${changed.join(", ")}` : "nothing to add",
-			]);
-			continue;
-		}
-		// A collision the caller chose to overwrite.
-		write(target, file.contents);
-		actions.push([yellow("~"), file.path, "overwritten"]);
-	}
-
-	console.log(`\n${green("✓")} ${bold(app.name)} ${dim(`→ ${root}`)}\n`);
-	for (const [marker, path, note] of actions) {
-		console.log(`  ${marker} ${path}${note ? ` ${dim(note)}` : ""}`);
-	}
-
-	// The merge leaves a script the repo already had alone, so the way into the dev
-	// loop is whatever survived that: `npm run dev` when it is ours, the CLI by
-	// name when the repo's own `dev` runs something else.
-	const manifest = JSON.parse(readFileSync(join(root, "package.json"), "utf-8"));
-	const ours = manifest.scripts?.dev === "waniwani dev";
-
-	if (manifest.type !== "module") {
-		console.log(
-			`\n${yellow("!")} ${bold("package.json")} says ${bold(`"type": "${manifest.type}"`)}`,
-		);
-		console.log(`  ${dim('app modules are ESM: set it to "module" or the build cannot load them')}`);
-	}
-
-	const manager = packageManager();
-	// A scaffold with no node_modules still checks out and still reads, so a
-	// failed install is reported and the folder is kept.
-	const installed = flags.install === false ? null : await install(root, manager);
-
-	console.log(`\n${bold("From here")}`);
-	// `init apps/store` is scaffolded two levels down, so the path is the one to
-	// print rather than the directory's own name.
-	const from = relative(process.cwd(), root);
-	if (from) {
-		console.log(`  cd ${from}`);
-	}
-	if (installed === false) {
-		console.log(`  ${yellow(`${manager} install`)} ${dim("(the first attempt failed)")}`);
-	} else if (installed === null) {
-		console.log(`  ${manager} install`);
-	}
-	console.log(`  ${ours ? `${manager} run dev` : `${RUNNERS[manager]} waniwani dev`}`);
-
-	console.log(`\n${bold("Then")}`);
-	console.log(`  ${dim("·")} edit ${bold(`tools/${TOOL}.ts`)} to answer with your own data`);
-	if (!flags.minimal) {
-		console.log(`  ${dim("·")} edit ${bold(`widgets/${WIDGET}/ui.tsx`)} for how it looks on screen`);
-	}
-	console.log(`  ${dim("·")} add ${bold("flows/<name>.ts")} for a multi-step conversation`);
-	return 0;
+    const interactive = process.stdin.isTTY && !flags.yes && !flags.name;
+    const suggested = slugify(basename(appRoot));
+    // One question, and both fields come out of the answer: `Acme Shop` gives the
+    // server the name `acme-shop` and keeps `Acme Shop` as the title. An answer
+    // that is already a slug gets a title with a capital on the front.
+    const answer = flags.name ?? (interactive ? await ask("App name", suggested) : suggested);
+    const name = slugify(answer);
+    const typed = cleanTitle(answer);
+    const app = { name, title: typed && typed !== name ? typed : titleize(name) };
+    // A name typed at the prompt with no directory to put it in names the
+    // directory as well: `oney` in ~/Projects means ~/Projects/oney, which is how
+    // create-next-app's one question reads. Taking the offered default leaves
+    // everything where it is, since that default is the current folder's own name,
+    // and `waniwani init .` names the current folder outright.
+    const root = !targeted && interactive && name !== suggested ? join(appRoot, name) : appRoot;
+    const files = scaffold(app, { minimal: Boolean(flags.minimal) });
+    // Nothing is written until every collision is known, so a refusal leaves the
+    // directory exactly as it was.
+    const clashes = files.filter((file) => !file.whenPresent && existsSync(join(root, file.path)));
+    if (clashes.length > 0 && !flags.force) {
+        console.error(`\n${red("✗")} ${bold("already an app folder here")}\n`);
+        for (const file of clashes) {
+            console.error(`  ${file.path}`);
+        }
+        console.error(`\n${dim("pass --force to overwrite, or init into a new directory")}`);
+        return 1;
+    }
+    mkdirSync(root, { recursive: true });
+    const actions = [];
+    for (const file of files) {
+        const target = join(root, file.path);
+        if (!existsSync(target)) {
+            write(target, file.contents);
+            actions.push([green("+"), file.path, null]);
+            continue;
+        }
+        if (file.whenPresent === "keep") {
+            actions.push([dim("·"), file.path, "yours, left alone"]);
+            continue;
+        }
+        if (file.whenPresent === "merge" && file.merge) {
+            const changed = file.merge(target, file.contents);
+            actions.push([
+                changed.length > 0 ? yellow("~") : dim("·"),
+                file.path,
+                changed.length > 0 ? `+ ${changed.join(", ")}` : "nothing to add",
+            ]);
+            continue;
+        }
+        // A collision the caller chose to overwrite.
+        write(target, file.contents);
+        actions.push([yellow("~"), file.path, "overwritten"]);
+    }
+    console.log(`\n${green("✓")} ${bold(app.name)} ${dim(`→ ${root}`)}\n`);
+    for (const [marker, path, note] of actions) {
+        console.log(`  ${marker} ${path}${note ? ` ${dim(note)}` : ""}`);
+    }
+    // The merge leaves a script the repo already had alone, so the way into the dev
+    // loop is whatever survived that: `npm run dev` when it is ours, the CLI by
+    // name when the repo's own `dev` runs something else.
+    const manifest = JSON.parse(readFileSync(join(root, "package.json"), "utf-8"));
+    const ours = manifest.scripts?.dev === "waniwani dev";
+    if (manifest.type !== "module") {
+        console.log(`\n${yellow("!")} ${bold("package.json")} says ${bold(`"type": "${manifest.type}"`)}`);
+        console.log(`  ${dim('app modules are ESM: set it to "module" or the build cannot load them')}`);
+    }
+    const manager = packageManager();
+    // A scaffold with no node_modules still checks out and still reads, so a
+    // failed install is reported and the folder is kept.
+    const installed = flags.install === false ? null : await install(root, manager);
+    console.log(`\n${bold("From here")}`);
+    // `init apps/store` is scaffolded two levels down, so the path is the one to
+    // print rather than the directory's own name.
+    const from = relative(process.cwd(), root);
+    if (from) {
+        console.log(`  cd ${from}`);
+    }
+    if (installed === false) {
+        console.log(`  ${yellow(`${manager} install`)} ${dim("(the first attempt failed)")}`);
+    }
+    else if (installed === null) {
+        console.log(`  ${manager} install`);
+    }
+    console.log(`  ${ours ? `${manager} run dev` : `${RUNNERS[manager]} waniwani dev`}`);
+    console.log(`\n${bold("Then")}`);
+    console.log(`  ${dim("·")} edit ${bold(`tools/${TOOL}.ts`)} to answer with your own data`);
+    if (!flags.minimal) {
+        console.log(`  ${dim("·")} edit ${bold(`widgets/${WIDGET}/ui.tsx`)} for how it looks on screen`);
+    }
+    console.log(`  ${dim("·")} add ${bold("flows/<name>.ts")} for a multi-step conversation`);
+    return 0;
 }
+//# sourceMappingURL=init.js.map