@rxap/schematic-angular 16.2.0-dev.2 → 16.2.0-dev.20

package/src/lib/table/table-filter-column-rule.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TableFilterColumnRule = 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 table_component_1 = require("../../schematics/table/table-component");
+const use_pick_from_table_interface_as_form_type_1 = require("../use-pick-from-table-interface-as-form-type");
+/**
+ * Applies table filter column rule.
+ *
+ * @param {NormalizedMinimumTableOptions & NormalizedAngularOptions & { name: string }} normalizedOptions - The normalized options object.
+ * @param {string} [suffix] - The optional suffix string for the file name of the table interface.
+ * @returns {Rule} - The rule function.
+ */
+function TableFilterColumnRule(normalizedOptions, suffix) {
+    const { columnList, project, feature, shared, directory, backend, overwrite, componentName, name, } = normalizedOptions;
+    if (columnList.some((c) => c.hasFilter)) {
+        return (0, schematics_1.chain)([
+            () => console.log(`Coerce the filter form definition`),
+            (0, schematics_utilities_1.ExecuteSchematic)('form-definition', {
+                name: (0, schematics_utilities_1.CoerceSuffix)(componentName, '-filter'),
+                project,
+                feature,
+                shared,
+                directory,
+                backend,
+                overwrite,
+                controlList: columnList
+                    .filter((column) => column.hasFilter)
+                    .map(table_component_1.TableColumnToFormControl),
+            }),
+            (0, schematics_ts_morph_1.CoerceComponentRule)({
+                project,
+                feature,
+                shared,
+                name: componentName,
+                directory,
+                overwrite,
+                tsMorphTransform: (project, [sourceFile]) => {
+                    (0, schematics_ts_morph_1.AddComponentProvider)(sourceFile, 'FormProviders', [
+                        {
+                            moduleSpecifier: './form.providers',
+                            namedImports: ['FormProviders'],
+                        },
+                    ]);
+                    (0, schematics_ts_morph_1.AddComponentProvider)(sourceFile, 'TableFilterService', [
+                        {
+                            moduleSpecifier: '@rxap/material-table-system',
+                            namedImports: ['TableFilterService'],
+                        },
+                    ]);
+                    (0, schematics_ts_morph_1.AddComponentProvider)(sourceFile, {
+                        provide: 'RXAP_TABLE_FILTER_FORM_DEFINITION',
+                        useFactory: 'FormFactory',
+                        deps: ['INJECTOR'],
+                    }, [
+                        {
+                            moduleSpecifier: '@angular/core',
+                            namedImports: ['INJECTOR'],
+                        },
+                        {
+                            moduleSpecifier: './form.providers',
+                            namedImports: ['FormFactory'],
+                        },
+                        {
+                            moduleSpecifier: '@rxap/material-table-system',
+                            namedImports: ['RXAP_TABLE_FILTER_FORM_DEFINITION'],
+                        },
+                    ]);
+                },
+            }),
+            (0, use_pick_from_table_interface_as_form_type_1.UsePickFromTableInterfaceAsFormTypeRule)({
+                name,
+                columnList,
+                feature,
+                project,
+                shared,
+                directory,
+                suffix,
+                formName: (0, schematics_utilities_1.CoerceSuffix)(componentName, '-filter'),
+            }),
+        ]);
+    }
+    return (0, schematics_1.noop)();
+}
+exports.TableFilterColumnRule = TableFilterColumnRule;
+//# sourceMappingURL=table-filter-column-rule.js.map

package/src/lib/table/table-filter-column-rule.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"table-filter-column-rule.js","sourceRoot":"","sources":["../../../../../../../packages/schematic/angular/src/lib/table/table-filter-column-rule.ts"],"names":[],"mappings":";;;AAAA,2DAIoC;AACpC,mEAGmC;AACnC,qEAGoC;AAKpC,4EAAkF;AAGlF,8GAAwG;AAExG;;;;;;GAMG;AACH,SAAgB,qBAAqB,CAAC,iBAA8F,EAAE,MAAe;IACnJ,MAAM,EACJ,UAAU,EACV,OAAO,EACP,OAAO,EACP,MAAM,EACN,SAAS,EACT,OAAO,EACP,SAAS,EACT,aAAa,EACb,IAAI,GACL,GAAG,iBAAiB,CAAC;IACtB,IAAI,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,EAAE;QACvC,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC;YACtD,IAAA,uCAAgB,EAAC,iBAAiB,EAAE;gBAClC,IAAI,EAAE,IAAA,mCAAY,EAAC,aAAa,EAAE,SAAS,CAAC;gBAC5C,OAAO;gBACP,OAAO;gBACP,MAAM;gBACN,SAAS;gBACT,OAAO;gBACP,SAAS;gBACT,WAAW,EAAE,UAAU;qBACpB,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,SAAS,CAAC;qBACpC,GAAG,CAAC,0CAAwB,CAAC;aACjC,CAAC;YACF,IAAA,yCAAmB,EAAC;gBAClB,OAAO;gBACP,OAAO;gBACP,MAAM;gBACN,IAAI,EAAE,aAAa;gBACnB,SAAS;gBACT,SAAS;gBACT,gBAAgB,EAAE,CAChB,OAAgB,EAChB,CAAE,UAAU,CAAkB,EAC9B,EAAE;oBACF,IAAA,0CAAoB,EAClB,UAAU,EACV,eAAe,EACf;wBACE;4BACE,eAAe,EAAE,kBAAkB;4BACnC,YAAY,EAAE,CAAE,eAAe,CAAE;yBAClC;qBACF,CACF,CAAC;oBACF,IAAA,0CAAoB,EAClB,UAAU,EACV,oBAAoB,EACpB;wBACE;4BACE,eAAe,EAAE,6BAA6B;4BAC9C,YAAY,EAAE,CAAE,oBAAoB,CAAE;yBACvC;qBACF,CACF,CAAC;oBACF,IAAA,0CAAoB,EAClB,UAAU,EACV;wBACE,OAAO,EAAE,mCAAmC;wBAC5C,UAAU,EAAE,aAAa;wBACzB,IAAI,EAAE,CAAE,UAAU,CAAE;qBACrB,EACD;wBACE;4BACE,eAAe,EAAE,eAAe;4BAChC,YAAY,EAAE,CAAE,UAAU,CAAE;yBAC7B;wBACD;4BACE,eAAe,EAAE,kBAAkB;4BACnC,YAAY,EAAE,CAAE,aAAa,CAAE;yBAChC;wBACD;4BACE,eAAe,EAAE,6BAA6B;4BAC9C,YAAY,EAAE,CAAE,mCAAmC,CAAE;yBACtD;qBACF,CACF,CAAC;gBACJ,CAAC;aACF,CAAC;YACF,IAAA,oFAAuC,EAAC;gBACtC,IAAI;gBACJ,UAAU;gBACV,OAAO;gBACP,OAAO;gBACP,MAAM;gBACN,SAAS;gBACT,MAAM;gBACN,QAAQ,EAAE,IAAA,mCAAY,EAAC,aAAa,EAAE,SAAS,CAAC;aACjD,CAAC;SACH,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,iBAAI,GAAE,CAAC;AAChB,CAAC;AAhGD,sDAgGC"}

package/src/lib/table-column.d.ts

@@ -1,6 +1,9 @@
-import { NormalizedTypeImport, TypeImport } from '@rxap/ts-morph';
+import { DataProperty, NormalizedDataProperty, NormalizedTypeImport, TypeImport } from '@rxap/ts-morph';
 import { Normalized } from '@rxap/utilities';
-export type TableColumnPipe = TypeImport;
+import Handlebars from 'handlebars';
+import { BaseFormControl } from './form-control';
+import { PipeOption } from './pipe-option';
+export type TableColumnPipe = PipeOption;
 export declare enum TableColumnModifier {
     FILTER = "filter",
     ACTIVE = "active",
@@ -23,9 +26,7 @@ export declare enum TableColumnKind {
     COPY_TO_CLIPBOARD = "copy-to-clipboard"
 }
 export declare function IsTableColumnKind(value: string): value is TableColumnKind;
-export interface TableColumn {
-    name: string;
-    type?: string | TypeImport;
+export interface TableColumn extends DataProperty {
     modifiers?: string[];
     hasFilter?: boolean;
     withoutTitle?: boolean;
@@ -37,20 +38,29 @@ export interface TableColumn {
     show?: boolean;
     nowrap?: boolean;
     cssClass?: string;
-    role?: TableColumnKind;
+    kind?: TableColumnKind;
     template?: string;
     pipeList?: Array<TableColumnPipe | string>;
     importList?: TypeImport[];
+    filterControl?: BaseFormControl;
 }
 export type NormalizedTableColumnPipe = NormalizedTypeImport;
-export interface NormalizedTableColumn extends Omit<Readonly<Normalized<TableColumn>>, 'pipeList' | 'importList'> {
+export interface NormalizedTableColumn extends Readonly<Normalized<Omit<TableColumn, 'pipeList' | 'importList'>> & NormalizedDataProperty> {
     type: NormalizedTypeImport;
     propertyPath: string;
     pipeList: ReadonlyArray<NormalizedTableColumnPipe>;
     modifiers: TableColumnModifier[];
     importList: ReadonlyArray<NormalizedTypeImport>;
-    role: TableColumnKind;
+    kind: TableColumnKind;
+    handlebars: Handlebars.TemplateDelegate<{
+        column: NormalizedTableColumn;
+    }>;
 }
-export declare function NormalizeTableColumnPipe(pipe: string | TableColumnPipe): NormalizedTableColumnPipe;
+export declare function GuessColumnTypeType(kind: TableColumnKind, type?: string | TypeImport): string | TypeImport;
+export declare function TableColumnNameToPropertyPath(name: string, propertyPath?: string | null | undefined): {
+    name: string;
+    propertyPath: string;
+};
+export declare function TableColumnNameToTitle(name: string): string;
 export declare function NormalizeTableColumn(column: Readonly<TableColumn>): NormalizedTableColumn;
 export declare function NormalizeTableColumnList(columnList?: ReadonlyArray<Readonly<TableColumn>>): ReadonlyArray<NormalizedTableColumn>;

package/src/lib/table-column.js

@@ -1,9 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NormalizeTableColumnList = exports.NormalizeTableColumn = exports.NormalizeTableColumnPipe = exports.IsTableColumnKind = exports.TableColumnKind = exports.IsTableColumnModifier = exports.TableColumnModifier = void 0;
+exports.NormalizeTableColumnList = exports.NormalizeTableColumn = exports.TableColumnNameToTitle = exports.TableColumnNameToPropertyPath = exports.GuessColumnTypeType = exports.IsTableColumnKind = exports.TableColumnKind = exports.IsTableColumnModifier = exports.TableColumnModifier = void 0;
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const ts_morph_1 = require("@rxap/ts-morph");
 const utilities_1 = require("@rxap/utilities");
+const path_1 = require("path");
+const form_control_1 = require("./form-control");
+const form_definition_control_1 = require("./form-definition-control");
+const load_handlebars_template_1 = require("./load-handlebars-template");
+const pipe_option_1 = require("./pipe-option");
 var TableColumnModifier;
 (function (TableColumnModifier) {
     TableColumnModifier["FILTER"] = "filter";
@@ -34,44 +39,10 @@ function IsTableColumnKind(value) {
     return Object.values(TableColumnKind).includes(value);
 }
 exports.IsTableColumnKind = IsTableColumnKind;
-function NormalizeTableColumnPipe(pipe) {
-    if (typeof pipe === 'string') {
-        switch (pipe) {
-            case 'async':
-                return (0, ts_morph_1.NormalizeTypeImport)({
-                    name: 'async',
-                    namedImport: 'AsyncPipe',
-                    moduleSpecifier: '@angular/common',
-                });
-            case 'date':
-                return (0, ts_morph_1.NormalizeTypeImport)({
-                    name: 'date',
-                    namedImport: 'DatePipe',
-                    moduleSpecifier: '@angular/common',
-                });
-            case 'json':
-                return (0, ts_morph_1.NormalizeTypeImport)({
-                    name: 'json',
-                    namedImport: 'JsonPipe',
-                    moduleSpecifier: '@angular/common',
-                });
-            case 'keyvalue':
-                return (0, ts_morph_1.NormalizeTypeImport)({
-                    name: 'keyvalue',
-                    namedImport: 'KeyValuePipe',
-                    moduleSpecifier: '@angular/common',
-                });
-            default:
-                throw new Error(`Unknown pipe ${pipe}`);
-        }
-    }
-    return (0, ts_morph_1.NormalizeTypeImport)(pipe);
-}
-exports.NormalizeTableColumnPipe = NormalizeTableColumnPipe;
 function coerceTableColumnImportList(column) {
     var _a;
     const importList = (_a = column.importList) !== null && _a !== void 0 ? _a : [];
-    switch (column.role) {
+    switch (column.kind) {
         case TableColumnKind.COMPONENT:
             (0, utilities_1.CoerceArrayItems)(importList, [
                 {
@@ -121,88 +92,124 @@ function coerceTableColumnImportList(column) {
             ], (a, b) => a.name === b.name);
             break;
     }
+    if (column.hasFilter) {
+        switch (column.kind) {
+            case TableColumnKind.BOOLEAN:
+                (0, utilities_1.CoerceArrayItems)(importList, [
+                    {
+                        name: 'MatCheckboxModule',
+                        moduleSpecifier: '@angular/material/checkbox',
+                    },
+                    {
+                        name: 'ReactiveFormsModule',
+                        moduleSpecifier: '@angular/forms',
+                    },
+                    {
+                        name: 'ParentControlContainerDirective',
+                        moduleSpecifier: '@rxap/forms',
+                    },
+                ], (a, b) => a.name === b.name);
+                break;
+            default:
+                (0, utilities_1.CoerceArrayItems)(importList, [
+                    {
+                        name: 'MatInputModule',
+                        moduleSpecifier: '@angular/material/input',
+                    },
+                    {
+                        name: 'MatButtonModule',
+                        moduleSpecifier: '@angular/material/button',
+                    },
+                    {
+                        name: 'MatIconModule',
+                        moduleSpecifier: '@angular/material/icon',
+                    },
+                    {
+                        name: 'InputClearButtonDirective',
+                        moduleSpecifier: '@rxap/material-form-system',
+                    },
+                    {
+                        name: 'ReactiveFormsModule',
+                        moduleSpecifier: '@angular/forms',
+                    },
+                    {
+                        name: 'ParentControlContainerDirective',
+                        moduleSpecifier: '@rxap/forms',
+                    },
+                ], (a, b) => a.name === b.name);
+                break;
+        }
+    }
     return importList;
 }
-function NormalizeTableColumn(column) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
-    let name;
-    let type = 'unknown';
-    let modifiers = [];
-    let hasFilter = false;
-    let title = null;
-    let propertyPath = null;
-    let hidden = false;
-    let active = false;
-    let inactive = false;
-    let show = false;
-    let nowrap = false;
-    let withoutTitle = false;
-    let cssClass = null;
-    let role = TableColumnKind.DEFAULT;
-    let template = null;
-    let pipeList = [];
-    let importList = [];
-    name = column.name;
-    type = (_a = column.type) !== null && _a !== void 0 ? _a : type;
-    modifiers = (_b = column.modifiers) !== null && _b !== void 0 ? _b : [];
-    hasFilter = (_c = column.hasFilter) !== null && _c !== void 0 ? _c : false;
-    title = (_d = column.title) !== null && _d !== void 0 ? _d : title;
-    propertyPath = (_e = column.propertyPath) !== null && _e !== void 0 ? _e : propertyPath;
-    hidden = (_f = column.hidden) !== null && _f !== void 0 ? _f : false;
-    active = (_g = column.active) !== null && _g !== void 0 ? _g : false;
-    inactive = (_h = column.inactive) !== null && _h !== void 0 ? _h : false;
-    show = (_j = column.show) !== null && _j !== void 0 ? _j : false;
-    nowrap = (_k = column.nowrap) !== null && _k !== void 0 ? _k : false;
-    withoutTitle = (_l = column.withoutTitle) !== null && _l !== void 0 ? _l : false;
-    cssClass = (_m = column.cssClass) !== null && _m !== void 0 ? _m : cssClass;
-    role = (_o = column.role) !== null && _o !== void 0 ? _o : role;
-    template = (_p = column.template) !== null && _p !== void 0 ? _p : template;
-    pipeList = (_q = column.pipeList) !== null && _q !== void 0 ? _q : pipeList;
-    importList = coerceTableColumnImportList(column);
-    const namePrefix = (_s = (_r = name.match(/^(_+)/)) === null || _r === void 0 ? void 0 : _r[1]) !== null && _s !== void 0 ? _s : '';
-    propertyPath !== null && propertyPath !== void 0 ? propertyPath : (propertyPath = name
-        .replace(/\?\./g, '.')
-        .split('.')
-        .map((part) => (0, schematics_utilities_1.camelize)(part))
-        .join('?.'));
-    name = (0, schematics_utilities_1.dasherize)(name.replace(/\??\./g, '_'));
-    if (namePrefix) {
-        name = namePrefix + name;
-        propertyPath = namePrefix + propertyPath;
-    }
-    title !== null && title !== void 0 ? title : (title = (0, schematics_utilities_1.dasherize)(name)
-        .replace(/_/g, '-')
-        .split('-')
-        .map((part) => (0, schematics_utilities_1.capitalize)(part))
-        .join(' '));
-    hasFilter = modifiers.includes(TableColumnModifier.FILTER) || hasFilter;
-    active = modifiers.includes(TableColumnModifier.ACTIVE) || active;
-    inactive = modifiers.includes(TableColumnModifier.INACTIVE) || inactive;
-    show = modifiers.includes(TableColumnModifier.SHOW) || show;
-    hidden = modifiers.includes(TableColumnModifier.HIDDEN) || hidden;
-    nowrap = modifiers.includes(TableColumnModifier.NOWRAP) || nowrap;
-    withoutTitle = modifiers.includes(TableColumnModifier.WITHOUT_TITLE) || modifiers.includes(TableColumnModifier.NO_TITLE) || withoutTitle;
-    if (!type || type === 'unknown') {
-        switch (role) {
-            case 'date':
+function GuessColumnTypeType(kind, type) {
+    const autoType = type ? typeof type === 'string' ? type : type.name : null;
+    if (!autoType || autoType === 'unknown') {
+        switch (kind) {
+            case TableColumnKind.DATE:
                 type = 'number | Date';
                 break;
-            case 'link':
+            case TableColumnKind.LINK:
                 type = 'string';
                 break;
-            case 'icon':
-                // TODO : use the IconConfig type
+            case TableColumnKind.ICON:
                 type = {
                     name: 'IconConfig',
                     moduleSpecifier: '@rxap/utilities',
                 };
                 break;
-            case 'boolean':
+            case TableColumnKind.BOOLEAN:
                 type = 'boolean';
                 break;
         }
     }
     type !== null && type !== void 0 ? type : (type = 'unknown');
+    return type;
+}
+exports.GuessColumnTypeType = GuessColumnTypeType;
+function TableColumnNameToPropertyPath(name, propertyPath = null) {
+    var _a, _b;
+    const namePrefix = (_b = (_a = name.match(/^(_+)/)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : '';
+    propertyPath !== null && propertyPath !== void 0 ? propertyPath : (propertyPath = name
+        .replace(/\?\./g, '.')
+        .split('.')
+        .map((part) => (0, schematics_utilities_1.camelize)(part))
+        .join('?.'));
+    name = (0, schematics_utilities_1.dasherize)(name.replace(/\??\./g, '_'));
+    if (namePrefix) {
+        name = namePrefix + name;
+        propertyPath = namePrefix + propertyPath;
+    }
+    return { name, propertyPath };
+}
+exports.TableColumnNameToPropertyPath = TableColumnNameToPropertyPath;
+function TableColumnNameToTitle(name) {
+    return (0, schematics_utilities_1.dasherize)(name)
+        .replace(/_/g, '-')
+        .split('-')
+        .map((part) => (0, schematics_utilities_1.capitalize)(part))
+        .join(' ');
+}
+exports.TableColumnNameToTitle = TableColumnNameToTitle;
+function NormalizeTableColumn(column) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+    const { name, propertyPath } = TableColumnNameToPropertyPath(column.name, column.propertyPath);
+    const modifiers = (_a = column.modifiers) !== null && _a !== void 0 ? _a : [];
+    let hasFilter = modifiers.includes(TableColumnModifier.FILTER) || ((_b = column.hasFilter) !== null && _b !== void 0 ? _b : false);
+    const title = (_c = column.title) !== null && _c !== void 0 ? _c : TableColumnNameToTitle(name);
+    const hidden = modifiers.includes(TableColumnModifier.HIDDEN) || ((_d = column.hidden) !== null && _d !== void 0 ? _d : false);
+    const active = modifiers.includes(TableColumnModifier.ACTIVE) || ((_e = column.active) !== null && _e !== void 0 ? _e : false);
+    const inactive = modifiers.includes(TableColumnModifier.INACTIVE) || ((_f = column.inactive) !== null && _f !== void 0 ? _f : false);
+    const show = modifiers.includes(TableColumnModifier.SHOW) || ((_g = column.show) !== null && _g !== void 0 ? _g : false);
+    const nowrap = modifiers.includes(TableColumnModifier.NOWRAP) || ((_h = column.nowrap) !== null && _h !== void 0 ? _h : false);
+    const withoutTitle = modifiers.includes(TableColumnModifier.WITHOUT_TITLE) || modifiers.includes(TableColumnModifier.NO_TITLE) || ((_j = column.withoutTitle) !== null && _j !== void 0 ? _j : false);
+    let cssClass = (_k = column.cssClass) !== null && _k !== void 0 ? _k : null;
+    const kind = (_l = column.kind) !== null && _l !== void 0 ? _l : TableColumnKind.DEFAULT;
+    const template = (_m = column.template) !== null && _m !== void 0 ? _m : kind + '-table-column.hbs';
+    const pipeList = (_o = column.pipeList) !== null && _o !== void 0 ? _o : [];
+    const importList = coerceTableColumnImportList(column);
+    const type = GuessColumnTypeType(kind, column.type);
+    const source = (_p = column.source) !== null && _p !== void 0 ? _p : propertyPath;
     if (nowrap) {
         if (!cssClass) {
             cssClass = 'nowrap';
@@ -214,13 +221,29 @@ function NormalizeTableColumn(column) {
     if (!modifiers.every(IsTableColumnModifier)) {
         throw new Error(`Unknown modifier in column ${name} - [ ${modifiers.join(', ')} ]`);
     }
-    if (!IsTableColumnKind(role)) {
-        throw new Error(`Unknown role in column ${name} - ${role}`);
+    if (!IsTableColumnKind(kind)) {
+        throw new Error(`Unknown kind in column ${name} - ${kind}`);
+    }
+    let filterControl = (_q = column.filterControl) !== null && _q !== void 0 ? _q : null;
+    if (Object.keys(filterControl !== null && filterControl !== void 0 ? filterControl : {}).length === 0) {
+        filterControl = null;
+    }
+    if (hasFilter && !filterControl) {
+        filterControl = { name: column.name, kind: form_control_1.FormControlKinds.DEFAULT };
+    }
+    if (filterControl && !hasFilter) {
+        hasFilter = true;
+    }
+    if (filterControl) {
+        (_r = filterControl.label) !== null && _r !== void 0 ? _r : (filterControl.label = title);
+    }
+    const normalizedFilterControl = filterControl ? (0, form_definition_control_1.NormalizeFormDefinitionControl)(filterControl) : null;
+    if (normalizedFilterControl) {
+        (0, utilities_1.CoerceArrayItems)(importList, normalizedFilterControl.importList, (a, b) => a.name === b.name);
     }
-    return Object.freeze({
-        role,
-        name,
-        type: (0, ts_morph_1.NormalizeTypeImport)(type),
+    return Object.freeze(Object.assign(Object.assign({}, (0, ts_morph_1.NormalizeDataProperty)(Object.assign(Object.assign({}, column), { name,
+        type,
+        source }))), { kind,
         modifiers,
         hasFilter,
         title,
@@ -231,11 +254,7 @@ function NormalizeTableColumn(column) {
         show,
         nowrap,
         withoutTitle,
-        cssClass,
-        pipeList: pipeList.map(NormalizeTableColumnPipe),
-        template,
-        importList: importList.map(ts_morph_1.NormalizeTypeImport),
-    });
+        cssClass, pipeList: (0, pipe_option_1.NormalizePipeOptionList)(pipeList), template, importList: (0, ts_morph_1.NormalizeTypeImportList)(importList), handlebars: (0, load_handlebars_template_1.LoadHandlebarsTemplate)(template, (0, path_1.join)(__dirname, '..', 'schematics', 'table', 'templates')), filterControl: normalizedFilterControl }));
 }
 exports.NormalizeTableColumn = NormalizeTableColumn;
 function NormalizeTableColumnList(columnList) {

package/src/lib/table-column.js.map

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

package/src/lib/table-options.d.ts

@@ -21,7 +21,7 @@ export interface NormalizedTableOptions extends Omit<Readonly<Normalized<TableOp
     componentName: string;
     columnList: ReadonlyArray<NormalizedTableColumn>;
     actionList: ReadonlyArray<NormalizedTableAction>;
-    propertyList: ReadonlyArray<NormalizedDataProperty>;
+    propertyList: Array<NormalizedDataProperty>;
     tableMethod: NormalizedExistingMethod | null;
     openApi: NormalizedTableOpenApiOptions | null;
 }

package/src/lib/tree-table-options.d.ts

@@ -18,7 +18,7 @@ export interface NormalizedTreeTableOptions extends Omit<Readonly<Normalized<Tre
     componentName: string;
     columnList: ReadonlyArray<NormalizedTableColumn>;
     actionList: ReadonlyArray<NormalizedTableAction>;
-    propertyList: ReadonlyArray<NormalizedDataProperty>;
+    propertyList: Array<NormalizedDataProperty>;
     tableRootMethod: NormalizedExistingMethod | null;
     tableChildMethod: NormalizedExistingMethod | null;
 }

package/src/lib/use-pick-from-table-interface-as-form-type.d.ts

@@ -0,0 +1,10 @@
+import { Rule } from '@angular-devkit/schematics';
+import { TsMorphAngularProjectTransformOptions } from '@rxap/schematics-ts-morph';
+import { NormalizedTableColumn } from './table-column';
+export interface UsePickFromTableInterfaceAsFormTypeRuleOptions extends TsMorphAngularProjectTransformOptions {
+    name: string;
+    formName: string;
+    columnList: ReadonlyArray<NormalizedTableColumn>;
+    suffix?: string;
+}
+export declare function UsePickFromTableInterfaceAsFormTypeRule(options: UsePickFromTableInterfaceAsFormTypeRuleOptions): Rule;

package/src/lib/use-pick-from-table-interface-as-form-type.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.UsePickFromTableInterfaceAsFormTypeRule = void 0;
+const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
+const schematics_utilities_1 = require("@rxap/schematics-utilities");
+const utilities_1 = require("@rxap/utilities");
+const form_table_action_1 = require("../schematics/table/action/form-table-action");
+function UsePickFromTableInterfaceAsFormTypeRule(options) {
+    const { name, columnList, formName, suffix = 'table', } = options;
+    const className = (0, schematics_utilities_1.CoerceSuffix)((0, utilities_1.classify)(formName), 'Form');
+    const interfaceName = `I${className}`;
+    const tableInterfaceName = `I${(0, utilities_1.classify)(name)}${(0, utilities_1.classify)(suffix)}`;
+    return (0, schematics_ts_morph_1.TsMorphAngularProjectTransformRule)(options, (project, [sourceFile]) => {
+        const interfaceDeclaration = sourceFile.getInterface(interfaceName);
+        if (interfaceDeclaration) {
+            interfaceDeclaration.remove();
+        }
+        const type = `Pick<${tableInterfaceName}, ${columnList.filter(c => c.hasFilter)
+            .map(c => `'${(0, utilities_1.camelize)(c.name)}'`)
+            .join(' | ')}>`;
+        (0, form_table_action_1.CoerceTypeAlias)(sourceFile, interfaceName, {
+            type,
+            isExported: true,
+        }).set({ type });
+        (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+            namedImports: [tableInterfaceName],
+            moduleSpecifier: `./${name}-${(0, utilities_1.dasherize)(suffix)}`,
+        });
+    }, ['/' + (0, schematics_utilities_1.CoerceSuffix)(formName, '.form.ts')]);
+}
+exports.UsePickFromTableInterfaceAsFormTypeRule = UsePickFromTableInterfaceAsFormTypeRule;
+//# sourceMappingURL=use-pick-from-table-interface-as-form-type.js.map

package/src/lib/use-pick-from-table-interface-as-form-type.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"use-pick-from-table-interface-as-form-type.js","sourceRoot":"","sources":["../../../../../../packages/schematic/angular/src/lib/use-pick-from-table-interface-as-form-type.ts"],"names":[],"mappings":";;;AACA,mEAImC;AACnC,qEAA0D;AAC1D,+CAIyB;AACzB,oFAA+E;AAW/E,SAAgB,uCAAuC,CACrD,OAAuD;IAEvD,MAAM,EACJ,IAAI,EACJ,UAAU,EACV,QAAQ,EACR,MAAM,GAAG,OAAO,GACjB,GAAG,OAAO,CAAC;IAEZ,MAAM,SAAS,GAAG,IAAA,mCAAY,EAAC,IAAA,oBAAQ,EAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAC3D,MAAM,aAAa,GAAG,IAAK,SAAU,EAAE,CAAC;IACxC,MAAM,kBAAkB,GAAG,IAAK,IAAA,oBAAQ,EAAC,IAAI,CAAE,GAAG,IAAA,oBAAQ,EAAC,MAAM,CAAC,EAAE,CAAC;IAErE,OAAO,IAAA,wDAAkC,EAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAE,UAAU,CAAE,EAAE,EAAE;QAE7E,MAAM,oBAAoB,GAAG,UAAU,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;QACpE,IAAI,oBAAoB,EAAE;YACxB,oBAAoB,CAAC,MAAM,EAAE,CAAC;SAC/B;QAED,MAAM,IAAI,GAAG,QAAS,kBAAmB,KAAM,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aAC/E,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAK,IAAA,oBAAQ,EAAC,CAAC,CAAC,IAAI,CAAE,GAAG,CAAC;aACnC,IAAI,CAAC,KAAK,CAAE,GAAG,CAAC;QAEnB,IAAA,mCAAe,EAAC,UAAU,EAAE,aAAa,EAAE;YACzC,IAAI;YACJ,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAEjB,IAAA,mCAAa,EAAC,UAAU,EAAE;YACxB,YAAY,EAAE,CAAE,kBAAkB,CAAE;YACpC,eAAe,EAAE,KAAM,IAAK,IAAI,IAAA,qBAAS,EAAC,MAAM,CAAC,EAAE;SACpD,CAAC,CAAC;IACL,CAAC,EAAE,CAAE,GAAG,GAAG,IAAA,mCAAY,EAAC,QAAQ,EAAE,UAAU,CAAC,CAAE,CAAC,CAAC;AACnD,CAAC;AAnCD,0FAmCC"}

package/src/lib/value-option.d.ts

@@ -0,0 +1,12 @@
+import { NormalizedTypeImport, TypeImport } from '@rxap/ts-morph';
+export interface ValueOption {
+    value: string;
+    type?: string | TypeImport;
+}
+export interface NormalizedValueOption {
+    value: string;
+    templateValue: string;
+    type: NormalizedTypeImport;
+}
+export declare function NormalizeValueOption(option: Readonly<ValueOption> | string): Readonly<NormalizedValueOption>;
+export declare function NormalizeValueOptionList(optionList?: Array<Readonly<ValueOption> | string>): ReadonlyArray<NormalizedValueOption>;