fix: generating allOf, anyOf, oneOf named enums (#271)

* fix: generating allOf, anyOf, oneOf named enums

* fix: update snapshot - make allOfNamedEnum required

Author: Adrian Wędzel

src/generator.ts

@@ -43,6 +43,9 @@ function declareEnums(ast: AST, options: Options, processed = new Set<AST>()): s
       break
     case 'ARRAY':
       return declareEnums(ast.params, options, processed)
+    case 'UNION':
+    case 'INTERSECTION':
+      return ast.params.reduce((prev, ast) => prev + declareEnums(ast, options, processed), '')
     case 'TUPLE':
       type = ast.params.reduce((prev, ast) => prev + declareEnums(ast, options, processed), '')
       if (ast.spreadParam) {

test/__snapshots__/test/test.ts.md

@@ -1272,6 +1272,9 @@ Generated by [AVA](https://ava.li).
       impliedHeterogeneousEnum?: -20.1 | null | "foo" | false;␊
       namedIntegerEnumTitle: NamedInteger;␊
       impliedNamedIntegerEnumTitle: ImpliedNamedInteger;␊
+      oneOfNamedEnum: IntegerOneOfNamedEnum | StringOneOfNamedEnum;␊
+      anyOfNamedEnum: IntegerAnyOfNamedEnum | StringAnyOfNamedEnum;␊
+      allOfNamedEnum: IntegerAllOfNamedEnum & StringAllOfNamedEnum;␊
     }␊
     ␊
     export const enum NamedIntegerEnum {␊
@@ -1294,6 +1297,36 @@ Generated by [AVA](https://ava.li).
       Five = 5,␊
       Six = 6␊
     }␊
+    export const enum IntegerOneOfNamedEnum {␊
+      One = 1,␊
+      Two = 2,␊
+      Three = 3␊
+    }␊
+    export const enum StringOneOfNamedEnum {␊
+      Four = "four",␊
+      Five = "five",␊
+      Six = "six"␊
+    }␊
+    export const enum IntegerAnyOfNamedEnum {␊
+      One = 1,␊
+      Two = 2,␊
+      Three = 3␊
+    }␊
+    export const enum StringAnyOfNamedEnum {␊
+      Four = "four",␊
+      Five = "five",␊
+      Six = "six"␊
+    }␊
+    export const enum IntegerAllOfNamedEnum {␊
+      One = 1,␊
+      Two = 2,␊
+      Three = 3␊
+    }␊
+    export const enum StringAllOfNamedEnum {␊
+      Four = "four",␊
+      Five = "five",␊
+      Six = "six"␊
+    }␊
     `
 
 ## extends.1a.js

test/__snapshots__/test/test.ts.snap

@@ -49,10 +49,58 @@ export const input = {
       enum: [4, 5, 6],
       title: "ImpliedNamedInteger",
       tsEnumNames: ['Four', 'Five', 'Six']
+    },
+    oneOfNamedEnum: {
+      oneOf: [
+        {
+          type: "integer",
+          enum: [1, 2, 3],
+          title: "IntegerOneOfNamedEnum",
+          tsEnumNames: ["One", "Two", "Three"]
+        },
+        {
+          type: "string",
+          enum: ["four", "five", "six"],
+          title: "StringOneOfNamedEnum",
+          tsEnumNames: ["Four", "Five", "Six"]
+        }
+      ]
+    },
+    anyOfNamedEnum: {
+      anyOf: [
+        {
+          type: "integer",
+          enum: [1, 2, 3],
+          title: "IntegerAnyOfNamedEnum",
+          tsEnumNames: ["One", "Two", "Three"]
+        },
+        {
+          type: "string",
+          enum: ["four", "five", "six"],
+          title: "StringAnyOfNamedEnum",
+          tsEnumNames: ["Four", "Five", "Six"]
+        }
+      ]
+    },
+    allOfNamedEnum: {
+      allOf: [
+        {
+          type: "integer",
+          enum: [1, 2, 3],
+          title: "IntegerAllOfNamedEnum",
+          tsEnumNames: ["One", "Two", "Three"]
+        },
+        {
+          type: "string",
+          enum: ["four", "five", "six"],
+          title: "StringAllOfNamedEnum",
+          tsEnumNames: ["Four", "Five", "Six"]
+        }
+      ]
     }
   },
   required: ['stringEnum', 'impliedStringEnum', 'booleanEnum', 'impliedBooleanEnum', 'integerEnum', 'impliedIntegerEnum', 'impliedNamedIntegerEnum',
-  'namedIntegerEnumTitle', 'impliedNamedIntegerEnumTitle'],
+  'namedIntegerEnumTitle', 'impliedNamedIntegerEnumTitle', 'oneOfNamedEnum', 'anyOfNamedEnum', 'allOfNamedEnum'],
   additionalProperties: false
 }