fix(patch): fix angular#927, shoud not throw error when definePropert…

…y with frozen desc (angular#929)
hmdhk · Dec 27, 2017 · 5a7a2af · 5a7a2af
1 parent 2e5d482
commit 5a7a2af
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 3 deletions.
diff --git a/lib/browser/define-property.ts b/lib/browser/define-property.ts
@@ -69,12 +69,18 @@ function isUnconfigurable(obj: any, prop: any) {
 }
 
 function rewriteDescriptor(obj: any, prop: string, desc: any) {
-  desc.configurable = true;
+  // issue-927, if the desc is frozen, don't try to change the desc
+  if (!Object.isFrozen(desc)) {
+    desc.configurable = true;
+  }
   if (!desc.configurable) {
-    if (!obj[unconfigurablesKey]) {
+    // issue-927, if the obj is frozen, don't try to set the desc to obj
+    if (!obj[unconfigurablesKey] && !Object.isFrozen(obj)) {
       _defineProperty(obj, unconfigurablesKey, {writable: true, value: {}});
     }
-    obj[unconfigurablesKey][prop] = true;
+    if (obj[unconfigurablesKey]) {
+      obj[unconfigurablesKey][prop] = true;
+    }
   }
   return desc;
 }

diff --git a/test/browser/define-property.spec.ts b/test/browser/define-property.spec.ts
@@ -14,4 +14,16 @@ describe('defineProperty', function() {
         .not.toThrow();
   });
 
+  it('should not throw error when try to defineProperty with a frozen desc', function() {
+    const obj = {};
+    const desc = Object.freeze({value: null, writable: true});
+    Object.defineProperty(obj, 'prop', desc);
+  });
+
+  it('should not throw error when try to defineProperty with a frozen obj', function() {
+    const obj = {};
+    Object.freeze(obj);
+    Object.defineProperty(obj, 'prop', {configurable: true, writable: true, value: 'value'});
+  });
+
 });