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

package/src/schematics/accordion/item/accordion-item-tree-table-component/template.schema.json

@@ -0,0 +1,43 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "accordion-item-tree-table-component-schematic",
+  "allOf": [
+    {
+      "$ref": "#/definitions/angular"
+    },
+    {
+      "$ref": "#/definitions/accordionItem"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "modifiers": {
+          "alias": "modifier",
+          "type": "array",
+          "items": {
+            "type": "string",
+            "enum": [
+              "navigation-back-header",
+              "without-title"
+            ]
+          },
+          "description": "The table modifiers"
+        },
+        "table": {
+          "$ref": "#/definitions/treeTable"
+        }
+      }
+    }
+  ],
+  "definitions": {
+    "treeTable": {
+      "$ref": "../../../tree-table.schema.json"
+    },
+    "accordionItem": {
+      "$ref": "../../../accordion-item.schema.json"
+    },
+    "angular": {
+      "$ref": "../../../angular.schema.json"
+    }
+  }
+}

package/src/schematics/accordion/templates/accordion-header.hbs

@@ -0,0 +1,6 @@
+<rxap-navigate-back-button>
+  <ng-container>
+  {{#if header.title}}<h1>{{header.title}}</h1>{{/if~}}
+  {{#if header.property}}<h1>\{{ data.{{header.property.name}} }}</h1>{{/if~}}
+  </ng-container>
+</rxap-navigate-back-button>

package/src/schematics/accordion/templates/data-grid-accordion-item.hbs

@@ -0,0 +1,15 @@
+
+<mat-expansion-panel>
+
+  <mat-expansion-panel-header>
+    <mat-panel-title i18n>{{item.title}}</mat-panel-title>
+    {{#if item.description}}
+    <mat-panel-description i18n>{{item.description}}</mat-panel-description>
+    {{/if}}
+  </mat-expansion-panel-header>
+
+  <ng-template matExpansionPanelContent>
+    <{{prefix}}-{{item.name}}-panel></{{prefix}}-{{item.name}}-panel>
+  </ng-template>
+
+</mat-expansion-panel>

package/src/schematics/accordion/templates/default-accordion-item.hbs

@@ -0,0 +1,15 @@
+
+<mat-expansion-panel>
+
+  <mat-expansion-panel-header>
+    <mat-panel-title i18n>{{item.title}}</mat-panel-title>
+    {{#if item.description}}
+    <mat-panel-description i18n>{{item.description}}</mat-panel-description>
+    {{/if}}
+  </mat-expansion-panel-header>
+
+  <ng-template matExpansionPanelContent>
+    <{{prefix}}-{{item.name}}-panel></{{prefix}}-{{item.name}}-panel>
+  </ng-template>
+
+</mat-expansion-panel>

package/src/schematics/accordion/templates/switch-accordion-item.hbs

@@ -0,0 +1,21 @@
+
+<ng-container [ngSwitch]="data.{{item.switch.property.name}}">
+  {{#each item.switch.case}}
+  <ng-template [ngSwitchCase]="{{this.test}}">
+  {{#each this.itemList}}
+  {{#if this.permission}}<ng-template rxapIfHasPermission="{{item.permission}}">{{/if~}}
+  {{ indent (compile this.handlebars item=this prefix=../../prefix) 2 }}
+  {{#if this.permission}}</ng-template>{{/if~}}
+  {{/each}}
+  </ng-template>
+  {{/each}}
+  {{#if item.switch.defaultCase}}
+  <ng-template ngSwitchDefault>
+  {{#each item.switch.defaultCase.itemList}}
+  {{#if this.permission}}<ng-template rxapIfHasPermission="{{item.permission}}">{{/if~}}
+  {{ indent (compile this.handlebars item=this prefix=../prefix) 2 }}
+  {{#if this.permission}}</ng-template>{{/if~}}
+  {{/each}}
+  </ng-template>
+  {{/if}}
+</ng-container>

package/src/schematics/accordion/templates/table-accordion-item.hbs

@@ -0,0 +1,15 @@
+
+<mat-expansion-panel>
+
+  <mat-expansion-panel-header>
+    <mat-panel-title i18n>{{item.title}}</mat-panel-title>
+    {{#if item.description}}
+    <mat-panel-description i18n>{{item.description}}</mat-panel-description>
+    {{/if}}
+  </mat-expansion-panel-header>
+
+  <ng-template matExpansionPanelContent>
+    <{{prefix}}-{{item.name}}-panel></{{prefix}}-{{item.name}}-panel>
+  </ng-template>
+
+</mat-expansion-panel>

package/src/schematics/accordion/templates/tree-table-accordion-item.hbs

@@ -0,0 +1,15 @@
+
+<mat-expansion-panel>
+
+  <mat-expansion-panel-header>
+    <mat-panel-title i18n>{{item.title}}</mat-panel-title>
+    {{#if item.description}}
+    <mat-panel-description i18n>{{item.description}}</mat-panel-description>
+    {{/if}}
+  </mat-expansion-panel-header>
+
+  <ng-template matExpansionPanelContent>
+    <{{prefix}}-{{item.name}}-panel></{{prefix}}-{{item.name}}-panel>
+  </ng-template>
+
+</mat-expansion-panel>

package/src/schematics/accordion-identifier.schema.json

@@ -0,0 +1,25 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "accordion-identifier",
+  "type": "object",
+  "properties": {
+    "property": {
+      "$ref": "#/definitions/property"
+    },
+    "source": {
+      "type": "string",
+      "enum": [
+        "route"
+      ],
+      "default": "route"
+    }
+  },
+  "required": [
+    "property"
+  ],
+  "definitions": {
+    "property": {
+      "$ref": "./property.schema.json"
+    }
+  }
+}

package/src/schematics/accordion-item.schema.json

@@ -0,0 +1,59 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "accordion-item",
+  "type": "object",
+  "properties": {
+    "kind": {
+      "type": "string",
+      "enum": [
+        "default",
+        "table",
+        "data-grid",
+        "data-grid-collection",
+        "tree-table",
+        "switch"
+      ],
+      "description": "The type of the accordion item",
+      "default": "panel"
+    },
+    "modifiers": {
+      "alias": "modifier",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "description": "The modifiers to apply to the accordion item type"
+    },
+    "identifier": {
+      "$ref": "#/definitions/accordionIdentifier"
+    },
+    "title": {
+      "type": "string"
+    },
+    "description": {
+      "type": "string"
+    },
+    "upstream": {
+      "$ref": "#/definitions/upstream"
+    },
+    "propertyList": {
+      "alias": "property",
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/property"
+      }
+    }
+  },
+  "definitions": {
+    "accordionIdentifier": {
+      "$ref": "./accordion-identifier.schema.json"
+    },
+    "upstream": {
+      "$ref": "./upstream.schema.json"
+    },
+    "property": {
+      "$ref": "./property.schema.json"
+    }
+  },
+  "additionalProperties": true
+}

package/src/schematics/angular.schema.json

@@ -3,7 +3,7 @@
   "$id": "angular",
   "allOf": [
     {
-      "$ref": "https://unpkg.com/@rxap/schematic-angular@16.1.0-dev.23/src/schematics/general.schema.json"
+      "$ref": "#/definitions/general"
     },
     {
       "type": "object",
@@ -26,15 +26,7 @@
           "type": "string"
         },
         "backend": {
-          "type": "string",
-          "description": "The backend that should be used to handel data",
-          "enum": [
-            "none",
-            "nestjs",
-            "open-api",
-            "local"
-          ],
-          "default": "none"
+          "$ref": "#/definitions/backend"
         },
         "directory": {
           "type": "string",
@@ -57,5 +49,13 @@
         }
       }
     }
-  ]
+  ],
+  "definitions": {
+    "general": {
+      "$ref": "./general.schema.json"
+    },
+    "backend": {
+      "$ref": "./backend.schema.json"
+    }
+  }
 }

package/src/schematics/backend.schema.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "backend",
+  "type": "string",
+  "description": "The backend that should be used to handel data",
+  "enum": [
+    "none",
+    "nestjs",
+    "open-api",
+    "local"
+  ],
+  "default": "none"
+}

package/src/schematics/button.schema.json

@@ -0,0 +1,30 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "button",
+  "type": "object",
+  "properties": {
+    "svgIcon": {
+      "type": "string"
+    },
+    "icon": {
+      "type": "string"
+    },
+    "directiveList": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/type"
+      }
+    },
+    "importList": {
+      "type": "array",
+      "items": {
+        "$ref": "#/definitions/type"
+      }
+    }
+  },
+  "definitions": {
+    "type": {
+      "$ref": "./type.schema.json"
+    }
+  }
+}

package/src/schematics/data-grid-component/files/component/__componentName__.component.html.hbs

@@ -0,0 +1,35 @@
+{{#if inCard}}
+<mat-card>
+  {{#if title}}
+  <mat-card-header>
+    <mat-card-title>{{title}}</mat-card-title>
+    {{#if subtitle}}<mat-card-subtitle>{{subtitle}}</mat-card-subtitle>{{/if}}
+  </mat-card-header>
+  {{/if}}
+  <mat-card-content>
+{{/if}}
+    <div class="p-4">
+      {{#if isForm}}<form #form="rxapForm" rxapForm>{{/if~}}
+        <rxap-data-grid {{#if collection}}[data]="data"{{else}}[dataSource]="dataGridDataSource"{{/if}} mode="{{mode}}">
+        {{#each itemList}}
+          <ng-container rxapDataGridRowDef="{{this.name}}">
+            {{#if this.hasHeaderCellDef}}
+            <th *rxapDataGridHeaderCellDef class="whitespace-nowrap" i18n>{{this.header}}</th>
+            {{/if}}
+            {{#if this.hasEditCellDef}}
+            <ng-template rxapDataGridEditCellDef>
+              {{ indent (compile this.formControl.handlebars control=this.formControl) 14}}
+            </ng-template>
+            {{/if}}
+            {{#if this.hasCellDef}}
+            {{ indent (compile this.handlebars item=this) 12}}
+            {{/if}}
+          </ng-container>
+        {{/each}}
+        </rxap-data-grid>
+      {{#if isForm}}</form>{{/if}}
+    </div>
+{{#if inCard}}
+  </mat-card-content>
+</mat-card>
+{{/if}}

package/src/schematics/data-grid-component/index.d.ts

@@ -1,16 +1,14 @@
 import { Rule } from '@angular-devkit/schematics';
 import { Normalized } from '@rxap/utilities';
 import { NormalizedAngularOptions } from '../../lib/angular-options';
-import { NormalizedDataGridItem } from '../../lib/data-grid-item';
 import { NormalizedDataGridOptions } from '../../lib/data-grid-options';
 import { DataGridComponentOptions } from './schema';
-export interface NormalizedDataGridComponentOptions extends Omit<Readonly<Normalized<DataGridComponentOptions> & NormalizedAngularOptions & NormalizedDataGridOptions>, 'itemList'> {
-    nestController: string;
+export interface NormalizedDataGridComponentOptions extends Readonly<Normalized<Omit<DataGridComponentOptions, 'itemList' | 'propertyList'>> & NormalizedAngularOptions & NormalizedDataGridOptions> {
     dataSourceClassName: string;
     dataSourceFileName: string;
     componentName: string;
+    controllerName: string;
     name: string;
-    itemList: ReadonlyArray<NormalizedDataGridItem>;
 }
 export declare function NormalizeDataGridComponentOptions(options: Readonly<DataGridComponentOptions>): NormalizedDataGridComponentOptions;
 export default function (options: DataGridComponentOptions): () => Rule;

package/src/schematics/data-grid-component/index.js

@@ -10,25 +10,24 @@ const path_1 = require("path");
 const ts_morph_2 = require("ts-morph");
 const angular_options_1 = require("../../lib/angular-options");
 const backend_types_1 = require("../../lib/backend-types");
+const data_grid_mode_1 = require("../../lib/data-grid-mode");
 const data_grid_options_1 = require("../../lib/data-grid-options");
+const load_handlebars_template_1 = require("../../lib/load-handlebars-template");
 function NormalizeDataGridComponentOptions(options) {
     const normalizedAngularOptions = (0, angular_options_1.NormalizeAngularOptions)(options);
     const normalizedDataGridOptions = (0, data_grid_options_1.NormalizeDataGridOptions)(options);
     (0, angular_options_1.AssertAngularOptionsNameProperty)(normalizedAngularOptions);
-    const { name, directory, } = normalizedAngularOptions;
+    const { name, directory, nestModule, } = normalizedAngularOptions;
     const componentName = (0, schematics_utilities_1.CoerceSuffix)((0, schematics_utilities_1.dasherize)(name), '-data-grid');
-    return Object.freeze(Object.assign(Object.assign(Object.assign({}, normalizedAngularOptions), normalizedDataGridOptions), { directory: (0, path_1.join)(directory !== null && directory !== void 0 ? directory : '', componentName), componentName, nestController: componentName, dataSourceClassName: (0, schematics_utilities_1.CoerceSuffix)((0, schematics_utilities_1.classify)(name), 'DataGridDataSource'), dataSourceFileName: (0, schematics_utilities_1.CoerceSuffix)(name, '-data-grid.data-source') }));
-}
-exports.NormalizeDataGridComponentOptions = NormalizeDataGridComponentOptions;
-function getControllerName(normalizedOptions) {
-    const { componentName, nestModule, } = normalizedOptions;
-    return (0, schematics_ts_morph_1.BuildNestControllerName)({
-        controllerName: componentName,
+    const controllerName = (0, schematics_ts_morph_1.BuildNestControllerName)({
+        controllerName: name,
         nestModule,
     });
+    return Object.freeze(Object.assign(Object.assign(Object.assign({}, normalizedAngularOptions), normalizedDataGridOptions), { controllerName, directory: (0, path_1.join)(directory !== null && directory !== void 0 ? directory : '', componentName), componentName, dataSourceClassName: (0, schematics_utilities_1.CoerceSuffix)((0, schematics_utilities_1.classify)(name), 'DataGridDataSource'), dataSourceFileName: (0, schematics_utilities_1.CoerceSuffix)(name, '-data-grid.data-source') }));
 }
+exports.NormalizeDataGridComponentOptions = NormalizeDataGridComponentOptions;
 function componentRule(normalizedOptions) {
-    const { project, feature, directory, mode, componentName, overwrite, collection, name, } = normalizedOptions;
+    const { project, feature, directory, mode, componentName, overwrite, collection, name, inCard, } = normalizedOptions;
     const templateOptions = Object.assign(Object.assign({}, core_1.strings), normalizedOptions);
     return (0, schematics_1.chain)([
         () => console.log('Coerce data source component ...'),
@@ -39,25 +38,35 @@ function componentRule(normalizedOptions) {
             directory,
             overwrite,
             template: {
-                url: `./files/${mode}`,
                 options: templateOptions,
             },
+            handlebars: {
+                partials: {
+                    matFormField: (0, load_handlebars_template_1.LoadMatFormFieldHandlebarsTemplate)(),
+                    pipe: (0, load_handlebars_template_1.LoadPipeHandlebarsTemplate)(),
+                }
+            },
             tsMorphTransform: (project, [sourceFile], [classDeclaration]) => {
                 (0, ts_morph_1.CoerceComponentImport)(classDeclaration, { name: 'DataGridModule', moduleSpecifier: '@rxap/data-grid' });
-                (0, ts_morph_1.CoerceComponentImport)(classDeclaration, { name: 'MatCardModule', moduleSpecifier: '@angular/material/card' });
+                if (inCard) {
+                    (0, ts_morph_1.CoerceComponentImport)(classDeclaration, {
+                        name: 'MatCardModule',
+                        moduleSpecifier: '@angular/material/card'
+                    });
+                }
                 if (!collection) {
                     const dataSourceClassName = `${(0, schematics_utilities_1.classify)(name)}DataGridDataSource`;
                     (0, schematics_ts_morph_1.AddComponentProvider)(sourceFile, dataSourceClassName);
-                    (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                    (0, ts_morph_1.CoerceImports)(sourceFile, {
                         namedImports: [dataSourceClassName],
                         moduleSpecifier: `./${name}-data-grid.data-source`,
                     });
-                    (0, schematics_ts_morph_1.CoercePropertyDeclaration)(classDeclaration, 'dataGridDataSource', {
+                    (0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, 'dataGridDataSource', {
                         isReadonly: true,
                         scope: ts_morph_2.Scope.Public,
                         initializer: `inject(${dataSourceClassName})`,
                     });
-                    (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                    (0, ts_morph_1.CoerceImports)(sourceFile, {
                         namedImports: ['inject'],
                         moduleSpecifier: '@angular/core',
                     });
@@ -66,28 +75,36 @@ function componentRule(normalizedOptions) {
                     (0, ts_morph_1.CoerceComponentInput)(classDeclaration, 'data', 'any', { isRequired: true });
                 }
                 switch (mode) {
-                    case data_grid_options_1.DataGridMode.Form:
+                    case data_grid_mode_1.DataGridMode.Form:
                         (0, ts_morph_1.CoerceComponentImport)(classDeclaration, { name: 'RxapFormsModule', moduleSpecifier: '@rxap/forms' });
                         (0, ts_morph_1.CoerceComponentImport)(classDeclaration, { name: 'ReactiveFormsModule', moduleSpecifier: '@angular/forms' });
                         (0, schematics_ts_morph_1.AddComponentProvider)(sourceFile, 'FormProviders');
                         (0, schematics_ts_morph_1.AddComponentProvider)(sourceFile, 'FormComponentProviders');
-                        (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                        (0, ts_morph_1.CoerceImports)(sourceFile, {
                             namedImports: ['FormProviders', 'FormComponentProviders'],
                             moduleSpecifier: './form.providers',
                         });
                         break;
-                    case data_grid_options_1.DataGridMode.Plain:
+                    case data_grid_mode_1.DataGridMode.Plain:
                         break;
                 }
             },
         }),
     ]);
 }
+function buildGetOperationId(normalizedOptions) {
+    const { identifier } = normalizedOptions;
+    return (0, schematics_ts_morph_1.buildOperationId)(normalizedOptions, identifier ? 'getById' : 'get', (0, schematics_ts_morph_1.BuildNestControllerName)(normalizedOptions));
+}
+function buildSubmitOperationId(normalizedOptions) {
+    const { identifier } = normalizedOptions;
+    return (0, schematics_ts_morph_1.buildOperationId)(normalizedOptions, identifier ? 'submitById' : 'submit', (0, schematics_ts_morph_1.BuildNestControllerName)(normalizedOptions));
+}
 function nestjsFormModeRule(normalizedOptions) {
-    const { project, feature, nestModule, name, componentName, directory, shared, itemList, collection, scope, } = normalizedOptions;
-    const controllerName = getControllerName(normalizedOptions);
-    const submitOperationId = (0, schematics_ts_morph_1.buildOperationId)(normalizedOptions, 'submit', controllerName);
-    const dataGridResponseClassName = (0, schematics_utilities_1.CoerceSuffix)((0, schematics_utilities_1.classify)([nestModule, componentName].filter(Boolean).join('-')), 'ControllerGetResponse');
+    const { project, feature, nestModule, name, directory, shared, itemList, collection, scope, identifier, controllerName, } = normalizedOptions;
+    const submitOperationId = buildSubmitOperationId(normalizedOptions);
+    const getOperationId = buildGetOperationId(normalizedOptions);
+    const dataGridResponseClassName = (0, ts_morph_1.OperationIdToResponseClassName)(getOperationId);
     return (0, schematics_1.chain)([
         () => console.log('Coerce form provider rule for the data grid data source submit method ...'),
         (0, schematics_ts_morph_1.CoerceFormProviderRule)({
@@ -137,25 +154,37 @@ function nestjsFormModeRule(normalizedOptions) {
                     type: 'unknown',
                 });
                 typeAliasDeclaration.setIsExported(true);
-                typeAliasDeclaration.setType(dataGridResponseClassName);
-                (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                const excludedProperties = itemList
+                    .filter(item => !item.formControl)
+                    .map(item => item.name)
+                    .filter(name => !itemList.filter(i => i.formControl).some(i => { var _a; return ((_a = i.formControl) === null || _a === void 0 ? void 0 : _a.name) === name; }));
+                // if an identifier is defined and the identifier is not an item with a form control add the identifier property to the excluded properties list
+                if (identifier && !itemList.some(item => { var _a; return ((_a = item.formControl) === null || _a === void 0 ? void 0 : _a.name) === (identifier === null || identifier === void 0 ? void 0 : identifier.property.name); })) {
+                    excludedProperties.push(identifier.property.name);
+                }
+                if (excludedProperties.length) {
+                    typeAliasDeclaration.setType(`Omit<${dataGridResponseClassName}, '${excludedProperties.join('\' | \'')}'>`);
+                }
+                else {
+                    typeAliasDeclaration.setType(dataGridResponseClassName);
+                }
+                (0, ts_morph_1.CoerceImports)(sourceFile, {
                     namedImports: [dataGridResponseClassName],
-                    moduleSpecifier: (0, schematics_ts_morph_1.OpenApiResponseClassImportPath)(dataGridResponseClassName, (0, schematics_ts_morph_1.buildNestProjectName)(normalizedOptions), scope),
+                    moduleSpecifier: (0, ts_morph_1.OperationIdToResponseClassImportPath)(getOperationId, scope),
                 });
             },
         }),
         () => console.log('Coerce submit operation for the data grid data source ...'),
         (0, schematics_ts_morph_1.CoerceSubmitDataGridOperation)({
-            controllerName: name,
+            controllerName,
             nestModule,
             project,
             feature,
             shared,
+            idProperty: identifier === null || identifier === void 0 ? void 0 : identifier.property,
             propertyList: itemList
-                .map(item => ({
-                name: item.name,
-                type: item.type,
-            })),
+                .map(item => item.formControl)
+                .filter((formControl) => !!formControl),
             skipCoerce: true,
             collection,
         }),
@@ -164,15 +193,14 @@ function nestjsFormModeRule(normalizedOptions) {
 function nestjsModeRule(normalizedOptions) {
     const { mode } = normalizedOptions;
     switch (mode) {
-        case data_grid_options_1.DataGridMode.Form:
+        case data_grid_mode_1.DataGridMode.Form:
             return nestjsFormModeRule(normalizedOptions);
     }
     return (0, schematics_1.noop)();
 }
 function nestjsBackendRule(normalizedOptions) {
-    const { project, feature, collection, shared, nestModule, name, itemList, directory, scope, } = normalizedOptions;
-    const controllerName = getControllerName(normalizedOptions);
-    const getOperationId = (0, schematics_ts_morph_1.buildOperationId)(normalizedOptions, 'get', controllerName);
+    const { project, feature, collection, shared, nestModule, name, directory, scope, upstream, propertyList, identifier, controllerName, } = normalizedOptions;
+    const getOperationId = buildGetOperationId(normalizedOptions);
     return (0, schematics_1.chain)([
         () => console.log('Coerce get operation for the data grid data source ...'),
         (0, schematics_ts_morph_1.CoerceGetDataGridOperation)({
@@ -181,12 +209,10 @@ function nestjsBackendRule(normalizedOptions) {
             shared,
             nestModule,
             collection,
-            controllerName: name,
-            propertyList: itemList
-                .map((item) => ({
-                name: item.name,
-                type: item.type,
-            })),
+            controllerName,
+            upstream,
+            propertyList,
+            idProperty: identifier === null || identifier === void 0 ? void 0 : identifier.property,
         }),
         () => console.log('Coerce data grid data source class'),
         (0, schematics_ts_morph_1.CoerceDataSourceClass)({
@@ -196,26 +222,26 @@ function nestjsBackendRule(normalizedOptions) {
             directory,
             name: (0, schematics_utilities_1.CoerceSuffix)(name, '-data-grid'),
             tsMorphTransform: (project, sourceFile, classDeclaration) => {
-                classDeclaration.setExtends(`DataGridDataSource<${(0, schematics_ts_morph_1.OperationIdToResponseClassName)(getOperationId)}>`);
-                (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
-                    namedImports: [(0, schematics_ts_morph_1.OperationIdToResponseClassName)(getOperationId)],
-                    moduleSpecifier: (0, schematics_ts_morph_1.OperationIdToResponseClassImportPath)(getOperationId, scope),
+                classDeclaration.setExtends(`DataGridDataSource<${(0, ts_morph_1.OperationIdToResponseClassName)(getOperationId)}>`);
+                (0, ts_morph_1.CoerceImports)(sourceFile, {
+                    namedImports: [(0, ts_morph_1.OperationIdToResponseClassName)(getOperationId)],
+                    moduleSpecifier: (0, ts_morph_1.OperationIdToResponseClassImportPath)(getOperationId, scope),
                 });
-                (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                (0, ts_morph_1.CoerceImports)(sourceFile, {
                     namedImports: [(0, schematics_ts_morph_1.OperationIdToClassName)(getOperationId)],
                     moduleSpecifier: (0, schematics_ts_morph_1.OperationIdToClassImportPath)(getOperationId, scope),
                 });
-                (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                (0, ts_morph_1.CoerceImports)(sourceFile, {
                     namedImports: ['DataGridDataSource'],
                     moduleSpecifier: '@rxap/data-grid',
                 });
-                (0, schematics_ts_morph_1.CoercePropertyDeclaration)(classDeclaration, 'method', {
+                (0, ts_morph_1.CoercePropertyDeclaration)(classDeclaration, 'method', {
                     scope: ts_morph_2.Scope.Protected,
                     isReadonly: true,
                     hasOverrideKeyword: true,
                     initializer: `inject(${(0, schematics_ts_morph_1.OperationIdToClassName)(getOperationId)})`,
                 });
-                (0, schematics_ts_morph_1.CoerceImports)(sourceFile, {
+                (0, ts_morph_1.CoerceImports)(sourceFile, {
                     namedImports: ['inject'],
                     moduleSpecifier: '@angular/core',
                 });
@@ -260,15 +286,20 @@ function backendRule(normalizedOptions) {
     return (0, schematics_1.noop)();
 }
 function formModeRule(normalizedOptions) {
-    const { project, feature, directory, name, itemList, dataSourceClassName, dataSourceFileName, componentName, overwrite, } = normalizedOptions;
+    const { project, feature, directory, name, itemList, dataSourceClassName, dataSourceFileName, componentName, overwrite, backend, nestModule, controllerName, identifier, } = normalizedOptions;
     return (0, schematics_1.chain)([
         () => console.log('Coerce form definition ...'),
-        (0, schematics_ts_morph_1.CoerceFormDefinition)({
+        (0, schematics_utilities_1.ExecuteSchematic)('form-definition', {
             name,
             project,
-            feature,
             directory,
-            controlList: itemList,
+            feature,
+            controlList: itemList.map(item => item.formControl).filter((formControl) => !!formControl),
+            overwrite,
+            backend,
+            nestModule,
+            controllerName,
+            identifier,
         }),
         () => console.log('Coerce form providers ...'),
         (0, schematics_ts_morph_1.CoerceFormProvidersFile)({
@@ -322,7 +353,7 @@ function formModeRule(normalizedOptions) {
 function modeRule(normalizedOptions) {
     const { mode } = normalizedOptions;
     switch (mode) {
-        case data_grid_options_1.DataGridMode.Form:
+        case data_grid_mode_1.DataGridMode.Form:
             return formModeRule(normalizedOptions);
     }
     return (0, schematics_1.noop)();