@mpen/rerouter 0.3.0 → 0.3.1

package/dist/bin.d.ts

@@ -1,4 +1,4 @@
-//#region src/bin.d.ts
+//#region cli/bin.d.ts
 type RunOptions = {
   cwd?: string;
   commandName?: string;

package/dist/bin.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { n as normalizeRoutes, t as normalizeLegacyPathToRegexpSyntax } from "./routes-Hpf6cwcZ.js";
+import { n as normalizeRoutes, t as normalizeLegacyPathToRegexpSyntax } from "./routes-PW-bNm8e.js";
 import { parse } from "path-to-regexp";
 import fs from "node:fs/promises";
 import path from "node:path";
 import process from "node:process";
 import { fileURLToPath, pathToFileURL } from "node:url";
 import { parseArgs } from "node:util";
-//#region src/bin.ts
+//#region cli/bin.ts
 const PARSE_CONFIG = {
 	options: {
 		output: {
@@ -17,6 +17,10 @@ const PARSE_CONFIG = {
 			type: "boolean",
 			short: "w"
 		},
+		pretty: {
+			type: "boolean",
+			short: "p"
+		},
 		"wildcard-delimiter": { type: "string" },
 		"encode-function": { type: "string" }
 	},
@@ -39,6 +43,7 @@ function compilePathGenerator(pattern, { delimiter = "/", encode = "encodeURICom
 		name,
 		type: typeOfParam(t)
 	});
+	const renderPropsType = (props) => props.length ? `{ ${props.map((p) => `${escapeString(p.name)}: ${p.type}`).join("; ")} }` : "{}";
 	function collectGroupProps(ts2) {
 		const props = [];
 		for (const t of ts2) if (t.type === "param" || t.type === "wildcard") props.push(makeProp(t.name, t));
@@ -49,23 +54,12 @@ function compilePathGenerator(pattern, { delimiter = "/", encode = "encodeURICom
 		for (const t of ts2) if ((t.type === "param" || t.type === "wildcard") && intoBase) baseProps.push(makeProp(t.name, t));
 		else if (t.type === "group") {
 			const groupProps = collectGroupProps(t.tokens);
-			if (groupProps.length) {
-				const some = [
-					"{",
-					...groupProps.map((p) => `    ${escapeString(p.name)}: ${p.type}`),
-					"}"
-				].join("\n");
-				groupTypes.push(`AllOrNone<${some}>`);
-			}
+			if (groupProps.length) groupTypes.push(`AllOrNone<${renderPropsType(groupProps)}>`);
 			collectTypes(t.tokens, false);
 		}
 	}
 	collectTypes(tokens);
-	const baseParamsType = [
-		"{",
-		...baseProps.map((p) => `    ${escapeString(p.name)}: ${p.type}`),
-		"}"
-	].join("\n");
+	const baseParamsType = renderPropsType(baseProps);
 	const paramsType = groupTypes.length ? `${baseParamsType} & ${groupTypes.join(" & ")}` : baseParamsType;
 	const lines = [];
 	const indentUnit = "    ";
@@ -74,11 +68,8 @@ function compilePathGenerator(pattern, { delimiter = "/", encode = "encodeURICom
 		else lines.push(indentUnit.repeat(indentLevel) + text);
 	};
 	const hasAnyParams = baseProps.length > 0 || groupTypes.length > 0;
-	if (hasAnyParams) {
-		lines.push(`export function ${functionName}(`);
-		lines.push(`    params: ${paramsType}`);
-		lines.push(`): string {`);
-	} else lines.push(`export function ${functionName}(): string {`);
+	if (hasAnyParams) lines.push(`export function ${functionName}(params: ${paramsType}): string {`);
+	else lines.push(`export function ${functionName}(): string {`);
 	line(1, `let sb = ""`);
 	line(0);
 	const delim = escapeString(delimiter);
@@ -122,6 +113,19 @@ async function importRoutes(routesPath) {
 	if (!Array.isArray(mod.default)) throw new Error("Routes file must default export an array of routes.");
 	return mod.default;
 }
+async function formatWithPrettier(source, outputPath) {
+	let prettier;
+	try {
+		prettier = await import("./prettier-BT_F8kIx.js");
+	} catch (cause) {
+		throw new Error("The --pretty option requires prettier to be installed.", { cause });
+	}
+	const options = await prettier.resolveConfig(outputPath) ?? {};
+	return prettier.format(source, {
+		...options,
+		filepath: outputPath
+	});
+}
 function extractRoutes(routes) {
 	return normalizeRoutes(routes).flatMap((route) => {
 		if (!route.name || typeof route.pattern !== "string") return [];
@@ -136,7 +140,7 @@ async function main(options, positionals, { cwd = process.cwd(), commandName = "
 	if (!routesPathArg) return {
 		exitCode: 1,
 		stdout: "",
-		stderr: "Usage: rerouter <routes-file> [-o <output-file>] [-w] [--wildcard-delimiter <string>] [--encode-function <identifier>]\n"
+		stderr: "Usage: rerouter <routes-file> [-o <output-file>] [-w] [-p|--pretty] [--wildcard-delimiter <string>] [--encode-function <identifier>]\n"
 	};
 	const routesPath = path.resolve(cwd, routesPathArg);
 	let outputPath;
@@ -179,12 +183,13 @@ async function main(options, positionals, { cwd = process.cwd(), commandName = "
 			out.push(``);
 		}
 	}
-	const finalOutput = out.join("\n");
+	let finalOutput = out.join("\n");
 	if (outputPath) {
+		if (options.pretty) finalOutput = await formatWithPrettier(finalOutput, outputPath);
 		await fs.writeFile(outputPath, finalOutput, "utf8");
 		return {
 			stdout: "",
-			stderr: `Wrote ${outputPath}\n`
+			stderr: `Wrote ${path.relative(cwd, outputPath) || "."}\n`
 		};
 	} else return {
 		stdout: finalOutput,