diff --git a/.gitignore b/.gitignore index a6d40a9..fea6302 100644 --- 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 index 1caf60d..c4856f2 100644 --- 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 index 9bcd825..760b603 100644 --- a/source/index.ts +++ b/source/index.ts @@ -13,7 +13,7 @@ import type { AnyFlags, } from './types.js'; -const buildResult = ({pkg: packageJson, ...options}: ParsedOptions, parserOptions: ParserOptions): Result => { +const buildResult = ({pkg: packageJson, ...options}: ParsedOptions, parserOptions: ParserOptions): Result => { 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(helpMessage: string, options: Options): Result; -export default function meow(options: Options): Result; +export default function meow(helpMessage: string, options: Options): Result; +export default function meow(options: Options): Result; -export default function meow(helpMessage: string | Options, options?: Options): Result { +export default function meow(helpMessage: string | Options, options?: Options): Result { if (typeof helpMessage !== 'string') { options = helpMessage; helpMessage = ''; diff --git a/source/minimist-options.d.ts b/source/minimist-options.d.ts index bcf4364..636d866 100644 --- a/source/minimist-options.d.ts +++ b/source/minimist-options.d.ts @@ -46,17 +46,16 @@ declare module 'minimist-options' { export type MinimistOption = Pick; - export type Options = MinimistOption & { - [key: string]: ( - | OptionType - | StringOption - | BooleanOption - | NumberOption - | DefaultArrayOption - | StringArrayOption - | BooleanArrayOption - | NumberArrayOption - ); + export type Options = MinimistOption & Record & { arguments?: string; }; diff --git a/test/build.ts b/test/build.js similarity index 94% rename from test/build.ts rename to test/build.js index 28411f8..cd75d56 100644 --- a/test/build.ts +++ b/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 b/test/fixtures/build.js similarity index 96% rename from test/fixtures/build.ts rename to test/fixtures/build.js index 073a0d2..83f7222 100755 --- a/test/fixtures/build.ts +++ b/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';