@sebspark/openapi-typegen 1.7.3 → 1.8.1

package/dist/index.js

@@ -552,7 +552,16 @@ var parseDocumentation = (source) => {
 var parseSchemas = (schemas = {}) => Object.entries(schemas || {}).map(
   ([name, schema]) => parseSchema(name, schema)
 );
-var parseSchema = (name, schemaOrRef) => {
+var marshall = (type, format2) => {
+  if (type === "integer") {
+    return "number";
+  }
+  if (type === "string" && (format2 === "date" || format2 === "date-time")) {
+    return "Date";
+  }
+  return type;
+};
+var parseSchema = (name, schemaOrRef, generateDocs2 = true) => {
   const ref = schemaOrRef.$ref;
   if (ref) {
     return { name, type: parseRef(ref) };
@@ -565,7 +574,7 @@ var parseSchema = (name, schemaOrRef) => {
     case "integer":
     case "number":
     case "string":
-      return schema.enum ? parseEnumType(name, schema) : parsePropertyType(schema)[0];
+      return schema.enum ? parseEnumType(name, schema) : name ? { name, type: marshall(schema.type, schema.format) } : parsePropertyType(schema, generateDocs2)[0];
     default:
       return parseObjectSchema(name, schema);
   }
@@ -584,13 +593,13 @@ var parseObjectSchema = (name, schema) => {
     );
   }
   if (schema.allOf) {
-    type.allOf = schema.allOf.flatMap(parsePropertyType);
+    type.allOf = schema.allOf.flatMap((s) => parsePropertyType(s));
   }
   if (schema.oneOf) {
-    type.oneOf = schema.oneOf.flatMap(parsePropertyType);
+    type.oneOf = schema.oneOf.flatMap((s) => parsePropertyType(s));
   }
   if (schema.anyOf) {
-    type.oneOf = schema.anyOf.flatMap(parsePropertyType);
+    type.oneOf = schema.anyOf.flatMap((s) => parsePropertyType(s));
   }
   if ((_a = schema.discriminator) == null ? void 0 : _a.mapping) {
     const mapping = {};
@@ -610,7 +619,7 @@ var parseArraySchema = (name, schema) => {
   return {
     name,
     type: "array",
-    items: schema.items ? parsePropertyType(schema.items)[0] : { type: "unknown" },
+    items: schema.items ? parseSchema(void 0, schema.items, false) : { type: "unknown" },
     ...parseDocumentation(schema)
   };
 };
@@ -623,17 +632,18 @@ var parseProperty = (name, schema, required) => {
   };
   return property;
 };
-var parsePropertyType = (property) => {
+var parsePropertyType = (property, generateDocs2 = true) => {
   const ref = property.$ref;
   if (ref) {
     return [{ type: parseRef(ref) }];
   }
   const schemaObject = property;
+  const docs = generateDocs2 ? parseDocumentation(schemaObject) : {};
   if (schemaObject.enum) {
     const enumType = {
       type: "enum",
       values: schemaObject.enum,
-      ...parseDocumentation(schemaObject)
+      ...docs
     };
     return [enumType];
   }
@@ -646,22 +656,11 @@ var parsePropertyType = (property) => {
         case "object": {
           return parseObjectSchema(void 0, schemaObject);
         }
-        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) };
+          return {
+            type: marshall(type, schemaObject.format),
+            ...docs
+          };
         }
       }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sebspark/openapi-typegen",
-  "version": "1.7.3",
+  "version": "1.8.1",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",