xe-utils - npm Package Compare versions

Comparing version 1.5.24 to 1.5.25

dist/xe-utils.js

 /**
- * xe-utils.js v1.5.24
+ * xe-utils.js v1.5.25
  * (c) 2017-2018 Xu Liangzhan
@@ -16,3 +16,3 @@ * ISC License.
 
-  XEUtils.version = '1.5.24'
+  XEUtils.version = '1.5.25'
 
@@ -993,3 +993,3 @@ /**
     *   @param {Boolean} secure: 设置为安全的,只能用https协议
-    *   @param {Number} expires: 几天后过期
+    *   @param {Number} expires: 过期时间,可以指定日期或者字符串，默认天
     */
@@ -1016,4 +1016,16 @@ function cookie (name, value, options) {
             values.push(encode(opts.name) + '=' + encode(baseExports.isObject(opts.value) ? JSON.stringify(opts.value) : opts.value))
-            if (opts.expires !== undefined) {
-              opts.expires = new Date(new Date().getTime() + parseFloat(opts.expires) * 86400000).toUTCString()
+            if (opts.expires) {
+              if (isNaN(opts.expires)) {
+                // UTCString
+                opts.expires = opts.expires
+              } else if (/^[0-9]{11,13}$/.test(opts.expires)) {
+                // now
+                opts.expires = new Date(opts.expires).toUTCString()
+              } else if (baseExports.isDate(opts.expires)) {
+                // Date
+                opts.expires = opts.expires.toUTCString()
+              } else {
+                // day
+                opts.expires = new Date(new Date().getTime() + parseFloat(opts.expires) * 86400000).toUTCString()
+              }
             }
@@ -1020,0 +1032,0 @@ baseExports.arrayEach(['expires', 'path', 'domain', 'secure'], function (key) {

dist/xe-utils.min.js

 /**
- * xe-utils.js v1.5.24
+ * xe-utils.js v1.5.25
  * (c) 2017-2018 Xu Liangzhan
@@ -7,2 +7,2 @@ * ISC License.
  */
-!function(n,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):n.XEUtils=e()}(this,function(){"use strict";function n(){}function e(n){var e=[];return rn.isArray(n)&&rn.arrayEach(n,function(n){e.includes(n)||e.push(n)}),e}function t(){for(var n=[],t=0,r=arguments.length;t<r;t++)n=n.concat(arguments[t]);return e(n)}function r(n,e,t){return rn.isArray(n)?n.sort(e?rn.isFunction(e)?e.bind(t||this):function(n,t){return n[e]>t[e]?1:-1}:function(n,e){return n>e?1:-1}):n}function i(n){for(var e=[],t=rn.objectValues(n),r=t.length-1;r>=0;r--){var i=r>0?gn.getRandom(0,r):0;e.push(t[i]),t.splice(i,1)}return e}function o(n,e){var t=i(n);return 1===arguments.length?t[0]:(e<t.length&&(t.length=e||0),t)}function u(n,e,t){if(n){if(t=t||this,rn.isArray(n))return n.some(e,t);for(var r in n)if(n.hasOwnProperty(r)&&e.call(t,n[r],r,n))return!0}return!1}function a(n,e,t){if(n){if(t=t||this,rn.isArray(n))return n.every(e,t);for(var r in n)if(n.hasOwnProperty(r)&&!e.call(t,n[r],r,n))return!1}return!0}function s(n,e,t){if(n){if(t=t||this,rn.isArray(n))return n.filter(e,t);var r={};return rn.each(n,function(i,o){e.call(t,i,o,n)&&(r[o]=i)}),r}return[]}function c(n,e,t){if(n){if(t=t||this,rn.isArray(n))return n.find(e,t);for(var r in n)if(n.hasOwnProperty(r)&&e.call(t,n[r],r,n))return n[r]}}function f(n,e,t){var r=[];if(n){if(t=t||this,rn.isArray(n))return n.map(e,t);rn.each(n,function(){r.push(e.apply(t,arguments))})}return r}function l(n,e,t){var r=0;return t=t||this,rn.each(n,e?rn.isFunction(e)?function(){r+=e.apply(t,arguments)}:function(n,t){r+=n[e]}:function(n,e){r+=n}),r}function y(n){return"function"==typeof n}function h(n){return"string"==typeof n}function p(n){return"number"==typeof n}function g(n){return"object"==typeof n}function d(n){return!!n&&n.constructor===Object}function m(n){return"[object Date]"===z.call(n)}function v(n){return"undefined"!=typeof Symbol&&Symbol.isSymbol?Symbol.isSymbol(n):"symbol"==typeof n}function b(n){return function(e,t){if(e){if(h(e)||K(e))return n(e,t);for(var r in e)if(t===e[r])return r}return-1}}function S(n,e){return-1!==Q(n,e)}function j(n,e,t){for(var r,i=1,o=e.length;i<o;i++)r=e[i],N(M(e[i]),function(e){n[e]=t?T(r[e],t):r[e]});return n}function M(n){var e=[];if(n){if(Object.keys)return Object.keys(n);E(n,function(n,t){e.push(t)})}return e}function O(n){if(Object.values)return n?Object.values(n):[];var e=[];return N(M(n),function(t){e.push(n[t])}),e}function x(n){if(Object.entries)return n?Object.entries(n):[];var e=[];return N(M(n),function(t){e.push([t,n[t]])}),e}function D(n){return O(n)[0]}function w(n){var e=O(n);return e[e.length-1]}function E(n,e,t){for(var r in n)n.hasOwnProperty(r)&&e.call(t||this,n[r],r,n)}function N(n,e,t){for(var r=0,i=n.length||0;r<i;r++)e.call(t||this,n[r],r,n)}function A(n,e,t){return n?K(n)?y(n.forEach)?n.forEach(e,t||this):N(n,e,t||this):E(n,e,t||this):n}function F(e){return d(e)?function(n){var e={};return A(n,function(n,t){e[t]=F(n)}),e}(e):K(e)?function(e){return n.arrayMap(e,F)}(e):e}function T(n,e){return n?e?F(n):G(d(n)?{}:[],n):n}function I(n,e,t){var r=[],i="undefined"!=typeof document;if(this&&this.$context&&(this.$context=null),rn.isArray(n)?r=n:arguments.length>1?r=[rn.objectAssign({name:n,value:e},t)]:rn.isObject(n)&&(r=[n]),!(r.length>0)){var o={};return i&&document.cookie&&rn.arrayEach(document.cookie.split("; "),function(n){var e=n.indexOf("=");o[un(n.substring(0,e))]=un(n.substring(e+1)||"")}),1===arguments.length?o[n]:o}i&&rn.arrayEach(r,function(n){var e=rn.objectAssign({},n),t=[];e.name&&(t.push(an(e.name)+"="+an(rn.isObject(e.value)?JSON.stringify(e.value):e.value)),void 0!==e.expires&&(e.expires=new Date((new Date).getTime()+864e5*parseFloat(e.expires)).toUTCString()),rn.arrayEach(["expires","path","domain","secure"],function(n){void 0!==e[n]&&t.push(e[n]&&"secure"===n?n:n+"="+e[n])})),document.cookie=t.join("; ")})}function k(n,e){if(n){if(rn.isDate(n))return n;if(!isNaN(n))return new Date(n);if(rn.isString(n)){e=e||"yyyy-MM-dd HH:mm:ss.SSS";var t=[];return rn.arrayEach(fn,function(r){for(var i,o,u=0,a=r.rules,s=a.length;u<s;u++){if(i=a[u],(o=e.indexOf(i[0]))>-1){t.push(parseFloat(n.substring(o,o+i[1])||0)+(r.offset||0));break}u===s-1&&t.push(0)}}),new Date(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}}return"Invalid Date"}function H(n,e,t){var r=k(n),i=e&&!isNaN(e)?e:0,o=r.getHours(),u=r.getMinutes(),a=r.getSeconds(),s=r.getMilliseconds();if("first"===t){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,o,u,a,s):new Date(c+Math.floor(f/12),f%12,1,o,u,a,s)}if("last"===t)return new Date(H(r,i+1,"first").getTime()-864e5);var l=r.getDate(),y=H(r,i,"first"),h=y.getMonth();for(y.setDate(l);h<y.getMonth();)y.setDate(--l);return y}function P(n){var e={},t=n.split("?")[1]||"";return t&&rn.arrayEach(t.split("&"),function(n){var t=n.split("=");e[decodeURIComponent(t[0])]=decodeURIComponent(t[1]||"")}),e}function R(){return hn?hn.origin||hn.protocol+"//"+hn.host:""}function U(n){var e=""+n;0===e.indexOf("/")&&(e=R()+e);var t=e.replace(/#.*/,"").match(/(\?.*)/),r={href:e,hash:"",host:"",hostname:"",protocol:"",port:"",search:t?t[1]:""};r.path=e.replace(/^([a-z0-9.+-]*:)\/\//,function(n,e){return r.protocol=e,""}).replace(/^([a-z0-9.+-]*)(:\d+)?\//,function(n,e,t){var i=t||"";return r.port=i.replace(":",""),r.hostname=e,r.host=e+i,"/"}).replace(/(#.*)/,function(n,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=P(r.hash),r.searchQuery=P(r.search),r}function C(n,e){return rn.isFunction(e)?B.arraySort(B.arrayMap(n,e,this)):B.arraySort(n,e)}function q(){return C.apply(this,arguments)[0]}function J(){return C.apply(this,arguments).reverse()[0]}function W(n){if(n){var e=parseFloat(n);return isNaN(e)?0:e}return 0}function $(n){var e=new RegExp("(?:"+rn.objectKeys(n).join("|")+")","g");return function(t){return String(t||"").replace(e,function(e){return n[e]})}}n.version="1.5.24";var B={arrayUniq:e,uniq:e,arrayUnion:t,union:t,arraySort:r,sort:r,arrayShuffle:i,shuffle:i,arraySample:o,sample:o,arraySome:u,some:u,arrayEvery:a,every:a,arrayFilter:s,filter:s,arrayFind:c,find:c,arrayMap:f,map:f,arraySum:l,sum:l},z=Object.prototype.toString,K=Array.isArray||function(n){return"[object Array]"===z.call(n)},Y=Number.isInteger,L=0,Q=b(function(n,e){if(n.indexOf)return n.indexOf(e);for(var t=0,r=n.length;t<r;t++)if(e===n[t])return t}),V=b(function(n,e){if(n.lastIndexOf)return n.lastIndexOf(e);for(var t=n.length-1;t>=0;t--)if(e===n[t])return t;return-1}),X=S,G=function(n){if(n){var e=arguments;if(!0!==n)return Object.assign?Object.assign.apply(Object,e):j(n,e);if(e.length>1)return n=K(n[1])?[]:{},j(n,e,!0)}return n},Z=M,_=O,nn=x,en=D,tn=w,rn={isNaN:isNaN,isFinite:isFinite,isArray:K,isFloat:function(n){return null!==n&&!isNaN(n)&&!Y(n)},isInteger:Y,isFunction:y,isBoolean:function(n){return"boolean"==typeof n},isString:h,isNumber:p,isRegExp:function(n){return"[object RegExp]"===z.call(n)},isObject:g,isPlainObject:d,isDate:m,isError:function(n){return"[object Error]"===z.call(n)},isTypeError:function(n){return!!n&&n.constructor===TypeError},isEmpty:function(n){if(0===n||!p(n)){for(var e in n)return!1;return!0}return!1},isNull:function(n){return null===n},isSymbol:v,isArguments:function(n){return"[object Arguments]"===z.call(n)},isElement:function(n){return n&&h(n.nodeName)&&p(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},isLeapYear:function(e){var t=(e?n.stringToDate(e):new Date).getFullYear();return t%4==0&&(t%100!=0||t%400==0)},getType:function(n){return null===n?""+n:v(n)?"symbol":m(n)?"date":K(n)?"array":typeof n},uniqueId:function(){return++L},getSize:function(n){var e=0;return h(n)||K(n)?n.length:(A(n,function(){e++}),e)},lastIndexOf:V,includes:S,contains:X,objectAssign:G,assign:G,extend:G,stringToJson:function(n){if(g(n))return n;if(h(n))try{return JSON.parse(n)}catch(n){console.error(n)}return{}},jsonToString:function(n){if(g(n))try{return JSON.stringify(n)}catch(n){console.error(n)}return n?""+n:""},objectKeys:M,keys:Z,objectValues:O,values:_,objectEntries:x,entries:nn,arrayFirst:D,first:en,arrayLast:w,last:tn,objectEach:E,arrayEach:N,each:A,groupBy:function(n,e,t){var r,i,o={};return n&&(h(e)?(i=e,e=null):e=y(e)?e.bind(t||this):i=null,A(n,function(t,u){r=e?e(t,u,n):i?t[i]:t,o[r]?o[r].push(t):o[r]=[t]})),o},objectMap:function(n,e,t){var r={};return A(n,function(i,o){r[o]=e.call(t||this,i,o,n)}),r},clone:T},on={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"],e=navigator.userAgent,t=0;t<n.length;t++)if(e.indexOf(n[t])>0)return!0;return!1}(),n.isPC=!n.isMobile,"undefined"!=typeof document){var e=document.body||document.documentElement;rn.arrayEach(["webkit","khtml","moz","ms","o"],function(t){n["-"+t]=!!e[t+"MatchesSelector"]})}return n}},un=decodeURIComponent,an=encodeURIComponent;rn.objectAssign(I,{setItem:function(n,e){I(n,e)},getItem:function(n){return I(n)},removeItem:function(n){I(n,null,{expires:-1})},getJSON:function(){return I()}});var sn={cookie:I},cn=Date.now||function(){return(new Date).getTime()},fn=[{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]]}],ln=[["yyyy",31536e6],["MM",2592e6],["dd",864e5],["HH",36e5],["mm",6e4],["ss",1e3],["S",0]],yn={timestamp:cn,now:cn,stringToDate:k,dateToString:function(n,e){if(n){if(n=k(n),rn.isDate(n)){var t=["日","一","二","三","四","五","六"],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(e||"yyyy-MM-dd HH:mm:ss").replace(/(y+)/,function(e){return(""+n.getFullYear()).substr(4-e.length)});for(var o in r)if(r.hasOwnProperty(o)){var u=""+r[o];i=i.replace(new RegExp("("+o+")"),function(n){return"q+"===o||"E+"===o?t[u]:1===n.length?u:("00"+u).substr(u.length)})}return i}return n}return""},getWhatMonth:H,getWhatWeek:function(n,e,t){var r=k(n),i=Number(/^[0-7]$/.test(t)?t:r.getDay()),o=r.getDay(),u=r.getTime()+864e5*((0===i?7:i)-(0===o?7:o));return e&&!isNaN(e)&&(u+=6048e5*e),new Date(u)},getWhatDay:function(n,e){return new Date(k(n).getTime()+(e&&!isNaN(e)?864e5*e:0))},getDaysOfMonth:function(n,e){return Math.floor((H(n,e,"last").getTime()-H(n,e,"first").getTime())/864e5)+1},getDateDiff:function(n,e,t){var r={done:!1},i=k(n).getTime(),o=e?k(e).getTime():new Date;if(i<o){var u,a=o-i,s=t&&t.length>0?t:ln;r.done=!0;for(var c=0,f=s.length;c<f;c++)a>=(u=s[c])[1]?c===f-1?r[u[0]]=a||0:(r[u[0]]=Math.floor(a/u[1]),a-=r[u[0]]*u[1]):r[u[0]]=0}return r}},hn=null;"undefined"!=typeof location&&(hn=location);var pn={parseUrl:U,getBaseURL:function(){if(hn){var n=hn.pathname,e=rn.lastIndexOf(n,"/")+1;return R()+(e===n.length?n:n.substring(0,e))}return""},locat:function(){return hn?U(hn.href):{}}},gn={getRandom:function(n,e){return n>=e?n:(n>>=0)+Math.round(Math.random()*((e||9)-n))},arrayMin:q,min:q,arrayMax:J,max:J,commafy:function(n,e){var t=rn.objectAssign({spaceNumber:3,separator:",",fixed:0},e),r=parseFloat((""+n).replace(/,/g,"")||0).toFixed(t.fixed).split(".");return r[0].replace(new RegExp("(?=(?!(\\b))(\\d{"+t.spaceNumber+"})+$)","g"),t.separator)+(r[1]?"."+r[1]:"")},toNumber:W,stringToNumber:W},dn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},mn={};rn.arrayEach(rn.objectKeys(dn),function(n){mn[dn[n]]=n});var vn={escape:$(dn),unescape:$(mn)},bn={};return rn.objectAssign(bn,B,rn,on,sn,yn,pn,gn,vn),n.mixin=function(e){bn.objectEach(e,function(e,t){n[t]=-1==="cookie".indexOf(t)&&bn.isFunction(e)?function(){var t=e.apply(n.$context,arguments);return n.$context=null,t}:e})},n.mixin(bn),n});
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):e.XEUtils=n()}(this,function(){"use strict";function e(){}function n(e){var n=[];return re.isArray(e)&&re.arrayEach(e,function(e){n.includes(e)||n.push(e)}),n}function t(){for(var e=[],t=0,r=arguments.length;t<r;t++)e=e.concat(arguments[t]);return n(e)}function r(e,n,t){return re.isArray(e)?e.sort(n?re.isFunction(n)?n.bind(t||this):function(e,t){return e[n]>t[n]?1:-1}:function(e,n){return e>n?1:-1}):e}function i(e){for(var n=[],t=re.objectValues(e),r=t.length-1;r>=0;r--){var i=r>0?pe.getRandom(0,r):0;n.push(t[i]),t.splice(i,1)}return n}function o(e,n){var t=i(e);return 1===arguments.length?t[0]:(n<t.length&&(t.length=n||0),t)}function u(e,n,t){if(e){if(t=t||this,re.isArray(e))return e.some(n,t);for(var r in e)if(e.hasOwnProperty(r)&&n.call(t,e[r],r,e))return!0}return!1}function a(e,n,t){if(e){if(t=t||this,re.isArray(e))return e.every(n,t);for(var r in e)if(e.hasOwnProperty(r)&&!n.call(t,e[r],r,e))return!1}return!0}function s(e,n,t){if(e){if(t=t||this,re.isArray(e))return e.filter(n,t);var r={};return re.each(e,function(i,o){n.call(t,i,o,e)&&(r[o]=i)}),r}return[]}function c(e,n,t){if(e){if(t=t||this,re.isArray(e))return e.find(n,t);for(var r in e)if(e.hasOwnProperty(r)&&n.call(t,e[r],r,e))return e[r]}}function f(e,n,t){var r=[];if(e){if(t=t||this,re.isArray(e))return e.map(n,t);re.each(e,function(){r.push(n.apply(t,arguments))})}return r}function l(e,n,t){var r=0;return t=t||this,re.each(e,n?re.isFunction(n)?function(){r+=n.apply(t,arguments)}:function(e,t){r+=e[n]}:function(e,n){r+=e}),r}function y(e){return"function"==typeof e}function h(e){return"string"==typeof e}function p(e){return"number"==typeof e}function g(e){return"object"==typeof e}function d(e){return!!e&&e.constructor===Object}function m(e){return"[object Date]"===z.call(e)}function v(e){return"undefined"!=typeof Symbol&&Symbol.isSymbol?Symbol.isSymbol(e):"symbol"==typeof e}function b(e){return function(n,t){if(n){if(h(n)||K(n))return e(n,t);for(var r in n)if(t===n[r])return r}return-1}}function x(e,n){return-1!==Q(e,n)}function S(e,n,t){for(var r,i=1,o=n.length;i<o;i++)r=n[i],E(j(n[i]),function(n){e[n]=t?F(r[n],t):r[n]});return e}function j(e){var n=[];if(e){if(Object.keys)return Object.keys(e);N(e,function(e,t){n.push(t)})}return n}function M(e){if(Object.values)return e?Object.values(e):[];var n=[];return E(j(e),function(t){n.push(e[t])}),n}function O(e){if(Object.entries)return e?Object.entries(e):[];var n=[];return E(j(e),function(t){n.push([t,e[t]])}),n}function D(e){return M(e)[0]}function w(e){var n=M(e);return n[n.length-1]}function N(e,n,t){for(var r in e)e.hasOwnProperty(r)&&n.call(t||this,e[r],r,e)}function E(e,n,t){for(var r=0,i=e.length||0;r<i;r++)n.call(t||this,e[r],r,e)}function T(e,n,t){return e?K(e)?y(e.forEach)?e.forEach(n,t||this):E(e,n,t||this):N(e,n,t||this):e}function A(n){return d(n)?function(e){var n={};return T(e,function(e,t){n[t]=A(e)}),n}(n):K(n)?function(n){return e.arrayMap(n,A)}(n):n}function F(e,n){return e?n?A(e):G(d(e)?{}:[],e):e}function I(e,n,t){var r=[],i="undefined"!=typeof document;if(this&&this.$context&&(this.$context=null),re.isArray(e)?r=e:arguments.length>1?r=[re.objectAssign({name:e,value:n},t)]:re.isObject(e)&&(r=[e]),!(r.length>0)){var o={};return i&&document.cookie&&re.arrayEach(document.cookie.split("; "),function(e){var n=e.indexOf("=");o[oe(e.substring(0,n))]=oe(e.substring(n+1)||"")}),1===arguments.length?o[e]:o}i&&re.arrayEach(r,function(e){var n=re.objectAssign({},e),t=[];n.name&&(t.push(ue(n.name)+"="+ue(re.isObject(n.value)?JSON.stringify(n.value):n.value)),n.expires&&(isNaN(n.expires)?n.expires=n.expires:/^[0-9]{11,13}$/.test(n.expires)?n.expires=new Date(n.expires).toUTCString():re.isDate(n.expires)?n.expires=n.expires.toUTCString():n.expires=new Date((new Date).getTime()+864e5*parseFloat(n.expires)).toUTCString()),re.arrayEach(["expires","path","domain","secure"],function(e){void 0!==n[e]&&t.push(n[e]&&"secure"===e?e:e+"="+n[e])})),document.cookie=t.join("; ")})}function k(e,n){if(e){if(re.isDate(e))return e;if(!isNaN(e))return new Date(e);if(re.isString(e)){n=n||"yyyy-MM-dd HH:mm:ss.SSS";var t=[];return re.arrayEach(ce,function(r){for(var i,o,u=0,a=r.rules,s=a.length;u<s;u++){if(i=a[u],(o=n.indexOf(i[0]))>-1){t.push(parseFloat(e.substring(o,o+i[1])||0)+(r.offset||0));break}u===s-1&&t.push(0)}}),new Date(t[0],t[1],t[2],t[3],t[4],t[5],t[6])}}return"Invalid Date"}function H(e,n,t){var r=k(e),i=n&&!isNaN(n)?n:0,o=r.getHours(),u=r.getMinutes(),a=r.getSeconds(),s=r.getMilliseconds();if("first"===t){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,o,u,a,s):new Date(c+Math.floor(f/12),f%12,1,o,u,a,s)}if("last"===t)return new Date(H(r,i+1,"first").getTime()-864e5);var l=r.getDate(),y=H(r,i,"first"),h=y.getMonth();for(y.setDate(l);h<y.getMonth();)y.setDate(--l);return y}function P(e){var n={},t=e.split("?")[1]||"";return t&&re.arrayEach(t.split("&"),function(e){var t=e.split("=");n[decodeURIComponent(t[0])]=decodeURIComponent(t[1]||"")}),n}function R(){return ye?ye.origin||ye.protocol+"//"+ye.host:""}function U(e){var n=""+e;0===n.indexOf("/")&&(n=R()+n);var t=n.replace(/#.*/,"").match(/(\?.*)/),r={href:n,hash:"",host:"",hostname:"",protocol:"",port:"",search:t?t[1]:""};r.path=n.replace(/^([a-z0-9.+-]*:)\/\//,function(e,n){return r.protocol=n,""}).replace(/^([a-z0-9.+-]*)(:\d+)?\//,function(e,n,t){var i=t||"";return r.port=i.replace(":",""),r.hostname=n,r.host=n+i,"/"}).replace(/(#.*)/,function(e,n){return r.hash=n,""});var i=r.hash.match(/#((.*)\?|(.*))/);return r.pathname=r.path.replace(/(\?|#.*).*/,""),r.origin=r.protocol+"//"+r.host,r.hashKey=i?i[2]||"":"",r.hashQuery=P(r.hash),r.searchQuery=P(r.search),r}function C(e,n){return re.isFunction(n)?B.arraySort(B.arrayMap(e,n,this)):B.arraySort(e,n)}function $(){return C.apply(this,arguments)[0]}function q(){return C.apply(this,arguments).reverse()[0]}function J(e){if(e){var n=parseFloat(e);return isNaN(n)?0:n}return 0}function W(e){var n=new RegExp("(?:"+re.objectKeys(e).join("|")+")","g");return function(t){return String(t||"").replace(n,function(n){return e[n]})}}e.version="1.5.25";var B={arrayUniq:n,uniq:n,arrayUnion:t,union:t,arraySort:r,sort:r,arrayShuffle:i,shuffle:i,arraySample:o,sample:o,arraySome:u,some:u,arrayEvery:a,every:a,arrayFilter:s,filter:s,arrayFind:c,find:c,arrayMap:f,map:f,arraySum:l,sum:l},z=Object.prototype.toString,K=Array.isArray||function(e){return"[object Array]"===z.call(e)},Y=Number.isInteger,L=0,Q=b(function(e,n){if(e.indexOf)return e.indexOf(n);for(var t=0,r=e.length;t<r;t++)if(n===e[t])return t}),V=b(function(e,n){if(e.lastIndexOf)return e.lastIndexOf(n);for(var t=e.length-1;t>=0;t--)if(n===e[t])return t;return-1}),X=x,G=function(e){if(e){var n=arguments;if(!0!==e)return Object.assign?Object.assign.apply(Object,n):S(e,n);if(n.length>1)return e=K(e[1])?[]:{},S(e,n,!0)}return e},Z=j,_=M,ee=O,ne=D,te=w,re={isNaN:isNaN,isFinite:isFinite,isArray:K,isFloat:function(e){return null!==e&&!isNaN(e)&&!Y(e)},isInteger:Y,isFunction:y,isBoolean:function(e){return"boolean"==typeof e},isString:h,isNumber:p,isRegExp:function(e){return"[object RegExp]"===z.call(e)},isObject:g,isPlainObject:d,isDate:m,isError:function(e){return"[object Error]"===z.call(e)},isTypeError:function(e){return!!e&&e.constructor===TypeError},isEmpty:function(e){if(0===e||!p(e)){for(var n in e)return!1;return!0}return!1},isNull:function(e){return null===e},isSymbol:v,isArguments:function(e){return"[object Arguments]"===z.call(e)},isElement:function(e){return e&&h(e.nodeName)&&p(e.nodeType)},isDocument:function(e){return e&&9===e.nodeType&&"undefined"!=typeof document},isWindow:function(e){return e&&e===e.window&&"undefined"!=typeof window},isFormData:function(e){return"undefined"!=typeof FormData&&e instanceof FormData},isLeapYear:function(n){var t=(n?e.stringToDate(n):new Date).getFullYear();return t%4==0&&(t%100!=0||t%400==0)},getType:function(e){return null===e?""+e:v(e)?"symbol":m(e)?"date":K(e)?"array":typeof e},uniqueId:function(){return++L},getSize:function(e){var n=0;return h(e)||K(e)?e.length:(T(e,function(){n++}),n)},lastIndexOf:V,includes:x,contains:X,objectAssign:G,assign:G,extend:G,stringToJson:function(e){if(g(e))return e;if(h(e))try{return JSON.parse(e)}catch(e){console.error(e)}return{}},jsonToString:function(e){if(g(e))try{return JSON.stringify(e)}catch(e){console.error(e)}return e?""+e:""},objectKeys:j,keys:Z,objectValues:M,values:_,objectEntries:O,entries:ee,arrayFirst:D,first:ne,arrayLast:w,last:te,objectEach:N,arrayEach:E,each:T,groupBy:function(e,n,t){var r,i,o={};return e&&(h(n)?(i=n,n=null):n=y(n)?n.bind(t||this):i=null,T(e,function(t,u){r=n?n(t,u,e):i?t[i]:t,o[r]?o[r].push(t):o[r]=[t]})),o},objectMap:function(e,n,t){var r={};return T(e,function(i,o){r[o]=n.call(t||this,i,o,e)}),r},clone:F},ie={browse:function(){var e={isNode:!1,isMobile:!1,isPC:!1};if("undefined"==typeof window&&"undefined"!=typeof process)e.nodeJS=!0;else if(e.isMobile=function(){for(var e=["Android","webOS","iPhone","iPad","iPod","SymbianOS","BlackBerry","Windows Phone"],n=navigator.userAgent,t=0;t<e.length;t++)if(n.indexOf(e[t])>0)return!0;return!1}(),e.isPC=!e.isMobile,"undefined"!=typeof document){var n=document.body||document.documentElement;re.arrayEach(["webkit","khtml","moz","ms","o"],function(t){e["-"+t]=!!n[t+"MatchesSelector"]})}return e}},oe=decodeURIComponent,ue=encodeURIComponent;re.objectAssign(I,{setItem:function(e,n){I(e,n)},getItem:function(e){return I(e)},removeItem:function(e){I(e,null,{expires:-1})},getJSON:function(){return I()}});var ae={cookie:I},se=Date.now||function(){return(new Date).getTime()},ce=[{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]]}],fe=[["yyyy",31536e6],["MM",2592e6],["dd",864e5],["HH",36e5],["mm",6e4],["ss",1e3],["S",0]],le={timestamp:se,now:se,stringToDate:k,dateToString:function(e,n){if(e){if(e=k(e),re.isDate(e)){var t=["日","一","二","三","四","五","六"],r={"q+":Math.floor((e.getMonth()+3)/3),"M+":e.getMonth()+1,"E+":e.getDay(),"d+":e.getDate(),"H+":e.getHours(),"m+":e.getMinutes(),"s+":e.getSeconds(),S:e.getMilliseconds()},i=String(n||"yyyy-MM-dd HH:mm:ss").replace(/(y+)/,function(n){return(""+e.getFullYear()).substr(4-n.length)});for(var o in r)if(r.hasOwnProperty(o)){var u=""+r[o];i=i.replace(new RegExp("("+o+")"),function(e){return"q+"===o||"E+"===o?t[u]:1===e.length?u:("00"+u).substr(u.length)})}return i}return e}return""},getWhatMonth:H,getWhatWeek:function(e,n,t){var r=k(e),i=Number(/^[0-7]$/.test(t)?t:r.getDay()),o=r.getDay(),u=r.getTime()+864e5*((0===i?7:i)-(0===o?7:o));return n&&!isNaN(n)&&(u+=6048e5*n),new Date(u)},getWhatDay:function(e,n){return new Date(k(e).getTime()+(n&&!isNaN(n)?864e5*n:0))},getDaysOfMonth:function(e,n){return Math.floor((H(e,n,"last").getTime()-H(e,n,"first").getTime())/864e5)+1},getDateDiff:function(e,n,t){var r={done:!1},i=k(e).getTime(),o=n?k(n).getTime():new Date;if(i<o){var u,a=o-i,s=t&&t.length>0?t:fe;r.done=!0;for(var c=0,f=s.length;c<f;c++)a>=(u=s[c])[1]?c===f-1?r[u[0]]=a||0:(r[u[0]]=Math.floor(a/u[1]),a-=r[u[0]]*u[1]):r[u[0]]=0}return r}},ye=null;"undefined"!=typeof location&&(ye=location);var he={parseUrl:U,getBaseURL:function(){if(ye){var e=ye.pathname,n=re.lastIndexOf(e,"/")+1;return R()+(n===e.length?e:e.substring(0,n))}return""},locat:function(){return ye?U(ye.href):{}}},pe={getRandom:function(e,n){return e>=n?e:(e>>=0)+Math.round(Math.random()*((n||9)-e))},arrayMin:$,min:$,arrayMax:q,max:q,commafy:function(e,n){var t=re.objectAssign({spaceNumber:3,separator:",",fixed:0},n),r=parseFloat((""+e).replace(/,/g,"")||0).toFixed(t.fixed).split(".");return r[0].replace(new RegExp("(?=(?!(\\b))(\\d{"+t.spaceNumber+"})+$)","g"),t.separator)+(r[1]?"."+r[1]:"")},toNumber:J,stringToNumber:J},ge={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},de={};re.arrayEach(re.objectKeys(ge),function(e){de[ge[e]]=e});var me={escape:W(ge),unescape:W(de)},ve={};return re.objectAssign(ve,B,re,ie,ae,le,he,pe,me),e.mixin=function(n){ve.objectEach(n,function(n,t){e[t]=-1==="cookie".indexOf(t)&&ve.isFunction(n)?function(){var t=n.apply(e.$context,arguments);return e.$context=null,t}:n})},e.mixin(ve),e});

package.json

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

src/core/utils.js

@@ -5,4 +5,4 @@ 'use strict'
 
-XEUtils.version = '1.5.24'
+XEUtils.version = '1.5.25'
 
 module.exports = XEUtils

src/method/cookie.js

@@ -18,3 +18,3 @@ 'use strict'
   *   @param {Boolean} secure: 设置为安全的,只能用https协议
-  *   @param {Number} expires: 几天后过期
+  *   @param {Number} expires: 过期时间,可以指定日期或者字符串，默认天
   */
@@ -41,4 +41,16 @@ function cookie (name, value, options) {
           values.push(encode(opts.name) + '=' + encode(baseExports.isObject(opts.value) ? JSON.stringify(opts.value) : opts.value))
-          if (opts.expires !== undefined) {
-            opts.expires = new Date(new Date().getTime() + parseFloat(opts.expires) * 86400000).toUTCString()
+          if (opts.expires) {
+            if (isNaN(opts.expires)) {
+              // UTCString
+              opts.expires = opts.expires
+            } else if (/^[0-9]{11,13}$/.test(opts.expires)) {
+              // now
+              opts.expires = new Date(opts.expires).toUTCString()
+            } else if (baseExports.isDate(opts.expires)) {
+              // Date
+              opts.expires = opts.expires.toUTCString()
+            } else {
+              // day
+              opts.expires = new Date(new Date().getTime() + parseFloat(opts.expires) * 86400000).toUTCString()
+            }
           }
@@ -45,0 +57,0 @@ baseExports.arrayEach(['expires', 'path', 'domain', 'secure'], function (key) {

No alert changes

Improved metrics

Total package byte prevSize

116662

increased by1.01%

Lines of code

2868

increased by0.84%

No dependency changes