Merge pull request #83 from ethdebug/smarter-schemas

Replace a few `oneOf`s with if/then/else
ethdebug · Mar 29, 2024 · 574bac6 · 574bac6
2 parents 7af6291 + 102facc
commit 574bac6
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 6 deletions.
diff --git a/schemas/type.schema.yaml b/schemas/type.schema.yaml
@@ -22,9 +22,19 @@ then:
   title: KnownType
   description:
     Then the object must adhere to exactly one known kind of type
-  oneOf:
-    - $ref: "schema:ethdebug/format/type/elementary"
-    - $ref: "schema:ethdebug/format/type/complex"
+  allOf:
+    - if:
+        properties:
+          kind:
+            $ref: "schema:ethdebug/format/type/elementary#/$defs/Kind"
+      then:
+        $ref: "schema:ethdebug/format/type/elementary"
+    - if:
+        properties:
+          kind:
+            $ref: "schema:ethdebug/format/type/complex#/$defs/Kind"
+      then:
+        $ref: "schema:ethdebug/format/type/complex"
 
 else:
   type: object

diff --git a/schemas/type/wrapper.schema.yaml b/schemas/type/wrapper.schema.yaml
@@ -9,9 +9,14 @@ description:
 type: object
 properties:
   type:
-    oneOf:
-      - $ref: "schema:ethdebug/format/type"
-      - $ref: "schema:ethdebug/format/type/reference"
+    # Discriminate between reference and type based on presence of `id`
+    if:
+      required:
+        - id
+    then:
+      $ref: "schema:ethdebug/format/type/reference"
+    else:
+      $ref: "schema:ethdebug/format/type"
 
 required:
   - type