@ray-js/library 1.4.0-alpha.3 → 1.4.0-alpha.4

package/lib/regexp/NamedRegexp.js

@@ -1,49 +1,35 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.array.reduce.js";
-import "core-js/modules/es.object.to-string.js";
-
 /**
  * 实现 Named Groups RegExp 的正则百表达式
  * ECMA 2018 的实现
  * 通过 new RegExp 运算符，无法被 babel 转义
  */
-var NamedRegexp = /*#__PURE__*/function () {
+export default class NamedRegexp {
   /**
    * 创建 Named RegExp
    * @param {object} options
    * @param {RegExp} options.regex 正则
    * @param {Array<String>} options.groups 分组
    */
-  function NamedRegexp(options) {
-    _classCallCheck(this, NamedRegexp);
 
-    var regex = options.regex,
-        groups = options.groups;
+  constructor(options) {
+    const {
+      regex,
+      groups
+    } = options;
     this.regex = regex;
     this.groups = groups;
   }
-
-  _createClass(NamedRegexp, [{
-    key: "exec",
-    value: function exec(value) {
-      var _this = this;
-
-      var matches = this.regex.exec(value);
-      if (!matches) return matches;
-      var groups = matches.reduce(function (result, match, index) {
-        if (index > 0) // This subtraction is required because we count
-          // match indexes from 1, because 0 is the entire matched string
-          result[_this.groups[index - 1]] = match;
-        return result;
-      }, {});
-      matches.groups = groups;
-      return matches;
-    }
-  }]);
-
-  return NamedRegexp;
-}();
-
-export { NamedRegexp as default };
+  exec(value) {
+    const matches = this.regex.exec(value);
+    if (!matches) return matches;
+    const groups = matches.reduce((result, match, index) => {
+      if (index > 0)
+        // This subtraction is required because we count
+        // match indexes from 1, because 0 is the entire matched string
+        result[this.groups[index - 1]] = match;
+      return result;
+    }, {});
+    matches.groups = groups;
+    return matches;
+  }
+}

package/lib/url/format.js

@@ -1,20 +1,14 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.string.search.js";
-import "core-js/modules/es.array.concat.js";
 import queryStringify from './queryStringify';
 import searchParse from './searchParse';
 export default function format(attrs) {
-  var _attrs$hash = attrs.hash,
-      hash = _attrs$hash === void 0 ? '' : _attrs$hash,
-      _attrs$pathname = attrs.pathname,
-      pathname = _attrs$pathname === void 0 ? '' : _attrs$pathname,
-      _attrs$origin = attrs.origin,
-      origin = _attrs$origin === void 0 ? '' : _attrs$origin,
-      _attrs$query = attrs.query,
-      query = _attrs$query === void 0 ? {} : _attrs$query,
-      _attrs$search = attrs.search,
-      search = _attrs$search === void 0 ? '' : _attrs$search;
-  var searchQuery = searchParse(search);
+  const {
+    hash = '',
+    pathname = '',
+    origin = '',
+    query = {},
+    search = ''
+  } = attrs;
+  const searchQuery = searchParse(search);
   return "".concat(origin).concat(pathname).concat(queryStringify(_objectSpread(_objectSpread({}, query), searchQuery))).concat(hash);
 }

package/lib/url/index.js

@@ -3,13 +3,13 @@ import params from './params';
 import parse from './parse';
 import queryStringify from './queryStringify';
 import searchParse from './searchParse';
-var queryParse = searchParse;
+const queryParse = searchParse;
 export { parse, format, queryStringify, params, searchParse, queryParse };
 export default {
-  parse: parse,
-  format: format,
-  queryStringify: queryStringify,
-  queryParse: queryParse,
-  params: params,
-  searchParse: searchParse
+  parse,
+  format,
+  queryStringify,
+  queryParse,
+  params,
+  searchParse
 };

package/lib/url/params.js

@@ -1,27 +1,27 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["query"];
-import "core-js/modules/es.array.concat.js";
+const _excluded = ["query"];
+import "core-js/modules/web.dom-collections.iterator.js";
 import merge from 'merge';
 import parse from './parse';
 import format from './format';
+
 /**
  * 调整页面地址的 query
  * @param url - url 地址
  * @param args -  附加到 query 上的参数
  * @returns
  */
-
 export default function params(url) {
-  var _parse = parse(url),
-      query = _parse.query,
-      rest = _objectWithoutProperties(_parse, _excluded);
-
+  const _parse = parse(url),
+    {
+      query
+    } = _parse,
+    rest = _objectWithoutProperties(_parse, _excluded);
   for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
     args[_key - 1] = arguments[_key];
   }
-
   return format(_objectSpread({
-    query: merge.apply(void 0, [query].concat(args))
+    query: merge(query, ...args)
   }, rest));
 }

package/lib/url/parse.js

@@ -1,61 +1,53 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["pathname"],
-    _excluded2 = ["____h_a_s_h____"];
-import "core-js/modules/es.regexp.exec.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-import "core-js/modules/es.object.keys.js";
-import "core-js/modules/es.string.search.js";
+const _excluded = ["pathname"],
+  _excluded2 = ["____h_a_s_h____"];
 import { NamedRegexp } from '../regexp';
 import searchParse from './searchParse';
 import format from './format';
-var URL_REGEX = new NamedRegexp({
+const URL_REGEX = new NamedRegexp({
   regex: /(((?:http|https):)?(?:\/\/)?([^./]([^:/?#]*)(?::(\d+))?))?([^?#]+)?(\?[^#]*)?(#.*)?/,
   groups: ['origin', 'protocol', 'host', 'hostname', 'port', 'pathname', 'search', 'hash']
 });
 export default function parse(href) {
   /* istanbul ignore next */
-  var _ref = URL_REGEX.exec(href) || {
+  const {
+    groups = {}
+  } = URL_REGEX.exec(href) || {
     groups: {}
-  },
-      _ref$groups = _ref.groups,
-      groups = _ref$groups === void 0 ? {} : _ref$groups;
-
-  Object.keys(groups).forEach(function (key) {
+  };
+  Object.keys(groups).forEach(key => {
     if (!groups[key]) {
       groups[key] = '';
     }
   });
-
-  var pathname = groups.pathname,
-      restGroups = _objectWithoutProperties(groups, _excluded);
-
-  var res = _objectSpread({
+  const {
+      pathname
+    } = groups,
+    restGroups = _objectWithoutProperties(groups, _excluded);
+  const res = _objectSpread({
     query: {},
-    href: href,
+    href,
     pathname: pathname ? pathname : '/'
   }, restGroups);
-
   if (groups.search) {
     // 小程序不能传递hash，用query.____h_a_s_h____传递
     // 回显恢复____h_a_s_h____ ====> hash
     // 从query中接出hash值
-    var _searchParse = searchParse(groups.search),
-        ____h_a_s_h____ = _searchParse.____h_a_s_h____,
-        query = _objectWithoutProperties(_searchParse, _excluded2);
-
+    const _searchParse = searchParse(groups.search),
+      {
+        ____h_a_s_h____
+      } = _searchParse,
+      query = _objectWithoutProperties(_searchParse, _excluded2);
     res.query = query;
-
     if (____h_a_s_h____) {
       // 剔除 ____h_a_s_h____
       res.hash = res.hash || "#".concat(____h_a_s_h____);
       res.search = format({
-        query: query
+        query
       });
       res.href = format(res);
     }
   }
-
   return res;
 }

package/lib/url/queryStringify.js

@@ -1,20 +1,15 @@
-import "core-js/modules/es.object.keys.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-import "core-js/modules/es.array.concat.js";
 export default function queryStringify(query) {
-  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var _options$prefix = options.prefix,
-      prefix = _options$prefix === void 0 ? true : _options$prefix;
-  var search = [];
-  var keys = Object.keys(query);
-
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  const {
+    prefix = true
+  } = options;
+  const search = [];
+  const keys = Object.keys(query);
   if (keys.length === 0) {
     return '';
   }
-
-  keys.forEach(function (key) {
-    var value = query[key];
+  keys.forEach(key => {
+    const value = query[key];
     search.push([key, value].join('='));
   });
   return "".concat(prefix ? '?' : '').concat(search.join('&'));

package/lib/url/searchParse.js

@@ -1,40 +1,25 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _toArray from "@babel/runtime/helpers/esm/toArray";
-import "core-js/modules/es.array.slice.js";
-import "core-js/modules/es.regexp.exec.js";
+import "core-js/modules/web.dom-collections.iterator.js";
 import "core-js/modules/es.string.replace.js";
-import "core-js/modules/es.object.to-string.js";
-import "core-js/modules/web.dom-collections.for-each.js";
-
 /**
  * 分割url search key value，返回 [key, value]
  */
 function splitSearchKeyValue(str) {
-  var _str$split = str.split('='),
-      _str$split2 = _toArray(_str$split),
-      key = _str$split2[0],
-      valueArr = _str$split2.slice(1);
-
-  var value = valueArr.length ? valueArr.join('=') : '';
+  const [key, ...valueArr] = str.split('=');
+  const value = valueArr.length ? valueArr.join('=') : '';
   return [key, value];
 }
+
 /**
  * 解析 url.search 返回对象类型
  * @param search URL search 信息
  */
-
-
 export default function searchParse(search) {
-  var query = {};
+  const query = {};
   if (!search) return query;
   search = search.replace(/^\?/, ''); // 移除首字符 问号
 
-  search.split('&').forEach(function (i) {
-    var _splitSearchKeyValue = splitSearchKeyValue(i),
-        _splitSearchKeyValue2 = _slicedToArray(_splitSearchKeyValue, 2),
-        key = _splitSearchKeyValue2[0],
-        value = _splitSearchKeyValue2[1];
-
+  search.split('&').forEach(i => {
+    const [key, value] = splitSearchKeyValue(i);
     query[key] = value;
   });
   return query;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/library",
-  "version": "1.4.0-alpha.3",
+  "version": "1.4.0-alpha.4",
   "description": "Ray library for browser",
   "keywords": [
     "ray"
@@ -23,7 +23,7 @@
     "merge": "^2.1.1"
   },
   "devDependencies": {
-    "@ray-js/cli": "^1.4.0-alpha.3"
+    "@ray-js/cli": "^1.4.0-alpha.4"
   },
   "maintainers": [
     {
@@ -31,6 +31,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "438a6262377009a49dd569adab1079542e4e857a",
+  "gitHead": "ae3621a47944287771e18e926c76ea92d0516097",
   "repository": {}
 }