yaml 1.5.1 → 1.7.2

package/browser/dist/Document.js

@@ -52,6 +52,7 @@ function () {
     this.commentBefore = null;
     this.comment = null;
     this.contents = null;
+    this.directivesEndMarker = null;
     this.errors = [];
     this.options = options;
     this.schema = null;
@@ -139,8 +140,20 @@ function () {
     }
   }, {
     key: "setSchema",
-    value: function setSchema() {
-      if (!this.schema) this.schema = new _schema.default(Object.assign({}, this.getDefaults(), this.options));
+    value: function setSchema(id, customTags) {
+      if (!id && !customTags && this.schema) return;
+      if (typeof id === 'number') id = id.toFixed(1);
+
+      if (id === '1.0' || id === '1.1' || id === '1.2') {
+        if (this.version) this.version = id;else this.options.version = id;
+        delete this.options.schema;
+      } else if (id && typeof id === 'string') {
+        this.options.schema = id;
+      }
+
+      if (Array.isArray(customTags)) this.options.customTags = customTags;
+      var opt = Object.assign({}, this.getDefaults(), this.options);
+      this.schema = new _schema.default(opt);
     }
   }, {
     key: "parse",
@@ -151,6 +164,7 @@ function () {
           directives = _node$directives === void 0 ? [] : _node$directives,
           _node$contents = node.contents,
           contents = _node$contents === void 0 ? [] : _node$contents,
+          directivesEndMarker = node.directivesEndMarker,
           error = node.error,
           valueRange = node.valueRange;
 
@@ -160,6 +174,7 @@ function () {
       }
 
       this.parseDirectives(directives, prevDoc);
+      if (directivesEndMarker) this.directivesEndMarker = true;
       this.range = valueRange ? [valueRange.start, valueRange.end] : null;
       this.setSchema();
       this.anchors._cstAliases = [];
@@ -719,7 +734,6 @@ function () {
       if (this.errors.length > 0) throw new Error('Document with errors cannot be stringified');
       this.setSchema();
       var lines = [];
-      if (this.commentBefore) lines.push(this.commentBefore.replace(/^/gm, '#'), '');
       var hasDirectives = false;
 
       if (this.version) {
@@ -745,7 +759,13 @@ function () {
           hasDirectives = true;
         }
       });
-      if (hasDirectives) lines.push('---');
+      if (hasDirectives || this.directivesEndMarker) lines.push('---');
+
+      if (this.commentBefore) {
+        if (hasDirectives || !this.directivesEndMarker) lines.unshift('');
+        lines.unshift(this.commentBefore.replace(/^/gm, '#'));
+      }
+
       var ctx = {
         anchors: {},
         doc: this,
@@ -756,7 +776,7 @@ function () {
 
       if (this.contents) {
         if (this.contents instanceof _Node.default) {
-          if (this.contents.spaceBefore && hasDirectives) lines.push('');
+          if (this.contents.spaceBefore && (hasDirectives || this.directivesEndMarker)) lines.push('');
           if (this.contents.commentBefore) lines.push(this.contents.commentBefore.replace(/^/gm, '#')); // top-level block scalars need to be indented if followed by a comment
 
           ctx.forceBlockIndent = !!this.comment;

package/browser/dist/cst/CollectionItem.js

@@ -63,12 +63,15 @@ function (_Node) {
       var offset = _Node2.default.endOfWhiteSpace(src, start + 1);
 
       var ch = src[offset];
+      var inlineComment = ch === '#';
+      var comments = [];
+      var blankLine = null;
 
       while (ch === '\n' || ch === '#') {
         if (ch === '#') {
           var _end = _Node2.default.endOfLine(src, offset + 1);
 
-          this.props.push(new _Range.default(offset, _end));
+          comments.push(new _Range.default(offset, _end));
           offset = _end;
         } else {
           atLineStart = true;
@@ -76,13 +79,11 @@ function (_Node) {
 
           var wsEnd = _Node2.default.endOfWhiteSpace(src, lineStart);
 
-          if (src[wsEnd] === '\n') {
-            var blankLine = new _BlankLine.default();
+          if (src[wsEnd] === '\n' && comments.length === 0) {
+            blankLine = new _BlankLine.default();
             lineStart = blankLine.parse({
               src: src
             }, lineStart);
-            var items = context.parent.items || context.parent.contents;
-            items.push(blankLine);
           }
 
           offset = _Node2.default.endOfIndent(src, lineStart);
@@ -99,11 +100,31 @@ function (_Node) {
           lineStart: lineStart,
           parent: this
         }, offset);
-        if (this.node) offset = this.node.range.end;
       } else if (ch && lineStart > start + 1) {
         offset = lineStart - 1;
       }
 
+      if (this.node) {
+        if (blankLine) {
+          // Only blank lines preceding non-empty nodes are captured. Note that
+          // this means that collection item range start indices do not always
+          // increase monotonically. -- eemeli/yaml#126
+          var items = context.parent.items || context.parent.contents;
+          if (items) items.push(blankLine);
+        }
+
+        if (comments.length) Array.prototype.push.apply(this.props, comments);
+        offset = this.node.range.end;
+      } else {
+        if (inlineComment) {
+          var c = comments[0];
+          this.props.push(c);
+          offset = c.end;
+        } else {
+          offset = _Node2.default.endOfLine(src, start + 1);
+        }
+      }
+
       var end = this.node ? this.node.valueRange.end : offset;
       this.valueRange = new _Range.default(start, end);
       return offset;

package/browser/dist/cst/Document.js

@@ -56,6 +56,8 @@ function (_Node) {
     _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Document).call(this, _constants.Type.DOCUMENT));
     _this.directives = null;
     _this.contents = null;
+    _this.directivesEndMarker = null;
+    _this.documentEndMarker = null;
     return _this;
   }
 
@@ -125,7 +127,10 @@ function (_Node) {
         }
       }
 
-      if (src[offset]) return offset + 3;
+      if (src[offset]) {
+        this.directivesEndMarker = new _Range.default(offset, offset + 3);
+        return offset + 3;
+      }
 
       if (hasDirectives) {
         this.error = new _errors.YAMLSemanticError(this, 'Missing directives-end indicator line');
@@ -214,6 +219,7 @@ function (_Node) {
       this.valueRange.end = offset;
 
       if (src[offset]) {
+        this.documentEndMarker = new _Range.default(offset, offset + 3);
         offset += 3;
 
         if (src[offset]) {
@@ -269,9 +275,11 @@ function (_Node) {
       this.directives.forEach(function (node) {
         offset = node.setOrigRanges(cr, offset);
       });
+      if (this.directivesEndMarker) offset = this.directivesEndMarker.setOrigRange(cr, offset);
       this.contents.forEach(function (node) {
         offset = node.setOrigRanges(cr, offset);
       });
+      if (this.documentEndMarker) offset = this.documentEndMarker.setOrigRange(cr, offset);
       return offset;
     }
   }, {

package/browser/dist/cst/FlowCollection.js

@@ -94,7 +94,15 @@ function (_Node) {
               }
 
               offset = _Node2.default.endOfIndent(src, lineStart);
-              if (offset - lineStart <= indent) this.error = new _errors.YAMLSemanticError(this, 'Insufficient indentation in flow collection');
+
+              if (offset <= lineStart + indent) {
+                char = src[offset];
+
+                if (offset < lineStart + indent || char !== ']' && char !== '}') {
+                  var msg = 'Insufficient indentation in flow collection';
+                  this.error = new _errors.YAMLSemanticError(this, msg);
+                }
+              }
             }
             break;
 

package/browser/dist/cst/Node.js

@@ -15,7 +15,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _constants = require("../constants");
 
-var _getLinePos = _interopRequireDefault(require("./getLinePos"));
+var _sourceUtils = require("./source-utils");
 
 var _Range = _interopRequireDefault(require("./Range"));
 
@@ -205,7 +205,10 @@ function () {
 
   function Node(type, props, context) {
     (0, _classCallCheck2.default)(this, Node);
-    this.context = context || null;
+    Object.defineProperty(this, 'context', {
+      value: context || null,
+      writable: true
+    });
     this.error = null;
     this.range = null;
     this.valueRange = null;
@@ -337,9 +340,9 @@ function () {
     key: "rangeAsLinePos",
     get: function get() {
       if (!this.range || !this.context) return undefined;
-      var start = (0, _getLinePos.default)(this.range.start, this.context.root);
+      var start = (0, _sourceUtils.getLinePos)(this.range.start, this.context.root);
       if (!start) return undefined;
-      var end = (0, _getLinePos.default)(this.range.end, this.context.root);
+      var end = (0, _sourceUtils.getLinePos)(this.range.end, this.context.root);
       return {
         start: start,
         end: end

package/browser/dist/cst/PlainValue.js

@@ -168,7 +168,7 @@ function (_Node) {
       while (ch && ch !== '\n') {
         if (inFlow && (ch === '[' || ch === ']' || ch === '{' || ch === '}' || ch === ',')) break;
         var next = src[offset + 1];
-        if (ch === ':' && (next === '\n' || next === '\t' || next === ' ' || inFlow && next === ',')) break;
+        if (ch === ':' && (!next || next === '\n' || next === '\t' || next === ' ' || inFlow && next === ',')) break;
         if ((ch === ' ' || ch === '\t') && next === '#') break;
         offset += 1;
         ch = next;

package/browser/dist/cst/source-utils.js

@@ -0,0 +1,179 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getLinePos = getLinePos;
+exports.getLine = getLine;
+exports.getPrettyContext = getPrettyContext;
+
+function findLineStarts(src) {
+  var ls = [0];
+  var offset = src.indexOf('\n');
+
+  while (offset !== -1) {
+    offset += 1;
+    ls.push(offset);
+    offset = src.indexOf('\n', offset);
+  }
+
+  return ls;
+}
+
+function getSrcInfo(cst) {
+  var lineStarts, src;
+
+  if (typeof cst === 'string') {
+    lineStarts = findLineStarts(cst);
+    src = cst;
+  } else {
+    if (Array.isArray(cst)) cst = cst[0];
+
+    if (cst && cst.context) {
+      if (!cst.lineStarts) cst.lineStarts = findLineStarts(cst.context.src);
+      lineStarts = cst.lineStarts;
+      src = cst.context.src;
+    }
+  }
+
+  return {
+    lineStarts: lineStarts,
+    src: src
+  };
+}
+/**
+ * @typedef {Object} LinePos - One-indexed position in the source
+ * @property {number} line
+ * @property {number} col
+ */
+
+/**
+ * Determine the line/col position matching a character offset.
+ *
+ * Accepts a source string or a CST document as the second parameter. With
+ * the latter, starting indices for lines are cached in the document as
+ * `lineStarts: number[]`.
+ *
+ * Returns a one-indexed `{ line, col }` location if found, or
+ * `undefined` otherwise.
+ *
+ * @param {number} offset
+ * @param {string|Document|Document[]} cst
+ * @returns {?LinePos}
+ */
+
+
+function getLinePos(offset, cst) {
+  if (typeof offset !== 'number' || offset < 0) return null;
+
+  var _getSrcInfo = getSrcInfo(cst),
+      lineStarts = _getSrcInfo.lineStarts,
+      src = _getSrcInfo.src;
+
+  if (!lineStarts || !src || offset > src.length) return null;
+
+  for (var i = 0; i < lineStarts.length; ++i) {
+    var start = lineStarts[i];
+
+    if (offset < start) {
+      return {
+        line: i,
+        col: offset - lineStarts[i - 1] + 1
+      };
+    }
+
+    if (offset === start) return {
+      line: i + 1,
+      col: 1
+    };
+  }
+
+  var line = lineStarts.length;
+  return {
+    line: line,
+    col: offset - lineStarts[line - 1] + 1
+  };
+}
+/**
+ * Get a specified line from the source.
+ *
+ * Accepts a source string or a CST document as the second parameter. With
+ * the latter, starting indices for lines are cached in the document as
+ * `lineStarts: number[]`.
+ *
+ * Returns the line as a string if found, or `null` otherwise.
+ *
+ * @param {number} line One-indexed line number
+ * @param {string|Document|Document[]} cst
+ * @returns {?string}
+ */
+
+
+function getLine(line, cst) {
+  var _getSrcInfo2 = getSrcInfo(cst),
+      lineStarts = _getSrcInfo2.lineStarts,
+      src = _getSrcInfo2.src;
+
+  if (!lineStarts || !(line >= 1) || line > lineStarts.length) return null;
+  var start = lineStarts[line - 1];
+  var end = lineStarts[line]; // undefined for last line; that's ok for slice()
+
+  while (end && end > start && src[end - 1] === '\n') {
+    --end;
+  }
+
+  return src.slice(start, end);
+}
+/**
+ * Pretty-print the starting line from the source indicated by the range `pos`
+ *
+ * Trims output to `maxWidth` chars while keeping the starting column visible,
+ * using `…` at either end to indicate dropped characters.
+ *
+ * Returns a two-line string (or `null`) with `\n` as separator; the second line
+ * will hold appropriately indented `^` marks indicating the column range.
+ *
+ * @param {Object} pos
+ * @param {LinePos} pos.start
+ * @param {LinePos} [pos.end]
+ * @param {string|Document|Document[]*} cst
+ * @param {number} [maxWidth=80]
+ * @returns {?string}
+ */
+
+
+function getPrettyContext(_ref, cst) {
+  var start = _ref.start,
+      end = _ref.end;
+  var maxWidth = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 80;
+  var src = getLine(start.line, cst);
+  if (!src) return null;
+  var col = start.col;
+
+  if (src.length > maxWidth) {
+    if (col <= maxWidth - 10) {
+      src = src.substr(0, maxWidth - 1) + '…';
+    } else {
+      var halfWidth = Math.round(maxWidth / 2);
+      if (src.length > col + halfWidth) src = src.substr(0, col + halfWidth - 1) + '…';
+      col -= src.length - maxWidth;
+      src = '…' + src.substr(1 - maxWidth);
+    }
+  }
+
+  var errLen = 1;
+  var errEnd = '';
+
+  if (end) {
+    if (end.line === start.line && col + (end.col - start.col) <= maxWidth + 1) {
+      errLen = end.col - start.col;
+    } else {
+      errLen = Math.min(src.length + 1, maxWidth) - col;
+      errEnd = '…';
+    }
+  }
+
+  var offset = col > 1 ? ' '.repeat(col - 1) : '';
+  var err = '^'.repeat(errLen);
+  return "".concat(src, "\n").concat(offset).concat(err).concat(errEnd);
+}

package/browser/dist/errors.js

@@ -21,6 +21,10 @@ var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/w
 
 var _Node = _interopRequireDefault(require("./cst/Node"));
 
+var _sourceUtils = require("./cst/source-utils");
+
+var _Range = _interopRequireDefault(require("./cst/Range"));
+
 var YAMLError =
 /*#__PURE__*/
 function (_Error) {
@@ -41,12 +45,41 @@ function (_Error) {
   (0, _createClass2.default)(YAMLError, [{
     key: "makePretty",
     value: function makePretty() {
-      if (this.source) {
-        this.nodeType = this.source.type;
+      if (!this.source) return;
+      this.nodeType = this.source.type;
+      var cst = this.source.context && this.source.context.root;
+
+      if (typeof this.offset === 'number') {
+        this.range = new _Range.default(this.offset, this.offset + 1);
+        var start = cst && (0, _sourceUtils.getLinePos)(this.offset, cst);
+
+        if (start) {
+          var end = {
+            line: start.line,
+            col: start.col + 1
+          };
+          this.linePos = {
+            start: start,
+            end: end
+          };
+        }
+
+        delete this.offset;
+      } else {
         this.range = this.source.range;
         this.linePos = this.source.rangeAsLinePos;
-        delete this.source;
       }
+
+      if (this.linePos) {
+        var _this$linePos$start = this.linePos.start,
+            line = _this$linePos$start.line,
+            col = _this$linePos$start.col;
+        this.message += " at line ".concat(line, ", column ").concat(col);
+        var ctx = cst && (0, _sourceUtils.getPrettyContext)(this.linePos, cst);
+        if (ctx) this.message += ":\n\n".concat(ctx, "\n");
+      }
+
+      delete this.source;
     }
   }]);
   return YAMLError;

package/browser/dist/index.js

@@ -23,7 +23,8 @@ var _errors = require("./errors");
 
 var _schema = _interopRequireDefault(require("./schema"));
 
-/* global console */
+var _warnings = require("./warnings");
+
 var defaultOptions = {
   anchorPrefix: 'a',
   customTags: null,
@@ -34,6 +35,7 @@ var defaultOptions = {
   maxAliasCount: 100,
   prettyErrors: false,
   // TODO Set true in v2
+  simpleKeys: false,
   version: '1.2'
 };
 
@@ -110,10 +112,9 @@ function parseDocument(src, options) {
 }
 
 function parse(src, options) {
-  var doc = parseDocument(src, options); // eslint-disable-next-line no-console
-
+  var doc = parseDocument(src, options);
   doc.warnings.forEach(function (warning) {
-    return console.warn(warning);
+    return (0, _warnings.warn)(warning);
   });
   if (doc.errors.length > 0) throw doc.errors[0];
   return doc.toJSON();

package/browser/dist/schema/Alias.js

@@ -119,7 +119,7 @@ function (_Node) {
         return a.node === _this2.source;
       });
 
-      if (!anchor || !anchor.res) {
+      if (!anchor || anchor.res === undefined) {
         var msg = 'This should not happen: Alias anchor was not resolved?';
         if (this.cstNode) throw new _errors.YAMLReferenceError(this.cstNode, msg);else throw new ReferenceError(msg);
       }

package/browser/dist/schema/Merge.js

@@ -95,7 +95,7 @@ function (_Pair) {
               } else if (map instanceof Set) {
                 map.add(key);
               } else {
-                if (!map.hasOwnProperty(key)) map[key] = value;
+                if (!Object.prototype.hasOwnProperty.call(map, key)) map[key] = value;
               }
             }
           } catch (err) {

package/browser/dist/schema/Pair.js

@@ -21,6 +21,8 @@ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 
 var _addComment = _interopRequireDefault(require("../addComment"));
 
+var _constants = require("../constants");
+
 var _toJSON = _interopRequireDefault(require("../toJSON"));
 
 var _Collection = _interopRequireDefault(require("./Collection"));
@@ -87,10 +89,23 @@ function (_Node) {
     key: "toString",
     value: function toString(ctx, onComment, onChompKeep) {
       if (!ctx || !ctx.doc) return JSON.stringify(this);
+      var simpleKeys = ctx.doc.options.simpleKeys;
       var key = this.key,
           value = this.value;
       var keyComment = key instanceof _Node2.default && key.comment;
-      var explicitKey = !key || keyComment || key instanceof _Collection.default;
+
+      if (simpleKeys) {
+        if (keyComment) {
+          throw new Error('With simple keys, key nodes cannot have comments');
+        }
+
+        if (key instanceof _Collection.default) {
+          var msg = 'With simple keys, collection cannot be used as a key value';
+          throw new Error(msg);
+        }
+      }
+
+      var explicitKey = !simpleKeys && (!key || keyComment || key instanceof _Collection.default || key.type === _constants.Type.BLOCK_FOLDED || key.type === _constants.Type.BLOCK_LITERAL);
       var _ctx = ctx,
           doc = _ctx.doc,
           indent = _ctx.indent;
@@ -106,7 +121,7 @@ function (_Node) {
       });
       str = (0, _addComment.default)(str, ctx.indent, keyComment);
 
-      if (ctx.allNullValues) {
+      if (ctx.allNullValues && !simpleKeys) {
         if (this.comment) {
           str = (0, _addComment.default)(str, ctx.indent, this.comment);
           if (onComment) onComment();

package/browser/dist/schema/index.js

@@ -15,7 +15,7 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _deprecation = require("../deprecation");
+var _warnings = require("../warnings");
 
 var _constants = require("../constants");
 
@@ -69,7 +69,7 @@ function () {
 
     if (!customTags && deprecatedCustomTags) {
       customTags = deprecatedCustomTags;
-      (0, _deprecation.warnOptionDeprecation)('tags', 'customTags');
+      (0, _warnings.warnOptionDeprecation)('tags', 'customTags');
     }
 
     if (Array.isArray(customTags)) {
@@ -122,6 +122,7 @@ function () {
   (0, _createClass2.default)(Schema, [{
     key: "createNode",
     value: function createNode(value, wrapScalars, tag, ctx) {
+      if (value instanceof _Node.default) return value;
       var tagObj;
 
       if (tag) {
@@ -250,7 +251,7 @@ function () {
     key: "resolveNodeWithFallback",
     value: function resolveNodeWithFallback(doc, node, tagName) {
       var res = this.resolveNode(doc, node, tagName);
-      if (node.hasOwnProperty('resolved')) return res;
+      if (Object.prototype.hasOwnProperty.call(node, 'resolved')) return res;
       var fallback = isMap(node) ? Schema.defaultTags.MAP : isSeq(node) ? Schema.defaultTags.SEQ : Schema.defaultTags.STR;
 
       if (fallback) {

package/browser/dist/schema/parseMap.js

@@ -25,6 +25,8 @@ var _parseUtils = require("./parseUtils");
 
 var _Alias = _interopRequireDefault(require("./Alias"));
 
+var _Collection = _interopRequireDefault(require("./Collection"));
+
 function parseMap(doc, cst) {
   if (cst.type !== _constants.Type.MAP && cst.type !== _constants.Type.FLOW_MAP) {
     var msg = "A ".concat(cst.type, " node cannot be resolved as a mapping");
@@ -39,9 +41,11 @@ function parseMap(doc, cst) {
   var map = new _Map.default();
   map.items = items;
   (0, _parseUtils.resolveComments)(map, comments);
+  var hasCollectionKey = false;
 
   for (var i = 0; i < items.length; ++i) {
     var iKey = items[i].key;
+    if (iKey instanceof _Collection.default) hasCollectionKey = true;
 
     if (doc.schema.merge && iKey && iKey.value === _Merge.MERGE_KEY) {
       items[i] = new _Merge.default(items[i]);
@@ -63,7 +67,7 @@ function parseMap(doc, cst) {
       for (var j = i + 1; j < items.length; ++j) {
         var jKey = items[j].key;
 
-        if (iKey === jKey || iKey && jKey && iKey.hasOwnProperty('value') && iKey.value === jKey.value) {
+        if (iKey === jKey || iKey && jKey && Object.prototype.hasOwnProperty.call(iKey, 'value') && iKey.value === jKey.value) {
           var _msg = "Map keys must be unique; \"".concat(iKey, "\" is repeated");
 
           doc.errors.push(new _errors.YAMLSemanticError(cst, _msg));
@@ -73,6 +77,11 @@ function parseMap(doc, cst) {
     }
   }
 
+  if (hasCollectionKey && !doc.options.mapAsMap) {
+    var warn = 'Keys with collection values will be stringified as YAML due to JS Object restrictions. Use mapAsMap: true to avoid this.';
+    doc.warnings.push(new _errors.YAMLWarning(cst, warn));
+  }
+
   cst.resolved = map;
   return map;
 }
@@ -246,7 +255,8 @@ function resolveFlowMapItems(doc, cst) {
     var item = cst.items[i];
 
     if (typeof item.char === 'string') {
-      var char = item.char;
+      var char = item.char,
+          offset = item.offset;
 
       if (char === '?' && key === undefined && !explicitKey) {
         explicitKey = true;
@@ -286,7 +296,10 @@ function resolveFlowMapItems(doc, cst) {
         continue;
       }
 
-      doc.errors.push(new _errors.YAMLSyntaxError(cst, "Flow map contains an unexpected ".concat(char)));
+      var msg = "Flow map contains an unexpected ".concat(char);
+      var err = new _errors.YAMLSyntaxError(cst, msg);
+      err.offset = offset;
+      doc.errors.push(err);
     } else if (item.type === _constants.Type.BLANK_LINE) {
       comments.push({
         afterKey: !!key,
@@ -310,7 +323,7 @@ function resolveFlowMapItems(doc, cst) {
     }
   }
 
-  if (cst.items[cst.items.length - 1].char !== '}') doc.errors.push(new _errors.YAMLSemanticError(cst, 'Expected flow map to end with }'));
+  (0, _parseUtils.checkFlowCollectionEnd)(doc.errors, cst);
   if (key !== undefined) items.push(new _Pair.default(key));
   return {
     comments: comments,