refactor: code

Author: WeilinerL

dist/vue-create-api.esm.js

@@ -45,6 +45,10 @@ function isFunction(fn) {
   return typeof fn === 'function';
 }
 
+function isArray(arr) {
+  return Object.prototype.toString.call(arr) === '[object Array]';
+}
+
 function assert(condition, msg) {
   if (!condition) {
     throw new Error("[vue-create-api error]: " + msg);
@@ -329,39 +333,35 @@ var cache = {
     }
   },
   remove: function remove(component) {
-    var idx = -1;
     var instances = cache.instances;
     var len = instances.length;
     for (var i = 0; i < len; i += 1) {
       var ins = instances[i];
       if (ins === component) {
-        idx = i;
-        break;
+        instances.splice(i, 1);
+        return;
       }
     }
-    if (idx > -1) {
-      instances.splice(idx, 1);
-    }
   }
 };
 
 function batchDestroy(filter) {
-  var hasFilter = typeof filter === 'function';
+  var hasFilter = isFunction(filter);
   var instancesCopy = cache.instances.slice();
   var instances = hasFilter ? filter(instancesCopy) : instancesCopy;
-  if (!Array.isArray(instances)) {
+  if (!isArray(instances)) {
     return;
   }
   if (hasFilter) {
     instances.forEach(function (ins) {
-      if (ins && typeof ins.remove === 'function') {
+      if (ins && isFunction(ins.remove)) {
         ins.remove();
         cache.remove(ins);
       }
     });
   } else {
     instances.forEach(function (ins) {
-      if (ins && typeof ins.remove === 'function') {
+      if (ins && isFunction(ins.remove)) {
         ins.remove();
       }
     });

dist/vue-create-api.js

@@ -51,6 +51,10 @@
     return typeof fn === 'function';
   }
 
+  function isArray(arr) {
+    return Object.prototype.toString.call(arr) === '[object Array]';
+  }
+
   function assert(condition, msg) {
     if (!condition) {
       throw new Error("[vue-create-api error]: " + msg);
@@ -335,39 +339,35 @@
       }
     },
     remove: function remove(component) {
-      var idx = -1;
       var instances = cache.instances;
       var len = instances.length;
       for (var i = 0; i < len; i += 1) {
         var ins = instances[i];
         if (ins === component) {
-          idx = i;
-          break;
+          instances.splice(i, 1);
+          return;
         }
       }
-      if (idx > -1) {
-        instances.splice(idx, 1);
-      }
     }
   };
 
   function batchDestroy(filter) {
-    var hasFilter = typeof filter === 'function';
+    var hasFilter = isFunction(filter);
     var instancesCopy = cache.instances.slice();
     var instances = hasFilter ? filter(instancesCopy) : instancesCopy;
-    if (!Array.isArray(instances)) {
+    if (!isArray(instances)) {
       return;
     }
     if (hasFilter) {
       instances.forEach(function (ins) {
-        if (ins && typeof ins.remove === 'function') {
+        if (ins && isFunction(ins.remove)) {
           ins.remove();
           cache.remove(ins);
         }
       });
     } else {
       instances.forEach(function (ins) {
-        if (ins && typeof ins.remove === 'function') {
+        if (ins && isFunction(ins.remove)) {
           ins.remove();
         }
       });

dist/vue-create-api.min.js

@@ -1,4 +1,4 @@
-import { camelize, escapeReg, isBoolean } from './util'
+import { camelize, escapeReg, isBoolean, isFunction, isArray } from './util'
 import { assert, warn } from './debug'
 import apiCreator from './creator'
 import instantiateComponent from './instantiate'
@@ -21,39 +21,35 @@ const cache = {
     }
   },
   remove(component) {
-    let idx = -1
     const instances = cache.instances
     const len = instances.length
     for (let i = 0; i < len; i += 1) {
       const ins = instances[i]
       if (ins === component) {
-        idx = i
-        break 
+        instances.splice(i, 1)
+        return
       }
     }
-    if (idx > -1) {
-      instances.splice(idx, 1)
-    }
   }
 }
 
 function batchDestroy(filter) {
-  const hasFilter = typeof filter === 'function'
+  const hasFilter = isFunction(filter)
   const instancesCopy = cache.instances.slice()
   const instances = hasFilter ? filter(instancesCopy) : instancesCopy
-  if (!Array.isArray(instances)) {
+  if (!isArray(instances)) {
     return
   }
   if (hasFilter) {
     instances.forEach(ins => {
-      if (ins && typeof ins.remove === 'function') {
+      if (ins && isFunction(ins.remove)) {
         ins.remove()
         cache.remove(ins)
       }
     }) 
   } else {
     instances.forEach(ins => {
-      if (ins && typeof ins.remove === 'function') {
+      if (ins && isFunction(ins.remove)) {
         ins.remove()
       }
     })

src/index.js

@@ -30,3 +30,6 @@ export function isFunction(fn) {
   return typeof fn === 'function'
 }
 
+export function isArray(arr) {
+  return Object.prototype.toString.call(arr) === '[object Array]'
+}