incur 0.3.2 → 0.3.3

package/src/Fetch.ts

@@ -102,8 +102,7 @@ export function buildRequest(input: FetchInput): Request {
 
   if (input.body !== undefined) {
     init.body = input.body
-    if (!input.headers.has('content-type'))
-      input.headers.set('content-type', 'application/json')
+    if (!input.headers.has('content-type')) input.headers.set('content-type', 'application/json')
   }
 
   return new Request(url.toString(), init)

package/src/Filter.ts

@@ -97,7 +97,12 @@ function resolve(data: unknown, segments: Segment[], index: number): unknown {
   return sliced.map((item) => resolve(item, segments, index + 1))
 }
 
-function merge(target: Record<string, unknown>, data: unknown, segments: Segment[], index: number): void {
+function merge(
+  target: Record<string, unknown>,
+  data: unknown,
+  segments: Segment[],
+  index: number,
+): void {
   if (index >= segments.length || typeof data !== 'object' || data === null) return
   const segment = segments[index]!
 
@@ -129,8 +134,7 @@ function merge(target: Record<string, unknown>, data: unknown, segments: Segment
 
     // Next segment is a key — recurse into nested object
     if (typeof val !== 'object' || val === null) return
-    if (!target[segment.key] || typeof target[segment.key] !== 'object')
-      target[segment.key] = {}
+    if (!target[segment.key] || typeof target[segment.key] !== 'object') target[segment.key] = {}
     merge(target[segment.key] as Record<string, unknown>, val, segments, index + 1)
     return
   }

package/src/Help.test.ts

@@ -199,9 +199,9 @@ describe('formatRoot', () => {
     })
     expect(result).toMatchInlineSnapshot(`
       "my-tool@1.0.0 — A test CLI
-      Aliases: mt, myt
 
       Usage: my-tool <command>
+      Aliases: mt, myt
 
       Commands:
         fetch  Fetch a URL
@@ -228,9 +228,9 @@ describe('formatRoot', () => {
     })
     expect(result).toMatchInlineSnapshot(`
       "my-tool@1.0.0 — A test CLI
-      Aliases: mt, myt
 
       Usage: my-tool <url>
+      Aliases: mt, myt
 
       Arguments:
         url  URL to fetch

package/src/Help.ts

@@ -8,11 +8,11 @@ export function formatRoot(name: string, options: formatRoot.Options = {}): stri
   // Header
   const title = version ? `${name}@${version}` : name
   lines.push(description ? `${title} \u2014 ${description}` : title)
-  if (aliases?.length) lines.push(`Aliases: ${aliases.join(', ')}`)
   lines.push('')
 
   // Synopsis
   lines.push(`Usage: ${name} <command>`)
+  if (aliases?.length) lines.push(`Aliases: ${aliases.join(', ')}`)
 
   // Commands
   if (commands.length > 0) {
@@ -105,7 +105,6 @@ export function formatCommand(name: string, options: formatCommand.Options = {})
   // Header
   const title = version ? `${name}@${version}` : name
   lines.push(description ? `${title} \u2014 ${description}` : title)
-  if (aliases?.length) lines.push(`Aliases: ${aliases.join(', ')}`)
   lines.push('')
 
   // Synopsis
@@ -128,6 +127,7 @@ export function formatCommand(name: string, options: formatCommand.Options = {})
     const commandSuffix = options.commands && options.commands.length > 0 ? ' | <command>' : ''
     lines.push(`Usage: ${synopsis}${opts ? ' [options]' : ''}${commandSuffix}`)
   }
+  if (aliases?.length) lines.push(`Aliases: ${aliases.join(', ')}`)
 
   // Arguments
   if (args) {

package/src/Openapi.test.ts

@@ -1,11 +1,11 @@
 import { describe, expect, test } from 'vitest'
 
-import * as Cli from './Cli.js'
-import * as Openapi from './Openapi.js'
-import { app } from '../test/fixtures/hono-api.js'
 import { app as prefixedApp } from '../test/fixtures/hono-api-prefixed.js'
-import { spec } from '../test/fixtures/openapi-spec.js'
+import { app } from '../test/fixtures/hono-api.js'
 import { app as openapiApp, spec as openapiSpec } from '../test/fixtures/hono-openapi-app.js'
+import { spec } from '../test/fixtures/openapi-spec.js'
+import * as Cli from './Cli.js'
+import * as Openapi from './Openapi.js'
 
 function serve(cli: { serve: Cli.Cli['serve'] }, argv: string[]) {
   let output = ''
@@ -13,7 +13,9 @@ function serve(cli: { serve: Cli.Cli['serve'] }, argv: string[]) {
   return cli
     .serve(argv, {
       stdout: (s) => (output += s),
-      exit: (c) => { exitCode = c },
+      exit: (c) => {
+        exitCode = c
+      },
     })
     .then(() => ({
       output,
@@ -22,9 +24,7 @@ function serve(cli: { serve: Cli.Cli['serve'] }, argv: string[]) {
 }
 
 function json(output: string) {
-  return JSON.parse(
-    output.replace(/"duration": "[^"]+"/g, '"duration": "<stripped>"'),
-  )
+  return JSON.parse(output.replace(/"duration": "[^"]+"/g, '"duration": "<stripped>"'))
 }
 
 describe('generateCommands', () => {
@@ -46,8 +46,10 @@ describe('generateCommands', () => {
 
 describe('cli integration', () => {
   function createCli() {
-    return Cli.create('test', { description: 'test' })
-      .command('api', { fetch: app.fetch, openapi: spec })
+    return Cli.create('test', { description: 'test' }).command('api', {
+      fetch: app.fetch,
+      openapi: spec,
+    })
   }
 
   test('GET /users via operationId', async () => {
@@ -57,7 +59,12 @@ describe('cli integration', () => {
 
   test('GET /users?limit=5 via options', async () => {
     const { output } = await serve(createCli(), [
-      'api', 'listUsers', '--limit', '5', '--format', 'json',
+      'api',
+      'listUsers',
+      '--limit',
+      '5',
+      '--format',
+      'json',
     ])
     expect(json(output).limit).toBe(5)
   })
@@ -125,7 +132,11 @@ describe('cli integration', () => {
 
   test('--verbose wraps in envelope', async () => {
     const { output } = await serve(createCli(), [
-      'api', 'healthCheck', '--verbose', '--format', 'json',
+      'api',
+      'healthCheck',
+      '--verbose',
+      '--format',
+      'json',
     ])
     const parsed = json(output)
     expect(parsed.ok).toBe(true)
@@ -141,8 +152,10 @@ describe('cli integration', () => {
 
 describe('@hono/zod-openapi integration', () => {
   function createCli() {
-    return Cli.create('test', { description: 'test' })
-      .command('api', { fetch: openapiApp.fetch, openapi: openapiSpec })
+    return Cli.create('test', { description: 'test' }).command('api', {
+      fetch: openapiApp.fetch,
+      openapi: openapiSpec,
+    })
   }
 
   test('GET /users via listUsers', async () => {
@@ -151,7 +164,14 @@ describe('@hono/zod-openapi integration', () => {
   })
 
   test('GET /users?limit=5', async () => {
-    const { output } = await serve(createCli(), ['api', 'listUsers', '--limit', '5', '--format', 'json'])
+    const { output } = await serve(createCli(), [
+      'api',
+      'listUsers',
+      '--limit',
+      '5',
+      '--format',
+      'json',
+    ])
     expect(json(output).limit).toBe(5)
   })
 
@@ -224,7 +244,11 @@ describe('@hono/zod-openapi integration', () => {
 
   test('--verbose wraps in envelope', async () => {
     const { output } = await serve(createCli(), [
-      'api', 'healthCheck', '--verbose', '--format', 'json',
+      'api',
+      'healthCheck',
+      '--verbose',
+      '--format',
+      'json',
     ])
     const parsed = json(output)
     expect(parsed.ok).toBe(true)
@@ -248,7 +272,15 @@ describe('@hono/zod-openapi integration', () => {
 
   test('PUT /users/:id with optional boolean body option', async () => {
     const { output } = await serve(createCli(), [
-      'api', 'updateUser', '1', '--name', 'Updated', '--active', 'true', '--format', 'json',
+      'api',
+      'updateUser',
+      '1',
+      '--name',
+      'Updated',
+      '--active',
+      'true',
+      '--format',
+      'json',
     ])
     const parsed = json(output)
     expect(parsed.id).toBe(1)
@@ -257,44 +289,63 @@ describe('@hono/zod-openapi integration', () => {
   })
 
   test('query param coercion with zod-openapi generated spec', async () => {
-    const { output } = await serve(createCli(), ['api', 'listUsers', '--limit', '3', '--format', 'json'])
+    const { output } = await serve(createCli(), [
+      'api',
+      'listUsers',
+      '--limit',
+      '3',
+      '--format',
+      'json',
+    ])
     expect(json(output).limit).toBe(3)
   })
 })
 
 describe('basePath', () => {
   test('fetch gateway prepends basePath to request path', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'users'])
     expect(output).toContain('Alice')
   })
 
   test('fetch gateway basePath with query params', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'users', '--limit', '5', '--format', 'json'])
     expect(json(output).limit).toBe(5)
   })
 
   test('fetch gateway basePath with POST', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'users', '-X', 'POST', '-d', '{"name":"Bob"}'])
     expect(output).toContain('Bob')
     expect(output).toContain('created')
   })
 
   test('openapi with basePath prepends to spec paths', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, openapi: spec, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      openapi: spec,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'listUsers'])
     expect(output).toContain('Alice')
   })
 
   test('openapi basePath with path params', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, openapi: spec, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      openapi: spec,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'getUser', '42'])
     expect(output).toMatchInlineSnapshot(`
       "id: 42
@@ -304,16 +355,22 @@ describe('basePath', () => {
   })
 
   test('openapi basePath with body options', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, openapi: spec, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      openapi: spec,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'createUser', '--name', 'Bob'])
     expect(output).toContain('created')
     expect(output).toContain('Bob')
   })
 
   test('openapi basePath with health check', async () => {
-    const cli = Cli.create('test', { description: 'test' })
-      .command('api', { fetch: prefixedApp.fetch, openapi: spec, basePath: '/api' })
+    const cli = Cli.create('test', { description: 'test' }).command('api', {
+      fetch: prefixedApp.fetch,
+      openapi: spec,
+      basePath: '/api',
+    })
     const { output } = await serve(cli, ['api', 'healthCheck', '--format', 'json'])
     expect(json(output)).toEqual({ ok: true })
   })

package/src/Openapi.ts

@@ -46,7 +46,7 @@ export async function generateCommands(
   fetch: FetchHandler,
   options: { basePath?: string | undefined } = {},
 ): Promise<Map<string, GeneratedCommand>> {
-  const resolved = await dereference(structuredClone(spec) as any) as unknown as OpenAPISpec
+  const resolved = (await dereference(structuredClone(spec) as any)) as unknown as OpenAPISpec
   const commands = new Map<string, GeneratedCommand>()
   const paths = (resolved.paths ?? {}) as Record<string, Record<string, unknown>>
 
@@ -96,7 +96,15 @@ export async function generateCommands(
         description: op.summary ?? op.description,
         args: argsSchema,
         options: optionsSchema,
-        run: createHandler({ basePath: options.basePath, fetch, httpMethod, path, pathParams, queryParams, bodyProps }),
+        run: createHandler({
+          basePath: options.basePath,
+          fetch,
+          httpMethod,
+          path,
+          pathParams,
+          queryParams,
+          bodyProps,
+        }),
       })
     }
   }
@@ -135,8 +143,7 @@ function createHandler(config: {
     const bodyKeys = Object.keys(config.bodyProps)
     if (bodyKeys.length > 0) {
       const bodyObj: Record<string, unknown> = {}
-      for (const key of bodyKeys)
-        if (options[key] !== undefined) bodyObj[key] = options[key]
+      for (const key of bodyKeys) if (options[key] !== undefined) bodyObj[key] = options[key]
       if (Object.keys(bodyObj).length > 0) body = JSON.stringify(bodyObj)
     }
 
@@ -180,8 +187,10 @@ function coerceIfNeeded(schema: z.ZodType): z.ZodType {
   const inner = isOptional ? schema.unwrap() : schema
 
   // Direct number/boolean
-  if (inner instanceof z.ZodNumber) return isOptional ? z.coerce.number().optional() : z.coerce.number()
-  if (inner instanceof z.ZodBoolean) return isOptional ? z.coerce.boolean().optional() : z.coerce.boolean()
+  if (inner instanceof z.ZodNumber)
+    return isOptional ? z.coerce.number().optional() : z.coerce.number()
+  if (inner instanceof z.ZodBoolean)
+    return isOptional ? z.coerce.boolean().optional() : z.coerce.boolean()
 
   // Union containing number (e.g. type: ["number", "null"] from OpenAPI 3.1)
   if (inner instanceof z.ZodUnion) {

package/src/Skill.test.ts

@@ -333,9 +333,7 @@ describe('split', () => {
 
   test('emits fallback description when no explicit descriptions exist', () => {
     const files = Skill.split('test', [{ name: 'ping' }], 1)
-    expect(files[0]!.content).toContain(
-      'description: Run `test ping --help` for usage details.',
-    )
+    expect(files[0]!.content).toContain('description: Run `test ping --help` for usage details.')
   })
 
   test('includes requires_bin in frontmatter', () => {

package/src/Skill.ts

@@ -24,7 +24,11 @@ export type File = {
 }
 
 /** Generates a compact Markdown command index for `--llms`. */
-export function index(name: string, commands: CommandInfo[], description?: string | undefined): string {
+export function index(
+  name: string,
+  commands: CommandInfo[],
+  description?: string | undefined,
+): string {
   const lines: string[] = [`# ${name}`]
   if (description) lines.push('', description)
   lines.push('')
@@ -35,7 +39,10 @@ export function index(name: string, commands: CommandInfo[], description?: strin
     const desc = cmd.description ?? ''
     lines.push(`| \`${signature}\` | ${desc} |`)
   }
-  lines.push('', `Run \`${name} --llms-full\` for full manifest. Run \`${name} <command> --schema\` for argument details.`)
+  lines.push(
+    '',
+    `Run \`${name} --llms-full\` for full manifest. Run \`${name} <command> --schema\` for argument details.`,
+  )
   return lines.join('\n')
 }
 

package/src/e2e.test.ts

@@ -1,4 +1,5 @@
 import { Cli, Errors, Skill, Typegen, z } from 'incur'
+
 import { app as honoApp } from '../test/fixtures/hono-api.js'
 
 let __mockSkillsHash: string | undefined
@@ -432,7 +433,13 @@ describe('--token-limit and --token-offset', () => {
   })
 
   test('--token-limit and --token-offset together for pagination', async () => {
-    const { output } = await serve(createApp(), ['ping', '--token-offset', '2', '--token-limit', '4'])
+    const { output } = await serve(createApp(), [
+      'ping',
+      '--token-offset',
+      '2',
+      '--token-limit',
+      '4',
+    ])
     expect(output).toMatchInlineSnapshot(`
       " true
       [truncated: showing tokens 2–3 of 3]
@@ -449,7 +456,14 @@ describe('--token-limit and --token-offset', () => {
   })
 
   test('works with --verbose', async () => {
-    const { output } = await serve(createApp(), ['ping', '--verbose', '--format', 'json', '--token-limit', '20'])
+    const { output } = await serve(createApp(), [
+      'ping',
+      '--verbose',
+      '--format',
+      'json',
+      '--token-limit',
+      '20',
+    ])
     expect(output).toMatchInlineSnapshot(`
       "{
         "ok": true,
@@ -466,13 +480,27 @@ describe('--token-limit and --token-offset', () => {
   })
 
   test('--verbose includes meta.nextOffset when truncated', async () => {
-    const { output } = await serve(createApp(), ['ping', '--verbose', '--format', 'json', '--token-limit', '2'])
+    const { output } = await serve(createApp(), [
+      'ping',
+      '--verbose',
+      '--format',
+      'json',
+      '--token-limit',
+      '2',
+    ])
     expect(output).toContain('"nextOffset"')
     expect(output).toContain('[truncated:')
   })
 
   test('--verbose omits meta.nextOffset when not truncated', async () => {
-    const { output } = await serve(createApp(), ['ping', '--verbose', '--format', 'json', '--token-limit', '10000'])
+    const { output } = await serve(createApp(), [
+      'ping',
+      '--verbose',
+      '--format',
+      'json',
+      '--token-limit',
+      '10000',
+    ])
     const parsed = json(output)
     expect(parsed.meta.nextOffset).toBeUndefined()
   })
@@ -499,7 +527,12 @@ describe('--token-count', () => {
   })
 
   test('works with --filter-output', async () => {
-    const { output } = await serve(createApp(), ['ping', '--filter-output', 'pong', '--token-count'])
+    const { output } = await serve(createApp(), [
+      'ping',
+      '--filter-output',
+      'pong',
+      '--token-count',
+    ])
     expect(output.trim()).toBe('1')
   })
 })
@@ -1222,7 +1255,13 @@ describe('--llms-full', () => {
   })
 
   test('scoped --llms-full to nested group', async () => {
-    const { output } = await serve(createApp(), ['project', 'deploy', '--llms-full', '--format', 'json'])
+    const { output } = await serve(createApp(), [
+      'project',
+      'deploy',
+      '--llms-full',
+      '--format',
+      'json',
+    ])
     const names = json(output).commands.map((c: any) => c.name)
     expect(names).toMatchInlineSnapshot(`
       [
@@ -1253,7 +1292,13 @@ describe('--llms-full', () => {
   })
 
   test('--llms-full json includes examples on commands', async () => {
-    const { output } = await serve(createApp(), ['project', 'deploy', '--llms-full', '--format', 'json'])
+    const { output } = await serve(createApp(), [
+      'project',
+      'deploy',
+      '--llms-full',
+      '--format',
+      'json',
+    ])
     const deployCreate = json(output).commands.find((c: any) => c.name === 'project deploy create')
     expect(deployCreate.examples).toMatchInlineSnapshot(`
       [
@@ -2188,12 +2233,7 @@ describe('fetch gateway', () => {
   })
 
   test('implicit POST with --body', async () => {
-    const { output } = await serve(createApp(), [
-      'api',
-      'users',
-      '--body',
-      '{"name":"Eve"}',
-    ])
+    const { output } = await serve(createApp(), ['api', 'users', '--body', '{"name":"Eve"}'])
     expect(output).toMatchInlineSnapshot(`
       "created: true
       name: Eve
@@ -2202,13 +2242,7 @@ describe('fetch gateway', () => {
   })
 
   test('DELETE with --method', async () => {
-    const { output } = await serve(createApp(), [
-      'api',
-      'users',
-      '1',
-      '--method',
-      'DELETE',
-    ])
+    const { output } = await serve(createApp(), ['api', 'users', '1', '--method', 'DELETE'])
     expect(output).toMatchInlineSnapshot(`
       "deleted: true
       id: 1
@@ -2240,13 +2274,7 @@ describe('fetch gateway', () => {
   })
 
   test('--verbose wraps in envelope', async () => {
-    const { output } = await serve(createApp(), [
-      'api',
-      'health',
-      '--verbose',
-      '--format',
-      'json',
-    ])
+    const { output } = await serve(createApp(), ['api', 'health', '--verbose', '--format', 'json'])
     const parsed = json(output)
     expect(parsed.ok).toBe(true)
     expect(parsed.data).toEqual({ ok: true })
@@ -2298,7 +2326,10 @@ describe('fetch gateway', () => {
 
   test('streaming NDJSON --format jsonl', async () => {
     const { output } = await serve(createApp(), ['api', 'stream', '--format', 'jsonl'])
-    const lines = output.trim().split('\n').map((l) => JSON.parse(l))
+    const lines = output
+      .trim()
+      .split('\n')
+      .map((l) => JSON.parse(l))
     expect(lines[0]).toEqual({ type: 'chunk', data: { progress: 1 } })
     expect(lines[1]).toEqual({ type: 'chunk', data: { progress: 2 } })
     expect(lines[2].type).toBe('done')
@@ -2374,7 +2405,8 @@ describe('fetch api', () => {
 
   test('GET with query params → options', async () => {
     const cli = createApp()
-    expect(await fetchJson(cli, new Request('http://localhost/echo/hi?prefix=yo'))).toMatchInlineSnapshot(`
+    expect(await fetchJson(cli, new Request('http://localhost/echo/hi?prefix=yo')))
+      .toMatchInlineSnapshot(`
       {
         "body": {
           "data": {
@@ -2420,7 +2452,8 @@ describe('fetch api', () => {
 
   test('trailing path segments → positional args', async () => {
     const cli = createApp()
-    expect(await fetchJson(cli, new Request('http://localhost/project/get/p1'))).toMatchInlineSnapshot(`
+    expect(await fetchJson(cli, new Request('http://localhost/project/get/p1')))
+      .toMatchInlineSnapshot(`
       {
         "body": {
           "data": {
@@ -2447,7 +2480,8 @@ describe('fetch api', () => {
 
   test('nested command (3 levels deep)', async () => {
     const cli = createApp()
-    expect(await fetchJson(cli, new Request('http://localhost/project/deploy/status/d-456'))).toMatchInlineSnapshot(`
+    expect(await fetchJson(cli, new Request('http://localhost/project/deploy/status/d-456')))
+      .toMatchInlineSnapshot(`
       {
         "body": {
           "data": {
@@ -2488,7 +2522,8 @@ describe('fetch api', () => {
 
   test('IncurError → 500 with code', async () => {
     const cli = createApp()
-    expect(await fetchJson(cli, new Request('http://localhost/explode-clac'))).toMatchInlineSnapshot(`
+    expect(await fetchJson(cli, new Request('http://localhost/explode-clac')))
+      .toMatchInlineSnapshot(`
       {
         "body": {
           "error": {
@@ -2519,7 +2554,10 @@ describe('fetch api', () => {
     const res = await cli.fetch(new Request('http://localhost/stream'))
     expect(res.status).toBe(200)
     expect(res.headers.get('content-type')).toBe('application/x-ndjson')
-    const lines = (await res.text()).trim().split('\n').map((l) => JSON.parse(l))
+    const lines = (await res.text())
+      .trim()
+      .split('\n')
+      .map((l) => JSON.parse(l))
     expect(lines).toMatchInlineSnapshot(`
       [
         {
@@ -2585,7 +2623,9 @@ describe('fetch api', () => {
 
   test('middleware error → error response', async () => {
     const cli = Cli.create('test')
-    cli.use((c) => { c.error({ code: 'FORBIDDEN', message: 'nope' }) })
+    cli.use((c) => {
+      c.error({ code: 'FORBIDDEN', message: 'nope' })
+    })
     cli.command('secret', { run: () => ({ secret: true }) })
     expect(await fetchJson(cli, new Request('http://localhost/secret'))).toMatchInlineSnapshot(`
       {