@rxap/schematic-angular 16.2.0-dev.1 → 16.2.0-dev.11

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

@@ -1,106 +1,443 @@
 {
   "$schema": "http://json-schema.org/schema",
-  "$id": "table-select-form-control",
-  "type": "object",
-  "properties": {
-    "name": {
-      "type": "string",
-      "description": "The name of form control",
-      "x-prompt": "Enter the name of the form control?"
-    },
-    "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"
-    },
-    "project": {
-      "type": "string",
-      "description": "The project where the form control should be added",
-      "x-prompt": "Enter project name where the form control should be added"
-    },
-    "backend": {
-      "type": "string",
-      "description": "The backend that should be used to handel data",
-      "enum": [
-        "none",
-        "local",
-        "nestjs",
-        "open-api"
-      ],
-      "default": "none"
-    },
-    "feature": {
-      "type": "string",
-      "description": "The feature where the form control should be added",
-      "x-prompt": "Enter feature name where the form control should be added"
-    },
-    "shared": {
-      "type": "boolean",
-      "description": "Whether the form is shared across applications",
-      "default": false
-    },
-    "directory": {
-      "type": "string",
-      "description": "A path suffix added to the base path"
-    },
-    "nestModule": {
-      "type": "string",
-      "description": "Name of the nest module where the controller is created"
-    },
-    "controllerName": {
-      "type": "string",
-      "description": "Name of the nest controller"
+  "$id": "table-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": {
+                  "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": {
+            "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": "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"
+          ]
+        }
+      ]
     },
+    {
+      "type": "object",
+      "properties": {
+        "columnList": {
+          "alias": "column",
+          "type": "array",
+          "items": {
+            "description": "table column name",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "table column name"
+              },
+              "title": {
+                "type": "string",
+                "description": "table column label"
+              },
+              "hasFilter": {
+                "type": "boolean",
+                "description": "Whether the column has a filter"
+              },
+              "kind": {
+                "type": "string",
+                "description": "The kind of data in the column"
+              }
+            }
+          },
+          "description": "List of table column names"
+        },
+        "title": {
+          "type": "string",
+          "description": "The title of the table select window"
+        },
+        "toDisplay": {
+          "type": "object",
+          "properties": {
+            "property": {
+              "$ref": "#/definitions/property"
+            }
+          }
+        },
+        "toValue": {
+          "type": "object",
+          "properties": {
+            "property": {
+              "$ref": "#/definitions/property"
+            }
+          }
+        },
+        "upstream": {
+          "$ref": "#/definitions/upstream"
+        }
+      }
+    }
+  ],
+  "definitions": {
     "type": {
-      "type": "string",
-      "description": "The data type of the form control"
-    },
-    "validatorList": {
-      "alias": "validator",
-      "type": "array",
-      "items": {
-        "type": "string"
-      },
-      "description": "List of validators to be added to the form control"
+      "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"
+          ]
+        }
+      ]
     },
-    "isRequired": {
-      "alias": "required",
-      "type": "boolean",
-      "description": "Whether the form control value is required"
-    },
-    "state": {
-      "type": "string",
-      "description": "The initial state of the form control"
-    },
-    "isArray": {
-      "alias": "array",
-      "type": "boolean",
-      "description": "Whether the form control is an array"
-    },
-    "multiple": {
-      "alias": "multi",
-      "type": "boolean",
-      "description": "Whether the select form control is multiple mode"
+    "property": {
+      "oneOf": [
+        {
+          "type": "string"
+        },
+        {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "type": {
+              "$ref": "#/definitions/type"
+            }
+          },
+          "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"
+              ]
+            }
+          ]
+        }
+      }
     },
-    "columnList": {
-      "alias": "column",
-      "type": "array",
-      "items": {
-        "type": "string",
-        "description": "table column 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"
+          }
+        }
       },
-      "description": "List of table column names"
+      "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"
+              ]
+            }
+          ]
+        }
+      }
     },
-    "context": {
-      "type": "string",
-      "description": "The context use to generate proper names for class, files, etc"
+    "upstream": {
+      "oneOf": [
+        {
+          "type": "object",
+          "properties": {
+            "kind": {
+              "type": "string",
+              "enum": [
+                "open-api"
+              ]
+            },
+            "operationId": {
+              "type": "string"
+            },
+            "scope": {
+              "type": "string"
+            },
+            "mapper": {
+              "type": "object",
+              "properties": {
+                "pageIndex": {
+                  "type": "string"
+                },
+                "pageSize": {
+                  "type": "string"
+                },
+                "sortBy": {
+                  "type": "string"
+                },
+                "sortDirection": {
+                  "type": "string"
+                },
+                "list": {
+                  "type": "string"
+                },
+                "total": {
+                  "type": "string"
+                },
+                "filter": {
+                  "type": "object",
+                  "properties": {
+                    "eq": {
+                      "type": "string"
+                    },
+                    "join": {
+                      "type": "string"
+                    }
+                  }
+                }
+              }
+            }
+          },
+          "required": [
+            "kind",
+            "operationId"
+          ]
+        }
+      ]
     }
-  },
-  "required": [
-    "name",
-    "formName",
-    "project",
-    "feature"
-  ]
-}
+  }
+}

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

@@ -0,0 +1,78 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "table-select-form-control-schematic",
+  "allOf": [
+    {
+      "$ref": "../../form-control/template.schema.json"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "columnList": {
+          "alias": "column",
+          "type": "array",
+          "items": {
+            "description": "table column name",
+            "type": "object",
+            "properties": {
+              "name": {
+                "type": "string",
+                "description": "table column name"
+              },
+              "title": {
+                "type": "string",
+                "description": "table column label"
+              },
+              "hasFilter": {
+                "type": "boolean",
+                "description": "Whether the column has a filter"
+              },
+              "kind": {
+                "type": "string",
+                "description": "The kind of data in the column"
+              }
+            }
+          },
+          "description": "List of table column names"
+        },
+        "title": {
+          "type": "string",
+          "description": "The title of the table select window"
+        },
+        "toDisplay": {
+          "type": "object",
+          "properties": {
+            "property": {
+              "$ref": "#/definitions/property"
+            }
+          }
+        },
+        "toValue": {
+          "type": "object",
+          "properties": {
+            "property": {
+              "$ref": "#/definitions/property"
+            }
+          }
+        },
+        "upstream": {
+          "$ref": "#/definitions/upstream"
+        }
+      }
+    }
+  ],
+  "definitions": {
+    "type": {
+      "$ref": "../../../type.schema.json"
+    },
+    "property": {
+      "$ref": "../../../property.schema.json"
+    },
+    "button": {
+      "$ref": "../../../button.schema.json"
+    },
+    "upstream": {
+      "$ref": "../../../upstream.schema.json"
+    }
+  }
+}

package/src/schematics/form/form-component/files/component/{__componentName__.component.html.template → __componentName__.component.html.hbs}

@@ -1,12 +1,12 @@
 <form rxapForm>
-  <% if (window) { %>
+  {{#if window}}
   <ng-template rxapFormWindowFooter let-windowRef>
     <rxap-form-controls
       (close)="windowRef.complete()"
       (submitted)="windowRef.next($event)"
     ></rxap-form-controls>
   </ng-template>
-  <% } else { %>
+  {{else}}
   <rxap-form-controls></rxap-form-controls>
-  <% } %>
+  {{/if}}
 </form>

package/src/schematics/form/form-component/index.js

@@ -16,9 +16,12 @@ function NormalizeFormComponentOptions(options) {
     var _a, _b, _c, _d;
     const normalizedAngularOptions = (0, angular_options_1.NormalizeAngularOptions)(options);
     (0, angular_options_1.AssertAngularOptionsNameProperty)(normalizedAngularOptions);
-    const { name, } = normalizedAngularOptions;
+    const { name, nestModule, } = normalizedAngularOptions;
     const componentName = (0, schematics_utilities_1.CoerceSuffix)(name, '-form');
-    const controllerName = (_a = options.controllerName) !== null && _a !== void 0 ? _a : componentName;
+    const controllerName = (_a = options.controllerName) !== null && _a !== void 0 ? _a : (0, schematics_ts_morph_1.BuildNestControllerName)({
+        controllerName: componentName,
+        nestModule,
+    });
     return Object.freeze(Object.assign(Object.assign({}, normalizedAngularOptions), { window: (_b = options.window) !== null && _b !== void 0 ? _b : false, directory: (0, path_1.join)((_c = options.directory) !== null && _c !== void 0 ? _c : '', componentName), role: (_d = options.role) !== null && _d !== void 0 ? _d : null, componentName,
         controllerName, controlList: (0, form_component_control_1.NormalizeFormComponentControlList)(options.controlList), context: options.context ? (0, utilities_1.dasherize)(options.context) : null, matFormFieldDefaultOptions: (0, mat_form_field_default_options_1.NormalizeMatFormFieldDefaultOptions)(options.matFormFieldDefaultOptions) }));
 }
@@ -50,7 +53,7 @@ function componentRule(normalizedOptions) {
     ]);
 }
 function formDefinitionRule(normalizedOptions) {
-    const { name, project, feature, directory, controlList, overwrite, } = normalizedOptions;
+    const { name, project, feature, directory, controlList, overwrite, backend, nestModule, controllerName, } = normalizedOptions;
     return (0, schematics_1.chain)([
         () => console.log(`Coerce form definition files`),
         (0, schematics_utilities_1.ExecuteSchematic)('form-definition', {
@@ -60,6 +63,9 @@ function formDefinitionRule(normalizedOptions) {
             feature,
             controlList,
             overwrite,
+            backend,
+            nestModule,
+            controllerName,
         }),
     ]);
 }