@blueking/bkui-form 0.0.48 → 0.0.49

package/dist/bkui-form-umd.js

@@ -190,7 +190,7 @@
       i = _objectWithoutPropertiesLoose(e, t);
     if (Object.getOwnPropertySymbols) {
       var n = Object.getOwnPropertySymbols(e);
-      for (r = 0; r < n.length; r++) o = n[r], t.indexOf(o) >= 0 || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
+      for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]);
     }
     return i;
   }
@@ -198,7 +198,7 @@
     if (null == r) return {};
     var t = {};
     for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
-      if (e.indexOf(n) >= 0) continue;
+      if (-1 !== e.indexOf(n)) continue;
       t[n] = r[n];
     }
     return t;
@@ -592,11 +592,11 @@
     }
     return _typeof(value);
   };
-  var merge = function merge(target, source) {
+  var _merge = function merge(target, source) {
     if (isObj(source)) {
       return Object.keys(source).reduce(function (pre, key) {
         var _target;
-        pre[key] = merge(((_target = target) === null || _target === void 0 ? void 0 : _target[key]) || {}, source[key]);
+        pre[key] = _merge(((_target = target) === null || _target === void 0 ? void 0 : _target[key]) || {}, source[key]);
         return pre;
       }, JSON.parse(JSON.stringify(target)));
     }
@@ -604,7 +604,7 @@
       target = Array.isArray(target) ? target : [];
       return source.map(function (item, index) {
         if (target[index]) {
-          return merge(target[index], item);
+          return _merge(target[index], item);
         }
         return item;
       });
@@ -1375,8 +1375,8 @@
     headers: {},
     cache: 'no-cache'
   };
-  var request = ( /*#__PURE__*/(function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url) {
+  var request = (/*#__PURE__*/function () {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(url) {
       var config,
         _mergeDeep,
         params,
@@ -1485,7 +1485,7 @@
     return function (_x) {
       return _ref.apply(this, arguments);
     };
-  })());
+  }());
 
   var props$1 = {
     // 表单值
@@ -1722,7 +1722,7 @@
       }
     };
   };
-  var executeExpression = function executeExpression(expression, instance) {
+  var _executeExpression = function executeExpression(expression, instance) {
     var $dep = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var $args = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     var _getContext = getContext(instance),
@@ -1780,7 +1780,7 @@
     }
     if (isObj(expression)) {
       Object.keys(expression).forEach(function (key) {
-        expression[key] = executeExpression(expression[key], instance);
+        expression[key] = _executeExpression(expression[key], instance);
       });
       return expression;
     }
@@ -1826,7 +1826,6 @@
         crtInstance = _ref.instance; // 当前组件实例，用来条件表达式判断
       var _ref2 = widgetTree.widgetMap[targetPath] || {},
         operateInstance = _ref2.instance; // 需要执行操作的组件实例，可能为其他组件也可能为当前组件
-      if (!crtInstance || !operateInstance) return;
       var fullfill = true;
       var deps = [];
       if (reaction.source) {
@@ -1836,33 +1835,39 @@
           deps.push(instance);
         });
       }
-      if (typeof reaction.if === 'string') {
-        fullfill = executeExpression(reaction.if, crtInstance, deps);
+      if (typeof reaction.if === 'string' && crtInstance) {
+        fullfill = _executeExpression(reaction.if, crtInstance, deps);
       }
       var operations = fullfill ? reaction.then : reaction.else;
-      executeOperations(operations, operateInstance, deps);
+      operateInstance && executeOperations(operations, operateInstance, deps);
     };
   };
+  /**
+   * 执行操作
+   * @param operations
+   * @param instance
+   * @param deps
+   */
   var executeOperations = function executeOperations(operations, instance, deps) {
     if (operations) {
       if (operations.state) {
         Object.keys(operations.state).forEach(function (key) {
           var val = operations.state[key];
           if (typeof val === 'string' && /^{{.+}}$/.test(val.trim())) {
-            val = executeExpression(val, instance, deps);
+            val = _executeExpression(val, instance, deps);
           }
           instance.setState(key, val);
         });
       }
       if (Array.isArray(operations.actions)) {
         operations.actions.forEach(function (item) {
-          executeExpression(item, instance, deps);
+          _executeExpression(item, instance, deps);
         });
       }
     }
   };
   var parsePath = function parsePath(path, instance) {
-    return isExpression(path) ? executeExpression(path, instance) : path;
+    return isExpression(path) ? _executeExpression(path, instance) : path;
   };
   var reactionRegister = function reactionRegister(path) {
     var reactions = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -1915,8 +1920,6 @@
     }
   };
 
-  var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
-
   function getDefaultExportFromCjs (x) {
   	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
   }
@@ -1938,6 +1941,7 @@
   (function (exports) {
   Object.defineProperty(exports, "__esModule", { value: true });
   exports.regexpCode = exports.getEsmExportName = exports.getProperty = exports.safeStringify = exports.stringify = exports.strConcat = exports.addCodeArg = exports.str = exports._ = exports.nil = exports._Code = exports.Name = exports.IDENTIFIER = exports._CodeOrName = void 0;
+  // eslint-disable-next-line @typescript-eslint/no-extraneous-class
   class _CodeOrName {
   }
   exports._CodeOrName = _CodeOrName;
@@ -3946,7 +3950,7 @@
   }
   subschema.extendSubschemaMode = extendSubschemaMode;
 
-  var resolve$1 = {};
+  var resolve$2 = {};
 
   // do not edit .js files directly - edit src/index.jst
 
@@ -4087,10 +4091,10 @@
     return str.replace(/~/g, '~0').replace(/\//g, '~1');
   }
 
-  Object.defineProperty(resolve$1, "__esModule", { value: true });
-  resolve$1.getSchemaRefs = resolve$1.resolveUrl = resolve$1.normalizeId = resolve$1._getFullPath = resolve$1.getFullPath = resolve$1.inlineRef = void 0;
+  Object.defineProperty(resolve$2, "__esModule", { value: true });
+  resolve$2.getSchemaRefs = resolve$2.resolveUrl = resolve$2.normalizeId = resolve$2._getFullPath = resolve$2.getFullPath = resolve$2.inlineRef = void 0;
   const util_1$m = util;
-  const equal$2 = fastDeepEqual;
+  const equal$3 = fastDeepEqual;
   const traverse = jsonSchemaTraverse.exports;
   // TODO refactor to use keyword definitions
   const SIMPLE_INLINED = new Set([
@@ -4120,7 +4124,7 @@
           return false;
       return countKeys(schema) <= limit;
   }
-  resolve$1.inlineRef = inlineRef;
+  resolve$2.inlineRef = inlineRef;
   const REF_KEYWORDS = new Set([
       "$ref",
       "$recursiveRef",
@@ -4162,22 +4166,22 @@
       const p = resolver.parse(id);
       return _getFullPath(resolver, p);
   }
-  resolve$1.getFullPath = getFullPath;
+  resolve$2.getFullPath = getFullPath;
   function _getFullPath(resolver, p) {
       const serialized = resolver.serialize(p);
       return serialized.split("#")[0] + "#";
   }
-  resolve$1._getFullPath = _getFullPath;
+  resolve$2._getFullPath = _getFullPath;
   const TRAILING_SLASH_HASH = /#\/?$/;
   function normalizeId(id) {
       return id ? id.replace(TRAILING_SLASH_HASH, "") : "";
   }
-  resolve$1.normalizeId = normalizeId;
+  resolve$2.normalizeId = normalizeId;
   function resolveUrl(resolver, baseId, id) {
       id = normalizeId(id);
       return resolver.resolve(baseId, id);
   }
-  resolve$1.resolveUrl = resolveUrl;
+  resolve$2.resolveUrl = resolveUrl;
   const ANCHOR = /^[a-z_][-a-z0-9._]*$/i;
   function getSchemaRefs(schema, baseId) {
       if (typeof schema == "boolean")
@@ -4232,14 +4236,14 @@
       });
       return localRefs;
       function checkAmbiguosRef(sch1, sch2, ref) {
-          if (sch2 !== undefined && !equal$2(sch1, sch2))
+          if (sch2 !== undefined && !equal$3(sch1, sch2))
               throw ambiguos(ref);
       }
       function ambiguos(ref) {
           return new Error(`reference "${ref}" resolves to more than one schema`);
       }
   }
-  resolve$1.getSchemaRefs = getSchemaRefs;
+  resolve$2.getSchemaRefs = getSchemaRefs;
 
   Object.defineProperty(validate$1, "__esModule", { value: true });
   validate$1.getData = validate$1.KeywordCxt = validate$1.validateFunctionCode = void 0;
@@ -4252,7 +4256,7 @@
   const subschema_1 = subschema;
   const codegen_1$n = codegen;
   const names_1$3 = names$1;
-  const resolve_1$2 = resolve$1;
+  const resolve_1$2 = resolve$2;
   const util_1$l = util;
   const errors_1 = errors;
   // schema compilation - generates validation function, subschemaCode (below) is used for subschemas
@@ -4774,7 +4778,7 @@
   var ref_error = {};
 
   Object.defineProperty(ref_error, "__esModule", { value: true });
-  const resolve_1$1 = resolve$1;
+  const resolve_1$1 = resolve$2;
   class MissingRefError extends Error {
       constructor(resolver, baseId, ref, msg) {
           super(msg || `can't resolve reference ${ref} from id ${baseId}`);
@@ -4791,7 +4795,7 @@
   const codegen_1$m = codegen;
   const validation_error_1 = validation_error;
   const names_1$2 = names$1;
-  const resolve_1 = resolve$1;
+  const resolve_1 = resolve$2;
   const util_1$k = util;
   const validate_1$1 = validate$1;
   class SchemaEnv {
@@ -4917,7 +4921,7 @@
       const schOrFunc = root.refs[ref];
       if (schOrFunc)
           return schOrFunc;
-      let _sch = resolve.call(this, root, ref);
+      let _sch = resolve$1.call(this, root, ref);
       if (_sch === undefined) {
           const schema = (_a = root.localRefs) === null || _a === void 0 ? void 0 : _a[ref]; // TODO maybe localRefs should hold SchemaEnv
           const { schemaId } = this.opts;
@@ -4947,7 +4951,7 @@
   }
   // resolve and compile the references ($ref)
   // TODO returns AnySchemaObject (if the schema can be inlined) or validation function
-  function resolve(root, // information about the root schema for the current schema
+  function resolve$1(root, // information about the root schema for the current schema
   ref // reference to resolve
   ) {
       let sch;
@@ -5058,1416 +5062,770 @@
 
   var uri$1 = {};
 
-  var uri_all = {exports: {}};
-
-  /** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
-
-  (function (module, exports) {
-  (function (global, factory) {
-  	factory(exports) ;
-  }(commonjsGlobal, (function (exports) {
-  function merge() {
-      for (var _len = arguments.length, sets = Array(_len), _key = 0; _key < _len; _key++) {
-          sets[_key] = arguments[_key];
-      }
-
-      if (sets.length > 1) {
-          sets[0] = sets[0].slice(0, -1);
-          var xl = sets.length - 1;
-          for (var x = 1; x < xl; ++x) {
-              sets[x] = sets[x].slice(1, -1);
-          }
-          sets[xl] = sets[xl].slice(1);
-          return sets.join('');
-      } else {
-          return sets[0];
-      }
-  }
-  function subexp(str) {
-      return "(?:" + str + ")";
-  }
-  function typeOf(o) {
-      return o === undefined ? "undefined" : o === null ? "null" : Object.prototype.toString.call(o).split(" ").pop().split("]").shift().toLowerCase();
-  }
-  function toUpperCase(str) {
-      return str.toUpperCase();
-  }
-  function toArray(obj) {
-      return obj !== undefined && obj !== null ? obj instanceof Array ? obj : typeof obj.length !== "number" || obj.split || obj.setInterval || obj.call ? [obj] : Array.prototype.slice.call(obj) : [];
-  }
-  function assign(target, source) {
-      var obj = target;
-      if (source) {
-          for (var key in source) {
-              obj[key] = source[key];
-          }
-      }
-      return obj;
-  }
-
-  function buildExps(isIRI) {
-      var ALPHA$$ = "[A-Za-z]",
-          DIGIT$$ = "[0-9]",
-          HEXDIG$$ = merge(DIGIT$$, "[A-Fa-f]"),
-          PCT_ENCODED$ = subexp(subexp("%[EFef]" + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$) + "|" + subexp("%[89A-Fa-f]" + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$) + "|" + subexp("%" + HEXDIG$$ + HEXDIG$$)),
-          //expanded
-      GEN_DELIMS$$ = "[\\:\\/\\?\\#\\[\\]\\@]",
-          SUB_DELIMS$$ = "[\\!\\$\\&\\'\\(\\)\\*\\+\\,\\;\\=]",
-          RESERVED$$ = merge(GEN_DELIMS$$, SUB_DELIMS$$),
-          UCSCHAR$$ = isIRI ? "[\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF]" : "[]",
-          //subset, excludes bidi control characters
-      IPRIVATE$$ = isIRI ? "[\\uE000-\\uF8FF]" : "[]",
-          //subset
-      UNRESERVED$$ = merge(ALPHA$$, DIGIT$$, "[\\-\\.\\_\\~]", UCSCHAR$$);
-          subexp(ALPHA$$ + merge(ALPHA$$, DIGIT$$, "[\\+\\-\\.]") + "*");
-          subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]")) + "*");
-          var DEC_OCTET_RELAXED$ = subexp(subexp("25[0-5]") + "|" + subexp("2[0-4]" + DIGIT$$) + "|" + subexp("1" + DIGIT$$ + DIGIT$$) + "|" + subexp("0?[1-9]" + DIGIT$$) + "|0?0?" + DIGIT$$),
-          //relaxed parsing rules
-      IPV4ADDRESS$ = subexp(DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$),
-          H16$ = subexp(HEXDIG$$ + "{1,4}"),
-          LS32$ = subexp(subexp(H16$ + "\\:" + H16$) + "|" + IPV4ADDRESS$),
-          IPV6ADDRESS1$ = subexp(subexp(H16$ + "\\:") + "{6}" + LS32$),
-          //                           6( h16 ":" ) ls32
-      IPV6ADDRESS2$ = subexp("\\:\\:" + subexp(H16$ + "\\:") + "{5}" + LS32$),
-          //                      "::" 5( h16 ":" ) ls32
-      IPV6ADDRESS3$ = subexp(subexp(H16$) + "?\\:\\:" + subexp(H16$ + "\\:") + "{4}" + LS32$),
-          //[               h16 ] "::" 4( h16 ":" ) ls32
-      IPV6ADDRESS4$ = subexp(subexp(subexp(H16$ + "\\:") + "{0,1}" + H16$) + "?\\:\\:" + subexp(H16$ + "\\:") + "{3}" + LS32$),
-          //[ *1( h16 ":" ) h16 ] "::" 3( h16 ":" ) ls32
-      IPV6ADDRESS5$ = subexp(subexp(subexp(H16$ + "\\:") + "{0,2}" + H16$) + "?\\:\\:" + subexp(H16$ + "\\:") + "{2}" + LS32$),
-          //[ *2( h16 ":" ) h16 ] "::" 2( h16 ":" ) ls32
-      IPV6ADDRESS6$ = subexp(subexp(subexp(H16$ + "\\:") + "{0,3}" + H16$) + "?\\:\\:" + H16$ + "\\:" + LS32$),
-          //[ *3( h16 ":" ) h16 ] "::"    h16 ":"   ls32
-      IPV6ADDRESS7$ = subexp(subexp(subexp(H16$ + "\\:") + "{0,4}" + H16$) + "?\\:\\:" + LS32$),
-          //[ *4( h16 ":" ) h16 ] "::"              ls32
-      IPV6ADDRESS8$ = subexp(subexp(subexp(H16$ + "\\:") + "{0,5}" + H16$) + "?\\:\\:" + H16$),
-          //[ *5( h16 ":" ) h16 ] "::"              h16
-      IPV6ADDRESS9$ = subexp(subexp(subexp(H16$ + "\\:") + "{0,6}" + H16$) + "?\\:\\:"),
-          //[ *6( h16 ":" ) h16 ] "::"
-      IPV6ADDRESS$ = subexp([IPV6ADDRESS1$, IPV6ADDRESS2$, IPV6ADDRESS3$, IPV6ADDRESS4$, IPV6ADDRESS5$, IPV6ADDRESS6$, IPV6ADDRESS7$, IPV6ADDRESS8$, IPV6ADDRESS9$].join("|")),
-          ZONEID$ = subexp(subexp(UNRESERVED$$ + "|" + PCT_ENCODED$) + "+");
-          //RFC 6874, with relaxed parsing rules
-      subexp("[vV]" + HEXDIG$$ + "+\\." + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]") + "+");
-          //RFC 6874
-      subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$)) + "*");
-          var PCHAR$ = subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:\\@]"));
-          subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\@]")) + "+");
-          subexp(subexp(PCHAR$ + "|" + merge("[\\/\\?]", IPRIVATE$$)) + "*");
-      return {
-          NOT_SCHEME: new RegExp(merge("[^]", ALPHA$$, DIGIT$$, "[\\+\\-\\.]"), "g"),
-          NOT_USERINFO: new RegExp(merge("[^\\%\\:]", UNRESERVED$$, SUB_DELIMS$$), "g"),
-          NOT_HOST: new RegExp(merge("[^\\%\\[\\]\\:]", UNRESERVED$$, SUB_DELIMS$$), "g"),
-          NOT_PATH: new RegExp(merge("[^\\%\\/\\:\\@]", UNRESERVED$$, SUB_DELIMS$$), "g"),
-          NOT_PATH_NOSCHEME: new RegExp(merge("[^\\%\\/\\@]", UNRESERVED$$, SUB_DELIMS$$), "g"),
-          NOT_QUERY: new RegExp(merge("[^\\%]", UNRESERVED$$, SUB_DELIMS$$, "[\\:\\@\\/\\?]", IPRIVATE$$), "g"),
-          NOT_FRAGMENT: new RegExp(merge("[^\\%]", UNRESERVED$$, SUB_DELIMS$$, "[\\:\\@\\/\\?]"), "g"),
-          ESCAPE: new RegExp(merge("[^]", UNRESERVED$$, SUB_DELIMS$$), "g"),
-          UNRESERVED: new RegExp(UNRESERVED$$, "g"),
-          OTHER_CHARS: new RegExp(merge("[^\\%]", UNRESERVED$$, RESERVED$$), "g"),
-          PCT_ENCODED: new RegExp(PCT_ENCODED$, "g"),
-          IPV4ADDRESS: new RegExp("^(" + IPV4ADDRESS$ + ")$"),
-          IPV6ADDRESS: new RegExp("^\\[?(" + IPV6ADDRESS$ + ")" + subexp(subexp("\\%25|\\%(?!" + HEXDIG$$ + "{2})") + "(" + ZONEID$ + ")") + "?\\]?$") //RFC 6874, with relaxed parsing rules
-      };
+  var fastUri$1 = {exports: {}};
+
+  const HEX$1 = {
+    0: 0,
+    1: 1,
+    2: 2,
+    3: 3,
+    4: 4,
+    5: 5,
+    6: 6,
+    7: 7,
+    8: 8,
+    9: 9,
+    a: 10,
+    A: 10,
+    b: 11,
+    B: 11,
+    c: 12,
+    C: 12,
+    d: 13,
+    D: 13,
+    e: 14,
+    E: 14,
+    f: 15,
+    F: 15
+  };
+
+  var scopedChars = {
+    HEX: HEX$1
+  };
+
+  const { HEX } = scopedChars;
+
+  const IPV4_REG = /^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u;
+
+  function normalizeIPv4$1 (host) {
+    if (findToken(host, '.') < 3) { return { host, isIPV4: false } }
+    const matches = host.match(IPV4_REG) || [];
+    const [address] = matches;
+    if (address) {
+      return { host: stripLeadingZeros(address, '.'), isIPV4: true }
+    } else {
+      return { host, isIPV4: false }
+    }
   }
-  var URI_PROTOCOL = buildExps(false);
-
-  var IRI_PROTOCOL = buildExps(true);
-
-  var slicedToArray = function () {
-    function sliceIterator(arr, i) {
-      var _arr = [];
-      var _n = true;
-      var _d = false;
-      var _e = undefined;
 
-      try {
-        for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
-          _arr.push(_s.value);
+  /**
+   * @param {string[]} input
+   * @param {boolean} [keepZero=false]
+   * @returns {string|undefined}
+   */
+  function stringArrayToHexStripped (input, keepZero = false) {
+    let acc = '';
+    let strip = true;
+    for (const c of input) {
+      if (HEX[c] === undefined) return undefined
+      if (c !== '0' && strip === true) strip = false;
+      if (!strip) acc += c;
+    }
+    if (keepZero && acc.length === 0) acc = '0';
+    return acc
+  }
+
+  function getIPV6 (input) {
+    let tokenCount = 0;
+    const output = { error: false, address: '', zone: '' };
+    const address = [];
+    const buffer = [];
+    let isZone = false;
+    let endipv6Encountered = false;
+    let endIpv6 = false;
+
+    function consume () {
+      if (buffer.length) {
+        if (isZone === false) {
+          const hex = stringArrayToHexStripped(buffer);
+          if (hex !== undefined) {
+            address.push(hex);
+          } else {
+            output.error = true;
+            return false
+          }
+        }
+        buffer.length = 0;
+      }
+      return true
+    }
 
-          if (i && _arr.length === i) break;
+    for (let i = 0; i < input.length; i++) {
+      const cursor = input[i];
+      if (cursor === '[' || cursor === ']') { continue }
+      if (cursor === ':') {
+        if (endipv6Encountered === true) {
+          endIpv6 = true;
         }
-      } catch (err) {
-        _d = true;
-        _e = err;
-      } finally {
-        try {
-          if (!_n && _i["return"]) _i["return"]();
-        } finally {
-          if (_d) throw _e;
+        if (!consume()) { break }
+        tokenCount++;
+        address.push(':');
+        if (tokenCount > 7) {
+          // not valid
+          output.error = true;
+          break
         }
+        if (i - 1 >= 0 && input[i - 1] === ':') {
+          endipv6Encountered = true;
+        }
+        continue
+      } else if (cursor === '%') {
+        if (!consume()) { break }
+        // switch to zone detection
+        isZone = true;
+      } else {
+        buffer.push(cursor);
+        continue
       }
-
-      return _arr;
     }
-
-    return function (arr, i) {
-      if (Array.isArray(arr)) {
-        return arr;
-      } else if (Symbol.iterator in Object(arr)) {
-        return sliceIterator(arr, i);
+    if (buffer.length) {
+      if (isZone) {
+        output.zone = buffer.join('');
+      } else if (endIpv6) {
+        address.push(buffer.join(''));
       } else {
-        throw new TypeError("Invalid attempt to destructure non-iterable instance");
+        address.push(stringArrayToHexStripped(buffer));
       }
-    };
-  }();
-
-
-
-
-
-
-
-
-
-
-
-
+    }
+    output.address = address.join('');
+    return output
+  }
 
-  var toConsumableArray = function (arr) {
-    if (Array.isArray(arr)) {
-      for (var i = 0, arr2 = Array(arr.length); i < arr.length; i++) arr2[i] = arr[i];
+  function normalizeIPv6$1 (host) {
+    if (findToken(host, ':') < 2) { return { host, isIPV6: false } }
+    const ipv6 = getIPV6(host);
 
-      return arr2;
+    if (!ipv6.error) {
+      let newHost = ipv6.address;
+      let escapedHost = ipv6.address;
+      if (ipv6.zone) {
+        newHost += '%' + ipv6.zone;
+        escapedHost += '%25' + ipv6.zone;
+      }
+      return { host: newHost, escapedHost, isIPV6: true }
     } else {
-      return Array.from(arr);
+      return { host, isIPV6: false }
     }
-  };
-
-  /** Highest positive signed 32-bit float value */
-
-  var maxInt = 2147483647; // aka. 0x7FFFFFFF or 2^31-1
-
-  /** Bootstring parameters */
-  var base = 36;
-  var tMin = 1;
-  var tMax = 26;
-  var skew = 38;
-  var damp = 700;
-  var initialBias = 72;
-  var initialN = 128; // 0x80
-  var delimiter = '-'; // '\x2D'
-
-  /** Regular expressions */
-  var regexPunycode = /^xn--/;
-  var regexNonASCII = /[^\0-\x7E]/; // non-ASCII chars
-  var regexSeparators = /[\x2E\u3002\uFF0E\uFF61]/g; // RFC 3490 separators
-
-  /** Error messages */
-  var errors = {
-  	'overflow': 'Overflow: input needs wider integers to process',
-  	'not-basic': 'Illegal input >= 0x80 (not a basic code point)',
-  	'invalid-input': 'Invalid input'
-  };
-
-  /** Convenience shortcuts */
-  var baseMinusTMin = base - tMin;
-  var floor = Math.floor;
-  var stringFromCharCode = String.fromCharCode;
-
-  /*--------------------------------------------------------------------------*/
-
-  /**
-   * A generic error utility function.
-   * @private
-   * @param {String} type The error type.
-   * @returns {Error} Throws a `RangeError` with the applicable error message.
-   */
-  function error$1(type) {
-  	throw new RangeError(errors[type]);
   }
 
-  /**
-   * A generic `Array#map` utility function.
-   * @private
-   * @param {Array} array The array to iterate over.
-   * @param {Function} callback The function that gets called for every array
-   * item.
-   * @returns {Array} A new array of values returned by the callback function.
-   */
-  function map(array, fn) {
-  	var result = [];
-  	var length = array.length;
-  	while (length--) {
-  		result[length] = fn(array[length]);
-  	}
-  	return result;
+  function stripLeadingZeros (str, token) {
+    let out = '';
+    let skip = true;
+    const l = str.length;
+    for (let i = 0; i < l; i++) {
+      const c = str[i];
+      if (c === '0' && skip) {
+        if ((i + 1 <= l && str[i + 1] === token) || i + 1 === l) {
+          out += c;
+          skip = false;
+        }
+      } else {
+        if (c === token) {
+          skip = true;
+        } else {
+          skip = false;
+        }
+        out += c;
+      }
+    }
+    return out
   }
 
-  /**
-   * A simple `Array#map`-like wrapper to work with domain name strings or email
-   * addresses.
-   * @private
-   * @param {String} domain The domain name or email address.
-   * @param {Function} callback The function that gets called for every
-   * character.
-   * @returns {Array} A new string of characters returned by the callback
-   * function.
-   */
-  function mapDomain(string, fn) {
-  	var parts = string.split('@');
-  	var result = '';
-  	if (parts.length > 1) {
-  		// In email addresses, only the domain name should be punycoded. Leave
-  		// the local part (i.e. everything up to `@`) intact.
-  		result = parts[0] + '@';
-  		string = parts[1];
-  	}
-  	// Avoid `split(regex)` for IE8 compatibility. See #17.
-  	string = string.replace(regexSeparators, '\x2E');
-  	var labels = string.split('.');
-  	var encoded = map(labels, fn).join('.');
-  	return result + encoded;
+  function findToken (str, token) {
+    let ind = 0;
+    for (let i = 0; i < str.length; i++) {
+      if (str[i] === token) ind++;
+    }
+    return ind
+  }
+
+  const RDS1 = /^\.\.?\//u;
+  const RDS2 = /^\/\.(?:\/|$)/u;
+  const RDS3 = /^\/\.\.(?:\/|$)/u;
+  const RDS5 = /^\/?(?:.|\n)*?(?=\/|$)/u;
+
+  function removeDotSegments$1 (input) {
+    const output = [];
+
+    while (input.length) {
+      if (input.match(RDS1)) {
+        input = input.replace(RDS1, '');
+      } else if (input.match(RDS2)) {
+        input = input.replace(RDS2, '/');
+      } else if (input.match(RDS3)) {
+        input = input.replace(RDS3, '/');
+        output.pop();
+      } else if (input === '.' || input === '..') {
+        input = '';
+      } else {
+        const im = input.match(RDS5);
+        if (im) {
+          const s = im[0];
+          input = input.slice(s.length);
+          output.push(s);
+        } else {
+          throw new Error('Unexpected dot segment condition')
+        }
+      }
+    }
+    return output.join('')
   }
 
-  /**
-   * Creates an array containing the numeric code points of each Unicode
-   * character in the string. While JavaScript uses UCS-2 internally,
-   * this function will convert a pair of surrogate halves (each of which
-   * UCS-2 exposes as separate characters) into a single code point,
-   * matching UTF-16.
-   * @see `punycode.ucs2.encode`
-   * @see <https://mathiasbynens.be/notes/javascript-encoding>
-   * @memberOf punycode.ucs2
-   * @name decode
-   * @param {String} string The Unicode input string (UCS-2).
-   * @returns {Array} The new array of code points.
-   */
-  function ucs2decode(string) {
-  	var output = [];
-  	var counter = 0;
-  	var length = string.length;
-  	while (counter < length) {
-  		var value = string.charCodeAt(counter++);
-  		if (value >= 0xD800 && value <= 0xDBFF && counter < length) {
-  			// It's a high surrogate, and there is a next character.
-  			var extra = string.charCodeAt(counter++);
-  			if ((extra & 0xFC00) == 0xDC00) {
-  				// Low surrogate.
-  				output.push(((value & 0x3FF) << 10) + (extra & 0x3FF) + 0x10000);
-  			} else {
-  				// It's an unmatched surrogate; only append this code unit, in case the
-  				// next code unit is the high surrogate of a surrogate pair.
-  				output.push(value);
-  				counter--;
-  			}
-  		} else {
-  			output.push(value);
-  		}
-  	}
-  	return output;
+  function normalizeComponentEncoding$1 (components, esc) {
+    const func = esc !== true ? escape : unescape;
+    if (components.scheme !== undefined) {
+      components.scheme = func(components.scheme);
+    }
+    if (components.userinfo !== undefined) {
+      components.userinfo = func(components.userinfo);
+    }
+    if (components.host !== undefined) {
+      components.host = func(components.host);
+    }
+    if (components.path !== undefined) {
+      components.path = func(components.path);
+    }
+    if (components.query !== undefined) {
+      components.query = func(components.query);
+    }
+    if (components.fragment !== undefined) {
+      components.fragment = func(components.fragment);
+    }
+    return components
   }
 
-  /**
-   * Creates a string based on an array of numeric code points.
-   * @see `punycode.ucs2.decode`
-   * @memberOf punycode.ucs2
-   * @name encode
-   * @param {Array} codePoints The array of numeric code points.
-   * @returns {String} The new Unicode string (UCS-2).
-   */
-  var ucs2encode = function ucs2encode(array) {
-  	return String.fromCodePoint.apply(String, toConsumableArray(array));
-  };
-
-  /**
-   * Converts a basic code point into a digit/integer.
-   * @see `digitToBasic()`
-   * @private
-   * @param {Number} codePoint The basic numeric code point value.
-   * @returns {Number} The numeric value of a basic code point (for use in
-   * representing integers) in the range `0` to `base - 1`, or `base` if
-   * the code point does not represent a value.
-   */
-  var basicToDigit = function basicToDigit(codePoint) {
-  	if (codePoint - 0x30 < 0x0A) {
-  		return codePoint - 0x16;
-  	}
-  	if (codePoint - 0x41 < 0x1A) {
-  		return codePoint - 0x41;
-  	}
-  	if (codePoint - 0x61 < 0x1A) {
-  		return codePoint - 0x61;
-  	}
-  	return base;
-  };
-
-  /**
-   * Converts a digit/integer into a basic code point.
-   * @see `basicToDigit()`
-   * @private
-   * @param {Number} digit The numeric value of a basic code point.
-   * @returns {Number} The basic code point whose value (when used for
-   * representing integers) is `digit`, which needs to be in the range
-   * `0` to `base - 1`. If `flag` is non-zero, the uppercase form is
-   * used; else, the lowercase form is used. The behavior is undefined
-   * if `flag` is non-zero and `digit` has no uppercase form.
-   */
-  var digitToBasic = function digitToBasic(digit, flag) {
-  	//  0..25 map to ASCII a..z or A..Z
-  	// 26..35 map to ASCII 0..9
-  	return digit + 22 + 75 * (digit < 26) - ((flag != 0) << 5);
-  };
-
-  /**
-   * Bias adaptation function as per section 3.4 of RFC 3492.
-   * https://tools.ietf.org/html/rfc3492#section-3.4
-   * @private
-   */
-  var adapt = function adapt(delta, numPoints, firstTime) {
-  	var k = 0;
-  	delta = firstTime ? floor(delta / damp) : delta >> 1;
-  	delta += floor(delta / numPoints);
-  	for (; /* no initialization */delta > baseMinusTMin * tMax >> 1; k += base) {
-  		delta = floor(delta / baseMinusTMin);
-  	}
-  	return floor(k + (baseMinusTMin + 1) * delta / (delta + skew));
-  };
+  function recomposeAuthority$1 (components) {
+    const uriTokens = [];
 
-  /**
-   * Converts a Punycode string of ASCII-only symbols to a string of Unicode
-   * symbols.
-   * @memberOf punycode
-   * @param {String} input The Punycode string of ASCII-only symbols.
-   * @returns {String} The resulting string of Unicode symbols.
-   */
-  var decode = function decode(input) {
-  	// Don't use UCS-2.
-  	var output = [];
-  	var inputLength = input.length;
-  	var i = 0;
-  	var n = initialN;
-  	var bias = initialBias;
-
-  	// Handle the basic code points: let `basic` be the number of input code
-  	// points before the last delimiter, or `0` if there is none, then copy
-  	// the first basic code points to the output.
-
-  	var basic = input.lastIndexOf(delimiter);
-  	if (basic < 0) {
-  		basic = 0;
-  	}
-
-  	for (var j = 0; j < basic; ++j) {
-  		// if it's not a basic code point
-  		if (input.charCodeAt(j) >= 0x80) {
-  			error$1('not-basic');
-  		}
-  		output.push(input.charCodeAt(j));
-  	}
-
-  	// Main decoding loop: start just after the last delimiter if any basic code
-  	// points were copied; start at the beginning otherwise.
+    if (components.userinfo !== undefined) {
+      uriTokens.push(components.userinfo);
+      uriTokens.push('@');
+    }
 
-  	for (var index = basic > 0 ? basic + 1 : 0; index < inputLength;) /* no final expression */{
+    if (components.host !== undefined) {
+      let host = unescape(components.host);
+      const ipV4res = normalizeIPv4$1(host);
 
-  		// `index` is the index of the next character to be consumed.
-  		// Decode a generalized variable-length integer into `delta`,
-  		// which gets added to `i`. The overflow checking is easier
-  		// if we increase `i` as we go, then subtract off its starting
-  		// value at the end to obtain `delta`.
-  		var oldi = i;
-  		for (var w = 1, k = base;; /* no condition */k += base) {
+      if (ipV4res.isIPV4) {
+        host = ipV4res.host;
+      } else {
+        const ipV6res = normalizeIPv6$1(ipV4res.host);
+        if (ipV6res.isIPV6 === true) {
+          host = `[${ipV6res.escapedHost}]`;
+        } else {
+          host = components.host;
+        }
+      }
+      uriTokens.push(host);
+    }
 
-  			if (index >= inputLength) {
-  				error$1('invalid-input');
-  			}
+    if (typeof components.port === 'number' || typeof components.port === 'string') {
+      uriTokens.push(':');
+      uriTokens.push(String(components.port));
+    }
 
-  			var digit = basicToDigit(input.charCodeAt(index++));
+    return uriTokens.length ? uriTokens.join('') : undefined
+  }
+  var utils = {
+    recomposeAuthority: recomposeAuthority$1,
+    normalizeComponentEncoding: normalizeComponentEncoding$1,
+    removeDotSegments: removeDotSegments$1,
+    normalizeIPv4: normalizeIPv4$1,
+    normalizeIPv6: normalizeIPv6$1,
+    stringArrayToHexStripped
+  };
 
-  			if (digit >= base || digit > floor((maxInt - i) / w)) {
-  				error$1('overflow');
-  			}
+  const UUID_REG = /^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu;
+  const URN_REG = /([\da-z][\d\-a-z]{0,31}):((?:[\w!$'()*+,\-.:;=@]|%[\da-f]{2})+)/iu;
 
-  			i += digit * w;
-  			var t = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias;
+  function isSecure (wsComponents) {
+    return typeof wsComponents.secure === 'boolean' ? wsComponents.secure : String(wsComponents.scheme).toLowerCase() === 'wss'
+  }
 
-  			if (digit < t) {
-  				break;
-  			}
+  function httpParse (components) {
+    if (!components.host) {
+      components.error = components.error || 'HTTP URIs must have a host.';
+    }
 
-  			var baseMinusT = base - t;
-  			if (w > floor(maxInt / baseMinusT)) {
-  				error$1('overflow');
-  			}
+    return components
+  }
 
-  			w *= baseMinusT;
-  		}
+  function httpSerialize (components) {
+    const secure = String(components.scheme).toLowerCase() === 'https';
 
-  		var out = output.length + 1;
-  		bias = adapt(i - oldi, out, oldi == 0);
+    // normalize the default port
+    if (components.port === (secure ? 443 : 80) || components.port === '') {
+      components.port = undefined;
+    }
 
-  		// `i` was supposed to wrap around from `out` to `0`,
-  		// incrementing `n` each time, so we'll fix that now:
-  		if (floor(i / out) > maxInt - n) {
-  			error$1('overflow');
-  		}
+    // normalize the empty path
+    if (!components.path) {
+      components.path = '/';
+    }
 
-  		n += floor(i / out);
-  		i %= out;
+    // NOTE: We do not parse query strings for HTTP URIs
+    // as WWW Form Url Encoded query strings are part of the HTML4+ spec,
+    // and not the HTTP spec.
 
-  		// Insert `n` at position `i` of the output.
-  		output.splice(i++, 0, n);
-  	}
+    return components
+  }
 
-  	return String.fromCodePoint.apply(String, output);
-  };
+  function wsParse (wsComponents) {
+  // indicate if the secure flag is set
+    wsComponents.secure = isSecure(wsComponents);
 
-  /**
-   * Converts a string of Unicode symbols (e.g. a domain name label) to a
-   * Punycode string of ASCII-only symbols.
-   * @memberOf punycode
-   * @param {String} input The string of Unicode symbols.
-   * @returns {String} The resulting Punycode string of ASCII-only symbols.
-   */
-  var encode = function encode(input) {
-  	var output = [];
+    // construct resouce name
+    wsComponents.resourceName = (wsComponents.path || '/') + (wsComponents.query ? '?' + wsComponents.query : '');
+    wsComponents.path = undefined;
+    wsComponents.query = undefined;
 
-  	// Convert the input in UCS-2 to an array of Unicode code points.
-  	input = ucs2decode(input);
+    return wsComponents
+  }
 
-  	// Cache the length.
-  	var inputLength = input.length;
+  function wsSerialize (wsComponents) {
+  // normalize the default port
+    if (wsComponents.port === (isSecure(wsComponents) ? 443 : 80) || wsComponents.port === '') {
+      wsComponents.port = undefined;
+    }
 
-  	// Initialize the state.
-  	var n = initialN;
-  	var delta = 0;
-  	var bias = initialBias;
+    // ensure scheme matches secure flag
+    if (typeof wsComponents.secure === 'boolean') {
+      wsComponents.scheme = (wsComponents.secure ? 'wss' : 'ws');
+      wsComponents.secure = undefined;
+    }
 
-  	// Handle the basic code points.
-  	var _iteratorNormalCompletion = true;
-  	var _didIteratorError = false;
-  	var _iteratorError = undefined;
+    // reconstruct path from resource name
+    if (wsComponents.resourceName) {
+      const [path, query] = wsComponents.resourceName.split('?');
+      wsComponents.path = (path && path !== '/' ? path : undefined);
+      wsComponents.query = query;
+      wsComponents.resourceName = undefined;
+    }
 
-  	try {
-  		for (var _iterator = input[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-  			var _currentValue2 = _step.value;
+    // forbid fragment component
+    wsComponents.fragment = undefined;
 
-  			if (_currentValue2 < 0x80) {
-  				output.push(stringFromCharCode(_currentValue2));
-  			}
-  		}
-  	} catch (err) {
-  		_didIteratorError = true;
-  		_iteratorError = err;
-  	} finally {
-  		try {
-  			if (!_iteratorNormalCompletion && _iterator.return) {
-  				_iterator.return();
-  			}
-  		} finally {
-  			if (_didIteratorError) {
-  				throw _iteratorError;
-  			}
-  		}
-  	}
+    return wsComponents
+  }
 
-  	var basicLength = output.length;
-  	var handledCPCount = basicLength;
+  function urnParse (urnComponents, options) {
+    if (!urnComponents.path) {
+      urnComponents.error = 'URN can not be parsed';
+      return urnComponents
+    }
+    const matches = urnComponents.path.match(URN_REG);
+    if (matches) {
+      const scheme = options.scheme || urnComponents.scheme || 'urn';
+      urnComponents.nid = matches[1].toLowerCase();
+      urnComponents.nss = matches[2];
+      const urnScheme = `${scheme}:${options.nid || urnComponents.nid}`;
+      const schemeHandler = SCHEMES$1[urnScheme];
+      urnComponents.path = undefined;
+
+      if (schemeHandler) {
+        urnComponents = schemeHandler.parse(urnComponents, options);
+      }
+    } else {
+      urnComponents.error = urnComponents.error || 'URN can not be parsed.';
+    }
 
-  	// `handledCPCount` is the number of code points that have been handled;
-  	// `basicLength` is the number of basic code points.
+    return urnComponents
+  }
 
-  	// Finish the basic string with a delimiter unless it's empty.
-  	if (basicLength) {
-  		output.push(delimiter);
-  	}
+  function urnSerialize (urnComponents, options) {
+    const scheme = options.scheme || urnComponents.scheme || 'urn';
+    const nid = urnComponents.nid.toLowerCase();
+    const urnScheme = `${scheme}:${options.nid || nid}`;
+    const schemeHandler = SCHEMES$1[urnScheme];
 
-  	// Main encoding loop:
-  	while (handledCPCount < inputLength) {
+    if (schemeHandler) {
+      urnComponents = schemeHandler.serialize(urnComponents, options);
+    }
 
-  		// All non-basic code points < n have been handled already. Find the next
-  		// larger one:
-  		var m = maxInt;
-  		var _iteratorNormalCompletion2 = true;
-  		var _didIteratorError2 = false;
-  		var _iteratorError2 = undefined;
+    const uriComponents = urnComponents;
+    const nss = urnComponents.nss;
+    uriComponents.path = `${nid || options.nid}:${nss}`;
 
-  		try {
-  			for (var _iterator2 = input[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-  				var currentValue = _step2.value;
+    options.skipEscape = true;
+    return uriComponents
+  }
 
-  				if (currentValue >= n && currentValue < m) {
-  					m = currentValue;
-  				}
-  			}
+  function urnuuidParse (urnComponents, options) {
+    const uuidComponents = urnComponents;
+    uuidComponents.uuid = uuidComponents.nss;
+    uuidComponents.nss = undefined;
 
-  			// Increase `delta` enough to advance the decoder's <n,i> state to <m,0>,
-  			// but guard against overflow.
-  		} catch (err) {
-  			_didIteratorError2 = true;
-  			_iteratorError2 = err;
-  		} finally {
-  			try {
-  				if (!_iteratorNormalCompletion2 && _iterator2.return) {
-  					_iterator2.return();
-  				}
-  			} finally {
-  				if (_didIteratorError2) {
-  					throw _iteratorError2;
-  				}
-  			}
-  		}
+    if (!options.tolerant && (!uuidComponents.uuid || !UUID_REG.test(uuidComponents.uuid))) {
+      uuidComponents.error = uuidComponents.error || 'UUID is not valid.';
+    }
 
-  		var handledCPCountPlusOne = handledCPCount + 1;
-  		if (m - n > floor((maxInt - delta) / handledCPCountPlusOne)) {
-  			error$1('overflow');
-  		}
+    return uuidComponents
+  }
 
-  		delta += (m - n) * handledCPCountPlusOne;
-  		n = m;
+  function urnuuidSerialize (uuidComponents) {
+    const urnComponents = uuidComponents;
+    // normalize UUID
+    urnComponents.nss = (uuidComponents.uuid || '').toLowerCase();
+    return urnComponents
+  }
 
-  		var _iteratorNormalCompletion3 = true;
-  		var _didIteratorError3 = false;
-  		var _iteratorError3 = undefined;
+  const http = {
+    scheme: 'http',
+    domainHost: true,
+    parse: httpParse,
+    serialize: httpSerialize
+  };
 
-  		try {
-  			for (var _iterator3 = input[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-  				var _currentValue = _step3.value;
+  const https = {
+    scheme: 'https',
+    domainHost: http.domainHost,
+    parse: httpParse,
+    serialize: httpSerialize
+  };
 
-  				if (_currentValue < n && ++delta > maxInt) {
-  					error$1('overflow');
-  				}
-  				if (_currentValue == n) {
-  					// Represent delta as a generalized variable-length integer.
-  					var q = delta;
-  					for (var k = base;; /* no condition */k += base) {
-  						var t = k <= bias ? tMin : k >= bias + tMax ? tMax : k - bias;
-  						if (q < t) {
-  							break;
-  						}
-  						var qMinusT = q - t;
-  						var baseMinusT = base - t;
-  						output.push(stringFromCharCode(digitToBasic(t + qMinusT % baseMinusT, 0)));
-  						q = floor(qMinusT / baseMinusT);
-  					}
-
-  					output.push(stringFromCharCode(digitToBasic(q, 0)));
-  					bias = adapt(delta, handledCPCountPlusOne, handledCPCount == basicLength);
-  					delta = 0;
-  					++handledCPCount;
-  				}
-  			}
-  		} catch (err) {
-  			_didIteratorError3 = true;
-  			_iteratorError3 = err;
-  		} finally {
-  			try {
-  				if (!_iteratorNormalCompletion3 && _iterator3.return) {
-  					_iterator3.return();
-  				}
-  			} finally {
-  				if (_didIteratorError3) {
-  					throw _iteratorError3;
-  				}
-  			}
-  		}
+  const ws = {
+    scheme: 'ws',
+    domainHost: true,
+    parse: wsParse,
+    serialize: wsSerialize
+  };
 
-  		++delta;
-  		++n;
-  	}
-  	return output.join('');
+  const wss = {
+    scheme: 'wss',
+    domainHost: ws.domainHost,
+    parse: ws.parse,
+    serialize: ws.serialize
   };
 
-  /**
-   * Converts a Punycode string representing a domain name or an email address
-   * to Unicode. Only the Punycoded parts of the input will be converted, i.e.
-   * it doesn't matter if you call it on a string that has already been
-   * converted to Unicode.
-   * @memberOf punycode
-   * @param {String} input The Punycoded domain name or email address to
-   * convert to Unicode.
-   * @returns {String} The Unicode representation of the given Punycode
-   * string.
-   */
-  var toUnicode = function toUnicode(input) {
-  	return mapDomain(input, function (string) {
-  		return regexPunycode.test(string) ? decode(string.slice(4).toLowerCase()) : string;
-  	});
+  const urn = {
+    scheme: 'urn',
+    parse: urnParse,
+    serialize: urnSerialize,
+    skipNormalize: true
   };
 
-  /**
-   * Converts a Unicode string representing a domain name or an email address to
-   * Punycode. Only the non-ASCII parts of the domain name will be converted,
-   * i.e. it doesn't matter if you call it with a domain that's already in
-   * ASCII.
-   * @memberOf punycode
-   * @param {String} input The domain name or email address to convert, as a
-   * Unicode string.
-   * @returns {String} The Punycode representation of the given domain name or
-   * email address.
-   */
-  var toASCII = function toASCII(input) {
-  	return mapDomain(input, function (string) {
-  		return regexNonASCII.test(string) ? 'xn--' + encode(string) : string;
-  	});
+  const urnuuid = {
+    scheme: 'urn:uuid',
+    parse: urnuuidParse,
+    serialize: urnuuidSerialize,
+    skipNormalize: true
   };
 
-  /*--------------------------------------------------------------------------*/
-
-  /** Define the public API */
-  var punycode = {
-  	/**
-    * A string representing the current Punycode.js version number.
-    * @memberOf punycode
-    * @type String
-    */
-  	'version': '2.1.0',
-  	/**
-    * An object of methods to convert from JavaScript's internal character
-    * representation (UCS-2) to Unicode code points, and back.
-    * @see <https://mathiasbynens.be/notes/javascript-encoding>
-    * @memberOf punycode
-    * @type Object
-    */
-  	'ucs2': {
-  		'decode': ucs2decode,
-  		'encode': ucs2encode
-  	},
-  	'decode': decode,
-  	'encode': encode,
-  	'toASCII': toASCII,
-  	'toUnicode': toUnicode
+  const SCHEMES$1 = {
+    http,
+    https,
+    ws,
+    wss,
+    urn,
+    'urn:uuid': urnuuid
   };
 
-  /**
-   * URI.js
-   *
-   * @fileoverview An RFC 3986 compliant, scheme extendable URI parsing/validating/resolving library for JavaScript.
-   * @author <a href="mailto:gary.court@gmail.com">Gary Court</a>
-   * @see http://github.com/garycourt/uri-js
-   */
-  /**
-   * Copyright 2011 Gary Court. All rights reserved.
-   *
-   * Redistribution and use in source and binary forms, with or without modification, are
-   * permitted provided that the following conditions are met:
-   *
-   *    1. Redistributions of source code must retain the above copyright notice, this list of
-   *       conditions and the following disclaimer.
-   *
-   *    2. Redistributions in binary form must reproduce the above copyright notice, this list
-   *       of conditions and the following disclaimer in the documentation and/or other materials
-   *       provided with the distribution.
-   *
-   * THIS SOFTWARE IS PROVIDED BY GARY COURT ``AS IS'' AND ANY EXPRESS OR IMPLIED
-   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-   * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL GARY COURT OR
-   * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-   * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-   * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-   * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-   * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-   * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-   *
-   * The views and conclusions contained in the software and documentation are those of the
-   * authors and should not be interpreted as representing official policies, either expressed
-   * or implied, of Gary Court.
-   */
-  var SCHEMES = {};
-  function pctEncChar(chr) {
-      var c = chr.charCodeAt(0);
-      var e = void 0;
-      if (c < 16) e = "%0" + c.toString(16).toUpperCase();else if (c < 128) e = "%" + c.toString(16).toUpperCase();else if (c < 2048) e = "%" + (c >> 6 | 192).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase();else e = "%" + (c >> 12 | 224).toString(16).toUpperCase() + "%" + (c >> 6 & 63 | 128).toString(16).toUpperCase() + "%" + (c & 63 | 128).toString(16).toUpperCase();
-      return e;
-  }
-  function pctDecChars(str) {
-      var newStr = "";
-      var i = 0;
-      var il = str.length;
-      while (i < il) {
-          var c = parseInt(str.substr(i + 1, 2), 16);
-          if (c < 128) {
-              newStr += String.fromCharCode(c);
-              i += 3;
-          } else if (c >= 194 && c < 224) {
-              if (il - i >= 6) {
-                  var c2 = parseInt(str.substr(i + 4, 2), 16);
-                  newStr += String.fromCharCode((c & 31) << 6 | c2 & 63);
-              } else {
-                  newStr += str.substr(i, 6);
-              }
-              i += 6;
-          } else if (c >= 224) {
-              if (il - i >= 9) {
-                  var _c = parseInt(str.substr(i + 4, 2), 16);
-                  var c3 = parseInt(str.substr(i + 7, 2), 16);
-                  newStr += String.fromCharCode((c & 15) << 12 | (_c & 63) << 6 | c3 & 63);
-              } else {
-                  newStr += str.substr(i, 9);
-              }
-              i += 9;
-          } else {
-              newStr += str.substr(i, 3);
-              i += 3;
-          }
-      }
-      return newStr;
-  }
-  function _normalizeComponentEncoding(components, protocol) {
-      function decodeUnreserved(str) {
-          var decStr = pctDecChars(str);
-          return !decStr.match(protocol.UNRESERVED) ? str : decStr;
-      }
-      if (components.scheme) components.scheme = String(components.scheme).replace(protocol.PCT_ENCODED, decodeUnreserved).toLowerCase().replace(protocol.NOT_SCHEME, "");
-      if (components.userinfo !== undefined) components.userinfo = String(components.userinfo).replace(protocol.PCT_ENCODED, decodeUnreserved).replace(protocol.NOT_USERINFO, pctEncChar).replace(protocol.PCT_ENCODED, toUpperCase);
-      if (components.host !== undefined) components.host = String(components.host).replace(protocol.PCT_ENCODED, decodeUnreserved).toLowerCase().replace(protocol.NOT_HOST, pctEncChar).replace(protocol.PCT_ENCODED, toUpperCase);
-      if (components.path !== undefined) components.path = String(components.path).replace(protocol.PCT_ENCODED, decodeUnreserved).replace(components.scheme ? protocol.NOT_PATH : protocol.NOT_PATH_NOSCHEME, pctEncChar).replace(protocol.PCT_ENCODED, toUpperCase);
-      if (components.query !== undefined) components.query = String(components.query).replace(protocol.PCT_ENCODED, decodeUnreserved).replace(protocol.NOT_QUERY, pctEncChar).replace(protocol.PCT_ENCODED, toUpperCase);
-      if (components.fragment !== undefined) components.fragment = String(components.fragment).replace(protocol.PCT_ENCODED, decodeUnreserved).replace(protocol.NOT_FRAGMENT, pctEncChar).replace(protocol.PCT_ENCODED, toUpperCase);
-      return components;
-  }
+  var schemes = SCHEMES$1;
 
-  function _stripLeadingZeros(str) {
-      return str.replace(/^0*(.*)/, "$1") || "0";
+  const { normalizeIPv6, normalizeIPv4, removeDotSegments, recomposeAuthority, normalizeComponentEncoding } = utils;
+  const SCHEMES = schemes;
+
+  function normalize (uri, options) {
+    if (typeof uri === 'string') {
+      uri = serialize(parse(uri, options), options);
+    } else if (typeof uri === 'object') {
+      uri = parse(serialize(uri, options), options);
+    }
+    return uri
   }
-  function _normalizeIPv4(host, protocol) {
-      var matches = host.match(protocol.IPV4ADDRESS) || [];
 
-      var _matches = slicedToArray(matches, 2),
-          address = _matches[1];
+  function resolve (baseURI, relativeURI, options) {
+    const schemelessOptions = Object.assign({ scheme: 'null' }, options);
+    const resolved = resolveComponents(parse(baseURI, schemelessOptions), parse(relativeURI, schemelessOptions), schemelessOptions, true);
+    return serialize(resolved, { ...schemelessOptions, skipEscape: true })
+  }
 
-      if (address) {
-          return address.split(".").map(_stripLeadingZeros).join(".");
-      } else {
-          return host;
-      }
-  }
-  function _normalizeIPv6(host, protocol) {
-      var matches = host.match(protocol.IPV6ADDRESS) || [];
-
-      var _matches2 = slicedToArray(matches, 3),
-          address = _matches2[1],
-          zone = _matches2[2];
-
-      if (address) {
-          var _address$toLowerCase$ = address.toLowerCase().split('::').reverse(),
-              _address$toLowerCase$2 = slicedToArray(_address$toLowerCase$, 2),
-              last = _address$toLowerCase$2[0],
-              first = _address$toLowerCase$2[1];
-
-          var firstFields = first ? first.split(":").map(_stripLeadingZeros) : [];
-          var lastFields = last.split(":").map(_stripLeadingZeros);
-          var isLastFieldIPv4Address = protocol.IPV4ADDRESS.test(lastFields[lastFields.length - 1]);
-          var fieldCount = isLastFieldIPv4Address ? 7 : 8;
-          var lastFieldsStart = lastFields.length - fieldCount;
-          var fields = Array(fieldCount);
-          for (var x = 0; x < fieldCount; ++x) {
-              fields[x] = firstFields[x] || lastFields[lastFieldsStart + x] || '';
-          }
-          if (isLastFieldIPv4Address) {
-              fields[fieldCount - 1] = _normalizeIPv4(fields[fieldCount - 1], protocol);
-          }
-          var allZeroFields = fields.reduce(function (acc, field, index) {
-              if (!field || field === "0") {
-                  var lastLongest = acc[acc.length - 1];
-                  if (lastLongest && lastLongest.index + lastLongest.length === index) {
-                      lastLongest.length++;
-                  } else {
-                      acc.push({ index: index, length: 1 });
-                  }
-              }
-              return acc;
-          }, []);
-          var longestZeroFields = allZeroFields.sort(function (a, b) {
-              return b.length - a.length;
-          })[0];
-          var newHost = void 0;
-          if (longestZeroFields && longestZeroFields.length > 1) {
-              var newFirst = fields.slice(0, longestZeroFields.index);
-              var newLast = fields.slice(longestZeroFields.index + longestZeroFields.length);
-              newHost = newFirst.join(":") + "::" + newLast.join(":");
-          } else {
-              newHost = fields.join(":");
-          }
-          if (zone) {
-              newHost += "%" + zone;
-          }
-          return newHost;
+  function resolveComponents (base, relative, options, skipNormalization) {
+    const target = {};
+    if (!skipNormalization) {
+      base = parse(serialize(base, options), options); // normalize base components
+      relative = parse(serialize(relative, options), options); // normalize relative components
+    }
+    options = options || {};
+
+    if (!options.tolerant && relative.scheme) {
+      target.scheme = relative.scheme;
+      // target.authority = relative.authority;
+      target.userinfo = relative.userinfo;
+      target.host = relative.host;
+      target.port = relative.port;
+      target.path = removeDotSegments(relative.path || '');
+      target.query = relative.query;
+    } else {
+      if (relative.userinfo !== undefined || relative.host !== undefined || relative.port !== undefined) {
+        // target.authority = relative.authority;
+        target.userinfo = relative.userinfo;
+        target.host = relative.host;
+        target.port = relative.port;
+        target.path = removeDotSegments(relative.path || '');
+        target.query = relative.query;
       } else {
-          return host;
-      }
-  }
-  var URI_PARSE = /^(?:([^:\/?#]+):)?(?:\/\/((?:([^\/?#@]*)@)?(\[[^\/?#\]]+\]|[^\/?#:]*)(?:\:(\d*))?))?([^?#]*)(?:\?([^#]*))?(?:#((?:.|\n|\r)*))?/i;
-  var NO_MATCH_IS_UNDEFINED = "".match(/(){0}/)[1] === undefined;
-  function parse(uriString) {
-      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-      var components = {};
-      var protocol = options.iri !== false ? IRI_PROTOCOL : URI_PROTOCOL;
-      if (options.reference === "suffix") uriString = (options.scheme ? options.scheme + ":" : "") + "//" + uriString;
-      var matches = uriString.match(URI_PARSE);
-      if (matches) {
-          if (NO_MATCH_IS_UNDEFINED) {
-              //store each component
-              components.scheme = matches[1];
-              components.userinfo = matches[3];
-              components.host = matches[4];
-              components.port = parseInt(matches[5], 10);
-              components.path = matches[6] || "";
-              components.query = matches[7];
-              components.fragment = matches[8];
-              //fix port number
-              if (isNaN(components.port)) {
-                  components.port = matches[5];
-              }
+        if (!relative.path) {
+          target.path = base.path;
+          if (relative.query !== undefined) {
+            target.query = relative.query;
           } else {
-              //IE FIX for improper RegExp matching
-              //store each component
-              components.scheme = matches[1] || undefined;
-              components.userinfo = uriString.indexOf("@") !== -1 ? matches[3] : undefined;
-              components.host = uriString.indexOf("//") !== -1 ? matches[4] : undefined;
-              components.port = parseInt(matches[5], 10);
-              components.path = matches[6] || "";
-              components.query = uriString.indexOf("?") !== -1 ? matches[7] : undefined;
-              components.fragment = uriString.indexOf("#") !== -1 ? matches[8] : undefined;
-              //fix port number
-              if (isNaN(components.port)) {
-                  components.port = uriString.match(/\/\/(?:.|\n)*\:(?:\/|\?|\#|$)/) ? matches[4] : undefined;
-              }
+            target.query = base.query;
           }
-          if (components.host) {
-              //normalize IP hosts
-              components.host = _normalizeIPv6(_normalizeIPv4(components.host, protocol), protocol);
-          }
-          //determine reference type
-          if (components.scheme === undefined && components.userinfo === undefined && components.host === undefined && components.port === undefined && !components.path && components.query === undefined) {
-              components.reference = "same-document";
-          } else if (components.scheme === undefined) {
-              components.reference = "relative";
-          } else if (components.fragment === undefined) {
-              components.reference = "absolute";
-          } else {
-              components.reference = "uri";
-          }
-          //check for reference errors
-          if (options.reference && options.reference !== "suffix" && options.reference !== components.reference) {
-              components.error = components.error || "URI is not a " + options.reference + " reference.";
-          }
-          //find scheme handler
-          var schemeHandler = SCHEMES[(options.scheme || components.scheme || "").toLowerCase()];
-          //check if scheme can't handle IRIs
-          if (!options.unicodeSupport && (!schemeHandler || !schemeHandler.unicodeSupport)) {
-              //if host component is a domain name
-              if (components.host && (options.domainHost || schemeHandler && schemeHandler.domainHost)) {
-                  //convert Unicode IDN -> ASCII IDN
-                  try {
-                      components.host = punycode.toASCII(components.host.replace(protocol.PCT_ENCODED, pctDecChars).toLowerCase());
-                  } catch (e) {
-                      components.error = components.error || "Host's domain name can not be converted to ASCII via punycode: " + e;
-                  }
-              }
-              //convert IRI -> URI
-              _normalizeComponentEncoding(components, URI_PROTOCOL);
+        } else {
+          if (relative.path.charAt(0) === '/') {
+            target.path = removeDotSegments(relative.path);
           } else {
-              //normalize encodings
-              _normalizeComponentEncoding(components, protocol);
-          }
-          //perform scheme specific parsing
-          if (schemeHandler && schemeHandler.parse) {
-              schemeHandler.parse(components, options);
+            if ((base.userinfo !== undefined || base.host !== undefined || base.port !== undefined) && !base.path) {
+              target.path = '/' + relative.path;
+            } else if (!base.path) {
+              target.path = relative.path;
+            } else {
+              target.path = base.path.slice(0, base.path.lastIndexOf('/') + 1) + relative.path;
+            }
+            target.path = removeDotSegments(target.path);
           }
-      } else {
-          components.error = components.error || "URI can not be parsed.";
+          target.query = relative.query;
+        }
+        // target.authority = base.authority;
+        target.userinfo = base.userinfo;
+        target.host = base.host;
+        target.port = base.port;
       }
-      return components;
-  }
+      target.scheme = base.scheme;
+    }
 
-  function _recomposeAuthority(components, options) {
-      var protocol = options.iri !== false ? IRI_PROTOCOL : URI_PROTOCOL;
-      var uriTokens = [];
-      if (components.userinfo !== undefined) {
-          uriTokens.push(components.userinfo);
-          uriTokens.push("@");
-      }
-      if (components.host !== undefined) {
-          //normalize IP hosts, add brackets and escape zone separator for IPv6
-          uriTokens.push(_normalizeIPv6(_normalizeIPv4(String(components.host), protocol), protocol).replace(protocol.IPV6ADDRESS, function (_, $1, $2) {
-              return "[" + $1 + ($2 ? "%25" + $2 : "") + "]";
-          }));
-      }
-      if (typeof components.port === "number" || typeof components.port === "string") {
-          uriTokens.push(":");
-          uriTokens.push(String(components.port));
-      }
-      return uriTokens.length ? uriTokens.join("") : undefined;
-  }
-
-  var RDS1 = /^\.\.?\//;
-  var RDS2 = /^\/\.(\/|$)/;
-  var RDS3 = /^\/\.\.(\/|$)/;
-  var RDS5 = /^\/?(?:.|\n)*?(?=\/|$)/;
-  function removeDotSegments(input) {
-      var output = [];
-      while (input.length) {
-          if (input.match(RDS1)) {
-              input = input.replace(RDS1, "");
-          } else if (input.match(RDS2)) {
-              input = input.replace(RDS2, "/");
-          } else if (input.match(RDS3)) {
-              input = input.replace(RDS3, "/");
-              output.pop();
-          } else if (input === "." || input === "..") {
-              input = "";
-          } else {
-              var im = input.match(RDS5);
-              if (im) {
-                  var s = im[0];
-                  input = input.slice(s.length);
-                  output.push(s);
-              } else {
-                  throw new Error("Unexpected dot segment condition");
-              }
-          }
-      }
-      return output.join("");
+    target.fragment = relative.fragment;
+
+    return target
   }
 
-  function serialize(components) {
-      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  function equal$2 (uriA, uriB, options) {
+    if (typeof uriA === 'string') {
+      uriA = unescape(uriA);
+      uriA = serialize(normalizeComponentEncoding(parse(uriA, options), true), { ...options, skipEscape: true });
+    } else if (typeof uriA === 'object') {
+      uriA = serialize(normalizeComponentEncoding(uriA, true), { ...options, skipEscape: true });
+    }
 
-      var protocol = options.iri ? IRI_PROTOCOL : URI_PROTOCOL;
-      var uriTokens = [];
-      //find scheme handler
-      var schemeHandler = SCHEMES[(options.scheme || components.scheme || "").toLowerCase()];
-      //perform scheme specific serialization
-      if (schemeHandler && schemeHandler.serialize) schemeHandler.serialize(components, options);
-      if (components.host) {
-          //if host component is an IPv6 address
-          if (protocol.IPV6ADDRESS.test(components.host)) ;
-          //TODO: normalize IPv6 address as per RFC 5952
+    if (typeof uriB === 'string') {
+      uriB = unescape(uriB);
+      uriB = serialize(normalizeComponentEncoding(parse(uriB, options), true), { ...options, skipEscape: true });
+    } else if (typeof uriB === 'object') {
+      uriB = serialize(normalizeComponentEncoding(uriB, true), { ...options, skipEscape: true });
+    }
 
-          //if host component is a domain name
-          else if (options.domainHost || schemeHandler && schemeHandler.domainHost) {
-                  //convert IDN via punycode
-                  try {
-                      components.host = !options.iri ? punycode.toASCII(components.host.replace(protocol.PCT_ENCODED, pctDecChars).toLowerCase()) : punycode.toUnicode(components.host);
-                  } catch (e) {
-                      components.error = components.error || "Host's domain name can not be converted to " + (!options.iri ? "ASCII" : "Unicode") + " via punycode: " + e;
-                  }
-              }
-      }
-      //normalize encoding
-      _normalizeComponentEncoding(components, protocol);
-      if (options.reference !== "suffix" && components.scheme) {
-          uriTokens.push(components.scheme);
-          uriTokens.push(":");
-      }
-      var authority = _recomposeAuthority(components, options);
-      if (authority !== undefined) {
-          if (options.reference !== "suffix") {
-              uriTokens.push("//");
-          }
-          uriTokens.push(authority);
-          if (components.path && components.path.charAt(0) !== "/") {
-              uriTokens.push("/");
-          }
-      }
-      if (components.path !== undefined) {
-          var s = components.path;
-          if (!options.absolutePath && (!schemeHandler || !schemeHandler.absolutePath)) {
-              s = removeDotSegments(s);
-          }
-          if (authority === undefined) {
-              s = s.replace(/^\/\//, "/%2F"); //don't allow the path to start with "//"
-          }
-          uriTokens.push(s);
-      }
-      if (components.query !== undefined) {
-          uriTokens.push("?");
-          uriTokens.push(components.query);
-      }
-      if (components.fragment !== undefined) {
-          uriTokens.push("#");
-          uriTokens.push(components.fragment);
-      }
-      return uriTokens.join(""); //merge tokens into a string
-  }
+    return uriA.toLowerCase() === uriB.toLowerCase()
+  }
+
+  function serialize (cmpts, opts) {
+    const components = {
+      host: cmpts.host,
+      scheme: cmpts.scheme,
+      userinfo: cmpts.userinfo,
+      port: cmpts.port,
+      path: cmpts.path,
+      query: cmpts.query,
+      nid: cmpts.nid,
+      nss: cmpts.nss,
+      uuid: cmpts.uuid,
+      fragment: cmpts.fragment,
+      reference: cmpts.reference,
+      resourceName: cmpts.resourceName,
+      secure: cmpts.secure,
+      error: ''
+    };
+    const options = Object.assign({}, opts);
+    const uriTokens = [];
 
-  function resolveComponents(base, relative) {
-      var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-      var skipNormalization = arguments[3];
+    // find scheme handler
+    const schemeHandler = SCHEMES[(options.scheme || components.scheme || '').toLowerCase()];
 
-      var target = {};
-      if (!skipNormalization) {
-          base = parse(serialize(base, options), options); //normalize base components
-          relative = parse(serialize(relative, options), options); //normalize relative components
-      }
-      options = options || {};
-      if (!options.tolerant && relative.scheme) {
-          target.scheme = relative.scheme;
-          //target.authority = relative.authority;
-          target.userinfo = relative.userinfo;
-          target.host = relative.host;
-          target.port = relative.port;
-          target.path = removeDotSegments(relative.path || "");
-          target.query = relative.query;
+    // perform scheme specific serialization
+    if (schemeHandler && schemeHandler.serialize) schemeHandler.serialize(components, options);
+
+    if (components.path !== undefined) {
+      if (!options.skipEscape) {
+        components.path = escape(components.path);
+
+        if (components.scheme !== undefined) {
+          components.path = components.path.split('%3A').join(':');
+        }
       } else {
-          if (relative.userinfo !== undefined || relative.host !== undefined || relative.port !== undefined) {
-              //target.authority = relative.authority;
-              target.userinfo = relative.userinfo;
-              target.host = relative.host;
-              target.port = relative.port;
-              target.path = removeDotSegments(relative.path || "");
-              target.query = relative.query;
-          } else {
-              if (!relative.path) {
-                  target.path = base.path;
-                  if (relative.query !== undefined) {
-                      target.query = relative.query;
-                  } else {
-                      target.query = base.query;
-                  }
-              } else {
-                  if (relative.path.charAt(0) === "/") {
-                      target.path = removeDotSegments(relative.path);
-                  } else {
-                      if ((base.userinfo !== undefined || base.host !== undefined || base.port !== undefined) && !base.path) {
-                          target.path = "/" + relative.path;
-                      } else if (!base.path) {
-                          target.path = relative.path;
-                      } else {
-                          target.path = base.path.slice(0, base.path.lastIndexOf("/") + 1) + relative.path;
-                      }
-                      target.path = removeDotSegments(target.path);
-                  }
-                  target.query = relative.query;
-              }
-              //target.authority = base.authority;
-              target.userinfo = base.userinfo;
-              target.host = base.host;
-              target.port = base.port;
-          }
-          target.scheme = base.scheme;
+        components.path = unescape(components.path);
       }
-      target.fragment = relative.fragment;
-      return target;
-  }
+    }
 
-  function resolve(baseURI, relativeURI, options) {
-      var schemelessOptions = assign({ scheme: 'null' }, options);
-      return serialize(resolveComponents(parse(baseURI, schemelessOptions), parse(relativeURI, schemelessOptions), schemelessOptions, true), schemelessOptions);
-  }
+    if (options.reference !== 'suffix' && components.scheme) {
+      uriTokens.push(components.scheme, ':');
+    }
 
-  function normalize(uri, options) {
-      if (typeof uri === "string") {
-          uri = serialize(parse(uri, options), options);
-      } else if (typeOf(uri) === "object") {
-          uri = parse(serialize(uri, options), options);
+    const authority = recomposeAuthority(components);
+    if (authority !== undefined) {
+      if (options.reference !== 'suffix') {
+        uriTokens.push('//');
       }
-      return uri;
-  }
 
-  function equal(uriA, uriB, options) {
-      if (typeof uriA === "string") {
-          uriA = serialize(parse(uriA, options), options);
-      } else if (typeOf(uriA) === "object") {
-          uriA = serialize(uriA, options);
+      uriTokens.push(authority);
+
+      if (components.path && components.path.charAt(0) !== '/') {
+        uriTokens.push('/');
       }
-      if (typeof uriB === "string") {
-          uriB = serialize(parse(uriB, options), options);
-      } else if (typeOf(uriB) === "object") {
-          uriB = serialize(uriB, options);
+    }
+    if (components.path !== undefined) {
+      let s = components.path;
+
+      if (!options.absolutePath && (!schemeHandler || !schemeHandler.absolutePath)) {
+        s = removeDotSegments(s);
       }
-      return uriA === uriB;
-  }
 
-  function escapeComponent(str, options) {
-      return str && str.toString().replace(!options || !options.iri ? URI_PROTOCOL.ESCAPE : IRI_PROTOCOL.ESCAPE, pctEncChar);
-  }
+      if (authority === undefined) {
+        s = s.replace(/^\/\//u, '/%2F'); // don't allow the path to start with "//"
+      }
 
-  function unescapeComponent(str, options) {
-      return str && str.toString().replace(!options || !options.iri ? URI_PROTOCOL.PCT_ENCODED : IRI_PROTOCOL.PCT_ENCODED, pctDecChars);
+      uriTokens.push(s);
+    }
+
+    if (components.query !== undefined) {
+      uriTokens.push('?', components.query);
+    }
+
+    if (components.fragment !== undefined) {
+      uriTokens.push('#', components.fragment);
+    }
+    return uriTokens.join('')
   }
 
-  var handler = {
-      scheme: "http",
-      domainHost: true,
-      parse: function parse(components, options) {
-          //report missing host
-          if (!components.host) {
-              components.error = components.error || "HTTP URIs must have a host.";
-          }
-          return components;
-      },
-      serialize: function serialize(components, options) {
-          var secure = String(components.scheme).toLowerCase() === "https";
-          //normalize the default port
-          if (components.port === (secure ? 443 : 80) || components.port === "") {
-              components.port = undefined;
-          }
-          //normalize the empty path
-          if (!components.path) {
-              components.path = "/";
-          }
-          //NOTE: We do not parse query strings for HTTP URIs
-          //as WWW Form Url Encoded query strings are part of the HTML4+ spec,
-          //and not the HTTP spec.
-          return components;
+  const hexLookUp = Array.from({ length: 127 }, (_v, k) => /[^!"$&'()*+,\-.;=_`a-z{}~]/u.test(String.fromCharCode(k)));
+
+  function nonSimpleDomain (value) {
+    let code = 0;
+    for (let i = 0, len = value.length; i < len; ++i) {
+      code = value.charCodeAt(i);
+      if (code > 126 || hexLookUp[code]) {
+        return true
       }
-  };
+    }
+    return false
+  }
 
-  var handler$1 = {
-      scheme: "https",
-      domainHost: handler.domainHost,
-      parse: handler.parse,
-      serialize: handler.serialize
-  };
+  const URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
 
-  function isSecure(wsComponents) {
-      return typeof wsComponents.secure === 'boolean' ? wsComponents.secure : String(wsComponents.scheme).toLowerCase() === "wss";
-  }
-  //RFC 6455
-  var handler$2 = {
-      scheme: "ws",
-      domainHost: true,
-      parse: function parse(components, options) {
-          var wsComponents = components;
-          //indicate if the secure flag is set
-          wsComponents.secure = isSecure(wsComponents);
-          //construct resouce name
-          wsComponents.resourceName = (wsComponents.path || '/') + (wsComponents.query ? '?' + wsComponents.query : '');
-          wsComponents.path = undefined;
-          wsComponents.query = undefined;
-          return wsComponents;
-      },
-      serialize: function serialize(wsComponents, options) {
-          //normalize the default port
-          if (wsComponents.port === (isSecure(wsComponents) ? 443 : 80) || wsComponents.port === "") {
-              wsComponents.port = undefined;
-          }
-          //ensure scheme matches secure flag
-          if (typeof wsComponents.secure === 'boolean') {
-              wsComponents.scheme = wsComponents.secure ? 'wss' : 'ws';
-              wsComponents.secure = undefined;
-          }
-          //reconstruct path from resource name
-          if (wsComponents.resourceName) {
-              var _wsComponents$resourc = wsComponents.resourceName.split('?'),
-                  _wsComponents$resourc2 = slicedToArray(_wsComponents$resourc, 2),
-                  path = _wsComponents$resourc2[0],
-                  query = _wsComponents$resourc2[1];
-
-              wsComponents.path = path && path !== '/' ? path : undefined;
-              wsComponents.query = query;
-              wsComponents.resourceName = undefined;
-          }
-          //forbid fragment component
-          wsComponents.fragment = undefined;
-          return wsComponents;
+  function parse (uri, opts) {
+    const options = Object.assign({}, opts);
+    const parsed = {
+      scheme: undefined,
+      userinfo: undefined,
+      host: '',
+      port: undefined,
+      path: '',
+      query: undefined,
+      fragment: undefined
+    };
+    const gotEncoding = uri.indexOf('%') !== -1;
+    let isIP = false;
+    if (options.reference === 'suffix') uri = (options.scheme ? options.scheme + ':' : '') + '//' + uri;
+
+    const matches = uri.match(URI_PARSE);
+
+    if (matches) {
+      // store each component
+      parsed.scheme = matches[1];
+      parsed.userinfo = matches[3];
+      parsed.host = matches[4];
+      parsed.port = parseInt(matches[5], 10);
+      parsed.path = matches[6] || '';
+      parsed.query = matches[7];
+      parsed.fragment = matches[8];
+
+      // fix port number
+      if (isNaN(parsed.port)) {
+        parsed.port = matches[5];
+      }
+      if (parsed.host) {
+        const ipv4result = normalizeIPv4(parsed.host);
+        if (ipv4result.isIPV4 === false) {
+          const ipv6result = normalizeIPv6(ipv4result.host);
+          parsed.host = ipv6result.host.toLowerCase();
+          isIP = ipv6result.isIPV6;
+        } else {
+          parsed.host = ipv4result.host;
+          isIP = true;
+        }
+      }
+      if (parsed.scheme === undefined && parsed.userinfo === undefined && parsed.host === undefined && parsed.port === undefined && parsed.query === undefined && !parsed.path) {
+        parsed.reference = 'same-document';
+      } else if (parsed.scheme === undefined) {
+        parsed.reference = 'relative';
+      } else if (parsed.fragment === undefined) {
+        parsed.reference = 'absolute';
+      } else {
+        parsed.reference = 'uri';
       }
-  };
-
-  var handler$3 = {
-      scheme: "wss",
-      domainHost: handler$2.domainHost,
-      parse: handler$2.parse,
-      serialize: handler$2.serialize
-  };
 
-  var O = {};
-  //RFC 3986
-  var UNRESERVED$$ = "[A-Za-z0-9\\-\\.\\_\\~" + ("\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF" ) + "]";
-  var HEXDIG$$ = "[0-9A-Fa-f]"; //case-insensitive
-  var PCT_ENCODED$ = subexp(subexp("%[EFef]" + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$) + "|" + subexp("%[89A-Fa-f]" + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$) + "|" + subexp("%" + HEXDIG$$ + HEXDIG$$)); //expanded
-  //RFC 5322, except these symbols as per RFC 6068: @ : / ? # [ ] & ; =
-  //const ATEXT$$ = "[A-Za-z0-9\\!\\#\\$\\%\\&\\'\\*\\+\\-\\/\\=\\?\\^\\_\\`\\{\\|\\}\\~]";
-  //const WSP$$ = "[\\x20\\x09]";
-  //const OBS_QTEXT$$ = "[\\x01-\\x08\\x0B\\x0C\\x0E-\\x1F\\x7F]";  //(%d1-8 / %d11-12 / %d14-31 / %d127)
-  //const QTEXT$$ = merge("[\\x21\\x23-\\x5B\\x5D-\\x7E]", OBS_QTEXT$$);  //%d33 / %d35-91 / %d93-126 / obs-qtext
-  //const VCHAR$$ = "[\\x21-\\x7E]";
-  //const WSP$$ = "[\\x20\\x09]";
-  //const OBS_QP$ = subexp("\\\\" + merge("[\\x00\\x0D\\x0A]", OBS_QTEXT$$));  //%d0 / CR / LF / obs-qtext
-  //const FWS$ = subexp(subexp(WSP$$ + "*" + "\\x0D\\x0A") + "?" + WSP$$ + "+");
-  //const QUOTED_PAIR$ = subexp(subexp("\\\\" + subexp(VCHAR$$ + "|" + WSP$$)) + "|" + OBS_QP$);
-  //const QUOTED_STRING$ = subexp('\\"' + subexp(FWS$ + "?" + QCONTENT$) + "*" + FWS$ + "?" + '\\"');
-  var ATEXT$$ = "[A-Za-z0-9\\!\\$\\%\\'\\*\\+\\-\\^\\_\\`\\{\\|\\}\\~]";
-  var QTEXT$$ = "[\\!\\$\\%\\'\\(\\)\\*\\+\\,\\-\\.0-9\\<\\>A-Z\\x5E-\\x7E]";
-  var VCHAR$$ = merge(QTEXT$$, "[\\\"\\\\]");
-  var SOME_DELIMS$$ = "[\\!\\$\\'\\(\\)\\*\\+\\,\\;\\:\\@]";
-  var UNRESERVED = new RegExp(UNRESERVED$$, "g");
-  var PCT_ENCODED = new RegExp(PCT_ENCODED$, "g");
-  var NOT_LOCAL_PART = new RegExp(merge("[^]", ATEXT$$, "[\\.]", '[\\"]', VCHAR$$), "g");
-  var NOT_HFNAME = new RegExp(merge("[^]", UNRESERVED$$, SOME_DELIMS$$), "g");
-  var NOT_HFVALUE = NOT_HFNAME;
-  function decodeUnreserved(str) {
-      var decStr = pctDecChars(str);
-      return !decStr.match(UNRESERVED) ? str : decStr;
-  }
-  var handler$4 = {
-      scheme: "mailto",
-      parse: function parse$$1(components, options) {
-          var mailtoComponents = components;
-          var to = mailtoComponents.to = mailtoComponents.path ? mailtoComponents.path.split(",") : [];
-          mailtoComponents.path = undefined;
-          if (mailtoComponents.query) {
-              var unknownHeaders = false;
-              var headers = {};
-              var hfields = mailtoComponents.query.split("&");
-              for (var x = 0, xl = hfields.length; x < xl; ++x) {
-                  var hfield = hfields[x].split("=");
-                  switch (hfield[0]) {
-                      case "to":
-                          var toAddrs = hfield[1].split(",");
-                          for (var _x = 0, _xl = toAddrs.length; _x < _xl; ++_x) {
-                              to.push(toAddrs[_x]);
-                          }
-                          break;
-                      case "subject":
-                          mailtoComponents.subject = unescapeComponent(hfield[1], options);
-                          break;
-                      case "body":
-                          mailtoComponents.body = unescapeComponent(hfield[1], options);
-                          break;
-                      default:
-                          unknownHeaders = true;
-                          headers[unescapeComponent(hfield[0], options)] = unescapeComponent(hfield[1], options);
-                          break;
-                  }
-              }
-              if (unknownHeaders) mailtoComponents.headers = headers;
-          }
-          mailtoComponents.query = undefined;
-          for (var _x2 = 0, _xl2 = to.length; _x2 < _xl2; ++_x2) {
-              var addr = to[_x2].split("@");
-              addr[0] = unescapeComponent(addr[0]);
-              if (!options.unicodeSupport) {
-                  //convert Unicode IDN -> ASCII IDN
-                  try {
-                      addr[1] = punycode.toASCII(unescapeComponent(addr[1], options).toLowerCase());
-                  } catch (e) {
-                      mailtoComponents.error = mailtoComponents.error || "Email address's domain name can not be converted to ASCII via punycode: " + e;
-                  }
-              } else {
-                  addr[1] = unescapeComponent(addr[1], options).toLowerCase();
-              }
-              to[_x2] = addr.join("@");
-          }
-          return mailtoComponents;
-      },
-      serialize: function serialize$$1(mailtoComponents, options) {
-          var components = mailtoComponents;
-          var to = toArray(mailtoComponents.to);
-          if (to) {
-              for (var x = 0, xl = to.length; x < xl; ++x) {
-                  var toAddr = String(to[x]);
-                  var atIdx = toAddr.lastIndexOf("@");
-                  var localPart = toAddr.slice(0, atIdx).replace(PCT_ENCODED, decodeUnreserved).replace(PCT_ENCODED, toUpperCase).replace(NOT_LOCAL_PART, pctEncChar);
-                  var domain = toAddr.slice(atIdx + 1);
-                  //convert IDN via punycode
-                  try {
-                      domain = !options.iri ? punycode.toASCII(unescapeComponent(domain, options).toLowerCase()) : punycode.toUnicode(domain);
-                  } catch (e) {
-                      components.error = components.error || "Email address's domain name can not be converted to " + (!options.iri ? "ASCII" : "Unicode") + " via punycode: " + e;
-                  }
-                  to[x] = localPart + "@" + domain;
-              }
-              components.path = to.join(",");
-          }
-          var headers = mailtoComponents.headers = mailtoComponents.headers || {};
-          if (mailtoComponents.subject) headers["subject"] = mailtoComponents.subject;
-          if (mailtoComponents.body) headers["body"] = mailtoComponents.body;
-          var fields = [];
-          for (var name in headers) {
-              if (headers[name] !== O[name]) {
-                  fields.push(name.replace(PCT_ENCODED, decodeUnreserved).replace(PCT_ENCODED, toUpperCase).replace(NOT_HFNAME, pctEncChar) + "=" + headers[name].replace(PCT_ENCODED, decodeUnreserved).replace(PCT_ENCODED, toUpperCase).replace(NOT_HFVALUE, pctEncChar));
-              }
-          }
-          if (fields.length) {
-              components.query = fields.join("&");
-          }
-          return components;
+      // check for reference errors
+      if (options.reference && options.reference !== 'suffix' && options.reference !== parsed.reference) {
+        parsed.error = parsed.error || 'URI is not a ' + options.reference + ' reference.';
       }
-  };
 
-  var URN_PARSE = /^([^\:]+)\:(.*)/;
-  //RFC 2141
-  var handler$5 = {
-      scheme: "urn",
-      parse: function parse$$1(components, options) {
-          var matches = components.path && components.path.match(URN_PARSE);
-          var urnComponents = components;
-          if (matches) {
-              var scheme = options.scheme || urnComponents.scheme || "urn";
-              var nid = matches[1].toLowerCase();
-              var nss = matches[2];
-              var urnScheme = scheme + ":" + (options.nid || nid);
-              var schemeHandler = SCHEMES[urnScheme];
-              urnComponents.nid = nid;
-              urnComponents.nss = nss;
-              urnComponents.path = undefined;
-              if (schemeHandler) {
-                  urnComponents = schemeHandler.parse(urnComponents, options);
-              }
-          } else {
-              urnComponents.error = urnComponents.error || "URN can not be parsed.";
+      // find scheme handler
+      const schemeHandler = SCHEMES[(options.scheme || parsed.scheme || '').toLowerCase()];
+
+      // check if scheme can't handle IRIs
+      if (!options.unicodeSupport && (!schemeHandler || !schemeHandler.unicodeSupport)) {
+        // if host component is a domain name
+        if (parsed.host && (options.domainHost || (schemeHandler && schemeHandler.domainHost)) && isIP === false && nonSimpleDomain(parsed.host)) {
+          // convert Unicode IDN -> ASCII IDN
+          try {
+            parsed.host = URL.domainToASCII(parsed.host.toLowerCase());
+          } catch (e) {
+            parsed.error = parsed.error || "Host's domain name can not be converted to ASCII: " + e;
           }
-          return urnComponents;
-      },
-      serialize: function serialize$$1(urnComponents, options) {
-          var scheme = options.scheme || urnComponents.scheme || "urn";
-          var nid = urnComponents.nid;
-          var urnScheme = scheme + ":" + (options.nid || nid);
-          var schemeHandler = SCHEMES[urnScheme];
-          if (schemeHandler) {
-              urnComponents = schemeHandler.serialize(urnComponents, options);
-          }
-          var uriComponents = urnComponents;
-          var nss = urnComponents.nss;
-          uriComponents.path = (nid || options.nid) + ":" + nss;
-          return uriComponents;
+        }
+        // convert IRI -> URI
       }
-  };
 
-  var UUID = /^[0-9A-Fa-f]{8}(?:\-[0-9A-Fa-f]{4}){3}\-[0-9A-Fa-f]{12}$/;
-  //RFC 4122
-  var handler$6 = {
-      scheme: "urn:uuid",
-      parse: function parse(urnComponents, options) {
-          var uuidComponents = urnComponents;
-          uuidComponents.uuid = uuidComponents.nss;
-          uuidComponents.nss = undefined;
-          if (!options.tolerant && (!uuidComponents.uuid || !uuidComponents.uuid.match(UUID))) {
-              uuidComponents.error = uuidComponents.error || "UUID is not valid.";
-          }
-          return uuidComponents;
-      },
-      serialize: function serialize(uuidComponents, options) {
-          var urnComponents = uuidComponents;
-          //normalize UUID
-          urnComponents.nss = (uuidComponents.uuid || "").toLowerCase();
-          return urnComponents;
+      if (!schemeHandler || (schemeHandler && !schemeHandler.skipNormalize)) {
+        if (gotEncoding && parsed.scheme !== undefined) {
+          parsed.scheme = unescape(parsed.scheme);
+        }
+        if (gotEncoding && parsed.host !== undefined) {
+          parsed.host = unescape(parsed.host);
+        }
+        if (parsed.path) {
+          parsed.path = escape(unescape(parsed.path));
+        }
+        if (parsed.fragment) {
+          parsed.fragment = encodeURI(decodeURIComponent(parsed.fragment));
+        }
       }
-  };
 
-  SCHEMES[handler.scheme] = handler;
-  SCHEMES[handler$1.scheme] = handler$1;
-  SCHEMES[handler$2.scheme] = handler$2;
-  SCHEMES[handler$3.scheme] = handler$3;
-  SCHEMES[handler$4.scheme] = handler$4;
-  SCHEMES[handler$5.scheme] = handler$5;
-  SCHEMES[handler$6.scheme] = handler$6;
-
-  exports.SCHEMES = SCHEMES;
-  exports.pctEncChar = pctEncChar;
-  exports.pctDecChars = pctDecChars;
-  exports.parse = parse;
-  exports.removeDotSegments = removeDotSegments;
-  exports.serialize = serialize;
-  exports.resolveComponents = resolveComponents;
-  exports.resolve = resolve;
-  exports.normalize = normalize;
-  exports.equal = equal;
-  exports.escapeComponent = escapeComponent;
-  exports.unescapeComponent = unescapeComponent;
-
-  Object.defineProperty(exports, '__esModule', { value: true });
+      // perform scheme specific parsing
+      if (schemeHandler && schemeHandler.parse) {
+        schemeHandler.parse(parsed, options);
+      }
+    } else {
+      parsed.error = parsed.error || 'URI can not be parsed.';
+    }
+    return parsed
+  }
 
-  })));
+  const fastUri = {
+    SCHEMES,
+    normalize,
+    resolve,
+    resolveComponents,
+    equal: equal$2,
+    serialize,
+    parse
+  };
 
-  }(uri_all, uri_all.exports));
+  fastUri$1.exports = fastUri;
+  fastUri$1.exports.default = fastUri;
+  fastUri$1.exports.fastUri = fastUri;
 
   Object.defineProperty(uri$1, "__esModule", { value: true });
-  const uri = uri_all.exports;
+  const uri = fastUri$1.exports;
   uri.code = 'require("ajv/dist/runtime/uri").default';
   uri$1.default = uri;
 
@@ -6488,7 +5846,7 @@
   const rules_1 = rules;
   const compile_1 = compile;
   const codegen_2 = codegen;
-  const resolve_1 = resolve$1;
+  const resolve_1 = resolve$2;
   const dataType_1 = dataType;
   const util_1 = util;
   const $dataRefSchema = require$$9;
@@ -9604,7 +8962,7 @@
       message = _theRule.message;
     var valid = true;
     if (isExpression(validator)) {
-      valid = executeExpression(validator, instance);
+      valid = _executeExpression(validator, instance);
     } else if (typeof validator === 'function') {
       valid = validator(instance);
       // eslint-disable-next-line no-eval
@@ -9768,7 +9126,7 @@
   };
   // 校验schema是否正常
   var validateSchema = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(schema) {
+    var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(schema) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -9993,7 +9351,7 @@
       },
       loadDataSource: function loadDataSource() {
         var _this3 = this;
-        return _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        return _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
           var _this3$widgetSchema, _this3$widgetSchema$u, _this3$widgetSchema$u2;
           var xhrConfig, url, params, reset, _this3$httpAdapter, _this3$httpAdapter$re, http, responseParse, remoteURL, requestParams;
           return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -10008,8 +9366,8 @@
                 _this3$httpAdapter = _this3.httpAdapter, _this3$httpAdapter$re = _this3$httpAdapter.request, http = _this3$httpAdapter$re === void 0 ? request : _this3$httpAdapter$re, responseParse = _this3$httpAdapter.responseParse;
                 _context.prev = 4;
                 _this3.loading = true;
-                remoteURL = executeExpression(url, _this3);
-                requestParams = isObj(params) ? executeExpression(params, _this3) : params;
+                remoteURL = _executeExpression(url, _this3);
+                requestParams = isObj(params) ? _executeExpression(params, _this3) : params;
                 _context.next = 10;
                 return http(remoteURL, _objectSpread2(_objectSpread2({}, reset), {}, {
                   params: requestParams,
@@ -11143,82 +10501,6 @@
 
   function _extends(){return _extends=Object.assign?Object.assign.bind():function(a){for(var b,c=1;c<arguments.length;c++)for(var d in b=arguments[c],b)Object.prototype.hasOwnProperty.call(b,d)&&(a[d]=b[d]);return a},_extends.apply(this,arguments)}var normalMerge=["attrs","props","domProps"],toArrayMerge=["class","style","directives"],functionalMerge=["on","nativeOn"],mergeJsxProps=function(a){return a.reduce(function(c,a){for(var b in a)if(!c[b])c[b]=a[b];else if(-1!==normalMerge.indexOf(b))c[b]=_extends({},c[b],a[b]);else if(-1!==toArrayMerge.indexOf(b)){var d=c[b]instanceof Array?c[b]:[c[b]],e=a[b]instanceof Array?a[b]:[a[b]];c[b]=[].concat(d,e);}else if(-1!==functionalMerge.indexOf(b)){for(var f in a[b])if(c[b][f]){var g=c[b][f]instanceof Array?c[b][f]:[c[b][f]],h=a[b][f]instanceof Array?a[b][f]:[a[b][f]];c[b][f]=[].concat(g,h);}else c[b][f]=a[b][f];}else if("hook"===b)for(var i in a[b])c[b][i]=c[b][i]?mergeFn(c[b][i],a[b][i]):a[b][i];else c[b]=a[b];return c},{})},mergeFn=function(a,b){return function(){a&&a.apply(this,arguments),b&&b.apply(this,arguments);}};var helper=mergeJsxProps;
 
-  var CommonGroupWrap = Vue__default["default"].extend({
-    name: 'CommonFieldGroupWrap',
-    inject: ['widgetTree'],
-    props: _objectSpread2(_objectSpread2({}, props), {}, {
-      // 组类型
-      type: {
-        type: String,
-        default: 'default',
-        validator: function validator(value) {
-          return ['default', 'normal', 'card'].includes(value);
-        }
-      },
-      // 是否显示组title
-      showTitle: {
-        type: Boolean,
-        default: false
-      },
-      // 是否显示border
-      border: {
-        type: Boolean,
-        default: false
-      },
-      verifiable: {
-        type: Boolean,
-        default: false
-      },
-      hideEmptyRow: {
-        type: Boolean,
-        default: false
-      },
-      description: {
-        type: String,
-        default: ''
-      },
-      tag: {
-        type: String,
-        default: 'div'
-      }
-    }),
-    data: function data() {
-      return {
-        state: {
-          // 组类型目前只支持visible
-          visible: true
-        }
-      };
-    },
-    // created() {
-    //   // 注册widget TreeNode
-    //   this.widgetTree.addWidgetNode(this.path, this, 'group');
-    // },
-    mounted: function mounted() {
-      // 更新样式
-      this.$forceUpdate();
-    },
-    // beforeDestroy() {
-    //   this.widgetTree.removeWidgetNode(this.path, this);
-    // },
-    methods: {
-      setState: function setState(key, value) {
-        if (Reflect.has(this.state, key)) {
-          this.state[key] = value;
-        } else {
-          console.warn("Group unsupported ".concat(key, " state, please check"));
-        }
-      }
-    },
-    render: function render(h) {
-      var _this$layout;
-      var groupContentStyle = _objectSpread2({}, (_this$layout = this.layout) === null || _this$layout === void 0 ? void 0 : _this$layout.container);
-      return h(this.tag, {
-        style: groupContentStyle
-      }, [this.$slots.default]);
-    }
-  });
-
   // 伪数组类型
   var KeyValueArrayWidget = Vue__default["default"].extend({
     name: 'KeyValueArrayWidget',
@@ -11269,30 +10551,30 @@
         _this$schema2,
         _this$schema2$items,
         _this = this,
-        _this$value2;
+        _this$value2,
+        _this$value3;
       var labelBtnStyle = {
         'font-size': '16px',
         color: this.disabled ? '#c4c6cc' : '#979ba5',
         cursor: this.disabled ? 'not-allowed' : 'pointer',
         display: 'inline-block'
       };
-      var theadStyle = {
-        display: this.showTableHead ? '' : 'none'
-      };
+      var properties = (_this$schema = this.schema) === null || _this$schema === void 0 ? void 0 : (_this$schema$items = _this$schema.items) === null || _this$schema$items === void 0 ? void 0 : _this$schema$items.properties;
+      var props = orderProperties(Object.keys(properties || {}), (_this$schema2 = this.schema) === null || _this$schema2 === void 0 ? void 0 : (_this$schema2$items = _this$schema2.items) === null || _this$schema2$items === void 0 ? void 0 : _this$schema2$items['ui:order']);
+      // props为空时，表示只有一个项
+      var keysLen = Object.keys(properties || {}).length;
+      var defaultCols = properties ? new Array(keysLen).fill('1fr').concat('20px').join(' ') : '1fr 20px';
+      var defaultContainerLayout = _objectSpread2({}, this.layout.container || {
+        display: 'grid',
+        gridGap: '20px',
+        'grid-template-columns': defaultCols // 默认配置
+      });
       var thStyle = {
         fontSize: '14px',
         textAlign: 'left',
         fontWeight: 'normal',
-        color: '#63656E',
-        paddingLeft: '10px',
-        paddingRight: '10px'
-      };
-      var tdStyle = {
-        paddingLeft: '10px',
-        paddingRight: '10px'
+        color: '#63656E'
       };
-      var properties = (_this$schema = this.schema) === null || _this$schema === void 0 ? void 0 : (_this$schema$items = _this$schema.items) === null || _this$schema$items === void 0 ? void 0 : _this$schema$items.properties;
-      var props = orderProperties(Object.keys(properties || {}), (_this$schema2 = this.schema) === null || _this$schema2 === void 0 ? void 0 : (_this$schema2$items = _this$schema2.items) === null || _this$schema2$items === void 0 ? void 0 : _this$schema2$items['ui:order']);
       var self = this;
       var dealSchema = function dealSchema(schema) {
         return (
@@ -11340,57 +10622,55 @@
           }
         });
       };
-      return h("table", [h("thead", {
-        "style": theadStyle
-      }, [h("tr", [props === null || props === void 0 ? void 0 : props.map(function (prop, i) {
+      return h("div", [this.showTableHead && (_this$value2 = this.value) !== null && _this$value2 !== void 0 && _this$value2.length ? h("div", {
+        "style": _objectSpread2({}, defaultContainerLayout)
+      }, [props !== null && props !== void 0 && props.length ? props.map(function (key, index) {
         var _this$schema3, _this$schema3$items, _this$columns$path;
-        var schemaItem = (_this$schema3 = _this.schema) === null || _this$schema3 === void 0 ? void 0 : (_this$schema3$items = _this$schema3.items) === null || _this$schema3$items === void 0 ? void 0 : _this$schema3$items.properties[prop];
-        var path = Path.getCurPath(_this.path, "0.".concat(prop));
-        return h("th", {
-          "style": _objectSpread2(_objectSpread2({}, thStyle), {}, {
-            paddingLeft: i > 0 ? '10px' : '0px',
+        var schemaItem = (_this$schema3 = _this.schema) === null || _this$schema3 === void 0 ? void 0 : (_this$schema3$items = _this$schema3.items) === null || _this$schema3$items === void 0 ? void 0 : _this$schema3$items.properties[key];
+        var curPath = Path.getCurPath(_this.path, "".concat(index, ".").concat(key));
+        var lastProp = curPath.split('.').pop();
+        var layoutConfig = Layout.findLayoutByProp(lastProp, _this.layout.group || []) || {};
+        var path = Path.getCurPath(_this.path, "0.".concat(key));
+        return h("div", {
+          "style": _objectSpread2(_objectSpread2(_objectSpread2({}, thStyle), (layoutConfig === null || layoutConfig === void 0 ? void 0 : layoutConfig.item) || {}), {}, {
             display: ((_this$columns$path = _this.columns[path]) === null || _this$columns$path === void 0 ? void 0 : _this$columns$path.visible) === false ? 'none' : ''
           })
         }, [schemaItem === null || schemaItem === void 0 ? void 0 : schemaItem.title]);
-      }), h("th")])]), h("tbody", [(_this$value2 = this.value) === null || _this$value2 === void 0 ? void 0 : _this$value2.map(function (_, index) {
+      }) : h("div"), h("div", {
+        "style": {
+          width: '16px'
+        }
+      })]) : null, (_this$value3 = this.value) === null || _this$value3 === void 0 ? void 0 : _this$value3.map(function (_, index) {
         var _this$schema5;
         var groupPath = Path.getCurPath(_this.path, "".concat(index));
-        return h(CommonGroupWrap, helper([{}, {
+        return h(FieldGroupWrap, helper([{}, {
           "props": _objectSpread2(_objectSpread2({}, _this.$props), {}, {
             path: groupPath,
             value: Path.getPathVal(_this.rootData, groupPath),
             schema: _this.schema.items,
-            tag: 'tr',
-            layout: _objectSpread2({}, _this.layout)
+            layout: _objectSpread2(_objectSpread2({}, _this.layout), {}, {
+              container: _objectSpread2({}, defaultContainerLayout)
+            })
           })
-        }]), [props !== null && props !== void 0 && props.length ? props.map(function (prop, i) {
-          var _this$schema4, _this$schema4$items, _this$columns$curPath;
+        }]), [props !== null && props !== void 0 && props.length ? props.map(function (prop) {
+          var _this$schema4, _this$schema4$items;
           var schemaItem = (_this$schema4 = _this.schema) === null || _this$schema4 === void 0 ? void 0 : (_this$schema4$items = _this$schema4.items) === null || _this$schema4$items === void 0 ? void 0 : _this$schema4$items.properties[prop];
           var curPath = Path.getCurPath(_this.path, "".concat(index, ".").concat(prop));
           var lastProp = curPath.split('.').pop();
           var layoutConfig = Layout.findLayoutByProp(lastProp, _this.layout.group || []) || {};
-          return h("td", {
-            "style": _objectSpread2(_objectSpread2({}, tdStyle), {}, {
-              paddingLeft: i > 0 ? '10px' : '0px',
-              display: ((_this$columns$curPath = _this.columns[curPath]) === null || _this$columns$curPath === void 0 ? void 0 : _this$columns$curPath.visible) === false ? 'none' : ''
-            })
-          }, [renderSchemaField({
+          return renderSchemaField({
             path: curPath,
             schema: dealSchema(schemaItem),
             layout: layoutConfig,
             required: Schema.isRequired(schemaItem, prop)
-          })]);
-        }) : h("td", [renderSchemaField({
+          });
+        }) : renderSchemaField({
           path: Path.getCurPath(_this.path, index),
           schema: dealSchema(((_this$schema5 = _this.schema) === null || _this$schema5 === void 0 ? void 0 : _this$schema5.items) || {}),
           layout: {},
           required: false
-        })]), h("td", {
-          "style": _objectSpread2({}, tdStyle)
-        }, [h("span", {
-          "style": _objectSpread2(_objectSpread2({}, labelBtnStyle), {}, {
-            marginBottom: '10px'
-          }),
+        }), h("span", {
+          "style": labelBtnStyle,
           "on": {
             "click": function click() {
               return _this.handleRemoveItem(index);
@@ -11398,7 +10678,7 @@
           }
         }, [h("i", {
           "class": "bk-icon icon-minus-line"
-        })])])]);
+        })])]);
       }), h("span", {
         "on": {
           "click": this.handleAddItem
@@ -11406,7 +10686,7 @@
         "style": labelBtnStyle
       }, [h("i", {
         "class": "bk-icon icon-plus-line"
-      })])])]);
+      })])]);
     }
   });
 
@@ -11706,7 +10986,7 @@
         options.fileObj.xhr = xhr;
         var formData = new FormData();
         options.data.forEach(function (item) {
-          formData.append(item.name, executeExpression(item.value, _this.$parent.$parent));
+          formData.append(item.name, _executeExpression(item.value, _this.$parent.$parent));
         });
         formData.append(options.fileName, options.fileObj.origin);
         xhr.onreadystatechange = function () {
@@ -11729,12 +11009,12 @@
           if (Array.isArray(options.header)) {
             options.header.forEach(function (head) {
               var headerKey = head.name;
-              var headerVal = executeExpression(head.value, _this.$parent.$parent);
+              var headerVal = _executeExpression(head.value, _this.$parent.$parent);
               xhr.setRequestHeader(headerKey, headerVal);
             });
           } else {
             var headerKey = options.header.name;
-            var headerVal = executeExpression(options.header.value, this.$parent.$parent);
+            var headerVal = _executeExpression(options.header.value, this.$parent.$parent);
             xhr.setRequestHeader(headerKey, headerVal);
           }
         }
@@ -11758,13 +11038,13 @@
       handleResCode: function handleResCode(res) {
         var successed = true;
         if (this.isUploadSuccessed) {
-          successed = executeExpression(this.isUploadSuccessed, this.$parent.$parent, [], {
+          successed = _executeExpression(this.isUploadSuccessed, this.$parent.$parent, [], {
             response: res
           });
         }
         if (!successed) return;
         if (this.responseHandler) {
-          var files = executeExpression(this.responseHandler, this.$parent.$parent, [], {
+          var files = _executeExpression(this.responseHandler, this.$parent.$parent, [], {
             response: res
           });
           this.$emit('input', files);
@@ -12102,7 +11382,7 @@
       },
       methods: {
         initFormData: function initFormData() {
-          this.rootData = merge(Schema.getSchemaDefaultValue(createProxy(this.schema, this)) || {}, this.value);
+          this.rootData = _merge(Schema.getSchemaDefaultValue(createProxy(this.schema, this)) || {}, this.value);
           this.emitFormValueChange(this.rootData, this.value);
         },
         emitFormValueChange: function emitFormValueChange(newValue, oldValue) {