chore: init

zrosenbauer · zrosenbauer · commit 0b19f7d754ff · 2026-02-28T20:51:28.000-05:00
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "eslint-plugin-security": "^4.0.0",
     "oxfmt": "^0.35.0",
     "oxlint": "^1.50.0",
-    "vitest": "^3.2.4"
+    "vitest": "^4.0.18"
   },
   "packageManager": "pnpm@10.30.1"
 }
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -30,7 +30,7 @@
     "kidd": "workspace:*",
     "tsdown": "^0.6.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "kidd": "*"
diff --git a/packages/clerk/package.json b/packages/clerk/package.json
@@ -29,7 +29,7 @@
     "@types/node": "^25.3.2",
     "tsdown": "^0.6.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "@kidd/auth": "*"
diff --git a/packages/js/package.json b/packages/js/package.json
@@ -29,6 +29,6 @@
     "@types/node": "^25.3.2",
     "tsdown": "^0.6.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.0.18"
   }
 }
diff --git a/packages/kidd-cli/package.json b/packages/kidd-cli/package.json
@@ -33,6 +33,6 @@
     "@types/fs-extra": "^11.0.4",
     "tsdown": "^0.6.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.0.18"
   }
 }
diff --git a/packages/kidd/package.json b/packages/kidd/package.json
@@ -79,7 +79,7 @@
     "@types/yargs": "^17.0.33",
     "tsdown": "^0.6.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "pino": ">=9.0.0"
diff --git a/packages/kidd/src/core/cli.ts b/packages/kidd/src/core/cli.ts
@@ -58,6 +58,13 @@ interface ZodTypeInfo {
   isOptional: boolean
 }
 
+const resolveDefaultValue = (def: ZodDef, fallback: unknown): unknown => {
+  if (def.defaultValue) {
+    return def.defaultValue()
+  }
+  return fallback
+}
+
 const unwrapZodTypeRecursive = (
   current: z.ZodTypeAny,
   isOptional: boolean,
@@ -71,12 +78,7 @@ const unwrapZodTypeRecursive = (
     return { defaultValue, inner: current, isOptional: true }
   }
   if (def.typeName === 'ZodDefault') {
-    const newDefault = (() => {
-      if (def.defaultValue) {
-        return def.defaultValue()
-      }
-      return defaultValue
-    })()
+    const newDefault = resolveDefaultValue(def, defaultValue)
     if (def.innerType) {
       return unwrapZodTypeRecursive(def.innerType, true, newDefault)
     }
@@ -87,33 +89,33 @@ const unwrapZodTypeRecursive = (
 
 const unwrapZodType = (schema: z.ZodTypeAny): ZodTypeInfo => unwrapZodTypeRecursive(schema, false)
 
-const getZodTypeOption = (schema: z.ZodTypeAny): YargsOptions => {
-  const { inner, isOptional, defaultValue } = unwrapZodType(schema)
-  const innerDef = (inner as { _def: ZodDef })._def
-  const option: YargsOptions = {}
+const resolveZodYargsType = (typeName: string | undefined): 'string' | 'number' | 'boolean' | 'array' =>
+  match(typeName)
+    .with('ZodString', () => 'string' as const)
+    .with('ZodNumber', () => 'number' as const)
+    .with('ZodBoolean', () => 'boolean' as const)
+    .with('ZodArray', () => 'array' as const)
+    .otherwise(() => 'string' as const)
 
+const buildBaseOption = (innerDef: ZodDef, defaultValue: unknown): YargsOptions => {
+  const option: YargsOptions = {}
   if (innerDef.description) {
     option.describe = innerDef.description
   }
-
   if (defaultValue !== undefined) {
     option.default = defaultValue
   }
+  return option
+}
 
-  const { typeName } = innerDef
-  const typeResult = match(typeName)
-    .with('ZodString', () => 'string' as const)
-    .with('ZodNumber', () => 'number' as const)
-    .with('ZodBoolean', () => 'boolean' as const)
-    .with('ZodArray', () => 'array' as const)
-    .otherwise(() => 'string' as const)
-
-  option.type = typeResult
-
+const getZodTypeOption = (schema: z.ZodTypeAny): YargsOptions => {
+  const { inner, isOptional, defaultValue } = unwrapZodType(schema)
+  const innerDef = (inner as { _def: ZodDef })._def
+  const option = buildBaseOption(innerDef, defaultValue)
+  option.type = resolveZodYargsType(innerDef.typeName)
   if (!isOptional) {
     option.demandOption = true
   }
-
   return option
 }
 
@@ -222,12 +224,15 @@ const registerResolvedCommand = (options: RegisterResolvedCommandOptions): void
   )
 }
 
-const registerCommands = (
-  instance: Argv,
-  commands: CommandMap,
-  resolved: ResolvedRef,
+interface RegisterCommandsOptions {
+  commands: CommandMap
+  instance: Argv
   parentPath: string[]
-): void => {
+  resolved: ResolvedRef
+}
+
+const registerCommands = (options: RegisterCommandsOptions): void => {
+  const { instance, commands, resolved, parentPath } = options
   const commandEntries = Object.entries(commands)
     .filter(([, entry]) => !isAutoloadMarker(entry))
     .filter(([, entry]) => isCommand(entry))
@@ -330,17 +335,12 @@ const loadConfig = async <TSchema extends z.ZodType>(
   configOptions: CliConfigOptions<TSchema> | undefined,
   defaultName: string
 ): Promise<Record<string, unknown>> => {
-  if (!configOptions) {
-    return {}
-  }
-  const { schema } = configOptions
-  if (!schema) {
+  if (!configOptions || !configOptions.schema) {
     return {}
   }
-  const configName = configOptions.name ?? defaultName
   const configClient = createConfigClient({
-    name: configName,
-    schema: schema,
+    name: configOptions.name ?? defaultName,
+    schema: configOptions.schema,
   })
   const [configError, configResult] = await configClient.load()
   if (configError || !configResult) {
@@ -384,7 +384,7 @@ const runCli = async (
       'Autoload from directory path is not yet supported. Use a CommandMap object instead.'
     )
   } else if (options.commands && typeof options.commands === 'object') {
-    registerCommands(instance, options.commands, resolved, [])
+    registerCommands({ commands: options.commands, instance, parentPath: [], resolved })
     instance.demandCommand(SECOND_INDEX, 'You must specify a command.')
   }
 
@@ -438,4 +438,5 @@ const cli: CliFn = (options) => {
 }
 
 export default cli
+// eslint-disable-next-line eslint-plugin-import/no-named-export
 export { cli }
diff --git a/packages/kidd/src/internal/utils.ts b/packages/kidd/src/internal/utils.ts
@@ -1,5 +1,4 @@
 import { isString } from 'es-toolkit'
-/* eslint-disable eslint-plugin-import/no-named-export, eslint-plugin-import/group-exports, eslint-plugin-import/exports-last */
 import { P, match } from 'ts-pattern'
 
 /** Object key paths that should be redacted from logged output. */
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -31,7 +31,7 @@
     "next": "^15.0.0",
     "tsdown": "^0.6.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "next": ">=14"
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -33,7 +33,7 @@
     "react-dom": "^19.0.0",
     "tsdown": "^0.6.0",
     "typescript": "^5.7.0",
-    "vitest": "^3.0.0"
+    "vitest": "^4.0.18"
   },
   "peerDependencies": {
     "react": ">=18"
diff --git a/packages/react/src/context.tsx b/packages/react/src/context.tsx
@@ -25,4 +25,5 @@ const useKiddAuth = (): KiddAuthContextValue => {
   return context
 }
 
+// eslint-disable-next-line eslint-plugin-import(no-named-export)
 export { KiddAuthProvider, useKiddAuth }
diff --git a/packages/react/src/index.ts b/packages/react/src/index.ts
@@ -1,3 +1,4 @@
+/* eslint-disable eslint-plugin-import(no-named-export) */
 export type {
   KiddAuthProviderProps,
   AuthRedirectState,
diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
@@ -1,3 +1,4 @@
+/* eslint-disable eslint-plugin-import(no-named-export) */
 import type { ReactNode } from 'react'
 
 type Result<TValue, TError = Error> = readonly [TError, undefined] | readonly [undefined, TValue]
diff --git a/packages/react/src/use-api-keys.ts b/packages/react/src/use-api-keys.ts
@@ -18,6 +18,77 @@ const handleFetchError = async (fetchKeys: () => Promise<void>): Promise<void> =
   }
 }
 
+const handleFetchErrorResult = (
+  error: unknown,
+  setError: (msg: string) => void,
+  setLoading: (v: boolean) => void,
+): void => {
+  if (error instanceof Error) {
+    setError(error.message)
+  } else {
+    setError('An unknown error occurred')
+  }
+  setLoading(false)
+}
+
+const createApiKeyError = (
+  type: 'create_error' | 'revoke_error',
+  status: number,
+  statusText: string,
+): ApiKeyError => ({
+  _tag: 'ApiKeyError',
+  message: `Failed to ${type === 'create_error' ? 'create' : 'revoke'} API key: ${String(status)} ${statusText}`,
+  status,
+  type,
+})
+
+const createKey = async (
+  apiKeysEndpoint: string,
+  params: CreateKeyParams,
+  setKeys: React.Dispatch<React.SetStateAction<readonly ApiKeyDisplay[]>>,
+): Promise<Result<CreatedKeyResult, ApiKeyError>> => {
+  const response = await fetch(apiKeysEndpoint, {
+    body: JSON.stringify(params),
+    headers: { 'Content-Type': 'application/json' },
+    method: 'POST',
+  })
+
+  if (!response.ok) {
+    return [createApiKeyError('create_error', response.status, response.statusText), undefined]
+  }
+
+  const result = (await response.json()) as CreatedKeyResult
+  setKeys((prev) => [...prev, result.key])
+  return [undefined, result]
+}
+
+const revokeKey = async (
+  apiKeysEndpoint: string,
+  keyId: string,
+  setKeys: React.Dispatch<React.SetStateAction<readonly ApiKeyDisplay[]>>,
+): Promise<Result<void, ApiKeyError>> => {
+  const response = await fetch(apiKeysEndpoint, {
+    body: JSON.stringify({ keyId }),
+    headers: { 'Content-Type': 'application/json' },
+    method: 'DELETE',
+  })
+
+  if (!response.ok) {
+    return [createApiKeyError('revoke_error', response.status, response.statusText), undefined]
+  }
+
+  setKeys((prev) =>
+    prev.map((key) => {
+      if (key.id === keyId) {
+        return { ...key, revoked: true }
+      }
+      return key
+    }),
+  )
+  return [undefined, undefined]
+}
+
+// eslint-disable-next-line eslint/max-lines-per-function
 const useApiKeys = (): ApiKeyManagerState => {
   const { apiKeysEndpoint } = useKiddAuth()
   const [keys, setKeys] = useState<readonly ApiKeyDisplay[]>([])
@@ -44,73 +115,20 @@ const useApiKeys = (): ApiKeyManagerState => {
 
   useEffect(() => {
     void handleFetchError(fetchKeys).catch((error: unknown) => {
-      if (error instanceof Error) {
-        setError(error.message)
-      } else {
-        setError('An unknown error occurred')
-      }
-      setLoading(false)
+      handleFetchErrorResult(error, setError, setLoading)
     })
   }, [fetchKeys])
 
   const create = useCallback(
-    async (params: CreateKeyParams): Promise<Result<CreatedKeyResult, ApiKeyError>> => {
-      const response = await fetch(apiKeysEndpoint, {
-        body: JSON.stringify(params),
-        headers: { 'Content-Type': 'application/json' },
-        method: 'POST',
-      })
-
-      if (!response.ok) {
-        return [
-          {
-            _tag: 'ApiKeyError',
-            message: `Failed to create API key: ${String(response.status)} ${response.statusText}`,
-            status: response.status,
-            type: 'create_error',
-          },
-          undefined,
-        ]
-      }
-
-      const result = (await response.json()) as CreatedKeyResult
-      setKeys((prev) => [...prev, result.key])
-      return [undefined, result]
-    },
-    [apiKeysEndpoint]
+    async (params: CreateKeyParams): Promise<Result<CreatedKeyResult, ApiKeyError>> =>
+      createKey(apiKeysEndpoint, params, setKeys),
+    [apiKeysEndpoint],
   )
 
   const revoke = useCallback(
-    async (keyId: string): Promise<Result<void, ApiKeyError>> => {
-      const response = await fetch(apiKeysEndpoint, {
-        body: JSON.stringify({ keyId }),
-        headers: { 'Content-Type': 'application/json' },
-        method: 'DELETE',
-      })
-
-      if (!response.ok) {
-        return [
-          {
-            _tag: 'ApiKeyError',
-            message: `Failed to revoke API key: ${String(response.status)} ${response.statusText}`,
-            status: response.status,
-            type: 'revoke_error',
-          },
-          undefined,
-        ]
-      }
-
-      setKeys((prev) =>
-        prev.map((key) => {
-          if (key.id === keyId) {
-            return { ...key, revoked: true }
-          }
-          return key
-        })
-      )
-      return [undefined, undefined]
-    },
-    [apiKeysEndpoint]
+    async (keyId: string): Promise<Result<void, ApiKeyError>> =>
+      revokeKey(apiKeysEndpoint, keyId, setKeys),
+    [apiKeysEndpoint],
   )
 
   const refresh = useCallback(async (): Promise<void> => {
diff --git a/packages/react/src/use-cli-auth-redirect.ts b/packages/react/src/use-cli-auth-redirect.ts
diff --git a/packages/react/test/context.test.tsx b/packages/react/test/context.test.tsx
diff --git a/packages/server/package.json b/packages/server/package.json
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@`
`25`	`25`	`"eslint-plugin-security": "^4.0.0",`
`26`	`26`	`"oxfmt": "^0.35.0",`
`27`	`27`	`"oxlint": "^1.50.0",`
`28`		`- "vitest": "^3.2.4"`
	`28`	`+ "vitest": "^4.0.18"`
`29`	`29`	`},`
`30`	`30`	`"packageManager": "pnpm@10.30.1"`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@`
`29`	`29`	`"@types/node": "^25.3.2",`
`30`	`30`	`"tsdown": "^0.6.0",`
`31`	`31`	`"typescript": "^5.7.0",`
`32`		`- "vitest": "^3.0.0"`
	`32`	`+ "vitest": "^4.0.18"`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,6 @@`
`33`	`33`	`"@types/fs-extra": "^11.0.4",`
`34`	`34`	`"tsdown": "^0.6.0",`
`35`	`35`	`"typescript": "^5.7.0",`
`36`		`- "vitest": "^3.0.0"`
	`36`	`+ "vitest": "^4.0.18"`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import { isString } from 'es-toolkit'`
`2`		`-/* eslint-disable eslint-plugin-import/no-named-export, eslint-plugin-import/group-exports, eslint-plugin-import/exports-last */`
`3`	`2`	`import { P, match } from 'ts-pattern'`
`4`	`3`
`5`	`4`	`/** Object key paths that should be redacted from logged output. */`