@sebspark/openapi-typegen 1.0.0 → 1.2.0

package/dist/index.js

@@ -182,9 +182,10 @@ var generateType = (parsed) => {
 };
 var generateProperty = (property) => {
   const types = property.type.map(generateType);
-  return `${document(property)}${propertyName(property.name)}${property.optional ? "?" : ""}: ${types.join(OR)}`;
+  return `${document(property)}${propertyName(property.name)}${property.optional ? "?" : ""}: ${types.join(OR) || "unknown"}`;
 };
 var preamble = (type) => type.name ? `${document(type)}export type ${typeName(type.name)} = ` : "";
+var rxProperVariable = /^[a-zA-Z_<>$][a-zA-Z0-9_<>$]*$/;
 var typeName = (name) => {
   if (rxProperVariable.test(name))
     return name;
@@ -195,7 +196,6 @@ var propertyName = (name) => {
     return name;
   return `'${name}'`;
 };
-var rxProperVariable = /^[a-zA-Z_$][a-zA-Z0-9_$]*$/;
 var extensions = (type) => type.extends.map(generateType).concat("").join(AND);
 var generatePrimitive = (parsed) => `${preamble(parsed)}${parsed.type}`;
 var generateCustom = (parsed) => `${preamble(parsed)}${typeName(parsed.type)}`;
@@ -217,7 +217,7 @@ var generateEnum = (parsed) => {
 var generateHeader = (header) => {
   return `${preamble(header)}{ ${propertyName(header.name)}${header.optional ? "?" : ""}: ${generateType(header.type)} }`;
 };
-var generateResponseBody = (type) => {
+var generateResponseBody = (type, optional = true) => {
   const customType = type.type;
   if (customType)
     return typeName(customType);
@@ -227,7 +227,9 @@ var generateResponseBody = (type) => {
   const tokens = [];
   tokens.push(preamble(body));
   tokens.push("APIResponse<");
-  tokens.push(body.data ? generateType(body.data) : "undefined");
+  tokens.push(
+    body.data ? generateType(serialized(body.data, optional)) : "undefined"
+  );
   if (body.headers) {
     tokens.push(", ");
     tokens.push(body.headers ? generateHeaders(body.headers) : "undefined");
@@ -235,6 +237,36 @@ var generateResponseBody = (type) => {
   tokens.push(">");
   return tokens.join("");
 };
+var serialized = (orig, optional = true) => {
+  switch (orig.type) {
+    case "bigint":
+    case "boolean":
+    case "enum":
+    case "null":
+    case "number":
+    case "string":
+    case "symbol":
+    case "undefined": {
+      return orig;
+    }
+    case "Date": {
+      return { ...orig, type: "string" };
+    }
+    case "array": {
+      return {
+        ...orig,
+        items: serialized(orig.items, optional)
+      };
+    }
+    case "object": {
+      return orig;
+    }
+    default: {
+      const wrapper = optional ? "PartiallySerialized" : "Serialized";
+      return { ...orig, type: `${wrapper}<${typeName(orig.type)}>` };
+    }
+  }
+};
 var generateHeaders = (headers) => {
   const tokens = [];
   for (const header of headers) {
@@ -306,7 +338,7 @@ var generateCall = (path) => {
     url: '${path.url}', ${generateClientArgs(path.args)}opts?: RequestOptions,
   ): Promise<${responses}>`;
 };
-var generateResponses = (path) => Object.entries(path.responses).filter(([code]) => parseInt(code, 10) < 400).map(([, type]) => generateResponseBody(type)).join(OR);
+var generateResponses = (path) => Object.entries(path.responses).filter(([code]) => parseInt(code, 10) < 400).map(([, type]) => generateResponseBody(type, false)).join(OR);
 
 // src/generator/server.ts
 var generateServer = (name, paths) => {
@@ -353,7 +385,9 @@ var generate = (name, doc) => `
    APIServerDefinition,
    BaseClient,
    GenericRouteHandler,
+   PartiallySerialized,
    RequestOptions,
+   Serialized,
  } from '@sebspark/openapi-core'
  import type { Request } from 'express'
  
@@ -508,12 +542,32 @@ var parsePropertyType = (property) => {
         case "integer": {
           return { type: "number", ...parseDocumentation(schemaObject) };
         }
+        case "string": {
+          switch (schemaObject.format) {
+            case "date":
+            case "date-time": {
+              return { type: "Date", ...parseDocumentation(schemaObject) };
+            }
+            default: {
+              return { type, ...parseDocumentation(schemaObject) };
+            }
+          }
+        }
         default: {
           return { type, ...parseDocumentation(schemaObject) };
         }
       }
     });
   }
+  if (schemaObject.allOf) {
+    const types = [];
+    for (const allOf of schemaObject.allOf) {
+      const type = parseSchema(void 0, allOf);
+      delete type.name;
+      types.push(type);
+    }
+    return types;
+  }
   return [];
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/openapi-typegen",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -27,7 +27,7 @@
     "boxen": "<6",
     "chalk": "<5",
     "change-case": "4.1.2",
-    "prettier": "3.2.3",
+    "prettier": "3.2.5",
     "yaml": "2.3.4",
     "yargs": "17.7.2",
     "yarn": "1.22.21"