@rxap/schematic-angular 16.2.0-dev.5 → 16.2.0-dev.7

package/src/schematics/form/control/input-form-control/schema.d.ts

@@ -1,5 +1,4 @@
+import { InputFormControl } from '../../../../lib/form-control';
 import { FormControlOptions } from '../../form-control/schema';
 
-export interface InputFormControlOptions extends FormControlOptions {
-  inputType?: string;
-}
+export interface InputFormControlOptions extends FormControlOptions, InputFormControl {}

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

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

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

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

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

@@ -7,116 +7,152 @@ const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const path_1 = require("path");
 const ts_morph_1 = require("ts-morph");
 const angular_options_1 = require("../../../../lib/angular-options");
-const form_control_1 = require("../../form-control");
+const backend_types_1 = require("../../../../lib/backend-types");
+const form_control_1 = require("../../../../lib/form-control");
+const form_control_2 = require("../../form-control");
 function NormalizeSelectFormControlOptions(options) {
-    var _a, _b;
-    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;
-    return Object.freeze(Object.assign(Object.assign({}, normalizedOptions), { isArray,
-        multiple, staticDataSource: (_b = options.staticDataSource) !== null && _b !== void 0 ? _b : false }));
+    return Object.freeze(Object.assign(Object.assign({}, (0, form_control_2.NormalizeFormControlOptions)(options)), (0, form_control_1.NormalizeSelectFormControl)(options)));
 }
 exports.NormalizeSelectFormControlOptions = NormalizeSelectFormControlOptions;
 function printOptions(options) {
     (0, angular_options_1.PrintAngularOptions)('select-form-control', options);
 }
-function default_1(options) {
-    const normalizedOptions = NormalizeSelectFormControlOptions(options);
-    const { name, project, feature, directory, formName, type, isArray, state, isRequired, validatorList, staticDataSource, nestModule, controllerName, context, scope, } = normalizedOptions;
-    printOptions(normalizedOptions);
-    const optionsOperationName = ['get', name, 'options'].join('-');
+function noneBackendOptionsRule(normalizedOptions) {
+    const { name, project, feature, directory, formName, type, isArray, state, isRequired, validatorList, } = normalizedOptions;
+    const optionsDataSourceDirectory = (0, path_1.join)(directory !== null && directory !== void 0 ? directory : '', 'data-sources');
+    const optionsDataSourceName = (0, schematics_utilities_1.classify)([name, 'options', 'data-source'].join('-'));
+    const optionsDataSourceImportPath = `./data-sources/${(0, schematics_utilities_1.dasherize)(name)}-options.data-source`;
+    return (0, schematics_1.chain)([
+        (0, schematics_ts_morph_1.CoerceOptionsDataSourceRule)({
+            project,
+            feature,
+            directory: optionsDataSourceDirectory,
+            name: [name, 'options'].join('-'),
+        }),
+        (0, schematics_ts_morph_1.CoerceFormProviderRule)({
+            project,
+            feature,
+            directory,
+            providerObject: optionsDataSourceName,
+            importStructures: [
+                {
+                    namedImports: [optionsDataSourceName],
+                    moduleSpecifier: optionsDataSourceImportPath,
+                },
+            ],
+        }),
+        (0, schematics_ts_morph_1.CoerceFormDefinitionControl)({
+            project,
+            feature,
+            directory,
+            formName,
+            name,
+            type,
+            isArray,
+            state,
+            isRequired,
+            validatorList,
+            coerceFormControl: (sourceFile, classDeclaration, control) => {
+                const { propertyDeclaration, decoratorDeclaration, } = (0, schematics_ts_morph_1.CoerceFormControl)(sourceFile, classDeclaration, control);
+                (0, schematics_ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseOptionsDataSource').set({
+                    arguments: [optionsDataSourceName],
+                });
+                (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                    namedImports: [optionsDataSourceName],
+                    moduleSpecifier: optionsDataSourceImportPath,
+                });
+                (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                    namedImports: ['UseOptionsDataSource'],
+                    moduleSpecifier: '@rxap/form-system',
+                });
+                return {
+                    propertyDeclaration,
+                    decoratorDeclaration,
+                };
+            },
+        })
+    ]);
+}
+function nestJsBackendOptionsRule(normalizedOptions) {
+    const { name, project, feature, directory, formName, type, isArray, state, isRequired, validatorList, nestModule, controllerName, context, scope, } = normalizedOptions;
     const optionsOperationPath = ['options', name].join('/');
+    const optionsOperationName = ['get', name, 'options'].join('-');
     const optionsOperationId = (0, schematics_ts_morph_1.buildOperationId)(normalizedOptions, optionsOperationName, (0, schematics_ts_morph_1.BuildNestControllerName)({
         controllerName,
         nestModule,
     }));
-    const optionsDataSourceName = (0, schematics_utilities_1.classify)([name, 'options', 'data-source'].join('-'));
-    const optionsDataSourceImportPath = `./data-sources/${(0, schematics_utilities_1.dasherize)(name)}-options.data-source`;
-    const optionsDataSourceDirectory = (0, path_1.join)(directory !== null && directory !== void 0 ? directory : '', 'data-sources');
+    return (0, schematics_1.chain)([
+        (0, schematics_ts_morph_1.CoerceOptionsOperationRule)({
+            project,
+            feature,
+            nestModule,
+            controllerName,
+            operationName: optionsOperationName,
+            path: optionsOperationPath,
+            control: normalizedOptions,
+            context,
+        }),
+        (0, schematics_ts_morph_1.CoerceFormDefinitionControl)({
+            project,
+            feature,
+            directory,
+            formName,
+            name,
+            type,
+            isArray,
+            state,
+            isRequired,
+            validatorList,
+            coerceFormControl: (sourceFile, classDeclaration, control) => {
+                const { propertyDeclaration, decoratorDeclaration, } = (0, schematics_ts_morph_1.CoerceFormControl)(sourceFile, classDeclaration, control);
+                (0, schematics_ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseOptionsMethod').set({
+                    arguments: [
+                        (0, schematics_ts_morph_1.OperationIdToClassName)(optionsOperationId),
+                        ts_morph_1.Writers.object({ withoutParameters: 'true' }),
+                    ],
+                });
+                (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                    namedImports: [(0, schematics_ts_morph_1.OperationIdToClassName)(optionsOperationId)],
+                    moduleSpecifier: (0, schematics_ts_morph_1.OperationIdToClassImportPath)(optionsOperationId, scope),
+                });
+                (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                    namedImports: ['UseOptionsMethod'],
+                    moduleSpecifier: '@rxap/form-system',
+                });
+                return {
+                    propertyDeclaration,
+                    decoratorDeclaration,
+                };
+            },
+        })
+    ]);
+}
+function openApiBackendOptionsRule(normalizedOptions) {
+    return () => {
+        throw new schematics_1.SchematicsException('The open api backend is not supported yet!');
+    };
+}
+function optionsRule(normalizedOptions) {
+    const { backend } = normalizedOptions;
+    switch (backend) {
+        case backend_types_1.BackendTypes.LOCAL:
+        case backend_types_1.BackendTypes.NONE:
+            return noneBackendOptionsRule(normalizedOptions);
+        case backend_types_1.BackendTypes.NESTJS:
+            return nestJsBackendOptionsRule(normalizedOptions);
+        case backend_types_1.BackendTypes.OPEN_API:
+            return openApiBackendOptionsRule(normalizedOptions);
+        default:
+            throw new schematics_1.SchematicsException(`The backend type "${backend}" is not supported!`);
+    }
+}
+function default_1(options) {
+    const normalizedOptions = NormalizeSelectFormControlOptions(options);
+    printOptions(normalizedOptions);
     return () => {
         return (0, schematics_1.chain)([
             () => console.group('\x1b[32m[@rxap/schematics-angular:select-form-control]\x1b[0m'),
-            (0, schematics_utilities_1.ExecuteSchematic)('form-control', normalizedOptions),
-            () => staticDataSource
-                ? (0, schematics_1.chain)([
-                    (0, schematics_ts_morph_1.CoerceOptionsDataSourceRule)({
-                        project,
-                        feature,
-                        directory: optionsDataSourceDirectory,
-                        name: [name, 'options'].join('-'),
-                    }),
-                    (0, schematics_ts_morph_1.CoerceFormProviderRule)({
-                        project,
-                        feature,
-                        directory,
-                        providerObject: optionsDataSourceName,
-                        importStructures: [
-                            {
-                                namedImports: [optionsDataSourceName],
-                                moduleSpecifier: optionsDataSourceImportPath,
-                            },
-                        ],
-                    }),
-                ])
-                : (0, schematics_ts_morph_1.CoerceOptionsOperationRule)({
-                    project,
-                    feature,
-                    nestModule,
-                    controllerName,
-                    operationName: optionsOperationName,
-                    path: optionsOperationPath,
-                    control: normalizedOptions,
-                    context,
-                }),
-            (0, schematics_ts_morph_1.CoerceFormDefinitionControl)({
-                project,
-                feature,
-                directory,
-                formName,
-                name,
-                type,
-                isArray,
-                state,
-                isRequired,
-                validatorList,
-                coerceFormControl: (sourceFile, classDeclaration, control) => {
-                    const { propertyDeclaration, decoratorDeclaration, } = (0, schematics_ts_morph_1.CoerceFormControl)(sourceFile, classDeclaration, control);
-                    if (staticDataSource) {
-                        (0, schematics_ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseOptionsDataSource').set({
-                            arguments: [optionsDataSourceName],
-                        });
-                        (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
-                            namedImports: [optionsDataSourceName],
-                            moduleSpecifier: optionsDataSourceImportPath,
-                        });
-                        (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
-                            namedImports: ['UseOptionsDataSource'],
-                            moduleSpecifier: '@rxap/form-system',
-                        });
-                    }
-                    else {
-                        (0, schematics_ts_morph_1.CoerceDecorator)(propertyDeclaration, 'UseOptionsMethod').set({
-                            arguments: [
-                                (0, schematics_ts_morph_1.OperationIdToClassName)(optionsOperationId),
-                                ts_morph_1.Writers.object({ withoutParameters: 'true' }),
-                            ],
-                        });
-                        (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
-                            namedImports: [(0, schematics_ts_morph_1.OperationIdToClassName)(optionsOperationId)],
-                            moduleSpecifier: (0, schematics_ts_morph_1.OperationIdToClassImportPath)(optionsOperationId, scope),
-                        });
-                        (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
-                            namedImports: ['UseOptionsMethod'],
-                            moduleSpecifier: '@rxap/form-system',
-                        });
-                    }
-                    return {
-                        propertyDeclaration,
-                        decoratorDeclaration,
-                    };
-                },
-            }),
+            optionsRule(normalizedOptions),
             (0, schematics_ts_morph_1.EnforceUseFormControlOrderRule)(normalizedOptions),
             () => console.groupEnd(),
         ]);

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

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

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

@@ -1,6 +1,5 @@
+import { SelectFormControl } from '../../../../lib/form-control';
 import { FormControlOptions } from '../../form-control/schema';
 
-export interface SelectFormControlOptions extends FormControlOptions {
-  multiple?: boolean;
-  staticDataSource?: boolean;
+export interface SelectFormControlOptions extends FormControlOptions, SelectFormControl {
 }

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

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

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

@@ -1,12 +1,10 @@
 import { Normalized } from '@rxap/utilities';
 import { WriterFunction } from 'ts-morph';
-import { NormalizedTableColumn } from '../../../../lib/table-column';
+import { NormalizedTableSelectColumn, NormalizedTableSelectFormControl } from '../../../../lib/form-control';
 import { NormalizedFormControlOptions } from '../../form-control';
 import { TableSelectFormControlOptions } from './schema';
-export interface NormalizedTableSelectFormControlOptions extends Omit<Readonly<Normalized<TableSelectFormControlOptions> & NormalizedFormControlOptions>, 'columnList'> {
-    columnList: ReadonlyArray<NormalizedTableColumn>;
-}
+export type NormalizedTableSelectFormControlOptions = Readonly<Normalized<Omit<TableSelectFormControlOptions, 'columnList' | 'propertyList'>> & NormalizedFormControlOptions & NormalizedTableSelectFormControl>;
 export declare function NormalizeTableSelectFormControlOptions(options: TableSelectFormControlOptions): NormalizedTableSelectFormControlOptions;
-export declare function TableColumnToTableSelectColumn(options: NormalizedTableColumn): WriterFunction;
-export declare function TableColumnListToTableSelectColumnMap(columnList: ReadonlyArray<NormalizedTableColumn>): WriterFunction;
+export declare function TableColumnToTableSelectColumn(column: NormalizedTableSelectColumn): WriterFunction;
+export declare function TableColumnListToTableSelectColumnMap(columnList: Array<NormalizedTableSelectColumn>): WriterFunction;
 export default function (options: TableSelectFormControlOptions): () => import("@angular-devkit/schematics").Rule;

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,