typed-openapi 0.7.0 → 0.9.0

package/dist/{chunk-T4QUCLXL.js → chunk-TKIDWJ3F.js}

@@ -299,8 +299,8 @@ var methods = ["get", "put", "post", "delete", "options", "head", "patch", "trac
 var methodsRegex = new RegExp(`(?:${methods.join("|")})_`);
 var endpointExport = new RegExp(`export (?:type|const) (?:${methodsRegex.source})`);
 var replacerByRuntime = {
-  yup: (line) => line.replace(/y\.InferType<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/(.*? )(y\.object)(\()/).source, "g"), "$1$2("),
-  zod: (line) => line.replace(/z\.infer<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/(.*? )(z\.object)(\()/).source, "g"), "$1$2(")
+  yup: (line) => line.replace(/y\.InferType<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/([\s\S]*? )(y\.object)(\()/).source, "g"), "$1$2("),
+  zod: (line) => line.replace(/z\.infer<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/([\s\S]*? )(z\.object)(\()/).source, "g"), "$1$2(")
 };
 var generateFile = (options) => {
   const ctx = { ...options, runtime: options.runtime ?? "none" };
@@ -312,8 +312,8 @@ var generateFile = (options) => {
     const transformer = runtimeValidationGenerator[ctx.runtime];
     const generated = ctx.runtime === "typebox" ? Codegen.TypeScriptToTypeBox.Generate(file2) : transformer(model);
     let converted = "";
-    const match2 = generated.match(/(const __ENDPOINTS_START__ =)([\s\S]*?)(export type __ENDPOINTS_END__)/);
-    const content = match2?.[2];
+    const match3 = generated.match(/(const __ENDPOINTS_START__ =)([\s\S]*?)(export type __ENDPOINTS_END__)/);
+    const content = match3?.[2];
     if (content && ctx.runtime in replacerByRuntime) {
       const before = generated.slice(0, generated.indexOf("export type __ENDPOINTS_START"));
       converted = before + replacerByRuntime[ctx.runtime](
@@ -369,6 +369,7 @@ var generateEndpointSchemaList = (ctx) => {
     file += `export type ${endpoint.meta.alias} = {
       method: "${endpoint.method.toUpperCase()}",
       path: "${endpoint.path}",
+      requestFormat: "${endpoint.requestFormat}",
       ${endpoint.meta.hasParameters ? `parameters: {
             ${parameters.query ? `query:  ${parameterObjectToString(parameters.query)},` : ""}
         ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
@@ -439,6 +440,8 @@ export type EndpointParameters = {
 export type MutationMethod = "post" | "put" | "patch" | "delete";
 export type Method = "get" | "head" | MutationMethod;
 
+type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
+
 export type DefaultEndpoint = {
   parameters?: EndpointParameters | undefined;
   response: unknown;
@@ -448,6 +451,7 @@ export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
   operationId: string;
   method: Method;
   path: string;
+  requestFormat: RequestFormat;
   parameters?: TConfig["parameters"];
   meta: {
     alias: string;
@@ -709,6 +713,7 @@ var tsFactory = createFactory({
 
 // src/map-openapi-endpoints.ts
 import { capitalize as capitalize3, pick } from "pastable/server";
+import { match as match2, P } from "ts-pattern";
 var factory = tsFactory;
 var mapOpenApiEndpoints = (doc) => {
   const refs = createRefResolver(doc, factory);
@@ -723,6 +728,7 @@ var mapOpenApiEndpoints = (doc) => {
         operation,
         method,
         path,
+        requestFormat: "json",
         response: openApiSchemaToTs({ schema: {}, ctx }),
         meta: {
           alias: getAlias({ path, method, operation }),
@@ -771,6 +777,7 @@ var mapOpenApiEndpoints = (doc) => {
             ctx
           });
         }
+        endpoint.requestFormat = match2(matchingMediaType).with("application/octet-stream", () => "binary").with("multipart/form-data", () => "form-data").with("application/x-www-form-urlencoded", () => "form-url").with(P.string.includes("json"), () => "json").otherwise(() => "text");
       }
       if (params) {
         const t = createBoxFactory({}, ctx);

package/dist/cli.cjs

@@ -31,7 +31,7 @@ var import_promises = require("fs/promises");
 
 // package.json
 var name = "typed-openapi";
-var version = "0.7.0";
+var version = "0.9.0";
 
 // src/generator.ts
 var import_server2 = require("pastable/server");
@@ -334,8 +334,8 @@ var methods = ["get", "put", "post", "delete", "options", "head", "patch", "trac
 var methodsRegex = new RegExp(`(?:${methods.join("|")})_`);
 var endpointExport = new RegExp(`export (?:type|const) (?:${methodsRegex.source})`);
 var replacerByRuntime = {
-  yup: (line) => line.replace(/y\.InferType<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/(.*? )(y\.object)(\()/).source, "g"), "$1$2("),
-  zod: (line) => line.replace(/z\.infer<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/(.*? )(z\.object)(\()/).source, "g"), "$1$2(")
+  yup: (line) => line.replace(/y\.InferType<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/([\s\S]*? )(y\.object)(\()/).source, "g"), "$1$2("),
+  zod: (line) => line.replace(/z\.infer<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/([\s\S]*? )(z\.object)(\()/).source, "g"), "$1$2(")
 };
 var generateFile = (options) => {
   const ctx = { ...options, runtime: options.runtime ?? "none" };
@@ -347,8 +347,8 @@ var generateFile = (options) => {
     const transformer = runtimeValidationGenerator[ctx.runtime];
     const generated = ctx.runtime === "typebox" ? Codegen.TypeScriptToTypeBox.Generate(file2) : transformer(model);
     let converted = "";
-    const match2 = generated.match(/(const __ENDPOINTS_START__ =)([\s\S]*?)(export type __ENDPOINTS_END__)/);
-    const content = match2?.[2];
+    const match3 = generated.match(/(const __ENDPOINTS_START__ =)([\s\S]*?)(export type __ENDPOINTS_END__)/);
+    const content = match3?.[2];
     if (content && ctx.runtime in replacerByRuntime) {
       const before = generated.slice(0, generated.indexOf("export type __ENDPOINTS_START"));
       converted = before + replacerByRuntime[ctx.runtime](
@@ -404,6 +404,7 @@ var generateEndpointSchemaList = (ctx) => {
     file += `export type ${endpoint.meta.alias} = {
       method: "${endpoint.method.toUpperCase()}",
       path: "${endpoint.path}",
+      requestFormat: "${endpoint.requestFormat}",
       ${endpoint.meta.hasParameters ? `parameters: {
             ${parameters.query ? `query:  ${parameterObjectToString(parameters.query)},` : ""}
         ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
@@ -474,6 +475,8 @@ export type EndpointParameters = {
 export type MutationMethod = "post" | "put" | "patch" | "delete";
 export type Method = "get" | "head" | MutationMethod;
 
+type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
+
 export type DefaultEndpoint = {
   parameters?: EndpointParameters | undefined;
   response: unknown;
@@ -483,6 +486,7 @@ export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
   operationId: string;
   method: Method;
   path: string;
+  requestFormat: RequestFormat;
   parameters?: TConfig["parameters"];
   meta: {
     alias: string;
@@ -746,6 +750,7 @@ var tsFactory = createFactory({
 });
 
 // src/map-openapi-endpoints.ts
+var import_ts_pattern2 = require("ts-pattern");
 var factory = tsFactory;
 var mapOpenApiEndpoints = (doc) => {
   const refs = createRefResolver(doc, factory);
@@ -760,6 +765,7 @@ var mapOpenApiEndpoints = (doc) => {
         operation,
         method,
         path,
+        requestFormat: "json",
         response: openApiSchemaToTs({ schema: {}, ctx }),
         meta: {
           alias: getAlias({ path, method, operation }),
@@ -808,6 +814,7 @@ var mapOpenApiEndpoints = (doc) => {
             ctx
           });
         }
+        endpoint.requestFormat = (0, import_ts_pattern2.match)(matchingMediaType).with("application/octet-stream", () => "binary").with("multipart/form-data", () => "form-data").with("application/x-www-form-urlencoded", () => "form-url").with(import_ts_pattern2.P.string.includes("json"), () => "json").otherwise(() => "text");
       }
       if (params) {
         const t = createBoxFactory({}, ctx);

package/dist/cli.js

@@ -2,7 +2,7 @@ import {
   allowedRuntimes,
   generateFile,
   mapOpenApiEndpoints
-} from "./chunk-T4QUCLXL.js";
+} from "./chunk-TKIDWJ3F.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.7.0";
+var version = "0.9.0";
 
 // src/cli.ts
 var cwd = process.cwd();

package/dist/index.cjs

@@ -342,8 +342,8 @@ var methods = ["get", "put", "post", "delete", "options", "head", "patch", "trac
 var methodsRegex = new RegExp(`(?:${methods.join("|")})_`);
 var endpointExport = new RegExp(`export (?:type|const) (?:${methodsRegex.source})`);
 var replacerByRuntime = {
-  yup: (line) => line.replace(/y\.InferType<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/(.*? )(y\.object)(\()/).source, "g"), "$1$2("),
-  zod: (line) => line.replace(/z\.infer<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/(.*? )(z\.object)(\()/).source, "g"), "$1$2(")
+  yup: (line) => line.replace(/y\.InferType<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/([\s\S]*? )(y\.object)(\()/).source, "g"), "$1$2("),
+  zod: (line) => line.replace(/z\.infer<\s*?typeof (.*?)\s*?>/g, "typeof $1").replace(new RegExp(`(${endpointExport.source})` + new RegExp(/([\s\S]*? )(z\.object)(\()/).source, "g"), "$1$2(")
 };
 var generateFile = (options) => {
   const ctx = { ...options, runtime: options.runtime ?? "none" };
@@ -355,8 +355,8 @@ var generateFile = (options) => {
     const transformer = runtimeValidationGenerator[ctx.runtime];
     const generated = ctx.runtime === "typebox" ? Codegen.TypeScriptToTypeBox.Generate(file2) : transformer(model);
     let converted = "";
-    const match2 = generated.match(/(const __ENDPOINTS_START__ =)([\s\S]*?)(export type __ENDPOINTS_END__)/);
-    const content = match2?.[2];
+    const match3 = generated.match(/(const __ENDPOINTS_START__ =)([\s\S]*?)(export type __ENDPOINTS_END__)/);
+    const content = match3?.[2];
     if (content && ctx.runtime in replacerByRuntime) {
       const before = generated.slice(0, generated.indexOf("export type __ENDPOINTS_START"));
       converted = before + replacerByRuntime[ctx.runtime](
@@ -412,6 +412,7 @@ var generateEndpointSchemaList = (ctx) => {
     file += `export type ${endpoint.meta.alias} = {
       method: "${endpoint.method.toUpperCase()}",
       path: "${endpoint.path}",
+      requestFormat: "${endpoint.requestFormat}",
       ${endpoint.meta.hasParameters ? `parameters: {
             ${parameters.query ? `query:  ${parameterObjectToString(parameters.query)},` : ""}
         ${parameters.path ? `path:  ${parameterObjectToString(parameters.path)},` : ""}
@@ -482,6 +483,8 @@ export type EndpointParameters = {
 export type MutationMethod = "post" | "put" | "patch" | "delete";
 export type Method = "get" | "head" | MutationMethod;
 
+type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
+
 export type DefaultEndpoint = {
   parameters?: EndpointParameters | undefined;
   response: unknown;
@@ -491,6 +494,7 @@ export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
   operationId: string;
   method: Method;
   path: string;
+  requestFormat: RequestFormat;
   parameters?: TConfig["parameters"];
   meta: {
     alias: string;
@@ -754,6 +758,7 @@ var tsFactory = createFactory({
 });
 
 // src/map-openapi-endpoints.ts
+var import_ts_pattern2 = require("ts-pattern");
 var factory = tsFactory;
 var mapOpenApiEndpoints = (doc) => {
   const refs = createRefResolver(doc, factory);
@@ -768,6 +773,7 @@ var mapOpenApiEndpoints = (doc) => {
         operation,
         method,
         path,
+        requestFormat: "json",
         response: openApiSchemaToTs({ schema: {}, ctx }),
         meta: {
           alias: getAlias({ path, method, operation }),
@@ -816,6 +822,7 @@ var mapOpenApiEndpoints = (doc) => {
             ctx
           });
         }
+        endpoint.requestFormat = (0, import_ts_pattern2.match)(matchingMediaType).with("application/octet-stream", () => "binary").with("multipart/form-data", () => "form-data").with("application/x-www-form-urlencoded", () => "form-url").with(import_ts_pattern2.P.string.includes("json"), () => "json").otherwise(() => "text");
       }
       if (params) {
         const t = createBoxFactory({}, ctx);

package/dist/index.d.cts

@@ -213,6 +213,7 @@ type EndpointParameters = {
     header?: Box<BoxRef> | Record<string, AnyBox>;
     path?: Box<BoxRef> | Record<string, AnyBox>;
 };
+type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
 type DefaultEndpoint = {
     parameters?: EndpointParameters | undefined;
     response: AnyBox;
@@ -222,6 +223,7 @@ type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
     method: Method;
     path: string;
     parameters?: TConfig["parameters"];
+    requestFormat: RequestFormat;
     meta: {
         alias: string;
         hasParameters: boolean;

package/dist/index.d.ts

@@ -213,6 +213,7 @@ type EndpointParameters = {
     header?: Box<BoxRef> | Record<string, AnyBox>;
     path?: Box<BoxRef> | Record<string, AnyBox>;
 };
+type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
 type DefaultEndpoint = {
     parameters?: EndpointParameters | undefined;
     response: AnyBox;
@@ -222,6 +223,7 @@ type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
     method: Method;
     path: string;
     parameters?: TConfig["parameters"];
+    requestFormat: RequestFormat;
     meta: {
         alias: string;
         hasParameters: boolean;

package/dist/index.js

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

package/package.json

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

package/src/generator.ts

@@ -46,11 +46,11 @@ const replacerByRuntime = {
   yup: (line: string) =>
     line
       .replace(/y\.InferType<\s*?typeof (.*?)\s*?>/g, "typeof $1")
-      .replace(new RegExp(`(${endpointExport.source})` + new RegExp(/(.*? )(y\.object)(\()/).source, "g"), "$1$2("),
+      .replace(new RegExp(`(${endpointExport.source})` + new RegExp(/([\s\S]*? )(y\.object)(\()/).source, "g"), "$1$2("),
   zod: (line: string) =>
     line
       .replace(/z\.infer<\s*?typeof (.*?)\s*?>/g, "typeof $1")
-      .replace(new RegExp(`(${endpointExport.source})` + new RegExp(/(.*? )(z\.object)(\()/).source, "g"), "$1$2("),
+      .replace(new RegExp(`(${endpointExport.source})` + new RegExp(/([\s\S]*? )(z\.object)(\()/).source, "g"), "$1$2("),
 };
 
 export const generateFile = (options: GeneratorOptions) => {
@@ -137,6 +137,7 @@ const generateEndpointSchemaList = (ctx: GeneratorContext) => {
     file += `export type ${endpoint.meta.alias} = {
       method: "${endpoint.method.toUpperCase()}",
       path: "${endpoint.path}",
+      requestFormat: "${endpoint.requestFormat}",
       ${
         endpoint.meta.hasParameters
           ? `parameters: {
@@ -235,6 +236,8 @@ export type EndpointParameters = {
 export type MutationMethod = "post" | "put" | "patch" | "delete";
 export type Method = "get" | "head" | MutationMethod;
 
+type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
+
 export type DefaultEndpoint = {
   parameters?: EndpointParameters | undefined;
   response: unknown;
@@ -244,6 +247,7 @@ export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
   operationId: string;
   method: Method;
   path: string;
+  requestFormat: RequestFormat;
   parameters?: TConfig["parameters"];
   meta: {
     alias: string;

package/src/map-openapi-endpoints.ts

@@ -8,6 +8,7 @@ import { createRefResolver } from "./ref-resolver";
 import { tsFactory } from "./ts-factory";
 import { AnyBox, BoxRef, OpenapiSchemaConvertContext } from "./types";
 import { pathToVariableName } from "./string-utils";
+import { match, P } from "ts-pattern";
 
 const factory = tsFactory;
 
@@ -25,6 +26,7 @@ export const mapOpenApiEndpoints = (doc: OpenAPIObject) => {
         operation,
         method: method as Method,
         path,
+        requestFormat: "json",
         response: openApiSchemaToTs({ schema: {}, ctx }),
         meta: {
           alias: getAlias({ path, method, operation } as Endpoint),
@@ -83,12 +85,21 @@ export const mapOpenApiEndpoints = (doc: OpenAPIObject) => {
             ctx,
           });
         }
+
+        endpoint.requestFormat = match(matchingMediaType)
+          .with("application/octet-stream", () => "binary" as const)
+          .with("multipart/form-data", () => "form-data" as const)
+          .with("application/x-www-form-urlencoded", () => "form-url" as const)
+          .with(P.string.includes("json"), () => "json" as const)
+          .otherwise(() => "text" as const);
       }
 
       // Make parameters optional if all or some of them are not required
       if (params) {
         const t = createBoxFactory({}, ctx);
-        const filtered_params = ["query", "path", "header"] as Array<keyof Pick<typeof params, "query" | "path" | "header">>;
+        const filtered_params = ["query", "path", "header"] as Array<
+          keyof Pick<typeof params, "query" | "path" | "header">
+        >;
 
         for (const k of filtered_params) {
           if (params[k] && lists[k].length) {
@@ -165,6 +176,8 @@ export type EndpointParameters = {
   path?: Box<BoxRef> | Record<string, AnyBox>;
 };
 
+type RequestFormat = "json" | "form-data" | "form-url" | "binary" | "text";
+
 type DefaultEndpoint = {
   parameters?: EndpointParameters | undefined;
   response: AnyBox;
@@ -175,6 +188,7 @@ export type Endpoint<TConfig extends DefaultEndpoint = DefaultEndpoint> = {
   method: Method;
   path: string;
   parameters?: TConfig["parameters"];
+  requestFormat: RequestFormat;
   meta: {
     alias: string;
     hasParameters: boolean;