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

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

@@ -3,10 +3,10 @@
   "$id": "form-control-schematic",
   "allOf": [
     {
-      "$ref": "../../angular.schema.json"
+      "$ref": "#/definitions/angular"
     },
     {
-      "$ref": "../../form-control.schema.json"
+      "$ref": "#/definitions/formControl"
     },
     {
       "type": "object",
@@ -14,8 +14,7 @@
         "formName": {
           "alias": "form",
           "type": "string",
-          "description": "The name of the form where the form control should be added",
-          "x-prompt": "Enter the name of the form where the form control should be added"
+          "description": "The name of the form where the form control should be added"
         }
       },
       "required": [
@@ -24,14 +23,11 @@
     }
   ],
   "definitions": {
-    "type": {
-      "$ref": "../../type.schema.json"
-    },
-    "property": {
-      "$ref": "../../property.schema.json"
+    "angular": {
+      "$ref": "../../angular.schema.json"
     },
-    "button": {
-      "$ref": "../../button.schema.json"
+    "formControl": {
+      "$ref": "../../form-control.schema.json"
     }
   }
 }

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

@@ -1,10 +1,10 @@
 import { Normalized } from '@rxap/utilities';
 import { NormalizedAngularOptions } from '../../../lib/angular-options';
-import { NormalizedFormDefinitionControl } from '../../../lib/form-definition-control';
+import { NormalizedControl } from '../../../lib/form/control';
 import { FormDefinitionOptions } from './schema';
 export interface NormalizedFormDefinitionOptions extends Readonly<Normalized<Omit<FormDefinitionOptions, 'controlList'>> & NormalizedAngularOptions> {
     name: string;
-    controlList: ReadonlyArray<NormalizedFormDefinitionControl>;
+    controlList: ReadonlyArray<NormalizedControl>;
 }
 export declare function NormalizeFormDefinitionOptions(options: Readonly<FormDefinitionOptions>): Readonly<NormalizedFormDefinitionOptions>;
 export default function (options: FormDefinitionOptions): () => import("@angular-devkit/schematics").Rule;

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

@@ -5,12 +5,13 @@ const schematics_1 = require("@angular-devkit/schematics");
 const schematics_ts_morph_1 = require("@rxap/schematics-ts-morph");
 const schematics_utilities_1 = require("@rxap/schematics-utilities");
 const angular_options_1 = require("../../../lib/angular-options");
-const form_definition_control_1 = require("../../../lib/form-definition-control");
+const abstract_control_1 = require("../../../lib/form/abstract-control");
+const control_1 = require("../../../lib/form/control");
 function NormalizeFormDefinitionOptions(options) {
     var _a;
     const normalizedAngularOptions = (0, angular_options_1.NormalizeAngularOptions)(options);
     (0, angular_options_1.AssertAngularOptionsNameProperty)(normalizedAngularOptions);
-    return Object.freeze(Object.assign(Object.assign({}, normalizedAngularOptions), { controlList: (0, form_definition_control_1.NormalizeFormDefinitionControlList)(options.controlList), standalone: (_a = options.standalone) !== null && _a !== void 0 ? _a : true }));
+    return Object.freeze(Object.assign(Object.assign({}, normalizedAngularOptions), { controlList: (0, control_1.NormalizeControlList)(options.controlList), standalone: (_a = options.standalone) !== null && _a !== void 0 ? _a : true }));
 }
 exports.NormalizeFormDefinitionOptions = NormalizeFormDefinitionOptions;
 function printFormDefinitionOptions(options) {
@@ -28,7 +29,7 @@ function default_1(options) {
     printFormDefinitionOptions(normalizedOptions);
     return () => {
         return (0, schematics_1.chain)([
-            () => console.group('\x1b[32m[@rxap/schematics-angular:form-definition]\x1b[0m'),
+            () => console.group('[@rxap/schematics-angular:form-definition]'.green),
             () => console.log('Coerce form definition class ...'),
             (0, schematics_ts_morph_1.CoerceFormDefinition)({
                 project,
@@ -37,18 +38,30 @@ function default_1(options) {
                 controlList,
                 name,
             }),
-            (0, schematics_1.chain)(controlList.map(control => (0, schematics_utilities_1.ExecuteSchematic)('form-control', Object.assign({ formName: name, project,
-                feature,
-                directory,
-                context,
-                nestModule,
-                controllerName,
-                backend,
-                shared,
-                scope,
-                prefix,
-                overwrite,
-                replace }, control)))),
+            (0, schematics_1.chain)(controlList.map(control => {
+                const inputOptions = Object.assign({ formName: name, project,
+                    feature,
+                    directory,
+                    context,
+                    nestModule,
+                    controllerName,
+                    backend,
+                    shared,
+                    scope,
+                    prefix,
+                    overwrite,
+                    replace }, control);
+                switch (control.role) {
+                    case abstract_control_1.AbstractControlRolls.CONTROL:
+                        return (0, schematics_utilities_1.ExecuteSchematic)('form-control', inputOptions);
+                    case abstract_control_1.AbstractControlRolls.ARRAY:
+                        return (0, schematics_utilities_1.ExecuteSchematic)('form-array', inputOptions);
+                    case abstract_control_1.AbstractControlRolls.GROUP:
+                        return (0, schematics_utilities_1.ExecuteSchematic)('form-group', inputOptions);
+                    default:
+                        return () => console.log(`No schematic for control role: ${control.role}`.yellow);
+                }
+            })),
             standalone ?
                 (0, schematics_1.chain)([
                     () => console.log('Coerce form providers file ...'),

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

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

package/src/schematics/form/form-definition/schema.d.ts

@@ -1,7 +1,7 @@
 import { AngularOptions } from '../../../lib/angular-options';
-import { FormDefinitionControl } from '../../../lib/form-definition-control';
+import { Control } from '../../../lib/form/control';
 
 export interface FormDefinitionOptions extends AngularOptions {
-  controlList: Array<FormDefinitionControl>;
+  controlList: Array<Control>;
   standalone?: boolean;
 }