@sebspark/openapi-typegen 0.1.0 → 0.2.0

package/dist/index.js

@@ -47,11 +47,14 @@ var header = `/**
  * Do not make direct changes to the file.
  */
 
-import {
+import type {
   APIServerDefinition,
   BaseClient,
   GenericRouteHandler,
 } from '@sebspark/openapi-core'
+import type { Request } from 'express'
+
+type Req = Pick<Request, 'url' | 'baseUrl' | 'cookies' | 'hostname'>
  
 /* tslint:disable */
 /* eslint-disable */`;
@@ -259,7 +262,7 @@ ${Object.entries(map).map(
       ([url, methods]) => `  '${url}': {
 ${Object.entries(methods).map(
         ([method, definition]) => `    '${method}': {
-    handler: (${serializeArgs(definition.args)}) => Promise<[${definition.response.code}, ${definition.response.type}]>
+    handler: (${serializeArgs(definition.args, true)}) => Promise<[${definition.response.code}, ${definition.response.type}]>
     pre?: GenericRouteHandler | GenericRouteHandler[]
   }`
       ).join("\n")}
@@ -325,11 +328,18 @@ var parseArgs = (route) => {
   if (args.headers || args.params || args.query || args.body)
     return args;
 };
-var serializeArgs = (args) => {
+var optional = (params) => {
+  const rxRequiredParams = /(?<!\?\s*)\b['"]?\w+['"]?\s*:\s*\w+/gim;
+  const anyRequired = rxRequiredParams.test(params) || !params.includes(":");
+  return anyRequired ? "" : "?";
+};
+var serializeArgs = (args, includeRequest = false) => {
   if (!args)
     return "";
-  const argsString = Object.entries(args).map(([key, value]) => `${key}: ${value}`).join(",");
-  return `args: {${argsString}}`;
+  const argsString = Object.entries(args).map(([key, value]) => {
+    return `${key}${optional(value)}: ${value}`;
+  }).join(",");
+  return `args${optional(argsString)}: ${includeRequest ? "Req & " : ""}{${argsString}}`;
 };
 
 // src/openapi/parser.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/openapi-typegen",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,7 +19,7 @@
     "typecheck": "vitest typecheck --passWithNoTests"
   },
   "devDependencies": {
-    "@types/yargs": "17.0.30",
+    "@types/yargs": "17.0.31",
     "tsconfig": "*"
   },
   "dependencies": {
@@ -27,8 +27,8 @@
     "boxen": "<6",
     "chalk": "<5",
     "change-case": "4.1.2",
-    "prettier": "3.0.3",
+    "prettier": "3.1.0",
     "yargs": "17.7.2",
-    "yarn": "1.22.19"
+    "yarn": "1.22.20"
   }
 }