fix type and build tests

sindresorhus · Mar 4, 2024 · f71b940 · f71b940
1 parent 01eeabc
commit f71b940
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,5 @@ node_modules
 build
 yarn.lock
 test-d/build.ts
+test-d/*.d.ts
 .tsimp
diff --git a/rollup.config.js b/rollup.config.js
@@ -86,6 +86,9 @@ const dtsConfig = defineConfig({
 				);
 
 				await fs.writeFile(`./test-d/${outputDirectory}.ts`, tsdFile);
+
+				const minimistFile = await fs.readFile(`./${sourceDirectory}/minimist-options.d.ts`, 'utf8');
+				await fs.writeFile('./test-d/minimist-options.d.ts', minimistFile);
 			},
 		},
 	],

diff --git a/source/index.ts b/source/index.ts
@@ -13,7 +13,7 @@ import type {
 	AnyFlags,
 } from './types.js';
 
-const buildResult = <Flags extends AnyFlags = AnyFlags>({pkg: packageJson, ...options}: ParsedOptions, parserOptions: ParserOptions): Result<Flags> => {
+const buildResult = <Flags extends AnyFlags = never>({pkg: packageJson, ...options}: ParsedOptions, parserOptions: ParserOptions): Result<Flags> => {
 	const {_: input, ...argv} = parseArguments(options.argv as string[], parserOptions);
 	let help = '';
 
@@ -130,10 +130,10 @@ const cli = meow(`
 foo(cli.input.at(0), cli.flags);
 ```
 */
-export default function meow<Flags extends AnyFlags>(helpMessage: string, options: Options<Flags>): Result<Flags>;
-export default function meow<Flags extends AnyFlags>(options: Options<Flags>): Result<Flags>;
+export default function meow<Flags extends AnyFlags = never>(helpMessage: string, options: Options<Flags>): Result<Flags>;
+export default function meow<Flags extends AnyFlags = never>(options: Options<Flags>): Result<Flags>;
 
-export default function meow<Flags extends AnyFlags = AnyFlags>(helpMessage: string | Options<Flags>, options?: Options<Flags>): Result<Flags> {
+export default function meow<Flags extends AnyFlags = never>(helpMessage: string | Options<Flags>, options?: Options<Flags>): Result<Flags> {
 	if (typeof helpMessage !== 'string') {
 		options = helpMessage;
 		helpMessage = '';

diff --git a/source/minimist-options.d.ts b/source/minimist-options.d.ts
@@ -46,17 +46,16 @@ declare module 'minimist-options' {
 
 	export type MinimistOption = Pick<MinimistOptions, 'stopEarly' | 'unknown' | '--'>;
 
-	export type Options = MinimistOption & {
-		[key: string]: (
-			| OptionType
-			| StringOption
-			| BooleanOption
-			| NumberOption
-			| DefaultArrayOption
-			| StringArrayOption
-			| BooleanArrayOption
-			| NumberArrayOption
-		);
+	export type Options = MinimistOption & Record<string, (
+		| OptionType
+		| StringOption
+		| BooleanOption
+		| NumberOption
+		| DefaultArrayOption
+		| StringArrayOption
+		| BooleanArrayOption
+		| NumberArrayOption
+	)> & {
 		arguments?: string;
 	};
 

diff --git a/test/build.ts → test/build.js b/test/build.ts → test/build.js
@@ -2,7 +2,7 @@ import test from 'ava';
 import meow from '../build/index.js';
 import {_verifyCli, meowVersion} from './_utils.js';
 
-const verifyCli = _verifyCli();
+const verifyCli = _verifyCli('build.js');
 
 test('main', t => {
 	const cli = meow(`

diff --git a/test/fixtures/build.ts → test/fixtures/build.js b/test/fixtures/build.ts → test/fixtures/build.js
@@ -1,4 +1,4 @@
-#!/usr/bin/env tsimp
+#!/usr/bin/env node
 import process from 'node:process';
 import meow from '../../build/index.js';