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

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

@@ -0,0 +1,33 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "$id": "form-array-schematic",
+  "allOf": [
+    {
+      "$ref": "#/definitions/angular"
+    },
+    {
+      "$ref": "#/definitions/formArray"
+    },
+    {
+      "type": "object",
+      "properties": {
+        "formName": {
+          "alias": "form",
+          "type": "string",
+          "description": "The name of the form where the form control should be added"
+        }
+      },
+      "required": [
+        "formName"
+      ]
+    }
+  ],
+  "definitions": {
+    "angular": {
+      "$ref": "../../angular.schema.json"
+    },
+    "formArray": {
+      "$ref": "../../form-array.schema.json"
+    }
+  }
+}

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

@@ -1,12 +1,15 @@
-<form rxapForm>
-  <% if (window) { %>
+<form rxapForm class="flex flex-col gap-2">
+  {{#each controlList}}
+  {{ indent (compile this.handlebars control=this prefix=../prefix) 2 }}
+  {{/each}}
+  {{#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.d.ts

@@ -1,17 +1,17 @@
 import { Rule } from '@angular-devkit/schematics';
-import { DtoClassProperty } from '@rxap/schematics-ts-morph';
 import { Normalized } from '@rxap/utilities';
+import { NormalizedAccordionIdentifier } from '../../../lib/accordion-identifier';
 import { NormalizedAngularOptions } from '../../../lib/angular-options';
-import { NormalizedFormComponentControl } from '../../../lib/form-component-control';
+import { NormalizedControl } from '../../../lib/form/control';
 import { NormalizedMatFormFieldDefaultOptions } from '../../../lib/mat-form-field-default-options';
 import { FormComponentOptions } from './schema';
 export interface NormalizedFormComponentOptions extends Omit<Readonly<Normalized<FormComponentOptions> & NormalizedAngularOptions>, 'controlList' | 'name' | 'matFormFieldDefaultOptions'> {
     componentName: string;
     controllerName: string;
-    controlList: ReadonlyArray<NormalizedFormComponentControl>;
+    controlList: ReadonlyArray<NormalizedControl>;
     name: string;
     matFormFieldDefaultOptions: NormalizedMatFormFieldDefaultOptions | null;
+    identifier: NormalizedAccordionIdentifier | null;
 }
 export declare function NormalizeFormComponentOptions(options: Readonly<FormComponentOptions>): Readonly<NormalizedFormComponentOptions>;
-export declare function FormComponentControlToDtoClassProperty(control: NormalizedFormComponentControl): DtoClassProperty;
 export default function (options: FormComponentOptions): () => Rule;

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

@@ -1,38 +1,34 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FormComponentControlToDtoClassProperty = exports.NormalizeFormComponentOptions = void 0;
+exports.NormalizeFormComponentOptions = void 0;
 const core_1 = require("@angular-devkit/core");
 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 utilities_1 = require("@rxap/utilities");
 const path_1 = require("path");
+const accordion_identifier_1 = require("../../../lib/accordion-identifier");
 const angular_options_1 = require("../../../lib/angular-options");
 const backend_types_1 = require("../../../lib/backend-types");
 const coerce_form_component_1 = require("../../../lib/coerce-form-component");
-const form_component_control_1 = require("../../../lib/form-component-control");
+const control_1 = require("../../../lib/form/control");
 const mat_form_field_default_options_1 = require("../../../lib/mat-form-field-default-options");
 function NormalizeFormComponentOptions(options) {
     var _a, _b, _c, _d;
     const normalizedAngularOptions = (0, angular_options_1.NormalizeAngularOptions)(options);
     (0, angular_options_1.AssertAngularOptionsNameProperty)(normalizedAngularOptions);
-    const { name, } = normalizedAngularOptions;
+    const { name, nestModule, } = normalizedAngularOptions;
     const componentName = (0, schematics_utilities_1.CoerceSuffix)(name, '-form');
-    const controllerName = (_a = options.controllerName) !== null && _a !== void 0 ? _a : componentName;
+    const controllerName = (_a = options.controllerName) !== null && _a !== void 0 ? _a : (0, schematics_ts_morph_1.BuildNestControllerName)({
+        controllerName: componentName,
+        nestModule,
+    });
     return Object.freeze(Object.assign(Object.assign({}, normalizedAngularOptions), { window: (_b = options.window) !== null && _b !== void 0 ? _b : false, directory: (0, path_1.join)((_c = options.directory) !== null && _c !== void 0 ? _c : '', componentName), role: (_d = options.role) !== null && _d !== void 0 ? _d : null, componentName,
-        controllerName, controlList: (0, form_component_control_1.NormalizeFormComponentControlList)(options.controlList), context: options.context ? (0, utilities_1.dasherize)(options.context) : null, matFormFieldDefaultOptions: (0, mat_form_field_default_options_1.NormalizeMatFormFieldDefaultOptions)(options.matFormFieldDefaultOptions) }));
+        controllerName, controlList: (0, control_1.NormalizeControlList)(options.controlList), context: options.context ? (0, utilities_1.dasherize)(options.context) : null, matFormFieldDefaultOptions: (0, mat_form_field_default_options_1.NormalizeMatFormFieldDefaultOptions)(options.matFormFieldDefaultOptions), identifier: (0, accordion_identifier_1.NormalizeAccordionIdentifier)(options.identifier) }));
 }
 exports.NormalizeFormComponentOptions = NormalizeFormComponentOptions;
-function FormComponentControlToDtoClassProperty(control) {
-    return {
-        name: control.name,
-        type: control.type,
-        isOptional: !control.isRequired,
-    };
-}
-exports.FormComponentControlToDtoClassProperty = FormComponentControlToDtoClassProperty;
 function componentRule(normalizedOptions) {
-    const { componentName, project, feature, directory, overwrite, } = normalizedOptions;
+    const { componentName, project, feature, directory, overwrite, controlList, } = normalizedOptions;
     return (0, schematics_1.chain)([
         () => console.log(`Coerce form component '${componentName}'`),
         (0, coerce_form_component_1.CoerceFormComponentRule)({
@@ -43,14 +39,13 @@ function componentRule(normalizedOptions) {
             directory,
             overwrite,
             template: {
-                options: Object.assign(Object.assign({}, normalizedOptions), { OperationIdToClassName: schematics_ts_morph_1.OperationIdToClassName,
-                    OperationIdToClassImportPath: schematics_ts_morph_1.OperationIdToClassImportPath }),
-            },
+                options: Object.assign({}, 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 +55,9 @@ function formDefinitionRule(normalizedOptions) {
             feature,
             controlList,
             overwrite,
+            backend,
+            nestModule,
+            controllerName,
         }),
     ]);
 }
@@ -102,7 +100,7 @@ function formSubmitProviderRule(normalizedOptions) {
     ]);
 }
 function formSubmitBackendRule(normalizedOptions) {
-    const { backend, project, feature, controlList, controllerName, nestModule, shared, } = normalizedOptions;
+    const { backend, project, feature, controlList, controllerName, nestModule, shared, overwrite, identifier, } = normalizedOptions;
     switch (backend) {
         case backend_types_1.BackendTypes.NESTJS:
             return (0, schematics_1.chain)([
@@ -110,10 +108,12 @@ function formSubmitBackendRule(normalizedOptions) {
                 (0, schematics_ts_morph_1.CoerceFormSubmitOperation)({
                     controllerName,
                     project,
+                    overwrite,
                     feature,
                     shared,
                     nestModule,
-                    propertyList: controlList.map(FormComponentControlToDtoClassProperty),
+                    idProperty: identifier === null || identifier === void 0 ? void 0 : identifier.property,
+                    propertyList: controlList.map(control_1.ControlToDtoClassProperty),
                     bodyDtoName: controllerName,
                 }),
             ]);
@@ -148,12 +148,12 @@ function windowRule(normalizedOptions) {
     return (0, schematics_1.noop)();
 }
 function getSubmitOperationId(normalizedOptions) {
-    const { project, feature, shared, controllerName, } = normalizedOptions;
+    const { project, feature, shared, controllerName, identifier, } = normalizedOptions;
     return (0, schematics_ts_morph_1.buildOperationId)({
         project,
         feature,
         shared,
-    }, 'submit', controllerName);
+    }, identifier ? 'submitById' : 'submit', controllerName);
 }
 function printFormComponentOptions(options) {
     (0, angular_options_1.PrintAngularOptions)('form-component', options);
@@ -170,7 +170,7 @@ function default_1(options) {
     printFormComponentOptions(normalizedOptions);
     return function () {
         return (0, schematics_1.chain)([
-            () => console.group('\x1b[32m[@rxap/schematics-angular:form-component]\x1b[0m'),
+            () => console.group('[@rxap/schematics-angular:form-component]'.green),
             componentRule(normalizedOptions),
             windowRule(normalizedOptions),
             formDefinitionRule(normalizedOptions),

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":";;;AAAA,+CAA+C;AAC/C,2DAUoC;AACpC,mEASmC;AACnC,qEAGoC;AACpC,+CAGyB;AACzB,+BAA4B;AAC5B,kEAKsC;AACtC,8DAA0D;AAC1D,8EAA6E;AAC7E,gFAG6C;AAC7C,gGAGqD;AAarD,SAAgB,6BAA6B,CAC3C,OAAuC;;IAEvC,MAAM,wBAAwB,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,CAAC;IAClE,IAAA,kDAAgC,EAAC,wBAAwB,CAAC,CAAC;IAC3D,MAAM,EACJ,IAAI,GACL,GAAG,wBAAwB,CAAC;IAC7B,MAAM,aAAa,GAAG,IAAA,mCAAY,EAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAClD,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,aAAa,CAAC;IAC/D,OAAO,MAAM,CAAC,MAAM,iCACf,wBAAwB,KAC3B,MAAM,EAAE,MAAA,OAAO,CAAC,MAAM,mCAAI,KAAK,EAC/B,SAAS,EAAE,IAAA,WAAI,EAAC,MAAA,OAAO,CAAC,SAAS,mCAAI,EAAE,EAAE,aAAa,CAAC,EACvD,IAAI,EAAE,MAAA,OAAO,CAAC,IAAI,mCAAI,IAAI,EAC1B,aAAa;QACb,cAAc,EACd,WAAW,EAAE,IAAA,0DAAiC,EAAC,OAAO,CAAC,WAAW,CAAC,EACnE,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,qBAAS,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,EAC5D,0BAA0B,EAAE,IAAA,oEAAmC,EAAC,OAAO,CAAC,0BAA0B,CAAC,IACnG,CAAC;AACL,CAAC;AArBD,sEAqBC;AAED,SAAgB,sCAAsC,CACpD,OAAuC;IAEvC,OAAO;QACL,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,UAAU,EAAE,CAAC,OAAO,CAAC,UAAU;KAChC,CAAC;AACJ,CAAC;AARD,wFAQC;AAED,SAAS,aAAa,CAAC,iBAAiD;IAEtE,MAAM,EACJ,aAAa,EACb,OAAO,EACP,OAAO,EACP,SAAS,EACT,SAAS,GACV,GAAG,iBAAiB,CAAC;IAEtB,OAAO,IAAA,kBAAK,EAAC;QACX,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,0BAA2B,aAAc,GAAG,CAAC;QAC/D,IAAA,+CAAuB,EAAC;YACtB,IAAI,EAAE,iBAAiB;YACvB,OAAO;YACP,OAAO;YACP,IAAI,EAAE,aAAa;YACnB,SAAS;YACT,SAAS;YACT,QAAQ,EAAE;gBACR,OAAO,kCACF,iBAAiB,KACpB,sBAAsB,EAAtB,4CAAsB;oBACtB,4BAA4B,EAA5B,kDAA4B,GAC7B;aACF;SACF,CAAC;KACH,CAAC,CAAC;AAEL,CAAC;AAED,SAAS,kBAAkB,CAAC,iBAAiD;IAC3E,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,OAAO,EACP,SAAS,EACT,WAAW,EACX,SAAS,GACV,GAAG,iBAAiB,CAAC;IACtB,OAAO,IAAA,kBAAK,EAAC;QACX,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC;QACjD,IAAA,uCAAgB,EAAC,iBAAiB,EAAE;YAClC,IAAI;YACJ,OAAO;YACP,SAAS;YACT,OAAO;YACP,WAAW;YACX,SAAS;SACV,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,SAAS,sBAAsB,CAAC,iBAAiD;IAC/E,MAAM,EACJ,OAAO,EACP,OAAO,EACP,SAAS,EACT,KAAK,GACN,GAAG,iBAAiB,CAAC;IACtB,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,iBAAiB,CAAC,CAAC;IAClE,OAAO,IAAA,kBAAK,EAAC;QACX,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC;QAC9C,IAAA,qDAA+B,EAAC;YAC9B,OAAO;YACP,OAAO;YACP,SAAS;YACT,cAAc,EAAE;gBACd,OAAO,EAAE,yBAAyB;gBAClC,UAAU,EAAE,iCAAiC;gBAC7C,IAAI,EAAE;oBACJ,IAAA,4CAAsB,EAAC,iBAAiB,CAAC;oBACzC,uCAAuC;iBACxC;aACF;YACD,gBAAgB,EAAE;gBAChB;oBACE,eAAe,EAAE,mBAAmB;oBACpC,YAAY,EAAE,CAAE,iCAAiC,CAAE;iBACpD;gBACD;oBACE,eAAe,EAAE,aAAa;oBAC9B,YAAY,EAAE,CAAE,yBAAyB,EAAE,mBAAmB,CAAE;iBACjE;gBACD;oBACE,eAAe,EAAE,eAAe;oBAChC,YAAY,EAAE,CAAE,UAAU,CAAE;iBAC7B;gBACD;oBACE,eAAe,EAAE,IAAA,kDAA4B,EAAC,iBAAiB,EAAE,KAAK,CAAC;oBACvE,YAAY,EAAE,CAAE,IAAA,4CAAsB,EAAC,iBAAiB,CAAC,CAAE;iBAC5D;aACF;SACF,CAAC;KACH,CAAC,CAAC;AACL,CAAC;AAED,SAAS,qBAAqB,CAAC,iBAAiD;IAE9E,MAAM,EACJ,OAAO,EACP,OAAO,EACP,OAAO,EACP,WAAW,EACX,cAAc,EACd,UAAU,EACV,MAAM,GACP,GAAG,iBAAiB,CAAC;IAEtB,QAAQ,OAAO,EAAE;QAEf,KAAK,4BAAY,CAAC,MAAM;YACtB,OAAO,IAAA,kBAAK,EAAC;gBACX,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC;gBACjD,IAAA,+CAAyB,EAAC;oBACxB,cAAc;oBACd,OAAO;oBACP,OAAO;oBACP,MAAM;oBACN,UAAU;oBACV,YAAY,EAAE,WAAW,CAAC,GAAG,CAAC,sCAAsC,CAAC;oBACrE,WAAW,EAAE,cAAc;iBAC5B,CAAC;aACH,CAAC,CAAC;KACN;IAED,OAAO,IAAA,iBAAI,GAAE,CAAC;AAEhB,CAAC;AAED,SAAS,cAAc,CAAC,iBAAiD;IAEvE,MAAM,EACJ,OAAO,EACP,cAAc,EACd,UAAU,GACX,GAAG,iBAAiB,CAAC;IAEtB,IAAI,CAAE,4BAAY,CAAC,MAAM,CAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;QAC7C,OAAO,IAAA,kBAAK,EAAC;YACX,qBAAqB,CAAC,iBAAiB,CAAC;YACxC,sBAAsB,CAAC,iBAAiB,CAAC;SAC1C,CAAC,CAAC;KACJ;IAED,OAAO,IAAA,iBAAI,GAAE,CAAC;AAGhB,CAAC;AAED,SAAS,UAAU,CAAC,iBAAiD;IAEnE,MAAM,EACJ,MAAM,EACN,SAAS,EACT,aAAa,GACd,GAAG,iBAAiB,CAAC;IAEtB,IAAI,MAAM,EAAE;QACV,OAAO,IAAI,CAAC,EAAE;YACZ,MAAM,QAAQ,GAAG,IAAA,0CAAoB,EAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;YAC/D,MAAM,IAAI,GAAG,CAAC,CAAC,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,aAAa,CAAC,CAAA,CAAC;YAClD,OAAO,IAAA,kBAAK,EAAC;gBACX,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC;gBACrD,IAAA,sBAAS,EAAC,IAAA,kBAAK,EAAC,IAAA,gBAAG,EAAC,gBAAgB,CAAC,EAAE;oBACrC,IAAA,2BAAc,kBACZ,aAAa,EACb,IAAI,EAAE,IAAA,qBAAS,EAAC,aAAa,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,IACjD,cAAO,EACV;oBACF,IAAA,iBAAI,EAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAA,WAAI,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;iBACtD,CAAC,EAAE,0BAAa,CAAC,SAAS,CAAC;aAC7B,CAAC,CAAC;QACL,CAAC,CAAC;KACH;IAED,OAAO,IAAA,iBAAI,GAAE,CAAC;AAEhB,CAAC;AAED,SAAS,oBAAoB,CAAC,iBAAiD;IAC7E,MAAM,EACJ,OAAO,EACP,OAAO,EACP,MAAM,EACN,cAAc,GACf,GAAG,iBAAiB,CAAC;IACtB,OAAO,IAAA,sCAAgB,EACrB;QACE,OAAO;QACP,OAAO;QACP,MAAM;KACP,EACD,QAAQ,EACR,cAAc,CACf,CAAC;AACJ,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAuC;IACxE,IAAA,qCAAmB,EAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC/C,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;IACD,OAAO,CAAC,GAAG,CAAC,iCAAkC,OAAO,CAAC,MAAO,SAAS,CAAC,CAAC;AAC1E,CAAC;AAED,mBAAyB,OAA6B;IACpD,MAAM,iBAAiB,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;IACjE,yBAAyB,CAAC,iBAAiB,CAAC,CAAC;IAC7C,OAAO;QACL,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,0DAA0D,CAAC;YAC/E,aAAa,CAAC,iBAAiB,CAAC;YAChC,UAAU,CAAC,iBAAiB,CAAC;YAC7B,kBAAkB,CAAC,iBAAiB,CAAC;YACrC,cAAc,CAAC,iBAAiB,CAAC;YACjC,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE;SACzB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAbD,4BAaC"}
+{"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/schema.d.ts

@@ -1,10 +1,12 @@
-import { FormComponentControl } from '../../../lib/form-component-control';
+import { AccordionIdentifier } from '../../../lib/accordion-identifier';
 import { AngularOptions } from '../../../lib/angular-options';
+import { Control } from '../../../lib/form/control';
 import { MatFormFieldDefaultOptions } from '../../../lib/mat-form-field-default-options';
 
 export interface FormComponentOptions extends AngularOptions {
   window?: boolean;
-  controlList?: Array<FormComponentControl>;
+  controlList?: Array<Control>;
   role?: string;
   matFormFieldDefaultOptions?: MatFormFieldDefaultOptions;
+  identifier?: AccordionIdentifier;
 }