fix: Add use standalone lodash.clonedeep and lodash.mergewith in lib

EndyKaufman · May 4, 2019 · d38198d · d38198d
1 parent df54a55
commit d38198d
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 56 deletions.
diff --git a/angular.json b/angular.json
@@ -49,15 +49,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
             }
           }

diff --git a/libs/ngx-dynamic-form-builder/package.json b/libs/ngx-dynamic-form-builder/package.json
@@ -49,11 +49,13 @@
     "@angular/core": "^7.2.14",
     "class-transformer": "^0.2.0",
     "class-validator": "^0.9.1",
-    "@types/lodash-es": "^4.17.3",
-    "lodash-es": "^4.17.11"
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.mergewith": "^4.6.1"
   },
   "dependencies": {
     "class-transformer": "^0.2.0",
-    "class-validator": "^0.9.1"
+    "class-validator": "^0.9.1",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.mergewith": "^4.6.1"
   }
 }
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
@@ -1,34 +1,18 @@
-import {
-  AbstractControl,
-  AbstractControlOptions,
-  AsyncValidatorFn,
-  FormArray,
-  FormBuilder,
-  FormControl,
-  FormGroup,
-  ValidatorFn
-} from '@angular/forms';
+import { AbstractControl, AbstractControlOptions, AsyncValidatorFn, FormArray, FormBuilder, FormControl, FormGroup, ValidatorFn } from '@angular/forms';
 import { classToClass, plainToClass } from 'class-transformer';
 import { ClassType } from 'class-transformer/ClassTransformer';
-import {
-  getFromContainer,
-  MetadataStorage,
-  validate,
-  validateSync,
-  ValidationError,
-  ValidationTypes,
-  Validator,
-  ValidatorOptions
-} from 'class-validator';
+import { getFromContainer, MetadataStorage, validate, validateSync, ValidationError, ValidationTypes, Validator, ValidatorOptions } from 'class-validator';
 import { ValidationMetadata } from 'class-validator/metadata/ValidationMetadata';
-import cloneDeep from 'lodash-es/cloneDeep';
-import mergeWith from 'lodash-es/mergeWith';
 import 'reflect-metadata';
 import { BehaviorSubject, Subject } from 'rxjs';
 import { Dictionary, DynamicFormGroupField, ShortValidationErrors } from '../models';
 import { foreverInvalid, FOREVER_INVALID_NAME } from '../validators/forever-invalid.validator';
 import { DynamicFormControl } from './dynamic-form-control';
 
+const cloneDeep = require('lodash.clonedeep');
+const mergeWith = require('lodash.mergewith');
+
+
 // Enforces the properties of the object, if supplied, to be of the original type or DynamicFormGroup or, FormArray
 export type FormModel<T> = { [P in keyof T]?: T[P] | DynamicFormGroup<any> | FormArray };
 
@@ -98,7 +82,7 @@ export class DynamicFormGroup<TModel> extends FormGroup {
   // Public API
   validate(externalErrors?: ShortValidationErrors, validatorOptions?: ValidatorOptions) {
     this.validateAsync(externalErrors, validatorOptions).then(
-      () => {},
+      () => { },
       error => {
         throw error;
       }
@@ -199,7 +183,7 @@ export class DynamicFormGroup<TModel> extends FormGroup {
 
   setExternalErrors(externalErrors: ShortValidationErrors) {
     this.setExternalErrorsAsync(externalErrors).then(
-      () => {},
+      () => { },
       error => {
         throw error;
       }
@@ -228,7 +212,7 @@ export class DynamicFormGroup<TModel> extends FormGroup {
 
   setValidatorOptions(validatorOptions: ValidatorOptions) {
     this.setValidatorOptionsAsync(validatorOptions).then(
-      () => {},
+      () => { },
       error => {
         throw error;
       }
@@ -362,8 +346,8 @@ export class DynamicFormGroup<TModel> extends FormGroup {
     const object = this._object
       ? this.classToClass(this._object)
       : this.factoryModel
-      ? new this.factoryModel()
-      : undefined;
+        ? new this.factoryModel()
+        : undefined;
 
     if (object !== undefined) {
       // Recursively get the value of all fields
@@ -600,7 +584,7 @@ export function getClassValidators<TModel>(
   //
 
   function createNestedValidate(objectToValidate: any, validationMetadata: ValidationMetadata) {
-    return function(control: FormControl) {
+    return function (control: FormControl) {
       const isValid =
         getValidateErrors(control, objectToValidate !== undefined ? objectToValidate : control.value, validatorOptions)
           .length === 0;
@@ -613,7 +597,7 @@ export function getClassValidators<TModel>(
     conditionalValidations: ValidationMetadata[],
     fieldName: string
   ) {
-    return function(control: FormControl) {
+    return function (control: FormControl) {
       if (!control) {
         return null;
       }
@@ -633,7 +617,7 @@ export function getClassValidators<TModel>(
   }
 
   function createCustomValidation(fieldName: string, validationMetadata: ValidationMetadata) {
-    return function(control: FormControl) {
+    return function (control: FormControl) {
       const validateErrors: ValidationError[] = setObjectValueAndGetValidationErrors(
         control,
         fieldName,
@@ -728,8 +712,8 @@ function setObjectValueAndGetValidationErrors(control: FormControl, key: string,
     control.parent instanceof DynamicFormGroup
       ? (control.parent as DynamicFormGroup<any>).object
       : control.parent
-      ? control.parent.value
-      : {};
+        ? control.parent.value
+        : {};
 
   if (object) {
     object[key] = control.value;
@@ -748,11 +732,11 @@ function getIsValidResult(isValid: boolean, validationMetadata: ValidationMetada
   return isValid
     ? null
     : {
-        [errorType]: {
-          valid: false,
-          type: validationMetadata.type
-        }
-      };
+      [errorType]: {
+        valid: false,
+        type: validationMetadata.type
+      }
+    };
 }
 
 type ErrorPropertyName = 'nestedValidate' | 'customValidation' | 'dynamicValidate';

diff --git a/libs/ngx-dynamic-form-builder/tsconfig.lib.json b/libs/ngx-dynamic-form-builder/tsconfig.lib.json
@@ -10,6 +10,7 @@
     "inlineSources": true,
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "esModuleInterop": true,
     "importHelpers": true,
     "types": [],
     "lib": [
@@ -30,4 +31,4 @@
     "src/test.ts",
     "**/*.spec.ts"
   ]
-}
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -81,12 +81,13 @@
     "@angular/router": "^7.2.14",
     "@angular/service-worker": "^7.2.14",
     "@ngx-prism/core": "^2.0.1",
-    "@types/lodash-es": "^4.17.3",
     "@types/prismjs": "^1.16.0",
     "class-transformer": "^0.2.0",
     "class-validator": "^0.9.1",
     "core-js": "^2.6.2",
     "lodash-es": "^4.17.11",
+    "lodash.clonedeep": "^4.5.0",
+    "lodash.mergewith": "^4.6.1",
     "ngx-markdown": "^7.1.5",
     "prismjs": "^1.16.0",
     "rxjs": "^6.5.1",
@@ -101,6 +102,8 @@
     "@rucken/cli": "^4.1.3",
     "@types/jasmine": "~3.3.12",
     "@types/jasminewd2": "~2.0.6",
+    "@types/lodash.clonedeep": "^4.5.6",
+    "@types/lodash.mergewith": "^4.6.6",
     "@types/node": "~11.13.9",
     "codelyzer": "~5.0.1",
     "conventional-changelog-cli": "^2.0.17",

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,6 +8,7 @@
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
+    "esModuleInterop": true,
     "target": "es5",
     "typeRoots": [
       "node_modules/@types"
@@ -18,10 +19,10 @@
     ],
     "paths": {
       "ngx-dynamic-form-builder": [
-        "dist/ngx-dynamic-form-builder"
+        "libs/ngx-dynamic-form-builder/src"
       ],
       "ngx-dynamic-form-builder/*": [
-        "dist/ngx-dynamic-form-builder/*"
+        "libs/ngx-dynamic-form-builder/src/*"
       ]
     }
   }