make instance methods work with prototypes in runtime

babel · Apr 12, 2018 · 83e4d40 · 83e4d40
1 parent 49de8b9
commit 83e4d40
Show file tree

Hide file tree

Showing 39 changed files with 41 additions and 40 deletions.
diff --git a/packages/babel-runtime/core-js/instance/at.js b/packages/babel-runtime/core-js/instance/at.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.at;
-  return (own === StringPrototype.at && (typeof it === "string" || it instanceof String)) ? at : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.at) ? at : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/bind.js b/packages/babel-runtime/core-js/instance/bind.js
@@ -3,5 +3,5 @@ var FunctionPrototype = Function.prototype;
 
 module.exports = function (it) {
   var own = it.bind;
-  return (own === FunctionPrototype.bind && it instanceof Function) ? bind : own;
+  return it === FunctionPrototype || (it instanceof Function && own === FunctionPrototype.bind) ? bind : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/code-point-at.js b/packages/babel-runtime/core-js/instance/code-point-at.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.codePointAt;
-  return (own === StringPrototype.codePointAt && (typeof it === "string" || it instanceof String)) ? codePointAt : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.codePointAt) ? codePointAt : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/concat.js b/packages/babel-runtime/core-js/instance/concat.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.concat;
-  return (own === ArrayPrototype.concat && it instanceof Array) ? concat : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.concat) ? concat : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/copy-within.js b/packages/babel-runtime/core-js/instance/copy-within.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.copyWithin;
-  return (own === ArrayPrototype.copyWithin && it instanceof Array) ? copyWithin : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.copyWithin) ? copyWithin : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/ends-with.js b/packages/babel-runtime/core-js/instance/ends-with.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.endsWith;
-  return (own === StringPrototype.endsWith && (typeof it === "string" || it instanceof String)) ? endsWith : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.endsWith) ? endsWith : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/entries.js b/packages/babel-runtime/core-js/instance/entries.js
@@ -9,5 +9,5 @@ var DOMIterables = {
 
 module.exports = function (it) {
   var own = it.entries;
-  return (own === ArrayPrototype.entries && (it instanceof Array || DOMIterables.hasOwnProperty(toString.call(it)))) ? entries : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.entries) || DOMIterables.hasOwnProperty(toString.call(it)) ? entries : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/every.js b/packages/babel-runtime/core-js/instance/every.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.every;
-  return (own === ArrayPrototype.every && it instanceof Array) ? every : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.every) ? every : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/fill.js b/packages/babel-runtime/core-js/instance/fill.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.fill;
-  return (own === ArrayPrototype.fill && it instanceof Array) ? fill : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.fill) ? fill : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/filter.js b/packages/babel-runtime/core-js/instance/filter.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.filter;
-  return (own === ArrayPrototype.filter && it instanceof Array) ? filter : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.filter) ? filter : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/find-index.js b/packages/babel-runtime/core-js/instance/find-index.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.findIndex;
-  return (own === ArrayPrototype.findIndex && it instanceof Array) ? findIndex : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.findIndex) ? findIndex : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/find.js b/packages/babel-runtime/core-js/instance/find.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.find;
-  return (own === ArrayPrototype.find && it instanceof Array) ? find : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.find) ? find : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/flags.js b/packages/babel-runtime/core-js/instance/flags.js
@@ -1,5 +1,6 @@
 var flags = require("core-js-pure/features/regexp/flags");
+var RegExpPrototype = RegExp.prototype;
 
 module.exports = function (it) {
-  return (it instanceof RegExp && !('flags' in it)) ? flags(it) : it.flags;
+  return (it === RegExpPrototype || it instanceof RegExp) && !('flags' in it) ? flags(it) : it.flags;
 };
diff --git a/packages/babel-runtime/core-js/instance/flat-map.js b/packages/babel-runtime/core-js/instance/flat-map.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.flatMap;
-  return (own === ArrayPrototype.flatMap && it instanceof Array) ? flatMap : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.flatMap) ? flatMap : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/flatten.js b/packages/babel-runtime/core-js/instance/flatten.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.flatten;
-  return (own === ArrayPrototype.flatten && it instanceof Array) ? flatten : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.flatten) ? flatten : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/for-each.js b/packages/babel-runtime/core-js/instance/for-each.js
@@ -9,5 +9,5 @@ var DOMIterables = {
 
 module.exports = function (it) {
   var own = it.forEach;
-  return (own === ArrayPrototype.forEach && (it instanceof Array || DOMIterables.hasOwnProperty(toString.call(it)))) ? forEach : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.forEach) || DOMIterables.hasOwnProperty(toString.call(it)) ? forEach : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/includes.js b/packages/babel-runtime/core-js/instance/includes.js
@@ -5,7 +5,7 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.includes;
-  if (own === ArrayPrototype.includes && it instanceof Array) return arrayIncludes;
-  if (own === StringPrototype.includes && (typeof it === "string" || it instanceof String)) return stringIncludes;
+  if (it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.includes)) return arrayIncludes;
+  if (typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.includes)) return stringIncludes;
   return own;
 };
diff --git a/packages/babel-runtime/core-js/instance/index-of.js b/packages/babel-runtime/core-js/instance/index-of.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.indexOf;
-  return (own === ArrayPrototype.indexOf && it instanceof Array) ? indexOf : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.indexOf) ? indexOf : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/keys.js b/packages/babel-runtime/core-js/instance/keys.js
@@ -9,5 +9,5 @@ var DOMIterables = {
 
 module.exports = function (it) {
   var own = it.keys;
-  return (own === ArrayPrototype.keys && (it instanceof Array || DOMIterables.hasOwnProperty(toString.call(it)))) ? keys : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.keys) || DOMIterables.hasOwnProperty(toString.call(it)) ? keys : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/last-index-of.js b/packages/babel-runtime/core-js/instance/last-index-of.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.lastIndexOf;
-  return (own === ArrayPrototype.lastIndexOf && it instanceof Array) ? lastIndexOf : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.lastIndexOf) ? lastIndexOf : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/map.js b/packages/babel-runtime/core-js/instance/map.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.map;
-  return (own === ArrayPrototype.map && it instanceof Array) ? map : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.map) ? map : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/match-all.js b/packages/babel-runtime/core-js/instance/match-all.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.matchAll;
-  return (own === StringPrototype.matchAll && (typeof it === "string" || it instanceof String)) ? matchAll : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.matchAll) ? matchAll : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/pad-end.js b/packages/babel-runtime/core-js/instance/pad-end.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.padEnd;
-  return (own === StringPrototype.padEnd && (typeof it === "string" || it instanceof String)) ? padEnd : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.padEnd) ? padEnd : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/pad-start.js b/packages/babel-runtime/core-js/instance/pad-start.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.padStart;
-  return (own === StringPrototype.padStart && (typeof it === "string" || it instanceof String)) ? padStart : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.padStart) ? padStart : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/reduce-right.js b/packages/babel-runtime/core-js/instance/reduce-right.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.reduceRight;
-  return (own === ArrayPrototype.reduceRight && it instanceof Array) ? reduceRight : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.reduceRight) ? reduceRight : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/reduce.js b/packages/babel-runtime/core-js/instance/reduce.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.reduce;
-  return (own === ArrayPrototype.reduce && it instanceof Array) ? reduce : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.reduce) ? reduce : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/repeat.js b/packages/babel-runtime/core-js/instance/repeat.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.repeat;
-  return (own === StringPrototype.repeat && (typeof it === "string" || it instanceof String)) ? repeat : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.repeat) ? repeat : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/replace-all.js b/packages/babel-runtime/core-js/instance/replace-all.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.replaceAll;
-  return (own === StringPrototype.replaceAll && (typeof it === "string" || it instanceof String)) ? replaceAll : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.replaceAll) ? replaceAll : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/slice.js b/packages/babel-runtime/core-js/instance/slice.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.slice;
-  return (own === ArrayPrototype.slice && it instanceof Array) ? slice : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.slice) ? slice : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/some.js b/packages/babel-runtime/core-js/instance/some.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.some;
-  return (own === ArrayPrototype.some && it instanceof Array) ? some : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.some) ? some : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/sort.js b/packages/babel-runtime/core-js/instance/sort.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.sort;
-  return (own === ArrayPrototype.sort && it instanceof Array) ? sort : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.sort) ? sort : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/splice.js b/packages/babel-runtime/core-js/instance/splice.js
@@ -3,5 +3,5 @@ var ArrayPrototype = Array.prototype;
 
 module.exports = function (it) {
   var own = it.splice;
-  return (own === ArrayPrototype.splice && it instanceof Array) ? splice : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.splice) ? splice : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/starts-with.js b/packages/babel-runtime/core-js/instance/starts-with.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.startsWith;
-  return (own === StringPrototype.startsWith && (typeof it === "string" || it instanceof String)) ? startsWith : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.startsWith) ? startsWith : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/trim-end.js b/packages/babel-runtime/core-js/instance/trim-end.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.trimEnd;
-  return (own === StringPrototype.trimEnd && (typeof it === "string" || it instanceof String)) ? trimEnd : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.trimEnd) ? trimEnd : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/trim-left.js b/packages/babel-runtime/core-js/instance/trim-left.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.trimLeft;
-  return (own === StringPrototype.trimLeft && (typeof it === "string" || it instanceof String)) ? trimLeft : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.trimLeft) ? trimLeft : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/trim-right.js b/packages/babel-runtime/core-js/instance/trim-right.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.trimRight;
-  return (own === StringPrototype.trimRight && (typeof it === "string" || it instanceof String)) ? trimRight : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.trimRight) ? trimRight : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/trim-start.js b/packages/babel-runtime/core-js/instance/trim-start.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.trimStart;
-  return (own === StringPrototype.trimStart && (typeof it === "string" || it instanceof String)) ? trimStart : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.trimStart) ? trimStart : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/trim.js b/packages/babel-runtime/core-js/instance/trim.js
@@ -3,5 +3,5 @@ var StringPrototype = String.prototype;
 
 module.exports = function (it) {
   var own = it.trim;
-  return (own === StringPrototype.trim && (typeof it === "string" || it instanceof String)) ? trim : own;
+  return typeof it === "string" || it === StringPrototype || (it instanceof String && own === StringPrototype.trim) ? trim : own;
 };
diff --git a/packages/babel-runtime/core-js/instance/values.js b/packages/babel-runtime/core-js/instance/values.js
@@ -9,5 +9,5 @@ var DOMIterables = {
 
 module.exports = function (it) {
   var own = it.values;
-  return (own === ArrayPrototype.values && (it instanceof Array || DOMIterables.hasOwnProperty(toString.call(it)))) ? values : own;
+  return it === ArrayPrototype || (it instanceof Array && own === ArrayPrototype.values) || DOMIterables.hasOwnProperty(toString.call(it)) ? values : own;
 };