Skip to content

Commit 0f59c43

Browse files
committed
Fixed typecasting issue with CLI arguments.
1 parent 1b338e2 commit 0f59c43

File tree

1 file changed

+24
-17
lines changed

1 file changed

+24
-17
lines changed

packages/doxdox-cli/src/index.ts

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,23 @@ const args = parseCmdArgs(null, {
5151

5252
const cwd = process.cwd();
5353

54-
const showHelp = args.flags['-h'] || args.flags['--help'];
55-
const showVersion = args.flags['-v'] || args.flags['--version'];
56-
57-
const overrideName = args.flags['-n'] || args.flags['--name'];
58-
const overrideDescription = args.flags['-d'] || args.flags['--description'];
59-
const overrideIgnore = args.flags['-i'] || args.flags['--ignore'] || '';
60-
const overrideRenderer =
61-
args.flags['-r'] || args.flags['--renderer'] || 'markdown';
62-
const overrideOutput = args.flags['-o'] || args.flags['--output'] || false;
63-
const overridePackage = args.flags['-p'] || args.flags['--package'];
54+
const showHelp = Boolean(args.flags['-h'] || args.flags['--help'] || false);
55+
const showVersion = Boolean(
56+
args.flags['-v'] || args.flags['--version'] || false
57+
);
58+
59+
const overrideName = String(args.flags['-n'] || args.flags['--name'] || '');
60+
const overrideDescription = String(
61+
args.flags['-d'] || args.flags['--description'] || ''
62+
);
63+
const overrideIgnore = String(args.flags['-i'] || args.flags['--ignore'] || '');
64+
const overrideRenderer = String(
65+
args.flags['-r'] || args.flags['--renderer'] || 'markdown'
66+
);
67+
const overrideOutput = String(args.flags['-o'] || args.flags['--output'] || '');
68+
const overridePackage = String(
69+
args.flags['-p'] || args.flags['--package'] || ''
70+
);
6471

6572
(async () => {
6673
const pkgPath = await findFileInPath(
@@ -89,7 +96,7 @@ const overridePackage = args.flags['-p'] || args.flags['--package'];
8996

9097
const paths = await globby(
9198
(args.inputs?.length ? args.inputs : defaultPaths).concat(
92-
parseIgnoreConfig(String(overrideIgnore).split(',').join(EOL))
99+
parseIgnoreConfig(overrideIgnore.split(',').join(EOL))
93100
),
94101
{
95102
cwd,
@@ -113,7 +120,7 @@ const overridePackage = args.flags['-p'] || args.flags['--package'];
113120
const loadedRenderer = await loadPlugin<(doc: Doc) => Promise<string>>(
114121
nodeModulesDir,
115122
'doxdox-renderer-',
116-
String(overrideRenderer).toLowerCase()
123+
overrideRenderer.toLowerCase()
117124
);
118125

119126
if (!loadedParser) {
@@ -124,18 +131,18 @@ const overridePackage = args.flags['-p'] || args.flags['--package'];
124131
throw new Error('Renderer missing!');
125132
}
126133

127-
const pkg = await getProjectPackage(String(overridePackage) || cwd);
134+
const pkg = await getProjectPackage(overridePackage || cwd);
128135

129136
const output = await doxdox(cwd, paths, loadedParser, loadedRenderer, {
130-
name: String(overrideName) || pkg.name || 'Untitled Project',
131-
description: String(overrideDescription) || pkg.description || '',
137+
name: overrideName || pkg.name || 'Untitled Project',
138+
description: overrideDescription || pkg.description || '',
132139
version: pkg.version
133140
});
134141

135142
if (overrideOutput) {
136-
await fs.mkdir(dirname(String(overrideOutput)), { recursive: true });
143+
await fs.mkdir(dirname(overrideOutput), { recursive: true });
137144

138-
await fs.writeFile(String(overrideOutput), output);
145+
await fs.writeFile(overrideOutput, output);
139146
} else {
140147
process.stdout.write(output);
141148
}

0 commit comments

Comments
 (0)