typed-openapi 1.2.0 → 1.3.1

package/dist/{chunk-SLMCJHD5.js → chunk-YLPQQ24J.js}

@@ -685,8 +685,8 @@ var getTransitiveDependencies = (directDependencies) => {
 
 // src/ts-factory.ts
 var tsFactory = createFactory({
-  union: (types) => types.map(unwrap).join(" | "),
-  intersection: (types) => types.map(unwrap).join(" & "),
+  union: (types) => `(${types.map(unwrap).join(" | ")})`,
+  intersection: (types) => `(${types.map(unwrap).join(" & ")})`,
   array: (type2) => `Array<${unwrap(type2)}>`,
   optional: (type2) => `${unwrap(type2)} | undefined`,
   reference: (name, typeArgs) => `${name}${typeArgs ? `<${typeArgs.map(unwrap).join(", ")}>` : ""}`,
@@ -952,20 +952,28 @@ var generateTanstackQueryFile = async (ctx) => {
          * Generic mutation method with full type-safety for any endpoint that doesnt require parameters to be passed initially
          */
         mutation<
-        TMethod extends keyof EndpointByMethod,
-        TPath extends keyof EndpointByMethod[TMethod],
-        TEndpoint extends EndpointByMethod[TMethod][TPath]
-        >(
-          method: TMethod,
-          path: TPath) {
+            TMethod extends keyof EndpointByMethod,
+            TPath extends keyof EndpointByMethod[TMethod],
+            TEndpoint extends EndpointByMethod[TMethod][TPath],
+            TSelection,
+        >(method: TMethod, path: TPath, selectFn?: (res: Omit<Response, "json"> & {
+            /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/json) */
+            json: () => Promise<TEndpoint extends { response: infer Res } ? Res : never>;
+        }) => TSelection) {
             const mutationKey = [{ method, path }] as const;
             return {
+            /** type-only property if you need easy access to the endpoint params */
+            "~endpoint": {} as TEndpoint,
+            mutationKey: mutationKey,
+            mutationOptions: {
                 mutationKey: mutationKey,
-                mutationOptions: {
-                    mutationKey: mutationKey,
-                    mutationFn: async (params: TEndpoint extends { parameters: infer Parameters} ? Parameters: never) => this.client.request(method, path, params)
-                }
-            }
+                mutationFn: async (params: TEndpoint extends { parameters: infer Parameters } ? Parameters : never) => {
+                const response = await this.client.request(method, path, params);
+                const res = selectFn ? selectFn(response) : response
+                return res as unknown extends TSelection ? typeof response : Awaited<TSelection>
+                },
+            },
+            };
         }
         // </ApiClient.request>
   }

package/dist/cli.js

@@ -4,7 +4,7 @@ import {
   generateTanstackQueryFile,
   mapOpenApiEndpoints,
   prettify
-} from "./chunk-SLMCJHD5.js";
+} from "./chunk-YLPQQ24J.js";
 
 // src/cli.ts
 import SwaggerParser from "@apidevtools/swagger-parser";

package/dist/index.js

@@ -8,7 +8,7 @@ import {
   openApiSchemaToTs,
   tsFactory,
   unwrap
-} from "./chunk-SLMCJHD5.js";
+} from "./chunk-YLPQQ24J.js";
 export {
   createBoxFactory,
   createFactory,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "main": "dist/index.js",
   "module": "dist/index.js",
   "exports": {

package/src/tanstack-query.generator.ts

@@ -112,20 +112,28 @@ export const generateTanstackQueryFile = async (ctx: GeneratorContext & { relati
          * Generic mutation method with full type-safety for any endpoint that doesnt require parameters to be passed initially
          */
         mutation<
-        TMethod extends keyof EndpointByMethod,
-        TPath extends keyof EndpointByMethod[TMethod],
-        TEndpoint extends EndpointByMethod[TMethod][TPath]
-        >(
-          method: TMethod,
-          path: TPath) {
+            TMethod extends keyof EndpointByMethod,
+            TPath extends keyof EndpointByMethod[TMethod],
+            TEndpoint extends EndpointByMethod[TMethod][TPath],
+            TSelection,
+        >(method: TMethod, path: TPath, selectFn?: (res: Omit<Response, "json"> & {
+            /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/Request/json) */
+            json: () => Promise<TEndpoint extends { response: infer Res } ? Res : never>;
+        }) => TSelection) {
             const mutationKey = [{ method, path }] as const;
             return {
+            /** type-only property if you need easy access to the endpoint params */
+            "~endpoint": {} as TEndpoint,
+            mutationKey: mutationKey,
+            mutationOptions: {
                 mutationKey: mutationKey,
-                mutationOptions: {
-                    mutationKey: mutationKey,
-                    mutationFn: async (params: TEndpoint extends { parameters: infer Parameters} ? Parameters: never) => this.client.request(method, path, params)
-                }
-            }
+                mutationFn: async (params: TEndpoint extends { parameters: infer Parameters } ? Parameters : never) => {
+                const response = await this.client.request(method, path, params);
+                const res = selectFn ? selectFn(response) : response
+                return res as unknown extends TSelection ? typeof response : Awaited<TSelection>
+                },
+            },
+            };
         }
         // </ApiClient.request>
   }

package/src/ts-factory.ts

@@ -3,8 +3,8 @@ import { createFactory, unwrap } from "./box-factory.ts";
 import { wrapWithQuotesIfNeeded } from "./string-utils.ts";
 
 export const tsFactory = createFactory({
-  union: (types) => types.map(unwrap).join(" | "),
-  intersection: (types) => types.map(unwrap).join(" & "),
+  union: (types) => `(${types.map(unwrap).join(" | ")})`,
+  intersection: (types) => `(${types.map(unwrap).join(" & ")})`,
   array: (type) => `Array<${unwrap(type)}>`,
   optional: (type) => `${unwrap(type)} | undefined`,
   reference: (name, typeArgs) => `${name}${typeArgs ? `<${typeArgs.map(unwrap).join(", ")}>` : ""}`,