feat(core): take account of enumerable getter on clone (#1637)

ngx-formly · Jun 26, 2019 · 66239d9 · 66239d9
1 parent 7015bbe
commit 66239d9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/src/core/src/lib/utils.spec.ts b/src/core/src/lib/utils.spec.ts
@@ -143,4 +143,14 @@ describe('clone', () => {
     expect(clone(d)).toEqual(d);
     expect(clone(d) === d).toBeFalsy();
   });
+
+  it('Enumerable getter', () => {
+    const d = {};
+    Object.defineProperty(d, 'a', { get: () => 'test', enumerable: true });
+    const value = clone(d);
+
+    const propDescriptor = Object.getOwnPropertyDescriptor(value, 'a');
+    expect(propDescriptor.get).toBeDefined();
+    expect(propDescriptor.enumerable).toBeTruthy();
+  });
 });
diff --git a/src/core/src/lib/utils.ts b/src/core/src/lib/utils.ts
@@ -118,10 +118,17 @@ export function clone(value: any): any {
     return value.slice(0).map(v => clone(v));
   }
 
-  value = Object.assign({}, value);
-  Object.keys(value).forEach(k => value[k] = clone(value[k]));
+  return Object.keys(value).reduce((newVal, prop) => {
+    const propDescriptor = Object.getOwnPropertyDescriptor(value, prop);
 
-  return value;
+    if (propDescriptor.get) {
+      Object.defineProperty(newVal, prop, { ...propDescriptor, get: () => clone(value[prop]) });
+    } else {
+      newVal[prop] = clone(value[prop]);
+    }
+
+    return newVal;
+  }, {});
 }
 
 export function defineHiddenProp(field, prop, defaultValue) {

diff --git a/src/material/form-field/src/form-field.wrapper.ts b/src/material/form-field/src/form-field.wrapper.ts
@@ -64,7 +64,7 @@ export class FormlyWrapperFormField extends FieldWrapper<MatFormlyFieldConfig> i
     defineHiddenProp(this.field, '__formField__', this.formField);
 
     const fieldComponent = this.formlyField['_componentFactory'];
-    if (!(fieldComponent.componentRef.instance instanceof FieldType)) {
+    if (fieldComponent && !(fieldComponent.componentRef.instance instanceof FieldType)) {
       console.warn(`Component '${fieldComponent.component.prototype.constructor.name}' must extend 'FieldType' from '@ngx-formly/material'.`);
     }