typed-openapi 0.4.1 → 0.6.0

package/dist/{chunk-XEXIEYXO.js → chunk-UHCVCAGY.js}

@@ -291,7 +291,7 @@ var inferByRuntime = {
   arktype: (input) => `${input}["infer"]`,
   "io-ts": (input) => `t.TypeOf<${input}>`,
   typebox: (input) => `Static<${input}>`,
-  valibot: (input) => `v.Output<${input}>`,
+  valibot: (input) => `v.InferOutput<${input}>`,
   yup: (input) => `y.InferType<${input}>`,
   zod: (input) => `z.infer<${input}>`
 };
@@ -774,16 +774,19 @@ var mapOpenApiEndpoints = (doc) => {
       }
       if (params) {
         const t = createBoxFactory({}, ctx);
-        if (params.query && lists.query.length && lists.query.every((param) => !param.required)) {
-          if (!params.query)
-            params.query = {};
-          params.query = t.reference("Partial", [t.object(params.query)]);
-        }
-        if (params.path && lists.path.length && lists.path.every((param) => !param.required)) {
-          params.path = t.reference("Partial", [t.object(params.path)]);
-        }
-        if (params.header && lists.header.length && lists.header.every((param) => !param.required)) {
-          params.header = t.reference("Partial", [t.object(params.header)]);
+        const filtered_params = ["query", "path", "header"];
+        for (const k of filtered_params) {
+          if (params[k] && lists[k].length) {
+            if (lists[k].every((param) => !param.required)) {
+              params[k] = t.reference("Partial", [t.object(params[k])]);
+            } else {
+              for (const p of lists[k]) {
+                if (!p.required) {
+                  params[k][p.name] = t.optional(params[k][p.name]);
+                }
+              }
+            }
+          }
         }
         endpoint.parameters = Object.keys(params).length ? params : void 0;
       }
@@ -820,7 +823,7 @@ var allowedParamMediaTypes = [
 ];
 var isAllowedParamMediaTypes = (mediaType) => mediaType.includes("application/") && mediaType.includes("json") || allowedParamMediaTypes.includes(mediaType) || mediaType.includes("text/");
 var isResponseMediaType = (mediaType) => mediaType === "application/json";
-var getAlias = ({ path, method, operation }) => method + "_" + capitalize3(operation.operationId ?? pathToVariableName(path));
+var getAlias = ({ path, method, operation }) => (method + "_" + capitalize3(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__");
 
 export {
   unwrap,

package/dist/cli.cjs

@@ -31,7 +31,7 @@ var import_promises = require("fs/promises");
 
 // package.json
 var name = "typed-openapi";
-var version = "0.4.1";
+var version = "0.6.0";
 
 // src/generator.ts
 var import_server2 = require("pastable/server");
@@ -326,7 +326,7 @@ var inferByRuntime = {
   arktype: (input) => `${input}["infer"]`,
   "io-ts": (input) => `t.TypeOf<${input}>`,
   typebox: (input) => `Static<${input}>`,
-  valibot: (input) => `v.Output<${input}>`,
+  valibot: (input) => `v.InferOutput<${input}>`,
   yup: (input) => `y.InferType<${input}>`,
   zod: (input) => `z.infer<${input}>`
 };
@@ -811,16 +811,19 @@ var mapOpenApiEndpoints = (doc) => {
       }
       if (params) {
         const t = createBoxFactory({}, ctx);
-        if (params.query && lists.query.length && lists.query.every((param) => !param.required)) {
-          if (!params.query)
-            params.query = {};
-          params.query = t.reference("Partial", [t.object(params.query)]);
-        }
-        if (params.path && lists.path.length && lists.path.every((param) => !param.required)) {
-          params.path = t.reference("Partial", [t.object(params.path)]);
-        }
-        if (params.header && lists.header.length && lists.header.every((param) => !param.required)) {
-          params.header = t.reference("Partial", [t.object(params.header)]);
+        const filtered_params = ["query", "path", "header"];
+        for (const k of filtered_params) {
+          if (params[k] && lists[k].length) {
+            if (lists[k].every((param) => !param.required)) {
+              params[k] = t.reference("Partial", [t.object(params[k])]);
+            } else {
+              for (const p of lists[k]) {
+                if (!p.required) {
+                  params[k][p.name] = t.optional(params[k][p.name]);
+                }
+              }
+            }
+          }
         }
         endpoint.parameters = Object.keys(params).length ? params : void 0;
       }
@@ -857,7 +860,7 @@ var allowedParamMediaTypes = [
 ];
 var isAllowedParamMediaTypes = (mediaType) => mediaType.includes("application/") && mediaType.includes("json") || allowedParamMediaTypes.includes(mediaType) || mediaType.includes("text/");
 var isResponseMediaType = (mediaType) => mediaType === "application/json";
-var getAlias = ({ path, method, operation }) => method + "_" + (0, import_server4.capitalize)(operation.operationId ?? pathToVariableName(path));
+var getAlias = ({ path, method, operation }) => (method + "_" + (0, import_server4.capitalize)(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__");
 
 // src/cli.ts
 var cwd = process.cwd();

package/dist/cli.js

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

package/dist/index.cjs

@@ -334,7 +334,7 @@ var inferByRuntime = {
   arktype: (input) => `${input}["infer"]`,
   "io-ts": (input) => `t.TypeOf<${input}>`,
   typebox: (input) => `Static<${input}>`,
-  valibot: (input) => `v.Output<${input}>`,
+  valibot: (input) => `v.InferOutput<${input}>`,
   yup: (input) => `y.InferType<${input}>`,
   zod: (input) => `z.infer<${input}>`
 };
@@ -819,16 +819,19 @@ var mapOpenApiEndpoints = (doc) => {
       }
       if (params) {
         const t = createBoxFactory({}, ctx);
-        if (params.query && lists.query.length && lists.query.every((param) => !param.required)) {
-          if (!params.query)
-            params.query = {};
-          params.query = t.reference("Partial", [t.object(params.query)]);
-        }
-        if (params.path && lists.path.length && lists.path.every((param) => !param.required)) {
-          params.path = t.reference("Partial", [t.object(params.path)]);
-        }
-        if (params.header && lists.header.length && lists.header.every((param) => !param.required)) {
-          params.header = t.reference("Partial", [t.object(params.header)]);
+        const filtered_params = ["query", "path", "header"];
+        for (const k of filtered_params) {
+          if (params[k] && lists[k].length) {
+            if (lists[k].every((param) => !param.required)) {
+              params[k] = t.reference("Partial", [t.object(params[k])]);
+            } else {
+              for (const p of lists[k]) {
+                if (!p.required) {
+                  params[k][p.name] = t.optional(params[k][p.name]);
+                }
+              }
+            }
+          }
         }
         endpoint.parameters = Object.keys(params).length ? params : void 0;
       }
@@ -865,7 +868,7 @@ var allowedParamMediaTypes = [
 ];
 var isAllowedParamMediaTypes = (mediaType) => mediaType.includes("application/") && mediaType.includes("json") || allowedParamMediaTypes.includes(mediaType) || mediaType.includes("text/");
 var isResponseMediaType = (mediaType) => mediaType === "application/json";
-var getAlias = ({ path, method, operation }) => method + "_" + (0, import_server4.capitalize)(operation.operationId ?? pathToVariableName(path));
+var getAlias = ({ path, method, operation }) => (method + "_" + (0, import_server4.capitalize)(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   createBoxFactory,

package/dist/index.js

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "typed-openapi",
   "type": "module",
-  "version": "0.4.1",
+  "version": "0.6.0",
   "main": "dist/index.cjs",
   "module": "dist/index.js",
   "bin": {
@@ -15,7 +15,7 @@
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.1.0",
     "@changesets/cli": "^2.26.2",
-    "@sinclair/typebox-codegen": "^0.8.5",
+    "@sinclair/typebox-codegen": "^0.10.3",
     "arktype": "1.0.18-alpha",
     "cac": "^6.7.14",
     "openapi3-ts": "^4.1.2",

package/src/generator.ts

@@ -33,7 +33,7 @@ const inferByRuntime = {
   arktype: (input: string) => `${input}["infer"]`,
   "io-ts": (input: string) => `t.TypeOf<${input}>`,
   typebox: (input: string) => `Static<${input}>`,
-  valibot: (input: string) => `v.Output<${input}>`,
+  valibot: (input: string) => `v.InferOutput<${input}>`,
   yup: (input: string) => `y.InferType<${input}>`,
   zod: (input: string) => `z.infer<${input}>`,
 };

package/src/map-openapi-endpoints.ts

@@ -85,18 +85,23 @@ export const mapOpenApiEndpoints = (doc: OpenAPIObject) => {
         }
       }
 
-      // Make parameters optional if none of them are required
+      // Make parameters optional if all or some of them are not required
       if (params) {
         const t = createBoxFactory({}, ctx);
-        if (params.query && lists.query.length && lists.query.every((param) => !param.required)) {
-          if (!params.query) params.query = {};
-          params.query = t.reference("Partial", [t.object(params.query)]) as any;
-        }
-        if (params.path && lists.path.length && lists.path.every((param) => !param.required)) {
-          params.path = t.reference("Partial", [t.object(params.path)]) as any;
-        }
-        if (params.header && lists.header.length && lists.header.every((param) => !param.required)) {
-          params.header = t.reference("Partial", [t.object(params.header)]) as any;
+        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) {
+            if (lists[k].every((param) => !param.required)) {
+              params[k] = t.reference("Partial", [t.object(params[k]!)]) as any;
+            } else {
+              for (const p of lists[k]) {
+                if (!p.required) {
+                  params[k]![p.name] = t.optional(params[k]![p.name] as any);
+                }
+              }
+            }
+          }  
         }
 
         // No need to pass empty objects, it's confusing
@@ -148,7 +153,7 @@ const isAllowedParamMediaTypes = (
 
 const isResponseMediaType = (mediaType: string) => mediaType === "application/json";
 const getAlias = ({ path, method, operation }: Endpoint) =>
-  method + "_" + capitalize(operation.operationId ?? pathToVariableName(path));
+  (method + "_" + capitalize(operation.operationId ?? pathToVariableName(path))).replace(/-/g, "__");
 
 type MutationMethod = "post" | "put" | "patch" | "delete";
 type Method = "get" | "head" | "options" | MutationMethod;