type fix

Author: malcolm-kee

docs/openapi-ts/plugins/faker.md

@@ -95,7 +95,7 @@ A single factory function is generated per operation for request data. It combin
 
 ```ts [example]
 // body + path + query combined into one factory
-export const fakeUpdatePetRequest = (options?: Options): UpdatePetData => {
+export const fakeUpdatePetRequest = (options?: Options): Omit<UpdatePetData, 'url'> => {
   const f = options?.faker ?? faker;
   return {
     body: {
@@ -112,7 +112,7 @@ export const fakeUpdatePetRequest = (options?: Options): UpdatePetData => {
 };
 
 // body only
-export const fakeCreatePetRequest = (options?: Options): CreatePetData => {
+export const fakeCreatePetRequest = (options?: Options): Omit<CreatePetData, 'url'> => {
   const f = options?.faker ?? faker;
   return {
     body: {

packages/openapi-ts-tests/faker/v10/__snapshots__/2.0.x/faker-typed/@faker-js/faker.gen.ts

@@ -334,7 +334,7 @@ export const fakeDocument = (options?: Options): Document => {
     };
 };
 
-export const fakeListPetsRequest = (options?: Options): ListPetsData => {
+export const fakeListPetsRequest = (options?: Options): Omit<ListPetsData, 'url'> => {
     const f = options?.faker ?? faker;
     return { query: {
             ...!resolveCondition(options?.includeOptional ?? true, f) ? {} : { limit: f.number.int({ min: 1, max: 100 }) }
@@ -346,7 +346,7 @@ export const fakeListPetsResponse = (options?: Options): ListPetsResponse => {
     return f.helpers.multiple(() => fakePet(options));
 };
 
-export const fakeCreatePetRequest = (options?: Options): CreatePetData => {
+export const fakeCreatePetRequest = (options?: Options): Omit<CreatePetData, 'url'> => {
     const f = options?.faker ?? faker;
     return { body: {
             name: f.string.sample(),
@@ -358,7 +358,7 @@ export const fakeCreatePetResponse201 = (options?: Options): CreatePetResponses[
 
 export const fakeCreatePetResponse204 = (): CreatePetResponses[204] => undefined;
 
-export const fakeDeletePetRequest = (options?: Options): DeletePetData => {
+export const fakeDeletePetRequest = (options?: Options): Omit<DeletePetData, 'url'> => {
     const f = options?.faker ?? faker;
     return { path: {
             id: f.string.uuid()
@@ -369,7 +369,7 @@ export const fakeDeletePetResponse204 = (): DeletePetResponses[204] => undefined
 
 export const fakeDeletePetResponse404 = (options?: Options): DeletePetErrors[404] => fakeError(options);
 
-export const fakeGetPetRequest = (options?: Options): GetPetData => {
+export const fakeGetPetRequest = (options?: Options): Omit<GetPetData, 'url'> => {
     const f = options?.faker ?? faker;
     return { path: {
             id: f.string.uuid()
@@ -380,7 +380,7 @@ export const fakeGetPetResponse200 = (options?: Options): GetPetResponses[200] =
 
 export const fakeGetPetResponse404 = (options?: Options): GetPetErrors[404] => fakeError(options);
 
-export const fakeUpdatePetRequest = (options?: Options): UpdatePetData => {
+export const fakeUpdatePetRequest = (options?: Options): Omit<UpdatePetData, 'url'> => {
     const f = options?.faker ?? faker;
     return {
         body: {

packages/openapi-ts-tests/faker/v10/__snapshots__/3.0.x/faker-typed/@faker-js/faker.gen.ts

@@ -418,7 +418,7 @@ export const fakeDocument = (options?: Options): Document => {
     };
 };
 
-export const fakeListPetsRequest = (options?: Options): ListPetsData => {
+export const fakeListPetsRequest = (options?: Options): Omit<ListPetsData, 'url'> => {
     const f = options?.faker ?? faker;
     return { query: {
             ...!resolveCondition(options?.includeOptional ?? true, f) ? {} : { limit: f.number.int({ min: 1, max: 100 }) }
@@ -430,7 +430,7 @@ export const fakeListPetsResponse = (options?: Options): ListPetsResponse => {
     return f.helpers.multiple(() => fakePet(options));
 };
 
-export const fakeCreatePetRequest = (options?: Options): CreatePetData => {
+export const fakeCreatePetRequest = (options?: Options): Omit<CreatePetData, 'url'> => {
     const f = options?.faker ?? faker;
     return { body: {
             name: f.string.sample(),
@@ -440,7 +440,7 @@ export const fakeCreatePetRequest = (options?: Options): CreatePetData => {
 
 export const fakeCreatePetResponse = (options?: Options): CreatePetResponse => fakePet(options);
 
-export const fakeDeletePetRequest = (options?: Options): DeletePetData => {
+export const fakeDeletePetRequest = (options?: Options): Omit<DeletePetData, 'url'> => {
     const f = options?.faker ?? faker;
     return { path: {
             id: f.string.uuid()
@@ -449,7 +449,7 @@ export const fakeDeletePetRequest = (options?: Options): DeletePetData => {
 
 export const fakeDeletePetResponse404 = (options?: Options): DeletePetErrors[404] => fakeError(options);
 
-export const fakeGetPetRequest = (options?: Options): GetPetData => {
+export const fakeGetPetRequest = (options?: Options): Omit<GetPetData, 'url'> => {
     const f = options?.faker ?? faker;
     return { path: {
             id: f.string.uuid()
@@ -460,7 +460,7 @@ export const fakeGetPetResponse200 = (options?: Options): GetPetResponses[200] =
 
 export const fakeGetPetResponse404 = (options?: Options): GetPetErrors[404] => fakeError(options);
 
-export const fakeUpdatePetRequest = (options?: Options): UpdatePetData => {
+export const fakeUpdatePetRequest = (options?: Options): Omit<UpdatePetData, 'url'> => {
     const f = options?.faker ?? faker;
     return {
         body: {

packages/openapi-ts-tests/faker/v10/__snapshots__/3.1.x/faker-typed/@faker-js/faker.gen.ts

@@ -420,7 +420,7 @@ export const fakeDocument = (options?: Options): Document => {
     };
 };
 
-export const fakeListPetsRequest = (options?: Options): ListPetsData => {
+export const fakeListPetsRequest = (options?: Options): Omit<ListPetsData, 'url'> => {
     const f = options?.faker ?? faker;
     return { query: {
             ...!resolveCondition(options?.includeOptional ?? true, f) ? {} : { limit: f.number.int({ min: 1, max: 100 }) }
@@ -432,7 +432,7 @@ export const fakeListPetsResponse = (options?: Options): ListPetsResponse => {
     return f.helpers.multiple(() => fakePet(options));
 };
 
-export const fakeCreatePetRequest = (options?: Options): CreatePetData => {
+export const fakeCreatePetRequest = (options?: Options): Omit<CreatePetData, 'url'> => {
     const f = options?.faker ?? faker;
     return { body: {
             name: f.string.sample(),
@@ -442,7 +442,7 @@ export const fakeCreatePetRequest = (options?: Options): CreatePetData => {
 
 export const fakeCreatePetResponse = (options?: Options): CreatePetResponse => fakePet(options);
 
-export const fakeDeletePetRequest = (options?: Options): DeletePetData => {
+export const fakeDeletePetRequest = (options?: Options): Omit<DeletePetData, 'url'> => {
     const f = options?.faker ?? faker;
     return { path: {
             id: f.string.uuid()
@@ -451,7 +451,7 @@ export const fakeDeletePetRequest = (options?: Options): DeletePetData => {
 
 export const fakeDeletePetResponse404 = (options?: Options): DeletePetErrors[404] => fakeError(options);
 
-export const fakeGetPetRequest = (options?: Options): GetPetData => {
+export const fakeGetPetRequest = (options?: Options): Omit<GetPetData, 'url'> => {
     const f = options?.faker ?? faker;
     return { path: {
             id: f.string.uuid()
@@ -462,7 +462,7 @@ export const fakeGetPetResponse200 = (options?: Options): GetPetResponses[200] =
 
 export const fakeGetPetResponse404 = (options?: Options): GetPetErrors[404] => fakeError(options);
 
-export const fakeUpdatePetRequest = (options?: Options): UpdatePetData => {
+export const fakeUpdatePetRequest = (options?: Options): Omit<UpdatePetData, 'url'> => {
     const f = options?.faker ?? faker;
     return {
         body: {

packages/openapi-ts/src/plugins/@faker-js/faker/shared/operation-request.ts

@@ -155,7 +155,9 @@ export function irOperationRequestToAst({
   const arrowFn = $.func()
     .arrow()
     .$if(usesFaker, (f) => f.param('options', (p) => p.optional().type('Options')))
-    .$if(typeSymbol, (f) => f.returns($.type(typeSymbol!)))
+    .$if(typeSymbol, (f) =>
+      f.returns($.type.expr('Omit').generic($.type(typeSymbol!)).generic($.type.literal('url'))),
+    )
     .$if(
       usesAccessor,
       (f) => {