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

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

@@ -3,195 +3,84 @@
   "$id": "select-form-control-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": {
-                  "$ref": "#/allOf/1/allOf/1/properties/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
-                }
-              }
-            }
-          ]
+      "$ref": "#/definitions/formControl"
+    },
+    {
+      "$ref": "#/definitions/selectFormControl"
+    }
+  ],
+  "definitions": {
+    "formControl": {
+      "type": "object",
+      "properties": {
+        "name": {
+          "type": "string",
+          "description": "The name of the control"
         },
-        {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string",
-              "description": "The name of the control"
-            },
-            "type": {
-              "$ref": "#/definitions/type"
-            },
-            "isArray": {
-              "type": "boolean",
-              "description": "Whether the control value is an array",
-              "default": false
-            },
-            "state": {
-              "type": "string",
-              "description": "The initial state of the control"
-            },
-            "isRequired": {
-              "type": "boolean",
-              "description": "Whether the control value is required",
-              "default": false
-            },
-            "isReadonly": {
-              "type": "boolean",
-              "description": "Whether the control value is readonly",
-              "default": false
-            },
-            "isDisabled": {
-              "type": "boolean",
-              "description": "Whether the control value is disabled",
-              "default": false
-            },
-            "validatorList": {
-              "type": "array",
-              "items": {
-                "type": "string"
-              }
-            },
-            "kind": {
-              "type": "string",
-              "description": "The name of the template",
-              "enum": [
-                "default",
-                "input",
-                "select",
-                "checkbox",
-                "autocomplete-table-select",
-                "table-select",
-                "textarea",
-                "slide-toggle"
-              ],
-              "default": "default"
-            }
-          },
-          "required": [
-            "name"
-          ],
-          "additionalProperties": true
+        "type": {
+          "$ref": "#/definitions/type"
         },
-        {
-          "type": "object",
-          "properties": {
-            "formName": {
-              "alias": "form",
-              "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"
-            }
-          },
-          "required": [
-            "formName"
-          ]
+        "isArray": {
+          "type": "boolean",
+          "description": "Whether the control value is an array",
+          "default": false
+        },
+        "state": {
+          "type": "string",
+          "description": "The initial state of the control"
+        },
+        "isRequired": {
+          "type": "boolean",
+          "description": "Whether the control value is required",
+          "default": false
+        },
+        "isReadonly": {
+          "type": "boolean",
+          "description": "Whether the control value is readonly",
+          "default": false
+        },
+        "isDisabled": {
+          "type": "boolean",
+          "description": "Whether the control value is disabled",
+          "default": false
+        },
+        "validatorList": {
+          "type": "array",
+          "items": {
+            "type": "string"
+          }
+        },
+        "kind": {
+          "type": "string",
+          "description": "The name of the template",
+          "enum": [
+            "default",
+            "input",
+            "select",
+            "checkbox",
+            "autocomplete-table-select",
+            "table-select",
+            "textarea",
+            "slide-toggle"
+          ],
+          "default": "default"
         }
-      ]
+      },
+      "required": [
+        "name"
+      ],
+      "additionalProperties": true
     },
-    {
+    "selectFormControl": {
       "allOf": [
         {
-          "$ref": "#/allOf/0/allOf/1"
+          "$ref": "#/definitions/formControl"
         },
         {
           "type": "object",
           "properties": {
             "formField": {
-              "type": "object",
-              "properties": {
-                "label": {
-                  "type": "string"
-                },
-                "prefixButton": {
-                  "$ref": "#/definitions/button"
-                },
-                "suffixButton": {
-                  "$ref": "#/definitions/button"
-                },
-                "hasClearButton": {
-                  "type": "boolean"
-                }
-              }
+              "$ref": "#/definitions/formField"
             },
             "options": {
               "type": "array",
@@ -222,15 +111,7 @@
               }
             },
             "backend": {
-              "type": "string",
-              "description": "The backend that should be used to handel data",
-              "enum": [
-                "none",
-                "nestjs",
-                "open-api",
-                "local"
-              ],
-              "default": "none"
+              "$ref": "#/definitions/backend"
             },
             "multiple": {
               "alias": "multi",
@@ -240,9 +121,58 @@
           }
         }
       ]
-    }
-  ],
-  "definitions": {
+    },
+    "backend": {
+      "type": "string",
+      "description": "The backend that should be used to handel data",
+      "enum": [
+        "none",
+        "nestjs",
+        "open-api",
+        "local"
+      ],
+      "default": "none"
+    },
+    "button": {
+      "type": "object",
+      "properties": {
+        "svgIcon": {
+          "type": "string"
+        },
+        "icon": {
+          "type": "string"
+        },
+        "directiveList": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/type"
+          }
+        },
+        "importList": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/type"
+          }
+        }
+      }
+    },
+    "formField": {
+      "type": "object",
+      "properties": {
+        "label": {
+          "type": "string"
+        },
+        "prefixButton": {
+          "$ref": "#/definitions/button"
+        },
+        "suffixButton": {
+          "$ref": "#/definitions/button"
+        },
+        "hasClearButton": {
+          "type": "boolean"
+        }
+      }
+    },
     "type": {
       "oneOf": [
         {
@@ -275,123 +205,6 @@
           ]
         }
       ]
-    },
-    "property": {
-      "oneOf": [
-        {
-          "type": "string"
-        },
-        {
-          "type": "object",
-          "properties": {
-            "name": {
-              "type": "string"
-            },
-            "type": {
-              "$ref": "#/definitions/type"
-            },
-            "isArray": {
-              "type": "boolean"
-            }
-          },
-          "required": [
-            "name"
-          ]
-        }
-      ],
-      "definitions": {
-        "type": {
-          "oneOf": [
-            {
-              "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": [
-            {
-              "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"
-              ]
-            }
-          ]
-        }
-      }
     }
   }
 }

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

@@ -3,21 +3,18 @@
   "$id": "select-form-control-schematic",
   "allOf": [
     {
-      "$ref": "../../form-control/template.schema.json"
+      "$ref": "#/definitions/formControl"
     },
     {
-      "$ref": "../../../select-form-control.schema.json"
+      "$ref": "#/definitions/selectFormControl"
     }
   ],
   "definitions": {
-    "type": {
-      "$ref": "../../../type.schema.json"
-    },
-    "property": {
-      "$ref": "../../../property.schema.json"
+    "formControl": {
+      "$ref": "../../form-control/template.schema.json"
     },
-    "button": {
-      "$ref": "../../../button.schema.json"
+    "selectFormControl": {
+      "$ref": "../../../select-form-control.schema.json"
     }
   }
 }

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

@@ -1,9 +1,15 @@
+import { NormalizedUpstreamOptions } from '@rxap/ts-morph';
 import { Normalized } from '@rxap/utilities';
 import { WriterFunction } from 'ts-morph';
 import { NormalizedTableSelectColumn, NormalizedTableSelectFormControl } from '../../../../lib/form-control';
 import { NormalizedFormControlOptions } from '../../form-control';
 import { TableSelectFormControlOptions } from './schema';
-export type NormalizedTableSelectFormControlOptions = Readonly<Normalized<Omit<TableSelectFormControlOptions, 'columnList' | 'propertyList'>> & NormalizedFormControlOptions & NormalizedTableSelectFormControl>;
+export interface NormalizedTableSelectFormControlOptions extends Readonly<Normalized<Omit<TableSelectFormControlOptions, 'columnList' | 'propertyList'>> & NormalizedFormControlOptions & NormalizedTableSelectFormControl> {
+    controllerName: string;
+    resolver: {
+        upstream: NormalizedUpstreamOptions | null;
+    } | null;
+}
 export declare function NormalizeTableSelectFormControlOptions(options: TableSelectFormControlOptions): NormalizedTableSelectFormControlOptions;
 export declare function TableColumnToTableSelectColumn(column: NormalizedTableSelectColumn): WriterFunction;
 export declare function TableColumnListToTableSelectColumnMap(columnList: Array<NormalizedTableSelectColumn>): WriterFunction;