@rxap/schematic-angular 16.2.0-dev.22 → 16.2.0-dev.24

package/src/schematics/accordion/item/accordion-item-data-grid-component/schema.json

@@ -6,15 +6,7 @@
       "$ref": "#/definitions/angular"
     },
     {
-      "$ref": "#/definitions/accordionItem"
-    },
-    {
-      "type": "object",
-      "properties": {
-        "dataGrid": {
-          "$ref": "#/definitions/dataGrid"
-        }
-      }
+      "$ref": "#/definitions/dataGridAccordionItem"
     }
   ],
   "definitions": {
@@ -100,60 +92,13 @@
           "type": "string",
           "enum": [
             "route"
-          ],
-          "default": "route"
+          ]
         }
       },
       "required": [
         "property"
       ]
     },
-    "accordionItem": {
-      "type": "object",
-      "properties": {
-        "kind": {
-          "type": "string",
-          "enum": [
-            "default",
-            "table",
-            "data-grid",
-            "data-grid-collection",
-            "tree-table",
-            "switch"
-          ],
-          "description": "The type of the accordion item",
-          "default": "panel"
-        },
-        "modifiers": {
-          "alias": "modifier",
-          "type": "array",
-          "items": {
-            "type": "string"
-          },
-          "description": "The modifiers to apply to the accordion item type"
-        },
-        "identifier": {
-          "$ref": "#/definitions/accordionIdentifier"
-        },
-        "title": {
-          "type": "string"
-        },
-        "description": {
-          "type": "string"
-        },
-        "upstream": {
-          "$ref": "#/definitions/upstream"
-        },
-        "propertyList": {
-          "alias": "property",
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/property"
-          }
-        }
-      },
-      "additionalProperties": true
-    },
     "angular": {
       "allOf": [
         {
@@ -218,7 +163,7 @@
             },
             "kind": {
               "type": "string",
-              "const": "table-select"
+              "const": "autocomplete-table-select"
             },
             "placeholder": {
               "type": "string"
@@ -296,6 +241,47 @@
       ],
       "default": "none"
     },
+    "baseAccordionItem": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string"
+        },
+        "kind": {
+          "type": "string"
+        },
+        "modifiers": {
+          "alias": "modifier",
+          "type": "array",
+          "items": {
+            "type": "string"
+          },
+          "description": "The modifiers to apply to the accordion item type"
+        },
+        "identifier": {
+          "$ref": "#/definitions/accordionIdentifier"
+        },
+        "title": {
+          "type": "string"
+        },
+        "description": {
+          "type": "string"
+        },
+        "upstream": {
+          "$ref": "#/definitions/upstream"
+        },
+        "propertyList": {
+          "alias": "property",
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/property"
+          }
+        }
+      },
+      "required": [
+        "name"
+      ]
+    },
     "baseFormArray": {
       "allOf": [
         {
@@ -492,6 +478,30 @@
         }
       }
     },
+    "dataGridAccordionItem": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseAccordionItem"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "data-grid"
+            }
+          }
+        },
+        {
+          "type": "object",
+          "properties": {
+            "dataGrid": {
+              "$ref": "#/definitions/dataGrid"
+            }
+          }
+        }
+      ]
+    },
     "dataGridItem": {
       "type": "object",
       "properties": {
@@ -802,10 +812,7 @@
             "isArray": {
               "type": "boolean"
             }
-          },
-          "required": [
-            "name"
-          ]
+          }
         }
       ]
     },
@@ -962,6 +969,9 @@
                   "$ref": "#/definitions/upstream"
                 }
               }
+            },
+            "identifier": {
+              "$ref": "#/definitions/accordionIdentifier"
             }
           }
         }

package/src/schematics/accordion/item/accordion-item-data-grid-component/template.schema.json

@@ -6,26 +6,15 @@
       "$ref": "#/definitions/angular"
     },
     {
-      "$ref": "#/definitions/accordionItem"
-    },
-    {
-      "type": "object",
-      "properties": {
-        "dataGrid": {
-          "$ref": "#/definitions/dataGrid"
-        }
-      }
+      "$ref": "#/definitions/dataGridAccordionItem"
     }
   ],
   "definitions": {
-    "accordionItem": {
-      "$ref": "../../../accordion-item.schema.json"
+    "dataGridAccordionItem": {
+      "$ref": "../../../data-grid-accordion-item.schema.json"
     },
     "angular": {
       "$ref": "../../../angular.schema.json"
-    },
-    "dataGrid": {
-      "$ref": "../../../data-grid.schema.json"
     }
   }
 }