meta-schemas: Rework schemas to avoid oneOf

'oneOf' results in ambiguous warning messages as it's not clear which
entry is the real error. Rework the meta-schemas to use if/then/else
instead which tends to result in more precise warning messages.

Signed-off-by: Rob Herring (Arm) <[email protected]>

Author: robherring

dtschema/meta-schemas/cell.yaml

@@ -37,20 +37,22 @@ array:
           description: '"items" can be a list defining each entry or a schema
             applying to all items. A list has an implicit size. A schema
             requires minItems/maxItems to define the size.'
-          oneOf:
-            - type: object
-              allOf:
-                - $ref: '#/array'
-            - type: array
+          if:
+            type: object
+          then:
+            $ref: '#/array'
+          else:
+            type: array
+            if:
               items:
-                $ref: '#/single'
-            - type: array
+                required: [ items ]
+            then:
               maxItems: 1 # for more than 1, outer 'items' should be a schema
               items:
-                allOf:
-                  - $ref: '#/array'
-                required:
-                  - items
+                $ref: '#/array'
+            else:
+              items:
+                $ref: '#/single'
         additionalItems:
           type: boolean
           const: true

dtschema/meta-schemas/clocks.yaml

@@ -8,9 +8,13 @@ $schema: https://json-schema.org/draft/2019-09/schema
 
 properties:
   clocks:
-    oneOf:
-      - $ref: cell.yaml#/array
-      - $ref: nodes.yaml
+    if:
+      type: object
+      required: [type]
+    then:
+      $ref: nodes.yaml
+    else:
+      $ref: cell.yaml#/array
   clock-ranges:
     $ref: boolean.yaml
   clock-indices:

dtschema/meta-schemas/interrupts.yaml

@@ -18,9 +18,13 @@ properties:
   interrupt-map-mask:
     $ref: cell.yaml#/array
   interrupt-controller:
-    oneOf:
-      - $ref: boolean.yaml
-      - $ref: nodes.yaml
+    if:
+      type: object
+      required: [type]
+    then:
+      $ref: nodes.yaml
+    else:
+      $ref: boolean.yaml
 
 dependentRequired:
   interrupt-map: ['#interrupt-cells']

dtschema/meta-schemas/keywords.yaml

@@ -171,13 +171,14 @@ properties:
   if:
     $ref: "#/definitions/sub-schemas"
   items:
-    oneOf:
-      - type: object
-        allOf:
-          - $ref: "#/definitions/sub-schemas"
-      - type: array
-        items:
-          $ref: "#/definitions/sub-schemas"
+    if:
+      type: object
+    then:
+      $ref: "#/definitions/sub-schemas"
+    else:
+      type: array
+      items:
+        $ref: "#/definitions/sub-schemas"
   maxItems:
     minimum: 1
   minItems:
@@ -230,11 +231,12 @@ properties:
   then:
     $ref: "#/definitions/sub-schemas"
   unevaluatedProperties:
-    oneOf:
-      - type: object
-        allOf:
-          - $ref: "#/definitions/sub-schemas"
-      - type: boolean
+    if:
+      type: object
+    then:
+      $ref: "#/definitions/sub-schemas"
+    else:
+      type: boolean
   uniqueItems:
     type: boolean