Nest discriminators

Author: bennypowers

schema.d.ts

@@ -155,13 +155,16 @@ export interface CustomElementExport {
   deprecated?: boolean | string;
 }
 
+/**
+ * @discriminator kind
+ */
 export type Declaration =
-  | ClassDeclaration
   | FunctionDeclaration
-  | MixinDeclaration
   | VariableDeclaration
-  | CustomElementDeclaration
-  | CustomElementMixinDeclaration;
+  | /** @discriminator customElement */(MixinDeclaration
+  | CustomElementMixinDeclaration)
+  | /** @discriminator customElement */(ClassDeclaration
+  | CustomElementDeclaration)
 
 /**
  * A reference to an export of a module.

schema.json

@@ -590,26 +590,148 @@
       "type": "object"
     },
     "Declaration": {
-      "anyOf": [
+      "allOf": [
         {
-          "$ref": "#/definitions/ClassDeclaration"
+          "if": {
+            "properties": {
+              "kind": {
+                "const": "function",
+                "type": "string"
+              }
+            }
+          },
+          "then": {
+            "$ref": "#/definitions/FunctionDeclaration"
+          }
         },
         {
-          "$ref": "#/definitions/FunctionDeclaration"
+          "if": {
+            "properties": {
+              "kind": {
+                "const": "variable",
+                "type": "string"
+              }
+            }
+          },
+          "then": {
+            "$ref": "#/definitions/VariableDeclaration"
+          }
         },
         {
-          "$ref": "#/definitions/MixinDeclaration"
+          "if": {
+            "allOf": [
+              {
+                "properties": {
+                  "kind": {
+                    "const": "mixin",
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "kind"
+                ]
+              },
+              {
+                "not": {
+                  "properties": {
+                    "customElement": {}
+                  },
+                  "required": [
+                    "customElement"
+                  ]
+                }
+              }
+            ]
+          },
+          "then": {
+            "$ref": "#/definitions/MixinDeclaration"
+          }
         },
         {
-          "$ref": "#/definitions/VariableDeclaration"
+          "if": {
+            "properties": {
+              "customElement": {
+                "const": true
+              },
+              "kind": {
+                "const": "mixin",
+                "type": "string"
+              }
+            },
+            "required": [
+              "kind",
+              "customElement"
+            ]
+          },
+          "then": {
+            "$ref": "#/definitions/CustomElementMixinDeclaration"
+          }
         },
         {
-          "$ref": "#/definitions/CustomElementDeclaration"
+          "if": {
+            "allOf": [
+              {
+                "properties": {
+                  "kind": {
+                    "const": "class",
+                    "type": "string"
+                  }
+                },
+                "required": [
+                  "kind"
+                ]
+              },
+              {
+                "not": {
+                  "properties": {
+                    "customElement": {}
+                  },
+                  "required": [
+                    "customElement"
+                  ]
+                }
+              }
+            ]
+          },
+          "then": {
+            "$ref": "#/definitions/ClassDeclaration"
+          }
         },
         {
-          "$ref": "#/definitions/CustomElementMixinDeclaration"
+          "if": {
+            "properties": {
+              "customElement": {
+                "const": true
+              },
+              "kind": {
+                "const": "class",
+                "type": "string"
+              }
+            },
+            "required": [
+              "kind",
+              "customElement"
+            ]
+          },
+          "then": {
+            "$ref": "#/definitions/CustomElementDeclaration"
+          }
         }
-      ]
+      ],
+      "properties": {
+        "kind": {
+          "enum": [
+            "function",
+            "variable",
+            "mixin",
+            "class"
+          ]
+        }
+      },
+      "required": [
+        "kind"
+      ],
+      "type": "object"
     },
     "Demo": {
       "additionalProperties": false,