xe-utils - npm Package Compare versions

Comparing version 1.5.30 to 1.5.31

dist/xe-utils.js

 /**
- * xe-utils.js v1.5.30
+ * xe-utils.js v1.5.31
  * (c) 2017-2018 Xu Liangzhan
@@ -16,3 +16,3 @@ * ISC License.
 
-  XEUtils.version = '1.5.30'
+  XEUtils.version = '1.5.31'
 
@@ -81,3 +81,3 @@ /**
     for (var list = baseExports.objectValues(array), len = list.length - 1; len >= 0; len--) {
-      var index = len > 0 ? numberExports.getRandom(0, len) : 0
+      var index = len > 0 ? XEUtils.getRandom(0, len) : 0
       result.push(list[index])
@@ -348,3 +348,3 @@ list.splice(index, 1)
       } else {
-        result = array
+        result = [array]
       }
@@ -355,2 +355,29 @@ }
 
+  /**
+   * 将每个数组中相应位置的值合并在一起
+   *
+   * @param {Array*} array 数组
+   */
+  function zip () {
+    return unzip(arguments)
+  }
+
+  /**
+   * 与 zip 相反
+   *
+   * @param {Array} arrays 数组集合
+   */
+  function unzip (arrays) {
+    var result = []
+    var len = XEUtils.max(arrays, function (item) {
+      return item.length || 0
+    })
+    for (var index = 0; index < len; index++) {
+      result.push(arrayMap(arrays, function (item) {
+        return item ? item[index] : null
+      }))
+    }
+    return result
+  }
+
   var arrayExports = {
@@ -383,3 +410,5 @@ arrayUniq: arrayUniq,
     copyWithin: arrayCopyWithin,
-    chunk: chunk
+    chunk: chunk,
+    zip: zip,
+    unzip: unzip
   }
@@ -1081,2 +1110,3 @@
     arrayEach: arrayEach,
+    forEach: arrayEach,
     each: each,
@@ -1572,3 +1602,3 @@ groupBy: groupBy,
   function sortData (arr, iteratee) {
-    return (baseExports.isFunction(iteratee) ? arrayExports.arraySort(arrayExports.arrayMap(arr, iteratee, this)) : arrayExports.arraySort(arr, iteratee))
+    return (baseExports.isFunction(iteratee) ? XEUtils.arraySort(XEUtils.arrayMap(arr, iteratee, this)) : XEUtils.arraySort(arr, iteratee))
   }
@@ -1575,0 +1605,0 @@

dist/xe-utils.min.js

 /**
- * xe-utils.js v1.5.30
+ * xe-utils.js v1.5.31
  * (c) 2017-2018 Xu Liangzhan
@@ -7,2 +7,2 @@ * ISC License.
  */
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.XEUtils=e()}(this,function(){"use strict";function t(){}function e(t){var e=[];return dt.isArray(t)&&dt.arrayEach(t,function(t){e.includes(t)||e.push(t)}),e}function n(){for(var t=[],n=0,r=arguments.length;n<r;n++)t=t.concat(arguments[n]);return e(t)}function r(t,e,n){return dt.isArray(t)?t.sort(e?dt.isFunction(e)?e.bind(n||this):function(t,n){return t[e]>n[e]?1:-1}:function(t,e){return t>e?1:-1}):t}function i(t){for(var e=[],n=dt.objectValues(t),r=n.length-1;r>=0;r--){var i=r>0?wt.getRandom(0,r):0;e.push(n[i]),n.splice(i,1)}return e}function a(t,e){var n=i(t);return 1===arguments.length?n[0]:(e<n.length&&(n.length=e||0),n)}function o(t,e,n){if(t){if(n=n||this,dt.isArray(t)&&t.some)return t.some(e,n);for(var r in t)if(t.hasOwnProperty(r)&&e.call(n,t[r],r,t))return!0}return!1}function u(t,e,n){if(t){if(n=n||this,dt.isArray(t)&&t.every)return t.every(e,n);for(var r in t)if(t.hasOwnProperty(r)&&!e.call(n,t[r],r,t))return!1}return!0}function s(t,e,n){if(t){if(n=n||this,dt.isArray(t)&&t.filter)return t.filter(e,n);var r={};return dt.each(t,function(i,a){e.call(n,i,a,t)&&(r[a]=i)}),r}return[]}function c(t,e,n){if(t){if(n=n||this,dt.isArray(t)&&t.find)return t.find(e,n);for(var r in t)if(t.hasOwnProperty(r)&&e.call(n,t[r],r,t))return t[r]}}function f(t,e,n){var r=[];if(t){if(n=n||this,dt.isArray(t))return t.map(e,n);dt.each(t,function(){r.push(e.apply(n,arguments))})}return r}function l(t,e,n){var r=0;return n=n||this,dt.each(t,e?dt.isFunction(e)?function(){r+=e.apply(n,arguments)}:function(t,n){r+=t[e]}:function(t,e){r+=t}),r}function h(t,e,n){var r=n,i=0,a=t.length,o=this;if(dt.isArray(t)){if(void 0===n&&(r=t[0],i=1),t.reduce)return t.reduce(e,n);for(;i<a;i++)r=e.call(o,r,t[i],i,t)}else dt.each(t,function(n,i){r=e.call(o,r,n,i,t)});return r}function g(t,e,n,r){if(dt.isArray(t)&&t.copyWithin)return t.copyWithin(e,n,r);var i=e>>0,a=n>>0,o=t.length,u=arguments.length>3?r>>0:o;if(i<o&&(i=i>=0?i:o+i)>=0&&(a=a>=0?a:o+a,u=u>=0?u:o+u,a<u))for(var s=0,c=t.slice(a,u);i<o&&!(c.length<=s);i++)t[i]=c[s++];return t}function p(t){return"function"==typeof t}function y(t){return"string"==typeof t}function d(t){return"number"==typeof t}function m(t){return"object"==typeof t}function v(t){return!!t&&t.constructor===Object}function b(t){return"[object Date]"===rt.call(t)}function S(t){return"undefined"!=typeof Symbol&&Symbol.isSymbol?Symbol.isSymbol(t):"symbol"==typeof t}function M(t){return function(e,n){if(e){if(y(e)||it(e))return t(e,n);for(var r in e)if(n===e[r])return r}return-1}}function x(t,e){return-1!==ut(t,e)}function j(t,e,n){for(var r,i=1,a=e.length;i<a;i++)r=e[i],F(O(e[i]),function(e){t[e]=n?k(r[e],n):r[e]});return t}function O(t){var e=[];if(t){if(Object.keys)return Object.keys(t);A(t,function(t,n){e.push(n)})}return e}function D(t){if(Object.values)return t?Object.values(t):[];var e=[];return F(O(t),function(n){e.push(t[n])}),e}function E(t){if(Object.entries)return t?Object.entries(t):[];var e=[];return F(O(t),function(n){e.push([n,t[n]])}),e}function w(t){return D(t)[0]}function N(t){var e=D(t);return e[e.length-1]}function A(t,e,n){for(var r in t)t.hasOwnProperty(r)&&e.call(n||this,t[r],r,t)}function F(t,e,n){for(var r=0,i=t.length||0;r<i;r++)e.call(n||this,t[r],r,t)}function T(t,e,n){return t?it(t)?p(t.forEach)?t.forEach(e,n||this):F(t,e,n||this):A(t,e,n||this):t}function W(e){return v(e)?function(t){var e={};return T(t,function(t,n){e[n]=W(t)}),e}(e):it(e)?function(e){return t.arrayMap(e,W)}(e):e}function k(t,e){return t?e?W(t):ft(v(t)?{}:[],t):t}function I(t,e){var n=parseFloat(e),r=new Date,i=r.getTime();switch(t){case"y":return Ot.getWhatYear(r,n).getTime();case"M":return Ot.getWhatMonth(r,n).getTime();case"d":return Ot.getWhatDay(r,n).getTime();case"H":return i+60*n*60*1e3;case"m":return i+60*n*1e3;case"s":return i+1e3*n}return i}function R(t){return(dt.isDate(t)?t:new Date(t)).toUTCString()}function H(t,e,n){var r=[],i="undefined"!=typeof document;if(this&&this.$context&&(this.$context=null),dt.isArray(t)?r=t:arguments.length>1?r=[dt.objectAssign({name:t,value:e},n)]:dt.isObject(t)&&(r=[t]),!(r.length>0)){var a={};return i&&document.cookie&&dt.arrayEach(document.cookie.split("; "),function(t){var e=t.indexOf("=");a[vt(t.substring(0,e))]=vt(t.substring(e+1)||"")}),1===arguments.length?a[t]:a}i&&dt.arrayEach(r,function(t){var e=dt.objectAssign({},t),n=[];if(e.name){var r=e.expires;n.push(bt(e.name)+"="+bt(dt.isObject(e.value)?JSON.stringify(e.value):e.value)),r&&(isNaN(r)?e.expires=r.replace(/^([0-9]+)(y|M|d|H|m|s)$/,function(t,e,n){return R(I(n,e))}):/^[0-9]{11,13}$/.test(r)||dt.isDate(r)?e.expires=R(r):e.expires=R(I("d",r))),dt.arrayEach(["expires","path","domain","secure"],function(t){void 0!==e[t]&&n.push(e[t]&&"secure"===t?t:t+"="+e[t])})}document.cookie=n.join("; ")})}function P(t,e){if(t){if(dt.isDate(t))return t;if(/^[0-9]{11,13}$/.test(t))return new Date(t);if(dt.isString(t)){e=e||"yyyy-MM-dd HH:mm:ss.SSS";var n=[];return dt.arrayEach(xt,function(r){for(var i,a,o=0,u=r.rules,s=u.length;o<s;o++){if(i=u[o],(a=e.indexOf(i[0]))>-1){n.push(parseFloat(t.substring(a,a+i[1])||0)+(r.offset||0));break}o===s-1&&n.push(0)}}),new Date(n[0],n[1],n[2],n[3],n[4],n[5],n[6])}}return"Invalid Date"}function C(t,e,n){var r=P(t),i=e&&!isNaN(e)?e:0,a=r.getHours(),o=r.getMinutes(),u=r.getSeconds(),s=r.getMilliseconds();if("first"===n){var c=r.getFullYear(),f=r.getMonth();return(f+=i)<0?new Date(c-Math.ceil((f=Math.abs(f))/12),12-(f%12||1),1,a,o,u,s):new Date(c+Math.floor(f/12),f%12,1,a,o,u,s)}if("last"===n)return new Date(C(r,i+1,"first").getTime()-864e5);var l=r.getDate(),h=C(r,i,"first"),g=h.getMonth();for(h.setDate(l);g<h.getMonth();)h.setDate(--l);return h}function U(t){var e={},n=t.split("?")[1]||"";return n&&dt.arrayEach(n.split("&"),function(t){var n=t.split("=");e[decodeURIComponent(n[0])]=decodeURIComponent(n[1]||"")}),e}function $(){return Dt?Dt.origin||Dt.protocol+"//"+Dt.host:""}function L(t){var e=""+t;0===e.indexOf("/")&&(e=$()+e);var n=e.replace(/#.*/,"").match(/(\?.*)/),r={href:e,hash:"",host:"",hostname:"",protocol:"",port:"",search:n?n[1]:""};r.path=e.replace(/^([a-z0-9.+-]*:)\/\//,function(t,e){return r.protocol=e,""}).replace(/^([a-z0-9.+-]*)(:\d+)?\//,function(t,e,n){var i=n||"";return r.port=i.replace(":",""),r.hostname=e,r.host=e+i,"/"}).replace(/(#.*)/,function(t,e){return r.hash=e,""});var i=r.hash.match(/#((.*)\?|(.*))/);return r.pathname=r.path.replace(/(\?|#.*).*/,""),r.origin=r.protocol+"//"+r.host,r.hashKey=i?i[2]||"":"",r.hashQuery=U(r.hash),r.searchQuery=U(r.search),r}function Y(t,e){return dt.isFunction(e)?nt.arraySort(nt.arrayMap(t,e,this)):nt.arraySort(t,e)}function q(){return Y.apply(this,arguments)[0]}function J(){return Y.apply(this,arguments).reverse()[0]}function z(t){if(t){var e=parseFloat(t);return isNaN(e)?0:e}return 0}function B(t){return parseInt(z(t))}function K(t){return t&&t.trim?t.trim():V(Q(t))}function Q(t){return t&&t.trimLeft?t.trimLeft():(""+t).replace(/^[\s\uFEFF\xA0]+/g,"")}function V(t){return t&&t.trimRight?t.trimRight():(""+t).replace(/[\s\uFEFF\xA0]+$/g,"")}function Z(t){var e=new RegExp("(?:"+dt.objectKeys(t).join("|")+")","g");return function(n){return(""+n).replace(e,function(e){return t[e]})}}function X(t,e){var n=""+t;if(t.repeat)return t.repeat(e);var r=isNaN(e)?[]:new Array(parseInt(e));return r.join(n)+(r.length>0?n:"")}function G(t,e,n){var r=""+t;return r.padStart?r.padStart(e,n):e>>0>r.length?(n=String(n||" "),(e-=r.length)>n.length&&(n+=X(n,e/n.length)),n.slice(0,e)+r):r}function _(t,e,n){var r=""+t;return r.padEnd?r.padEnd(e,n):e>>0>r.length?(n=String(n||" "),(e-=r.length)>n.length&&(n+=X(n,e/n.length)),r+n.slice(0,e)):r}function tt(t,e,n){var r=""+t;return 0===(1===arguments.length?r:r.substring(n)).indexOf(e)}function et(t,e,n){var r=""+t;return 1===arguments.length?r.indexOf(e)===r.length-1:r.substring(0,n).indexOf(e)===n-1}t.version="1.5.30";var nt={arrayUniq:e,uniq:e,arrayUnion:n,union:n,arraySort:r,sort:r,arrayShuffle:i,shuffle:i,arraySample:a,sample:a,arraySome:o,some:o,arrayEvery:u,every:u,arrayFilter:s,filter:s,arrayFind:c,find:c,arrayMap:f,map:f,arraySum:l,sum:l,arrayReduce:h,reduce:h,arrayCopyWithin:g,copyWithin:g,chunk:function(t,e){var n=[],r=e>>0||1;if(dt.isArray(t))if(r>=0&&t.length>r)for(var i=0;i<t.length;)n.push(t.slice(i,i+r)),i+=r;else n=t;return n}},rt=Object.prototype.toString,it=Array.isArray||function(t){return"[object Array]"===rt.call(t)},at=Number.isInteger,ot=0,ut=M(function(t,e){if(t.indexOf)return t.indexOf(e);for(var n=0,r=t.length;n<r;n++)if(e===t[n])return n}),st=M(function(t,e){if(t.lastIndexOf)return t.lastIndexOf(e);for(var n=t.length-1;n>=0;n--)if(e===t[n])return n;return-1}),ct=x,ft=function(t){if(t){var e=arguments;if(!0!==t)return Object.assign?Object.assign.apply(Object,e):j(t,e);if(e.length>1)return t=it(t[1])?[]:{},j(t,e,!0)}return t},lt=O,ht=D,gt=E,pt=w,yt=N,dt={isNaN:isNaN,isFinite:isFinite,isArray:it,isFloat:function(t){return null!==t&&!isNaN(t)&&!at(t)},isInteger:at,isFunction:p,isBoolean:function(t){return"boolean"==typeof t},isString:y,isNumber:d,isRegExp:function(t){return"[object RegExp]"===rt.call(t)},isObject:m,isPlainObject:v,isDate:b,isError:function(t){return"[object Error]"===rt.call(t)},isTypeError:function(t){return!!t&&t.constructor===TypeError},isEmpty:function(t){if(0===t||!d(t)){for(var e in t)return!1;return!0}return!1},isNull:function(t){return null===t},isSymbol:S,isArguments:function(t){return"[object Arguments]"===rt.call(t)},isElement:function(t){return t&&y(t.nodeName)&&d(t.nodeType)},isDocument:function(t){return t&&9===t.nodeType&&"undefined"!=typeof document},isWindow:function(t){return t&&t===t.window&&"undefined"!=typeof window},isFormData:function(t){return"undefined"!=typeof FormData&&t instanceof FormData},isMap:function(t){return"undefined"!=typeof Map&&t instanceof Map},isWeakMap:function(t){return"undefined"!=typeof WeakMap&&t instanceof WeakMap},isSet:function(t){return"undefined"!=typeof Set&&t instanceof Set},isWeakSet:function(t){return"undefined"!=typeof WeakSet&&t instanceof WeakSet},isLeapYear:function(e){var n=(e?t.stringToDate(e):new Date).getFullYear();return n%4==0&&(n%100!=0||n%400==0)},getType:function(t){return null===t?""+t:S(t)?"symbol":b(t)?"date":it(t)?"array":typeof t},uniqueId:function(){return++ot},getSize:function(t){var e=0;return y(t)||it(t)?t.length:(T(t,function(){e++}),e)},lastIndexOf:st,includes:x,contains:ct,objectAssign:ft,assign:ft,extend:ft,stringToJson:function(t){if(m(t))return t;if(y(t))try{return JSON.parse(t)}catch(t){console.error(t)}return{}},jsonToString:function(t){if(m(t))try{return JSON.stringify(t)}catch(t){console.error(t)}return t?""+t:""},objectKeys:O,keys:lt,objectValues:D,values:ht,objectEntries:E,entries:gt,arrayFirst:w,first:pt,arrayLast:N,last:yt,objectEach:A,arrayEach:F,each:T,groupBy:function(t,e,n){var r,i,a={};return t&&(y(e)?(i=e,e=null):e=p(e)?e.bind(n||this):i=null,T(t,function(n,o){r=e?e(n,o,t):i?n[i]:n,a[r]?a[r].push(n):a[r]=[n]})),a},objectMap:function(t,e,n){var r={};return T(t,function(i,a){r[a]=e.call(n||this,i,a,t)}),r},clone:k},mt={browse:function(){var t={isNode:!1,isMobile:!1,isPC:!1};if("undefined"==typeof window&&"undefined"!=typeof process)t.nodeJS=!0;else if(t.isMobile=function(){for(var t=["Android","webOS","iPhone","iPad","iPod","SymbianOS","BlackBerry","Windows Phone"],e=navigator.userAgent,n=0;n<t.length;n++)if(e.indexOf(t[n])>0)return!0;return!1}(),t.isPC=!t.isMobile,"undefined"!=typeof document){var e=document.body||document.documentElement;dt.arrayEach(["webkit","khtml","moz","ms","o"],function(n){t["-"+n]=!!e[n+"MatchesSelector"]})}return t}},vt=decodeURIComponent,bt=encodeURIComponent;dt.objectAssign(H,{setItem:function(t,e,n){H(t,e,n)},getItem:function(t){return H(t)},removeItem:function(t){H(t,null,{expires:-1})},getJSON:function(){return H()}});var St={cookie:H},Mt=Date.now||function(){return(new Date).getTime()},xt=[{rules:[["yyyy",4],["yyy",3],["yy",2]]},{rules:[["MM",2],["M",1]],offset:-1},{rules:[["dd",2],["d",1]]},{rules:[["HH",2],["H",1]]},{rules:[["mm",2],["m",1]]},{rules:[["ss",2],["s",1]]},{rules:[["SSS",3],["SS",2],["S",1]]}],jt=[["yyyy",31536e6],["MM",2592e6],["dd",864e5],["HH",36e5],["mm",6e4],["ss",1e3],["S",0]],Ot={timestamp:Mt,now:Mt,stringToDate:P,dateToString:function(t,e){if(t){if(t=P(t),dt.isDate(t)){var n=["日","一","二","三","四","五","六"],r={"q+":Math.floor((t.getMonth()+3)/3),"M+":t.getMonth()+1,"E+":t.getDay(),"d+":t.getDate(),"H+":t.getHours(),"m+":t.getMinutes(),"s+":t.getSeconds(),S:t.getMilliseconds()},i=String(e||"yyyy-MM-dd HH:mm:ss").replace(/(y+)/,function(e){return(""+t.getFullYear()).substr(4-e.length)});for(var a in r)if(r.hasOwnProperty(a)){var o=""+r[a];i=i.replace(new RegExp("("+a+")"),function(t){return"q+"===a||"E+"===a?n[o]:1===t.length?o:("00"+o).substr(o.length)})}return i}return t}return""},getWhatYear:function(t,e){var n=P(t);if(e){var r=e&&!isNaN(e)?e:0;n.setFullYear(n.getFullYear()+r)}return n},getWhatMonth:C,getWhatWeek:function(t,e,n){var r=P(t),i=Number(/^[0-7]$/.test(n)?n:r.getDay()),a=r.getDay(),o=r.getTime()+864e5*((0===i?7:i)-(0===a?7:a));return e&&!isNaN(e)&&(o+=6048e5*e),new Date(o)},getWhatDay:function(t,e){var n=P(t);return e?new Date(n.getTime()+(e&&!isNaN(e)?864e5*e:0)):n},getDaysOfMonth:function(t,e){return Math.floor((C(t,e,"last").getTime()-C(t,e,"first").getTime())/864e5)+1},getDateDiff:function(t,e,n){var r={done:!1},i=P(t).getTime(),a=e?P(e).getTime():new Date;if(i<a){var o,u=a-i,s=n&&n.length>0?n:jt;r.done=!0;for(var c=0,f=s.length;c<f;c++)u>=(o=s[c])[1]?c===f-1?r[o[0]]=u||0:(r[o[0]]=Math.floor(u/o[1]),u-=r[o[0]]*o[1]):r[o[0]]=0}return r}},Dt=null;"undefined"!=typeof location&&(Dt=location);var Et={parseUrl:L,getBaseURL:function(){if(Dt){var t=Dt.pathname,e=dt.lastIndexOf(t,"/")+1;return $()+(e===t.length?t:t.substring(0,e))}return""},locat:function(){return Dt?L(Dt.href):{}}},wt={getRandom:function(t,e){return t>=e?t:(t>>=0)+Math.round(Math.random()*((e||9)-t))},arrayMin:q,min:q,arrayMax:J,max:J,commafy:function(t,e){var n=dt.objectAssign({spaceNumber:3,separator:",",fixed:0},e),r=parseFloat((""+t).replace(/,/g,"")||0).toFixed(n.fixed).split(".");return r[0].replace(new RegExp("(?=(?!(\\b))(\\d{"+n.spaceNumber+"})+$)","g"),n.separator)+(r[1]?"."+r[1]:"")},toNumber:z,stringToNumber:z,toInteger:B,stringToInteger:B},Nt={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},At={};dt.arrayEach(dt.objectKeys(Nt),function(t){At[Nt[t]]=t});var Ft={trim:K,stringTrim:K,trimLeft:Q,stringTrimLeft:Q,trimRight:V,stringTrimRight:V,escape:Z(Nt),unescape:Z(At),camelCase:function(t){return(""+t).replace(/(-[a-zA-Z])/g,function(t,e){return e.substring(1).toLocaleUpperCase()})},kebabCase:function(t){return(""+t).replace(/([A-Z])/g,function(t,e){return"-"+e.toLowerCase()})},repeat:X,stringRepeat:X,padStart:G,stringPadStart:G,padEnd:_,stringPadEnd:_,startsWith:tt,stringStartsWith:tt,endsWith:et,stringEndsWith:et},Tt={};return dt.objectAssign(Tt,nt,dt,mt,St,Ot,Et,wt,Ft),t.mixin=function(e){Tt.objectEach(e,function(e,n){t[n]=-1==="cookie".indexOf(n)&&Tt.isFunction(e)?function(){var n=e.apply(t.$context,arguments);return t.$context=null,n}:e})},t.mixin(Tt),t});
+!function(n,t){"object"==typeof exports&&"undefined"!=typeof module?module.exports=t():"function"==typeof define&&define.amd?define(t):n.XEUtils=t()}(this,function(){"use strict";function n(){}function t(n){var t=[];return vn.isArray(n)&&vn.arrayEach(n,function(n){t.includes(n)||t.push(n)}),t}function e(){for(var n=[],e=0,r=arguments.length;e<r;e++)n=n.concat(arguments[e]);return t(n)}function r(n,t,e){return vn.isArray(n)?n.sort(t?vn.isFunction(t)?t.bind(e||this):function(n,e){return n[t]>e[t]?1:-1}:function(n,t){return n>t?1:-1}):n}function i(t){for(var e=[],r=vn.objectValues(t),i=r.length-1;i>=0;i--){var a=i>0?n.getRandom(0,i):0;e.push(r[a]),r.splice(a,1)}return e}function a(n,t){var e=i(n);return 1===arguments.length?e[0]:(t<e.length&&(e.length=t||0),e)}function o(n,t,e){if(n){if(e=e||this,vn.isArray(n)&&n.some)return n.some(t,e);for(var r in n)if(n.hasOwnProperty(r)&&t.call(e,n[r],r,n))return!0}return!1}function u(n,t,e){if(n){if(e=e||this,vn.isArray(n)&&n.every)return n.every(t,e);for(var r in n)if(n.hasOwnProperty(r)&&!t.call(e,n[r],r,n))return!1}return!0}function s(n,t,e){if(n){if(e=e||this,vn.isArray(n)&&n.filter)return n.filter(t,e);var r={};return vn.each(n,function(i,a){t.call(e,i,a,n)&&(r[a]=i)}),r}return[]}function c(n,t,e){if(n){if(e=e||this,vn.isArray(n)&&n.find)return n.find(t,e);for(var r in n)if(n.hasOwnProperty(r)&&t.call(e,n[r],r,n))return n[r]}}function f(n,t,e){var r=[];if(n){if(e=e||this,vn.isArray(n))return n.map(t,e);vn.each(n,function(){r.push(t.apply(e,arguments))})}return r}function l(n,t,e){var r=0;return e=e||this,vn.each(n,t?vn.isFunction(t)?function(){r+=t.apply(e,arguments)}:function(n,e){r+=n[t]}:function(n,t){r+=n}),r}function h(n,t,e){var r=e,i=0,a=n.length,o=this;if(vn.isArray(n)){if(void 0===e&&(r=n[0],i=1),n.reduce)return n.reduce(t,e);for(;i<a;i++)r=t.call(o,r,n[i],i,n)}else vn.each(n,function(e,i){r=t.call(o,r,e,i,n)});return r}function p(n,t,e,r){if(vn.isArray(n)&&n.copyWithin)return n.copyWithin(t,e,r);var i=t>>0,a=e>>0,o=n.length,u=arguments.length>3?r>>0:o;if(i<o&&(i=i>=0?i:o+i)>=0&&(a=a>=0?a:o+a,u=u>=0?u:o+u,a<u))for(var s=0,c=n.slice(a,u);i<o&&!(c.length<=s);i++)n[i]=c[s++];return n}function g(t){for(var e=[],r=n.max(t,function(n){return n.length||0}),i=0;i<r;i++)e.push(f(t,function(n){return n?n[i]:null}));return e}function y(n){return"function"==typeof n}function d(n){return"string"==typeof n}function m(n){return"number"==typeof n}function v(n){return"object"==typeof n}function b(n){return!!n&&n.constructor===Object}function S(n){return"[object Date]"===an.call(n)}function M(n){return"undefined"!=typeof Symbol&&Symbol.isSymbol?Symbol.isSymbol(n):"symbol"==typeof n}function x(n){return function(t,e){if(t){if(d(t)||on(t))return n(t,e);for(var r in t)if(e===t[r])return r}return-1}}function j(n,t){return-1!==cn(n,t)}function O(n,t,e){for(var r,i=1,a=t.length;i<a;i++)r=t[i],T(D(t[i]),function(t){n[t]=e?I(r[t],e):r[t]});return n}function D(n){var t=[];if(n){if(Object.keys)return Object.keys(n);F(n,function(n,e){t.push(e)})}return t}function E(n){if(Object.values)return n?Object.values(n):[];var t=[];return T(D(n),function(e){t.push(n[e])}),t}function w(n){if(Object.entries)return n?Object.entries(n):[];var t=[];return T(D(n),function(e){t.push([e,n[e]])}),t}function N(n){return E(n)[0]}function A(n){var t=E(n);return t[t.length-1]}function F(n,t,e){for(var r in n)n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n)}function T(n,t,e){for(var r=0,i=n.length||0;r<i;r++)t.call(e||this,n[r],r,n)}function W(n,t,e){return n?on(n)?y(n.forEach)?n.forEach(t,e||this):T(n,t,e||this):F(n,t,e||this):n}function k(t){return b(t)?function(n){var t={};return W(n,function(n,e){t[e]=k(n)}),t}(t):on(t)?function(t){return n.arrayMap(t,k)}(t):t}function I(n,t){return n?t?k(n):hn(b(n)?{}:[],n):n}function R(n,t){var e=parseFloat(t),r=new Date,i=r.getTime();switch(n){case"y":return En.getWhatYear(r,e).getTime();case"M":return En.getWhatMonth(r,e).getTime();case"d":return En.getWhatDay(r,e).getTime();case"H":return i+60*e*60*1e3;case"m":return i+60*e*1e3;case"s":return i+1e3*e}return i}function H(n){return(vn.isDate(n)?n:new Date(n)).toUTCString()}function P(n,t,e){var r=[],i="undefined"!=typeof document;if(this&&this.$context&&(this.$context=null),vn.isArray(n)?r=n:arguments.length>1?r=[vn.objectAssign({name:n,value:t},e)]:vn.isObject(n)&&(r=[n]),!(r.length>0)){var a={};return i&&document.cookie&&vn.arrayEach(document.cookie.split("; "),function(n){var t=n.indexOf("=");a[Sn(n.substring(0,t))]=Sn(n.substring(t+1)||"")}),1===arguments.length?a[n]:a}i&&vn.arrayEach(r,function(n){var t=vn.objectAssign({},n),e=[];if(t.name){var r=t.expires;e.push(Mn(t.name)+"="+Mn(vn.isObject(t.value)?JSON.stringify(t.value):t.value)),r&&(isNaN(r)?t.expires=r.replace(/^([0-9]+)(y|M|d|H|m|s)$/,function(n,t,e){return H(R(e,t))}):/^[0-9]{11,13}$/.test(r)||vn.isDate(r)?t.expires=H(r):t.expires=H(R("d",r))),vn.arrayEach(["expires","path","domain","secure"],function(n){void 0!==t[n]&&e.push(t[n]&&"secure"===n?n:n+"="+t[n])})}document.cookie=e.join("; ")})}function C(n,t){if(n){if(vn.isDate(n))return n;if(/^[0-9]{11,13}$/.test(n))return new Date(n);if(vn.isString(n)){t=t||"yyyy-MM-dd HH:mm:ss.SSS";var e=[];return vn.arrayEach(On,function(r){for(var i,a,o=0,u=r.rules,s=u.length;o<s;o++){if(i=u[o],(a=t.indexOf(i[0]))>-1){e.push(parseFloat(n.substring(a,a+i[1])||0)+(r.offset||0));break}o===s-1&&e.push(0)}}),new Date(e[0],e[1],e[2],e[3],e[4],e[5],e[6])}}return"Invalid Date"}function U(n,t,e){var r=C(n),i=t&&!isNaN(t)?t:0,a=r.getHours(),o=r.getMinutes(),u=r.getSeconds(),s=r.getMilliseconds();if("first"===e){var c=r.getFullYear(),f=r.getMonth();return(f+=i)<0?new Date(c-Math.ceil((f=Math.abs(f))/12),12-(f%12||1),1,a,o,u,s):new Date(c+Math.floor(f/12),f%12,1,a,o,u,s)}if("last"===e)return new Date(U(r,i+1,"first").getTime()-864e5);var l=r.getDate(),h=U(r,i,"first"),p=h.getMonth();for(h.setDate(l);p<h.getMonth();)h.setDate(--l);return h}function $(n){var t={},e=n.split("?")[1]||"";return e&&vn.arrayEach(e.split("&"),function(n){var e=n.split("=");t[decodeURIComponent(e[0])]=decodeURIComponent(e[1]||"")}),t}function L(){return wn?wn.origin||wn.protocol+"//"+wn.host:""}function Y(n){var t=""+n;0===t.indexOf("/")&&(t=L()+t);var e=t.replace(/#.*/,"").match(/(\?.*)/),r={href:t,hash:"",host:"",hostname:"",protocol:"",port:"",search:e?e[1]:""};r.path=t.replace(/^([a-z0-9.+-]*:)\/\//,function(n,t){return r.protocol=t,""}).replace(/^([a-z0-9.+-]*)(:\d+)?\//,function(n,t,e){var i=e||"";return r.port=i.replace(":",""),r.hostname=t,r.host=t+i,"/"}).replace(/(#.*)/,function(n,t){return r.hash=t,""});var i=r.hash.match(/#((.*)\?|(.*))/);return r.pathname=r.path.replace(/(\?|#.*).*/,""),r.origin=r.protocol+"//"+r.host,r.hashKey=i?i[2]||"":"",r.hashQuery=$(r.hash),r.searchQuery=$(r.search),r}function z(t,e){return vn.isFunction(e)?n.arraySort(n.arrayMap(t,e,this)):n.arraySort(t,e)}function q(){return z.apply(this,arguments)[0]}function J(){return z.apply(this,arguments).reverse()[0]}function B(n){if(n){var t=parseFloat(n);return isNaN(t)?0:t}return 0}function K(n){return parseInt(B(n))}function Q(n){return n&&n.trim?n.trim():Z(V(n))}function V(n){return n&&n.trimLeft?n.trimLeft():(""+n).replace(/^[\s\uFEFF\xA0]+/g,"")}function Z(n){return n&&n.trimRight?n.trimRight():(""+n).replace(/[\s\uFEFF\xA0]+$/g,"")}function X(n){var t=new RegExp("(?:"+vn.objectKeys(n).join("|")+")","g");return function(e){return(""+e).replace(t,function(t){return n[t]})}}function G(n,t){var e=""+n;if(n.repeat)return n.repeat(t);var r=isNaN(t)?[]:new Array(parseInt(t));return r.join(e)+(r.length>0?e:"")}function _(n,t,e){var r=""+n;return r.padStart?r.padStart(t,e):t>>0>r.length?(e=String(e||" "),(t-=r.length)>e.length&&(e+=G(e,t/e.length)),e.slice(0,t)+r):r}function nn(n,t,e){var r=""+n;return r.padEnd?r.padEnd(t,e):t>>0>r.length?(e=String(e||" "),(t-=r.length)>e.length&&(e+=G(e,t/e.length)),r+e.slice(0,t)):r}function tn(n,t,e){var r=""+n;return 0===(1===arguments.length?r:r.substring(e)).indexOf(t)}function en(n,t,e){var r=""+n;return 1===arguments.length?r.indexOf(t)===r.length-1:r.substring(0,e).indexOf(t)===e-1}n.version="1.5.31";var rn={arrayUniq:t,uniq:t,arrayUnion:e,union:e,arraySort:r,sort:r,arrayShuffle:i,shuffle:i,arraySample:a,sample:a,arraySome:o,some:o,arrayEvery:u,every:u,arrayFilter:s,filter:s,arrayFind:c,find:c,arrayMap:f,map:f,arraySum:l,sum:l,arrayReduce:h,reduce:h,arrayCopyWithin:p,copyWithin:p,chunk:function(n,t){var e=[],r=t>>0||1;if(vn.isArray(n))if(r>=0&&n.length>r)for(var i=0;i<n.length;)e.push(n.slice(i,i+r)),i+=r;else e=[n];return e},zip:function(){return g(arguments)},unzip:g},an=Object.prototype.toString,on=Array.isArray||function(n){return"[object Array]"===an.call(n)},un=Number.isInteger,sn=0,cn=x(function(n,t){if(n.indexOf)return n.indexOf(t);for(var e=0,r=n.length;e<r;e++)if(t===n[e])return e}),fn=x(function(n,t){if(n.lastIndexOf)return n.lastIndexOf(t);for(var e=n.length-1;e>=0;e--)if(t===n[e])return e;return-1}),ln=j,hn=function(n){if(n){var t=arguments;if(!0!==n)return Object.assign?Object.assign.apply(Object,t):O(n,t);if(t.length>1)return n=on(n[1])?[]:{},O(n,t,!0)}return n},pn=D,gn=E,yn=w,dn=N,mn=A,vn={isNaN:isNaN,isFinite:isFinite,isArray:on,isFloat:function(n){return null!==n&&!isNaN(n)&&!un(n)},isInteger:un,isFunction:y,isBoolean:function(n){return"boolean"==typeof n},isString:d,isNumber:m,isRegExp:function(n){return"[object RegExp]"===an.call(n)},isObject:v,isPlainObject:b,isDate:S,isError:function(n){return"[object Error]"===an.call(n)},isTypeError:function(n){return!!n&&n.constructor===TypeError},isEmpty:function(n){if(0===n||!m(n)){for(var t in n)return!1;return!0}return!1},isNull:function(n){return null===n},isSymbol:M,isArguments:function(n){return"[object Arguments]"===an.call(n)},isElement:function(n){return n&&d(n.nodeName)&&m(n.nodeType)},isDocument:function(n){return n&&9===n.nodeType&&"undefined"!=typeof document},isWindow:function(n){return n&&n===n.window&&"undefined"!=typeof window},isFormData:function(n){return"undefined"!=typeof FormData&&n instanceof FormData},isMap:function(n){return"undefined"!=typeof Map&&n instanceof Map},isWeakMap:function(n){return"undefined"!=typeof WeakMap&&n instanceof WeakMap},isSet:function(n){return"undefined"!=typeof Set&&n instanceof Set},isWeakSet:function(n){return"undefined"!=typeof WeakSet&&n instanceof WeakSet},isLeapYear:function(t){var e=(t?n.stringToDate(t):new Date).getFullYear();return e%4==0&&(e%100!=0||e%400==0)},getType:function(n){return null===n?""+n:M(n)?"symbol":S(n)?"date":on(n)?"array":typeof n},uniqueId:function(){return++sn},getSize:function(n){var t=0;return d(n)||on(n)?n.length:(W(n,function(){t++}),t)},lastIndexOf:fn,includes:j,contains:ln,objectAssign:hn,assign:hn,extend:hn,stringToJson:function(n){if(v(n))return n;if(d(n))try{return JSON.parse(n)}catch(n){console.error(n)}return{}},jsonToString:function(n){if(v(n))try{return JSON.stringify(n)}catch(n){console.error(n)}return n?""+n:""},objectKeys:D,keys:pn,objectValues:E,values:gn,objectEntries:w,entries:yn,arrayFirst:N,first:dn,arrayLast:A,last:mn,objectEach:F,arrayEach:T,forEach:T,each:W,groupBy:function(n,t,e){var r,i,a={};return n&&(d(t)?(i=t,t=null):t=y(t)?t.bind(e||this):i=null,W(n,function(e,o){r=t?t(e,o,n):i?e[i]:e,a[r]?a[r].push(e):a[r]=[e]})),a},objectMap:function(n,t,e){var r={};return W(n,function(i,a){r[a]=t.call(e||this,i,a,n)}),r},clone:I},bn={browse:function(){var n={isNode:!1,isMobile:!1,isPC:!1};if("undefined"==typeof window&&"undefined"!=typeof process)n.nodeJS=!0;else if(n.isMobile=function(){for(var n=["Android","webOS","iPhone","iPad","iPod","SymbianOS","BlackBerry","Windows Phone"],t=navigator.userAgent,e=0;e<n.length;e++)if(t.indexOf(n[e])>0)return!0;return!1}(),n.isPC=!n.isMobile,"undefined"!=typeof document){var t=document.body||document.documentElement;vn.arrayEach(["webkit","khtml","moz","ms","o"],function(e){n["-"+e]=!!t[e+"MatchesSelector"]})}return n}},Sn=decodeURIComponent,Mn=encodeURIComponent;vn.objectAssign(P,{setItem:function(n,t,e){P(n,t,e)},getItem:function(n){return P(n)},removeItem:function(n){P(n,null,{expires:-1})},getJSON:function(){return P()}});var xn={cookie:P},jn=Date.now||function(){return(new Date).getTime()},On=[{rules:[["yyyy",4],["yyy",3],["yy",2]]},{rules:[["MM",2],["M",1]],offset:-1},{rules:[["dd",2],["d",1]]},{rules:[["HH",2],["H",1]]},{rules:[["mm",2],["m",1]]},{rules:[["ss",2],["s",1]]},{rules:[["SSS",3],["SS",2],["S",1]]}],Dn=[["yyyy",31536e6],["MM",2592e6],["dd",864e5],["HH",36e5],["mm",6e4],["ss",1e3],["S",0]],En={timestamp:jn,now:jn,stringToDate:C,dateToString:function(n,t){if(n){if(n=C(n),vn.isDate(n)){var e=["日","一","二","三","四","五","六"],r={"q+":Math.floor((n.getMonth()+3)/3),"M+":n.getMonth()+1,"E+":n.getDay(),"d+":n.getDate(),"H+":n.getHours(),"m+":n.getMinutes(),"s+":n.getSeconds(),S:n.getMilliseconds()},i=String(t||"yyyy-MM-dd HH:mm:ss").replace(/(y+)/,function(t){return(""+n.getFullYear()).substr(4-t.length)});for(var a in r)if(r.hasOwnProperty(a)){var o=""+r[a];i=i.replace(new RegExp("("+a+")"),function(n){return"q+"===a||"E+"===a?e[o]:1===n.length?o:("00"+o).substr(o.length)})}return i}return n}return""},getWhatYear:function(n,t){var e=C(n);if(t){var r=t&&!isNaN(t)?t:0;e.setFullYear(e.getFullYear()+r)}return e},getWhatMonth:U,getWhatWeek:function(n,t,e){var r=C(n),i=Number(/^[0-7]$/.test(e)?e:r.getDay()),a=r.getDay(),o=r.getTime()+864e5*((0===i?7:i)-(0===a?7:a));return t&&!isNaN(t)&&(o+=6048e5*t),new Date(o)},getWhatDay:function(n,t){var e=C(n);return t?new Date(e.getTime()+(t&&!isNaN(t)?864e5*t:0)):e},getDaysOfMonth:function(n,t){return Math.floor((U(n,t,"last").getTime()-U(n,t,"first").getTime())/864e5)+1},getDateDiff:function(n,t,e){var r={done:!1},i=C(n).getTime(),a=t?C(t).getTime():new Date;if(i<a){var o,u=a-i,s=e&&e.length>0?e:Dn;r.done=!0;for(var c=0,f=s.length;c<f;c++)u>=(o=s[c])[1]?c===f-1?r[o[0]]=u||0:(r[o[0]]=Math.floor(u/o[1]),u-=r[o[0]]*o[1]):r[o[0]]=0}return r}},wn=null;"undefined"!=typeof location&&(wn=location);var Nn={parseUrl:Y,getBaseURL:function(){if(wn){var n=wn.pathname,t=vn.lastIndexOf(n,"/")+1;return L()+(t===n.length?n:n.substring(0,t))}return""},locat:function(){return wn?Y(wn.href):{}}},An={getRandom:function(n,t){return n>=t?n:(n>>=0)+Math.round(Math.random()*((t||9)-n))},arrayMin:q,min:q,arrayMax:J,max:J,commafy:function(n,t){var e=vn.objectAssign({spaceNumber:3,separator:",",fixed:0},t),r=parseFloat((""+n).replace(/,/g,"")||0).toFixed(e.fixed).split(".");return r[0].replace(new RegExp("(?=(?!(\\b))(\\d{"+e.spaceNumber+"})+$)","g"),e.separator)+(r[1]?"."+r[1]:"")},toNumber:B,stringToNumber:B,toInteger:K,stringToInteger:K},Fn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},Tn={};vn.arrayEach(vn.objectKeys(Fn),function(n){Tn[Fn[n]]=n});var Wn={trim:Q,stringTrim:Q,trimLeft:V,stringTrimLeft:V,trimRight:Z,stringTrimRight:Z,escape:X(Fn),unescape:X(Tn),camelCase:function(n){return(""+n).replace(/(-[a-zA-Z])/g,function(n,t){return t.substring(1).toLocaleUpperCase()})},kebabCase:function(n){return(""+n).replace(/([A-Z])/g,function(n,t){return"-"+t.toLowerCase()})},repeat:G,stringRepeat:G,padStart:_,stringPadStart:_,padEnd:nn,stringPadEnd:nn,startsWith:tn,stringStartsWith:tn,endsWith:en,stringEndsWith:en},kn={};return vn.objectAssign(kn,rn,vn,bn,xn,En,Nn,An,Wn),n.mixin=function(t){kn.objectEach(t,function(t,e){n[e]=-1==="cookie".indexOf(e)&&kn.isFunction(t)?function(){var e=t.apply(n.$context,arguments);return n.$context=null,e}:t})},n.mixin(kn),n});

package.json

 {
   "name": "xe-utils",
-  "version": "1.5.30",
+  "version": "1.5.31",
   "description": "XEUtils 函数库",
@@ -5,0 +5,0 @@ "main": "index.js",

README.md

@@ -499,3 +499,3 @@ # XEUtils 函数库
 
-### each/objectEach/arrayEach ( obj, iteratee, context ) 迭代器
+### each/forEach/objectEach/arrayEach ( obj, iteratee, context ) 迭代器
 
@@ -508,6 +508,9 @@ ```JavaScript
 })
+XEUtils.forEach([11, 22, 33], (item, index) => {
+  // 数组迭代器
+})
 objectEach({a: 11, b: 22}, (item, key) => {
   // 对象迭代器
 })
-arrayEach([11, 22, 33], (item, key) => {
+arrayEach([11, 22, 33], (item, index) => {
   // 数组迭代器
@@ -671,2 +674,20 @@ })
 
+### zip ( ) 将每个数组中相应位置的值合并在一起
+
+```JavaScript
+import XEUtils from 'xe-utils'
+
+XEUtils.zip(['name1', 'name2', 'name3'], [true, true, false], [30, 40, 20])
+// [['name1', true, 30], ['name2', true, 40], ['name3', false, 20]]
+```
+
+### unzip ( arrays ) 与 zip 相反
+
+```JavaScript
+import XEUtils from 'xe-utils'
+
+XEUtils.unzip([['name1', true, 30], ['name2', true, 40], ['name3', false, 20]])
+// [['name1', 'name2', 'name3'], [true, true, false], [30, 40, 20]]
+```
+
 ### chunk ( array, size ) 将一个数组分割成大小的组。如果数组不能被平均分配，那么最后一块将是剩下的元素
@@ -673,0 +694,0 @@

src/core/utils.js

@@ -5,4 +5,4 @@ 'use strict'
 
-XEUtils.version = '1.5.30'
+XEUtils.version = '1.5.31'
 
 module.exports = XEUtils

src/method/array.js

 'use strict'
 
+var XEUtils = require('../core/utils')
 var baseExports = require('./base')
-var numberExports = require('./number')
 
@@ -68,3 +68,3 @@ /**
   for (var list = baseExports.objectValues(array), len = list.length - 1; len >= 0; len--) {
-    var index = len > 0 ? numberExports.getRandom(0, len) : 0
+    var index = len > 0 ? XEUtils.getRandom(0, len) : 0
     result.push(list[index])
@@ -335,3 +335,3 @@ list.splice(index, 1)
     } else {
-      result = array
+      result = [array]
     }
@@ -342,2 +342,29 @@ }
 
+/**
+ * 将每个数组中相应位置的值合并在一起
+ *
+ * @param {Array*} array 数组
+ */
+function zip () {
+  return unzip(arguments)
+}
+
+/**
+ * 与 zip 相反
+ *
+ * @param {Array} arrays 数组集合
+ */
+function unzip (arrays) {
+  var result = []
+  var len = XEUtils.max(arrays, function (item) {
+    return item.length || 0
+  })
+  for (var index = 0; index < len; index++) {
+    result.push(arrayMap(arrays, function (item) {
+      return item ? item[index] : null
+    }))
+  }
+  return result
+}
+
 var arrayExports = {
@@ -370,5 +397,7 @@ arrayUniq: arrayUniq,
   copyWithin: arrayCopyWithin,
-  chunk: chunk
+  chunk: chunk,
+  zip: zip,
+  unzip: unzip
 }
 
 module.exports = arrayExports

src/method/base.js

@@ -699,2 +699,3 @@ 'use strict'
   arrayEach: arrayEach,
+  forEach: arrayEach,
   each: each,
@@ -701,0 +702,0 @@ groupBy: groupBy,

src/method/number.js

 'use strict'
 
+var XEUtils = require('../core/utils')
 var baseExports = require('./base')
-var arrayExports = require('./array')
 
@@ -18,3 +18,3 @@ /**
 function sortData (arr, iteratee) {
-  return (baseExports.isFunction(iteratee) ? arrayExports.arraySort(arrayExports.arrayMap(arr, iteratee, this)) : arrayExports.arraySort(arr, iteratee))
+  return (baseExports.isFunction(iteratee) ? XEUtils.arraySort(XEUtils.arrayMap(arr, iteratee, this)) : XEUtils.arraySort(arr, iteratee))
 }
@@ -21,0 +21,0 @@

No alert changes

Improved metrics

Total package byte prevSize

147649

1.36%

Lines of code

3587

1.59%

Number of lines in readme file

1109

1.93%

No dependency changes