fix: remove constructor from excluded properties

adaltas · Sep 21, 2021 · cf6af53 · cf6af53
1 parent 17a6d1a
commit cf6af53
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 9 deletions.
diff --git a/dist/mixme.cjs.js b/dist/mixme.cjs.js
@@ -18,7 +18,7 @@ function _typeof(obj) {
   return _typeof(obj);
 }
 
-// Generated by CoffeeScript 2.5.1
+// Generated by CoffeeScript 2.6.0
 var _snake_case; exports.clone = void 0; exports.compare = void 0; exports.is_object = void 0; exports.is_object_literal = void 0; exports.merge = void 0; exports.mutate = void 0; exports.snake_case = void 0;
 
 exports.merge = function merge() {
@@ -50,10 +50,13 @@ exports.mutate = function mutate() {
       }
 
       for (name in source) {
-        if (/__proto__|constructor|prototype|eval|function|\*|\+|;|\s|\(|\)|!/.test(name)) {
+        if (/__proto__|prototype/.test(name)) {
           // See
           // https://github.com/adaltas/node-mixme/issues/1
           // https://github.com/adaltas/node-mixme/issues/2
+          // continue if /__proto__|constructor|prototype|eval|function|\*|\+|;|\s|\(|\)|!/.test name
+          // Unless proven wrong, I consider ok to copy any properties named eval
+          // or function, we are not executing those, only copying.
           continue;
         }
 

diff --git a/dist/mixme.esm.js b/dist/mixme.esm.js
@@ -14,7 +14,7 @@ function _typeof(obj) {
   return _typeof(obj);
 }
 
-// Generated by CoffeeScript 2.5.1
+// Generated by CoffeeScript 2.6.0
 var _snake_case, _clone, _compare, is_object, is_object_literal, merge, _mutate, _snake_case2;
 
 merge = function merge() {
@@ -46,10 +46,13 @@ _mutate = function mutate() {
       }
 
       for (name in source) {
-        if (/__proto__|constructor|prototype|eval|function|\*|\+|;|\s|\(|\)|!/.test(name)) {
+        if (/__proto__|prototype/.test(name)) {
           // See
           // https://github.com/adaltas/node-mixme/issues/1
           // https://github.com/adaltas/node-mixme/issues/2
+          // continue if /__proto__|constructor|prototype|eval|function|\*|\+|;|\s|\(|\)|!/.test name
+          // Unless proven wrong, I consider ok to copy any properties named eval
+          // or function, we are not executing those, only copying.
           continue;
         }
 

diff --git a/dist/mixme.umd.js b/dist/mixme.umd.js
@@ -20,7 +20,7 @@
     return _typeof(obj);
   }
 
-  // Generated by CoffeeScript 2.5.1
+  // Generated by CoffeeScript 2.6.0
   var _snake_case; exports.clone = void 0; exports.compare = void 0; exports.is_object = void 0; exports.is_object_literal = void 0; exports.merge = void 0; exports.mutate = void 0; exports.snake_case = void 0;
 
   exports.merge = function merge() {
@@ -52,10 +52,13 @@
         }
 
         for (name in source) {
-          if (/__proto__|constructor|prototype|eval|function|\*|\+|;|\s|\(|\)|!/.test(name)) {
+          if (/__proto__|prototype/.test(name)) {
             // See
             // https://github.com/adaltas/node-mixme/issues/1
             // https://github.com/adaltas/node-mixme/issues/2
+            // continue if /__proto__|constructor|prototype|eval|function|\*|\+|;|\s|\(|\)|!/.test name
+            // Unless proven wrong, I consider ok to copy any properties named eval
+            // or function, we are not executing those, only copying.
             continue;
           }
 

diff --git a/lib/index.js b/lib/index.js
diff --git a/src/index.coffee b/src/index.coffee
@@ -24,7 +24,7 @@ mutate = ->
         # continue if /__proto__|constructor|prototype|eval|function|\*|\+|;|\s|\(|\)|!/.test name
         # Unless proven wrong, I consider ok to copy any properties named eval
         # or function, we are not executing those, only copying.
-        continue if /__proto__|constructor|prototype/.test name
+        continue if /__proto__|prototype/.test name
         target[name] = mutate target[name], source[name]
     else if Array.isArray source
       target = for v in source