@ray-js/library 0.6.20 → 0.6.22-beta-1

package/lib/url/format.js

@@ -1,7 +1,6 @@
 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.slice.js";
 import "core-js/modules/es.array.concat.js";
 import queryStringify from './queryStringify';
 import searchParse from './searchParse';
@@ -17,10 +16,5 @@ export default function format(attrs) {
       _attrs$search = attrs.search,
       search = _attrs$search === void 0 ? '' : _attrs$search;
   var searchQuery = searchParse(search);
-
-  if (hash) {
-    query.____h_a_s_h____ = hash.slice(1);
-  }
-
   return "".concat(origin).concat(pathname).concat(queryStringify(_objectSpread(_objectSpread({}, query), searchQuery))).concat(hash);
 }

package/lib/url/params.js

@@ -1,7 +1,10 @@
+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";
 import merge from 'merge';
 import parse from './parse';
-import queryStringify from './queryStringify';
+import format from './format';
 /**
  * 调整页面地址的 query
  * @param url - url 地址
@@ -12,15 +15,13 @@ import queryStringify from './queryStringify';
 export default function params(url) {
   var _parse = parse(url),
       query = _parse.query,
-      pathname = _parse.pathname,
-      origin = _parse.origin,
-      hash = _parse.hash;
+      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];
   }
 
-  var params = merge.apply(void 0, [query].concat(args)); // 合并多个对象，覆盖前一个
-
-  return "".concat(origin).concat(pathname).concat(queryStringify(params)).concat(hash);
+  return format(_objectSpread({
+    query: merge.apply(void 0, [query].concat(args))
+  }, rest));
 }

package/lib/url/parse.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["pathname"];
+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";
@@ -8,6 +9,7 @@ import "core-js/modules/es.object.keys.js";
 import "core-js/modules/es.string.search.js";
 import { NamedRegexp } from '../regexp';
 import searchParse from './searchParse';
+import format from './format';
 var URL_REGEX = new NamedRegexp({
   regex: /(((?:http|https):)?(?:\/\/)?(([^:/?#]*)(?::(\d+))?))?([^?#]+)?(\?[^#]*)?(#.*)?/,
   groups: ['origin', 'protocol', 'host', 'hostname', 'port', 'pathname', 'search', 'hash']
@@ -25,18 +27,35 @@ export default function parse(href) {
       groups[key] = '';
     }
   });
-  var query = {};
-
-  if (groups.search) {
-    query = searchParse(groups.search);
-  }
 
   var pathname = groups.pathname,
       restGroups = _objectWithoutProperties(groups, _excluded);
 
-  return _objectSpread({
-    query: query,
+  var res = _objectSpread({
+    query: {},
     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);
+
+    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
+      });
+      res.href = format(res);
+    }
+  }
+
+  return res;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/library",
-  "version": "0.6.20",
+  "version": "0.6.22-beta-1",
   "description": "Ray library for browser",
   "keywords": [
     "ray"
@@ -23,7 +23,7 @@
     "merge": "^2.1.1"
   },
   "devDependencies": {
-    "@ray-js/cli": "^0.6.20"
+    "@ray-js/cli": "^0.6.22-beta-1"
   },
   "maintainers": [
     {
@@ -31,6 +31,6 @@
       "email": "tuyafe@tuya.com"
     }
   ],
-  "gitHead": "c4af108a845378cdd4c41d404cff1c6f30a55dd0",
+  "gitHead": "2e905a1820d0adfc0a6ca8cf3ecf1f3a584a0d44",
   "repository": {}
 }