Skip to content

fix(generator): codegen typing fixes for #298, #299, #300 #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benjamineckstein merged 1 commit into from
Jun 15, 2026
Merged

fix(generator): codegen typing fixes for #298, #299, #300 #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions examples/generated-rq/1password-connect/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This file is auto-generated by openapi-zod-ts — do not edit

import type { APIRequest, File, FullItem, Item, Patch, Vault } from './models.js'
import type { APIRequest, File, FullItem, Item, Patch, ServiceDependency, Vault } from './models.js'
import { getConfig, type ClientConfig } from './client-config.js'

export class ApiError<Status extends number = number, Body = unknown> extends Error {
Expand Down Expand Up @@ -326,7 +326,7 @@ export async function getHeartbeat(config?: Partial<ClientConfig>): Promise<stri

export async function getServerHealth(
config?: Partial<ClientConfig>
): Promise<Record<string, unknown>> {
): Promise<{ name: string; version: string; dependencies?: ServiceDependency[] }> {
const res = await _request('GET', '/health', {}, config)
return res.json()
}
Expand Down
124 changes: 80 additions & 44 deletions examples/generated-rq/1password-connect/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,24 +40,32 @@ export const activityKeys = {
export const vaultKeys = {
all: () => ['vaults'] as const,
list: (params?: Parameters<typeof getVaults>[0]) => ['vaults', 'list', params] as const,
getVaultById: (vaultUuid: string) => ['vaults', 'getVaultById', vaultUuid] as const,
getVaultItems: (vaultUuid: string, params?: Parameters<typeof getVaultItems>[1]) =>
['vaults', 'getVaultItems', vaultUuid, params] as const,
getVaultItemById: (vaultUuid: string, itemUuid: string) =>
['vaults', 'getVaultItemById', vaultUuid, itemUuid] as const,
getVaultById: (vaultUuid: Parameters<typeof getVaultById>[0]) =>
['vaults', 'getVaultById', vaultUuid] as const,
getVaultItems: (
vaultUuid: Parameters<typeof getVaultItems>[0],
params?: Parameters<typeof getVaultItems>[1]
) => ['vaults', 'getVaultItems', vaultUuid, params] as const,
getVaultItemById: (
vaultUuid: Parameters<typeof getVaultItemById>[0],
itemUuid: Parameters<typeof getVaultItemById>[1]
) => ['vaults', 'getVaultItemById', vaultUuid, itemUuid] as const,
getItemFiles: (
vaultUuid: string,
itemUuid: string,
vaultUuid: Parameters<typeof getItemFiles>[0],
itemUuid: Parameters<typeof getItemFiles>[1],
params?: Parameters<typeof getItemFiles>[2]
) => ['vaults', 'getItemFiles', vaultUuid, itemUuid, params] as const,
getDetailsOfFileById: (
vaultUuid: string,
itemUuid: string,
fileUuid: string,
vaultUuid: Parameters<typeof getDetailsOfFileById>[0],
itemUuid: Parameters<typeof getDetailsOfFileById>[1],
fileUuid: Parameters<typeof getDetailsOfFileById>[2],
params?: Parameters<typeof getDetailsOfFileById>[3]
) => ['vaults', 'getDetailsOfFileById', vaultUuid, itemUuid, fileUuid, params] as const,
downloadFileByID: (vaultUuid: string, itemUuid: string, fileUuid: string) =>
['vaults', 'downloadFileByID', vaultUuid, itemUuid, fileUuid] as const,
downloadFileByID: (
vaultUuid: Parameters<typeof downloadFileByID>[0],
itemUuid: Parameters<typeof downloadFileByID>[1],
fileUuid: Parameters<typeof downloadFileByID>[2]
) => ['vaults', 'downloadFileByID', vaultUuid, itemUuid, fileUuid] as const,
}

export const heartbeatKeys = {
Expand Down Expand Up @@ -110,7 +118,7 @@ export function getVaultsQueryOptions(
}

export function getVaultByIdQueryOptions(
vaultUuid: string,
vaultUuid: Parameters<typeof getVaultById>[0],
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getVaultById>>, ApiError>,
'queryKey' | 'queryFn'
Expand All @@ -126,7 +134,7 @@ export function getVaultByIdQueryOptions(
}

export function getVaultItemsQueryOptions(
vaultUuid: string,
vaultUuid: Parameters<typeof getVaultItems>[0],
params?: Parameters<typeof getVaultItems>[1],
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getVaultItems>>, ApiError>,
Expand All @@ -143,8 +151,8 @@ export function getVaultItemsQueryOptions(
}

export function getVaultItemByIdQueryOptions(
vaultUuid: string,
itemUuid: string,
vaultUuid: Parameters<typeof getVaultItemById>[0],
itemUuid: Parameters<typeof getVaultItemById>[1],
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getVaultItemById>>, ApiError>,
'queryKey' | 'queryFn'
Expand All @@ -160,8 +168,8 @@ export function getVaultItemByIdQueryOptions(
}

export function getItemFilesQueryOptions(
vaultUuid: string,
itemUuid: string,
vaultUuid: Parameters<typeof getItemFiles>[0],
itemUuid: Parameters<typeof getItemFiles>[1],
params?: Parameters<typeof getItemFiles>[2],
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getItemFiles>>, ApiError>,
Expand All @@ -178,9 +186,9 @@ export function getItemFilesQueryOptions(
}

export function getDetailsOfFileByIdQueryOptions(
vaultUuid: string,
itemUuid: string,
fileUuid: string,
vaultUuid: Parameters<typeof getDetailsOfFileById>[0],
itemUuid: Parameters<typeof getDetailsOfFileById>[1],
fileUuid: Parameters<typeof getDetailsOfFileById>[2],
params?: Parameters<typeof getDetailsOfFileById>[3],
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getDetailsOfFileById>>, ApiError>,
Expand All @@ -197,9 +205,9 @@ export function getDetailsOfFileByIdQueryOptions(
}

export function downloadFileByIDQueryOptions(
vaultUuid: string,
itemUuid: string,
fileUuid: string,
vaultUuid: Parameters<typeof downloadFileByID>[0],
itemUuid: Parameters<typeof downloadFileByID>[1],
fileUuid: Parameters<typeof downloadFileByID>[2],
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof downloadFileByID>>, ApiError>,
'queryKey' | 'queryFn'
Expand Down Expand Up @@ -325,7 +333,7 @@ export function useGetVaults(
}

export function useGetVaultById(
vaultUuid: string | undefined | null,
vaultUuid: Parameters<typeof getVaultById>[0] | undefined | null,
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getVaultById>>, ApiError>,
'queryKey' | 'queryFn'
Expand All @@ -342,7 +350,7 @@ export function useGetVaultById(
}

export function useGetVaultItems(
vaultUuid: string | undefined | null,
vaultUuid: Parameters<typeof getVaultItems>[0] | undefined | null,
params?: Parameters<typeof getVaultItems>[1],
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getVaultItems>>, ApiError>,
Expand All @@ -360,8 +368,8 @@ export function useGetVaultItems(
}

export function useGetVaultItemById(
vaultUuid: string | undefined | null,
itemUuid: string | undefined | null,
vaultUuid: Parameters<typeof getVaultItemById>[0] | undefined | null,
itemUuid: Parameters<typeof getVaultItemById>[1] | undefined | null,
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getVaultItemById>>, ApiError>,
'queryKey' | 'queryFn'
Expand All @@ -378,8 +386,8 @@ export function useGetVaultItemById(
}

export function useGetItemFiles(
vaultUuid: string | undefined | null,
itemUuid: string | undefined | null,
vaultUuid: Parameters<typeof getItemFiles>[0] | undefined | null,
itemUuid: Parameters<typeof getItemFiles>[1] | undefined | null,
params?: Parameters<typeof getItemFiles>[2],
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getItemFiles>>, ApiError>,
Expand All @@ -397,9 +405,9 @@ export function useGetItemFiles(
}

export function useGetDetailsOfFileById(
vaultUuid: string | undefined | null,
itemUuid: string | undefined | null,
fileUuid: string | undefined | null,
vaultUuid: Parameters<typeof getDetailsOfFileById>[0] | undefined | null,
itemUuid: Parameters<typeof getDetailsOfFileById>[1] | undefined | null,
fileUuid: Parameters<typeof getDetailsOfFileById>[2] | undefined | null,
params?: Parameters<typeof getDetailsOfFileById>[3],
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof getDetailsOfFileById>>, ApiError>,
Expand All @@ -418,9 +426,9 @@ export function useGetDetailsOfFileById(
}

export function useDownloadFileByID(
vaultUuid: string | undefined | null,
itemUuid: string | undefined | null,
fileUuid: string | undefined | null,
vaultUuid: Parameters<typeof downloadFileByID>[0] | undefined | null,
itemUuid: Parameters<typeof downloadFileByID>[1] | undefined | null,
fileUuid: Parameters<typeof downloadFileByID>[2] | undefined | null,
options?: Omit<
UseQueryOptions<Awaited<ReturnType<typeof downloadFileByID>>, ApiError>,
'queryKey' | 'queryFn'
Expand Down Expand Up @@ -489,15 +497,21 @@ export function useCreateVaultItem(
UseMutationOptions<
Awaited<ReturnType<typeof createVaultItem>>,
ApiError,
{ vaultUuid: string; body: Parameters<typeof createVaultItem>[1] }
{
vaultUuid: Parameters<typeof createVaultItem>[0]
body: Parameters<typeof createVaultItem>[1]
}
>,
'mutationFn'
>
) {
return useMutation<
Awaited<ReturnType<typeof createVaultItem>>,
ApiError,
{ vaultUuid: string; body: Parameters<typeof createVaultItem>[1] }
{
vaultUuid: Parameters<typeof createVaultItem>[0]
body: Parameters<typeof createVaultItem>[1]
}
>({
mutationFn: ({ vaultUuid, body }) => createVaultItem(vaultUuid, body),
...options,
Expand All @@ -509,15 +523,23 @@ export function useUpdateVaultItem(
UseMutationOptions<
Awaited<ReturnType<typeof updateVaultItem>>,
ApiError,
{ vaultUuid: string; itemUuid: string; body: Parameters<typeof updateVaultItem>[2] }
{
vaultUuid: Parameters<typeof updateVaultItem>[0]
itemUuid: Parameters<typeof updateVaultItem>[1]
body: Parameters<typeof updateVaultItem>[2]
}
>,
'mutationFn'
>
) {
return useMutation<
Awaited<ReturnType<typeof updateVaultItem>>,
ApiError,
{ vaultUuid: string; itemUuid: string; body: Parameters<typeof updateVaultItem>[2] }
{
vaultUuid: Parameters<typeof updateVaultItem>[0]
itemUuid: Parameters<typeof updateVaultItem>[1]
body: Parameters<typeof updateVaultItem>[2]
}
>({
mutationFn: ({ vaultUuid, itemUuid, body }) => updateVaultItem(vaultUuid, itemUuid, body),
...options,
Expand All @@ -529,15 +551,23 @@ export function usePatchVaultItem(
UseMutationOptions<
Awaited<ReturnType<typeof patchVaultItem>>,
ApiError,
{ vaultUuid: string; itemUuid: string; body: Parameters<typeof patchVaultItem>[2] }
{
vaultUuid: Parameters<typeof patchVaultItem>[0]
itemUuid: Parameters<typeof patchVaultItem>[1]
body: Parameters<typeof patchVaultItem>[2]
}
>,
'mutationFn'
>
) {
return useMutation<
Awaited<ReturnType<typeof patchVaultItem>>,
ApiError,
{ vaultUuid: string; itemUuid: string; body: Parameters<typeof patchVaultItem>[2] }
{
vaultUuid: Parameters<typeof patchVaultItem>[0]
itemUuid: Parameters<typeof patchVaultItem>[1]
body: Parameters<typeof patchVaultItem>[2]
}
>({
mutationFn: ({ vaultUuid, itemUuid, body }) => patchVaultItem(vaultUuid, itemUuid, body),
...options,
Expand All @@ -549,15 +579,21 @@ export function useDeleteVaultItem(
UseMutationOptions<
Awaited<ReturnType<typeof deleteVaultItem>>,
ApiError,
{ vaultUuid: string; itemUuid: string }
{
vaultUuid: Parameters<typeof deleteVaultItem>[0]
itemUuid: Parameters<typeof deleteVaultItem>[1]
}
>,
'mutationFn'
>
) {
return useMutation<
Awaited<ReturnType<typeof deleteVaultItem>>,
ApiError,
{ vaultUuid: string; itemUuid: string }
{
vaultUuid: Parameters<typeof deleteVaultItem>[0]
itemUuid: Parameters<typeof deleteVaultItem>[1]
}
>({
mutationFn: ({ vaultUuid, itemUuid }) => deleteVaultItem(vaultUuid, itemUuid),
...options,
Expand Down
Loading
Loading