feat: change class-validator to class-validator-multi-lang for suppor…

…t i18n
EndyKaufman · Sep 9, 2020 · df0eab4 · df0eab4
1 parent 1a80144
commit df0eab4
Show file tree

Hide file tree

Showing 23 changed files with 1,029 additions and 1,771 deletions.
diff --git a/README.md b/README.md
@@ -4,12 +4,12 @@
 [![npm version](https://badge.fury.io/js/ngx-dynamic-form-builder.svg)](https://badge.fury.io/js/ngx-dynamic-form-builder)
 
 
-[FormBuilder](https://angular.io/api/forms/FormBuilder) + [class-transformer](https://github.com/typestack/class-transformer) + [class-validator](https://github.com/typestack/class-validator) = dynamic form group builder for [Angular10+](https://angular.io)
+[FormBuilder](https://angular.io/api/forms/FormBuilder) + [class-transformer](https://github.com/typestack/class-transformer) + [class-validator-multi-lang](https://github.com/endykaufman/class-validator-multi-lang) = dynamic form group builder for [Angular10+](https://angular.io)
 
 ## Installation
 
 ```bash
-npm i --save class-transformer class-validator ngx-dynamic-form-builder
+npm i --save class-transformer class-validator-multi-lang ngx-dynamic-form-builder
 ```
 
 ## Links
@@ -22,7 +22,7 @@ npm i --save class-transformer class-validator ngx-dynamic-form-builder
 
 company.ts
 ```js 
-import { Validate, IsNotEmpty } from 'class-validator';
+import { Validate, IsNotEmpty } from 'class-validator-multi-lang';
 import { plainToClassFromExist } from 'class-transformer';
 import { TextLengthMore15 } from '../utils/custom-validators';
 
@@ -71,7 +71,7 @@ company-panel.component.html
     </p>
     <p>Form status: {{ form.status | json }}</p>
     <p>
-      Form class-validator errors: {{errors|json}}
+      Form class-validator-multi-lang errors: {{errors|json}}
     </p>
     <p>
       Form native errors: {{form?.nativeValidateErrors|async|json}}
@@ -138,7 +138,7 @@ custom-validators.ts
 ```js
 import {
     ValidatorConstraintInterface, ValidatorConstraint
-} from 'class-validator';
+} from 'class-validator-multi-lang';
 
 @ValidatorConstraint()
 export class TextLengthMore15 implements ValidatorConstraintInterface {

diff --git a/angular.json b/angular.json
@@ -17,6 +17,11 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
+            "allowedCommonJsDependencies": [
+              "class-transformer",
+              "validator",
+              "class-validator-multi-lang"
+            ],
             "outputPath": "dist/demo",
             "index": "apps/demo/src/index.html",
             "main": "apps/demo/src/main.ts",
@@ -50,15 +55,15 @@
                   "with": "apps/demo/src/environments/environment.prod.ts"
                 }
               ],
-              "optimization": true,
+              "optimization": false,
               "outputHashing": "all",
               "sourceMap": false,
               "extractCss": true,
               "namedChunks": false,
               "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": true,
+              "buildOptimizer": false,
               "serviceWorker": true
             }
           }
@@ -192,5 +197,8 @@
       }
     }
   },
-  "defaultProject": "demo"
+  "defaultProject": "demo",
+  "cli": {
+    "analytics": false
+  }
 }
diff --git a/apps/demo/src/app/shared/models/company.ts b/apps/demo/src/app/shared/models/company.ts
@@ -1,7 +1,6 @@
-import { Validate, IsNotEmpty, MaxLength, Min, Max, IsOptional } from 'class-validator';
 import { plainToClassFromExist } from 'class-transformer';
+import { IsNotEmpty, IsOptional, Max, MaxLength, Min, Validate } from 'class-validator-multi-lang';
 import { TextLengthMore15 } from '../utils/custom-validators';
-
 export class Company {
   static strings = {
     id: 'Id',

diff --git a/apps/demo/src/app/shared/models/department.ts b/apps/demo/src/app/shared/models/department.ts
@@ -1,5 +1,6 @@
-import { Type, plainToClassFromExist } from 'class-transformer';
-import { IsNotEmpty, IsOptional, ValidateNested } from 'class-validator';
+import { plainToClassFromExist } from 'class-transformer';
+import { Type } from 'class-transformer';
+import { IsNotEmpty, IsOptional, ValidateNested } from 'class-validator-multi-lang';
 import { serializeModel } from '../utils/custom-transforms';
 import { Company } from './company';
 

diff --git a/apps/demo/src/app/shared/models/exp-company.ts b/apps/demo/src/app/shared/models/exp-company.ts
@@ -1,4 +1,4 @@
-import { Validate, IsNotEmpty, Min, Max, MaxLength, IsOptional } from 'class-validator';
+import { Validate, IsNotEmpty, Min, Max, MaxLength, IsOptional } from 'class-validator-multi-lang';
 import { TextLengthMore15 } from '../utils/custom-validators';
 
 export class ExpCompany {

diff --git a/apps/demo/src/app/shared/models/exp-department.ts b/apps/demo/src/app/shared/models/exp-department.ts
@@ -1,4 +1,4 @@
-import { IsNotEmpty, ValidateNested, IsOptional } from 'class-validator';
+import { IsNotEmpty, ValidateNested, IsOptional } from 'class-validator-multi-lang';
 import { ExpCompany } from './exp-company';
 
 export class ExpDepartment {

diff --git a/apps/demo/src/app/shared/models/exp-user.ts b/apps/demo/src/app/shared/models/exp-user.ts
@@ -1,4 +1,4 @@
-import { IsEmail, IsNotEmpty, IsOptional, Validate, ValidateIf, ValidateNested } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsOptional, Validate, ValidateIf, ValidateNested } from 'class-validator-multi-lang';
 import { EqualsTo } from '../utils/custom-validators';
 import { ExpDepartment } from './exp-department';
 

diff --git a/apps/demo/src/app/shared/models/project.ts b/apps/demo/src/app/shared/models/project.ts
@@ -1,5 +1,5 @@
 import { Type } from 'class-transformer';
-import { IsNotEmpty, IsOptional, Validate, ValidateNested } from 'class-validator';
+import { IsNotEmpty, IsOptional, Validate, ValidateNested } from 'class-validator-multi-lang';
 import { ProjectPanelStepsEnum } from '../enums/project-panel-steps.enum';
 import { serializeModel } from '../utils/custom-transforms';
 import { ObjectMustBeNotEmpty } from '../utils/custom-validators';

diff --git a/apps/demo/src/app/shared/models/task.ts b/apps/demo/src/app/shared/models/task.ts
@@ -1,5 +1,5 @@
 import { plainToClassFromExist } from 'class-transformer';
-import { IsNotEmpty } from 'class-validator';
+import { IsNotEmpty } from 'class-validator-multi-lang';
 
 export class Task {
   id?: number = undefined;

diff --git a/apps/demo/src/app/shared/models/user.ts b/apps/demo/src/app/shared/models/user.ts
@@ -1,7 +1,8 @@
-import { plainToClassFromExist, Transform, Type } from 'class-transformer';
-import { IsEmail, IsNotEmpty, IsOptional, Matches, ValidateNested } from 'class-validator';
+import { IsEmail, IsNotEmpty, IsOptional, Matches, ValidateNested } from 'class-validator-multi-lang';
 import { serializeModel, transformDateToString, transformStringToDate } from '../utils/custom-transforms';
 import { Department } from './department';
+import { Type, Transform } from 'class-transformer';
+import { plainToClassFromExist } from 'class-transformer';
 
 export class User {
   static strings = {

diff --git a/apps/demo/src/app/shared/utils/custom-validators.ts b/apps/demo/src/app/shared/utils/custom-validators.ts
@@ -1,4 +1,4 @@
-import { ValidationArguments, ValidatorConstraint, ValidatorConstraintInterface } from 'class-validator';
+import { ValidationArguments, ValidatorConstraint, ValidatorConstraintInterface } from 'class-validator-multi-lang';
 
 @ValidatorConstraint()
 export class TextLengthMore15 implements ValidatorConstraintInterface {

diff --git a/libs/ngx-dynamic-form-builder/README.md b/libs/ngx-dynamic-form-builder/README.md
@@ -2,12 +2,12 @@
 [![npm version](https://badge.fury.io/js/ngx-dynamic-form-builder.svg)](https://badge.fury.io/js/ngx-dynamic-form-builder)
 
 
-[FormBuilder](https://angular.io/api/forms/FormBuilder) + [class-transformer](https://github.com/typestack/class-transformer) + [class-validator](https://github.com/typestack/class-validator) = dynamic form group builder for [Angular10+](https://angular.io)
+[FormBuilder](https://angular.io/api/forms/FormBuilder) + [class-transformer](https://github.com/typestack/class-transformer) + [class-validator-multi-lang](https://github.com/typestack/class-validator-multi-lang) = dynamic form group builder for [Angular10+](https://angular.io)
 
 ## Installation
 
 ```bash
-npm i --save class-transformer class-validator ngx-dynamic-form-builder
+npm i --save class-transformer class-validator-multi-lang ngx-dynamic-form-builder
 ```
 
 ## Links
@@ -42,7 +42,7 @@ export class AppModule {}
 
 company.ts
 ```js 
-import { Validate, IsNotEmpty } from 'class-validator';
+import { Validate, IsNotEmpty } from 'class-validator-multi-lang';
 import { plainToClassFromExist } from 'class-transformer';
 import { TextLengthMore15 } from '../utils/custom-validators';
 
@@ -69,7 +69,7 @@ company-panel.component.html
     </p>
     <p>Form status: {{ form.status | json }}</p>
     <p>
-      Form class-validator errors: {{errors|json}}
+      Form class-validator-multi-lang errors: {{errors|json}}
     </p>
     <p>
       Form native errors: {{form?.nativeValidateErrors|async|json}}
@@ -136,7 +136,7 @@ custom-validators.ts
 ```js
 import {
     ValidatorConstraintInterface, ValidatorConstraint
-} from 'class-validator';
+} from 'class-validator-multi-lang';
 
 @ValidatorConstraint()
 export class TextLengthMore15 implements ValidatorConstraintInterface {

diff --git a/libs/ngx-dynamic-form-builder/ng-package.json b/libs/ngx-dynamic-form-builder/ng-package.json
@@ -6,7 +6,7 @@
     "entryFile": "src/public_api.ts",
     "umdModuleIds": {
       "class-transformer": "class-transformer",
-      "class-validator": "class-validator"
+      "class-validator-multi-lang": "class-validator-multi-lang"
     }
   },
   "whitelistedNonPeerDependencies": [

diff --git a/libs/ngx-dynamic-form-builder/ng-package.prod.json b/libs/ngx-dynamic-form-builder/ng-package.prod.json
@@ -5,7 +5,7 @@
     "entryFile": "src/public_api.ts",
     "umdModuleIds": {
       "class-transformer": "class-transformer",
-      "class-validator": "class-validator"
+      "class-validator-multi-lang": "class-validator-multi-lang"
     }
   },
   "whitelistedNonPeerDependencies": [

diff --git a/libs/ngx-dynamic-form-builder/package.json b/libs/ngx-dynamic-form-builder/package.json
@@ -1,11 +1,12 @@
 {
   "name": "ngx-dynamic-form-builder",
   "version": "1.6.1",
-  "description": "FormBuilder + class-transformer + class-validator = dynamic form group builder for Angular10+",
+  "description": "FormBuilder + class-transformer + class-validator-multi-lang = dynamic form group builder for Angular10+",
   "keywords": [
     "form-builder",
     "class-transformer",
     "class-validator",
+    "class-validator-multi-lang",
     "auto",
     "dynamic",
     "formgroup",
@@ -43,12 +44,12 @@
   ],
   "peerDependencies": {
     "rxjs": "^6.6.2",
-    "@angular/forms": "^10.0.9",
-    "@angular/common": "^10.0.9",
-    "@angular/compiler": "^10.0.9",
-    "@angular/core": "^10.0.9",
+    "@angular/forms": "^10.1.0",
+    "@angular/common": "^10.1.0",
+    "@angular/compiler": "^10.1.0",
+    "@angular/core": "^10.1.0",
     "class-transformer": "^0.3.1",
-    "class-validator": "^0.12.2"
+    "class-validator-multi-lang": "^0.120.201"
   },
   "dependencies": {
     "lodash.clonedeep": "^4.5.0",

diff --git a/libs/ngx-dynamic-form-builder/src/lib/models/dynamic-form-group-config.ts b/libs/ngx-dynamic-form-builder/src/lib/models/dynamic-form-group-config.ts
@@ -1,5 +1,5 @@
 import { AbstractControlOptions, AsyncValidatorFn, ValidatorFn } from '@angular/forms';
-import { ValidatorOptions } from 'class-validator';
+import { ValidatorOptions } from 'class-validator-multi-lang';
 
 export interface DynamicFormGroupConfig {
   validator?: ValidatorFn | undefined;

diff --git a/libs/ngx-dynamic-form-builder/src/lib/models/dynamic-form-group-field.ts b/libs/ngx-dynamic-form-builder/src/lib/models/dynamic-form-group-field.ts
@@ -1,6 +1,6 @@
-import { ValidationMetadata } from 'class-validator/types/metadata/ValidationMetadata';
 import { DynamicFormGroup } from '../utils/dynamic-form-group';
 import { ValidatorFunctionType } from './validator-function-type';
+import { ValidationMetadata } from 'class-validator-multi-lang';
 
 export interface DynamicFormGroupField {
   data: any | DynamicFormGroup<any>;

diff --git a/libs/ngx-dynamic-form-builder/src/lib/utils/dynamic-form-control.ts b/libs/ngx-dynamic-form-builder/src/lib/utils/dynamic-form-control.ts
@@ -1,7 +1,7 @@
 import { AsyncValidatorFn, FormControl, ValidatorFn } from '@angular/forms';
-import { ValidationMetadata } from 'class-validator/types/metadata/ValidationMetadata';
 import { Observable } from 'rxjs';
 import { DynamicFormGroupField } from '../models/dynamic-form-group-field';
+import { ValidationMetadata } from 'class-validator-multi-lang';
 
 export class DynamicFormControl extends FormControl {
   public controlName: string;

diff --git a/libs/ngx-dynamic-form-builder/src/lib/utils/dynamic-form-group-helpers.ts b/libs/ngx-dynamic-form-builder/src/lib/utils/dynamic-form-group-helpers.ts
@@ -1,5 +1,5 @@
-import { ValidationError } from 'class-validator';
 import { ShortValidationErrors } from '../models/short-validation-errors';
+import { ValidationError } from 'class-validator-multi-lang';
 
 const cloneDeep = require('lodash.clonedeep');
 const mergeWith = require('lodash.mergewith');

diff --git a/libs/ngx-dynamic-form-builder/src/lib/utils/dynamic-form-group.ts b/libs/ngx-dynamic-form-builder/src/lib/utils/dynamic-form-group.ts
@@ -10,8 +10,14 @@ import {
 } from '@angular/forms';
 import { classToClass, plainToClass } from 'class-transformer';
 import { ClassType } from 'class-transformer/ClassTransformer';
-import { getMetadataStorage, validateSync, ValidationTypes, Validator, ValidatorOptions } from 'class-validator';
-import { ValidationMetadata } from 'class-validator/types/metadata/ValidationMetadata';
+import {
+  getMetadataStorage,
+  validateSync,
+  ValidationMetadata,
+  ValidationTypes,
+  Validator,
+  ValidatorOptions,
+} from 'class-validator-multi-lang';
 import stringify from 'fast-safe-stringify';
 import 'reflect-metadata';
 import { BehaviorSubject, Subject, Subscription } from 'rxjs';
@@ -581,18 +587,26 @@ export function getClassValidators<TModel>(
   fields?: Dictionary,
   validatorOptions?: ValidatorOptions
 ) {
+  const groups = validatorOptions ? validatorOptions.groups : undefined;
+  const strictGroups = (validatorOptions && validatorOptions.strictGroups) || false;
+  const always = (validatorOptions && validatorOptions.always) || false;
+
   // console.time(String(factoryModel));
   // Get the validation rules from the object decorators
   let allValidationMetadatas: ValidationMetadata[] | any = getMetadataStorage().getTargetValidationMetadatas(
     factoryModel,
-    ''
+    '',
+    always,
+    strictGroups
   );
 
-  // Get the validation rules for the validation group: https://github.com/typestack/class-validator#validation-groups
+  // Get the validation rules for the validation group: https://github.com/typestack/class-validator-multi-lang#validation-groups
   let validationGroupMetadatas: ValidationMetadata[] | any = getMetadataStorage().getTargetValidationMetadatas(
     factoryModel,
     '',
-    validatorOptions && validatorOptions.groups ? validatorOptions.groups : undefined
+    always,
+    strictGroups,
+    groups
   );
   const formGroupFields = {};
 
@@ -626,7 +640,7 @@ export function getClassValidators<TModel>(
           }
         });
 
-        // Nested Validation for the field for the requested class-validator group
+        // Nested Validation for the field for the requested class-validator-multi-lang group
         nestedGroupValidations = [];
         validationGroupMetadatas.forEach((validationMetadata) => {
           if (isPropertyValidatorOfType(validationMetadata, fieldName, ValidationKeys.nested.type)) {
@@ -814,7 +828,7 @@ export function getClassValidators<TModel>(
 
   /**
    * marked with @Validate(...)
-   * https://github.com/typestack/class-validator#custom-validation-classes
+   * https://github.com/typestack/class-validator-multi-lang#custom-validation-classes
    */
   function isCustomValidate(validationMetadata: ValidationMetadata, typeKey: string) {
     return (
@@ -826,7 +840,7 @@ export function getClassValidators<TModel>(
 
   /**
    * marked with @ValidateNested()
-   * https://github.com/typestack/class-validator#validating-nested-objects
+   * https://github.com/typestack/class-validator-multi-lang#validating-nested-objects
    */
   function isNestedValidate(validationMetadata: ValidationMetadata, typeKey: string) {
     return (