@miyaoka/fsss 0.3.0 → 0.3.2

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAkBA,UAAU,aAAa;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,GAAG;IACX,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAgFD,iBAAS,SAAS,CAAC,OAAO,EAAE,UAAU,GAAG,GAAG,CAoJ3C;AAED,OAAO,EAAE,SAAS,EAAE,CAAC;AACrB,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAkBA,UAAU,aAAa;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,UAAU;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,aAAa,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,GAAG;IACX,GAAG,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAgFD,iBAAS,SAAS,CAAC,OAAO,EAAE,UAAU,GAAG,GAAG,CAgJ3C;AAED,OAAO,EAAE,SAAS,EAAE,CAAC;AACrB,YAAY,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC"}

package/dist/codegen.js

@@ -1,18 +1,19 @@
 #!/usr/bin/env node
-import { join, relative } from "node:path";
-import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
-import { parseArgs } from "node:util";
-var PLUGINS_DIR_NAME = "_plugins", PLUGIN_FILE_EXTENSION = ".ts", INTERFACE_NAME_PATTERN = /export\s+interface\s+(\w+)/g;
-async function findAllPluginFiles(t) {
+import { join as e, relative as t } from "node:path";
+import { mkdir as n, readFile as r, readdir as i, writeFile as a } from "node:fs/promises";
+import { parseArgs as o } from "node:util";
+//#region src/codegen.ts
+var s = "_plugins", c = ".ts", l = /export\s+interface\s+(\w+)/g;
+async function u(t) {
 	let n = [];
 	async function r(t) {
-		let a = await readdir(t, { withFileTypes: !0 });
+		let a = await i(t, { withFileTypes: !0 });
 		for (let o of a) {
 			if (!o.isDirectory()) continue;
-			let a = join(t, o.name);
-			if (o.name === PLUGINS_DIR_NAME) {
-				let t = await readdir(a, { withFileTypes: !0 });
-				for (let r of t) r.isFile() && r.name.endsWith(PLUGIN_FILE_EXTENSION) && n.push(join(a, r.name));
+			let a = e(t, o.name);
+			if (o.name === s) {
+				let t = await i(a, { withFileTypes: !0 });
+				for (let r of t) r.isFile() && r.name.endsWith(c) && n.push(e(a, r.name));
 				continue;
 			}
 			await r(a);
@@ -20,17 +21,17 @@ async function findAllPluginFiles(t) {
 	}
 	return await r(t), n.sort();
 }
-async function extractInterfaceNames(e) {
-	let t = await readFile(e, "utf-8"), n = [], i = INTERFACE_NAME_PATTERN.exec(t);
-	for (; i !== null;) n.push(i[1]), i = INTERFACE_NAME_PATTERN.exec(t);
+async function d(e) {
+	let t = await r(e, "utf-8"), n = [], i = l.exec(t);
+	for (; i !== null;) n.push(i[1]), i = l.exec(t);
 	return n;
 }
-async function generateExtensionsType(r, i) {
-	let o = await findAllPluginFiles(r), s = [];
+async function f(r, i) {
+	let o = await u(r), s = [];
 	for (let e of o) {
-		let n = await extractInterfaceNames(e);
+		let n = await d(e);
 		if (n.length === 0) continue;
-		let r = relative(i, e).replace(/\.ts$/, ""), a = r.startsWith(".") ? r : `./${r}`;
+		let r = t(i, e).replace(/\.ts$/, ""), a = r.startsWith(".") ? r : `./${r}`;
 		s.push({
 			importPath: a,
 			interfaceNames: n
@@ -46,12 +47,13 @@ async function generateExtensionsType(r, i) {
 		let e = s.flatMap((e) => e.interfaceNames);
 		c.push("", "declare module \"@miyaoka/fsss\" {", `  interface Extensions extends ${e.join(", ")} {}`, "}", "");
 	}
-	await mkdir(i, { recursive: !0 });
-	let l = join(i, "extensions.d.ts");
-	await writeFile(l, c.join("\n"), "utf-8"), console.log(`Generated ${l}`);
+	await n(i, { recursive: !0 });
+	let l = e(i, "extensions.d.ts");
+	await a(l, c.join("\n"), "utf-8"), console.log(`Generated ${l}`);
 }
-var { values } = parseArgs({ options: {
+var { values: p } = o({ options: {
 	commandsDir: { type: "string" },
 	outDir: { type: "string" }
 } });
-(values.commandsDir === void 0 || values.outDir === void 0) && (console.error("Usage: bun run codegen.ts --commandsDir <path> --outDir <path>"), process.exit(1)), await generateExtensionsType(values.commandsDir, values.outDir);
+(p.commandsDir === void 0 || p.outDir === void 0) && (console.error("Usage: bun run codegen.ts --commandsDir <path> --outDir <path>"), process.exit(1)), await f(p.commandsDir, p.outDir);
+//#endregion

package/dist/help.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../src/help.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAU,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGhD,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAkED,iBAAS,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CA8DhD;AAGD,UAAU,oBAAoB;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,gBAAgB,EAAE,cAAc,EAAE,CAAC;CACpC;AAED,iBAAS,sBAAsB,CAAC,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAuBpE;AAID,iBAAS,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAG/E;AAID,UAAU,wBAAwB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,cAAc,EAAE,CAAC;CACpC;AAED,iBAAS,0BAA0B,CAAC,MAAM,EAAE,wBAAwB,GAAG,MAAM,CAiE5E;AAED,OAAO,EACL,0BAA0B,EAC1B,YAAY,EACZ,sBAAsB,EACtB,2BAA2B,GAC5B,CAAC;AACF,YAAY,EAAE,wBAAwB,EAAE,UAAU,EAAE,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../src/help.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,KAAK,EAAU,QAAQ,EAAE,MAAM,SAAS,CAAC;AAGhD,UAAU,UAAU;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAgFD,iBAAS,YAAY,CAAC,MAAM,EAAE,UAAU,GAAG,MAAM,CA8DhD;AAGD,UAAU,oBAAoB;IAC5B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,gBAAgB,EAAE,cAAc,EAAE,CAAC;CACpC;AAED,iBAAS,sBAAsB,CAAC,MAAM,EAAE,oBAAoB,GAAG,MAAM,CAuBpE;AAID,iBAAS,2BAA2B,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAG/E;AAID,UAAU,wBAAwB;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,cAAc,EAAE,CAAC;CACpC;AAED,iBAAS,0BAA0B,CAAC,MAAM,EAAE,wBAAwB,GAAG,MAAM,CAiE5E;AAED,OAAO,EACL,0BAA0B,EAC1B,YAAY,EACZ,sBAAsB,EACtB,2BAA2B,GAC5B,CAAC;AACF,YAAY,EAAE,wBAAwB,EAAE,UAAU,EAAE,oBAAoB,EAAE,CAAC"}

package/dist/index.js

@@ -1,95 +1,111 @@
-import { join, relative, resolve } from "node:path";
-import { ZodBoolean, ZodError, ZodNumber, z } from "zod";
-import { readFile, readdir, stat } from "node:fs/promises";
-import { homedir } from "node:os";
-function isRecord(e) {
+import { join as e, relative as t, resolve as n } from "node:path";
+import { ZodBoolean as r, ZodError as i, ZodNumber as a, z as o } from "zod";
+import { readFile as s, readdir as c, stat as l } from "node:fs/promises";
+import { homedir as u } from "node:os";
+//#region src/config.ts
+function d(e) {
 	return typeof e == "object" && !!e;
 }
-function getByDotPath(e, t) {
+function f(e, t) {
 	let n = t.split("."), r = e;
 	for (let e of n) {
-		if (!isRecord(r)) return;
+		if (!d(r)) return;
 		r = r[e];
 	}
 	return r;
 }
-async function loadConfig(e) {
+async function p(e) {
 	try {
-		let t = await readFile(e, "utf-8");
+		let t = await s(e, "utf-8");
 		return JSON.parse(t);
 	} catch {
 		return;
 	}
 }
-function deepMerge(e, t) {
+function m(e, t) {
 	let n = { ...e };
 	for (let [e, r] of Object.entries(t)) {
 		let t = n[e];
-		if (isRecord(t) && isRecord(r)) {
-			n[e] = deepMerge(t, r);
+		if (d(t) && d(r)) {
+			n[e] = m(t, r);
 			continue;
 		}
 		n[e] = r;
 	}
 	return n;
 }
-function resolveConfigPaths(t, n) {
+function h(t, n) {
 	let r = [];
-	return r.push(join(homedir(), ".config", t, "config.json")), r.push(join(process.cwd(), `${t}.config.json`)), n !== void 0 && r.push(n), r;
+	return r.push(e(u(), ".config", t, "config.json")), r.push(e(process.cwd(), `${t}.config.json`)), n !== void 0 && r.push(n), r;
 }
-async function loadMergedConfig(e, t) {
-	let n = resolveConfigPaths(e, t), r;
+async function g(e, t) {
+	let n = h(e, t), r;
 	for (let e of n) {
-		let t = await loadConfig(e);
+		let t = await p(e);
 		if (t !== void 0) {
 			if (r === void 0) {
 				r = t;
 				continue;
 			}
-			r = deepMerge(r, t);
+			r = m(r, t);
 		}
 	}
 	return r;
 }
-function deriveEnvName(e, t, n) {
+//#endregion
+//#region src/auto-mapping.ts
+function _(e, t, n) {
 	return [
 		e,
 		...t,
 		n
 	].join("_").toUpperCase();
 }
-function deriveConfigPath(e, t) {
+function v(e, t) {
 	return [...e, t].join(".");
 }
-function isBooleanSchema(e) {
-	return e instanceof ZodBoolean;
+//#endregion
+//#region src/zod-utils.ts
+function y(e) {
+	return e instanceof r;
 }
-function isNumberSchema(e) {
-	return e instanceof ZodNumber;
+function b(e) {
+	return e instanceof a;
 }
-var INDENT = "  ", COLUMN_GAP = 2;
-function resolveEnvNameForHelp(e, t, n, r) {
+//#endregion
+//#region src/help.ts
+var x = "  ", S = 2;
+function C(e, t, n, r) {
 	if (e.env !== void 0) return e.env;
-	if (t !== void 0) return deriveEnvName(t, n, r);
+	if (t !== void 0) return _(t, n, r);
+}
+function w(e) {
+	switch (typeof e) {
+		case "string":
+		case "number":
+		case "boolean":
+		case "bigint": return String(e);
+		default: return JSON.stringify(e);
+	}
 }
-function formatOptionMeta(e, t) {
+function ee(e, t) {
 	let n = [];
-	return t !== void 0 && n.push(`env: ${t}`), "default" in e && e.default !== void 0 && n.push(`default: ${String(e.default)}`), n.length === 0 ? "" : ` (${n.join(", ")})`;
+	return t !== void 0 && n.push(`env: ${t}`), "default" in e && e.default !== void 0 && n.push(`default: ${w(e.default)}`), n.length === 0 ? "" : ` (${n.join(", ")})`;
 }
-function formatOptionLine(e, t, n, r) {
-	let i = isBooleanSchema(t.type) ? "" : ` <${e}>`, a = `${t.alias === void 0 ? "    " : `-${t.alias}, `}--${e}${i}`, o = resolveEnvNameForHelp(t, n, r, e);
+function T(e, t, n, r) {
+	let i = y(t.type) ? "" : ` <${e}>`, a = `${t.alias === void 0 ? "    " : `-${t.alias}, `}--${e}${i}`, o = C(t, n, r, e);
 	return {
 		left: a,
-		right: `${t.description}${formatOptionMeta(t, o)}`
+		right: `${t.description}${ee(t, o)}`
 	};
 }
-function formatHelpLine() {
+function E() {
 	return {
 		left: "-h, --help",
 		right: "ヘルプを表示する"
 	};
 }
-function generateHelp(e) {
+function D(e) {
 	let { programName: t, commandPath: n, description: r, argsDefs: i, envPrefix: a } = e, o = [];
 	r !== void 0 && (o.push(r), o.push(""));
 	let s = [t, ...n];
@@ -105,51 +121,51 @@ function generateHelp(e) {
 	let c = Object.entries(i).filter(([, e]) => e.positional !== !0);
 	if (c.length === 0) {
 		o.push("Options:");
-		let e = formatHelpLine();
-		return o.push(`${INDENT}${e.left}  ${e.right}`), o.join("\n");
+		let e = E();
+		return o.push(`${x}${e.left}  ${e.right}`), o.join("\n");
 	}
 	o.push("Options:");
-	let l = c.map(([e, t]) => formatOptionLine(e, t, a, n));
-	l.push(formatHelpLine());
+	let l = c.map(([e, t]) => T(e, t, a, n));
+	l.push(E());
 	let u = Math.max(...l.map((e) => e.left.length));
 	for (let e of l) {
-		let t = " ".repeat(u - e.left.length + COLUMN_GAP);
-		o.push(`${INDENT}${e.left}${t}${e.right}`);
+		let t = " ".repeat(u - e.left.length + S);
+		o.push(`${x}${e.left}${t}${e.right}`);
 	}
 	return o.join("\n");
 }
-function generateSubcommandHelp(e) {
+function te(e) {
 	let { programName: t, commandPath: n, availableEntries: r } = e, i = [], a = [t, ...n].join(" ");
 	if (i.push(`Usage: ${a} <command>`), i.push(""), r.length === 0) return i.push("No available commands."), i.join("\n");
 	i.push("Available commands:");
 	for (let e of r) {
 		if (e.isDynamic) {
-			i.push(`${INDENT}<${e.paramName}>`);
+			i.push(`${x}<${e.paramName}>`);
 			continue;
 		}
-		i.push(`${INDENT}${e.name}`);
+		i.push(`${x}${e.name}`);
 	}
 	return i.join("\n");
 }
-function generateValidationErrorHelp(e, t) {
+function O(e, t) {
 	return [
 		`Error: ${t.join(", ")}`,
 		"",
 		e
 	].join("\n");
 }
-function generateDefaultCommandHelp(e) {
+function k(e) {
 	let { programName: t, defaultCommandName: n, commandPath: r, description: i, argsDefs: a, envPrefix: o, availableEntries: s } = e, c = [];
 	if (i !== void 0 && (c.push(i), c.push("")), a !== void 0 && Object.entries(a).some(([, e]) => e.positional !== !0) ? c.push(`Usage: ${t} [options]`) : c.push(`Usage: ${t}`), c.push(`       ${t} <command>`), c.push(""), a !== void 0) {
 		let e = Object.entries(a).filter(([, e]) => e.positional !== !0);
 		if (e.length > 0) {
 			c.push("Options:");
-			let t = e.map(([e, t]) => formatOptionLine(e, t, o, r));
-			t.push(formatHelpLine());
+			let t = e.map(([e, t]) => T(e, t, o, r));
+			t.push(E());
 			let n = Math.max(...t.map((e) => e.left.length));
 			for (let e of t) {
-				let t = " ".repeat(n - e.left.length + COLUMN_GAP);
-				c.push(`${INDENT}${e.left}${t}${e.right}`);
+				let t = " ".repeat(n - e.left.length + S);
+				c.push(`${x}${e.left}${t}${e.right}`);
 			}
 			c.push("");
 		}
@@ -158,17 +174,19 @@ function generateDefaultCommandHelp(e) {
 		c.push("Available commands:");
 		for (let e of s) {
 			if (e.isDynamic) {
-				c.push(`${INDENT}<${e.paramName}>`);
+				c.push(`${x}<${e.paramName}>`);
 				continue;
 			}
 			let t = e.name === n ? " (default)" : "";
-			c.push(`${INDENT}${e.name}${t}`);
+			c.push(`${x}${e.name}${t}`);
 		}
 	}
 	return c.join("\n");
 }
-var LONG_FLAG_PREFIX = "--", SHORT_FLAG_PREFIX = "-", DOUBLE_DASH = "--", NEGATION_PREFIX = "--no-", BOOLEAN_TRUE = "true", BOOLEAN_FALSE = "false";
-function addFlag(e, t, n) {
+//#endregion
+//#region src/parser.ts
+var A = "--", j = "-", ne = "--", re = "--no-", M = "true", N = "false";
+function P(e, t, n) {
 	let r = e.get(t);
 	if (r) {
 		r.push(n);
@@ -176,51 +194,51 @@ function addFlag(e, t, n) {
 	}
 	e.set(t, [n]);
 }
-function isNextTokenAvailable(e, t) {
-	return t + 1 >= e.length ? !1 : !e[t + 1].startsWith(SHORT_FLAG_PREFIX);
+function F(e, t) {
+	return t + 1 >= e.length ? !1 : !e[t + 1].startsWith(j);
 }
-function parseTokens(e, t) {
+function I(e, t) {
 	let n = /* @__PURE__ */ new Map(), r = [], i = [], a = 0;
 	for (; a < e.length;) {
 		let o = e[a];
-		if (o === DOUBLE_DASH) {
+		if (o === ne) {
 			i = e.slice(a + 1);
 			break;
 		}
-		if (o.startsWith(NEGATION_PREFIX)) {
-			addFlag(n, o.slice(5), BOOLEAN_FALSE), a++;
+		if (o.startsWith(re)) {
+			P(n, o.slice(5), N), a++;
 			continue;
 		}
-		if (o.startsWith(LONG_FLAG_PREFIX) && o.includes("=")) {
+		if (o.startsWith(A) && o.includes("=")) {
 			let e = o.indexOf("=");
-			addFlag(n, o.slice(2, e), o.slice(e + 1)), a++;
+			P(n, o.slice(2, e), o.slice(e + 1)), a++;
 			continue;
 		}
-		if (o.startsWith(LONG_FLAG_PREFIX)) {
+		if (o.startsWith(A)) {
 			let r = o.slice(2);
 			if (t.booleanFlags.has(r)) {
-				addFlag(n, r, BOOLEAN_TRUE), a++;
+				P(n, r, M), a++;
 				continue;
 			}
-			if (isNextTokenAvailable(e, a)) {
-				addFlag(n, r, e[a + 1]), a += 2;
+			if (F(e, a)) {
+				P(n, r, e[a + 1]), a += 2;
 				continue;
 			}
 			throw Error(`Flag --${r} requires a value`);
 		}
-		if (o.startsWith(SHORT_FLAG_PREFIX) && !o.startsWith(LONG_FLAG_PREFIX) && o.includes("=")) {
+		if (o.startsWith(j) && !o.startsWith(A) && o.includes("=")) {
 			let e = o.indexOf("="), r = o.slice(1, e), i = o.slice(e + 1);
-			addFlag(n, t.aliases.get(r) ?? r, i), a++;
+			P(n, t.aliases.get(r) ?? r, i), a++;
 			continue;
 		}
-		if (o.startsWith(SHORT_FLAG_PREFIX) && !o.startsWith(LONG_FLAG_PREFIX)) {
+		if (o.startsWith(j) && !o.startsWith(A)) {
 			let r = o.slice(1), i = t.aliases.get(r) ?? r;
 			if (t.booleanFlags.has(i)) {
-				addFlag(n, i, BOOLEAN_TRUE), a++;
+				P(n, i, M), a++;
 				continue;
 			}
-			if (isNextTokenAvailable(e, a)) {
-				addFlag(n, i, e[a + 1]), a += 2;
+			if (F(e, a)) {
+				P(n, i, e[a + 1]), a += 2;
 				continue;
 			}
 			throw Error(`Flag -${r} requires a value`);
@@ -233,11 +251,13 @@ function parseTokens(e, t) {
 		doubleDashArgs: i
 	};
 }
-var PLUGINS_DIR_NAME = "_plugins", PLUGIN_FILE_EXTENSION = ".ts";
-function definePlugin(e) {
+//#endregion
+//#region src/plugin.ts
+var L = "_plugins", R = ".ts";
+function z(e) {
 	return e;
 }
-async function resolvePlugins(e, t) {
+async function B(e, t) {
 	let n = {}, r = [];
 	for (let i of e) {
 		let e = await i(t);
@@ -248,7 +268,7 @@ async function resolvePlugins(e, t) {
 		middlewares: r
 	};
 }
-function buildMiddlewareChain(e, t) {
+function V(e, t) {
 	let n = t;
 	for (let t = e.length - 1; t >= 0; t--) {
 		let r = e[t], i = n;
@@ -256,29 +276,31 @@ function buildMiddlewareChain(e, t) {
 	}
 	return n;
 }
-async function scanPluginsAlongPath(t, n) {
+async function H(t, n) {
 	let r = [];
 	for (let n of t) {
-		let t = join(n, PLUGINS_DIR_NAME), i;
+		let t = e(n, L), i;
 		try {
-			i = await readdir(t, { withFileTypes: !0 });
+			i = await c(t, { withFileTypes: !0 });
 		} catch {
 			continue;
 		}
-		let a = i.filter((e) => e.isFile() && e.name.endsWith(PLUGIN_FILE_EXTENSION)).sort((e, t) => e.name.localeCompare(t.name));
+		let a = i.filter((e) => e.isFile() && e.name.endsWith(R)).sort((e, t) => e.name.localeCompare(t.name));
 		for (let n of a) {
-			let i = join(t, n.name), a = (await import(i)).default;
+			let i = e(t, n.name), a = (await import(i)).default;
 			if (a === void 0) throw Error(`Plugin file ${i} does not have a default export`);
 			r.push(a);
 		}
 	}
-	return resolvePlugins(r, n);
+	return B(r, n);
 }
-function resolveEnvName(e, t, n, r) {
+//#endregion
+//#region src/resolver.ts
+function U(e, t, n, r) {
 	if (e !== void 0) return e;
-	if (t !== void 0) return deriveEnvName(t, n, r);
+	if (t !== void 0) return _(t, n, r);
 }
-function resolveValues(e) {
+function W(e) {
 	let { argsDefs: t, parsedTokens: n, env: r, config: i, commandPath: a, envPrefix: o } = e, s = {}, c = 0;
 	for (let [e, l] of Object.entries(t)) {
 		let t = n.flags.get(e);
@@ -294,7 +316,7 @@ function resolveValues(e) {
 			s[e] = n.positionals[c], c++;
 			continue;
 		}
-		let u = resolveEnvName(l.env, o, a, e);
+		let u = U(l.env, o, a, e);
 		if (u !== void 0) {
 			let t = r[u];
 			if (t !== void 0) {
@@ -303,7 +325,7 @@ function resolveValues(e) {
 			}
 		}
 		if (i !== void 0) {
-			let t = getByDotPath(i, l.config ?? deriveConfigPath(a, e));
+			let t = f(i, l.config ?? v(a, e));
 			if (t !== void 0) {
 				s[e] = t;
 				continue;
@@ -316,29 +338,39 @@ function resolveValues(e) {
 	}
 	return s;
 }
-var DYNAMIC_SEGMENT_PATTERN = /^\[(.+)]$/, COMMAND_FILE_EXTENSION = ".ts", INDEX_FILE_NAME = "index", INTERNAL_PREFIX = "_";
-async function fileExists(e) {
+//#endregion
+//#region src/router.ts
+var G = /^\[(.+)]$/, K = [".ts", ".js"], q = "index", J = "_";
+function Y(e) {
+	return K.find((t) => e.endsWith(t));
+}
+function ie(e, t) {
+	return e.slice(0, -t.length);
+}
+async function ae(e) {
 	try {
-		return (await stat(e)).isFile();
+		return (await l(e)).isFile();
 	} catch {
 		return !1;
 	}
 }
-async function listAvailableEntries(e) {
+async function oe(e) {
 	try {
-		let t = await readdir(e, { withFileTypes: !0 }), n = [];
-		for (let e of t) if (!e.name.startsWith(INTERNAL_PREFIX)) {
-			if (e.isFile() && e.name.endsWith(COMMAND_FILE_EXTENSION)) {
-				let t = e.name.slice(0, -3);
-				if (t === INDEX_FILE_NAME) continue;
-				n.push({
-					name: t,
+		let t = (await c(e, { withFileTypes: !0 })).toSorted((e, t) => (e.isFile() ? K.indexOf(Y(e.name) ?? "") : -1) - (t.isFile() ? K.indexOf(Y(t.name) ?? "") : -1)), n = [], r = /* @__PURE__ */ new Set();
+		for (let e of t) {
+			if (e.name.startsWith(J)) continue;
+			let t = e.isFile() ? Y(e.name) : void 0;
+			if (t !== void 0) {
+				let i = ie(e.name, t);
+				if (i === q || r.has(i)) continue;
+				r.add(i), n.push({
+					name: i,
 					isDynamic: !1
 				});
 				continue;
 			}
 			if (e.isDirectory()) {
-				let t = e.name.match(DYNAMIC_SEGMENT_PATTERN);
+				let t = e.name.match(G);
 				if (t !== null) {
 					n.push({
 						name: e.name,
@@ -358,82 +390,88 @@ async function listAvailableEntries(e) {
 		return [];
 	}
 }
-async function resolveRoute(t, r) {
-	let i = resolve(t), a = {}, o = [i], s = 0;
+async function X(t, r) {
+	let i = n(t), a = {}, o = [i], s = 0;
 	for (let t = 0; t < r.length; t++) {
 		let n = r[t];
 		if (n.startsWith("-")) break;
-		let l = await readdir(i, { withFileTypes: !0 }), u = n + COMMAND_FILE_EXTENSION, d = l.find((e) => e.isFile() && e.name === u);
-		if (d) return s = t + 1, {
+		let l = await c(i, { withFileTypes: !0 }), u = K.reduce((e, t) => e ?? l.find((e) => e.isFile() && e.name === n + t), void 0);
+		if (u) return s = t + 1, {
 			kind: "resolved",
-			filePath: join(i, d.name),
+			filePath: e(i, u.name),
 			params: a,
 			remainingTokens: r.slice(s),
 			traversedDirs: o
 		};
-		let f = l.find((e) => e.isDirectory() && e.name === n);
-		if (f) {
-			i = join(i, f.name), o.push(i), s = t + 1;
+		let d = l.find((e) => e.isDirectory() && e.name === n);
+		if (d) {
+			i = e(i, d.name), o.push(i), s = t + 1;
 			continue;
 		}
-		let p, m = l.find((e) => {
+		let f, p = l.find((e) => {
 			if (!e.isDirectory()) return !1;
-			let t = e.name.match(DYNAMIC_SEGMENT_PATTERN);
-			return t === null ? !1 : (p = t[1], !0);
+			let t = e.name.match(G);
+			return t === null ? !1 : (f = t[1], !0);
 		});
-		if (m && p !== void 0) {
-			a[p] = n, i = join(i, m.name), o.push(i), s = t + 1;
+		if (p && f !== void 0) {
+			a[f] = n, i = e(i, p.name), o.push(i), s = t + 1;
 			continue;
 		}
 		break;
 	}
-	let l = join(i, INDEX_FILE_NAME + COMMAND_FILE_EXTENSION);
-	if (await fileExists(l)) return {
-		kind: "resolved",
-		filePath: l,
-		params: a,
-		remainingTokens: r.slice(s),
-		traversedDirs: o
-	};
-	let u = await listAvailableEntries(i);
+	for (let t of K) {
+		let n = e(i, q + t);
+		if (await ae(n)) return {
+			kind: "resolved",
+			filePath: n,
+			params: a,
+			remainingTokens: r.slice(s),
+			traversedDirs: o
+		};
+	}
+	let l = await oe(i);
 	return {
 		kind: "unresolved",
 		stoppedDir: i,
-		availableEntries: u
+		availableEntries: l
 	};
 }
-function wrapWithStringPreprocess(e) {
-	return isBooleanSchema(e) ? z.preprocess((e) => typeof e == "string" ? e === "true" || e === "1" : e, e) : isNumberSchema(e) ? z.preprocess((e) => typeof e == "string" ? Number(e) : e, e) : e;
+//#endregion
+//#region src/validator.ts
+function se(e) {
+	return y(e) ? o.preprocess((e) => typeof e == "string" ? e === "true" || e === "1" : e, e) : b(e) ? o.preprocess((e) => typeof e == "string" ? Number(e) : e, e) : e;
 }
-function validateArgs(e, t) {
+function ce(e, t) {
 	let n = {};
 	for (let [t, r] of Object.entries(e)) {
-		let e = wrapWithStringPreprocess(r.type);
+		let e = se(r.type);
 		if (r.multiple === !0) {
-			n[t] = z.array(e);
+			n[t] = o.array(e);
 			continue;
 		}
 		n[t] = e;
 	}
-	return z.object(n).parse(t);
+	return o.object(n).parse(t);
 }
-var DEFAULT_COMMANDS_DIR = "commands", ARGV_SKIP = 2, EXIT_CODE_ERROR = 1;
-function buildParserConfig(e) {
+//#endregion
+//#region src/cli.ts
+var le = "commands", Z = 2, Q = 1;
+function ue(e) {
 	let t = /* @__PURE__ */ new Set(), n = /* @__PURE__ */ new Map();
-	for (let [r, i] of Object.entries(e)) isBooleanSchema(i.type) && t.add(r), i.alias !== void 0 && n.set(i.alias, r);
+	for (let [r, i] of Object.entries(e)) y(i.type) && t.add(r), i.alias !== void 0 && n.set(i.alias, r);
 	return {
 		booleanFlags: t,
 		aliases: n
 	};
 }
-function extractCommandPath(e, r) {
-	return relative(resolve(e), r).replace(/\.ts$/, "").split("/").filter((e) => e !== "index" && !e.startsWith("["));
+function $(e, r) {
+	return t(n(e), r).replace(/\.ts$/, "").split("/").filter((e) => e !== "index" && !e.startsWith("["));
 }
-function extractPartialCommandPath(e, r) {
-	let i = relative(resolve(e), r);
+function de(e, r) {
+	let i = t(n(e), r);
 	return i === "" || i === "." ? [] : i.split("/").filter((e) => !e.startsWith("["));
 }
-function extractFrameworkFlags(e) {
+function fe(e) {
 	let t, n = [];
 	for (let r = 0; r < e.length; r++) {
 		let i = e[r];
@@ -454,42 +492,39 @@ function extractFrameworkFlags(e) {
 		remainingTokens: n
 	};
 }
-function createCLI(e) {
-	let t = e.commandsDir ?? DEFAULT_COMMANDS_DIR, r = e.name, a = e.autoEnv?.prefix, o = e.defaultCommand;
+function pe(e) {
+	let t = e.commandsDir ?? le, r = e.name, a = e.autoEnv?.prefix, o = e.defaultCommand;
 	async function s() {
-		let { configPath: e, remainingTokens: s } = extractFrameworkFlags(process.argv.slice(ARGV_SKIP)), c = await resolveRoute(t, s);
-		if (c.kind === "unresolved") {
-			let e = resolve(c.stoppedDir) === resolve(t), i = s.length > 0 && !s[0].startsWith("-");
-			if (e && o !== void 0 && !i) {
-				if (s.includes("--help") || s.includes("-h")) {
-					let e = await resolveRoute(t, [o]);
-					if (e.kind === "unresolved") throw Error(`defaultCommand "${o}" does not match any command file`);
-					let n = (await import(e.filePath)).default, i = n.args ?? {}, s = generateDefaultCommandHelp({
-						programName: r,
-						defaultCommandName: o,
-						commandPath: extractCommandPath(t, e.filePath),
-						description: n.description,
-						argsDefs: Object.keys(i).length > 0 ? i : void 0,
-						envPrefix: a,
-						availableEntries: c.availableEntries
-					});
-					console.log(s);
-					return;
-				}
-				let e = await resolveRoute(t, [o, ...s]);
+		let { configPath: e, remainingTokens: s } = fe(process.argv.slice(Z)), c = await X(t, s);
+		if (c.kind === "unresolved") if (n(c.stoppedDir) === n(t) && o !== void 0) {
+			if (s.includes("--help") || s.includes("-h")) {
+				let e = await X(t, [o]);
 				if (e.kind === "unresolved") throw Error(`defaultCommand "${o}" does not match any command file`);
-				c = e;
-			} else {
-				let e = generateSubcommandHelp({
+				let n = (await import(e.filePath)).default, i = n.args ?? {}, s = k({
 					programName: r,
-					commandPath: extractPartialCommandPath(t, c.stoppedDir),
+					defaultCommandName: o,
+					commandPath: $(t, e.filePath),
+					description: n.description,
+					argsDefs: Object.keys(i).length > 0 ? i : void 0,
+					envPrefix: a,
 					availableEntries: c.availableEntries
 				});
-				console.log(e);
+				console.log(s);
 				return;
 			}
+			let e = await X(t, [o, ...s]);
+			if (e.kind === "unresolved") throw Error(`defaultCommand "${o}" does not match any command file`);
+			c = e;
+		} else {
+			let e = te({
+				programName: r,
+				commandPath: de(t, c.stoppedDir),
+				availableEntries: c.availableEntries
+			});
+			console.log(e);
+			return;
 		}
-		let l = (await import(c.filePath)).default, u = l.args ?? {}, d = extractCommandPath(t, c.filePath), f = generateHelp({
+		let l = (await import(c.filePath)).default, u = l.args ?? {}, d = $(t, c.filePath), f = D({
 			programName: r,
 			commandPath: d,
 			description: l.description,
@@ -500,10 +535,10 @@ function createCLI(e) {
 			console.log(f);
 			return;
 		}
-		let p = buildParserConfig(u), m;
+		let p = ue(u), m;
 		try {
-			let t = parseTokens(c.remainingTokens, p), n = await loadMergedConfig(r, e);
-			m = validateArgs(u, resolveValues({
+			let t = I(c.remainingTokens, p), n = await g(r, e);
+			m = ce(u, W({
 				argsDefs: u,
 				parsedTokens: t,
 				env: process.env,
@@ -512,29 +547,32 @@ function createCLI(e) {
 				envPrefix: a
 			}));
 		} catch (e) {
-			if (e instanceof ZodError) {
+			if (e instanceof i) {
 				let t = e.issues.map((e) => `${e.path.join(".")}: ${e.message}`);
-				console.error(generateValidationErrorHelp(f, t)), process.exit(EXIT_CODE_ERROR);
+				console.error(O(f, t)), process.exit(Q);
 			}
-			throw e instanceof Error && (console.error(generateValidationErrorHelp(f, [e.message])), process.exit(EXIT_CODE_ERROR)), e;
+			throw e instanceof Error && (console.error(O(f, [e.message])), process.exit(Q)), e;
 		}
-		let { extensions: h, middlewares: g } = await scanPluginsAlongPath(c.traversedDirs, { cliName: r }), _ = {
+		let { extensions: h, middlewares: _ } = await H(c.traversedDirs, { cliName: r }), v = {
 			commandPath: d,
 			params: c.params,
 			args: m,
 			extensions: h
 		};
-		await buildMiddlewareChain(g, async (e) => {
+		await V(_, async (e) => {
 			await l.run({
 				params: e.params,
 				args: e.args,
 				extensions: e.extensions
 			});
-		})(_);
+		})(v);
 	}
 	return { run: s };
 }
-function defineCommand(e) {
+//#endregion
+//#region src/types.ts
+function me(e) {
 	return e;
 }
-export { createCLI, defineCommand, definePlugin };
+//#endregion
+export { pe as createCLI, me as defineCommand, z as definePlugin };

package/dist/router.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAQA,UAAU,aAAa;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,cAAc,EAAE,CAAC;CACpC;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,WAAW,GAAG,aAAa,GAAG,eAAe,CAAC;AAqDnD,iBAAe,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAmFvF;AAED,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC"}
+{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../src/router.ts"],"names":[],"mappings":"AAiBA,UAAU,aAAa;IACrB,IAAI,EAAE,UAAU,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,aAAa,EAAE,MAAM,EAAE,CAAC;CACzB;AAED,UAAU,eAAe;IACvB,IAAI,EAAE,YAAY,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,cAAc,EAAE,CAAC;CACpC;AAED,UAAU,cAAc;IACtB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,KAAK,WAAW,GAAG,aAAa,GAAG,eAAe,CAAC;AAsEnD,iBAAe,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC,CAuFvF;AAED,OAAO,EAAE,YAAY,EAAE,CAAC;AACxB,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@miyaoka/fsss",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "A CLI framework where your file structure becomes your command structure, and a single schema gives you typed values whether they come from flags, env vars, or config files.",
   "type": "module",
   "author": "miyaoka",
@@ -37,13 +37,13 @@
   },
   "devDependencies": {
     "@tsconfig/node24": "24.0.4",
-    "@types/bun": "1.3.9",
-    "oxfmt": "0.31.0",
-    "oxlint": "1.46.0",
-    "oxlint-tsgolint": "0.12.0",
+    "@types/bun": "1.3.10",
+    "oxfmt": "0.37.0",
+    "oxlint": "1.52.0",
+    "oxlint-tsgolint": "0.16.0",
     "typescript": "5.9.3",
     "unplugin-dts": "1.0.0-beta.6",
-    "vite": "8.0.0-beta.13"
+    "vite": "8.0.0-beta.18"
   },
   "scripts": {
     "build": "vite build",