@miyaoka/fsss 0.2.1 → 0.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE +21 -0
- package/dist/cli.d.ts +1 -0
- package/dist/cli.d.ts.map +1 -1
- package/dist/codegen.js +0 -0
- package/dist/help.d.ts +12 -2
- package/dist/help.d.ts.map +1 -1
- package/dist/index.js +88 -37
- package/package.json +15 -18
package/LICENSE
ADDED
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 miyaoka
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
package/dist/cli.d.ts
CHANGED
package/dist/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"
|
|
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"}
|
package/dist/codegen.js
CHANGED
|
File without changes
|
package/dist/help.d.ts
CHANGED
|
@@ -15,6 +15,16 @@ interface SubcommandHelpConfig {
|
|
|
15
15
|
}
|
|
16
16
|
declare function generateSubcommandHelp(config: SubcommandHelpConfig): string;
|
|
17
17
|
declare function generateValidationErrorHelp(helpText: string, errors: string[]): string;
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
interface DefaultCommandHelpConfig {
|
|
19
|
+
programName: string;
|
|
20
|
+
defaultCommandName: string;
|
|
21
|
+
commandPath: string[];
|
|
22
|
+
description?: string;
|
|
23
|
+
argsDefs?: ArgsDefs;
|
|
24
|
+
envPrefix?: string;
|
|
25
|
+
availableEntries: AvailableEntry[];
|
|
26
|
+
}
|
|
27
|
+
declare function generateDefaultCommandHelp(config: DefaultCommandHelpConfig): string;
|
|
28
|
+
export { generateDefaultCommandHelp, generateHelp, generateSubcommandHelp, generateValidationErrorHelp, };
|
|
29
|
+
export type { DefaultCommandHelpConfig, HelpConfig, SubcommandHelpConfig };
|
|
20
30
|
//# sourceMappingURL=help.d.ts.map
|
package/dist/help.d.ts.map
CHANGED
|
@@ -1 +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;AAED,
|
|
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"}
|
package/dist/index.js
CHANGED
|
@@ -138,6 +138,35 @@ function generateValidationErrorHelp(e, t) {
|
|
|
138
138
|
e
|
|
139
139
|
].join("\n");
|
|
140
140
|
}
|
|
141
|
+
function generateDefaultCommandHelp(e) {
|
|
142
|
+
let { programName: t, defaultCommandName: n, commandPath: r, description: i, argsDefs: a, envPrefix: o, availableEntries: s } = e, c = [];
|
|
143
|
+
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) {
|
|
144
|
+
let e = Object.entries(a).filter(([, e]) => e.positional !== !0);
|
|
145
|
+
if (e.length > 0) {
|
|
146
|
+
c.push("Options:");
|
|
147
|
+
let t = e.map(([e, t]) => formatOptionLine(e, t, o, r));
|
|
148
|
+
t.push(formatHelpLine());
|
|
149
|
+
let n = Math.max(...t.map((e) => e.left.length));
|
|
150
|
+
for (let e of t) {
|
|
151
|
+
let t = " ".repeat(n - e.left.length + COLUMN_GAP);
|
|
152
|
+
c.push(`${INDENT}${e.left}${t}${e.right}`);
|
|
153
|
+
}
|
|
154
|
+
c.push("");
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
if (s.length > 0) {
|
|
158
|
+
c.push("Available commands:");
|
|
159
|
+
for (let e of s) {
|
|
160
|
+
if (e.isDynamic) {
|
|
161
|
+
c.push(`${INDENT}<${e.paramName}>`);
|
|
162
|
+
continue;
|
|
163
|
+
}
|
|
164
|
+
let t = e.name === n ? " (default)" : "";
|
|
165
|
+
c.push(`${INDENT}${e.name}${t}`);
|
|
166
|
+
}
|
|
167
|
+
}
|
|
168
|
+
return c.join("\n");
|
|
169
|
+
}
|
|
141
170
|
var LONG_FLAG_PREFIX = "--", SHORT_FLAG_PREFIX = "-", DOUBLE_DASH = "--", NEGATION_PREFIX = "--no-", BOOLEAN_TRUE = "true", BOOLEAN_FALSE = "false";
|
|
142
171
|
function addFlag(e, t, n) {
|
|
143
172
|
let r = e.get(t);
|
|
@@ -426,62 +455,84 @@ function extractFrameworkFlags(e) {
|
|
|
426
455
|
};
|
|
427
456
|
}
|
|
428
457
|
function createCLI(e) {
|
|
429
|
-
let t = e.commandsDir ?? DEFAULT_COMMANDS_DIR,
|
|
430
|
-
async function
|
|
431
|
-
let { configPath: e, remainingTokens:
|
|
432
|
-
if (
|
|
433
|
-
let e =
|
|
434
|
-
|
|
435
|
-
|
|
436
|
-
|
|
437
|
-
|
|
438
|
-
|
|
439
|
-
|
|
458
|
+
let t = e.commandsDir ?? DEFAULT_COMMANDS_DIR, r = e.name, a = e.autoEnv?.prefix, o = e.defaultCommand;
|
|
459
|
+
async function s() {
|
|
460
|
+
let { configPath: e, remainingTokens: s } = extractFrameworkFlags(process.argv.slice(ARGV_SKIP)), c = await resolveRoute(t, s);
|
|
461
|
+
if (c.kind === "unresolved") {
|
|
462
|
+
let e = resolve(c.stoppedDir) === resolve(t), i = s.length > 0 && !s[0].startsWith("-");
|
|
463
|
+
if (e && o !== void 0 && !i) {
|
|
464
|
+
if (s.includes("--help") || s.includes("-h")) {
|
|
465
|
+
let e = await resolveRoute(t, [o]);
|
|
466
|
+
if (e.kind === "unresolved") throw Error(`defaultCommand "${o}" does not match any command file`);
|
|
467
|
+
let n = (await import(e.filePath)).default, i = n.args ?? {}, s = generateDefaultCommandHelp({
|
|
468
|
+
programName: r,
|
|
469
|
+
defaultCommandName: o,
|
|
470
|
+
commandPath: extractCommandPath(t, e.filePath),
|
|
471
|
+
description: n.description,
|
|
472
|
+
argsDefs: Object.keys(i).length > 0 ? i : void 0,
|
|
473
|
+
envPrefix: a,
|
|
474
|
+
availableEntries: c.availableEntries
|
|
475
|
+
});
|
|
476
|
+
console.log(s);
|
|
477
|
+
return;
|
|
478
|
+
}
|
|
479
|
+
let e = await resolveRoute(t, [o, ...s]);
|
|
480
|
+
if (e.kind === "unresolved") throw Error(`defaultCommand "${o}" does not match any command file`);
|
|
481
|
+
c = e;
|
|
482
|
+
} else {
|
|
483
|
+
let e = generateSubcommandHelp({
|
|
484
|
+
programName: r,
|
|
485
|
+
commandPath: extractPartialCommandPath(t, c.stoppedDir),
|
|
486
|
+
availableEntries: c.availableEntries
|
|
487
|
+
});
|
|
488
|
+
console.log(e);
|
|
489
|
+
return;
|
|
490
|
+
}
|
|
440
491
|
}
|
|
441
|
-
let
|
|
442
|
-
programName:
|
|
443
|
-
commandPath:
|
|
444
|
-
description:
|
|
445
|
-
argsDefs: Object.keys(
|
|
446
|
-
envPrefix:
|
|
492
|
+
let l = (await import(c.filePath)).default, u = l.args ?? {}, d = extractCommandPath(t, c.filePath), f = generateHelp({
|
|
493
|
+
programName: r,
|
|
494
|
+
commandPath: d,
|
|
495
|
+
description: l.description,
|
|
496
|
+
argsDefs: Object.keys(u).length > 0 ? u : void 0,
|
|
497
|
+
envPrefix: a
|
|
447
498
|
});
|
|
448
|
-
if (
|
|
449
|
-
console.log(
|
|
499
|
+
if (c.remainingTokens.includes("--help") || c.remainingTokens.includes("-h")) {
|
|
500
|
+
console.log(f);
|
|
450
501
|
return;
|
|
451
502
|
}
|
|
452
|
-
let
|
|
503
|
+
let p = buildParserConfig(u), m;
|
|
453
504
|
try {
|
|
454
|
-
let t = parseTokens(
|
|
455
|
-
|
|
456
|
-
argsDefs:
|
|
505
|
+
let t = parseTokens(c.remainingTokens, p), n = await loadMergedConfig(r, e);
|
|
506
|
+
m = validateArgs(u, resolveValues({
|
|
507
|
+
argsDefs: u,
|
|
457
508
|
parsedTokens: t,
|
|
458
509
|
env: process.env,
|
|
459
|
-
config:
|
|
460
|
-
commandPath:
|
|
461
|
-
envPrefix:
|
|
510
|
+
config: n,
|
|
511
|
+
commandPath: d,
|
|
512
|
+
envPrefix: a
|
|
462
513
|
}));
|
|
463
514
|
} catch (e) {
|
|
464
515
|
if (e instanceof ZodError) {
|
|
465
516
|
let t = e.issues.map((e) => `${e.path.join(".")}: ${e.message}`);
|
|
466
|
-
console.error(generateValidationErrorHelp(
|
|
517
|
+
console.error(generateValidationErrorHelp(f, t)), process.exit(EXIT_CODE_ERROR);
|
|
467
518
|
}
|
|
468
|
-
throw e instanceof Error && (console.error(generateValidationErrorHelp(
|
|
519
|
+
throw e instanceof Error && (console.error(generateValidationErrorHelp(f, [e.message])), process.exit(EXIT_CODE_ERROR)), e;
|
|
469
520
|
}
|
|
470
|
-
let { extensions:
|
|
471
|
-
commandPath:
|
|
472
|
-
params:
|
|
473
|
-
args:
|
|
474
|
-
extensions:
|
|
521
|
+
let { extensions: h, middlewares: g } = await scanPluginsAlongPath(c.traversedDirs, { cliName: r }), _ = {
|
|
522
|
+
commandPath: d,
|
|
523
|
+
params: c.params,
|
|
524
|
+
args: m,
|
|
525
|
+
extensions: h
|
|
475
526
|
};
|
|
476
|
-
await buildMiddlewareChain(
|
|
477
|
-
await
|
|
527
|
+
await buildMiddlewareChain(g, async (e) => {
|
|
528
|
+
await l.run({
|
|
478
529
|
params: e.params,
|
|
479
530
|
args: e.args,
|
|
480
531
|
extensions: e.extensions
|
|
481
532
|
});
|
|
482
|
-
})(
|
|
533
|
+
})(_);
|
|
483
534
|
}
|
|
484
|
-
return { run:
|
|
535
|
+
return { run: s };
|
|
485
536
|
}
|
|
486
537
|
function defineCommand(e) {
|
|
487
538
|
return e;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@miyaoka/fsss",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.3.0",
|
|
4
4
|
"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.",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"author": "miyaoka",
|
|
@@ -32,28 +32,25 @@
|
|
|
32
32
|
"files": [
|
|
33
33
|
"dist"
|
|
34
34
|
],
|
|
35
|
+
"dependencies": {
|
|
36
|
+
"zod": "4.3.6"
|
|
37
|
+
},
|
|
38
|
+
"devDependencies": {
|
|
39
|
+
"@tsconfig/node24": "24.0.4",
|
|
40
|
+
"@types/bun": "1.3.9",
|
|
41
|
+
"oxfmt": "0.31.0",
|
|
42
|
+
"oxlint": "1.46.0",
|
|
43
|
+
"oxlint-tsgolint": "0.12.0",
|
|
44
|
+
"typescript": "5.9.3",
|
|
45
|
+
"unplugin-dts": "1.0.0-beta.6",
|
|
46
|
+
"vite": "8.0.0-beta.13"
|
|
47
|
+
},
|
|
35
48
|
"scripts": {
|
|
36
|
-
"prepack": "cp ../../README.md .",
|
|
37
|
-
"postpack": "rm README.md",
|
|
38
|
-
"prepare": "vite build",
|
|
39
49
|
"build": "vite build",
|
|
40
50
|
"dev": "vite build --watch",
|
|
41
51
|
"test": "bun test",
|
|
42
52
|
"typecheck": "tsgo --noEmit",
|
|
43
53
|
"lint": "oxlint --type-aware .",
|
|
44
54
|
"fix": "oxlint --type-aware --fix . && oxfmt ."
|
|
45
|
-
},
|
|
46
|
-
"dependencies": {
|
|
47
|
-
"zod": "catalog:"
|
|
48
|
-
},
|
|
49
|
-
"devDependencies": {
|
|
50
|
-
"@tsconfig/node24": "catalog:",
|
|
51
|
-
"@types/bun": "catalog:",
|
|
52
|
-
"oxfmt": "catalog:",
|
|
53
|
-
"oxlint": "catalog:",
|
|
54
|
-
"oxlint-tsgolint": "catalog:",
|
|
55
|
-
"typescript": "catalog:",
|
|
56
|
-
"unplugin-dts": "catalog:",
|
|
57
|
-
"vite": "catalog:"
|
|
58
55
|
}
|
|
59
|
-
}
|
|
56
|
+
}
|