create-hollware 0.11.0 → 1.0.0-rc.1

package/dist/index.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import { spawn } from "node:child_process";
-import { cpSync, existsSync, readFileSync, readdirSync, realpathSync, renameSync, writeFileSync } from "node:fs";
+import { appendFileSync, cpSync, existsSync, readFileSync, readdirSync, realpathSync, renameSync, writeFileSync } from "node:fs";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { basename, join, resolve } from "node:path";
+import { basename, isAbsolute, join, relative, resolve } from "node:path";
 import { parseArgs } from "node:util";
 //#region src/scaffold.ts
 const USAGE = [
@@ -21,6 +21,12 @@ const USAGE = [
 	"                   Whether the activity log keeps a keyed hash of each address (default: off)",
 	"  --audit-retention-days <n>",
 	"                   Days each line of the activity log is kept, 30 to 3650 (default: forever)",
+	"  --token-file <path>",
+	"                   Write the first token to this file (mode 0600) and print its path, not the token;",
+	"                   a file that exists is refused. Inside the project, it goes into .gitignore",
+	"  --json           One JSON object on stdout and nothing else: dir, then what \"hollware init\" says",
+	"                   (site, ownerId, tokenId, token or tokenFile, expiresAt, setupUrl, mcpUrl,",
+	"                   readApiUrl), the commands to start it and the MCP configuration",
 	"  --pm <npm|pnpm>  The package manager that installs (default: npm)",
 	"  --yes            Take the defaults: <dir> is my-hollware when it is not given",
 	"  --no-install     Do not install, migrate or make the site",
@@ -42,7 +48,6 @@ const WORKER_NAME = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?$/;
 const SITE_KEY = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 /** What `@hollware/*` and `hollware` say in the template's package.json. */
 const VERSION_PLACEHOLDER = "HOLLWARE_VERSION";
-const TOKEN = /hw_pat_[0-9a-hjkmnp-tv-z]{52}/;
 /** The choices of a run, from its arguments. */
 function readChoices(argv) {
 	const { values, positionals } = (() => {
@@ -60,7 +65,9 @@ function readChoices(argv) {
 					pm: { type: "string" },
 					yes: { type: "boolean" },
 					"no-install": { type: "boolean" },
-					"no-git": { type: "boolean" }
+					"no-git": { type: "boolean" },
+					"token-file": { type: "string" },
+					json: { type: "boolean" }
 				}
 			});
 		} catch (error) {
@@ -84,6 +91,8 @@ function readChoices(argv) {
 		pm,
 		install: values["no-install"] !== true,
 		git: values["no-git"] !== true,
+		tokenFile: values["token-file"],
+		json: values.json === true,
 		initFlags: [
 			...values.preset === void 0 ? [] : ["--preset", values.preset],
 			...values.locales === void 0 ? [] : ["--locales", values.locales],
@@ -127,44 +136,107 @@ async function step(io, what, command, args, cwd) {
 	}
 	return result;
 }
+/** The environment variable that holds the token in an MCP client's configuration. */
+const TOKEN_VARIABLE = "HOLLWARE_TOKEN";
+/** The `.mcp.json` block of a Hollware: the URL of /mcp, and a header that names HOLLWARE_TOKEN. */
+function mcpJson(url) {
+	return JSON.stringify({ mcpServers: { hollware: {
+		type: "http",
+		url: `${url}/mcp`,
+		headers: { Authorization: `Bearer \${${TOKEN_VARIABLE}}` }
+	} } }, null, 2);
+}
+/** The `claude mcp add` line that names HOLLWARE_TOKEN instead of the token. */
+function claudeAddLine(url) {
+	return `claude mcp add --transport http hollware ${url}/mcp --header 'Authorization: Bearer \${${TOKEN_VARIABLE}}'`;
+}
+/** What `hollware init --json` prints, as far as this package reads it. */
+function readInitJson(stdout) {
+	try {
+		const parsed = JSON.parse(stdout);
+		if (typeof parsed === "object" && parsed !== null && !Array.isArray(parsed)) return Object.fromEntries(Object.entries(parsed));
+	} catch {}
+	throw new CreateError(`"hollware init --json" did not answer with a JSON object:\n${stdout}`);
+}
 /** Makes the project, and everything it needs to run locally. */
 async function create(argv, io) {
 	const choices = readChoices(argv);
 	const target = resolve(io.cwd, choices.dir);
 	if (existsSync(target) && readdirSync(target).length > 0) throw new CreateError(`${target} is not empty: choose a new directory.`);
+	const tokenFile = choices.tokenFile === void 0 ? void 0 : resolve(io.cwd, choices.tokenFile);
+	if (tokenFile !== void 0 && existsSync(tokenFile)) throw new CreateError(`${tokenFile} exists already, and a token is never written over a file: choose another --token-file.`);
+	const say = (message) => {
+		if (!choices.json) io.out(message);
+	};
 	writeProject(io, target, choices);
-	io.out(`Created a Hollware project in ${target}.`);
+	say(`Created a Hollware project in ${target}.`);
+	if (tokenFile !== void 0) {
+		const inside = relative(target, tokenFile);
+		if (inside !== "" && !inside.startsWith("..") && !isAbsolute(inside)) appendFileSync(join(target, ".gitignore"), `\n# The token of "hollware init": never commit it.\n/${inside}\n`);
+	}
 	if (choices.git) await step(io, "git init", "git", ["init", "--quiet"], target);
+	const initArgs = [
+		"init",
+		"--site",
+		choices.site,
+		...choices.initFlags,
+		...tokenFile === void 0 ? [] : ["--token-file", tokenFile]
+	];
 	if (!choices.install) {
+		const next = [
+			`cd ${choices.dir}`,
+			`${choices.pm} install`,
+			`${choices.pm} exec hollware migrate --local`,
+			`${choices.pm} exec hollware ${initArgs.join(" ")} --local`
+		];
+		if (choices.json) {
+			io.out(JSON.stringify({
+				dir: target,
+				installed: false,
+				next
+			}));
+			return 0;
+		}
 		io.out([
 			"",
 			"Next:",
-			`  cd ${choices.dir}`,
-			`  ${choices.pm} install`,
-			`  ${choices.pm} exec hollware migrate --local`,
-			`  ${choices.pm} exec hollware init --site ${[choices.site, ...choices.initFlags].join(" ")} --local`
+			...next.map((line) => `  ${line}`)
 		].join("\n"));
 		return 0;
 	}
-	io.out(`Installing with ${choices.pm} ...`);
+	say(`Installing with ${choices.pm} ...`);
 	await step(io, "The install", choices.pm, ["install"], target);
 	const hollware = join(target, "node_modules", ".bin", "hollware");
 	await step(io, "The migrations", hollware, ["migrate", "--local"], target);
 	const init = await step(io, "Making the site", hollware, [
-		"init",
-		"--site",
-		choices.site,
-		...choices.initFlags,
-		"--local"
+		...initArgs,
+		"--local",
+		...choices.json ? ["--json"] : []
 	], target);
+	const dev = `${choices.pm} exec hollware dev`;
+	if (choices.json) {
+		const made = readInitJson(init.stdout.trim());
+		const url = typeof made["mcpUrl"] === "string" ? made["mcpUrl"].replace(/\/mcp$/, "") : void 0;
+		io.out(JSON.stringify({
+			dir: target,
+			installed: true,
+			...made,
+			devCommand: dev,
+			adminUrl: url === void 0 ? null : `${url}/admin/`,
+			mcpConfig: url === void 0 ? null : {
+				variable: TOKEN_VARIABLE,
+				claudeCode: claudeAddLine(url),
+				json: JSON.parse(mcpJson(url))
+			}
+		}));
+		return 0;
+	}
 	io.out(init.stdout.trim());
-	const token = TOKEN.exec(init.stdout)?.[0] ?? "<the token above>";
 	io.out([
 		"",
-		"Start it, and connect your agent (Claude Code):",
+		"Start it:",
 		`  cd ${choices.dir}`,
-		`  ${choices.pm === "npm" ? "npm run dev" : "pnpm dev"}`,
-		`  claude mcp add --transport http hollware http://localhost:5199/mcp --header "Authorization: Bearer ${token}"`,
+		`  ${dev}`,
 		"",
 		"The admin is at http://localhost:5199/admin/. To deploy, log in to Cloudflare and run:",
 		`  ${choices.pm} exec wrangler login`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-hollware",
-  "version": "0.11.0",
+  "version": "1.0.0-rc.1",
   "description": "Create a new Hollware project.",
   "homepage": "https://hollware.com",
   "bugs": {