typed-openapi 0.2.0 → 0.4.0

package/dist/{chunk-A3A4AVLF.js → chunk-YRM7U5OB.js}

@@ -373,7 +373,14 @@ var generateEndpointSchemaList = (ctx) => {
             ${parameters.query ? `query:  ${parameterObjectToString(parameters.query)},` : ""}
         ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
         ${parameters.header ? `header:  ${parameterObjectToString(parameters.header)},` : ""}
-        ${parameters.body ? `body:  ${parameterObjectToString(parameters.body)},` : ""}
+        ${parameters.body ? `body:  ${parameterObjectToString(
+      ctx.runtime === "none" ? parameters.body.recompute((box) => {
+        if (Box.isReference(box) && !box.params.generics) {
+          box.value = `Schemas.${box.value}`;
+        }
+        return box;
+      }) : parameters.body
+    )},` : ""}
           }` : "parameters: never,"}
       response: ${ctx.runtime === "none" ? endpoint.response.recompute((box) => {
       if (Box.isReference(box) && !box.params.generics) {
@@ -480,7 +487,7 @@ export class ApiClient {
       path: Path,
       ...params: MaybeOptionalArg<${match(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint["parameters"]`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["parameters"]`).otherwise(() => `TEndpoint["parameters"]`)}>
     ): Promise<${match(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint["response"]`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["response"]`).otherwise(() => `TEndpoint["response"]`)}> {
-      return this.fetcher("${method}", this.baseUrl + path, params[0]);
+      return this.fetcher("${method}", this.baseUrl + path, params[0])${match(ctx.runtime).with("zod", () => `as Promise<TEndpoint["response"]> `).otherwise(() => ``)};
     }
     // </ApiClient.${method}>
     ` : "";
@@ -724,7 +731,7 @@ var mapOpenApiEndpoints = (doc) => {
         }
       };
       const lists = { query: [], path: [], header: [] };
-      const paramObjects = (operation.parameters ?? []).reduce(
+      const paramObjects = [...pathItemObj.parameters ?? [], ...operation.parameters ?? []].reduce(
         (acc, paramOrRef) => {
           const param = refs.unwrap(paramOrRef);
           const schema = openApiSchemaToTs({ schema: refs.unwrap(param.schema ?? {}), ctx });
@@ -781,15 +788,14 @@ var mapOpenApiEndpoints = (doc) => {
         endpoint.parameters = Object.keys(params).length ? params : void 0;
       }
       let responseObject;
-      if (operation.responses.default) {
+      Object.entries(operation.responses).map(([status, responseOrRef]) => {
+        const statusCode = Number(status);
+        if (statusCode >= 200 && statusCode < 300) {
+          responseObject = refs.unwrap(responseOrRef);
+        }
+      });
+      if (!responseObject && operation.responses.default) {
         responseObject = refs.unwrap(operation.responses.default);
-      } else {
-        Object.entries(operation.responses).map(([status, responseOrRef]) => {
-          const statusCode = Number(status);
-          if (statusCode >= 200 && statusCode < 300) {
-            responseObject = refs.unwrap(responseOrRef);
-          }
-        });
       }
       const content = responseObject?.content;
       if (content) {

package/dist/cli.cjs

@@ -31,7 +31,7 @@ var import_promises = require("fs/promises");
 
 // package.json
 var name = "typed-openapi";
-var version = "0.2.0";
+var version = "0.4.0";
 
 // src/generator.ts
 var import_server2 = require("pastable/server");
@@ -408,7 +408,14 @@ var generateEndpointSchemaList = (ctx) => {
             ${parameters.query ? `query:  ${parameterObjectToString(parameters.query)},` : ""}
         ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
         ${parameters.header ? `header:  ${parameterObjectToString(parameters.header)},` : ""}
-        ${parameters.body ? `body:  ${parameterObjectToString(parameters.body)},` : ""}
+        ${parameters.body ? `body:  ${parameterObjectToString(
+      ctx.runtime === "none" ? parameters.body.recompute((box) => {
+        if (Box.isReference(box) && !box.params.generics) {
+          box.value = `Schemas.${box.value}`;
+        }
+        return box;
+      }) : parameters.body
+    )},` : ""}
           }` : "parameters: never,"}
       response: ${ctx.runtime === "none" ? endpoint.response.recompute((box) => {
       if (Box.isReference(box) && !box.params.generics) {
@@ -515,7 +522,7 @@ export class ApiClient {
       path: Path,
       ...params: MaybeOptionalArg<${(0, import_ts_pattern.match)(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint["parameters"]`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["parameters"]`).otherwise(() => `TEndpoint["parameters"]`)}>
     ): Promise<${(0, import_ts_pattern.match)(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint["response"]`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["response"]`).otherwise(() => `TEndpoint["response"]`)}> {
-      return this.fetcher("${method}", this.baseUrl + path, params[0]);
+      return this.fetcher("${method}", this.baseUrl + path, params[0])${(0, import_ts_pattern.match)(ctx.runtime).with("zod", () => `as Promise<TEndpoint["response"]> `).otherwise(() => ``)};
     }
     // </ApiClient.${method}>
     ` : "";
@@ -761,7 +768,7 @@ var mapOpenApiEndpoints = (doc) => {
         }
       };
       const lists = { query: [], path: [], header: [] };
-      const paramObjects = (operation.parameters ?? []).reduce(
+      const paramObjects = [...pathItemObj.parameters ?? [], ...operation.parameters ?? []].reduce(
         (acc, paramOrRef) => {
           const param = refs.unwrap(paramOrRef);
           const schema = openApiSchemaToTs({ schema: refs.unwrap(param.schema ?? {}), ctx });
@@ -818,15 +825,14 @@ var mapOpenApiEndpoints = (doc) => {
         endpoint.parameters = Object.keys(params).length ? params : void 0;
       }
       let responseObject;
-      if (operation.responses.default) {
+      Object.entries(operation.responses).map(([status, responseOrRef]) => {
+        const statusCode = Number(status);
+        if (statusCode >= 200 && statusCode < 300) {
+          responseObject = refs.unwrap(responseOrRef);
+        }
+      });
+      if (!responseObject && operation.responses.default) {
         responseObject = refs.unwrap(operation.responses.default);
-      } else {
-        Object.entries(operation.responses).map(([status, responseOrRef]) => {
-          const statusCode = Number(status);
-          if (statusCode >= 200 && statusCode < 300) {
-            responseObject = refs.unwrap(responseOrRef);
-          }
-        });
       }
       const content = responseObject?.content;
       if (content) {

package/dist/cli.js

@@ -2,7 +2,7 @@ import {
   allowedRuntimes,
   generateFile,
   mapOpenApiEndpoints
-} from "./chunk-A3A4AVLF.js";
+} from "./chunk-YRM7U5OB.js";
 
 // src/cli.ts
 import SwaggerParser from "@apidevtools/swagger-parser";
@@ -13,7 +13,7 @@ import { writeFile } from "fs/promises";
 
 // package.json
 var name = "typed-openapi";
-var version = "0.2.0";
+var version = "0.4.0";
 
 // src/cli.ts
 var cwd = process.cwd();

package/dist/index.cjs

@@ -416,7 +416,14 @@ var generateEndpointSchemaList = (ctx) => {
             ${parameters.query ? `query:  ${parameterObjectToString(parameters.query)},` : ""}
         ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
         ${parameters.header ? `header:  ${parameterObjectToString(parameters.header)},` : ""}
-        ${parameters.body ? `body:  ${parameterObjectToString(parameters.body)},` : ""}
+        ${parameters.body ? `body:  ${parameterObjectToString(
+      ctx.runtime === "none" ? parameters.body.recompute((box) => {
+        if (Box.isReference(box) && !box.params.generics) {
+          box.value = `Schemas.${box.value}`;
+        }
+        return box;
+      }) : parameters.body
+    )},` : ""}
           }` : "parameters: never,"}
       response: ${ctx.runtime === "none" ? endpoint.response.recompute((box) => {
       if (Box.isReference(box) && !box.params.generics) {
@@ -523,7 +530,7 @@ export class ApiClient {
       path: Path,
       ...params: MaybeOptionalArg<${(0, import_ts_pattern.match)(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint["parameters"]`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["parameters"]`).otherwise(() => `TEndpoint["parameters"]`)}>
     ): Promise<${(0, import_ts_pattern.match)(ctx.runtime).with("zod", "yup", () => infer(`TEndpoint["response"]`)).with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["response"]`).otherwise(() => `TEndpoint["response"]`)}> {
-      return this.fetcher("${method}", this.baseUrl + path, params[0]);
+      return this.fetcher("${method}", this.baseUrl + path, params[0])${(0, import_ts_pattern.match)(ctx.runtime).with("zod", () => `as Promise<TEndpoint["response"]> `).otherwise(() => ``)};
     }
     // </ApiClient.${method}>
     ` : "";
@@ -769,7 +776,7 @@ var mapOpenApiEndpoints = (doc) => {
         }
       };
       const lists = { query: [], path: [], header: [] };
-      const paramObjects = (operation.parameters ?? []).reduce(
+      const paramObjects = [...pathItemObj.parameters ?? [], ...operation.parameters ?? []].reduce(
         (acc, paramOrRef) => {
           const param = refs.unwrap(paramOrRef);
           const schema = openApiSchemaToTs({ schema: refs.unwrap(param.schema ?? {}), ctx });
@@ -826,15 +833,14 @@ var mapOpenApiEndpoints = (doc) => {
         endpoint.parameters = Object.keys(params).length ? params : void 0;
       }
       let responseObject;
-      if (operation.responses.default) {
+      Object.entries(operation.responses).map(([status, responseOrRef]) => {
+        const statusCode = Number(status);
+        if (statusCode >= 200 && statusCode < 300) {
+          responseObject = refs.unwrap(responseOrRef);
+        }
+      });
+      if (!responseObject && operation.responses.default) {
         responseObject = refs.unwrap(operation.responses.default);
-      } else {
-        Object.entries(operation.responses).map(([status, responseOrRef]) => {
-          const statusCode = Number(status);
-          if (statusCode >= 200 && statusCode < 300) {
-            responseObject = refs.unwrap(responseOrRef);
-          }
-        });
       }
       const content = responseObject?.content;
       if (content) {

package/dist/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "bin": {

package/src/generator.ts

@@ -2,7 +2,7 @@ import { capitalize, groupBy } from "pastable/server";
 import { Box } from "./box";
 import { prettify } from "./format";
 import { mapOpenApiEndpoints } from "./map-openapi-endpoints";
-import { AnyBox, BoxRef } from "./types";
+import { AnyBox, AnyBoxDef } from "./types";
 import * as Codegen from "@sinclair/typebox-codegen";
 import { match } from "ts-pattern";
 import { type } from "arktype";
@@ -117,7 +117,7 @@ const generateSchemaList = ({ refs, runtime }: GeneratorContext) => {
   );
 };
 
-const parameterObjectToString = (parameters: Box<BoxRef> | Record<string, AnyBox>) => {
+const parameterObjectToString = (parameters: Box<AnyBoxDef> | Record<string, AnyBox>) => {
   if (parameters instanceof Box) return parameters.value;
 
   let str = "{";
@@ -143,7 +143,20 @@ const generateEndpointSchemaList = (ctx: GeneratorContext) => {
             ${parameters.query ? `query:  ${parameterObjectToString(parameters.query)},` : ""}
         ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
         ${parameters.header ? `header:  ${parameterObjectToString(parameters.header)},` : ""}
-        ${parameters.body ? `body:  ${parameterObjectToString(parameters.body)},` : ""}
+        ${
+          parameters.body
+            ? `body:  ${parameterObjectToString(
+                ctx.runtime === "none"
+                  ? parameters.body.recompute((box) => {
+                      if (Box.isReference(box) && !box.params.generics) {
+                        box.value = `Schemas.${box.value}`;
+                      }
+                      return box;
+                    })
+                  : parameters.body,
+              )},`
+            : ""
+        }
           }`
           : "parameters: never,"
       }
@@ -280,7 +293,8 @@ export class ApiClient {
       .with("zod", "yup", () => infer(`TEndpoint["response"]`))
       .with("arktype", "io-ts", "typebox", "valibot", () => infer(`TEndpoint`) + `["response"]`)
       .otherwise(() => `TEndpoint["response"]`)}> {
-      return this.fetcher("${method}", this.baseUrl + path, params[0]);
+      return this.fetcher("${method}", this.baseUrl + path, params[0])${match(ctx.runtime)
+          .with("zod", () => `as Promise<TEndpoint["response"]> `).otherwise(() => ``)};
     }
     // </ApiClient.${method}>
     `

package/src/map-openapi-endpoints.ts

@@ -35,7 +35,7 @@ export const mapOpenApiEndpoints = (doc: OpenAPIObject) => {
 
       // Build a list of parameters by type + fill an object with all of them
       const lists = { query: [] as ParameterObject[], path: [] as ParameterObject[], header: [] as ParameterObject[] };
-      const paramObjects = (operation.parameters ?? []).reduce(
+      const paramObjects = [...(pathItemObj.parameters ?? []), ...(operation.parameters ?? [])].reduce(
         (acc, paramOrRef) => {
           const param = refs.unwrap(paramOrRef);
           const schema = openApiSchemaToTs({ schema: refs.unwrap(param.schema ?? {}), ctx });
@@ -103,17 +103,16 @@ export const mapOpenApiEndpoints = (doc: OpenAPIObject) => {
         endpoint.parameters = Object.keys(params).length ? (params as any as EndpointParameters) : undefined;
       }
 
-      let responseObject;
-      // Match the default response or first 2xx-3xx response found
-      if (operation.responses.default) {
+      // Match the first 2xx-3xx response found, or fallback to default one otherwise
+      let responseObject: ResponseObject | undefined;
+      Object.entries(operation.responses).map(([status, responseOrRef]) => {
+        const statusCode = Number(status);
+        if (statusCode >= 200 && statusCode < 300) {
+          responseObject = refs.unwrap<ResponseObject>(responseOrRef);
+        }
+      });
+      if (!responseObject && operation.responses.default) {
         responseObject = refs.unwrap(operation.responses.default);
-      } else {
-        Object.entries(operation.responses).map(([status, responseOrRef]) => {
-          const statusCode = Number(status);
-          if (statusCode >= 200 && statusCode < 300) {
-            responseObject = refs.unwrap<ResponseObject>(responseOrRef);
-          }
-        });
       }
 
       const content = responseObject?.content;