xe-utils - npm Package Compare versions

Comparing version 1.5.19 to 1.5.20

dist/xe-utils.js

 /**
- * xe-utils.js v1.5.18
+ * xe-utils.js v1.5.20
  * (c) 2017-2018 Xu Liangzhan
@@ -16,3 +16,3 @@ * ISC License.
 
-  XEUtils.version = '1.5.18'
+  XEUtils.version = '1.5.20'
 
@@ -1229,7 +1229,3 @@ /**
 
-  function hash () {
-    return ($locat.hash.split('#')[1] || '').split('?')[0] || ''
-  }
-
-  function parse (uri) {
+  function parseParams (uri) {
     var result = {}
@@ -1256,2 +1252,39 @@ var params = uri.split('?')[1] || ''
 
+  function parseUrl (url) {
+    var href = '' + url
+    if (href.indexOf('/') === 0) {
+      href = getLocatOrigin() + href
+    }
+    var searchs = href.replace(/#.*/, '').match(/(\?.*)/)
+    var parsed = {
+      href: href,
+      hash: '',
+      host: '',
+      hostname: '',
+      protocol: '',
+      port: '',
+      search: searchs ? searchs[1] : ''
+    }
+    parsed.path = href.replace(/^([a-z0-9.+-]*:)\/\//, function (text, protocol) {
+      parsed.protocol = protocol
+      return ''
+    }).replace(/^([a-z0-9.+-]*)(:\d+)?\//, function (text, hostname, port) {
+      var portText = port || ''
+      parsed.port = portText.replace(':', '')
+      parsed.hostname = hostname
+      parsed.host = hostname + portText
+      return '/'
+    }).replace(/(#.*)/, function (text, hash) {
+      parsed.hash = hash
+      return ''
+    })
+    var hashs = location.hash.match(/#((.*)\?|(.*))/)
+    parsed.pathname = parsed.path.replace(/(\?|#.*).*/, '')
+    parsed.origin = parsed.protocol + '//' + parsed.host
+    parsed.hashKey = hashs ? hashs[2] : ''
+    parsed.hashQuery = parseParams(parsed.hash)
+    parsed.searchQuery = parseParams(parsed.search)
+    return parsed
+  }
+
   /**
@@ -1262,16 +1295,7 @@ * 获取地址栏信息
   function locat () {
-    return $locat ? {
-      port: $locat.port,
-      href: $locat.href,
-      host: $locat.host,
-      hostname: $locat.hostname,
-      protocol: $locat.protocol,
-      origin: getLocatOrigin(),
-      hash: hash(),
-      query: parse($locat.hash),
-      params: parse($locat.search)
-    } : {}
+    return $locat ? parseUrl($locat.href) : {}
   }
 
   var locatExports = {
+    parseUrl: parseUrl,
     getBaseURL: getBaseURL,
@@ -1278,0 +1302,0 @@ locat: locat

dist/xe-utils.min.js

 /**
- * xe-utils.js v1.5.18
+ * xe-utils.js v1.5.20
  * (c) 2017-2018 Xu Liangzhan
@@ -7,2 +7,2 @@ * ISC License.
  */
-!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 nn.isArray(n)&&nn.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 nn.isArray(n)?n.sort(t?nn.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(n){for(var t=[],e=nn.objectValues(n),r=e.length-1;r>=0;r--){var i=r>0?fn.getRandom(0,r):0;t.push(e[i]),e.splice(i,1)}return t}function o(n,t){var e=i(n);return 1===arguments.length?e[0]:(t<e.length&&(e.length=t||0),e)}function u(n,t,e){if(n){if(nn.isArray(n))return n.some(t,e||this);for(var r in n)if(n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n))return!0}return!1}function a(n,t,e){if(n){if(nn.isArray(n))return n.every(t,e||this);for(var r in n)if(n.hasOwnProperty(r)&&!t.call(e||this,n[r],r,n))return!1}return!0}function s(n,t,e){if(n){if(nn.isArray(n))return n.filter(t,e||this);var r={};return nn.each(n,function(i,o){t.call(e||this,i,o,n)&&(r[o]=i)}),r}return[]}function c(n,t,e){if(n){if(nn.isArray(n))return n.find(t,e||this);for(var r in n)if(n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n))return n[r]}}function f(n,t,e){var r=[];if(n){if(nn.isArray(n))return n.map(t,e||this);nn.each(n,function(){r.push(t.apply(e||this,arguments))})}return r}function l(n){return"function"==typeof n}function y(n){return"string"==typeof n}function h(n){return"number"==typeof n}function p(n){return"object"==typeof n}function g(n){return!!n&&n.constructor===Object}function m(n){return"[object Date]"===W.call(n)}function d(n){return"undefined"!=typeof Symbol&&Symbol.isSymbol?Symbol.isSymbol(n):"symbol"==typeof n}function v(n){return function(t,e){if(t){if(y(t)||Y(t))return n(t,e);for(var r in t)if(e===t[r])return r}return-1}}function b(n,t){return-1!==K(n,t)}function j(n,t,e){for(var r,i=1,o=t.length;i<o;i++)r=t[i],w(S(t[i]),function(t){n[t]=e?F(r[t],e):r[t]});return n}function S(n){var t=[];if(n){if(Object.keys)return Object.keys(n);E(n,function(n,e){t.push(e)})}return t}function M(n){if(Object.values)return n?Object.values(n):[];var t=[];return w(S(n),function(e){t.push(n[e])}),t}function D(n){if(Object.entries)return n?Object.entries(n):[];var t=[];return w(S(n),function(e){t.push([e,n[e]])}),t}function O(n){return M(n)[0]}function x(n){var t=M(n);return t[t.length-1]}function E(n,t,e){for(var r in n)n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n)}function w(n,t,e){for(var r=0,i=n.length||0;r<i;r++)t.call(e||this,n[r],r,n)}function N(n,t,e){return n?Y(n)?l(n.forEach)?n.forEach(t,e||this):w(n,t,e||this):E(n,t,e||this):n}function A(t){return g(t)?function(n){var t={};return N(n,function(n,e){t[e]=A(n)}),t}(t):Y(t)?function(t){return n.arrayMap(t,A)}(t):t}function F(n,t){return n?t?A(n):V(g(n)?{}:[],n):n}function T(n,t,e){var r=[],i="undefined"!=typeof document;if(nn.isArray(n)?r=n:arguments.length>1?r=[nn.objectAssign({name:n,value:t},e)]:nn.isObject(n)&&(r=[n]),!(r.length>0)){var o={};return i&&document.cookie&&nn.arrayEach(document.cookie.split("; "),function(n){var t=n.indexOf("=");o[decodeURIComponent(n.substring(0,t))]=decodeURIComponent(n.substring(t+1)||"")}),1===arguments.length?o[n]:o}i&&nn.arrayEach(r,function(n){var t=nn.objectAssign({},n),e=[];t.name&&(e.push(encodeURIComponent(t.name)+"="+encodeURIComponent(nn.isObject(t.value)?JSON.stringify(t.value):t.value)),void 0!==t.expires&&(t.expires=new Date((new Date).getTime()+864e5*parseFloat(t.expires)).toUTCString()),nn.arrayEach(["expires","path","domain","secure"],function(n){void 0!==t[n]&&e.push(n+"="+t[n])})),document.cookie=e.join("; ")})}function I(n,t){if(n){if(nn.isDate(n))return n;if(!isNaN(n))return new Date(n);if(nn.isString(n)){t=t||"yyyy-MM-dd HH:mm:ss.SSS";var e=[];return nn.arrayEach(on,function(r){for(var i,o,u=0,a=r.rules,s=a.length;u<s;u++){if(i=a[u],(o=t.indexOf(i[0]))>-1){e.push(parseFloat(n.substring(o,o+i[1])||0)+(r.offset||0));break}u===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 R(n,t,e){var r=I(n),i=t&&!isNaN(t)?t:0,o=r.getHours(),u=r.getMinutes(),a=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,o,u,a,s):new Date(c+Math.floor(f/12),f%12,1,o,u,a,s)}if("last"===e)return new Date(R(r,i+1,"first").getTime()-864e5);var l=r.getDate(),y=R(r,i,"first"),h=y.getMonth();for(y.setDate(l);h<y.getMonth();)y.setDate(--l);return y}function H(n){var t={},e=n.split("?")[1]||"";return e&&nn.arrayEach(e.split("&"),function(n){var e=n.split("=");t[decodeURIComponent(e[0])]=decodeURIComponent(e[1]||"")}),t}function k(){return sn.origin||sn.protocol+"//"+sn.host}function U(n,t){return nn.isFunction(t)?J.arraySort(J.arrayMap(n,t,this)):J.arraySort(n,t)}function q(){return U.apply(this,arguments)[0]}function C(){return U.apply(this,arguments).reverse()[0]}function P(n){var t=new RegExp("(?:"+nn.objectKeys(n).join("|")+")","g");return function(e){return String(e||"").replace(t,function(t){return n[t]})}}n.version="1.5.18";var J={arrayUniq:t,uniq:t,arrayUnion:e,union:e,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},W=Object.prototype.toString,Y=Array.isArray||function(n){return"[object Array]"===W.call(n)},$=Number.isInteger,B=0,K=v(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}),L=v(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}),z=b,V=function(n){if(n){var t=arguments;if(!0!==n)return Object.assign?Object.assign.apply(Object,t):j(n,t);if(t.length>1)return n=Y(n[1])?[]:{},j(n,t,!0)}return n},X=S,G=M,Q=D,Z=O,_=x,nn={isNaN:isNaN,isFinite:isFinite,isArray:Y,isFloat:function(n){return null!==n&&!isNaN(n)&&!$(n)},isInteger:$,isFunction:l,isBoolean:function(n){return"boolean"==typeof n},isString:y,isNumber:h,isRegExp:function(n){return"[object RegExp]"===W.call(n)},isObject:p,isPlainObject:g,isDate:m,isError:function(n){return"[object Error]"===W.call(n)},isTypeError:function(n){return!!n&&n.constructor===TypeError},isEmpty:function(n){if(0===n||!h(n)){for(var t in n)return!1;return!0}return!1},isNull:function(n){return null===n},isSymbol:d,isArguments:function(n){return"[object Arguments]"===W.call(n)},isElement:function(n){return n&&y(n.nodeName)&&h(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(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:d(n)?"symbol":m(n)?"date":Y(n)?"array":typeof n},uniqueId:function(){return++B},getSize:function(n){var t=0;return y(n)||Y(n)?n.length:(N(n,function(){t++}),t)},lastIndexOf:L,includes:b,contains:z,objectAssign:V,assign:V,extend:V,stringToJson:function(n){if(p(n))return n;if(y(n))try{return JSON.parse(n)}catch(n){console.error(n)}return{}},jsonToString:function(n){if(p(n))try{return JSON.stringify(n)}catch(n){console.error(n)}return n?""+n:""},objectKeys:S,keys:X,objectValues:M,values:G,objectEntries:D,entries:Q,arrayFirst:O,first:Z,arrayLast:x,last:_,objectEach:E,arrayEach:w,each:N,groupBy:function(n,t,e){var r,i,o={};return n&&(y(t)?(i=t,t=null):t=l(t)?t.bind(e||this):i=null,N(n,function(e,u){r=t?t(e,u,n):i?e[i]:e,o[r]?o[r].push(e):o[r]=[e]})),o},objectMap:function(n,t,e){var r={};return N(n,function(i,o){r[o]=t.call(e||this,i,o,n)}),r},clone:F},tn={browse:function(){var n={};if("undefined"!=typeof document){var t=document.body||document.documentElement;nn.arrayEach(["webkit","khtml","moz","ms","o"],function(e){n["-"+e]=!!t[e+"MatchesSelector"]})}return n}};nn.objectAssign(T,{setItem:function(n,t){T(n,t)},getItem:function(n){return T(n)},removeItem:function(n){T(n,null,{expires:-1})},getJSON:function(){return T()}});var en={cookie:T},rn=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]]}],un=[["yyyy",31536e6],["MM",2592e6],["dd",864e5],["HH",36e5],["mm",6e4],["ss",1e3],["S",0]],an={timestamp:rn,now:rn,stringToDate:I,dateToString:function(n,t){if(n){if(n=I(n),nn.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 o in r)if(r.hasOwnProperty(o)){var u=""+r[o];i=i.replace(new RegExp("("+o+")"),function(n){return"q+"===o||"E+"===o?e[u]:1===n.length?u:("00"+u).substr(u.length)})}return i}return n}return""},getWhatMonth:R,getWhatWeek:function(n,t,e){var r=Number(/^[0-7]$/.test(e)?e:0),i=I(n),o=i.getDay(),u=i.getTime()+864e5*((0===r?7:r)-(0===o?7:o));return t&&!isNaN(t)&&(u+=6048e5*t),new Date(u)},getWhatDay:function(n,t){return new Date(I(n).getTime()+(t&&!isNaN(t)?864e5*t:0))},getDaysOfMonth:function(n,t){return Math.floor((R(n,t,"last").getTime()-R(n,t,"first").getTime())/864e5)+1},getDateDiff:function(n,t,e){var r={},i=I(n).getTime(),o=t?I(t).getTime():new Date;if(i<o)for(var u,a=o-i,s=e&&e.length>0?e:un,c=0,f=s.length;c<f;c++)a>=(u=s[c])[1]&&(c===f-1?a&&(r[u[0]]=a):(r[u[0]]=Math.floor(a/u[1]),a-=r[u[0]]*u[1]));return r}},sn=null;"undefined"!=typeof location&&(sn=location);var cn={getBaseURL:function(){var n=sn.pathname,t=nn.lastIndexOf(n,"/")+1;return k()+(t===n.length?n:n.substring(0,t))},locat:function(){return sn?{port:sn.port,href:sn.href,host:sn.host,hostname:sn.hostname,protocol:sn.protocol,origin:k(),hash:(sn.hash.split("#")[1]||"").split("?")[0]||"",query:H(sn.hash),params:H(sn.search)}:{}}},fn={getRandom:function(n,t){return n>=t?n:(n>>=0)+Math.round(Math.random()*((t||9)-n))},arrayMin:q,min:q,arrayMax:C,max:C,commafy:function(n,t){var e=nn.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]:"")}},ln={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},yn={};nn.arrayEach(nn.objectKeys(ln),function(n){yn[ln[n]]=n});var hn={escape:P(ln),unescape:P(yn)},pn={};return nn.objectAssign(pn,J,nn,tn,en,an,cn,fn,hn),n.mixin=function(t){pn.objectEach(t,function(t,e){n[e]=pn.isFunction(t)?function(){var e=t.apply(n.$context,arguments);return n.$context=null,e}:t})},n.mixin(pn),n});
+!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 tn.isArray(n)&&tn.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 tn.isArray(n)?n.sort(t?tn.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(n){for(var t=[],e=tn.objectValues(n),r=e.length-1;r>=0;r--){var i=r>0?ln.getRandom(0,r):0;t.push(e[i]),e.splice(i,1)}return t}function o(n,t){var e=i(n);return 1===arguments.length?e[0]:(t<e.length&&(e.length=t||0),e)}function u(n,t,e){if(n){if(tn.isArray(n))return n.some(t,e||this);for(var r in n)if(n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n))return!0}return!1}function a(n,t,e){if(n){if(tn.isArray(n))return n.every(t,e||this);for(var r in n)if(n.hasOwnProperty(r)&&!t.call(e||this,n[r],r,n))return!1}return!0}function c(n,t,e){if(n){if(tn.isArray(n))return n.filter(t,e||this);var r={};return tn.each(n,function(i,o){t.call(e||this,i,o,n)&&(r[o]=i)}),r}return[]}function s(n,t,e){if(n){if(tn.isArray(n))return n.find(t,e||this);for(var r in n)if(n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n))return n[r]}}function f(n,t,e){var r=[];if(n){if(tn.isArray(n))return n.map(t,e||this);tn.each(n,function(){r.push(t.apply(e||this,arguments))})}return r}function l(n){return"function"==typeof n}function h(n){return"string"==typeof n}function y(n){return"number"==typeof n}function p(n){return"object"==typeof n}function g(n){return!!n&&n.constructor===Object}function m(n){return"[object Date]"===z.call(n)}function d(n){return"undefined"!=typeof Symbol&&Symbol.isSymbol?Symbol.isSymbol(n):"symbol"==typeof n}function v(n){return function(t,e){if(t){if(h(t)||K(t))return n(t,e);for(var r in t)if(e===t[r])return r}return-1}}function b(n,t){return-1!==B(n,t)}function j(n,t,e){for(var r,i=1,o=t.length;i<o;i++)r=t[i],w(S(t[i]),function(t){n[t]=e?F(r[t],e):r[t]});return n}function S(n){var t=[];if(n){if(Object.keys)return Object.keys(n);E(n,function(n,e){t.push(e)})}return t}function M(n){if(Object.values)return n?Object.values(n):[];var t=[];return w(S(n),function(e){t.push(n[e])}),t}function D(n){if(Object.entries)return n?Object.entries(n):[];var t=[];return w(S(n),function(e){t.push([e,n[e]])}),t}function O(n){return M(n)[0]}function x(n){var t=M(n);return t[t.length-1]}function E(n,t,e){for(var r in n)n.hasOwnProperty(r)&&t.call(e||this,n[r],r,n)}function w(n,t,e){for(var r=0,i=n.length||0;r<i;r++)t.call(e||this,n[r],r,n)}function N(n,t,e){return n?K(n)?l(n.forEach)?n.forEach(t,e||this):w(n,t,e||this):E(n,t,e||this):n}function A(t){return g(t)?function(n){var t={};return N(n,function(n,e){t[e]=A(n)}),t}(t):K(t)?function(t){return n.arrayMap(t,A)}(t):t}function F(n,t){return n?t?A(n):V(g(n)?{}:[],n):n}function T(n,t,e){var r=[],i="undefined"!=typeof document;if(tn.isArray(n)?r=n:arguments.length>1?r=[tn.objectAssign({name:n,value:t},e)]:tn.isObject(n)&&(r=[n]),!(r.length>0)){var o={};return i&&document.cookie&&tn.arrayEach(document.cookie.split("; "),function(n){var t=n.indexOf("=");o[decodeURIComponent(n.substring(0,t))]=decodeURIComponent(n.substring(t+1)||"")}),1===arguments.length?o[n]:o}i&&tn.arrayEach(r,function(n){var t=tn.objectAssign({},n),e=[];t.name&&(e.push(encodeURIComponent(t.name)+"="+encodeURIComponent(tn.isObject(t.value)?JSON.stringify(t.value):t.value)),void 0!==t.expires&&(t.expires=new Date((new Date).getTime()+864e5*parseFloat(t.expires)).toUTCString()),tn.arrayEach(["expires","path","domain","secure"],function(n){void 0!==t[n]&&e.push(n+"="+t[n])})),document.cookie=e.join("; ")})}function I(n,t){if(n){if(tn.isDate(n))return n;if(!isNaN(n))return new Date(n);if(tn.isString(n)){t=t||"yyyy-MM-dd HH:mm:ss.SSS";var e=[];return tn.arrayEach(un,function(r){for(var i,o,u=0,a=r.rules,c=a.length;u<c;u++){if(i=a[u],(o=t.indexOf(i[0]))>-1){e.push(parseFloat(n.substring(o,o+i[1])||0)+(r.offset||0));break}u===c-1&&e.push(0)}}),new Date(e[0],e[1],e[2],e[3],e[4],e[5],e[6])}}return"Invalid Date"}function R(n,t,e){var r=I(n),i=t&&!isNaN(t)?t:0,o=r.getHours(),u=r.getMinutes(),a=r.getSeconds(),c=r.getMilliseconds();if("first"===e){var s=r.getFullYear(),f=r.getMonth();return(f+=i)<0?new Date(s-Math.ceil((f=Math.abs(f))/12),12-(f%12||1),1,o,u,a,c):new Date(s+Math.floor(f/12),f%12,1,o,u,a,c)}if("last"===e)return new Date(R(r,i+1,"first").getTime()-864e5);var l=r.getDate(),h=R(r,i,"first"),y=h.getMonth();for(h.setDate(l);y<h.getMonth();)h.setDate(--l);return h}function H(n){var t={},e=n.split("?")[1]||"";return e&&tn.arrayEach(e.split("&"),function(n){var e=n.split("=");t[decodeURIComponent(e[0])]=decodeURIComponent(e[1]||"")}),t}function U(){return sn.origin||sn.protocol+"//"+sn.host}function k(n){var t=""+n;0===t.indexOf("/")&&(t=U()+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=location.hash.match(/#((.*)\?|(.*))/);return r.pathname=r.path.replace(/(\?|#.*).*/,""),r.origin=r.protocol+"//"+r.host,r.hashKey=i?i[2]:"",r.hashQuery=H(r.hash),r.searchQuery=H(r.search),r}function C(n,t){return tn.isFunction(t)?W.arraySort(W.arrayMap(n,t,this)):W.arraySort(n,t)}function q(){return C.apply(this,arguments)[0]}function P(){return C.apply(this,arguments).reverse()[0]}function J(n){var t=new RegExp("(?:"+tn.objectKeys(n).join("|")+")","g");return function(e){return String(e||"").replace(t,function(t){return n[t]})}}n.version="1.5.20";var W={arrayUniq:t,uniq:t,arrayUnion:e,union:e,arraySort:r,sort:r,arrayShuffle:i,shuffle:i,arraySample:o,sample:o,arraySome:u,some:u,arrayEvery:a,every:a,arrayFilter:c,filter:c,arrayFind:s,find:s,arrayMap:f,map:f},z=Object.prototype.toString,K=Array.isArray||function(n){return"[object Array]"===z.call(n)},Y=Number.isInteger,$=0,B=v(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}),L=v(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}),Q=b,V=function(n){if(n){var t=arguments;if(!0!==n)return Object.assign?Object.assign.apply(Object,t):j(n,t);if(t.length>1)return n=K(n[1])?[]:{},j(n,t,!0)}return n},X=S,G=M,Z=D,_=O,nn=x,tn={isNaN:isNaN,isFinite:isFinite,isArray:K,isFloat:function(n){return null!==n&&!isNaN(n)&&!Y(n)},isInteger:Y,isFunction:l,isBoolean:function(n){return"boolean"==typeof n},isString:h,isNumber:y,isRegExp:function(n){return"[object RegExp]"===z.call(n)},isObject:p,isPlainObject:g,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||!y(n)){for(var t in n)return!1;return!0}return!1},isNull:function(n){return null===n},isSymbol:d,isArguments:function(n){return"[object Arguments]"===z.call(n)},isElement:function(n){return n&&h(n.nodeName)&&y(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(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:d(n)?"symbol":m(n)?"date":K(n)?"array":typeof n},uniqueId:function(){return++$},getSize:function(n){var t=0;return h(n)||K(n)?n.length:(N(n,function(){t++}),t)},lastIndexOf:L,includes:b,contains:Q,objectAssign:V,assign:V,extend:V,stringToJson:function(n){if(p(n))return n;if(h(n))try{return JSON.parse(n)}catch(n){console.error(n)}return{}},jsonToString:function(n){if(p(n))try{return JSON.stringify(n)}catch(n){console.error(n)}return n?""+n:""},objectKeys:S,keys:X,objectValues:M,values:G,objectEntries:D,entries:Z,arrayFirst:O,first:_,arrayLast:x,last:nn,objectEach:E,arrayEach:w,each:N,groupBy:function(n,t,e){var r,i,o={};return n&&(h(t)?(i=t,t=null):t=l(t)?t.bind(e||this):i=null,N(n,function(e,u){r=t?t(e,u,n):i?e[i]:e,o[r]?o[r].push(e):o[r]=[e]})),o},objectMap:function(n,t,e){var r={};return N(n,function(i,o){r[o]=t.call(e||this,i,o,n)}),r},clone:F},en={browse:function(){var n={};if("undefined"!=typeof document){var t=document.body||document.documentElement;tn.arrayEach(["webkit","khtml","moz","ms","o"],function(e){n["-"+e]=!!t[e+"MatchesSelector"]})}return n}};tn.objectAssign(T,{setItem:function(n,t){T(n,t)},getItem:function(n){return T(n)},removeItem:function(n){T(n,null,{expires:-1})},getJSON:function(){return T()}});var rn={cookie:T},on=Date.now||function(){return(new Date).getTime()},un=[{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]]}],an=[["yyyy",31536e6],["MM",2592e6],["dd",864e5],["HH",36e5],["mm",6e4],["ss",1e3],["S",0]],cn={timestamp:on,now:on,stringToDate:I,dateToString:function(n,t){if(n){if(n=I(n),tn.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 o in r)if(r.hasOwnProperty(o)){var u=""+r[o];i=i.replace(new RegExp("("+o+")"),function(n){return"q+"===o||"E+"===o?e[u]:1===n.length?u:("00"+u).substr(u.length)})}return i}return n}return""},getWhatMonth:R,getWhatWeek:function(n,t,e){var r=Number(/^[0-7]$/.test(e)?e:0),i=I(n),o=i.getDay(),u=i.getTime()+864e5*((0===r?7:r)-(0===o?7:o));return t&&!isNaN(t)&&(u+=6048e5*t),new Date(u)},getWhatDay:function(n,t){return new Date(I(n).getTime()+(t&&!isNaN(t)?864e5*t:0))},getDaysOfMonth:function(n,t){return Math.floor((R(n,t,"last").getTime()-R(n,t,"first").getTime())/864e5)+1},getDateDiff:function(n,t,e){var r={},i=I(n).getTime(),o=t?I(t).getTime():new Date;if(i<o)for(var u,a=o-i,c=e&&e.length>0?e:an,s=0,f=c.length;s<f;s++)a>=(u=c[s])[1]&&(s===f-1?a&&(r[u[0]]=a):(r[u[0]]=Math.floor(a/u[1]),a-=r[u[0]]*u[1]));return r}},sn=null;"undefined"!=typeof location&&(sn=location);var fn={parseUrl:k,getBaseURL:function(){var n=sn.pathname,t=tn.lastIndexOf(n,"/")+1;return U()+(t===n.length?n:n.substring(0,t))},locat:function(){return sn?k(sn.href):{}}},ln={getRandom:function(n,t){return n>=t?n:(n>>=0)+Math.round(Math.random()*((t||9)-n))},arrayMin:q,min:q,arrayMax:P,max:P,commafy:function(n,t){var e=tn.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]:"")}},hn={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;","'":"&#x27;","`":"&#x60;"},yn={};tn.arrayEach(tn.objectKeys(hn),function(n){yn[hn[n]]=n});var pn={escape:J(hn),unescape:J(yn)},gn={};return tn.objectAssign(gn,W,tn,en,rn,cn,fn,ln,pn),n.mixin=function(t){gn.objectEach(t,function(t,e){n[e]=gn.isFunction(t)?function(){var e=t.apply(n.$context,arguments);return n.$context=null,e}:t})},n.mixin(gn),n});

package.json

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

README.md

@@ -656,5 +656,12 @@ # XEUtils 函数库
 
-XEUtils.locat() // {hash: '', host: '', hostname: '', href: '', protocol: '', port: '', origin: '', query: {...}, params: {...}, ...}
+XEUtils.locat() // {hash: '', hostname: '', protocol: '', port: '', origin: '', ...}
 ```
 
+### parseUrl ( url ) 解析 URL 参数
+```shell
+import XEUtils from 'xe-utils'
+
+XEUtils.parseUrl('http://xuliangzhan.com:8080/demo/') // {hostname: 'xuliangzhan.com', protocol: 'http:', port: '8080', ...}
+```
+
 ### getBaseURL ( ) 获取上下文路径
@@ -661,0 +668,0 @@ ```shell

src/core/utils.js

@@ -5,4 +5,4 @@ 'use strict'
 
-XEUtils.version = '1.5.19'
+XEUtils.version = '1.5.20'
 
 module.exports = XEUtils

src/method/locat.js

@@ -11,7 +11,3 @@ 'use strict'
 
-function hash () {
-  return ($locat.hash.split('#')[1] || '').split('?')[0] || ''
-}
-
-function parse (uri) {
+function parseParams (uri) {
   var result = {}
@@ -38,2 +34,39 @@ var params = uri.split('?')[1] || ''
 
+function parseUrl (url) {
+  var href = '' + url
+  if (href.indexOf('/') === 0) {
+    href = getLocatOrigin() + href
+  }
+  var searchs = href.replace(/#.*/, '').match(/(\?.*)/)
+  var parsed = {
+    href: href,
+    hash: '',
+    host: '',
+    hostname: '',
+    protocol: '',
+    port: '',
+    search: searchs ? searchs[1] : ''
+  }
+  parsed.path = href.replace(/^([a-z0-9.+-]*:)\/\//, function (text, protocol) {
+    parsed.protocol = protocol
+    return ''
+  }).replace(/^([a-z0-9.+-]*)(:\d+)?\//, function (text, hostname, port) {
+    var portText = port || ''
+    parsed.port = portText.replace(':', '')
+    parsed.hostname = hostname
+    parsed.host = hostname + portText
+    return '/'
+  }).replace(/(#.*)/, function (text, hash) {
+    parsed.hash = hash
+    return ''
+  })
+  var hashs = location.hash.match(/#((.*)\?|(.*))/)
+  parsed.pathname = parsed.path.replace(/(\?|#.*).*/, '')
+  parsed.origin = parsed.protocol + '//' + parsed.host
+  parsed.hashKey = hashs ? hashs[2] : ''
+  parsed.hashQuery = parseParams(parsed.hash)
+  parsed.searchQuery = parseParams(parsed.search)
+  return parsed
+}
+
 /**
@@ -44,16 +77,7 @@ * 获取地址栏信息
 function locat () {
-  return $locat ? {
-    port: $locat.port,
-    href: $locat.href,
-    host: $locat.host,
-    hostname: $locat.hostname,
-    protocol: $locat.protocol,
-    origin: getLocatOrigin(),
-    hash: hash(),
-    query: parse($locat.hash),
-    params: parse($locat.search)
-  } : {}
+  return $locat ? parseUrl($locat.href) : {}
 }
 
 var locatExports = {
+  parseUrl: parseUrl,
   getBaseURL: getBaseURL,
@@ -60,0 +84,0 @@ locat: locat

No alert changes

Improved metrics

Total package byte prevSize

109707

increased by2.19%

Lines of code

2706

increased by1.81%

Number of lines in readme file

714

increased by0.99%

No dependency changes