@wiotp/sdk 0.8.2-alpha.1 → 0.8.2-alpha.2

package/dist/bundled/wiotp-bundle.js

@@ -32347,7 +32347,6 @@ function composeDoc(options, directives, _ref, onError) {
   }, options);
   var doc = new _Document.Document(undefined, opts);
   var ctx = {
-    atKey: false,
     atRoot: true,
     directives: doc.directives,
     options: doc.options,
@@ -32383,7 +32382,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.composeEmptyNode = composeEmptyNode;
 exports.composeNode = composeNode;
 var _Alias = require("../nodes/Alias.js");
-var _identity = require("../nodes/identity.js");
 var _composeCollection = require("./compose-collection.js");
 var _composeScalar = require("./compose-scalar.js");
 var _resolveEnd = require("./resolve-end.js");
@@ -32393,7 +32391,6 @@ var CN = {
   composeEmptyNode: composeEmptyNode
 };
 function composeNode(ctx, token, props, onError) {
-  var atKey = ctx.atKey;
   var spaceBefore = props.spaceBefore,
     comment = props.comment,
     anchor = props.anchor,
@@ -32427,10 +32424,6 @@ function composeNode(ctx, token, props, onError) {
       }
   }
   if (anchor && node.anchor === '') onError(anchor, 'BAD_ALIAS', 'Anchor cannot be an empty string');
-  if (atKey && ctx.options.stringKeys && (!(0, _identity.isScalar)(node) || typeof node.value !== 'string' || node.tag && node.tag !== 'tag:yaml.org,2002:str')) {
-    var msg = 'With stringKeys, all keys must be strings';
-    onError(tag !== null && tag !== void 0 ? tag : token, 'NON_STRING_KEY', msg);
-  }
   if (spaceBefore) node.spaceBefore = true;
   if (comment) {
     if (token.type === 'scalar' && token.source === '') node.comment = comment;else node.commentBefore = comment;
@@ -32478,7 +32471,7 @@ function composeAlias(_ref2, _ref3, onError) {
   return alias;
 }
 
-},{"../nodes/Alias.js":248,"../nodes/identity.js":256,"./compose-collection.js":224,"./compose-scalar.js":227,"./resolve-end.js":232,"./util-empty-scalar-position.js":237}],227:[function(require,module,exports){
+},{"../nodes/Alias.js":248,"./compose-collection.js":224,"./compose-scalar.js":227,"./resolve-end.js":232,"./util-empty-scalar-position.js":237}],227:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -32501,10 +32494,7 @@ function composeScalar(ctx, token, tagToken, onError) {
   var tagName = tagToken ? ctx.directives.tagName(tagToken.source, function (msg) {
     return onError(tagToken, 'TAG_RESOLVE_FAILED', msg);
   }) : null;
-  var tag;
-  if (ctx.options.stringKeys && ctx.atKey) {
-    tag = ctx.schema[_identity.SCALAR];
-  } else if (tagName) tag = findScalarTagByName(ctx.schema, value, tagName, tagToken, onError);else if (token.type === 'scalar') tag = findScalarTagByTest(ctx, value, token, onError);else tag = ctx.schema[_identity.SCALAR];
+  var tag = tagToken && tagName ? findScalarTagByName(ctx.schema, value, tagName, tagToken, onError) : token.type === 'scalar' ? findScalarTagByTest(ctx, value, token, onError) : ctx.schema[_identity.SCALAR];
   var scalar;
   try {
     var res = tag.resolve(value, function (msg) {
@@ -32560,12 +32550,11 @@ function findScalarTagByName(schema, value, tagName, tagToken, onError) {
   return schema[_identity.SCALAR];
 }
 function findScalarTagByTest(_ref2, value, token, onError) {
-  var atKey = _ref2.atKey,
-    directives = _ref2.directives,
+  var directives = _ref2.directives,
     schema = _ref2.schema;
   var tag = schema.tags.find(function (tag) {
     var _tag$test2;
-    return (tag["default"] === true || atKey && tag["default"] === 'key') && ((_tag$test2 = tag.test) === null || _tag$test2 === void 0 ? void 0 : _tag$test2.test(value));
+    return tag["default"] && ((_tag$test2 = tag.test) === null || _tag$test2 === void 0 ? void 0 : _tag$test2.test(value));
   }) || schema[_identity.SCALAR];
   if (schema.compat) {
     var _schema$compat$find;
@@ -32960,11 +32949,9 @@ function resolveBlockMap(_ref, ctx, bm, onError, tag) {
         onError(offset, 'BAD_INDENT', startColMsg);
       }
       // key value
-      ctx.atKey = true;
       var keyStart = keyProps.end;
       var keyNode = key ? composeNode(ctx, key, keyProps, onError) : composeEmptyNode(ctx, keyStart, start, null, keyProps, onError);
       if (ctx.schema.compat) (0, _utilFlowIndentCheck.flowIndentCheck)(bm.indent, key, onError);
-      ctx.atKey = false;
       if ((0, _utilMapIncludes.mapIncludes)(ctx, map.items, keyNode)) onError(keyStart, 'DUPLICATE_KEY', 'Map keys must be unique');
       // value properties
       var valueProps = (0, _resolveProps.resolveProps)(sep !== null && sep !== void 0 ? sep : [], {
@@ -33230,7 +33217,6 @@ function resolveBlockSeq(_ref, ctx, bs, onError, tag) {
   var NodeClass = (_tag$nodeClass = tag === null || tag === void 0 ? void 0 : tag.nodeClass) !== null && _tag$nodeClass !== void 0 ? _tag$nodeClass : _YAMLSeq.YAMLSeq;
   var seq = new NodeClass(ctx.schema);
   if (ctx.atRoot) ctx.atRoot = false;
-  if (ctx.atKey) ctx.atKey = false;
   var offset = bs.offset;
   var commentEnd = null;
   var _iterator = _createForOfIteratorHelper(bs.items),
@@ -33363,7 +33349,6 @@ function resolveFlowCollection(_ref, ctx, fc, onError, tag) {
   coll.flow = true;
   var atRoot = ctx.atRoot;
   if (atRoot) ctx.atRoot = false;
-  if (ctx.atKey) ctx.atKey = false;
   var offset = fc.offset + fc.start.source.length;
   for (var i = 0; i < fc.items.length; ++i) {
     var collItem = fc.items[i];
@@ -33439,11 +33424,9 @@ function resolveFlowCollection(_ref, ctx, fc, onError, tag) {
     } else {
       // item is a key+value pair
       // key value
-      ctx.atKey = true;
       var keyStart = props.end;
       var keyNode = key ? composeNode(ctx, key, props, onError) : composeEmptyNode(ctx, keyStart, start, null, props, onError);
       if (isBlock(key)) onError(keyNode.range, 'BLOCK_IN_FLOW', blockMsg);
-      ctx.atKey = false;
       // value properties
       var valueProps = (0, _resolveProps.resolveProps)(sep !== null && sep !== void 0 ? sep : [], {
         flow: fcName,
@@ -33496,8 +33479,6 @@ function resolveFlowCollection(_ref, ctx, fc, onError, tag) {
         var _map = new _YAMLMap.YAMLMap(ctx.schema);
         _map.flow = true;
         _map.items.push(pair);
-        var endRange = (_valueNode !== null && _valueNode !== void 0 ? _valueNode : keyNode).range;
-        _map.range = [keyNode.range[0], endRange[1], endRange[2]];
         coll.items.push(_map);
       }
       offset = _valueNode ? _valueNode.range[2] : valueProps.end;
@@ -33623,7 +33604,7 @@ function foldLines(source) {
   try {
     first = new RegExp('(.*?)(?<![ \t])[ \t]*\r?\n', 'sy');
     line = new RegExp('[ \t]*(.*?)(?:(?<![ \t])[ \t]*)?\r?\n', 'sy');
-  } catch (_unused) {
+  } catch (_) {
     first = new RegExp("([^]*?)[ \\t]*\\r?\\n", "y");
     line = new RegExp("[ \\t]*([^]*?)[ \\t]*\\r?\\n", "y");
   }
@@ -33827,7 +33808,7 @@ function resolveProps(tokens, _ref) {
           }
         case 'newline':
           if (atNewline) {
-            if (comment) comment += token.source;else if (!found || indicator !== 'seq-item-ind') spaceBefore = true;
+            if (comment) comment += token.source;else spaceBefore = true;
           } else commentSep += token.source;
           atNewline = true;
           hasNewline = true;
@@ -34042,7 +34023,7 @@ function mapIncludes(ctx, items, search) {
   var uniqueKeys = ctx.options.uniqueKeys;
   if (uniqueKeys === false) return false;
   var isEqual = typeof uniqueKeys === 'function' ? uniqueKeys : function (a, b) {
-    return a === b || (0, _identity.isScalar)(a) && (0, _identity.isScalar)(b) && a.value === b.value;
+    return a === b || (0, _identity.isScalar)(a) && (0, _identity.isScalar)(b) && a.value === b.value && !(a.value === '<<' && ctx.schema.merge);
   };
   return items.some(function (pair) {
     return isEqual(pair.key, search);
@@ -34105,7 +34086,6 @@ var Document = exports.Document = /*#__PURE__*/function () {
       logLevel: 'warn',
       prettyErrors: true,
       strict: true,
-      stringKeys: false,
       uniqueKeys: true,
       version: '1.2'
     }, options);
@@ -34347,6 +34327,7 @@ var Document = exports.Document = /*#__PURE__*/function () {
             version: '1.1'
           });
           opt = {
+            merge: true,
             resolveKnownTags: false,
             schema: 'yaml-1.1'
           };
@@ -34357,6 +34338,7 @@ var Document = exports.Document = /*#__PURE__*/function () {
             version: version
           });
           opt = {
+            merge: false,
             resolveKnownTags: true,
             schema: 'core'
           };
@@ -34449,7 +34431,7 @@ function assertCollection(contents) {
   throw new Error('Expected a YAML collection as document contents');
 }
 
-},{"../nodes/Alias.js":248,"../nodes/Collection.js":249,"../nodes/Pair.js":251,"../nodes/identity.js":256,"../nodes/toJS.js":257,"../schema/Schema.js":266,"../stringify/stringifyDocument.js":291,"./anchors.js":241,"./applyReviver.js":242,"./createNode.js":243,"./directives.js":244}],241:[function(require,module,exports){
+},{"../nodes/Alias.js":248,"../nodes/Collection.js":249,"../nodes/Pair.js":251,"../nodes/identity.js":256,"../nodes/toJS.js":257,"../schema/Schema.js":266,"../stringify/stringifyDocument.js":290,"./anchors.js":241,"./applyReviver.js":242,"./createNode.js":243,"./directives.js":244}],241:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -34525,7 +34507,7 @@ function createNodeAnchors(doc, prefix) {
   };
 }
 
-},{"../nodes/identity.js":256,"../visit.js":295}],242:[function(require,module,exports){
+},{"../nodes/identity.js":256,"../visit.js":294}],242:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -34552,7 +34534,6 @@ function applyReviver(reviver, obj, key, val) {
       for (var i = 0, len = val.length; i < len; ++i) {
         var v0 = val[i];
         var v1 = applyReviver(reviver, val, String(i), v0);
-        // eslint-disable-next-line @typescript-eslint/no-array-delete
         if (v1 === undefined) delete val[i];else if (v1 !== v0) val[i] = v1;
       }
     } else if (val instanceof Map) {
@@ -34896,7 +34877,7 @@ Directives.defaultTags = {
   '!!': 'tag:yaml.org,2002:'
 };
 
-},{"../nodes/identity.js":256,"../visit.js":295}],245:[function(require,module,exports){
+},{"../nodes/identity.js":256,"../visit.js":294}],245:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -35183,7 +35164,8 @@ var _visit = require("./visit.js");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 
-},{"./compose/composer.js":228,"./doc/Document.js":240,"./errors.js":245,"./nodes/Alias.js":248,"./nodes/Pair.js":251,"./nodes/Scalar.js":252,"./nodes/YAMLMap.js":253,"./nodes/YAMLSeq.js":254,"./nodes/identity.js":256,"./parse/cst.js":261,"./parse/lexer.js":262,"./parse/line-counter.js":263,"./parse/parser.js":264,"./public-api.js":265,"./schema/Schema.js":266,"./visit.js":295}],247:[function(require,module,exports){
+},{"./compose/composer.js":228,"./doc/Document.js":240,"./errors.js":245,"./nodes/Alias.js":248,"./nodes/Pair.js":251,"./nodes/Scalar.js":252,"./nodes/YAMLMap.js":253,"./nodes/YAMLSeq.js":254,"./nodes/identity.js":256,"./parse/cst.js":261,"./parse/lexer.js":262,"./parse/line-counter.js":263,"./parse/parser.js":264,"./public-api.js":265,"./schema/Schema.js":266,"./visit.js":294}],247:[function(require,module,exports){
+(function (process){(function (){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -35200,11 +35182,14 @@ function debug(logLevel) {
 }
 function warn(logLevel, warning) {
   if (logLevel === 'debug' || logLevel === 'warn') {
-    console.warn(warning);
+    // https://github.com/typescript-eslint/typescript-eslint/issues/7478
+    // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
+    if (typeof process !== 'undefined' && process.emitWarning) process.emitWarning(warning);else console.warn(warning);
   }
 }
 
-},{}],248:[function(require,module,exports){
+}).call(this)}).call(this,require('_process'))
+},{"_process":182}],248:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -35343,7 +35328,7 @@ function getAliasCount(doc, node, anchors) {
   return 1;
 }
 
-},{"../doc/anchors.js":241,"../visit.js":295,"./Node.js":250,"./identity.js":256,"./toJS.js":257}],249:[function(require,module,exports){
+},{"../doc/anchors.js":241,"../visit.js":294,"./Node.js":250,"./identity.js":256,"./toJS.js":257}],249:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -35649,7 +35634,7 @@ var Pair = exports.Pair = /*#__PURE__*/function () {
   }]);
 }();
 
-},{"../doc/createNode.js":243,"../stringify/stringifyPair.js":293,"./addPairToJSMap.js":255,"./identity.js":256}],252:[function(require,module,exports){
+},{"../doc/createNode.js":243,"../stringify/stringifyPair.js":292,"./addPairToJSMap.js":255,"./identity.js":256}],252:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -35923,7 +35908,7 @@ var YAMLMap = exports.YAMLMap = /*#__PURE__*/function (_Collection) {
   }]);
 }(_Collection2.Collection);
 
-},{"../stringify/stringifyCollection.js":289,"./Collection.js":249,"./Pair.js":251,"./Scalar.js":252,"./addPairToJSMap.js":255,"./identity.js":256}],254:[function(require,module,exports){
+},{"../stringify/stringifyCollection.js":288,"./Collection.js":249,"./Pair.js":251,"./Scalar.js":252,"./addPairToJSMap.js":255,"./identity.js":256}],254:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -36091,7 +36076,7 @@ function asItemIndex(key) {
   return typeof idx === 'number' && Number.isInteger(idx) && idx >= 0 ? idx : null;
 }
 
-},{"../doc/createNode.js":243,"../stringify/stringifyCollection.js":289,"./Collection.js":249,"./Scalar.js":252,"./identity.js":256,"./toJS.js":257}],255:[function(require,module,exports){
+},{"../doc/createNode.js":243,"../stringify/stringifyCollection.js":288,"./Collection.js":249,"./Scalar.js":252,"./identity.js":256,"./toJS.js":257}],255:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -36099,20 +36084,52 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.addPairToJSMap = addPairToJSMap;
 var _log = require("../log.js");
-var _merge = require("../schema/yaml-1.1/merge.js");
 var _stringify = require("../stringify/stringify.js");
 var _identity = require("./identity.js");
+var _Scalar = require("./Scalar.js");
 var _toJS = require("./toJS.js");
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
+function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var MERGE_KEY = '<<';
 function addPairToJSMap(ctx, map, _ref) {
   var key = _ref.key,
     value = _ref.value;
-  if ((0, _identity.isNode)(key) && key.addToJSMap) key.addToJSMap(ctx, map, value);
-  // TODO: Should drop this special case for bare << handling
-  else if ((0, _merge.isMergeKey)(ctx, key)) (0, _merge.addMergeToJSMap)(ctx, map, value);else {
+  if (ctx !== null && ctx !== void 0 && ctx.doc.schema.merge && isMergeKey(key)) {
+    value = (0, _identity.isAlias)(value) ? value.resolve(ctx.doc) : value;
+    if ((0, _identity.isSeq)(value)) {
+      var _iterator = _createForOfIteratorHelper(value.items),
+        _step;
+      try {
+        for (_iterator.s(); !(_step = _iterator.n()).done;) {
+          var it = _step.value;
+          mergeToJSMap(ctx, map, it);
+        }
+      } catch (err) {
+        _iterator.e(err);
+      } finally {
+        _iterator.f();
+      }
+    } else if (Array.isArray(value)) {
+      var _iterator2 = _createForOfIteratorHelper(value),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var _it = _step2.value;
+          mergeToJSMap(ctx, map, _it);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+    } else mergeToJSMap(ctx, map, value);
+  } else {
     var jsKey = (0, _toJS.toJS)(key, '', ctx);
     if (map instanceof Map) {
       map.set(jsKey, (0, _toJS.toJS)(value, jsKey, ctx));
@@ -36131,23 +36148,64 @@ function addPairToJSMap(ctx, map, _ref) {
   }
   return map;
 }
+var isMergeKey = function isMergeKey(key) {
+  return key === MERGE_KEY || (0, _identity.isScalar)(key) && key.value === MERGE_KEY && (!key.type || key.type === _Scalar.Scalar.PLAIN);
+};
+// 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
+function mergeToJSMap(ctx, map, value) {
+  var source = ctx && (0, _identity.isAlias)(value) ? value.resolve(ctx.doc) : value;
+  if (!(0, _identity.isMap)(source)) throw new Error('Merge sources must be maps or map aliases');
+  var srcMap = source.toJSON(null, ctx, Map);
+  var _iterator3 = _createForOfIteratorHelper(srcMap),
+    _step3;
+  try {
+    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+      var _step3$value = _slicedToArray(_step3.value, 2),
+        key = _step3$value[0],
+        _value = _step3$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) {
+    _iterator3.e(err);
+  } finally {
+    _iterator3.f();
+  }
+  return map;
+}
 function stringifyKey(key, jsKey, ctx) {
   if (jsKey === null) return '';
   if (_typeof(jsKey) !== 'object') return String(jsKey);
   if ((0, _identity.isNode)(key) && ctx !== null && ctx !== void 0 && ctx.doc) {
     var strCtx = (0, _stringify.createStringifyContext)(ctx.doc, {});
     strCtx.anchors = new Set();
-    var _iterator = _createForOfIteratorHelper(ctx.anchors.keys()),
-      _step;
+    var _iterator4 = _createForOfIteratorHelper(ctx.anchors.keys()),
+      _step4;
     try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var node = _step.value;
+      for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+        var node = _step4.value;
         strCtx.anchors.add(node.anchor);
       }
     } catch (err) {
-      _iterator.e(err);
+      _iterator4.e(err);
     } finally {
-      _iterator.f();
+      _iterator4.f();
     }
     strCtx.inFlow = true;
     strCtx.inStringifyKey = true;
@@ -36163,7 +36221,7 @@ function stringifyKey(key, jsKey, ctx) {
   return JSON.stringify(jsKey);
 }
 
-},{"../log.js":247,"../schema/yaml-1.1/merge.js":281,"../stringify/stringify.js":288,"./identity.js":256,"./toJS.js":257}],256:[function(require,module,exports){
+},{"../log.js":247,"../stringify/stringify.js":287,"./Scalar.js":252,"./identity.js":256,"./toJS.js":257}],256:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -36605,7 +36663,7 @@ function setFlowScalarValue(token, source, type) {
   }
 }
 
-},{"../compose/resolve-block-scalar.js":230,"../compose/resolve-flow-scalar.js":234,"../errors.js":245,"../stringify/stringifyString.js":294}],259:[function(require,module,exports){
+},{"../compose/resolve-block-scalar.js":230,"../compose/resolve-flow-scalar.js":234,"../errors.js":245,"../stringify/stringifyString.js":293}],259:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -39321,9 +39379,7 @@ var Parser = exports.Parser = /*#__PURE__*/function () {
                 sep = it.sep;
                 sep.push(this.sourceToken);
                 // @ts-expect-error type guard is wrong here
-                delete it.key;
-                // @ts-expect-error type guard is wrong here
-                delete it.sep;
+                delete it.key, delete it.sep;
                 this.stack.push({
                   type: 'block-map',
                   offset: this.offset,
@@ -39796,7 +39852,6 @@ var _composer = require("./compose/composer.js");
 var _Document = require("./doc/Document.js");
 var _errors = require("./errors.js");
 var _log = require("./log.js");
-var _identity = require("./nodes/identity.js");
 var _lineCounter = require("./parse/line-counter.js");
 var _parser = require("./parse/parser.js");
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -39920,11 +39975,10 @@ function stringify(value, replacer, options) {
       keepUndefined = _ref.keepUndefined;
     if (!keepUndefined) return undefined;
   }
-  if ((0, _identity.isDocument)(value) && !_replacer) return value.toString(options);
   return new _Document.Document(value, _replacer, options).toString(options);
 }
 
-},{"./compose/composer.js":228,"./doc/Document.js":240,"./errors.js":245,"./log.js":247,"./nodes/identity.js":256,"./parse/line-counter.js":263,"./parse/parser.js":264}],266:[function(require,module,exports){
+},{"./compose/composer.js":228,"./doc/Document.js":240,"./errors.js":245,"./log.js":247,"./parse/line-counter.js":263,"./parse/parser.js":264}],266:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -39956,9 +40010,10 @@ var Schema = exports.Schema = /*#__PURE__*/function () {
       toStringDefaults = _ref.toStringDefaults;
     _classCallCheck(this, Schema);
     this.compat = Array.isArray(compat) ? (0, _tags.getTags)(compat, 'compat') : compat ? (0, _tags.getTags)(null, compat) : null;
+    this.merge = !!merge;
     this.name = typeof schema === 'string' && schema || 'core';
     this.knownTags = resolveKnownTags ? _tags.coreKnownTags : {};
-    this.tags = (0, _tags.getTags)(customTags, this.name, merge);
+    this.tags = (0, _tags.getTags)(customTags, this.name);
     this.toStringOptions = toStringDefaults !== null && toStringDefaults !== void 0 ? toStringDefaults : null;
     Object.defineProperty(this, _identity.MAP, {
       value: _map.map
@@ -40080,7 +40135,7 @@ var string = exports.string = {
   }
 };
 
-},{"../../stringify/stringifyString.js":294}],271:[function(require,module,exports){
+},{"../../stringify/stringifyString.js":293}],271:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -40162,7 +40217,7 @@ var _float = exports["float"] = {
   stringify: _stringifyNumber.stringifyNumber
 };
 
-},{"../../nodes/Scalar.js":252,"../../stringify/stringifyNumber.js":292}],273:[function(require,module,exports){
+},{"../../nodes/Scalar.js":252,"../../stringify/stringifyNumber.js":291}],273:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -40223,7 +40278,7 @@ var intHex = exports.intHex = {
   }
 };
 
-},{"../../stringify/stringifyNumber.js":292}],274:[function(require,module,exports){
+},{"../../stringify/stringifyNumber.js":291}],274:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -40286,7 +40341,7 @@ var jsonScalars = [{
   },
   "default": true,
   tag: 'tag:yaml.org,2002:bool',
-  test: /^true$|^false$/,
+  test: /^true|false$/,
   resolve: function resolve(str) {
     return str === 'true';
   },
@@ -40345,7 +40400,6 @@ var _int2 = require("./core/int.js");
 var _schema = require("./core/schema.js");
 var _schema2 = require("./json/schema.js");
 var _binary = require("./yaml-1.1/binary.js");
-var _merge = require("./yaml-1.1/merge.js");
 var _omap = require("./yaml-1.1/omap.js");
 var _pairs = require("./yaml-1.1/pairs.js");
 var _schema3 = require("./yaml-1.1/schema.js");
@@ -40367,7 +40421,6 @@ var tagsByName = {
   intOct: _int2.intOct,
   intTime: _timestamp.intTime,
   map: _map.map,
-  merge: _merge.merge,
   "null": _null.nullTag,
   omap: _omap.omap,
   pairs: _pairs.pairs,
@@ -40377,18 +40430,13 @@ var tagsByName = {
 };
 var coreKnownTags = exports.coreKnownTags = {
   'tag:yaml.org,2002:binary': _binary.binary,
-  'tag:yaml.org,2002:merge': _merge.merge,
   'tag:yaml.org,2002:omap': _omap.omap,
   'tag:yaml.org,2002:pairs': _pairs.pairs,
   'tag:yaml.org,2002:set': _set.set,
   'tag:yaml.org,2002:timestamp': _timestamp.timestamp
 };
-function getTags(customTags, schemaName, addMergeTag) {
-  var schemaTags = schemas.get(schemaName);
-  if (schemaTags && !customTags) {
-    return addMergeTag && !schemaTags.includes(_merge.merge) ? schemaTags.concat(_merge.merge) : schemaTags.slice();
-  }
-  var tags = schemaTags;
+function getTags(customTags, schemaName) {
+  var tags = schemas.get(schemaName);
   if (!tags) {
     if (Array.isArray(customTags)) tags = [];else {
       var keys = Array.from(schemas.keys()).filter(function (key) {
@@ -40415,22 +40463,19 @@ function getTags(customTags, schemaName, addMergeTag) {
   } else if (typeof customTags === 'function') {
     tags = customTags(tags.slice());
   }
-  if (addMergeTag) tags = tags.concat(_merge.merge);
-  return tags.reduce(function (tags, tag) {
-    var tagObj = typeof tag === 'string' ? tagsByName[tag] : tag;
-    if (!tagObj) {
-      var tagName = JSON.stringify(tag);
-      var _keys = Object.keys(tagsByName).map(function (key) {
-        return JSON.stringify(key);
-      }).join(', ');
-      throw new Error("Unknown custom tag ".concat(tagName, "; use one of ").concat(_keys));
-    }
-    if (!tags.includes(tagObj)) tags.push(tagObj);
-    return tags;
-  }, []);
+  return tags.map(function (tag) {
+    if (typeof tag !== 'string') return tag;
+    var tagObj = tagsByName[tag];
+    if (tagObj) return tagObj;
+    var keys = Object.keys(tagsByName).map(function (key) {
+      return JSON.stringify(key);
+    }).join(', ');
+    throw new Error("Unknown custom tag \"".concat(tag, "\"; use one of ").concat(keys));
+  });
 }
 
-},{"./common/map.js":267,"./common/null.js":268,"./common/seq.js":269,"./common/string.js":270,"./core/bool.js":271,"./core/float.js":272,"./core/int.js":273,"./core/schema.js":274,"./json/schema.js":275,"./yaml-1.1/binary.js":277,"./yaml-1.1/merge.js":281,"./yaml-1.1/omap.js":282,"./yaml-1.1/pairs.js":283,"./yaml-1.1/schema.js":284,"./yaml-1.1/set.js":285,"./yaml-1.1/timestamp.js":286}],277:[function(require,module,exports){
+},{"./common/map.js":267,"./common/null.js":268,"./common/seq.js":269,"./common/string.js":270,"./core/bool.js":271,"./core/float.js":272,"./core/int.js":273,"./core/schema.js":274,"./json/schema.js":275,"./yaml-1.1/binary.js":277,"./yaml-1.1/omap.js":281,"./yaml-1.1/pairs.js":282,"./yaml-1.1/schema.js":283,"./yaml-1.1/set.js":284,"./yaml-1.1/timestamp.js":285}],277:[function(require,module,exports){
+(function (Buffer){(function (){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -40455,7 +40500,9 @@ var binary = exports.binary = {
    *   document.querySelector('#photo').src = URL.createObjectURL(blob)
    */
   resolve: function resolve(src, onError) {
-    if (typeof atob === 'function') {
+    if (typeof Buffer === 'function') {
+      return Buffer.from(src, 'base64');
+    } else if (typeof atob === 'function') {
       // On IE 11, atob() can't handle newlines
       var str = atob(src.replace(/[\n\r]/g, ''));
       var buffer = new Uint8Array(str.length);
@@ -40472,7 +40519,9 @@ var binary = exports.binary = {
       value = _ref.value;
     var buf = value; // checked earlier by binary.identify()
     var str;
-    if (typeof btoa === 'function') {
+    if (typeof Buffer === 'function') {
+      str = buf instanceof Buffer ? buf.toString('base64') : Buffer.from(buf.buffer).toString('base64');
+    } else if (typeof btoa === 'function') {
       var s = '';
       for (var i = 0; i < buf.length; ++i) s += String.fromCharCode(buf[i]);
       str = btoa(s);
@@ -40497,7 +40546,8 @@ var binary = exports.binary = {
   }
 };
 
-},{"../../nodes/Scalar.js":252,"../../stringify/stringifyString.js":294}],278:[function(require,module,exports){
+}).call(this)}).call(this,require("buffer").Buffer)
+},{"../../nodes/Scalar.js":252,"../../stringify/stringifyString.js":293,"buffer":74}],278:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -40593,7 +40643,7 @@ var _float = exports["float"] = {
   stringify: _stringifyNumber.stringifyNumber
 };
 
-},{"../../nodes/Scalar.js":252,"../../stringify/stringifyNumber.js":292}],280:[function(require,module,exports){
+},{"../../nodes/Scalar.js":252,"../../stringify/stringifyNumber.js":291}],280:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -40685,116 +40735,7 @@ var intHex = exports.intHex = {
   }
 };
 
-},{"../../stringify/stringifyNumber.js":292}],281:[function(require,module,exports){
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.addMergeToJSMap = addMergeToJSMap;
-exports.merge = exports.isMergeKey = void 0;
-var _identity = require("../../nodes/identity.js");
-var _Scalar = require("../../nodes/Scalar.js");
-function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
-function _createForOfIteratorHelper(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
-function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray(r, a) : void 0; } }
-function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-// 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
-var MERGE_KEY = '<<';
-var merge = exports.merge = {
-  identify: function identify(value) {
-    return value === MERGE_KEY || _typeof(value) === 'symbol' && value.description === MERGE_KEY;
-  },
-  "default": 'key',
-  tag: 'tag:yaml.org,2002:merge',
-  test: /^<<$/,
-  resolve: function resolve() {
-    return Object.assign(new _Scalar.Scalar(Symbol(MERGE_KEY)), {
-      addToJSMap: addMergeToJSMap
-    });
-  },
-  stringify: function stringify() {
-    return MERGE_KEY;
-  }
-};
-var isMergeKey = exports.isMergeKey = function isMergeKey(ctx, key) {
-  return (merge.identify(key) || (0, _identity.isScalar)(key) && (!key.type || key.type === _Scalar.Scalar.PLAIN) && merge.identify(key.value)) && (ctx === null || ctx === void 0 ? void 0 : ctx.doc.schema.tags.some(function (tag) {
-    return tag.tag === merge.tag && tag["default"];
-  }));
-};
-function addMergeToJSMap(ctx, map, value) {
-  value = ctx && (0, _identity.isAlias)(value) ? value.resolve(ctx.doc) : value;
-  if ((0, _identity.isSeq)(value)) {
-    var _iterator = _createForOfIteratorHelper(value.items),
-      _step;
-    try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
-        var it = _step.value;
-        mergeValue(ctx, map, it);
-      }
-    } catch (err) {
-      _iterator.e(err);
-    } finally {
-      _iterator.f();
-    }
-  } else if (Array.isArray(value)) {
-    var _iterator2 = _createForOfIteratorHelper(value),
-      _step2;
-    try {
-      for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-        var _it = _step2.value;
-        mergeValue(ctx, map, _it);
-      }
-    } catch (err) {
-      _iterator2.e(err);
-    } finally {
-      _iterator2.f();
-    }
-  } else mergeValue(ctx, map, value);
-}
-function mergeValue(ctx, map, value) {
-  var source = ctx && (0, _identity.isAlias)(value) ? value.resolve(ctx.doc) : value;
-  if (!(0, _identity.isMap)(source)) throw new Error('Merge sources must be maps or map aliases');
-  var srcMap = source.toJSON(null, ctx, Map);
-  var _iterator3 = _createForOfIteratorHelper(srcMap),
-    _step3;
-  try {
-    for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
-      var _step3$value = _slicedToArray(_step3.value, 2),
-        key = _step3$value[0],
-        _value = _step3$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) {
-    _iterator3.e(err);
-  } finally {
-    _iterator3.f();
-  }
-  return map;
-}
-
-},{"../../nodes/Scalar.js":252,"../../nodes/identity.js":256}],282:[function(require,module,exports){
+},{"../../stringify/stringifyNumber.js":291}],281:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -40919,7 +40860,7 @@ var omap = exports.omap = {
   }
 };
 
-},{"../../nodes/YAMLMap.js":253,"../../nodes/YAMLSeq.js":254,"../../nodes/identity.js":256,"../../nodes/toJS.js":257,"./pairs.js":283}],283:[function(require,module,exports){
+},{"../../nodes/YAMLMap.js":253,"../../nodes/YAMLSeq.js":254,"../../nodes/identity.js":256,"../../nodes/toJS.js":257,"./pairs.js":282}],282:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41003,7 +40944,7 @@ var pairs = exports.pairs = {
   createNode: createPairs
 };
 
-},{"../../nodes/Pair.js":251,"../../nodes/Scalar.js":252,"../../nodes/YAMLSeq.js":254,"../../nodes/identity.js":256}],284:[function(require,module,exports){
+},{"../../nodes/Pair.js":251,"../../nodes/Scalar.js":252,"../../nodes/YAMLSeq.js":254,"../../nodes/identity.js":256}],283:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41018,14 +40959,13 @@ var _binary = require("./binary.js");
 var _bool = require("./bool.js");
 var _float2 = require("./float.js");
 var _int2 = require("./int.js");
-var _merge = require("./merge.js");
 var _omap = require("./omap.js");
 var _pairs = require("./pairs.js");
 var _set = require("./set.js");
 var _timestamp = require("./timestamp.js");
-var schema = exports.schema = [_map.map, _seq.seq, _string.string, _null.nullTag, _bool.trueTag, _bool.falseTag, _int2.intBin, _int2.intOct, _int2["int"], _int2.intHex, _float2.floatNaN, _float2.floatExp, _float2["float"], _binary.binary, _merge.merge, _omap.omap, _pairs.pairs, _set.set, _timestamp.intTime, _timestamp.floatTime, _timestamp.timestamp];
+var schema = exports.schema = [_map.map, _seq.seq, _string.string, _null.nullTag, _bool.trueTag, _bool.falseTag, _int2.intBin, _int2.intOct, _int2["int"], _int2.intHex, _float2.floatNaN, _float2.floatExp, _float2["float"], _binary.binary, _omap.omap, _pairs.pairs, _set.set, _timestamp.intTime, _timestamp.floatTime, _timestamp.timestamp];
 
-},{"../common/map.js":267,"../common/null.js":268,"../common/seq.js":269,"../common/string.js":270,"./binary.js":277,"./bool.js":278,"./float.js":279,"./int.js":280,"./merge.js":281,"./omap.js":282,"./pairs.js":283,"./set.js":285,"./timestamp.js":286}],285:[function(require,module,exports){
+},{"../common/map.js":267,"../common/null.js":268,"../common/seq.js":269,"../common/string.js":270,"./binary.js":277,"./bool.js":278,"./float.js":279,"./int.js":280,"./omap.js":281,"./pairs.js":282,"./set.js":284,"./timestamp.js":285}],284:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41149,7 +41089,7 @@ var set = exports.set = {
   }
 };
 
-},{"../../nodes/Pair.js":251,"../../nodes/YAMLMap.js":253,"../../nodes/identity.js":256}],286:[function(require,module,exports){
+},{"../../nodes/Pair.js":251,"../../nodes/YAMLMap.js":253,"../../nodes/identity.js":256}],285:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41280,11 +41220,11 @@ var timestamp = exports.timestamp = {
   },
   stringify: function stringify(_ref2) {
     var value = _ref2.value;
-    return value.toISOString().replace(/(T00:00:00)?\.000Z$/, '');
+    return value.toISOString().replace(/((T00:00)?:00)?\.000Z$/, '');
   }
 };
 
-},{"../../stringify/stringifyNumber.js":292}],287:[function(require,module,exports){
+},{"../../stringify/stringifyNumber.js":291}],286:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41422,7 +41362,7 @@ function consumeMoreIndentedLines(text, i, indent) {
   return end;
 }
 
-},{}],288:[function(require,module,exports){
+},{}],287:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41495,12 +41435,6 @@ function getTagObject(tags, item) {
       var _t$identify;
       return (_t$identify = t.identify) === null || _t$identify === void 0 ? void 0 : _t$identify.call(t, obj);
     });
-    if (_match.length > 1) {
-      var testMatch = _match.filter(function (t) {
-        return t.test;
-      });
-      if (testMatch.length > 0) _match = testMatch;
-    }
     tagObj = (_match$find2 = _match.find(function (t) {
       return t.format === item.format;
     })) !== null && _match$find2 !== void 0 ? _match$find2 : _match.find(function (t) {
@@ -41561,7 +41495,7 @@ function stringify(item, ctx, onComment, onChompKeep) {
   return (0, _identity.isScalar)(node) || str[0] === '{' || str[0] === '[' ? "".concat(props, " ").concat(str) : "".concat(props, "\n").concat(ctx.indent).concat(str);
 }
 
-},{"../doc/anchors.js":241,"../nodes/identity.js":256,"./stringifyComment.js":290,"./stringifyString.js":294}],289:[function(require,module,exports){
+},{"../doc/anchors.js":241,"../nodes/identity.js":256,"./stringifyComment.js":289,"./stringifyString.js":293}],288:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41732,7 +41666,7 @@ function addCommentBefore(_ref5, lines, comment, chompKeep) {
   }
 }
 
-},{"../nodes/identity.js":256,"./stringify.js":288,"./stringifyComment.js":290}],290:[function(require,module,exports){
+},{"../nodes/identity.js":256,"./stringify.js":287,"./stringifyComment.js":289}],289:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41758,7 +41692,7 @@ var lineComment = exports.lineComment = function lineComment(str, indent, commen
   return str.endsWith('\n') ? indentComment(comment, indent) : comment.includes('\n') ? '\n' + indentComment(comment, indent) : (str.endsWith(' ') ? '' : ' ') + comment;
 };
 
-},{}],291:[function(require,module,exports){
+},{}],290:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41838,7 +41772,7 @@ function stringifyDocument(doc, options) {
   return lines.join('\n') + '\n';
 }
 
-},{"../nodes/identity.js":256,"./stringify.js":288,"./stringifyComment.js":290}],292:[function(require,module,exports){
+},{"../nodes/identity.js":256,"./stringify.js":287,"./stringifyComment.js":289}],291:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -41866,7 +41800,7 @@ function stringifyNumber(_ref) {
   return n;
 }
 
-},{}],293:[function(require,module,exports){
+},{}],292:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -42004,7 +41938,7 @@ function stringifyPair(_ref, ctx, onComment, onChompKeep) {
   return str;
 }
 
-},{"../nodes/Scalar.js":252,"../nodes/identity.js":256,"./stringify.js":288,"./stringifyComment.js":290}],294:[function(require,module,exports){
+},{"../nodes/Scalar.js":252,"../nodes/identity.js":256,"./stringify.js":287,"./stringifyComment.js":289}],293:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -42193,28 +42127,20 @@ function blockString(_ref, ctx, onComment, onChompKeep) {
     start = start.replace(/\n+/g, "$&".concat(indent));
   }
   var indentSize = indent ? '2' : '1'; // root is at -1
-  // Leading | or > is added later
-  var header = (startWithSpace ? indentSize : '') + chomp;
+  var header = (literal ? '|' : '>') + (startWithSpace ? indentSize : '') + chomp;
   if (comment) {
     header += ' ' + commentString(comment.replace(/ ?[\r\n]+/g, ' '));
     if (onComment) onComment();
   }
-  if (!literal) {
-    var foldedValue = value.replace(/\n+/g, '\n$&').replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, '$1$2') // more-indented lines aren't folded
-    //                ^ more-ind. ^ empty     ^ capture next empty lines only at end of indent
-    .replace(/\n+/g, "$&".concat(indent));
-    var literalFallback = false;
-    var foldOptions = getFoldOptions(ctx, true);
-    if (blockQuote !== 'folded' && type !== _Scalar.Scalar.BLOCK_FOLDED) {
-      foldOptions.onOverflow = function () {
-        literalFallback = true;
-      };
-    }
-    var body = (0, _foldFlowLines.foldFlowLines)("".concat(start).concat(foldedValue).concat(end), indent, _foldFlowLines.FOLD_BLOCK, foldOptions);
-    if (!literalFallback) return ">".concat(header, "\n").concat(indent).concat(body);
+  if (literal) {
+    value = value.replace(/\n+/g, "$&".concat(indent));
+    return "".concat(header, "\n").concat(indent).concat(start).concat(value).concat(end);
   }
-  value = value.replace(/\n+/g, "$&".concat(indent));
-  return "|".concat(header, "\n").concat(indent).concat(start).concat(value).concat(end);
+  value = value.replace(/\n+/g, '\n$&').replace(/(?:^|\n)([\t ].*)(?:([\n\t ]*)\n(?![\n\t ]))?/g, '$1$2') // more-indented lines aren't folded
+  //                ^ more-ind. ^ empty     ^ capture next empty lines only at end of indent
+  .replace(/\n+/g, "$&".concat(indent));
+  var body = (0, _foldFlowLines.foldFlowLines)("".concat(start).concat(value).concat(end), indent, _foldFlowLines.FOLD_BLOCK, getFoldOptions(ctx, true));
+  return "".concat(header, "\n").concat(indent).concat(body);
 }
 function plainString(item, ctx, onComment, onChompKeep) {
   var type = item.type,
@@ -42303,7 +42229,7 @@ function stringifyString(item, ctx, onComment, onChompKeep) {
   return res;
 }
 
-},{"../nodes/Scalar.js":252,"./foldFlowLines.js":287}],295:[function(require,module,exports){
+},{"../nodes/Scalar.js":252,"./foldFlowLines.js":286}],294:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -42607,7 +42533,7 @@ function replaceNode(key, path, node) {
   }
 }
 
-},{"./nodes/identity.js":256}],296:[function(require,module,exports){
+},{"./nodes/identity.js":256}],295:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -42634,7 +42560,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 // https://github.com/eemeli/yaml/issues/228
 var _default = exports["default"] = YAML;
 
-},{"./dist/index.js":246}],297:[function(require,module,exports){
+},{"./dist/index.js":246}],296:[function(require,module,exports){
 (function (Buffer){(function (){
 "use strict";
 
@@ -42864,7 +42790,7 @@ var BaseClient = exports["default"] = /*#__PURE__*/function (_events$EventEmitte
 }(_events["default"].EventEmitter);
 
 }).call(this)}).call(this,{"isBuffer":require("../node_modules/is-buffer/index.js")})
-},{"../node_modules/is-buffer/index.js":113,"events":97,"loglevel":138,"mqtt":148,"tinycache":193,"uuid":204}],298:[function(require,module,exports){
+},{"../node_modules/is-buffer/index.js":113,"events":97,"loglevel":138,"mqtt":148,"tinycache":193,"uuid":204}],297:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -43045,7 +42971,7 @@ var BaseConfig = exports["default"] = /*#__PURE__*/function () {
 }();
 ;
 
-},{}],299:[function(require,module,exports){
+},{}],298:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -43552,7 +43478,7 @@ var ApiClient = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 
-},{"../util":313,"axios":2,"bluebird":70,"btoa":73,"form-data":99,"loglevel":138}],300:[function(require,module,exports){
+},{"../util":312,"axios":2,"bluebird":70,"btoa":73,"form-data":99,"loglevel":138}],299:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -43629,7 +43555,7 @@ var _default = exports["default"] = {
   ServiceNotFound: ServiceNotFound
 };
 
-},{}],301:[function(require,module,exports){
+},{}],300:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -43960,7 +43886,7 @@ var DscClient = exports["default"] = /*#__PURE__*/function () {
   }]);
 }();
 
-},{"./ApiErrors":300,"loglevel":138}],302:[function(require,module,exports){
+},{"./ApiErrors":299,"loglevel":138}],301:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -44009,7 +43935,7 @@ var LecClient = exports["default"] = /*#__PURE__*/function () {
 }();
 ;
 
-},{"loglevel":138}],303:[function(require,module,exports){
+},{"loglevel":138}],302:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -44087,7 +44013,7 @@ var MgmtClient = exports["default"] = /*#__PURE__*/function () {
 }();
 ;
 
-},{"loglevel":138}],304:[function(require,module,exports){
+},{"loglevel":138}],303:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -44314,7 +44240,7 @@ var RegistryClient = exports["default"] = /*#__PURE__*/function () {
 }();
 ;
 
-},{}],305:[function(require,module,exports){
+},{}],304:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -44420,7 +44346,7 @@ RulesClient.RuleNotificationStrategy = {
   }
 };
 
-},{"loglevel":138}],306:[function(require,module,exports){
+},{"loglevel":138}],305:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -45143,7 +45069,7 @@ var StateClient = exports["default"] = /*#__PURE__*/function () {
 }();
 ;
 
-},{"loglevel":138}],307:[function(require,module,exports){
+},{"loglevel":138}],306:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -45501,7 +45427,7 @@ var ApplicationClient = exports["default"] = /*#__PURE__*/function (_BaseClient)
 }(_BaseClient2["default"]);
 ;
 
-},{"../BaseClient":297,"../api/ApiClient":299,"../api/DscClient":301,"../api/LecClient":302,"../api/MgmtClient":303,"../api/RegistryClient":304,"../api/RulesClient":305,"../api/StateClient":306,"../util":313,"./ApplicationConfig":308}],308:[function(require,module,exports){
+},{"../BaseClient":296,"../api/ApiClient":298,"../api/DscClient":300,"../api/LecClient":301,"../api/MgmtClient":302,"../api/RegistryClient":303,"../api/RulesClient":304,"../api/StateClient":305,"../util":312,"./ApplicationConfig":307}],307:[function(require,module,exports){
 (function (process){(function (){
 "use strict";
 
@@ -45745,7 +45671,7 @@ var ApplicationConfig = exports["default"] = /*#__PURE__*/function (_BaseConfig)
 }(_BaseConfig2["default"]);
 
 }).call(this)}).call(this,require('_process'))
-},{"../BaseConfig":298,"_process":182,"fs":72,"loglevel":138,"uuid":204,"yaml":296}],309:[function(require,module,exports){
+},{"../BaseConfig":297,"_process":182,"fs":72,"loglevel":138,"uuid":204,"yaml":295}],308:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -45847,7 +45773,7 @@ var DeviceClient = exports["default"] = /*#__PURE__*/function (_BaseClient) {
   }]);
 }(_BaseClient2["default"]);
 
-},{"../BaseClient":297,"../util":313,"./DeviceConfig":310,"util":203}],310:[function(require,module,exports){
+},{"../BaseClient":296,"../util":312,"./DeviceConfig":309,"util":203}],309:[function(require,module,exports){
 (function (process){(function (){
 "use strict";
 
@@ -46052,7 +45978,7 @@ var DeviceConfig = exports["default"] = /*#__PURE__*/function (_BaseConfig) {
 }(_BaseConfig2["default"]);
 
 }).call(this)}).call(this,require('_process'))
-},{"../BaseConfig":298,"_process":182,"fs":72,"loglevel":138,"yaml":296}],311:[function(require,module,exports){
+},{"../BaseConfig":297,"_process":182,"fs":72,"loglevel":138,"yaml":295}],310:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -46183,7 +46109,7 @@ var GatewayClient = exports["default"] = /*#__PURE__*/function (_BaseClient) {
   }]);
 }(_BaseClient2["default"]);
 
-},{"../BaseClient":297,"./GatewayConfig":312,"util":203}],312:[function(require,module,exports){
+},{"../BaseClient":296,"./GatewayConfig":311,"util":203}],311:[function(require,module,exports){
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -46229,7 +46155,7 @@ var GatewayConfig = exports["default"] = /*#__PURE__*/function (_DeviceConfig) {
 }(_DeviceConfig2["default"]);
 ;
 
-},{"../device/DeviceConfig":310}],313:[function(require,module,exports){
+},{"../device/DeviceConfig":309}],312:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -46275,7 +46201,7 @@ function generateUUID() {
   });
 }
 
-},{}],314:[function(require,module,exports){
+},{}],313:[function(require,module,exports){
 "use strict";
 
 Object.defineProperty(exports, "__esModule", {
@@ -46374,4 +46300,4 @@ var _RulesClient = _interopRequireDefault(require("./api/RulesClient"));
 var _StateClient = _interopRequireDefault(require("./api/StateClient"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
 
-},{"./api/ApiClient":299,"./api/ApiErrors":300,"./api/DscClient":301,"./api/LecClient":302,"./api/MgmtClient":303,"./api/RegistryClient":304,"./api/RulesClient":305,"./api/StateClient":306,"./application/ApplicationClient":307,"./application/ApplicationConfig":308,"./device/DeviceClient":309,"./device/DeviceConfig":310,"./gateway/GatewayClient":311}]},{},[314]);
+},{"./api/ApiClient":298,"./api/ApiErrors":299,"./api/DscClient":300,"./api/LecClient":301,"./api/MgmtClient":302,"./api/RegistryClient":303,"./api/RulesClient":304,"./api/StateClient":305,"./application/ApplicationClient":306,"./application/ApplicationConfig":307,"./device/DeviceClient":308,"./device/DeviceConfig":309,"./gateway/GatewayClient":310}]},{},[313]);