@sebspark/openapi-typegen 1.8.2 → 1.8.4

package/dist/index.js

@@ -49,10 +49,8 @@ var document = ({ title, description }) => {
   if (title || description) {
     const tokens = [];
     tokens.push("/**");
-    if (title)
-      tokens.push(` * ${title}`);
-    if (description)
-      tokens.push(` * ${description}`);
+    if (title) tokens.push(` * ${title}`);
+    if (description) tokens.push(` * ${description}`);
     tokens.push(" */\n");
     return tokens.join("\n");
   }
@@ -68,14 +66,11 @@ var documentServerPath = (path, responses) => documentPath(path, responses);
 var documentPath = (path, responses, argsBefore = [], argsAfter = []) => {
   const tokens = [];
   tokens.push("/**");
-  if (path.title)
-    tokens.push(` * ${path.title}`);
-  if (path.description)
-    tokens.push(` * ${path.description}`);
+  if (path.title) tokens.push(` * ${path.title}`);
+  if (path.description) tokens.push(` * ${path.description}`);
   tokens.push(" *");
   tokens.push(...argsBefore);
-  if (path.args)
-    tokens.push(...documentArgs(path.args));
+  if (path.args) tokens.push(...documentArgs(path.args));
   tokens.push(...argsAfter);
   tokens.push(` * @returns {Promise<${responses}>}`);
   tokens.push(" */");
@@ -99,8 +94,7 @@ var documentArgs = (args) => {
 };
 var buildPath = (path, property) => rxProperVariable.test(property) ? `${path}.${property}` : `${path}["${property}"]`;
 var requestArgs = (args, name, title) => {
-  if (!args)
-    return [];
+  if (!args) return [];
   const tokens = [];
   const type = (args.allOf || []).map((e) => e.type).join(AND) || "Object";
   tokens.push(
@@ -138,12 +132,9 @@ var param = (name, type, optional = false, title = "", description = "") => {
   );
   if (optional || title || description) {
     tokens.push(" -");
-    if (optional)
-      tokens.push(" Optional.");
-    if (title)
-      tokens.push(` ${title}`);
-    if (description)
-      tokens.push(` ${description}`);
+    if (optional) tokens.push(" Optional.");
+    if (title) tokens.push(` ${title}`);
+    if (description) tokens.push(` ${description}`);
   }
   return tokens.join("");
 };
@@ -195,8 +186,7 @@ var rxProperVariable = /^[a-zA-Z_<>$][a-zA-Z0-9_<>$]*$/;
 var isValidName = (name) => {
   const namingConventionRegex = /^([A-Z_]\w*)([a-z_]\w*)(<([a-z_]\w*(,\s*)?)+>)?$/;
   const hasCapitalLetterRegex = /[A-Z]/;
-  if (!namingConventionRegex.test(name))
-    return false;
+  if (!namingConventionRegex.test(name)) return false;
   if (!hasCapitalLetterRegex.test(name)) {
     return false;
   }
@@ -277,11 +267,9 @@ var generateHeader = (header) => {
 };
 var generateResponseBody = (type, optional = true) => {
   const customType = type.type;
-  if (customType)
-    return typeName(customType);
+  if (customType) return typeName(customType);
   const body = type;
-  if (!body.data && !body.headers)
-    return "undefined";
+  if (!body.data && !body.headers) return "undefined";
   const tokens = [];
   tokens.push(preamble(body));
   tokens.push("APIResponse<");
@@ -335,8 +323,7 @@ var generateHeaders = (headers) => {
   return `{${tokens.join(", ")}}`;
 };
 var serializeValue = (value) => {
-  if (typeof value === "string")
-    return `'${value}'`;
+  if (typeof value === "string") return `'${value}'`;
   return value;
 };
 
@@ -359,16 +346,14 @@ var generateArgs = (args, isServer) => {
         );
       }
     }
-    if (!tokens.length)
-      return "";
+    if (!tokens.length) return "";
     const optional = argsOptional(args);
     return `args${optional ? "?" : ""}: ${isServer ? "Req & " : ""}{ ${tokens.join(", ")} }, `;
   }
   return "";
 };
 var wrapArgs = (args, wrap) => {
-  if (!wrap)
-    return args;
+  if (!wrap) return args;
   return `LowerCaseHeaders<${args}>`;
 };
 var argsOptional = (args) => (
@@ -418,8 +403,7 @@ var generateServer = (name, paths) => {
 };
 var groupPathsByUrl = (paths) => paths.reduce(
   (group, path) => {
-    if (!group[path.url])
-      group[path.url] = [];
+    if (!group[path.url]) group[path.url] = [];
     group[path.url].push(path);
     return group;
   },
@@ -447,7 +431,7 @@ var generate = (name, doc) => `
   * This file was auto-generated.
   * Do not make direct changes to the file.
   */
- 
+
  import type {
    APIResponse,
    APIServerDefinition,
@@ -458,13 +442,13 @@ var generate = (name, doc) => `
    RequestOptions,
    Serialized,
  } from '@sebspark/openapi-core'
- import type { Request } from 'express'
- 
- type Req = Pick<Request, 'url' | 'baseUrl' | 'cookies' | 'hostname'>
- 
+ import type { Request as ExpressRequest } from 'express'
+
+ type Req = Pick<ExpressRequest, 'url' | 'baseUrl' | 'cookies' | 'hostname'>
+
  /* tslint:disable */
  /* eslint-disable */
- 
+
  ${generateComponents(doc.components)}
 
  ${doc.paths.length ? generateServer(name, doc.paths) : ""}
@@ -541,10 +525,8 @@ var findRef = (components, ref) => {
 };
 var parseDocumentation = (source) => {
   const documented = {};
-  if (source.title)
-    documented.title = source.title;
-  if (source.description)
-    documented.description = source.description;
+  if (source.title) documented.title = source.title;
+  if (source.description) documented.description = source.description;
   return documented;
 };
 
@@ -614,8 +596,7 @@ var parseObjectSchema = (name, schema) => {
   return type;
 };
 var parseArraySchema = (name, schema) => {
-  if (schema.type !== "array")
-    throw new Error("Not an array");
+  if (schema.type !== "array") throw new Error("Not an array");
   return {
     name,
     type: "array",
@@ -755,8 +736,7 @@ var joinArg = (arg1, arg2) => {
     arg.oneOf = (arg1.oneOf || []).concat(arg2.oneOf || []);
   if (arg1.description || arg2.description)
     arg.description = arg1.description || arg2.description;
-  if (arg1.title || arg2.title)
-    arg.title = arg1.title || arg2.title;
+  if (arg1.title || arg2.title) arg.title = arg1.title || arg2.title;
   return arg;
 };
 var parseSecurity = (security = [], components = {}) => {
@@ -769,8 +749,7 @@ var parseSecurity = (security = [], components = {}) => {
       );
       const arg = args.header || createArgs({ ...parseDocumentation(param2) });
       arg.optional = false;
-      if (!arg.allOf)
-        arg.allOf = [];
+      if (!arg.allOf) arg.allOf = [];
       arg.allOf.push({ type: parseRef(name) });
       args.header = arg;
     }
@@ -788,8 +767,7 @@ var parseParameters2 = (parameters = [], components = {}) => {
           const param2 = findRef(components, ref);
           const arg = args[param2.in] || createArgs({ ...parseDocumentation(param2) });
           arg.optional = arg.optional && !param2.required;
-          if (!arg.allOf)
-            arg.allOf = [];
+          if (!arg.allOf) arg.allOf = [];
           arg.allOf.push({ type: parseRef(ref) });
           args[param2.in] = arg;
           break;
@@ -826,8 +804,7 @@ var parseParameters2 = (parameters = [], components = {}) => {
 var parseRequestBody = (requestBody, components = {}) => {
   var _a, _b;
   const args = {};
-  if (!requestBody)
-    return args;
+  if (!requestBody) return args;
   const ref = requestBody.$ref;
   if (ref) {
     const refBody = findRef(components, ref);
@@ -875,14 +852,11 @@ var parseResponseBodies = (responses = {}) => {
 var parseResponseBody = (name, response) => {
   var _a, _b;
   const ref = response.$ref;
-  if (ref)
-    return { type: parseRef(ref) };
+  if (ref) return { type: parseRef(ref) };
   const responseObject = response;
   const body = {};
-  if (name)
-    body.name = name;
-  if (responseObject.description)
-    body.description = responseObject.description;
+  if (name) body.name = name;
+  if (responseObject.description) body.description = responseObject.description;
   if ((_b = (_a = responseObject.content) == null ? void 0 : _a["application/json"]) == null ? void 0 : _b.schema) {
     const schema = responseObject.content["application/json"].schema;
     body.data = parseSchema(void 0, schema);
@@ -898,8 +872,7 @@ var parseResponseBody = (name, response) => {
           type: { type: parseRef(ref2) },
           ...parseDocumentation(header)
         });
-      else
-        body.headers.push(parseHeader(headerName, header));
+      else body.headers.push(parseHeader(headerName, header));
     }
   }
   return body;
@@ -1033,16 +1006,14 @@ var generateTypescript = async (name, doc) => {
 var generate2 = async (input, output) => {
   const docs = await readDocs(input);
   const generated = await generateDocs(docs);
-  if (!output)
-    return generated.map((d) => d.ts).join("\n\n");
+  if (!output) return generated.map((d) => d.ts).join("\n\n");
   await saveDocs(output, generated);
 };
 var readDocs = async (input) => {
   const path = (0, import_node_path.resolve)(input);
   const stats = await (0, import_promises.stat)(path);
   const filePaths = [];
-  if (stats.isFile())
-    filePaths.push(path);
+  if (stats.isFile()) filePaths.push(path);
   if (stats.isDirectory()) {
     const files = await (0, import_promises.readdir)(path);
     filePaths.push(...files.map((f) => (0, import_node_path.resolve)(path, f)));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/openapi-typegen",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,7 +15,7 @@
     "build": "tsup-node src/index.ts src/cli.ts --format cjs --dts",
     "dev": "tsc --watch --noEmit",
     "lint": "biome check .",
-    "test": "vitest --passWithNoTests --coverage",
+    "test": "vitest run --passWithNoTests --coverage",
     "typecheck": "vitest --typecheck.only --passWithNoTests"
   },
   "devDependencies": {
@@ -27,8 +27,8 @@
     "boxen": "<6",
     "chalk": "<5",
     "change-case": "4.1.2",
-    "prettier": "3.2.5",
-    "yaml": "2.4.2",
+    "prettier": "3.3.2",
+    "yaml": "2.4.3",
     "yargs": "17.7.2",
     "yarn": "1.22.22"
   }