wawesome 0.0.7 → 0.0.8

package/README.md

@@ -52,8 +52,9 @@ npx wawesome init --template stripe-webhook
 
 This goes from nothing to a deployed Function in one command. The template is downloaded over
 plain HTTP and unpacked — **git is not required**, on any platform — and its files land exactly as
-they are published. Only two are touched: the `name` in `package.json`, and the App and Function
-names in `wawesome-function.json`.
+they are published. Only the `name` in `package.json`, the App and Function names in
+`wawesome-function.json`, and the `wawesome` dependency are touched — the last so the project you
+get depends on the CLI that scaffolded it rather than the one the template was released against.
 
 Templates declare what they need rather than shipping placeholders, so the CLI then asks for each
 environment variable the template requires — showing where in the provider's own dashboard to find
@@ -61,6 +62,15 @@ the value — stores them (secrets write-only), enables any outbound providers t
 and deploys. If a value does not exist yet, leave it blank; the CLI tells you the `env set` command
 to run once it does.
 
+Dependencies are installed for you (with whatever package manager launched the CLI — `npx`, `pnpm
+dlx`, `bun x`), so the types are there when you open the project and the bundler can resolve the
+template's imports. Pass `--no-install` to do it yourself. A failed install never stops the flow;
+the command to re-run is printed.
+
+Being logged in is checked **before** the first question, not at the deploy: an expired session
+offers you a login there and then, and declining still leaves you the project plus the two commands
+that finish it.
+
 Run it in an empty directory: if any file would be overwritten, nothing is written at all and the
 collision is named.
 

package/dist/index.mjs

@@ -5,8 +5,9 @@ import { build } from "esbuild";
 import os from "node:os";
 import http from "node:http";
 import readline from "node:readline";
+import { confirm, select } from "@inquirer/prompts";
+import { spawnSync } from "node:child_process";
 import zlib from "node:zlib";
-import { select } from "@inquirer/prompts";
 //#region src/config.ts
 /**
 * Hardcoded Supabase project config for the wawesome.io platform.
@@ -150,6 +151,18 @@ async function buildJs(entryInput, options) {
 	}
 }
 //#endregion
+//#region src/cli-version.ts
+/**
+* The version of the CLI that is running, read from the package it ships in.
+*
+* Compiled in at bundle time rather than resolved from disk, because `dist/` is
+* what gets published and the manifest next to it is not where a `npx` cache,
+* a global install, and a workspace checkout all agree it will be. Anything
+* that has to name this version — `--version`, the dependency a scaffolded
+* project pins — reads it here, so a release bumps one file.
+*/
+const CLI_VERSION = "0.0.8";
+//#endregion
 //#region src/prompt.ts
 /**
 * Open a prompt session on stdin, queueing lines as they arrive.
@@ -806,6 +819,58 @@ async function envCommand(action, key, value, options) {
 	process.exit(1);
 }
 //#endregion
+//#region src/install.ts
+/** Package managers whose `install` this understands. */
+const KNOWN_MANAGERS = [
+	"npm",
+	"pnpm",
+	"yarn",
+	"bun"
+];
+/**
+* Which package manager to install with.
+*
+* Taken from the one that launched this process — `pnpm dlx wawesome init`
+* should not leave a `package-lock.json` behind — and npm otherwise, since that
+* is what `npx` is.
+*/
+function packageManager(userAgent = process.env.npm_config_user_agent) {
+	const name = (userAgent ?? "").split("/")[0];
+	return KNOWN_MANAGERS.includes(name) ? name : "npm";
+}
+function installDependencies(dir, options = {}) {
+	const manager = packageManager();
+	const command = `${manager} install`;
+	if (!fs.existsSync(path.join(dir, "package.json"))) return {
+		command,
+		ok: false
+	};
+	console.log(`\n[wawesome] Installing dependencies (${command})...`);
+	const result = spawnSync(manager, ["install"], {
+		cwd: dir,
+		stdio: options.verbose ? "inherit" : [
+			"ignore",
+			"ignore",
+			"pipe"
+		],
+		shell: process.platform === "win32"
+	});
+	if (result.status === 0) {
+		console.log("[wawesome] ✅ Dependencies installed.");
+		return {
+			command,
+			ok: true
+		};
+	}
+	const stderr = result.stderr?.toString().trim();
+	console.log(`[wawesome] ${command} did not finish. Run it yourself when you can.`);
+	if (stderr) console.log(`[wawesome] ${stderr.split("\n").slice(-3).join("\n[wawesome] ")}`);
+	return {
+		command,
+		ok: false
+	};
+}
+//#endregion
 //#region src/provision.ts
 /** The gateway's own words for a failure, or a plain HTTP status if it gave none. */
 async function rejected(res, fallback) {
@@ -902,15 +967,61 @@ function applyTemplateIdentity(dir, identity) {
 		function: identity.functionName
 	}));
 }
+/** The package the CLI publishes itself as, and which a template depends on. */
+const CLI_PACKAGE = "wawesome";
+/**
+* Point the template's dependency on the CLI at the CLI that is scaffolding it.
+*
+* A template pins the version it was released against, and below 1.0 a caret
+* range is an exact pin — `^0.0.6` never resolves to `0.0.7`. So a template
+* whose repository has not been touched since installs an older CLI than the
+* one the user just ran, and ships types that predate the platform it is about
+* to deploy to. Rewriting it here keeps the two in step without a template
+* release for every CLI release.
+*
+* Only a declaration that already exists is rewritten: what a template depends
+* on is the template's business, and a template that does not use the CLI does
+* not acquire it here.
+*/
+function alignCliDependency(dir, version) {
+	const file = path.join(dir, PACKAGE_FILE);
+	const pkg = readJson(file);
+	const wanted = `^${version}`;
+	for (const field of ["dependencies", "devDependencies"]) {
+		const deps = pkg[field];
+		if (!isRecord(deps)) continue;
+		const current = deps[CLI_PACKAGE];
+		if (typeof current !== "string" || current === wanted) continue;
+		writeJson(file, {
+			...pkg,
+			[field]: {
+				...deps,
+				[CLI_PACKAGE]: wanted
+			}
+		});
+		return {
+			from: current,
+			to: wanted
+		};
+	}
+	return null;
+}
+function isRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 function patchJson(file, patch) {
+	writeJson(file, patch(readJson(file)));
+}
+function readJson(file) {
 	if (!fs.existsSync(file)) throw new Error(`The template is missing ${path.basename(file)}, which scaffolding must patch.`);
-	let current;
 	try {
-		current = JSON.parse(fs.readFileSync(file, "utf-8"));
+		return JSON.parse(fs.readFileSync(file, "utf-8"));
 	} catch (err) {
 		throw new Error(`The template's ${path.basename(file)} is not valid JSON: ${errorText(err)}`);
 	}
-	fs.writeFileSync(file, JSON.stringify(patch(current), null, 2) + "\n", "utf-8");
+}
+function writeJson(file, content) {
+	fs.writeFileSync(file, JSON.stringify(content, null, 2) + "\n", "utf-8");
 }
 /**
 * Which of the files a scaffold is about to write are already there.
@@ -1299,6 +1410,63 @@ async function promptForDeclaredEnv(session, declared) {
 	return answers;
 }
 /**
+* Whether the stored session is one the platform still accepts.
+*
+* Only a refusal counts as an answer. An unreachable gateway says nothing about
+* whether the credentials are good, and treating it as a dead session would send
+* a user who is merely offline through a login they do not need.
+*/
+async function sessionIsLive(creds) {
+	try {
+		await fetchTenantDetails(creds);
+		return true;
+	} catch (err) {
+		return !(err instanceof GatewayError && (err.status === 401 || err.status === 403));
+	}
+}
+/**
+* Get a working session before the first question is asked.
+*
+* The credentials file existing is not the same as being logged in — a JWT
+* expires — and everything this command does after scaffolding needs a live
+* session. Checked here, the two answers a user can get are "log in now" and a
+* project that scaffolds without one. Checked where it used to be, at the first
+* write, the answer was an error *after* they had typed a webhook secret in.
+*
+* Returns null when there is no session to work with, which is a supported way
+* to finish: the files are still worth having.
+*/
+async function ensureSession(options) {
+	const stored = readCredentials();
+	if (stored && await sessionIsLive(stored)) return stored;
+	console.log(stored ? "\n[wawesome] Your session has expired." : "\n[wawesome] You're not logged in yet — that's what a deploy needs.");
+	if (!isInteractive()) {
+		console.log("[wawesome] Run 'wawesome login', then 'wawesome deploy'.");
+		return null;
+	}
+	let wantsLogin;
+	try {
+		wantsLogin = await confirm({
+			message: "Log in now?",
+			default: true
+		});
+	} catch {
+		console.log("[wawesome] Cancelled. Nothing was written.");
+		process.exit(130);
+	}
+	if (!wantsLogin) return null;
+	try {
+		await login({
+			api: options.api,
+			verbose: options.verbose
+		});
+	} catch (err) {
+		console.error(`[wawesome] Login failed: ${errorText(err)}`);
+		return null;
+	}
+	return readCredentials();
+}
+/**
 * Satisfy the template's declarations against the platform.
 *
 * The manifest declares; nothing here is template-specific. Each declaration
@@ -1367,10 +1535,11 @@ async function initFromTemplate(templateName, options) {
 		force: true
 	});
 	process.once("exit", sweepStaging);
-	const session = openPromptSession();
 	let functionName;
 	let appSlug;
 	let manifest;
+	let creds;
+	let answers = [];
 	try {
 		let files;
 		try {
@@ -1384,39 +1553,46 @@ async function initFromTemplate(templateName, options) {
 		}
 		const collisions = collidingPaths(cwd, files);
 		if (collisions.length > 0) fail(`${collisions.join(", ")} already exist${collisions.length === 1 ? "s" : ""} here.`, "Run this in an empty directory, or move those files aside first. Nothing was written.");
-		functionName = await promptForSlug(session, "Function name", readFunctionConfig(staging)?.function || dirName);
-		console.log("  (an App groups the Functions of one project — its slug is part of the public URL)");
-		appSlug = await promptForSlug(session, "App slug", dirName);
+		creds = await ensureSession(options);
+		const session = openPromptSession();
 		try {
-			fs.cpSync(staging, cwd, { recursive: true });
-			applyTemplateIdentity(cwd, {
-				app: appSlug,
-				functionName
-			});
-		} catch (err) {
-			fail(errorText(err), `Some of '${template.name}' may have been written to ${cwd}.`);
+			functionName = await promptForSlug(session, "Function name", readFunctionConfig(staging)?.function || dirName);
+			console.log("  (an App groups the Functions of one project — its slug is part of the public URL)");
+			appSlug = await promptForSlug(session, "App slug", dirName);
+			let repinned = null;
+			try {
+				fs.cpSync(staging, cwd, { recursive: true });
+				applyTemplateIdentity(cwd, {
+					app: appSlug,
+					functionName
+				});
+				repinned = alignCliDependency(cwd, CLI_VERSION);
+			} catch (err) {
+				fail(errorText(err), `Some of '${template.name}' may have been written to ${cwd}.`);
+			}
+			console.log(`\n[wawesome] ✅ Scaffolded ${files.length} files from '${template.name}'.`);
+			if (repinned) console.log(`[wawesome] Using wawesome ${repinned.to} — the template pinned ${repinned.from}.`);
+			answers = creds ? await promptForDeclaredEnv(session, manifest.env) : [];
+		} finally {
+			session.close();
 		}
-		console.log(`\n[wawesome] ✅ Scaffolded ${files.length} files from '${template.name}'.`);
 	} finally {
 		sweepStaging();
 		process.off("exit", sweepStaging);
 	}
-	let answers = [];
-	let creds;
-	try {
-		creds = readCredentials();
-		if (creds) answers = await promptForDeclaredEnv(session, manifest.env);
-	} finally {
-		session.close();
-	}
 	if (!creds) {
+		const installed = options.install === false ? null : installDependencies(cwd, { verbose: options.verbose });
 		console.log("\n[wawesome] 🎉 Project ready. Next steps:");
-		console.log("  1. npm install");
-		console.log("  2. wawesome login");
-		console.log("  3. wawesome deploy\n");
+		[
+			...installed?.ok ? [] : [installed?.command ?? "npm install"],
+			"wawesome login",
+			"wawesome deploy"
+		].forEach((step, index) => console.log(`  ${index + 1}. ${step}`));
+		console.log("");
 		return;
 	}
 	await wireUp(creds, appSlug, manifest, answers);
+	if (options.install !== false) installDependencies(cwd, { verbose: options.verbose });
 	const result = await deploy(void 0, {
 		out: "dist/index.js",
 		verbose: options.verbose
@@ -1491,7 +1667,7 @@ export default {
 				typecheck: "tsc --noEmit"
 			},
 			devDependencies: {
-				"wawesome": "^1.0.0",
+				"wawesome": `^${CLI_VERSION}`,
 				typescript: "^7.0.0"
 			}
 		};
@@ -1524,10 +1700,14 @@ export default {
 		fs.writeFileSync(gitignorePath, "node_modules\ndist\n", "utf-8");
 		console.log("[wawesome] ✅ Created .gitignore");
 	}
+	const installed = options.install === false ? null : installDependencies(cwd, { verbose: options.verbose });
 	console.log("\n[wawesome] 🎉 Project initialized! Next steps:");
-	console.log("  1. npm install");
-	console.log("  2. wawesome login");
-	console.log("  3. wawesome deploy\n");
+	[
+		...installed?.ok ? [] : [installed?.command ?? "npm install"],
+		"wawesome login",
+		"wawesome deploy"
+	].forEach((step, index) => console.log(`  ${index + 1}. ${step}`));
+	console.log("");
 }
 //#endregion
 //#region src/version.ts
@@ -2279,7 +2459,7 @@ cli.command("logout", "Clear stored authentication credentials").action(() => lo
 cli.command("whoami", "Show current login session info").action(() => whoami());
 cli.command("workspace [action] [name]", "Show the workspace, or rename its public address").usage("workspace <action> [name]\n\nActions:\n  show                Show the workspace name, address, and whether it can still change\n  rename <name>       Change the public address, while nothing live depends on it").example("wawesome workspace").example("wawesome workspace rename northwind").option("-v, --verbose", "Enable verbose debug output").action((action, name, options) => workspaceCommand(action, name, options));
 cli.command("templates [action]", "Browse the template catalog").usage("templates [action]\n\nActions:\n  list (ls)           Show every available template (default)").example("wawesome templates").example("wawesome templates list").option("--api <url>", "API URL (default: https://api.wawesome.io)").option("-v, --verbose", "Enable verbose debug output").action((action, options) => templatesCommand(action, options));
-cli.command("init", "Scaffold a new function project in the current directory").usage("init [options]\n\nWith --template, the project is fetched from the template catalog, wired up\nfrom what the template declares it needs, and deployed. Run 'wawesome templates'\nto see what is available.").example("wawesome init").example("wawesome init --template stripe-webhook").option("-t, --template <name>", "Scaffold from a catalog template and deploy it").option("--api <url>", "API URL (default: https://api.wawesome.io)").option("-v, --verbose", "Enable verbose debug output").action((options) => init(options));
+cli.command("init", "Scaffold a new function project in the current directory").usage("init [options]\n\nWith --template, the project is fetched from the template catalog, wired up\nfrom what the template declares it needs, and deployed. Run 'wawesome templates'\nto see what is available.").example("wawesome init").example("wawesome init --template stripe-webhook").option("-t, --template <name>", "Scaffold from a catalog template and deploy it").option("--api <url>", "API URL (default: https://api.wawesome.io)").option("--no-install", "Skip installing dependencies after scaffolding").option("-v, --verbose", "Enable verbose debug output").action((options) => init(options));
 cli.command("logs [function-name-or-invocation-id]", "View invocation history, fetch log output, or follow live").usage(`logs [target] [options]
 
   The target argument determines what the command does:
@@ -2302,7 +2482,7 @@ cli.command("logs [function-name-or-invocation-id]", "View invocation history, f
   invocations — new output appears each time the function runs, no need to catch a
   specific invocation. Press Ctrl-C to stop at any time.`).option("-f, --follow", "Stream live output (tail -f style). Follows a running invocation or waits for the next one. Ctrl-C to stop").option("-i, --invocation <id>", "Fetch stdout/stderr log body for a specific invocation ID").option("-a, --app <app>", "App slug override (defaults to wawesome-function.json)").option("-s, --status <status>", "Filter invocations by status (success, error, timeout, running)").option("--success", "Shorthand for --status success").option("--error", "Shorthand for --status error").option("--timeout", "Shorthand for --status timeout").option("--running", "Shorthand for --status running").option("-v, --verbose", "Enable verbose debug output").action((target, options) => logsCommand(target, options));
 cli.help();
-cli.version("1.0.0");
+cli.version(CLI_VERSION);
 cli.parse();
 //#endregion
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wawesome",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "CLI tool for building and deploying serverless functions on wawesome.io platform",
   "type": "module",
   "bin": {