@rxap/schematic-angular 16.2.0-dev.53 → 16.2.0-dev.54

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [16.2.0-dev.54](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.53...@rxap/schematic-angular@16.2.0-dev.54) (2024-04-04)
+
+### Bug Fixes
+
+- add missing kind required flags ([2fa1de9](https://gitlab.com/rxap/packages/commit/2fa1de9f79851d5025b7948d3eb560ea0b81dc77))
+- add missing kind required flags ([7a803a6](https://gitlab.com/rxap/packages/commit/7a803a613413ad6b98513b20eddc2dd39b428836))
+- set table column default types ([1195f5e](https://gitlab.com/rxap/packages/commit/1195f5ec8764987e4a55bb15267a98e7a9e134e4))
+
+### Features
+
+- add table column type custom ([8026ccb](https://gitlab.com/rxap/packages/commit/8026ccb0d096fdd67f05315e68d8c049b739e91c))
+
 # [16.2.0-dev.53](https://gitlab.com/rxap/packages/compare/@rxap/schematic-angular@16.2.0-dev.52...@rxap/schematic-angular@16.2.0-dev.53) (2024-03-31)
 
 **Note:** Version bump only for package @rxap/schematic-angular

package/README.md

@@ -17,5 +17,5 @@ yarn add @rxap/schematic-angular
 ```
 **Install peer dependencies:**
 ```bash
-yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.1.0-dev.24 @rxap/schematics-utilities@^16.0.1-dev.3 @rxap/ts-morph@^1.1.0-dev.22 @rxap/utilities@^16.1.0-dev.8 @rxap/workspace-utilities@^16.1.0-dev.5 ts-morph@^18.0.0 tslib@2.6.2 
+yarn add @angular-devkit/core@^16.1.4 @angular-devkit/schematics@^16.1.4 @rxap/schematics-ts-morph@^16.1.0-dev.24 @rxap/schematics-utilities@^16.0.1-dev.3 @rxap/ts-morph@^1.1.0-dev.22 @rxap/utilities@^16.1.0-dev.8 @rxap/workspace-utilities@^16.1.0-dev.6 ts-morph@^18.0.0 tslib@2.6.2 
 ```

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "16.2.0-dev.53",
+  "version": "16.2.0-dev.54",
   "name": "@rxap/schematic-angular",
   "license": "GPL-3.0-or-later",
   "dependencies": {
@@ -18,7 +18,7 @@
     "@rxap/schematics-utilities": "^16.0.1-dev.3",
     "@rxap/ts-morph": "^1.1.0-dev.22",
     "@rxap/utilities": "^16.1.0-dev.8",
-    "@rxap/workspace-utilities": "^16.1.0-dev.5",
+    "@rxap/workspace-utilities": "^16.1.0-dev.6",
     "ts-morph": "^18.0.0",
     "tslib": "2.6.2",
     "@rxap/node-utilities": "1.2.0-dev.1",
@@ -33,7 +33,7 @@
     "url": "https://gitlab.com/rxap/packages/-/issues",
     "email": "incoming+rxap-packages-14898188-issue-@incoming.gitlab.com"
   },
-  "gitHead": "3d9ffb7ce9e258b17048b897e941200d1caa64dc",
+  "gitHead": "aa7d06c491b0b7220e7a57c5ec4e6110b6a75398",
   "homepage": "https:/gitlab.com/rxap/packages/packages/schematic/angular",
   "keywords": [
     "angular",
@@ -62,7 +62,7 @@
       },
       {
         "package": "@rxap/workspace-utilities",
-        "version": "16.1.0-dev.5"
+        "version": "16.1.0-dev.6"
       }
     ]
   },

package/src/lib/table/column/boolean-table-column.d.ts

@@ -0,0 +1,8 @@
+import { Normalized } from '@rxap/utilities';
+import { TableColumnKind } from '../table-column-kind';
+import { BaseTableColumn, NormalizedBaseTableColumn } from './base-table-column';
+export type BooleanTableColumn = BaseTableColumn;
+export interface NormalizedBooleanTableColumn extends Readonly<Normalized<Omit<BooleanTableColumn, keyof BaseTableColumn>> & NormalizedBaseTableColumn> {
+    kind: TableColumnKind.BOOLEAN;
+}
+export declare function NormalizeBooleanTableColumn(column: Readonly<BooleanTableColumn>): NormalizedBooleanTableColumn;

package/src/lib/table/column/boolean-table-column.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NormalizeBooleanTableColumn = void 0;
+const table_column_kind_1 = require("../table-column-kind");
+const base_table_column_1 = require("./base-table-column");
+function NormalizeBooleanTableColumn(column) {
+    return Object.assign(Object.assign({}, (0, base_table_column_1.NormalizeBaseTableColumn)(Object.assign({ type: 'boolean' }, column))), { kind: table_column_kind_1.TableColumnKind.BOOLEAN });
+}
+exports.NormalizeBooleanTableColumn = NormalizeBooleanTableColumn;
+//# sourceMappingURL=boolean-table-column.js.map

package/src/lib/table/column/boolean-table-column.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"boolean-table-column.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/lib/table/column/boolean-table-column.ts"],"names":[],"mappings":";;;AACA,4DAAuD;AACvD,2DAI6B;AAQ7B,SAAgB,2BAA2B,CACzC,MAAoC;IAEpC,uCACK,IAAA,4CAAwB,kBACzB,IAAI,EAAE,SAAS,IACZ,MAAM,EACT,KACF,IAAI,EAAE,mCAAe,CAAC,OAAO,IAC7B;AACJ,CAAC;AAVD,kEAUC"}

package/src/lib/table/column/custom-table-column.d.ts

@@ -0,0 +1,11 @@
+import { Normalized } from '@rxap/utilities';
+import { TableColumnKind } from '../table-column-kind';
+import { BaseTableColumn, NormalizedBaseTableColumn } from './base-table-column';
+export interface CustomTableColumn extends BaseTableColumn {
+    html?: string;
+}
+export interface NormalizedCustomTableColumn extends Readonly<Normalized<Omit<CustomTableColumn, keyof BaseTableColumn>> & NormalizedBaseTableColumn> {
+    html: string;
+    kind: TableColumnKind.CUSTOM;
+}
+export declare function NormalizeCustomTableColumn(column: Readonly<CustomTableColumn>): NormalizedCustomTableColumn;

package/src/lib/table/column/custom-table-column.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NormalizeCustomTableColumn = void 0;
+const table_column_kind_1 = require("../table-column-kind");
+const base_table_column_1 = require("./base-table-column");
+function NormalizeCustomTableColumn(column) {
+    var _a;
+    return Object.assign(Object.assign({}, (0, base_table_column_1.NormalizeBaseTableColumn)(column)), { kind: table_column_kind_1.TableColumnKind.CUSTOM, html: (_a = column.html) !== null && _a !== void 0 ? _a : 'TODO: set html property' });
+}
+exports.NormalizeCustomTableColumn = NormalizeCustomTableColumn;
+//# sourceMappingURL=custom-table-column.js.map

package/src/lib/table/column/custom-table-column.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"custom-table-column.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/lib/table/column/custom-table-column.ts"],"names":[],"mappings":";;;AACA,4DAAuD;AACvD,2DAI6B;AAW7B,SAAgB,0BAA0B,CACxC,MAAmC;;IAEnC,uCACK,IAAA,4CAAwB,EAAC,MAAM,CAAC,KACnC,IAAI,EAAE,mCAAe,CAAC,MAAM,EAC5B,IAAI,EAAE,MAAA,MAAM,CAAC,IAAI,mCAAI,yBAAyB,IAC9C;AACJ,CAAC;AARD,gEAQC"}

package/src/lib/table/column/date-table-column.js

@@ -5,7 +5,7 @@ const table_column_kind_1 = require("../table-column-kind");
 const base_table_column_1 = require("./base-table-column");
 function NormalizeDateTableColumn(column) {
     var _a;
-    return Object.assign(Object.assign({}, (0, base_table_column_1.NormalizeBaseTableColumn)(column)), { kind: table_column_kind_1.TableColumnKind.DATE, format: (_a = column.format) !== null && _a !== void 0 ? _a : 'dd.MM.yyyy HH:mm:ss' });
+    return Object.assign(Object.assign({}, (0, base_table_column_1.NormalizeBaseTableColumn)(Object.assign({ type: 'number | Date' }, column))), { kind: table_column_kind_1.TableColumnKind.DATE, format: (_a = column.format) !== null && _a !== void 0 ? _a : 'dd.MM.yyyy HH:mm:ss' });
 }
 exports.NormalizeDateTableColumn = NormalizeDateTableColumn;
 //# sourceMappingURL=date-table-column.js.map

package/src/lib/table/column/date-table-column.js.map

@@ -1 +1 @@
-{"version":3,"file":"date-table-column.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/lib/table/column/date-table-column.ts"],"names":[],"mappings":";;;AACA,4DAAuD;AACvD,2DAI6B;AAW7B,SAAgB,wBAAwB,CACtC,MAAiC;;IAEjC,uCACK,IAAA,4CAAwB,EAAC,MAAM,CAAC,KACnC,IAAI,EAAE,mCAAe,CAAC,IAAI,EAC1B,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,qBAAqB,IAC9C;AACJ,CAAC;AARD,4DAQC"}
+{"version":3,"file":"date-table-column.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/lib/table/column/date-table-column.ts"],"names":[],"mappings":";;;AACA,4DAAuD;AACvD,2DAI6B;AAW7B,SAAgB,wBAAwB,CACtC,MAAiC;;IAEjC,uCACK,IAAA,4CAAwB,kBACzB,IAAI,EAAE,eAAe,IAClB,MAAM,EACT,KACF,IAAI,EAAE,mCAAe,CAAC,IAAI,EAC1B,MAAM,EAAE,MAAA,MAAM,CAAC,MAAM,mCAAI,qBAAqB,IAC9C;AACJ,CAAC;AAXD,4DAWC"}

package/src/lib/table/table-column-kind.d.ts

@@ -1,6 +1,7 @@
 export declare enum TableColumnKind {
     DEFAULT = "default",
     DATE = "date",
+    CUSTOM = "custom",
     LINK = "link",
     ICON = "icon",
     BOOLEAN = "boolean",

package/src/lib/table/table-column-kind.js

@@ -5,6 +5,7 @@ var TableColumnKind;
 (function (TableColumnKind) {
     TableColumnKind["DEFAULT"] = "default";
     TableColumnKind["DATE"] = "date";
+    TableColumnKind["CUSTOM"] = "custom";
     TableColumnKind["LINK"] = "link";
     TableColumnKind["ICON"] = "icon";
     TableColumnKind["BOOLEAN"] = "boolean";

package/src/lib/table/table-column-kind.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-column-kind.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/angular/src/lib/table/table-column-kind.ts"],"names":[],"mappings":";;;AAAA,IAAY,eAUX;AAVD,WAAY,eAAe;IACzB,sCAAmB,CAAA;IACnB,gCAAa,CAAA;IACb,gCAAa,CAAA;IACb,gCAAa,CAAA;IACb,sCAAmB,CAAA;IACnB,0CAAuB,CAAA;IACvB,0DAAuC,CAAA;IACvC,gCAAa,CAAA;IACb,sCAAmB,CAAA;AACrB,CAAC,EAVW,eAAe,+BAAf,eAAe,QAU1B;AAED,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,KAAwB,CAAC,CAAC;AAC3E,CAAC;AAFD,8CAEC"}
+{"version":3,"file":"table-column-kind.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/angular/src/lib/table/table-column-kind.ts"],"names":[],"mappings":";;;AAAA,IAAY,eAWX;AAXD,WAAY,eAAe;IACzB,sCAAmB,CAAA;IACnB,gCAAa,CAAA;IACb,oCAAiB,CAAA;IACjB,gCAAa,CAAA;IACb,gCAAa,CAAA;IACb,sCAAmB,CAAA;IACnB,0CAAuB,CAAA;IACvB,0DAAuC,CAAA;IACvC,gCAAa,CAAA;IACb,sCAAmB,CAAA;AACrB,CAAC,EAXW,eAAe,+BAAf,eAAe,QAW1B;AAED,SAAgB,iBAAiB,CAAC,KAAa;IAC7C,OAAO,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,KAAwB,CAAC,CAAC;AAC3E,CAAC;AAFD,8CAEC"}

package/src/lib/table/table-column.js

@@ -2,12 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NormalizeTableColumnList = exports.NormalizeTableColumn = void 0;
 const base_table_column_1 = require("./column/base-table-column");
+const boolean_table_column_1 = require("./column/boolean-table-column");
+const custom_table_column_1 = require("./column/custom-table-column");
 const date_table_column_1 = require("./column/date-table-column");
 const table_column_kind_1 = require("./table-column-kind");
 function NormalizeTableColumn(column) {
     switch (column.kind) {
         case table_column_kind_1.TableColumnKind.DATE:
             return (0, date_table_column_1.NormalizeDateTableColumn)(column);
+        case table_column_kind_1.TableColumnKind.CUSTOM:
+            return (0, custom_table_column_1.NormalizeCustomTableColumn)(column);
+        case table_column_kind_1.TableColumnKind.BOOLEAN:
+            return (0, boolean_table_column_1.NormalizeBooleanTableColumn)(column);
         case table_column_kind_1.TableColumnKind.DEFAULT:
         default:
             return (0, base_table_column_1.NormalizeBaseTableColumn)(column);

package/src/lib/table/table-column.js.map

@@ -1 +1 @@
-{"version":3,"file":"table-column.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/angular/src/lib/table/table-column.ts"],"names":[],"mappings":";;;AAAA,kEAIoC;AACpC,kEAIoC;AACpC,2DAAsD;AAMtD,SAAgB,oBAAoB,CAClC,MAA6B;IAE7B,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,mCAAe,CAAC,IAAI;YACvB,OAAO,IAAA,4CAAwB,EAAC,MAAM,CAAC,CAAC;QAC1C,KAAK,mCAAe,CAAC,OAAO,CAAC;QAC7B;YACE,OAAO,IAAA,4CAAwB,EAAC,MAAM,CAAC,CAAC;KAC3C;AACH,CAAC;AAVD,oDAUC;AAED,SAAgB,wBAAwB,CACtC,UAAiD;;IAEjD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,oBAAoB,CAAC,mCAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC/E,IAAI,CAAC,CAAC,WAAW,EAAE;YACjB,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/B;QACD,IAAI,CAAC,CAAC,SAAS,EAAE;YACf,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC,CAAC;AACN,CAAC;AAZD,4DAYC"}
+{"version":3,"file":"table-column.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/angular/src/lib/table/table-column.ts"],"names":[],"mappings":";;;AAAA,kEAIoC;AACpC,wEAA4E;AAC5E,sEAA0E;AAC1E,kEAIoC;AACpC,2DAAsD;AAMtD,SAAgB,oBAAoB,CAClC,MAA6B;IAE7B,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,mCAAe,CAAC,IAAI;YACvB,OAAO,IAAA,4CAAwB,EAAC,MAAM,CAAC,CAAC;QAC1C,KAAK,mCAAe,CAAC,MAAM;YACzB,OAAO,IAAA,gDAA0B,EAAC,MAAM,CAAC,CAAC;QAC5C,KAAK,mCAAe,CAAC,OAAO;YAC1B,OAAO,IAAA,kDAA2B,EAAC,MAAM,CAAC,CAAC;QAC7C,KAAK,mCAAe,CAAC,OAAO,CAAC;QAC7B;YACE,OAAO,IAAA,4CAAwB,EAAC,MAAM,CAAC,CAAC;KAC3C;AACH,CAAC;AAdD,oDAcC;AAED,SAAgB,wBAAwB,CACtC,UAAiD;;IAEjD,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,MAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,GAAG,CAAC,oBAAoB,CAAC,mCAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QAC/E,IAAI,CAAC,CAAC,WAAW,EAAE;YACjB,OAAO,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC/B;QACD,IAAI,CAAC,CAAC,SAAS,EAAE;YACf,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SAC5B;QACD,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC,CAAC;AACN,CAAC;AAZD,4DAYC"}

package/src/schema.json

@@ -415,7 +415,10 @@
                 }
               }
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -658,7 +661,10 @@
               "type": "string",
               "const": "boolean"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -704,7 +710,10 @@
                 "after"
               ]
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -734,7 +743,10 @@
               "type": "string",
               "const": "component"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -763,7 +775,10 @@
               "type": "string",
               "const": "copy-to-clipboard"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -799,6 +814,29 @@
         }
       ]
     },
+    "customTableColumn": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseTableColumn"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "custom"
+            },
+            "html": {
+              "type": "string"
+            }
+          },
+          "required": [
+            "kind",
+            "html"
+          ]
+        }
+      ]
+    },
     "dataGrid": {
       "type": "object",
       "properties": {
@@ -861,7 +899,10 @@
               "type": "string",
               "const": "data-grid"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         },
         {
           "type": "object",
@@ -940,7 +981,10 @@
             "format": {
               "type": "string"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -1059,7 +1103,10 @@
               "type": "string",
               "const": "array"
             }
-          }
+          },
+          "required": [
+            "role"
+          ]
         },
         {
           "oneOf": [
@@ -1073,7 +1120,8 @@
                   "properties": {
                     "kind": {
                       "type": "string",
-                      "const": "default"
+                      "const": "default",
+                      "default": "default"
                     }
                   }
                 }
@@ -1175,7 +1223,8 @@
                   "properties": {
                     "kind": {
                       "type": "string",
-                      "const": "default"
+                      "const": "default",
+                      "default": "default"
                     }
                   }
                 }
@@ -1293,7 +1342,10 @@
               "type": "string",
               "const": "group"
             }
-          }
+          },
+          "required": [
+            "role"
+          ]
         },
         {
           "oneOf": [
@@ -1307,7 +1359,8 @@
                   "properties": {
                     "kind": {
                       "type": "string",
-                      "const": "default"
+                      "const": "default",
+                      "default": "default"
                     }
                   }
                 }
@@ -1516,7 +1569,10 @@
               "type": "string",
               "const": "icon"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -1565,7 +1621,10 @@
             "placeholder": {
               "type": "string"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -1604,7 +1663,10 @@
               "type": "string",
               "const": "link"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -2395,7 +2457,10 @@
               "type": "boolean",
               "description": "Whether the select form control is multiple mode"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -2441,7 +2506,10 @@
                 "after"
               ]
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -2457,7 +2525,10 @@
               "type": "string",
               "const": "spinner"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -2533,7 +2604,10 @@
                 "property"
               ]
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -2612,7 +2686,10 @@
             "table": {
               "$ref": "#/definitions/table"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -2707,7 +2784,8 @@
               "properties": {
                 "kind": {
                   "type": "string",
-                  "const": "default"
+                  "const": "default",
+                  "default": "default"
                 }
               }
             }
@@ -2716,6 +2794,9 @@
         {
           "$ref": "#/definitions/dateTableColumn"
         },
+        {
+          "$ref": "#/definitions/customTableColumn"
+        },
         {
           "$ref": "#/definitions/linkTableColumn"
         },
@@ -2848,7 +2929,10 @@
             "identifier": {
               "$ref": "#/definitions/accordionIdentifier"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -2904,7 +2988,10 @@
                 }
               }
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -3000,7 +3087,10 @@
             "table": {
               "$ref": "#/definitions/treeTable"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },
@@ -3016,7 +3106,10 @@
               "type": "string",
               "const": "tree"
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
     },