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

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

@@ -1,11 +1,9 @@
 import { Rule } from '@angular-devkit/schematics';
-import { Normalized } from '@rxap/utilities';
+import { NonNullableSelected, Normalized } from '@rxap/utilities';
 import { NormalizedAngularOptions } from '../../../lib/angular-options';
-import { NormalizedFormDefinitionControl } from '../../../lib/form-definition-control';
+import { NormalizedFormControl } from '../../../lib/form/control/form-control';
 import { FormControlOptions } from './schema';
 import 'colors';
-export interface NormalizedFormControlOptions extends Readonly<Normalized<FormControlOptions> & NormalizedAngularOptions & NormalizedFormDefinitionControl> {
-    controllerName: string;
-}
+export type NormalizedFormControlOptions = Readonly<Normalized<Pick<FormControlOptions, 'formName'>>> & NonNullableSelected<NormalizedAngularOptions, 'controllerName'> & NormalizedFormControl;
 export declare function NormalizeFormControlOptions(options: Readonly<FormControlOptions>): NormalizedFormControlOptions;
 export default function (options: FormControlOptions): () => Rule;

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

@@ -5,13 +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_control_1 = require("../../../lib/form-control");
-const form_definition_control_1 = require("../../../lib/form-definition-control");
+const form_control_1 = require("../../../lib/form/control/form-control");
+const form_control_kind_1 = require("../../../lib/form/control/form-control-kind");
 require("colors");
 function NormalizeFormControlOptions(options) {
     var _a;
     const normalizedAngularOptions = (0, angular_options_1.NormalizeAngularOptions)(options);
-    const normalizedFormDefinitionControl = (0, form_definition_control_1.NormalizeFormDefinitionControl)(options);
+    const normalizedFormDefinitionControl = (0, form_control_1.NormalizeFormControl)(options);
     const formName = (0, schematics_utilities_1.dasherize)(options.formName);
     const controllerName = (_a = options.controllerName) !== null && _a !== void 0 ? _a : formName;
     return Object.freeze(Object.assign(Object.assign(Object.assign({}, normalizedAngularOptions), normalizedFormDefinitionControl), { formName,
@@ -24,11 +24,11 @@ function printOptions(options) {
 }
 function formControlKind(normalizedOptions) {
     switch (normalizedOptions.kind) {
-        case form_control_1.FormControlKinds.INPUT:
+        case form_control_kind_1.FormControlKinds.INPUT:
             return (0, schematics_utilities_1.ExecuteSchematic)('input-form-control', normalizedOptions);
-        case form_control_1.FormControlKinds.SELECT:
+        case form_control_kind_1.FormControlKinds.SELECT:
             return (0, schematics_utilities_1.ExecuteSchematic)('select-form-control', normalizedOptions);
-        case form_control_1.FormControlKinds.TABLE_SELECT:
+        case form_control_kind_1.FormControlKinds.TABLE_SELECT:
             return (0, schematics_utilities_1.ExecuteSchematic)('table-select-form-control', normalizedOptions);
         default:
             return () => console.log(`No schematic for form control kind: ${normalizedOptions.kind}`.yellow);
@@ -37,24 +37,12 @@ function formControlKind(normalizedOptions) {
 }
 function default_1(options) {
     const normalizedOptions = NormalizeFormControlOptions(options);
-    const { name, project, feature, directory, formName, type, isArray, state, isRequired, validatorList, } = normalizedOptions;
     printOptions(normalizedOptions);
     return () => {
         return (0, schematics_1.chain)([
-            () => console.group('\x1b[32m[@rxap/schematics-angular:form-control]\x1b[0m'),
+            () => console.group('[@rxap/schematics-angular:form-control]'.green),
             () => console.log('Coerce control in form definition class ...'),
-            (0, schematics_ts_morph_1.CoerceFormDefinitionControl)({
-                project,
-                feature,
-                directory,
-                formName,
-                name,
-                type,
-                isArray,
-                state,
-                isRequired,
-                validatorList,
-            }),
+            (0, schematics_ts_morph_1.CoerceFormDefinitionFormControl)(normalizedOptions),
             formControlKind(normalizedOptions),
             () => console.groupEnd(),
         ]);

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/form/form-control/index.ts"],"names":[],"mappings":";;;AAAA,2DAIoC;AACpC,mEAAwE;AACxE,qEAGoC;AAEpC,kEAIsC;AACtC,4DAA6D;AAC7D,kFAG8C;AAE9C,kBAAgB;AAOhB,SAAgB,2BAA2B,CACzC,OAAqC;;IAErC,MAAM,wBAAwB,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,CAAC;IAClE,MAAM,+BAA+B,GAAG,IAAA,wDAA8B,EAAC,OAAO,CAAC,CAAC;IAChF,MAAM,QAAQ,GAAG,IAAA,gCAAS,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;IAC1D,OAAO,MAAM,CAAC,MAAM,+CACf,wBAAwB,GACxB,+BAA+B,KAClC,QAAQ;QACR,cAAc,EACd,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,gCAAS,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAC5D,CAAC;AACL,CAAC;AAdD,kEAcC;AAED,SAAS,YAAY,CAAC,OAAqC;IACzD,IAAA,qCAAmB,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,eAAe,CAAC,iBAA+C;IACtE,QAAQ,iBAAiB,CAAC,IAAI,EAAE;QAE9B,KAAK,+BAAgB,CAAC,KAAK;YACzB,OAAO,IAAA,uCAAgB,EAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QAEnE,KAAK,+BAAgB,CAAC,MAAM;YAC1B,OAAO,IAAA,uCAAgB,EAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;QAEpE,KAAK,+BAAgB,CAAC,YAAY;YAChC,OAAO,IAAA,uCAAgB,EAAC,2BAA2B,EAAE,iBAAiB,CAAC,CAAC;QAE1E;YACE,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,uCAAuC,iBAAiB,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;KAEpG;IAED,OAAO,IAAA,iBAAI,GAAE,CAAC;AAChB,CAAC;AAED,mBAAyB,OAA2B;IAClD,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC/D,MAAM,EACJ,IAAI,EACJ,OAAO,EACP,OAAO,EACP,SAAS,EACT,QAAQ,EACR,IAAI,EACJ,OAAO,EACP,KAAK,EACL,UAAU,EACV,aAAa,GACd,GAAG,iBAAiB,CAAC;IACtB,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEhC,OAAO,GAAG,EAAE;QACV,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,wDAAwD,CAAC;YAC7E,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC;YAChE,IAAA,iDAA2B,EAAC;gBAC1B,OAAO;gBACP,OAAO;gBACP,SAAS;gBACT,QAAQ;gBACR,IAAI;gBACJ,IAAI;gBACJ,OAAO;gBACP,KAAK;gBACL,UAAU;gBACV,aAAa;aACd,CAAC;YACF,eAAe,CAAC,iBAAiB,CAAC;YAClC,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE;SACzB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AApCD,4BAoCC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../../packages/schematic/angular/src/schematics/form/form-control/index.ts"],"names":[],"mappings":";;;AAAA,2DAIoC;AACpC,mEAA4E;AAC5E,qEAGoC;AAKpC,kEAIsC;AACtC,yEAGgD;AAChD,mFAA+E;AAE/E,kBAAgB;AAIhB,SAAgB,2BAA2B,CACzC,OAAqC;;IAErC,MAAM,wBAAwB,GAAG,IAAA,yCAAuB,EAAC,OAAO,CAAC,CAAC;IAClE,MAAM,+BAA+B,GAAG,IAAA,mCAAoB,EAAC,OAAO,CAAC,CAAC;IACtE,MAAM,QAAQ,GAAG,IAAA,gCAAS,EAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,cAAc,GAAG,MAAA,OAAO,CAAC,cAAc,mCAAI,QAAQ,CAAC;IAC1D,OAAO,MAAM,CAAC,MAAM,+CACf,wBAAwB,GACxB,+BAA+B,KAClC,QAAQ;QACR,cAAc,EACd,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,gCAAS,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,IAC5D,CAAC;AACL,CAAC;AAdD,kEAcC;AAED,SAAS,YAAY,CAAC,OAAqC;IACzD,IAAA,qCAAmB,EAAC,cAAc,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,aAAa,OAAO,CAAC,QAAQ,EAAE,CAAC,IAAI,CAAC,CAAC;AACpD,CAAC;AAED,SAAS,eAAe,CAAC,iBAA+C;IACtE,QAAQ,iBAAiB,CAAC,IAAI,EAAE;QAE9B,KAAK,oCAAgB,CAAC,KAAK;YACzB,OAAO,IAAA,uCAAgB,EAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;QAEnE,KAAK,oCAAgB,CAAC,MAAM;YAC1B,OAAO,IAAA,uCAAgB,EAAC,qBAAqB,EAAE,iBAAiB,CAAC,CAAC;QAEpE,KAAK,oCAAgB,CAAC,YAAY;YAChC,OAAO,IAAA,uCAAgB,EAAC,2BAA2B,EAAE,iBAAiB,CAAC,CAAC;QAE1E;YACE,OAAO,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,uCAAuC,iBAAiB,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC;KAEpG;IAED,OAAO,IAAA,iBAAI,GAAE,CAAC;AAChB,CAAC;AAED,mBAAyB,OAA2B;IAClD,MAAM,iBAAiB,GAAG,2BAA2B,CAAC,OAAO,CAAC,CAAC;IAC/D,YAAY,CAAC,iBAAiB,CAAC,CAAC;IAEhC,OAAO,GAAG,EAAE;QACV,OAAO,IAAA,kBAAK,EAAC;YACX,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,yCAAyC,CAAC,KAAK,CAAC;YACpE,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC;YAChE,IAAA,qDAA+B,EAAC,iBAAiB,CAAC;YAClD,eAAe,CAAC,iBAAiB,CAAC;YAClC,GAAG,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE;SACzB,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC;AAbD,4BAaC"}

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

@@ -1,6 +1,4 @@
-import { FormDefinitionControl } from '../../../lib/form-definition-control';
 import { AngularOptions } from '../../../lib/angular-options';
+import { FormControl } from '../../../lib/form/control/form-control';
 
-export interface FormControlOptions extends FormDefinitionControl, AngularOptions {
-  formName: string;
-}
+export type FormControlOptions = FormControl & Omit<AngularOptions, 'name'> & { formName: string; };