@rxap/schematic-angular 16.2.0-dev.9 → 16.3.0-dev.0

package/src/schematics/form/control/input-form-control/schema.json

@@ -3,101 +3,30 @@
   "$id": "input-form-control-schematic",
   "allOf": [
     {
+      "$ref": "#/definitions/angular"
+    },
+    {
+      "$ref": "#/definitions/inputFormControl"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "formName": {
+          "alias": "form",
+          "type": "string",
+          "description": "The name of the form where the form control should be added"
+        }
+      },
+      "required": [
+        "formName"
+      ]
+    }
+  ],
+  "definitions": {
+    "abstractControl": {
       "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
-                }
-              }
-            }
-          ]
+          "$ref": "#/definitions/property"
         },
         {
           "type": "object",
@@ -106,9 +35,6 @@
               "type": "string",
               "description": "The name of the control"
             },
-            "type": {
-              "$ref": "#/definitions/type"
-            },
             "isArray": {
               "type": "boolean",
               "description": "Whether the control value is an array",
@@ -141,49 +67,243 @@
             },
             "kind": {
               "type": "string",
-              "description": "The name of the template",
+              "description": "The kind of the control",
+              "default": "default"
+            },
+            "importList": {
+              "type": "array",
+              "items": {
+                "$ref": "#/definitions/type"
+              }
+            },
+            "template": {
+              "type": "string",
+              "description": "The template of the control"
+            },
+            "role": {
+              "type": "string",
+              "description": "The role of the control",
               "enum": [
-                "default",
-                "input",
-                "select",
-                "checkbox",
-                "autocomplete-table-select",
-                "table-select",
-                "textarea",
-                "slide-toggle"
+                "control",
+                "group",
+                "array"
               ],
-              "default": "default"
+              "default": "control"
             }
           },
-          "required": [
-            "name"
-          ],
           "additionalProperties": true
+        }
+      ]
+    },
+    "angular": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/general"
         },
         {
           "type": "object",
           "properties": {
-            "formName": {
-              "alias": "form",
+            "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 name of the form where the form control should be added",
-              "x-prompt": "Enter the name of the form where the form control should be added"
+              "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": [
-            "formName"
-          ]
+          }
         }
       ]
     },
-    {
+    "backend": {
+      "type": "string",
+      "description": "The backend that should be used to handel data",
+      "enum": [
+        "none",
+        "nestjs",
+        "open-api",
+        "local",
+        "data-source"
+      ],
+      "default": "none"
+    },
+    "baseFormControl": {
       "allOf": [
         {
-          "$ref": "#/allOf/0/allOf/1"
+          "$ref": "#/definitions/abstractControl"
         },
         {
           "type": "object",
           "properties": {
+            "label": {
+              "type": "string",
+              "description": "The label of the control"
+            },
+            "role": {
+              "type": "string",
+              "const": "control"
+            }
+          }
+        }
+      ]
+    },
+    "button": {
+      "type": "object",
+      "properties": {
+        "svgIcon": {
+          "type": "string"
+        },
+        "icon": {
+          "type": "string"
+        },
+        "directiveList": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/type"
+          }
+        },
+        "importList": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/type"
+          }
+        }
+      }
+    },
+    "cssClass": {
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            }
+          }
+        },
+        {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string"
+              }
+            }
+          }
+        }
+      ]
+    },
+    "formField": {
+      "type": "object",
+      "properties": {
+        "label": {
+          "type": "string"
+        },
+        "prefixButton": {
+          "$ref": "#/definitions/button"
+        },
+        "suffixButton": {
+          "$ref": "#/definitions/button"
+        },
+        "hasClearButton": {
+          "type": "boolean"
+        },
+        "cssClass": {
+          "$ref": "#/definitions/cssClass"
+        }
+      }
+    },
+    "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": "boolean"
+            },
+            {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          ],
+          "description": "Overwrite existing files",
+          "default": false
+        },
+        "overwriteHtml": {
+          "type": "boolean",
+          "default": false
+        },
+        "replace": {
+          "type": "boolean",
+          "default": false
+        }
+      }
+    },
+    "inputFormControl": {
+      "allOf": [
+        {
+          "$ref": "#/definitions/baseFormControl"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "const": "input"
+            },
+            "formField": {
+              "$ref": "#/definitions/formField"
+            },
             "inputType": {
               "type": "string",
               "enum": [
@@ -213,31 +333,15 @@
             },
             "placeholder": {
               "type": "string"
-            },
-            "formField": {
-              "type": "object",
-              "properties": {
-                "label": {
-                  "type": "string"
-                },
-                "prefixButton": {
-                  "$ref": "#/definitions/button"
-                },
-                "suffixButton": {
-                  "$ref": "#/definitions/button"
-                },
-                "hasClearButton": {
-                  "type": "boolean"
-                }
-              }
             }
-          }
+          },
+          "required": [
+            "kind"
+          ]
         }
       ]
-    }
-  ],
-  "definitions": {
-    "type": {
+    },
+    "property": {
       "oneOf": [
         {
           "type": "string"
@@ -248,29 +352,29 @@
             "name": {
               "type": "string"
             },
-            "isTypeOnly": {
-              "type": "boolean"
+            "type": {
+              "$ref": "#/definitions/type"
             },
-            "moduleSpecifier": {
-              "type": "string"
+            "isArray": {
+              "type": "boolean"
             },
-            "namedImport": {
-              "type": "string"
+            "isRequired": {
+              "type": "boolean"
             },
-            "namespaceImport": {
+            "source": {
               "type": "string"
             },
-            "defaultImport": {
-              "type": "string"
+            "memberList": {
+              "type": "array",
+              "items": {
+                "additionalProperties": true
+              }
             }
-          },
-          "required": [
-            "name"
-          ]
+          }
         }
       ]
     },
-    "property": {
+    "type": {
       "oneOf": [
         {
           "type": "string"
@@ -281,108 +385,27 @@
             "name": {
               "type": "string"
             },
-            "type": {
-              "$ref": "#/definitions/type"
-            }
-          },
-          "required": [
-            "name"
-          ]
-        }
-      ],
-      "definitions": {
-        "type": {
-          "oneOf": [
-            {
+            "isTypeOnly": {
+              "type": "boolean"
+            },
+            "moduleSpecifier": {
               "type": "string"
             },
-            {
-              "type": "object",
-              "properties": {
-                "name": {
-                  "type": "string"
-                },
-                "isTypeOnly": {
-                  "type": "boolean"
-                },
-                "moduleSpecifier": {
-                  "type": "string"
-                },
-                "namedImport": {
-                  "type": "string"
-                },
-                "namespaceImport": {
-                  "type": "string"
-                },
-                "defaultImport": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "name"
-              ]
-            }
-          ]
-        }
-      }
-    },
-    "button": {
-      "type": "object",
-      "properties": {
-        "svgIcon": {
-          "type": "string"
-        },
-        "icon": {
-          "type": "string"
-        },
-        "directiveList": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/type"
-          }
-        },
-        "importList": {
-          "type": "array",
-          "items": {
-            "$ref": "#/definitions/type"
-          }
-        }
-      },
-      "definitions": {
-        "type": {
-          "oneOf": [
-            {
+            "namedImport": {
               "type": "string"
             },
-            {
-              "type": "object",
-              "properties": {
-                "name": {
-                  "type": "string"
-                },
-                "isTypeOnly": {
-                  "type": "boolean"
-                },
-                "moduleSpecifier": {
-                  "type": "string"
-                },
-                "namedImport": {
-                  "type": "string"
-                },
-                "namespaceImport": {
-                  "type": "string"
-                },
-                "defaultImport": {
-                  "type": "string"
-                }
-              },
-              "required": [
-                "name"
-              ]
+            "namespaceImport": {
+              "type": "string"
+            },
+            "defaultImport": {
+              "type": "string"
             }
+          },
+          "required": [
+            "name"
           ]
         }
-      }
+      ]
     }
   }
 }

package/src/schematics/form/control/input-form-control/template.schema.json

@@ -3,21 +3,31 @@
   "$id": "input-form-control-schematic",
   "allOf": [
     {
-      "$ref": "../../form-control/template.schema.json"
+      "$ref": "#/definitions/angular"
     },
     {
-      "$ref": "../../../input-form-control.schema.json"
+      "$ref": "#/definitions/inputFormControl"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "formName": {
+          "alias": "form",
+          "type": "string",
+          "description": "The name of the form where the form control should be added"
+        }
+      },
+      "required": [
+        "formName"
+      ]
     }
   ],
   "definitions": {
-    "type": {
-      "$ref": "../../../type.schema.json"
+    "angular": {
+      "$ref": "../../../angular.schema.json"
     },
-    "property": {
-      "$ref": "../../../property.schema.json"
-    },
-    "button": {
-      "$ref": "../../../button.schema.json"
+    "inputFormControl": {
+      "$ref": "../../../input-form-control.schema.json"
     }
   }
 }

package/src/schematics/form/control/select-form-control/index.d.ts

@@ -1,8 +1,8 @@
 import { Rule } from '@angular-devkit/schematics';
 import { Normalized } from '@rxap/utilities';
-import { NormalizedSelectFormControl } from '../../../../lib/form-control';
+import { NormalizedSelectFormControl } from '../../../../lib/form/control/select-form-control';
 import { NormalizedFormControlOptions } from '../../form-control';
 import { SelectFormControlOptions } from './schema';
-export type NormalizedSelectFormControlOptions = Readonly<Normalized<Omit<SelectFormControlOptions, 'options'>>> & NormalizedFormControlOptions & NormalizedSelectFormControl;
+export type NormalizedSelectFormControlOptions = Readonly<Normalized<Omit<SelectFormControlOptions, 'optionList'>>> & NormalizedFormControlOptions & NormalizedSelectFormControl;
 export declare function NormalizeSelectFormControlOptions(options: SelectFormControlOptions): NormalizedSelectFormControlOptions;
 export default function (options: SelectFormControlOptions): () => Rule;