@sebspark/openapi-typegen 1.3.0 → 1.4.0

package/dist/index.js

@@ -196,37 +196,7 @@ var propertyName = (name) => {
     return name;
   return `'${name}'`;
 };
-var extensions = (type) => (type.allOf || []).map(generateType).concat("").join(AND) + parseOptional(type.oneOf, type.discriminator);
-var parseOptional = (optional, discriminator) => {
-  const tokens = [];
-  const map = reverseDiscriminator(discriminator);
-  for (const type of optional || []) {
-    if (type.type === "object")
-      tokens.push(generateType(type));
-    else {
-      const custom = type;
-      if (!map[custom.type])
-        tokens.push(generateType(custom));
-      else {
-        tokens.push(
-          `(${generateType(custom)} & { ${discriminator == null ? void 0 : discriminator.propertyName}: '${map[custom.type]}' })`
-        );
-      }
-    }
-  }
-  if (tokens.length)
-    tokens.push("");
-  return tokens.join(OR);
-};
-var reverseDiscriminator = (discriminator) => {
-  const reverse = {};
-  if (!discriminator)
-    return reverse;
-  for (const [val, { type }] of Object.entries(discriminator.mapping)) {
-    reverse[type] = val;
-  }
-  return reverse;
-};
+var extensions = (type) => (type.allOf || []).map(generateType).concat("").join(AND) + (type.oneOf || []).map(generateType).concat("").join(OR);
 var generatePrimitive = (parsed) => `${preamble(parsed)}${parsed.type}`;
 var generateCustom = (parsed) => `${preamble(parsed)}${typeName(parsed.type)}`;
 var generateObject = (parsed) => {
@@ -234,6 +204,18 @@ var generateObject = (parsed) => {
   lines.push(`${preamble(parsed)}${extensions(parsed)}{`);
   lines.push(...parsed.properties.map(generateProperty));
   lines.push("}");
+  if (parsed.discriminator && parsed.name) {
+    lines.push(generateDiscriminator(parsed.discriminator, parsed.name));
+  }
+  return lines.join("\n");
+};
+var generateDiscriminator = (discriminator, name) => {
+  const lines = [""];
+  lines.push(`export type ${name}Discriminator = {`);
+  for (const [key, type] of Object.entries(discriminator.mapping)) {
+    lines.push(`${key}: ${type.type}`);
+  }
+  lines.push("}");
   return lines.join("\n");
 };
 var generateArray = (parsed) => {

package/package.json

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