@rxap/schematic-angular 16.2.0-dev.14 → 16.2.0-dev.16

package/src/schematics/table/header-button/navigation-table-header-button/schema.json

@@ -3,153 +3,7 @@
   "$id": "navigation-table-header-button-schematic",
   "allOf": [
     {
-      "allOf": [
-        {
-          "allOf": [
-            {
-              "type": "object",
-              "properties": {
-                "project": {
-                  "type": "string",
-                  "description": "Project name where the files should be generated"
-                },
-                "feature": {
-                  "type": "string",
-                  "description": "Feature name where the files should be generated"
-                },
-                "overwrite": {
-                  "anyOf": [
-                    {
-                      "type": "boolean"
-                    },
-                    {
-                      "type": "array",
-                      "items": {
-                        "type": "string"
-                      }
-                    }
-                  ],
-                  "description": "Overwrite existing files",
-                  "default": false
-                },
-                "overwriteHtml": {
-                  "type": "boolean",
-                  "default": false
-                },
-                "replace": {
-                  "type": "boolean",
-                  "default": false
-                }
-              },
-              "required": [
-                "project"
-              ]
-            },
-            {
-              "type": "object",
-              "properties": {
-                "componentName": {
-                  "type": "string"
-                },
-                "name": {
-                  "type": "string"
-                },
-                "context": {
-                  "type": "string",
-                  "description": "The context use to generate proper names for class, files, etc"
-                },
-                "nestModule": {
-                  "type": "string",
-                  "description": "The module name for the table nest operations"
-                },
-                "controllerName": {
-                  "type": "string"
-                },
-                "backend": {
-                  "type": "string",
-                  "description": "The backend that should be used to handel data",
-                  "enum": [
-                    "none",
-                    "nestjs",
-                    "open-api",
-                    "local"
-                  ],
-                  "default": "none"
-                },
-                "directory": {
-                  "type": "string",
-                  "description": "A directory name or absolute path where the files should be generated. Relative to the project and feature base path if a feature is defined"
-                },
-                "shared": {
-                  "type": "boolean",
-                  "description": "Whether the generated code is used across the project",
-                  "default": false
-                },
-                "scope": {
-                  "type": "string"
-                },
-                "prefix": {
-                  "type": "string"
-                },
-                "openApi": {
-                  "type": "object",
-                  "additionalProperties": true
-                }
-              }
-            }
-          ]
-        },
-        {
-          "type": "object",
-          "properties": {
-            "permission": {
-              "type": "string"
-            },
-            "icon": {
-              "type": "string"
-            },
-            "svgIcon": {
-              "type": "string"
-            },
-            "refresh": {
-              "type": "boolean",
-              "description": "Whether the table action should refresh the table after execution",
-              "default": false
-            },
-            "confirm": {
-              "type": "boolean",
-              "description": "Whether the table action should confirm before execution",
-              "default": false
-            },
-            "tooltip": {
-              "type": "string",
-              "description": "The tooltip for the table action"
-            },
-            "errorMessage": {
-              "type": "string",
-              "description": "The error message for the table action"
-            },
-            "successMessage": {
-              "type": "string",
-              "description": "The success message for the table action"
-            },
-            "options": {
-              "type": "object",
-              "additionalProperties": true
-            }
-          }
-        },
-        {
-          "type": "object",
-          "properties": {
-            "tableName": {
-              "alias": "table",
-              "type": "string",
-              "description": "The name of the table action"
-            }
-          }
-        }
-      ]
+      "$ref": "#/definitions/tableHeaderButtonSchematic"
     },
     {
       "type": "object",
@@ -167,95 +21,161 @@
     }
   ],
   "definitions": {
-    "type": {
-      "oneOf": [
+    "tableHeaderButtonSchematic": {
+      "allOf": [
         {
-          "type": "string"
+          "$ref": "#/definitions/angular"
+        },
+        {
+          "$ref": "#/definitions/headerButton"
         },
         {
           "type": "object",
           "properties": {
-            "name": {
-              "type": "string"
-            },
-            "isTypeOnly": {
-              "type": "boolean"
-            },
-            "moduleSpecifier": {
-              "type": "string"
-            },
-            "namedImport": {
-              "type": "string"
-            },
-            "namespaceImport": {
-              "type": "string"
-            },
-            "defaultImport": {
-              "type": "string"
+            "tableName": {
+              "alias": "table",
+              "type": "string",
+              "description": "The name of the table action"
             }
-          },
-          "required": [
-            "name"
-          ]
+          }
         }
       ]
     },
-    "property": {
-      "oneOf": [
+    "angular": {
+      "allOf": [
         {
-          "type": "string"
+          "$ref": "#/definitions/general"
         },
         {
           "type": "object",
           "properties": {
+            "componentName": {
+              "type": "string"
+            },
             "name": {
               "type": "string"
             },
-            "type": {
-              "$ref": "#/definitions/type"
+            "context": {
+              "type": "string",
+              "description": "The context use to generate proper names for class, files, etc"
             },
-            "isArray": {
-              "type": "boolean"
+            "nestModule": {
+              "type": "string",
+              "description": "The module name for the table nest operations"
+            },
+            "controllerName": {
+              "type": "string"
+            },
+            "backend": {
+              "$ref": "#/definitions/backend"
+            },
+            "directory": {
+              "type": "string",
+              "description": "A directory name or absolute path where the files should be generated. Relative to the project and feature base path if a feature is defined"
+            },
+            "shared": {
+              "type": "boolean",
+              "description": "Whether the generated code is used across the project",
+              "default": false
+            },
+            "scope": {
+              "type": "string"
+            },
+            "prefix": {
+              "type": "string"
+            },
+            "openApi": {
+              "type": "object",
+              "additionalProperties": true
             }
-          },
-          "required": [
-            "name"
-          ]
+          }
         }
+      ]
+    },
+    "backend": {
+      "type": "string",
+      "description": "The backend that should be used to handel data",
+      "enum": [
+        "none",
+        "nestjs",
+        "open-api",
+        "local"
       ],
-      "definitions": {
-        "type": {
-          "oneOf": [
+      "default": "none"
+    },
+    "general": {
+      "type": "object",
+      "properties": {
+        "project": {
+          "type": "string",
+          "description": "Project name where the files should be generated"
+        },
+        "feature": {
+          "type": "string",
+          "description": "Feature name where the files should be generated"
+        },
+        "overwrite": {
+          "anyOf": [
             {
-              "type": "string"
+              "type": "boolean"
             },
             {
-              "type": "object",
-              "properties": {
-                "name": {
-                  "type": "string"
-                },
-                "isTypeOnly": {
-                  "type": "boolean"
-                },
-                "moduleSpecifier": {
-                  "type": "string"
-                },
-                "namedImport": {
-                  "type": "string"
-                },
-                "namespaceImport": {
-                  "type": "string"
-                },
-                "defaultImport": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "name"
-              ]
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             }
-          ]
+          ],
+          "description": "Overwrite existing files",
+          "default": false
+        },
+        "overwriteHtml": {
+          "type": "boolean",
+          "default": false
+        },
+        "replace": {
+          "type": "boolean",
+          "default": false
+        }
+      }
+    },
+    "headerButton": {
+      "type": "object",
+      "properties": {
+        "permission": {
+          "type": "string"
+        },
+        "icon": {
+          "type": "string"
+        },
+        "svgIcon": {
+          "type": "string"
+        },
+        "refresh": {
+          "type": "boolean",
+          "description": "Whether the table action should refresh the table after execution",
+          "default": false
+        },
+        "confirm": {
+          "type": "boolean",
+          "description": "Whether the table action should confirm before execution",
+          "default": false
+        },
+        "tooltip": {
+          "type": "string",
+          "description": "The tooltip for the table action"
+        },
+        "errorMessage": {
+          "type": "string",
+          "description": "The error message for the table action"
+        },
+        "successMessage": {
+          "type": "string",
+          "description": "The success message for the table action"
+        },
+        "options": {
+          "type": "object",
+          "additionalProperties": true
         }
       }
     }

package/src/schematics/table/header-button/navigation-table-header-button/template.schema.json

@@ -3,7 +3,7 @@
   "$id": "navigation-table-header-button-schematic",
   "allOf": [
     {
-      "$ref": "../../table-header-button/template.schema.json"
+      "$ref": "#/definitions/tableHeaderButtonSchematic"
     },
     {
       "type": "object",
@@ -21,11 +21,8 @@
     }
   ],
   "definitions": {
-    "type": {
-      "$ref": "../../../type.schema.json"
-    },
-    "property": {
-      "$ref": "../../../property.schema.json"
+    "tableHeaderButtonSchematic": {
+      "$ref": "../../table-header-button/template.schema.json"
     }
   }
 }

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

@@ -3,45 +3,27 @@
   "$id": "table-action-schematic",
   "allOf": [
     {
+      "$ref": "#/definitions/angular"
+    },
+    {
+      "$ref": "#/definitions/tableAction"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "tableName": {
+          "alias": "table",
+          "type": "string",
+          "description": "The name of the table action"
+        }
+      }
+    }
+  ],
+  "definitions": {
+    "angular": {
       "allOf": [
         {
-          "type": "object",
-          "properties": {
-            "project": {
-              "type": "string",
-              "description": "Project name where the files should be generated"
-            },
-            "feature": {
-              "type": "string",
-              "description": "Feature name where the files should be generated"
-            },
-            "overwrite": {
-              "anyOf": [
-                {
-                  "type": "boolean"
-                },
-                {
-                  "type": "array",
-                  "items": {
-                    "type": "string"
-                  }
-                }
-              ],
-              "description": "Overwrite existing files",
-              "default": false
-            },
-            "overwriteHtml": {
-              "type": "boolean",
-              "default": false
-            },
-            "replace": {
-              "type": "boolean",
-              "default": false
-            }
-          },
-          "required": [
-            "project"
-          ]
+          "$ref": "#/definitions/general"
         },
         {
           "type": "object",
@@ -64,15 +46,7 @@
               "type": "string"
             },
             "backend": {
-              "type": "string",
-              "description": "The backend that should be used to handel data",
-              "enum": [
-                "none",
-                "nestjs",
-                "open-api",
-                "local"
-              ],
-              "default": "none"
+              "$ref": "#/definitions/backend"
             },
             "directory": {
               "type": "string",
@@ -97,7 +71,7 @@
         }
       ]
     },
-    {
+    "tableAction": {
       "type": "object",
       "properties": {
         "type": {
@@ -156,107 +130,50 @@
         "type"
       ]
     },
-    {
+    "backend": {
+      "type": "string",
+      "description": "The backend that should be used to handel data",
+      "enum": [
+        "none",
+        "nestjs",
+        "open-api",
+        "local"
+      ],
+      "default": "none"
+    },
+    "general": {
       "type": "object",
       "properties": {
-        "tableName": {
-          "alias": "table",
+        "project": {
           "type": "string",
-          "description": "The name of the table action"
-        }
-      }
-    }
-  ],
-  "definitions": {
-    "type": {
-      "oneOf": [
-        {
-          "type": "string"
+          "description": "Project name where the files should be generated"
         },
-        {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "isTypeOnly": {
-              "type": "boolean"
-            },
-            "moduleSpecifier": {
-              "type": "string"
-            },
-            "namedImport": {
-              "type": "string"
-            },
-            "namespaceImport": {
-              "type": "string"
-            },
-            "defaultImport": {
-              "type": "string"
-            }
-          },
-          "required": [
-            "name"
-          ]
-        }
-      ]
-    },
-    "property": {
-      "oneOf": [
-        {
-          "type": "string"
+        "feature": {
+          "type": "string",
+          "description": "Feature name where the files should be generated"
         },
-        {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "type": {
-              "$ref": "#/definitions/type"
-            },
-            "isArray": {
-              "type": "boolean"
-            }
-          },
-          "required": [
-            "name"
-          ]
-        }
-      ],
-      "definitions": {
-        "type": {
-          "oneOf": [
+        "overwrite": {
+          "anyOf": [
             {
-              "type": "string"
+              "type": "boolean"
             },
             {
-              "type": "object",
-              "properties": {
-                "name": {
-                  "type": "string"
-                },
-                "isTypeOnly": {
-                  "type": "boolean"
-                },
-                "moduleSpecifier": {
-                  "type": "string"
-                },
-                "namedImport": {
-                  "type": "string"
-                },
-                "namespaceImport": {
-                  "type": "string"
-                },
-                "defaultImport": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "name"
-              ]
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             }
-          ]
+          ],
+          "description": "Overwrite existing files",
+          "default": false
+        },
+        "overwriteHtml": {
+          "type": "boolean",
+          "default": false
+        },
+        "replace": {
+          "type": "boolean",
+          "default": false
         }
       }
     }

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

@@ -3,10 +3,10 @@
   "$id": "table-action-schematic",
   "allOf": [
     {
-      "$ref": "../../angular.schema.json"
+      "$ref": "#/definitions/angular"
     },
     {
-      "$ref": "../../table-action.schema.json"
+      "$ref": "#/definitions/tableAction"
     },
     {
       "type": "object",
@@ -20,11 +20,11 @@
     }
   ],
   "definitions": {
-    "type": {
-      "$ref": "../../type.schema.json"
+    "angular": {
+      "$ref": "../../angular.schema.json"
     },
-    "property": {
-      "$ref": "../../property.schema.json"
+    "tableAction": {
+      "$ref": "../../table-action.schema.json"
     }
   }
 }

package/src/schematics/table/table-component/index.d.ts

@@ -1,5 +1,5 @@
 import { Rule } from '@angular-devkit/schematics';
-import { FormDefinitionControl, GetPageOperationProperty } from '@rxap/schematics-ts-morph';
+import { FormDefinitionControl } from '@rxap/schematics-ts-morph';
 import { NormalizedDataProperty } from '@rxap/ts-morph';
 import { Normalized } from '@rxap/utilities';
 import { NormalizedAngularOptions } from '../../../lib/angular-options';
@@ -11,6 +11,14 @@ export interface NormalizedTableComponentOptions extends Readonly<Normalized<Omi
     readonly controllerName: string;
 }
 export declare function NormalizeTableComponentOptions(options: Readonly<TableComponentOptions>): NormalizedTableComponentOptions;
-export declare function TableColumnListAndPropertyListToGetPageOperationPropertyList(columnList: ReadonlyArray<Pick<NormalizedTableColumn, 'name' | 'type' | 'propertyPath'>>, propertyList?: ReadonlyArray<NormalizedDataProperty>): GetPageOperationProperty[];
+/**
+ * // TODO : refactor
+ * Options 1: remove this function and create the propertyList in the normalize functions
+ * Options 1: use the CoerceArrayItems function with merge = true
+ * @param columnList
+ * @param propertyList
+ * @constructor
+ */
+export declare function TableColumnListAndPropertyListToGetPageOperationPropertyList(columnList: ReadonlyArray<Pick<NormalizedTableColumn, 'name' | 'type' | 'propertyPath' | 'isArray'>>, propertyList?: ReadonlyArray<NormalizedDataProperty>): NormalizedDataProperty[];
 export declare function TableColumnToFormControl(column: NormalizedTableColumn): FormDefinitionControl;
 export default function (options: TableComponentOptions): () => Rule;