Fix short-flag number values

Author: tedspare

README.md

@@ -28,7 +28,7 @@ const cli = createCLI({
   version: '1.0.0',
   description: 'My CLI tool',
   commands: [
-    {
+    createCommand({
       name: 'greet',
       description: 'Greet someone',
       args: z.object({
@@ -39,7 +39,7 @@ const cli = createCLI({
         const greeting = `Hello, ${name}!`;
         console.log(uppercase ? greeting.toUpperCase() : greeting);
       }
-    }
+    })
   ]
 });
 

lib/parse.test.ts

@@ -30,6 +30,15 @@ describe('parseArgs', () => {
 		expect(result).toEqual({ number: 123 })
 	})
 
+	it('should parse short-form number flags', () => {
+		const schema = z.object({
+			number: z.number()
+		})
+		const argv = ['-n', '123']
+		const result = parseArgs({ argv, schema })
+		expect(result).toEqual({ number: 123 })
+	})
+
 	it('should convert kebab-case flags to camelCase', () => {
 		const schema = z.object({
 			kebabCase: z.boolean().optional()

lib/parse.ts

@@ -76,55 +76,49 @@ export function parseArgs<T extends z.ZodType>({
 		const flagMatch = arg.match(FLAG_REGEX)
 		const shortMatch = arg.match(SHORT_FLAG_REGEX)
 
+		let flagName = ''
+
 		if (shortMatch) {
 			const flags = (shortMatch[1] || '').split('')
 			for (const flag of flags) {
 				if (schema instanceof z.ZodObject) {
-					const shape = schema.shape
+					const { shape } = schema
 					const keys = Object.keys(shape)
 					const matchingKey = keys.find(k => k.toLowerCase().startsWith(flag.toLowerCase()))
-					if (matchingKey) {
-						args[matchingKey] = nextIsValue ? nextArg : true
-						if (nextIsValue) i++ // Skip the next arg
-					}
+					flagName = matchingKey || ''
 				}
 			}
 		}
 
-		if (flagMatch) {
-			const flagName = kebabToCamel(flagMatch[1] || '')
-
-			// TODO: map between Zod types in a flat, extensible way
-			let isBoolean = false
-			let isNumber = false
-			if (schema instanceof z.ZodObject) {
-				const shape = schema.shape
-				const field = shape[flagName]
-				if (field) {
-					if (field instanceof z.ZodBoolean) {
-						isBoolean = true
-					} else if (field instanceof z.ZodOptional && field.unwrap() instanceof z.ZodBoolean) {
-						isBoolean = true
-					} else if (field instanceof z.ZodNumber) {
-						isNumber = true
-					} else if (field instanceof z.ZodOptional && field.unwrap() instanceof z.ZodNumber) {
-						isNumber = true
-					}
+		if (flagMatch) flagName = kebabToCamel(flagMatch[1] || '')
+
+		// TODO: map between Zod types in a flat, extensible way
+		if (schema instanceof z.ZodObject) {
+			const { shape } = schema
+			let field = shape[flagName]
+			if (field) {
+				if (field instanceof z.ZodOptional) field = field.unwrap()
+				if (field instanceof z.ZodDefault) field = field.unwrap()
+
+				if (field instanceof z.ZodBoolean) {
+					args[flagName] = true
+					continue
 				}
-			}
 
-			if (isNumber) {
-				args[flagName] = Number(nextArg)
-				i++ // Skip the next arg
-			} else if (isBoolean) {
-				args[flagName] = true
-			} else if (nextIsValue) {
-				args[flagName] = nextArg
-				i++ // Skip the next arg
-			} else {
-				throw new Error(`Missing value for flag --${flagMatch[1]}`)
+				if (field instanceof z.ZodNumber) {
+					args[flagName] = Number(nextArg)
+					i++ // Skip the next arg
+					continue
+				}
 			}
 		}
+
+		if (nextIsValue) {
+			args[flagName] = nextArg
+			i++ // Skip the next arg
+		} else {
+			throw new Error(`Missing value for flag --${flagName}`)
+		}
 	}
 
 	const { data, success, error } = schema.safeParse(args)