Resolve the scalar for delete type

contiamo · Mar 23, 2020 · 3e8f56c · 3e8f56c
1 parent ffd09d3
commit 3e8f56c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/scripts/import-open-api.ts b/src/scripts/import-open-api.ts
@@ -375,7 +375,7 @@ export const generateRestfulComponent = (
 
   const lastParamInTheRouteType =
     !isReference(lastParamInTheRouteDefinition.schema) && lastParamInTheRouteDefinition.schema
-      ? lastParamInTheRouteDefinition.schema.type
+      ? getScalar(lastParamInTheRouteDefinition.schema)
       : isReference(lastParamInTheRouteDefinition.schema)
       ? getRef(lastParamInTheRouteDefinition.schema.$ref)
       : "string";

diff --git a/src/scripts/tests/__snapshots__/import-open-api.test.ts.snap b/src/scripts/tests/__snapshots__/import-open-api.test.ts.snap
@@ -141,25 +141,25 @@ export type UseFindPetByIdProps = Omit<UseGetProps<Pet, void>, \\"path\\"> & {id
 export const useFindPetById = ({id, ...props}: UseFindPetByIdProps) => useGet<Pet, Error, void>(\`/pets/\${id}\`, props);
 
 
-export type DeletePetProps = Omit<MutateProps<void, Error, void, integer>, \\"path\\" | \\"verb\\">;
+export type DeletePetProps = Omit<MutateProps<void, Error, void, number>, \\"path\\" | \\"verb\\">;
 
 /**
  * deletes a single pet based on the ID supplied
  */
 export const DeletePet = (props: DeletePetProps) => (
-  <Mutate<void, Error, void, integer>
+  <Mutate<void, Error, void, number>
     verb=\\"DELETE\\"
     path={\`/pets\`}
     {...props}
   />
 );
 
-export type UseDeletePetProps = Omit<UseMutateProps<void, void, integer>, \\"path\\" | \\"verb\\">;
+export type UseDeletePetProps = Omit<UseMutateProps<void, void, number>, \\"path\\" | \\"verb\\">;
 
 /**
  * deletes a single pet based on the ID supplied
  */
-export const useDeletePet = (props: UseDeletePetProps) => useMutate<void, Error, void, integer>(\\"DELETE\\", \`/pets\`, props);
+export const useDeletePet = (props: UseDeletePetProps) => useMutate<void, Error, void, number>(\\"DELETE\\", \`/pets\`, props);
 
 
 export type UpdatePetProps = Omit<MutateProps<Pet, Error, void, UpdatePetRequestRequestBody>, \\"path\\" | \\"verb\\"> & {id: number};

diff --git a/src/scripts/tests/import-open-api.test.ts b/src/scripts/tests/import-open-api.test.ts
@@ -1774,7 +1774,7 @@ describe("scripts/import-open-api", () => {
             in: "path",
             required: true,
             description: "The id of the use case",
-            schema: { type: "number", format: "uuid" },
+            schema: { type: "integer", format: "uuid" },
           },
         ],
         responses: {