@rxap/schematic-angular 16.2.0-dev.6 → 16.2.0-dev.8

package/src/schematics/form/control/table-select-form-control/index.js

@@ -8,29 +8,21 @@ const utilities_1 = require("@rxap/utilities");
 const path_1 = require("path");
 const ts_morph_1 = require("ts-morph");
 const angular_options_1 = require("../../../../lib/angular-options");
-const table_column_1 = require("../../../../lib/table-column");
+const form_control_1 = require("../../../../lib/form-control");
 const table_component_1 = require("../../../table/table-component");
-const form_control_1 = require("../../form-control");
+const form_control_2 = require("../../form-control");
 function NormalizeTableSelectFormControlOptions(options) {
-    var _a;
-    const normalizedOptions = (0, form_control_1.NormalizeFormControlOptions)(options);
-    let { isArray } = normalizedOptions;
-    const multiple = (_a = options.multiple) !== null && _a !== void 0 ? _a : false;
-    isArray = multiple ? true : isArray;
-    const columnList = (0, table_column_1.NormalizeTableColumnList)(options.columnList);
-    return Object.freeze(Object.assign(Object.assign({}, normalizedOptions), { isArray,
-        multiple,
-        columnList }));
+    return Object.freeze(Object.assign(Object.assign({}, (0, form_control_2.NormalizeFormControlOptions)(options)), (0, form_control_1.NormalizeTableSelectFormControl)(options)));
 }
 exports.NormalizeTableSelectFormControlOptions = NormalizeTableSelectFormControlOptions;
-function TableColumnToTableSelectColumn(options) {
-    const { type, name, title, hasFilter, } = options;
+function TableColumnToTableSelectColumn(column) {
+    const { kind, name, title, hasFilter, } = column;
     const properties = {};
     properties['label'] = `$localize\`${title !== null && title !== void 0 ? title : (0, schematics_utilities_1.capitalize)(name)}\``;
     if (hasFilter) {
         properties['filter'] = 'true';
     }
-    properties['type'] = (w) => w.quote(type.name);
+    properties['type'] = (w) => w.quote(kind);
     return ts_morph_1.Writers.object(properties);
 }
 exports.TableColumnToTableSelectColumn = TableColumnToTableSelectColumn;
@@ -43,53 +35,65 @@ function printOptions(options) {
 }
 function default_1(options) {
     const normalizedOptions = NormalizeTableSelectFormControlOptions(options);
-    const { name, project, feature, directory, formName, type, isArray, state, isRequired, validatorList, nestModule, controllerName, columnList, shared, context, scope, } = normalizedOptions;
+    const { name, project, feature, directory, formName, type, isArray, state, isRequired, validatorList, nestModule, controllerName, columnList, shared, context, scope, toDisplay, toValue, propertyList, upstream, } = normalizedOptions;
     printOptions(normalizedOptions);
-    const optionsOperationName = ['get', name, 'option', 'page'].join('-');
-    const optionsOperationPath = ['options', name, 'page'].join('/');
+    const optionsOperationName = ['get', name, 'control', 'table-select', 'page'].join('-');
+    const optionsOperationPath = ['control', name, 'table-select', 'page'].join('/');
     const optionsOperationId = (0, schematics_ts_morph_1.buildOperationId)(normalizedOptions, optionsOperationName, (0, schematics_ts_morph_1.BuildNestControllerName)({
         controllerName,
         nestModule,
     }));
-    const resolveValueOperationName = ['resolve', name, 'option', 'value'].join('-');
-    const resolveValueOperationPath = ['options', name, 'resolve', ':value'].join('/');
-    const resolveValueOperationId = (0, schematics_ts_morph_1.buildOperationId)(normalizedOptions, resolveValueOperationName, (0, schematics_ts_morph_1.BuildNestControllerName)({
-        controllerName,
-        nestModule,
-    }));
+    // const resolveValueOperationName = [ 'resolve', name, 'option', 'value' ].join(
+    //   '-',
+    // );
+    // const resolveValueOperationPath = [ 'options', name, 'resolve', ':value' ].join(
+    //   '/',
+    // );
+    // const resolveValueOperationId = buildOperationId(
+    //   normalizedOptions,
+    //   resolveValueOperationName,
+    //   BuildNestControllerName({
+    //     controllerName,
+    //     nestModule,
+    //   }),
+    // );
     const tableDataSourceName = (0, schematics_utilities_1.classify)([name, 'select-table', 'data-source'].join('-'));
     const tableDataSourceImportPath = `./data-sources/${(0, schematics_utilities_1.dasherize)(name)}-select-table.data-source`;
     const tableDataSourceDirectory = (0, path_1.join)(directory !== null && directory !== void 0 ? directory : '', 'data-sources');
-    const resolveValueMethodName = (0, schematics_utilities_1.classify)([(0, schematics_utilities_1.dasherize)(name), 'table-select', 'value', 'resolver', 'method'].join('-'));
-    const resolveValueMethodImportPath = `./methods/${(0, schematics_utilities_1.dasherize)(name)}-table-select-value-resolver.method`;
-    const resolveValueMethodDirectory = (0, path_1.join)(directory !== null && directory !== void 0 ? directory : '', 'methods');
+    // const resolveValueMethodName = classify(
+    //   [ dasherize(name), 'table-select', 'value', 'resolver', 'method' ].join('-'),
+    // );
+    // const resolveValueMethodImportPath = `./methods/${ dasherize(
+    //   name,
+    // ) }-table-select-value-resolver.method`;
+    // const resolveValueMethodDirectory = join(directory ?? '', 'methods');
     const tableResponseDtoName = (0, utilities_1.joinWithDash)([context, name, 'table-select']);
     return () => {
         return (0, schematics_1.chain)([
             () => console.group('\x1b[32m[@rxap/schematics-angular:table-select-form-control]\x1b[0m'),
-            (0, schematics_utilities_1.ExecuteSchematic)('form-control', normalizedOptions),
             (0, schematics_ts_morph_1.CoerceTableSelectOperationRule)({
                 project,
                 feature,
                 nestModule,
                 controllerName,
-                propertyList: (0, table_component_1.TableColumnListAndPropertyListToGetPageOperationPropertyList)(columnList, []),
+                propertyList: (0, table_component_1.TableColumnListAndPropertyListToGetPageOperationPropertyList)(columnList, propertyList),
                 operationName: optionsOperationName,
                 path: optionsOperationPath,
                 skipCoerceTableSuffix: true,
                 responseDtoName: tableResponseDtoName,
                 context,
+                upstream
             }),
-            (0, schematics_ts_morph_1.CoerceTableSelectValueResolveOperationRule)({
-                project,
-                feature,
-                nestModule,
-                controllerName,
-                operationName: resolveValueOperationName,
-                path: resolveValueOperationPath,
-                responseDtoName: tableResponseDtoName,
-                context,
-            }),
+            // CoerceTableSelectValueResolveOperationRule({
+            //   project,
+            //   feature,
+            //   nestModule,
+            //   controllerName,
+            //   operationName: resolveValueOperationName,
+            //   path: resolveValueOperationPath,
+            //   responseDtoName: tableResponseDtoName,
+            //   context,
+            // }),
             (0, schematics_ts_morph_1.CoerceFormProviderRule)({
                 project,
                 feature,
@@ -102,18 +106,18 @@ function default_1(options) {
                     },
                 ],
             }),
-            (0, schematics_ts_morph_1.CoerceFormProviderRule)({
-                project,
-                feature,
-                directory,
-                providerObject: resolveValueMethodName,
-                importStructures: [
-                    {
-                        namedImports: [resolveValueMethodName],
-                        moduleSpecifier: resolveValueMethodImportPath,
-                    },
-                ],
-            }),
+            // CoerceFormProviderRule({
+            //   project,
+            //   feature,
+            //   directory,
+            //   providerObject: resolveValueMethodName,
+            //   importStructures: [
+            //     {
+            //       namedImports: [ resolveValueMethodName ],
+            //       moduleSpecifier: resolveValueMethodImportPath,
+            //     },
+            //   ],
+            // }),
             (0, schematics_ts_morph_1.CoerceTableDataSourceRule)({
                 scope,
                 project,
@@ -123,15 +127,15 @@ function default_1(options) {
                 name: [name, 'select-table'].join('-'),
                 operationId: optionsOperationId,
             }),
-            (0, schematics_ts_morph_1.CoerceTableSelectResolveValueMethodRule)({
-                scope,
-                project,
-                feature,
-                directory: resolveValueMethodDirectory,
-                shared,
-                name: [name, 'table-select', 'value', 'resolver'].join('-'),
-                operationId: resolveValueOperationId,
-            }),
+            // CoerceTableSelectResolveValueMethodRule({
+            //   scope,
+            //   project,
+            //   feature,
+            //   directory: resolveValueMethodDirectory,
+            //   shared,
+            //   name: [ name, 'table-select', 'value', 'resolver' ].join('-'),
+            //   operationId: resolveValueOperationId,
+            // }),
             (0, schematics_ts_morph_1.CoerceFormDefinitionControl)({
                 project,
                 feature,
@@ -148,17 +152,23 @@ function default_1(options) {
                     (0, schematics_ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseTableSelectDataSource').set({
                         arguments: [tableDataSourceName],
                     });
-                    (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
-                        namedImports: [tableDataSourceName],
-                        moduleSpecifier: tableDataSourceImportPath,
+                    (0, schematics_ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseTableSelectToDisplay').set({
+                        arguments: [`item => item.${toDisplay.property.name}`],
                     });
-                    (0, schematics_ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseTableSelectMethod').set({
-                        arguments: [resolveValueMethodName],
+                    (0, schematics_ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseTableSelectToValue').set({
+                        arguments: [`item => item.${toValue.property.name}`],
                     });
                     (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
-                        namedImports: [resolveValueMethodName],
-                        moduleSpecifier: resolveValueMethodImportPath,
+                        namedImports: [tableDataSourceName],
+                        moduleSpecifier: tableDataSourceImportPath,
                     });
+                    // CoerceDecorator(propertyDeclaration, 'UseTableSelectMethod').set({
+                    //   arguments: [ resolveValueMethodName ],
+                    // });
+                    // CoerceImports(sourceFile, {
+                    //   namedImports: [ resolveValueMethodName ],
+                    //   moduleSpecifier: resolveValueMethodImportPath,
+                    // });
                     (0, schematics_ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseTableSelectColumns').set({
                         arguments: [TableColumnListToTableSelectColumnMap(columnList)],
                     });
@@ -166,9 +176,11 @@ function default_1(options) {
                         namedImports: [
                             'UseTableSelectDataSource',
                             'UseTableSelectColumns',
-                            'UseTableSelectMethod',
+                            // 'UseTableSelectMethod',
+                            'UseTableSelectToDisplay',
+                            'UseTableSelectToValue'
                         ],
-                        moduleSpecifier: '@rxap/ngx-material-table-select',
+                        moduleSpecifier: '@digitaix/eurogard-table-select',
                     });
                     return {
                         propertyDeclaration,

package/src/schematics/form/control/table-select-form-control/index.js.map

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

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

@@ -1,7 +1,5 @@
+import { TableSelectFormControl } from '../../../../lib/form-control';
 import { FormControlOptions } from '../../form-control/schema';
-import { TableColumn } from '../../../table/table-component/schema';
 
-export interface TableSelectFormControlOptions extends FormControlOptions {
-  multiple?: boolean;
-  columnList: Array<TableColumn | string>;
+export interface TableSelectFormControlOptions extends FormControlOptions, TableSelectFormControl {
 }

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

@@ -50,7 +50,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 +60,9 @@ function formDefinitionRule(normalizedOptions) {
             feature,
             controlList,
             overwrite,
+            backend,
+            nestModule,
+            controllerName,
         }),
     ]);
 }

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

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

package/src/schematics/form/form-component/template.schema.json

@@ -0,0 +1,23 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "form-component-schematic",
+  "allOf": [
+    {
+      "$ref": "../../angular.schema.json"
+    },
+    {
+      "$ref": "../../form-component.schema.json"
+    }
+  ],
+  "definitions": {
+    "type": {
+      "$ref": "../../type.schema.json"
+    },
+    "property": {
+      "$ref": "../../property.schema.json"
+    },
+    "button": {
+      "$ref": "../../button.schema.json"
+    }
+  }
+}

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

@@ -1,9 +1,11 @@
+import { Rule } from '@angular-devkit/schematics';
 import { Normalized } from '@rxap/utilities';
 import { NormalizedAngularOptions } from '../../../lib/angular-options';
 import { NormalizedFormDefinitionControl } from '../../../lib/form-definition-control';
 import { FormControlOptions } from './schema';
+import 'colors';
 export interface NormalizedFormControlOptions extends Readonly<Normalized<FormControlOptions> & NormalizedAngularOptions & NormalizedFormDefinitionControl> {
     controllerName: string;
 }
 export declare function NormalizeFormControlOptions(options: Readonly<FormControlOptions>): NormalizedFormControlOptions;
-export default function (options: FormControlOptions): () => import("@angular-devkit/schematics").Rule;
+export default function (options: FormControlOptions): () => Rule;

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

@@ -5,25 +5,35 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const angular_options_1 = require("../../../lib/angular-options");
+const form_control_1 = require("../../../lib/form-control");
 const form_definition_control_1 = require("../../../lib/form-definition-control");
+require("colors");
 function NormalizeFormControlOptions(options) {
-    var _a, _b;
+    var _a;
     const normalizedAngularOptions = (0, angular_options_1.NormalizeAngularOptions)(options);
     const normalizedFormDefinitionControl = (0, form_definition_control_1.NormalizeFormDefinitionControl)(options);
-    const { nestModule } = normalizedAngularOptions;
     const formName = (0, schematics_utilities_1.dasherize)(options.formName);
-    let directory = (_a = options.directory) !== null && _a !== void 0 ? _a : '';
-    if (!directory.endsWith('/' + formName + '-form')) {
-        directory += '/' + formName + '-form';
-    }
-    const controllerName = (_b = options.controllerName) !== null && _b !== void 0 ? _b : formName;
+    const controllerName = (_a = options.controllerName) !== null && _a !== void 0 ? _a : formName;
     return Object.freeze(Object.assign(Object.assign(Object.assign({}, normalizedAngularOptions), normalizedFormDefinitionControl), { formName,
-        directory,
         controllerName, context: options.context ? (0, schematics_utilities_1.dasherize)(options.context) : null }));
 }
 exports.NormalizeFormControlOptions = NormalizeFormControlOptions;
 function printOptions(options) {
     (0, angular_options_1.PrintAngularOptions)('form-control', options);
+    console.log(`=== form: ${options.formName}`.blue);
+}
+function formControlKind(normalizedOptions) {
+    switch (normalizedOptions.kind) {
+        case form_control_1.FormControlKinds.INPUT:
+            return (0, schematics_utilities_1.ExecuteSchematic)('input-form-control', normalizedOptions);
+        case form_control_1.FormControlKinds.SELECT:
+            return (0, schematics_utilities_1.ExecuteSchematic)('select-form-control', normalizedOptions);
+        case form_control_1.FormControlKinds.TABLE_SELECT:
+            return (0, schematics_utilities_1.ExecuteSchematic)('table-select-form-control', normalizedOptions);
+        default:
+            return () => console.log(`No schematic for form control kind: ${normalizedOptions.kind}`.yellow);
+    }
+    return (0, schematics_1.noop)();
 }
 function default_1(options) {
     const normalizedOptions = NormalizeFormControlOptions(options);
@@ -45,6 +55,7 @@ function default_1(options) {
                 isRequired,
                 validatorList,
             }),
+            formControlKind(normalizedOptions),
             () => console.groupEnd(),
         ]);
     };

package/src/schematics/form/form-control/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/form/form-control/index.ts"],"names":[],"mappings":";;;AAAA,2DAAmD;AACnD,mEAAwE;AACxE,qEAAuD;AAEvD,kEAIsC;AACtC,kFAG8C;AAQ9C,SAAgB,2BAA2B,CACzC,OAAqC;;IAErC,MAAM,wBAAwB,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,CAAC;IAClE,MAAM,+BAA+B,GAAG,IAAA,wDAA8B,EAAC,OAAO,CAAC,CAAC;IAChF,MAAM,EAAE,UAAU,EAAE,GAAG,wBAAwB,CAAC;IAChD,MAAM,QAAQ,GAAG,IAAA,gCAAS,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7C,IAAI,SAAS,GAAG,MAAA,OAAO,CAAC,SAAS,mCAAI,EAAE,CAAC;IACxC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,GAAG,GAAG,QAAQ,GAAG,OAAO,CAAC,EAAE;QACjD,SAAS,IAAI,GAAG,GAAG,QAAQ,GAAG,OAAO,CAAC;KACvC;IACD,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;IAC1D,OAAO,MAAM,CAAC,MAAM,+CACf,wBAAwB,GACxB,+BAA+B,KAClC,QAAQ;QACR,SAAS;QACT,cAAc,EACd,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,gCAAS,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAC5D,CAAC;AACL,CAAC;AApBD,kEAoBC;AAED,SAAS,YAAY,CAAC,OAAqC;IACzD,IAAA,qCAAmB,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,mBAAyB,OAA2B;IAClD,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,OAAO,EACP,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,KAAK,EACL,UAAU,EACV,aAAa,GACd,GAAG,iBAAiB,CAAC;IACtB,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEhC,OAAO,GAAG,EAAE;QACV,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,wDAAwD,CAAC;YAC7E,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC;YAChE,IAAA,iDAA2B,EAAC;gBAC1B,OAAO;gBACP,OAAO;gBACP,SAAS;gBACT,QAAQ;gBACR,IAAI;gBACJ,IAAI;gBACJ,OAAO;gBACP,KAAK;gBACL,UAAU;gBACV,aAAa;aACd,CAAC;YACF,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE;SACzB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAnCD,4BAmCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/form/form-control/index.ts"],"names":[],"mappings":";;;AAAA,2DAIoC;AACpC,mEAAwE;AACxE,qEAGoC;AAEpC,kEAIsC;AACtC,4DAA6D;AAC7D,kFAG8C;AAE9C,kBAAgB;AAOhB,SAAgB,2BAA2B,CACzC,OAAqC;;IAErC,MAAM,wBAAwB,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,CAAC;IAClE,MAAM,+BAA+B,GAAG,IAAA,wDAA8B,EAAC,OAAO,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,IAAA,gCAAS,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;IAC1D,OAAO,MAAM,CAAC,MAAM,+CACf,wBAAwB,GACxB,+BAA+B,KAClC,QAAQ;QACR,cAAc,EACd,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,gCAAS,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAC5D,CAAC;AACL,CAAC;AAdD,kEAcC;AAED,SAAS,YAAY,CAAC,OAAqC;IACzD,IAAA,qCAAmB,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,eAAe,CAAC,iBAA+C;IACtE,QAAQ,iBAAiB,CAAC,IAAI,EAAE;QAE9B,KAAK,+BAAgB,CAAC,KAAK;YACzB,OAAO,IAAA,uCAAgB,EAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QAEnE,KAAK,+BAAgB,CAAC,MAAM;YAC1B,OAAO,IAAA,uCAAgB,EAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;QAEpE,KAAK,+BAAgB,CAAC,YAAY;YAChC,OAAO,IAAA,uCAAgB,EAAC,2BAA2B,EAAE,iBAAiB,CAAC,CAAC;QAE1E;YACE,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,uCAAuC,iBAAiB,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;KAEpG;IAED,OAAO,IAAA,iBAAI,GAAE,CAAC;AAChB,CAAC;AAED,mBAAyB,OAA2B;IAClD,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,OAAO,EACP,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,KAAK,EACL,UAAU,EACV,aAAa,GACd,GAAG,iBAAiB,CAAC;IACtB,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEhC,OAAO,GAAG,EAAE;QACV,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,wDAAwD,CAAC;YAC7E,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC;YAChE,IAAA,iDAA2B,EAAC;gBAC1B,OAAO;gBACP,OAAO;gBACP,SAAS;gBACT,QAAQ;gBACR,IAAI;gBACJ,IAAI;gBACJ,OAAO;gBACP,KAAK;gBACL,UAAU;gBACV,aAAa;aACd,CAAC;YACF,eAAe,CAAC,iBAAiB,CAAC;YAClC,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE;SACzB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AApCD,4BAoCC"}

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

@@ -0,0 +1,37 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "form-control-schematic",
+  "allOf": [
+    {
+      "$ref": "../../angular.schema.json"
+    },
+    {
+      "$ref": "../../form-control.schema.json"
+    },
+    {
+      "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"
+      ]
+    }
+  ],
+  "definitions": {
+    "type": {
+      "$ref": "../../type.schema.json"
+    },
+    "property": {
+      "$ref": "../../property.schema.json"
+    },
+    "button": {
+      "$ref": "../../button.schema.json"
+    }
+  }
+}

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

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.NormalizeFormDefinitionOptions = void 0;
 const schematics_1 = require("@angular-devkit/schematics");
 const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
+const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const angular_options_1 = require("../../../lib/angular-options");
 const form_definition_control_1 = require("../../../lib/form-definition-control");
 function NormalizeFormDefinitionOptions(options) {
@@ -23,7 +24,7 @@ function printFormDefinitionOptions(options) {
 }
 function default_1(options) {
     const normalizedOptions = NormalizeFormDefinitionOptions(options);
-    const { name, project, directory, feature, controlList, standalone, } = normalizedOptions;
+    const { name, project, directory, feature, controlList, standalone, context, nestModule, controllerName, backend, shared, scope, prefix, overwrite, replace, } = normalizedOptions;
     printFormDefinitionOptions(normalizedOptions);
     return () => {
         return (0, schematics_1.chain)([
@@ -36,6 +37,18 @@ function default_1(options) {
                 controlList,
                 name,
             }),
+            (0, schematics_1.chain)(controlList.map(control => (0, schematics_utilities_1.ExecuteSchematic)('form-control', Object.assign({ formName: name, project,
+                feature,
+                directory,
+                context,
+                nestModule,
+                controllerName,
+                backend,
+                shared,
+                scope,
+                prefix,
+                overwrite,
+                replace }, control)))),
             standalone ?
                 (0, schematics_1.chain)([
                     () => console.log('Coerce form providers file ...'),

package/src/schematics/form/form-definition/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/form/form-definition/index.ts"],"names":[],"mappings":";;;AAAA,2DAAmD;AACnD,mEAGmC;AAEnC,kEAKsC;AACtC,kFAG8C;AAS9C,SAAgB,8BAA8B,CAC5C,OAAwC;;IAExC,MAAM,wBAAwB,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,CAAC;IAClE,IAAA,kDAAgC,EAAC,wBAAwB,CAAC,CAAC;IAC3D,OAAO,MAAM,CAAC,MAAM,iCACf,wBAAwB,KAC3B,WAAW,EAAE,IAAA,4DAAkC,EAAC,OAAO,CAAC,WAAW,CAAC,EACpE,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,IACtC,CAAC;AACL,CAAC;AAVD,wEAUC;AAED,SAAS,0BAA0B,CAAC,OAAwC;IAC1E,IAAA,qCAAmB,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAChD,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE;QAC9B,OAAO,CAAC,GAAG,CAAC,iBAAkB,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAE,EAAE,CAAC,CAAC;KACrF;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;KACnC;AACH,CAAC;AAED,mBAAyB,OAA8B;IACrD,MAAM,iBAAiB,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;IAClE,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,EACT,OAAO,EACP,WAAW,EACX,UAAU,GACX,GAAG,iBAAiB,CAAC;IACtB,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;IAC9C,OAAO,GAAG,EAAE;QACV,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,2DAA2D,CAAC;YAChF,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC;YACrD,IAAA,0CAAoB,EAAC;gBACnB,OAAO;gBACP,OAAO;gBACP,SAAS;gBACT,WAAW;gBACX,IAAI;aACL,CAAC;YACF,UAAU,CAAC,CAAC;gBACZ,IAAA,kBAAK,EAAC;oBACJ,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC;oBACnD,IAAA,6CAAuB,EAAC;wBACtB,OAAO;wBACP,OAAO;wBACP,SAAS;wBACT,IAAI;qBACL,CAAC;iBACH,CAAC,CAAC,CAAC;gBACJ,IAAA,kBAAK,EAAC;oBACJ,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC;iBAClD,CAAC;YACF,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE;SACzB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAtCD,4BAsCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/form/form-definition/index.ts"],"names":[],"mappings":";;;AAAA,2DAAmD;AACnD,mEAGmC;AACnC,qEAA8D;AAE9D,kEAKsC;AACtC,kFAG8C;AAS9C,SAAgB,8BAA8B,CAC5C,OAAwC;;IAExC,MAAM,wBAAwB,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,CAAC;IAClE,IAAA,kDAAgC,EAAC,wBAAwB,CAAC,CAAC;IAC3D,OAAO,MAAM,CAAC,MAAM,iCACf,wBAAwB,KAC3B,WAAW,EAAE,IAAA,4DAAkC,EAAC,OAAO,CAAC,WAAW,CAAC,EACpE,UAAU,EAAE,MAAA,OAAO,CAAC,UAAU,mCAAI,IAAI,IACtC,CAAC;AACL,CAAC;AAVD,wEAUC;AAED,SAAS,0BAA0B,CAAC,OAAwC;IAC1E,IAAA,qCAAmB,EAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAChD,IAAI,OAAO,CAAC,WAAW,CAAC,MAAM,EAAE;QAC9B,OAAO,CAAC,GAAG,CAAC,iBAAkB,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAE,EAAE,CAAC,CAAC;KACrF;SAAM;QACL,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;KACnC;AACH,CAAC;AAED,mBAAyB,OAA8B;IACrD,MAAM,iBAAiB,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;IAClE,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,SAAS,EACT,OAAO,EACP,WAAW,EACX,UAAU,EACV,OAAO,EACP,UAAU,EACV,cAAc,EACd,OAAO,EACP,MAAM,EACN,KAAK,EACL,MAAM,EACN,SAAS,EACT,OAAO,GACR,GAAG,iBAAiB,CAAC;IACtB,0BAA0B,CAAC,iBAAiB,CAAC,CAAC;IAC9C,OAAO,GAAG,EAAE;QACV,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,2DAA2D,CAAC;YAChF,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC;YACrD,IAAA,0CAAoB,EAAC;gBACnB,OAAO;gBACP,OAAO;gBACP,SAAS;gBACT,WAAW;gBACX,IAAI;aACL,CAAC;YACF,IAAA,kBAAK,EAAC,WAAW,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAA,uCAAgB,EAAC,cAAc,kBAC9D,QAAQ,EAAE,IAAI,EACd,OAAO;gBACP,OAAO;gBACP,SAAS;gBACT,OAAO;gBACP,UAAU;gBACV,cAAc;gBACd,OAAO;gBACP,MAAM;gBACN,KAAK;gBACL,MAAM;gBACN,SAAS;gBACT,OAAO,IACJ,OAAO,EACV,CAAC,CAAC;YACJ,UAAU,CAAC,CAAC;gBACZ,IAAA,kBAAK,EAAC;oBACJ,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,gCAAgC,CAAC;oBACnD,IAAA,6CAAuB,EAAC;wBACtB,OAAO;wBACP,OAAO;wBACP,SAAS;wBACT,IAAI;qBACL,CAAC;iBACH,CAAC,CAAC,CAAC;gBACJ,IAAA,kBAAK,EAAC;oBACJ,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC;iBAClD,CAAC;YACF,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE;SACzB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AA/DD,4BA+DC"}