yaml 2.0.0-0 → 2.0.0-1

package/browser/dist/{Schema-d14032c2.js → Schema-ea978338.js}

@@ -1,9 +1,118 @@
-import { e as _createForOfIteratorHelper, h as _slicedToArray, _ as _typeof, p as YAMLReferenceError, T as Type, g as YAMLSemanticError, c as _defineProperty, j as _inherits, k as _createSuper, b as _classCallCheck, n as _assertThisInitialized, a as _createClass, l as _get, m as _getPrototypeOf } from './PlainValue-6b68dc0e.js';
-import { d as YAMLMap, j as resolveMap, k as createPair, Y as YAMLSeq, l as resolveSeq, e as createNode, m as resolveString, c as stringifyString, s as strOptions, S as Scalar, n as nullOptions, a as boolOptions, i as intOptions, o as stringifyNumber, b as binaryOptions, P as Pair, t as toJSON, p as findPair } from './resolveSeq-3477c430.js';
+import { l as _inherits, m as _createSuper, b as _classCallCheck, r as _possibleConstructorReturn, a as _createClass, h as _createForOfIteratorHelper, e as _slicedToArray, n as _get, o as _getPrototypeOf, _ as _typeof, T as Type, c as _defineProperty, p as _assertThisInitialized } from './errors-2634d01a.js';
+import { P as Pair, Y as YAMLSeq, S as Scalar, d as YAMLMap, j as createPair, e as createNode, c as stringifyString, s as strOptions, n as nullOptions, a as boolOptions, i as intOptions, k as stringifyNumber, b as binaryOptions, t as toJS, l as findPair } from './stringifyNumber-d8af95b1.js';
+
+var MERGE_KEY = '<<';
+var Merge = /*#__PURE__*/function (_Pair) {
+  _inherits(Merge, _Pair);
+
+  var _super = _createSuper(Merge);
+
+  function Merge(pair) {
+    var _this;
+
+    _classCallCheck(this, Merge);
+
+    if (pair instanceof Pair) {
+      var seq = pair.value;
+
+      if (!(seq instanceof YAMLSeq)) {
+        seq = new YAMLSeq();
+        seq.items.push(pair.value);
+        seq.range = pair.value.range;
+      }
+
+      _this = _super.call(this, pair.key, seq);
+      _this.range = pair.range;
+    } else {
+      _this = _super.call(this, new Scalar(MERGE_KEY), new YAMLSeq());
+    }
+
+    _this.type = Pair.Type.MERGE_PAIR;
+    return _possibleConstructorReturn(_this);
+  } // If the value associated with a merge key is a single mapping node, each of
+  // its key/value pairs is inserted into the current mapping, unless the key
+  // already exists in it. If the value associated with the merge key is a
+  // sequence, then this sequence is expected to contain mapping nodes and each
+  // of these nodes is merged in turn according to its order in the sequence.
+  // Keys in mapping nodes earlier in the sequence override keys specified in
+  // later mapping nodes. -- http://yaml.org/type/merge.html
+
+
+  _createClass(Merge, [{
+    key: "addToJSMap",
+    value: function addToJSMap(ctx, map) {
+      var _iterator = _createForOfIteratorHelper(this.value.items),
+          _step;
+
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var source = _step.value.source;
+          if (!(source instanceof YAMLMap)) throw new Error('Merge sources must be maps');
+          var srcMap = source.toJSON(null, ctx, Map);
+
+          var _iterator2 = _createForOfIteratorHelper(srcMap),
+              _step2;
+
+          try {
+            for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+              var _step2$value = _slicedToArray(_step2.value, 2),
+                  key = _step2$value[0],
+                  value = _step2$value[1];
+
+              if (map instanceof Map) {
+                if (!map.has(key)) map.set(key, value);
+              } else if (map instanceof Set) {
+                map.add(key);
+              } else if (!Object.prototype.hasOwnProperty.call(map, key)) {
+                Object.defineProperty(map, key, {
+                  value: value,
+                  writable: true,
+                  enumerable: true,
+                  configurable: true
+                });
+              }
+            }
+          } catch (err) {
+            _iterator2.e(err);
+          } finally {
+            _iterator2.f();
+          }
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+
+      return map;
+    }
+  }, {
+    key: "toString",
+    value: function toString(ctx, onComment) {
+      var seq = this.value;
+      if (seq.items.length > 1) return _get(_getPrototypeOf(Merge.prototype), "toString", this).call(this, ctx, onComment);
+      this.value = seq.items[0];
+
+      var str = _get(_getPrototypeOf(Merge.prototype), "toString", this).call(this, ctx, onComment);
+
+      this.value = seq;
+      return str;
+    }
+  }]);
+
+  return Merge;
+}(Pair);
 
 function createMap(schema, obj, ctx) {
+  var keepUndefined = ctx.keepUndefined,
+      replacer = ctx.replacer;
   var map = new YAMLMap(schema);
 
+  var add = function add(key, value) {
+    if (typeof replacer === 'function') value = replacer.call(obj, key, value);else if (Array.isArray(replacer) && !replacer.includes(key)) return;
+    if (value !== undefined || keepUndefined) map.items.push(createPair(key, value, ctx));
+  };
+
   if (obj instanceof Map) {
     var _iterator = _createForOfIteratorHelper(obj),
         _step;
@@ -14,7 +123,7 @@ function createMap(schema, obj, ctx) {
             key = _step$value[0],
             value = _step$value[1];
 
-        map.items.push(createPair(key, value, ctx));
+        add(key, value);
       }
     } catch (err) {
       _iterator.e(err);
@@ -24,8 +133,7 @@ function createMap(schema, obj, ctx) {
   } else if (obj && _typeof(obj) === 'object') {
     for (var _i = 0, _Object$keys = Object.keys(obj); _i < _Object$keys.length; _i++) {
       var _key = _Object$keys[_i];
-      var _value = obj[_key];
-      if (_value !== undefined) map.items.push(createPair(_key, _value, ctx));
+      add(_key, obj[_key]);
     }
   }
 
@@ -41,19 +149,30 @@ var map = {
   default: true,
   nodeClass: YAMLMap,
   tag: 'tag:yaml.org,2002:map',
-  resolve: resolveMap
+  resolve: function resolve(map) {
+    return map;
+  }
 };
 
 function createSeq(schema, obj, ctx) {
+  var replacer = ctx.replacer;
   var seq = new YAMLSeq(schema);
 
   if (obj && obj[Symbol.iterator]) {
+    var i = 0;
+
     var _iterator = _createForOfIteratorHelper(obj),
         _step;
 
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var it = _step.value;
+
+        if (typeof replacer === 'function') {
+          var key = obj instanceof Set ? it : String(i++);
+          it = replacer.call(obj, key, it);
+        }
+
         seq.items.push(createNode(it, null, ctx));
       }
     } catch (err) {
@@ -71,7 +190,9 @@ var seq = {
   default: true,
   nodeClass: YAMLSeq,
   tag: 'tag:yaml.org,2002:seq',
-  resolve: resolveSeq
+  resolve: function resolve(seq) {
+    return seq;
+  }
 };
 
 var string = {
@@ -80,7 +201,9 @@ var string = {
   },
   default: true,
   tag: 'tag:yaml.org,2002:str',
-  resolve: resolveString,
+  resolve: function resolve(str) {
+    return str;
+  },
   stringify: function stringify(item, ctx, onComment, onChompKeep) {
     ctx = Object.assign({
       actualString: true
@@ -98,8 +221,8 @@ var intIdentify = function intIdentify(value) {
   return typeof value === 'bigint' || Number.isInteger(value);
 };
 
-var intResolve = function intResolve(src, part, radix) {
-  return intOptions.asBigInt ? BigInt(src) : parseInt(part, radix);
+var intResolve = function intResolve(src, offset, radix) {
+  return intOptions.asBigInt ? BigInt(src) : parseInt(src.substring(offset), radix);
 };
 
 function intStringify(node, radix, prefix) {
@@ -118,12 +241,15 @@ var nullObj = {
   default: true,
   tag: 'tag:yaml.org,2002:null',
   test: /^(?:~|[Nn]ull|NULL)?$/,
-  resolve: function resolve() {
-    return null;
+  resolve: function resolve(str) {
+    var node = new Scalar(null);
+    node.sourceStr = str;
+    return node;
   },
   options: nullOptions,
-  stringify: function stringify() {
-    return nullOptions.nullStr;
+  stringify: function stringify(_ref) {
+    var sourceStr = _ref.sourceStr;
+    return sourceStr !== null && sourceStr !== void 0 ? sourceStr : nullOptions.nullStr;
   }
 };
 var boolObj = {
@@ -137,8 +263,8 @@ var boolObj = {
     return str[0] === 't' || str[0] === 'T';
   },
   options: boolOptions,
-  stringify: function stringify(_ref) {
-    var value = _ref.value;
+  stringify: function stringify(_ref2) {
+    var value = _ref2.value;
     return value ? boolOptions.trueStr : boolOptions.falseStr;
   }
 };
@@ -149,9 +275,9 @@ var octObj = {
   default: true,
   tag: 'tag:yaml.org,2002:int',
   format: 'OCT',
-  test: /^0o([0-7]+)$/,
-  resolve: function resolve(str, oct) {
-    return intResolve(str, oct, 8);
+  test: /^0o[0-7]+$/,
+  resolve: function resolve(str) {
+    return intResolve(str, 2, 8);
   },
   options: intOptions,
   stringify: function stringify(node) {
@@ -164,7 +290,7 @@ var intObj = {
   tag: 'tag:yaml.org,2002:int',
   test: /^[-+]?[0-9]+$/,
   resolve: function resolve(str) {
-    return intResolve(str, str, 10);
+    return intResolve(str, 0, 10);
   },
   options: intOptions,
   stringify: stringifyNumber
@@ -176,9 +302,9 @@ var hexObj = {
   default: true,
   tag: 'tag:yaml.org,2002:int',
   format: 'HEX',
-  test: /^0x([0-9a-fA-F]+)$/,
-  resolve: function resolve(str, hex) {
-    return intResolve(str, hex, 16);
+  test: /^0x[0-9a-fA-F]+$/,
+  resolve: function resolve(str) {
+    return intResolve(str, 2, 16);
   },
   options: intOptions,
   stringify: function stringify(node) {
@@ -191,9 +317,9 @@ var nanObj = {
   },
   default: true,
   tag: 'tag:yaml.org,2002:float',
-  test: /^(?:[-+]?\.inf|(\.nan))$/i,
-  resolve: function resolve(str, nan) {
-    return nan ? NaN : str[0] === '-' ? Number.NEGATIVE_INFINITY : Number.POSITIVE_INFINITY;
+  test: /^(?:[-+]?\.(?:inf|Inf|INF|nan|NaN|NAN))$/,
+  resolve: function resolve(str) {
+    return str.slice(-3).toLowerCase() === 'nan' ? NaN : str[0] === '-' ? Number.NEGATIVE_INFINITY : Number.POSITIVE_INFINITY;
   },
   stringify: stringifyNumber
 };
@@ -208,8 +334,8 @@ var expObj = {
   resolve: function resolve(str) {
     return parseFloat(str);
   },
-  stringify: function stringify(_ref2) {
-    var value = _ref2.value;
+  stringify: function stringify(_ref3) {
+    var value = _ref3.value;
     return Number(value).toExponential();
   }
 };
@@ -219,11 +345,11 @@ var floatObj = {
   },
   default: true,
   tag: 'tag:yaml.org,2002:float',
-  test: /^[-+]?(?:\.([0-9]+)|[0-9]+\.([0-9]*))$/,
-  resolve: function resolve(str, frac1, frac2) {
-    var frac = frac1 || frac2;
+  test: /^[-+]?(?:\.[0-9]+|[0-9]+\.[0-9]*)$/,
+  resolve: function resolve(str) {
     var node = new Scalar(parseFloat(str));
-    if (frac && frac[frac.length - 1] === '0') node.minFractionDigits = frac.length;
+    var dot = str.indexOf('.');
+    if (dot !== -1 && str[str.length - 1] === '0') node.minFractionDigits = str.length - dot - 1;
     return node;
   },
   stringify: stringifyNumber
@@ -247,7 +373,9 @@ var json = [map, seq, {
   },
   default: true,
   tag: 'tag:yaml.org,2002:str',
-  resolve: resolveString,
+  resolve: function resolve(str) {
+    return str;
+  },
   stringify: stringifyJSON
 }, {
   identify: function identify(value) {
@@ -297,12 +425,15 @@ var json = [map, seq, {
     return parseFloat(str);
   },
   stringify: stringifyJSON
+}, {
+  default: true,
+  test: /^/,
+  resolve: function resolve(str, onError) {
+    onError("Unresolved plain scalar ".concat(JSON.stringify(str)));
+    return str;
+  }
 }];
 
-json.scalarFallback = function (str) {
-  throw new SyntaxError("Unresolved plain scalar ".concat(JSON.stringify(str)));
-};
-
 /* global atob, btoa, Buffer */
 var binary = {
   identify: function identify(value) {
@@ -320,9 +451,7 @@ var binary = {
    *   const blob = new Blob([buffer], { type: 'image/jpeg' })
    *   document.querySelector('#photo').src = URL.createObjectURL(blob)
    */
-  resolve: function resolve(doc, node) {
-    var src = resolveString(doc, node);
-
+  resolve: function resolve(src, onError) {
     if (typeof Buffer === 'function') {
       return Buffer.from(src, 'base64');
     } else if (typeof atob === 'function') {
@@ -336,9 +465,8 @@ var binary = {
 
       return buffer;
     } else {
-      var msg = 'This environment does not support reading binary tags; either Buffer or atob is required';
-      doc.errors.push(new YAMLReferenceError(node, msg));
-      return null;
+      onError('This environment does not support reading binary tags; either Buffer or atob is required');
+      return src;
     }
   },
   options: binaryOptions,
@@ -386,30 +514,28 @@ var binary = {
   }
 };
 
-function parsePairs(doc, cst) {
-  var seq = resolveSeq(doc, cst);
-
-  for (var i = 0; i < seq.items.length; ++i) {
-    var item = seq.items[i];
-    if (item instanceof Pair) continue;else if (item instanceof YAMLMap) {
-      if (item.items.length > 1) {
-        var msg = 'Each pair must have its own sequence indicator';
-        throw new YAMLSemanticError(cst, msg);
+function parsePairs(seq, onError) {
+  if (seq instanceof YAMLSeq) {
+    for (var i = 0; i < seq.items.length; ++i) {
+      var item = seq.items[i];
+      if (item instanceof Pair) continue;else if (item instanceof YAMLMap) {
+        if (item.items.length > 1) onError('Each pair must have its own sequence indicator');
+        var pair = item.items[0] || new Pair();
+        if (item.commentBefore) pair.commentBefore = pair.commentBefore ? "".concat(item.commentBefore, "\n").concat(pair.commentBefore) : item.commentBefore;
+        if (item.comment) pair.comment = pair.comment ? "".concat(item.comment, "\n").concat(pair.comment) : item.comment;
+        item = pair;
       }
-
-      var pair = item.items[0] || new Pair();
-      if (item.commentBefore) pair.commentBefore = pair.commentBefore ? "".concat(item.commentBefore, "\n").concat(pair.commentBefore) : item.commentBefore;
-      if (item.comment) pair.comment = pair.comment ? "".concat(item.comment, "\n").concat(pair.comment) : item.comment;
-      item = pair;
+      seq.items[i] = item instanceof Pair ? item : new Pair(item);
     }
-    seq.items[i] = item instanceof Pair ? item : new Pair(item);
-  }
+  } else onError('Expected a sequence for this tag');
 
   return seq;
 }
 function createPairs(schema, iterable, ctx) {
+  var replacer = ctx.replacer;
   var pairs = new YAMLSeq(schema);
   pairs.tag = 'tag:yaml.org,2002:pairs';
+  var i = 0;
 
   var _iterator = _createForOfIteratorHelper(iterable),
       _step;
@@ -417,6 +543,7 @@ function createPairs(schema, iterable, ctx) {
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var it = _step.value;
+      if (typeof replacer === 'function') it = replacer.call(iterable, String(i++), it);
       var key = void 0,
           value = void 0;
 
@@ -481,7 +608,7 @@ var YAMLOMap = /*#__PURE__*/function (_YAMLSeq) {
 
   _createClass(YAMLOMap, [{
     key: "toJSON",
-    value: function toJSON$1(_, ctx) {
+    value: function toJSON(_, ctx) {
       var map = new Map();
       if (ctx && ctx.onCreate) ctx.onCreate(map);
 
@@ -495,10 +622,10 @@ var YAMLOMap = /*#__PURE__*/function (_YAMLSeq) {
               value = void 0;
 
           if (pair instanceof Pair) {
-            key = toJSON(pair.key, '', ctx);
-            value = toJSON(pair.value, key, ctx);
+            key = toJS(pair.key, '', ctx);
+            value = toJS(pair.value, key, ctx);
           } else {
-            key = toJSON(pair, '', ctx);
+            key = toJS(pair, '', ctx);
           }
 
           if (map.has(key)) throw new Error('Ordered maps must not include duplicate keys');
@@ -519,8 +646,8 @@ var YAMLOMap = /*#__PURE__*/function (_YAMLSeq) {
 
 _defineProperty(YAMLOMap, "tag", 'tag:yaml.org,2002:omap');
 
-function parseOMap(doc, cst) {
-  var pairs = parsePairs(doc, cst);
+function parseOMap(seq, onError) {
+  var pairs = parsePairs(seq, onError);
   var seenKeys = [];
 
   var _iterator2 = _createForOfIteratorHelper(pairs.items),
@@ -532,8 +659,7 @@ function parseOMap(doc, cst) {
 
       if (key instanceof Scalar) {
         if (seenKeys.includes(key.value)) {
-          var msg = 'Ordered maps must not include duplicate keys';
-          throw new YAMLSemanticError(cst, msg);
+          onError("Ordered maps must not include duplicate keys: ".concat(key.value));
         } else {
           seenKeys.push(key.value);
         }
@@ -571,12 +697,12 @@ var YAMLSet = /*#__PURE__*/function (_YAMLMap) {
 
   var _super = _createSuper(YAMLSet);
 
-  function YAMLSet() {
+  function YAMLSet(schema) {
     var _this;
 
     _classCallCheck(this, YAMLSet);
 
-    _this = _super.call(this);
+    _this = _super.call(this, schema);
     _this.tag = YAMLSet.tag;
     return _this;
   }
@@ -624,14 +750,17 @@ var YAMLSet = /*#__PURE__*/function (_YAMLMap) {
 
 _defineProperty(YAMLSet, "tag", 'tag:yaml.org,2002:set');
 
-function parseSet(doc, cst) {
-  var map = resolveMap(doc, cst);
-  if (!map.hasAllNullValues()) throw new YAMLSemanticError(cst, 'Set items must all have null values');
-  return Object.assign(new YAMLSet(), map);
+function parseSet(map, onError) {
+  if (map instanceof YAMLMap) {
+    if (map.hasAllNullValues()) return Object.assign(new YAMLSet(), map);else onError('Set items must all have null values');
+  } else onError('Expected a mapping for this tag');
+
+  return map;
 }
 
 function createSet(schema, iterable, ctx) {
-  var set = new YAMLSet();
+  var replacer = ctx.replacer;
+  var set = new YAMLSet(schema);
 
   var _iterator = _createForOfIteratorHelper(iterable),
       _step;
@@ -639,6 +768,7 @@ function createSet(schema, iterable, ctx) {
   try {
     for (_iterator.s(); !(_step = _iterator.n()).done;) {
       var value = _step.value;
+      if (typeof replacer === 'function') value = replacer.call(iterable, value, value);
       set.items.push(createPair(value, null, ctx));
     }
   } catch (err) {
@@ -661,34 +791,50 @@ var set = {
   createNode: createSet
 };
 
-var parseSexagesimal = function parseSexagesimal(sign, parts) {
-  var n = parts.split(':').reduce(function (n, p) {
-    return n * 60 + Number(p);
-  }, 0);
-  return sign === '-' ? -n : n;
+var parseSexagesimal = function parseSexagesimal(str, isInt) {
+  var sign = str[0];
+  var parts = sign === '-' || sign === '+' ? str.substring(1) : str;
+
+  var num = function num(n) {
+    return isInt && intOptions.asBigInt ? BigInt(n) : Number(n);
+  };
+
+  var res = parts.replace(/_/g, '').split(':').reduce(function (res, p) {
+    return res * num(60) + num(p);
+  }, num(0));
+  return sign === '-' ? num(-1) * res : res;
 }; // hhhh:mm:ss.sss
 
 
 var stringifySexagesimal = function stringifySexagesimal(_ref) {
   var value = _ref.value;
-  if (isNaN(value) || !isFinite(value)) return stringifyNumber(value);
+
+  var num = function num(n) {
+    return n;
+  };
+
+  if (typeof value === 'bigint') num = function num(n) {
+    return BigInt(n);
+  };else if (isNaN(value) || !isFinite(value)) return stringifyNumber(value);
   var sign = '';
 
   if (value < 0) {
     sign = '-';
-    value = Math.abs(value);
+    value *= num(-1);
   }
 
-  var parts = [value % 60]; // seconds, including ms
+  var _60 = num(60);
+
+  var parts = [value % _60]; // seconds, including ms
 
   if (value < 60) {
     parts.unshift(0); // at least one : is required
   } else {
-    value = Math.round((value - parts[0]) / 60);
-    parts.unshift(value % 60); // minutes
+    value = (value - parts[0]) / _60;
+    parts.unshift(value % _60); // minutes
 
     if (value >= 60) {
-      value = Math.round((value - parts[0]) / 60);
+      value = (value - parts[0]) / _60;
       parts.unshift(value); // hours
     }
   }
@@ -701,14 +847,14 @@ var stringifySexagesimal = function stringifySexagesimal(_ref) {
 
 var intTime = {
   identify: function identify(value) {
-    return typeof value === 'number';
+    return typeof value === 'bigint' || Number.isInteger(value);
   },
   default: true,
   tag: 'tag:yaml.org,2002:int',
   format: 'TIME',
-  test: /^([-+]?)([0-9][0-9_]*(?::[0-5]?[0-9])+)$/,
-  resolve: function resolve(str, sign, parts) {
-    return parseSexagesimal(sign, parts.replace(/_/g, ''));
+  test: /^[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+$/,
+  resolve: function resolve(str) {
+    return parseSexagesimal(str, true);
   },
   stringify: stringifySexagesimal
 };
@@ -719,9 +865,9 @@ var floatTime = {
   default: true,
   tag: 'tag:yaml.org,2002:float',
   format: 'TIME',
-  test: /^([-+]?)([0-9][0-9_]*(?::[0-5]?[0-9])+\.[0-9_]*)$/,
-  resolve: function resolve(str, sign, parts) {
-    return parseSexagesimal(sign, parts.replace(/_/g, ''));
+  test: /^[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+\.[0-9_]*$/,
+  resolve: function resolve(str) {
+    return parseSexagesimal(str, false);
   },
   stringify: stringifySexagesimal
 };
@@ -734,17 +880,29 @@ var timestamp = {
   // If the time zone is omitted, the timestamp is assumed to be specified in UTC. The time part
   // may be omitted altogether, resulting in a date format. In such a case, the time part is
   // assumed to be 00:00:00Z (start of day, UTC).
-  test: RegExp('^(?:' + '([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})' + // YYYY-Mm-Dd
-  '(?:(?:t|T|[ \\t]+)' + // t | T | whitespace
+  test: RegExp('^([0-9]{4})-([0-9]{1,2})-([0-9]{1,2})' + // YYYY-Mm-Dd
+  '(?:' + // time is optional
+  '(?:t|T|[ \\t]+)' + // t | T | whitespace
   '([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2}(\\.[0-9]+)?)' + // Hh:Mm:Ss(.ss)?
   '(?:[ \\t]*(Z|[-+][012]?[0-9](?::[0-9]{2})?))?' + // Z | +5 | -03:30
-  ')?' + ')$'),
-  resolve: function resolve(str, year, month, day, hour, minute, second, millisec, tz) {
+  ')?$'),
+  resolve: function resolve(str) {
+    var _str$match = str.match(timestamp.test),
+        _str$match2 = _slicedToArray(_str$match, 9),
+        year = _str$match2[1],
+        month = _str$match2[2],
+        day = _str$match2[3],
+        hour = _str$match2[4],
+        minute = _str$match2[5],
+        second = _str$match2[6],
+        millisec = _str$match2[7],
+        tz = _str$match2[8];
+
     if (millisec) millisec = (millisec + '00').substr(1, 3);
     var date = Date.UTC(year, month - 1, day, hour || 0, minute || 0, second || 0, millisec || 0);
 
     if (tz && tz !== 'Z') {
-      var d = parseSexagesimal(tz[0], tz.slice(1));
+      var d = parseSexagesimal(tz, false);
       if (Math.abs(d) < 30) d *= 60;
       date -= 60000 * d;
     }
@@ -768,8 +926,10 @@ var intIdentify$2 = function intIdentify(value) {
   return typeof value === 'bigint' || Number.isInteger(value);
 };
 
-function intResolve$1(sign, src, radix) {
-  var str = src.replace(/_/g, '');
+function intResolve$1(str, offset, radix) {
+  var sign = str[0];
+  if (sign === '-' || sign === '+') offset += 1;
+  str = str.substring(offset).replace(/_/g, '');
 
   if (intOptions.asBigInt) {
     switch (radix) {
@@ -816,12 +976,15 @@ var yaml11 = failsafe.concat([{
   default: true,
   tag: 'tag:yaml.org,2002:null',
   test: /^(?:~|[Nn]ull|NULL)?$/,
-  resolve: function resolve() {
-    return null;
+  resolve: function resolve(str) {
+    var node = new Scalar(null);
+    node.sourceStr = str;
+    return node;
   },
   options: nullOptions,
-  stringify: function stringify() {
-    return nullOptions.nullStr;
+  stringify: function stringify(_ref2) {
+    var sourceStr = _ref2.sourceStr;
+    return sourceStr !== null && sourceStr !== void 0 ? sourceStr : nullOptions.nullStr;
   }
 }, {
   identify: function identify(value) {
@@ -841,7 +1004,7 @@ var yaml11 = failsafe.concat([{
   },
   default: true,
   tag: 'tag:yaml.org,2002:bool',
-  test: /^(?:N|n|[Nn]o|NO|[Ff]alse|FALSE|[Oo]ff|OFF)$/i,
+  test: /^(?:N|n|[Nn]o|NO|[Ff]alse|FALSE|[Oo]ff|OFF)$/,
   resolve: function resolve() {
     return false;
   },
@@ -852,9 +1015,9 @@ var yaml11 = failsafe.concat([{
   default: true,
   tag: 'tag:yaml.org,2002:int',
   format: 'BIN',
-  test: /^([-+]?)0b([0-1_]+)$/,
-  resolve: function resolve(str, sign, bin) {
-    return intResolve$1(sign, bin, 2);
+  test: /^[-+]?0b[0-1_]+$/,
+  resolve: function resolve(str) {
+    return intResolve$1(str, 2, 2);
   },
   stringify: function stringify(node) {
     return intStringify$1(node, 2, '0b');
@@ -864,9 +1027,9 @@ var yaml11 = failsafe.concat([{
   default: true,
   tag: 'tag:yaml.org,2002:int',
   format: 'OCT',
-  test: /^([-+]?)0([0-7_]+)$/,
-  resolve: function resolve(str, sign, oct) {
-    return intResolve$1(sign, oct, 8);
+  test: /^[-+]?0[0-7_]+$/,
+  resolve: function resolve(str) {
+    return intResolve$1(str, 1, 8);
   },
   stringify: function stringify(node) {
     return intStringify$1(node, 8, '0');
@@ -875,9 +1038,9 @@ var yaml11 = failsafe.concat([{
   identify: intIdentify$2,
   default: true,
   tag: 'tag:yaml.org,2002:int',
-  test: /^([-+]?)([0-9][0-9_]*)$/,
-  resolve: function resolve(str, sign, abs) {
-    return intResolve$1(sign, abs, 10);
+  test: /^[-+]?[0-9][0-9_]*$/,
+  resolve: function resolve(str) {
+    return intResolve$1(str, 0, 10);
   },
   stringify: stringifyNumber
 }, {
@@ -885,9 +1048,9 @@ var yaml11 = failsafe.concat([{
   default: true,
   tag: 'tag:yaml.org,2002:int',
   format: 'HEX',
-  test: /^([-+]?)0x([0-9a-fA-F_]+)$/,
-  resolve: function resolve(str, sign, hex) {
-    return intResolve$1(sign, hex, 16);
+  test: /^[-+]?0x[0-9a-fA-F_]+$/,
+  resolve: function resolve(str) {
+    return intResolve$1(str, 2, 16);
   },
   stringify: function stringify(node) {
     return intStringify$1(node, 16, '0x');
@@ -898,9 +1061,9 @@ var yaml11 = failsafe.concat([{
   },
   default: true,
   tag: 'tag:yaml.org,2002:float',
-  test: /^(?:[-+]?\.inf|(\.nan))$/i,
-  resolve: function resolve(str, nan) {
-    return nan ? NaN : str[0] === '-' ? Number.NEGATIVE_INFINITY : Number.POSITIVE_INFINITY;
+  test: /^[-+]?\.(?:inf|Inf|INF|nan|NaN|NAN)$/,
+  resolve: function resolve(str) {
+    return str.slice(-3).toLowerCase() === 'nan' ? NaN : str[0] === '-' ? Number.NEGATIVE_INFINITY : Number.POSITIVE_INFINITY;
   },
   stringify: stringifyNumber
 }, {
@@ -910,12 +1073,12 @@ var yaml11 = failsafe.concat([{
   default: true,
   tag: 'tag:yaml.org,2002:float',
   format: 'EXP',
-  test: /^[-+]?([0-9][0-9_]*)?(\.[0-9_]*)?[eE][-+]?[0-9]+$/,
+  test: /^[-+]?(?:[0-9][0-9_]*)?(?:\.[0-9_]*)?[eE][-+]?[0-9]+$/,
   resolve: function resolve(str) {
     return parseFloat(str.replace(/_/g, ''));
   },
-  stringify: function stringify(_ref2) {
-    var value = _ref2.value;
+  stringify: function stringify(_ref3) {
+    var value = _ref3.value;
     return Number(value).toExponential();
   }
 }, {
@@ -924,12 +1087,13 @@ var yaml11 = failsafe.concat([{
   },
   default: true,
   tag: 'tag:yaml.org,2002:float',
-  test: /^[-+]?(?:[0-9][0-9_]*)?\.([0-9_]*)$/,
-  resolve: function resolve(str, frac) {
+  test: /^[-+]?(?:[0-9][0-9_]*)?\.[0-9_]*$/,
+  resolve: function resolve(str) {
     var node = new Scalar(parseFloat(str.replace(/_/g, '')));
+    var dot = str.indexOf('.');
 
-    if (frac) {
-      var f = frac.replace(/_/g, '');
+    if (dot !== -1) {
+      var f = str.substring(dot + 1).replace(/_/g, '');
       if (f[f.length - 1] === '0') node.minFractionDigits = f.length;
     }
 
@@ -1044,4 +1208,4 @@ var Schema = function Schema(_ref) {
   this.sortMapEntries = sortMapEntries === true ? sortMapEntriesByKey : sortMapEntries || null;
 };
 
-export { Schema as S };
+export { Merge as M, Schema as S, MERGE_KEY as a };