diff --git a/src/scripts/import-open-api.ts b/src/scripts/import-open-api.ts index 773e7b3c..d1bcad78 100644 --- a/src/scripts/import-open-api.ts +++ b/src/scripts/import-open-api.ts @@ -489,7 +489,7 @@ ${description}export const use${componentName} = (${ verb === "get" ? "" : `"${verb.toUpperCase()}", ` }${ paramsInPath.length - ? `({ ${paramsInPath.join(", ")} }: ${componentName}PathParams) => \`${route}\`` + ? `(paramsInPath: ${componentName}PathParams) => \`${route.replace(/\$\{/g, "${paramsInPath.")}\`` : `\`${route}\`` }, ${ customPropsEntries.length || paramsInPath.length diff --git a/src/scripts/tests/__snapshots__/import-open-api.test.ts.snap b/src/scripts/tests/__snapshots__/import-open-api.test.ts.snap index 50d6e02b..12e2b763 100644 --- a/src/scripts/tests/__snapshots__/import-open-api.test.ts.snap +++ b/src/scripts/tests/__snapshots__/import-open-api.test.ts.snap @@ -145,7 +145,7 @@ export type UseFindPetByIdProps = Omit useGet(({ id }: FindPetByIdPathParams) => \`/pets/\${id}\`, { pathParams: { id }, ...props }); +export const useFindPetById = ({id, ...props}: UseFindPetByIdProps) => useGet((paramsInPath: FindPetByIdPathParams) => \`/pets/\${paramsInPath.id}\`, { pathParams: { id }, ...props }); export type DeletePetProps = Omit, \\"path\\" | \\"verb\\">; @@ -194,7 +194,7 @@ export type UseUpdatePetProps = Omit useMutate(\\"PATCH\\", ({ id }: UpdatePetPathParams) => \`/pets/\${id}\`, { pathParams: { id }, ...props }); +export const useUpdatePet = ({id, ...props}: UseUpdatePetProps) => useMutate(\\"PATCH\\", (paramsInPath: UpdatePetPathParams) => \`/pets/\${paramsInPath.id}\`, { pathParams: { id }, ...props }); " `; diff --git a/src/scripts/tests/import-open-api.test.ts b/src/scripts/tests/import-open-api.test.ts index f5a7afe8..be2fc916 100644 --- a/src/scripts/tests/import-open-api.test.ts +++ b/src/scripts/tests/import-open-api.test.ts @@ -1241,7 +1241,7 @@ describe("scripts/import-open-api", () => { /** * List all fields for the use case schema */ - export const useListFields = ({id, ...props}: UseListFieldsProps) => useGet(({ id }: ListFieldsPathParams) => \`/fields/\${id}\`, { pathParams: { id }, ...props }); + export const useListFields = ({id, ...props}: UseListFieldsProps) => useGet((paramsInPath: ListFieldsPathParams) => \`/fields/\${paramsInPath.id}\`, { pathParams: { id }, ...props }); " `); @@ -1322,7 +1322,7 @@ describe("scripts/import-open-api", () => { /** * List all fields for the use case schema */ - export const useListFields = ({id, ...props}: UseListFieldsProps) => useGet(({ id }: ListFieldsPathParams) => \`/fields/\${id}\`, { pathParams: { id }, ...props }); + export const useListFields = ({id, ...props}: UseListFieldsProps) => useGet((paramsInPath: ListFieldsPathParams) => \`/fields/\${paramsInPath.id}\`, { pathParams: { id }, ...props }); " `); @@ -1397,7 +1397,7 @@ describe("scripts/import-open-api", () => { /** * Update use case details */ - export const useUpdateUseCase = ({useCaseId, ...props}: UseUpdateUseCaseProps) => useMutate(\\"PUT\\", ({ useCaseId }: UpdateUseCasePathParams) => \`/use-cases/\${useCaseId}\`, { pathParams: { useCaseId }, ...props }); + export const useUpdateUseCase = ({useCaseId, ...props}: UseUpdateUseCaseProps) => useMutate(\\"PUT\\", (paramsInPath: UpdateUseCasePathParams) => \`/use-cases/\${paramsInPath.useCaseId}\`, { pathParams: { useCaseId }, ...props }); " `); @@ -1489,7 +1489,7 @@ describe("scripts/import-open-api", () => { /** * Update use case details */ - export const useUpdateUseCase = ({useCaseId, ...props}: UseUpdateUseCaseProps) => useMutate(\\"PUT\\", ({ useCaseId }: UpdateUseCasePathParams) => \`/use-cases/\${useCaseId}\`, { pathParams: { useCaseId }, ...props }); + export const useUpdateUseCase = ({useCaseId, ...props}: UseUpdateUseCaseProps) => useMutate(\\"PUT\\", (paramsInPath: UpdateUseCasePathParams) => \`/use-cases/\${paramsInPath.useCaseId}\`, { pathParams: { useCaseId }, ...props }); " `); @@ -1584,7 +1584,7 @@ describe("scripts/import-open-api", () => { /** * Update use case details */ - export const useUpdateUseCase = ({useCaseId, ...props}: UseUpdateUseCaseProps) => useMutate(\\"PUT\\", ({ useCaseId }: UpdateUseCasePathParams) => \`/use-cases/\${useCaseId}\`, { pathParams: { useCaseId }, ...props }); + export const useUpdateUseCase = ({useCaseId, ...props}: UseUpdateUseCaseProps) => useMutate(\\"PUT\\", (paramsInPath: UpdateUseCasePathParams) => \`/use-cases/\${paramsInPath.useCaseId}\`, { pathParams: { useCaseId }, ...props }); " `); @@ -1682,7 +1682,7 @@ describe("scripts/import-open-api", () => { /** * Update use case details */ - export const useUpdateUseCase = ({useCaseId, ...props}: UseUpdateUseCaseProps) => useMutate(\\"PUT\\", ({ useCaseId }: UpdateUseCasePathParams) => \`/use-cases/\${useCaseId}\`, { pathParams: { useCaseId }, ...props }); + export const useUpdateUseCase = ({useCaseId, ...props}: UseUpdateUseCaseProps) => useMutate(\\"PUT\\", (paramsInPath: UpdateUseCasePathParams) => \`/use-cases/\${paramsInPath.useCaseId}\`, { pathParams: { useCaseId }, ...props }); " `); @@ -1814,7 +1814,7 @@ describe("scripts/import-open-api", () => { /** * Delete use case */ - export const useDeleteUseCase = ({useCaseId, ...props}: UseDeleteUseCaseProps) => useMutate(\\"DELETE\\", ({ useCaseId }: DeleteUseCasePathParams) => \`/use-cases/\${useCaseId}/secret\`, { pathParams: { useCaseId }, ...props }); + export const useDeleteUseCase = ({useCaseId, ...props}: UseDeleteUseCaseProps) => useMutate(\\"DELETE\\", (paramsInPath: DeleteUseCasePathParams) => \`/use-cases/\${paramsInPath.useCaseId}/secret\`, { pathParams: { useCaseId }, ...props }); " `);