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

package/src/schematics/table/action/navigation-table-action/schema.json

@@ -21,26 +21,6 @@
     }
   ],
   "definitions": {
-    "tableActionSchematic": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/angular"
-        },
-        {
-          "$ref": "#/definitions/tableAction"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "tableName": {
-              "alias": "table",
-              "type": "string",
-              "description": "The name of the table action"
-            }
-          }
-        }
-      ]
-    },
     "angular": {
       "allOf": [
         {
@@ -197,6 +177,26 @@
       "required": [
         "type"
       ]
+    },
+    "tableActionSchematic": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/angular"
+        },
+        {
+          "$ref": "#/definitions/tableAction"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "tableName": {
+              "alias": "table",
+              "type": "string",
+              "description": "The name of the table action"
+            }
+          }
+        }
+      ]
     }
   }
 }

package/src/schematics/table/action/open-api-table-action/schema.json

@@ -49,26 +49,6 @@
     }
   ],
   "definitions": {
-    "tableActionSchematic": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/angular"
-        },
-        {
-          "$ref": "#/definitions/tableAction"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "tableName": {
-              "alias": "table",
-              "type": "string",
-              "description": "The name of the table action"
-            }
-          }
-        }
-      ]
-    },
     "angular": {
       "allOf": [
         {
@@ -225,6 +205,26 @@
       "required": [
         "type"
       ]
+    },
+    "tableActionSchematic": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/angular"
+        },
+        {
+          "$ref": "#/definitions/tableAction"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "tableName": {
+              "alias": "table",
+              "type": "string",
+              "description": "The name of the table action"
+            }
+          }
+        }
+      ]
     }
   }
 }

package/src/schematics/table/action/operation-table-action/schema.json

@@ -7,26 +7,6 @@
     }
   ],
   "definitions": {
-    "tableActionSchematic": {
-      "allOf": [
-        {
-          "$ref": "#/definitions/angular"
-        },
-        {
-          "$ref": "#/definitions/tableAction"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "tableName": {
-              "alias": "table",
-              "type": "string",
-              "description": "The name of the table action"
-            }
-          }
-        }
-      ]
-    },
     "angular": {
       "allOf": [
         {
@@ -183,6 +163,26 @@
       "required": [
         "type"
       ]
+    },
+    "tableActionSchematic": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/angular"
+        },
+        {
+          "$ref": "#/definitions/tableAction"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "tableName": {
+              "alias": "table",
+              "type": "string",
+              "description": "The name of the table action"
+            }
+          }
+        }
+      ]
     }
   }
 }

package/src/schematics/table/header-button/form-table-header-button/index.d.ts

@@ -1,7 +1,7 @@
 import { Rule, Tree } from '@angular-devkit/schematics';
 import { Normalized } from '@rxap/utilities';
 import { NormalizedAngularOptions } from '../../../../lib/angular-options';
-import { NormalizedFormComponentControl } from '../../../../lib/form-component-control';
+import { NormalizedControl } from '../../../../lib/form/control';
 import { NormalizedTableHeaderButton } from '../../../../lib/table-header-button';
 import { FormTableHeaderButtonOptions } from './schema';
 export interface NormalizedFormTableHeaderButtonOptions extends Omit<Readonly<Normalized<FormTableHeaderButtonOptions> & NormalizedAngularOptions & NormalizedTableHeaderButton>, 'formOptions'> {
@@ -9,7 +9,7 @@ export interface NormalizedFormTableHeaderButtonOptions extends Omit<Readonly<No
     controllerName: string;
     formComponent: string;
     formOptions: {
-        controlList: ReadonlyArray<NormalizedFormComponentControl>;
+        controlList: ReadonlyArray<NormalizedControl>;
         role: string | null;
         window: boolean;
     };

package/src/schematics/table/header-button/form-table-header-button/index.js

@@ -8,7 +8,7 @@ const utilities_1 = require("@rxap/utilities");
 const ts_morph_1 = require("ts-morph");
 const angular_options_1 = require("../../../../lib/angular-options");
 const assert_table_component_exists_1 = require("../../../../lib/assert-table-component-exists");
-const form_component_control_1 = require("../../../../lib/form-component-control");
+const control_1 = require("../../../../lib/form/control");
 const index_1 = require("../../table-header-button/index");
 function NormalizeFormTableHeaderButtonOptions(options) {
     var _a, _b, _c, _d, _e;
@@ -22,7 +22,7 @@ function NormalizeFormTableHeaderButtonOptions(options) {
         }), formComponent: (0, utilities_1.CoerceSuffix)((0, utilities_1.dasherize)((_b = options.formComponent) !== null && _b !== void 0 ? _b : tableName.replace(/-table$/, '')), '-form'), customComponent: (_c = options.customComponent) !== null && _c !== void 0 ? _c : false, formOptions: {
             window: (_d = formOptions.window) !== null && _d !== void 0 ? _d : true,
             role: (_e = formOptions.role) !== null && _e !== void 0 ? _e : null,
-            controlList: (0, form_component_control_1.NormalizeFormComponentControlList)(formOptions.controlList),
+            controlList: (0, control_1.NormalizeControlList)(formOptions.controlList),
         } }));
 }
 exports.NormalizeFormTableHeaderButtonOptions = NormalizeFormTableHeaderButtonOptions;

package/src/schematics/table/header-button/form-table-header-button/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../packages/schematic/angular/src/schematics/table/header-button/form-table-header-button/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../../packages/schematic/angular/src/schematics/table/header-button/form-table-header-button/index.ts"],"names":[],"mappings":"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"}

package/src/schematics/table/header-button/form-table-header-button/schema.d.ts

@@ -1,4 +1,4 @@
-import { FormComponentControl } from '../../../../lib/form-component-control';
+import { Control } from '../../../../lib/form/control';
 import { TableHeaderButtonOptions } from '../../table-header-button/schema';
 
 
@@ -8,7 +8,7 @@ export interface FormTableHeaderButtonOptions extends TableHeaderButtonOptions {
   formComponent?: string;
   customComponent: boolean;
   formOptions?: {
-    controlList?: Array<FormComponentControl>;
+    controlList?: Array<Control>;
     role?: string;
     window?: boolean;
   };