yaml 1.5.1 → 1.7.2

package/browser/dist/schema/parseSeq.js

@@ -17,6 +17,8 @@ var _parseUtils = require("./parseUtils");
 
 var _Seq = _interopRequireDefault(require("./Seq"));
 
+var _Collection = _interopRequireDefault(require("./Collection"));
+
 function parseSeq(doc, cst) {
   if (cst.type !== _constants.Type.SEQ && cst.type !== _constants.Type.FLOW_SEQ) {
     var msg = "A ".concat(cst.type, " node cannot be resolved as a sequence");
@@ -31,6 +33,14 @@ function parseSeq(doc, cst) {
   var seq = new _Seq.default();
   seq.items = items;
   (0, _parseUtils.resolveComments)(seq, comments);
+
+  if (!doc.options.mapAsMap && items.some(function (it) {
+    return it instanceof _Pair.default && it.key instanceof _Collection.default;
+  })) {
+    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 = seq;
   return seq;
 }
@@ -91,7 +101,8 @@ function resolveFlowSeqItems(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 !== ':' && (explicitKey || key !== undefined)) {
         if (explicitKey && key === undefined) key = next ? items.pop() : null;
@@ -110,8 +121,10 @@ function resolveFlowSeqItems(doc, cst) {
           key = items.pop();
 
           if (key instanceof _Pair.default) {
-            var msg = 'Chaining flow sequence pairs is invalid (e.g. [ a : b : c ])';
-            doc.errors.push(new _errors.YAMLSemanticError(char, msg));
+            var msg = 'Chaining flow sequence pairs is invalid';
+            var err = new _errors.YAMLSemanticError(cst, msg);
+            err.offset = offset;
+            doc.errors.push(err);
           }
 
           if (!explicitKey) (0, _parseUtils.checkKeyLength)(doc.errors, cst, i, key, keyStart);
@@ -126,7 +139,10 @@ function resolveFlowSeqItems(doc, cst) {
       } else if (next === '[' || char !== ']' || i < cst.items.length - 1) {
         var _msg = "Flow sequence contains an unexpected ".concat(char);
 
-        doc.errors.push(new _errors.YAMLSyntaxError(cst, _msg));
+        var _err = new _errors.YAMLSyntaxError(cst, _msg);
+
+        _err.offset = offset;
+        doc.errors.push(_err);
       }
     } else if (item.type === _constants.Type.BLANK_LINE) {
       comments.push({
@@ -139,7 +155,7 @@ function resolveFlowSeqItems(doc, cst) {
       });
     } else {
       if (next) {
-        var _msg2 = "Expected a ".concat(next, " here in flow sequence");
+        var _msg2 = "Expected a ".concat(next, " in flow sequence");
 
         doc.errors.push(new _errors.YAMLSemanticError(item, _msg2));
       }
@@ -158,7 +174,7 @@ function resolveFlowSeqItems(doc, cst) {
     }
   }
 
-  if (cst.items[cst.items.length - 1].char !== ']') doc.errors.push(new _errors.YAMLSemanticError(cst, 'Expected flow sequence to end with ]'));
+  (0, _parseUtils.checkFlowCollectionEnd)(doc.errors, cst);
   if (key !== undefined) items.push(new _Pair.default(key));
   return {
     comments: comments,

package/browser/dist/schema/parseUtils.js

@@ -3,11 +3,60 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.checkFlowCollectionEnd = checkFlowCollectionEnd;
 exports.checkKeyLength = checkKeyLength;
 exports.resolveComments = resolveComments;
 
 var _errors = require("../errors");
 
+var _constants = require("../constants");
+
+function checkFlowCollectionEnd(errors, cst) {
+  var char, name;
+
+  switch (cst.type) {
+    case _constants.Type.FLOW_MAP:
+      char = '}';
+      name = 'flow map';
+      break;
+
+    case _constants.Type.FLOW_SEQ:
+      char = ']';
+      name = 'flow sequence';
+      break;
+
+    default:
+      errors.push(new _errors.YAMLSemanticError(cst, 'Not a flow collection!?'));
+      return;
+  }
+
+  var lastItem;
+
+  for (var i = cst.items.length - 1; i >= 0; --i) {
+    var item = cst.items[i];
+
+    if (!item || item.type !== _constants.Type.COMMENT) {
+      lastItem = item;
+      break;
+    }
+  }
+
+  if (lastItem && lastItem.char !== char) {
+    var msg = "Expected ".concat(name, " to end with ").concat(char);
+    var err;
+
+    if (typeof lastItem.offset === 'number') {
+      err = new _errors.YAMLSemanticError(cst, msg);
+      err.offset = lastItem.offset + 1;
+    } else {
+      err = new _errors.YAMLSemanticError(lastItem, msg);
+      if (lastItem.range && lastItem.range.end) err.offset = lastItem.range.end - lastItem.range.start;
+    }
+
+    errors.push(err);
+  }
+}
+
 function checkKeyLength(errors, node, itemIdx, key, keyStart) {
   if (!key || typeof keyStart !== 'number') return;
   var item = node.items[itemIdx];

package/browser/dist/stringify.js

@@ -265,10 +265,11 @@ function plainString(item, ctx, onComment, onChompKeep) {
     return blockString(item, ctx, onComment, onChompKeep);
   }
 
-  var str = value.replace(/\n+/g, "$&\n".concat(indent)); // May need to verify that output will be parsed as a string, as plain numbers
-  // and booleans get parsed with those types, e.g. '42', 'true' & '0.9e-3'.
+  var str = value.replace(/\n+/g, "$&\n".concat(indent)); // Verify that output will be parsed as a string, as e.g. plain numbers and
+  // booleans get parsed with those types in v1.2 (e.g. '42', 'true' & '0.9e-3'),
+  // and others in v1.1.
 
-  if (actualString && /^[\w.+-]+$/.test(str) && typeof tags.resolveScalar(str).value !== 'string') {
+  if (actualString && typeof tags.resolveScalar(str).value !== 'string') {
     return doubleQuotedString(value, ctx);
   }
 

package/browser/dist/tags/failsafe/map.js

@@ -47,8 +47,8 @@ function createMap(schema, obj, ctx) {
     }
   } else if (obj && (0, _typeof2.default)(obj) === 'object') {
     for (var _i = 0, _Object$keys = Object.keys(obj); _i < _Object$keys.length; _i++) {
-      var key = _Object$keys[_i];
-      map.items.push(schema.createPair(key, obj[key], ctx));
+      var _key = _Object$keys[_i];
+      map.items.push(schema.createPair(_key, obj[_key], ctx));
     }
   }
 

package/browser/dist/{deprecation.js → warnings.js}

@@ -3,23 +3,29 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.warn = warn;
 exports.warnFileDeprecation = warnFileDeprecation;
 exports.warnOptionDeprecation = warnOptionDeprecation;
 
 /* global global, console */
-function warn(msg) {
-  if (global && global.process && global.process.emitWarning) {
-    global.process.emitWarning(msg, 'DeprecationWarning');
-  } else {
+function warn(warning, type) {
+  if (global && global._YAML_SILENCE_WARNINGS) return;
+
+  var _ref = global && global.process,
+      emitWarning = _ref.emitWarning; // This will throw in Jest if `warning` is an Error instance due to
+  // https://github.com/facebook/jest/issues/2549
+
+
+  if (emitWarning) emitWarning(warning, type);else {
     // eslint-disable-next-line no-console
-    console.warn("DeprecationWarning: ".concat(msg));
+    console.warn(type ? "".concat(type, ": ").concat(warning) : warning);
   }
 }
 
 function warnFileDeprecation(filename) {
   if (global && global._YAML_SILENCE_DEPRECATION_WARNINGS) return;
   var path = filename.replace(/.*yaml[/\\]/i, '').replace(/\.js$/, '').replace(/\\/g, '/');
-  warn("The endpoint 'yaml/".concat(path, "' will be removed in a future release."));
+  warn("The endpoint 'yaml/".concat(path, "' will be removed in a future release."), 'DeprecationWarning');
 }
 
 var warned = {};
@@ -30,5 +36,5 @@ function warnOptionDeprecation(name, alternative) {
   warned[name] = true;
   var msg = "The option '".concat(name, "' will be removed in a future release");
   msg += alternative ? ", use '".concat(alternative, "' instead.") : '.';
-  warn(msg);
+  warn(msg, 'DeprecationWarning');
 }

package/browser/map.js

@@ -1,2 +1,2 @@
 module.exports = require('./dist/schema/Map').default
-require('./dist/deprecation').warnFileDeprecation(__filename)
+require('./dist/warnings').warnFileDeprecation(__filename)

package/browser/pair.js

@@ -1,2 +1,2 @@
 module.exports = require('./dist/schema/Pair').default
-require('./dist/deprecation').warnFileDeprecation(__filename)
+require('./dist/warnings').warnFileDeprecation(__filename)

package/browser/scalar.js

@@ -1,2 +1,2 @@
 module.exports = require('./dist/schema/Scalar').default
-require('./dist/deprecation').warnFileDeprecation(__filename)
+require('./dist/warnings').warnFileDeprecation(__filename)

package/browser/schema.js

@@ -4,4 +4,4 @@ module.exports.nullOptions = opt.nullOptions
 module.exports.strOptions = opt.strOptions
 module.exports.stringify = require('./dist/stringify').stringifyString
 
-require('./dist/deprecation').warnFileDeprecation(__filename)
+require('./dist/warnings').warnFileDeprecation(__filename)

package/browser/seq.js

@@ -1,2 +1,2 @@
 module.exports = require('./dist/schema/Seq').default
-require('./dist/deprecation').warnFileDeprecation(__filename)
+require('./dist/warnings').warnFileDeprecation(__filename)

package/browser/types/binary.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, '__esModule', { value: true })
 exports.binary = require('../dist/tags/yaml-1.1/binary').default
 exports.default = [exports.binary]
 
-require('../dist/deprecation').warnFileDeprecation(__filename)
+require('../dist/warnings').warnFileDeprecation(__filename)

package/browser/types/omap.js

@@ -1,2 +1,2 @@
 module.exports = require('../dist/tags/yaml-1.1/omap').default
-require('../dist/deprecation').warnFileDeprecation(__filename)
+require('../dist/warnings').warnFileDeprecation(__filename)

package/browser/types/pairs.js

@@ -1,2 +1,2 @@
 module.exports = require('../dist/tags/yaml-1.1/pairs').default
-require('../dist/deprecation').warnFileDeprecation(__filename)
+require('../dist/warnings').warnFileDeprecation(__filename)

package/browser/types/set.js

@@ -1,2 +1,2 @@
 module.exports = require('../dist/tags/yaml-1.1/set').default
-require('../dist/deprecation').warnFileDeprecation(__filename)
+require('../dist/warnings').warnFileDeprecation(__filename)

package/browser/types/timestamp.js

@@ -7,4 +7,4 @@ exports.floatTime = ts.floatTime
 exports.intTime = ts.intTime
 exports.timestamp = ts.timestamp
 
-require('../dist/deprecation').warnFileDeprecation(__filename)
+require('../dist/warnings').warnFileDeprecation(__filename)

package/dist/Document.js

@@ -27,7 +27,9 @@ var _Scalar = _interopRequireDefault(require("./schema/Scalar"));
 
 var _toJSON = _interopRequireDefault(require("./toJSON"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
+function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; if (obj != null) { var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -41,6 +43,7 @@ class Document {
     this.commentBefore = null;
     this.comment = null;
     this.contents = null;
+    this.directivesEndMarker = null;
     this.errors = [];
     this.options = options;
     this.schema = null;
@@ -114,8 +117,20 @@ class Document {
     }
   }
 
-  setSchema() {
-    if (!this.schema) this.schema = new _schema.default(Object.assign({}, this.getDefaults(), this.options));
+  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;
+    const opt = Object.assign({}, this.getDefaults(), this.options);
+    this.schema = new _schema.default(opt);
   }
 
   parse(node, prevDoc) {
@@ -124,6 +139,7 @@ class Document {
     const {
       directives = [],
       contents = [],
+      directivesEndMarker,
       error,
       valueRange
     } = node;
@@ -134,6 +150,7 @@ class Document {
     }
 
     this.parseDirectives(directives, prevDoc);
+    if (directivesEndMarker) this.directivesEndMarker = true;
     this.range = valueRange ? [valueRange.start, valueRange.end] : null;
     this.setSchema();
     this.anchors._cstAliases = [];
@@ -400,12 +417,10 @@ class Document {
     };
     const props = isCollectionItem(node.context.parent) ? node.context.parent.props.concat(node.props) : node.props;
 
-    for (const _ref of props) {
-      const {
-        start,
-        end
-      } = _ref;
-
+    for (const {
+      start,
+      end
+    } of props) {
       switch (node.context.src[start]) {
         case _constants.Char.COMMENT:
           {
@@ -592,7 +607,6 @@ class Document {
     if (this.errors.length > 0) throw new Error('Document with errors cannot be stringified');
     this.setSchema();
     const lines = [];
-    if (this.commentBefore) lines.push(this.commentBefore.replace(/^/gm, '#'), '');
     let hasDirectives = false;
 
     if (this.version) {
@@ -616,7 +630,13 @@ class Document {
         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, '#'));
+    }
+
     const ctx = {
       anchors: {},
       doc: this,
@@ -627,7 +647,7 @@ class Document {
 
     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/dist/cst/CollectionItem.js

@@ -49,12 +49,15 @@ class CollectionItem extends _Node.default {
     let offset = _Node.default.endOfWhiteSpace(src, start + 1);
 
     let ch = src[offset];
+    const inlineComment = ch === '#';
+    const comments = [];
+    let blankLine = null;
 
     while (ch === '\n' || ch === '#') {
       if (ch === '#') {
         const end = _Node.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;
@@ -62,13 +65,11 @@ class CollectionItem extends _Node.default {
 
         const wsEnd = _Node.default.endOfWhiteSpace(src, lineStart);
 
-        if (src[wsEnd] === '\n') {
-          const blankLine = new _BlankLine.default();
+        if (src[wsEnd] === '\n' && comments.length === 0) {
+          blankLine = new _BlankLine.default();
           lineStart = blankLine.parse({
             src
           }, lineStart);
-          const items = context.parent.items || context.parent.contents;
-          items.push(blankLine);
         }
 
         offset = _Node.default.endOfIndent(src, lineStart);
@@ -85,11 +86,31 @@ class CollectionItem extends _Node.default {
         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
+        const 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) {
+        const c = comments[0];
+        this.props.push(c);
+        offset = c.end;
+      } else {
+        offset = _Node.default.endOfLine(src, start + 1);
+      }
+    }
+
     const end = this.node ? this.node.valueRange.end : offset;
     this.valueRange = new _Range.default(start, end);
     return offset;

package/dist/cst/Document.js

@@ -35,6 +35,8 @@ class Document extends _Node.default {
     super(_constants.Type.DOCUMENT);
     this.directives = null;
     this.contents = null;
+    this.directivesEndMarker = null;
+    this.documentEndMarker = null;
   }
 
   parseDirectives(start) {
@@ -103,7 +105,10 @@ class Document extends _Node.default {
       }
     }
 
-    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');
@@ -190,6 +195,7 @@ class Document extends _Node.default {
     this.valueRange.end = offset;
 
     if (src[offset]) {
+      this.documentEndMarker = new _Range.default(offset, offset + 3);
       offset += 3;
 
       if (src[offset]) {
@@ -244,9 +250,11 @@ class Document extends _Node.default {
     this.directives.forEach(node => {
       offset = node.setOrigRanges(cr, offset);
     });
+    if (this.directivesEndMarker) offset = this.directivesEndMarker.setOrigRange(cr, offset);
     this.contents.forEach(node => {
       offset = node.setOrigRanges(cr, offset);
     });
+    if (this.documentEndMarker) offset = this.documentEndMarker.setOrigRange(cr, offset);
     return offset;
   }
 

package/dist/cst/FlowCollection.js

@@ -74,7 +74,15 @@ class FlowCollection extends _Node.default {
             }
 
             offset = _Node.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 !== '}') {
+                const msg = 'Insufficient indentation in flow collection';
+                this.error = new _errors.YAMLSemanticError(this, msg);
+              }
+            }
           }
           break;
 

package/dist/cst/Node.js

@@ -7,7 +7,7 @@ exports.default = void 0;
 
 var _constants = require("../constants");
 
-var _getLinePos = _interopRequireDefault(require("./getLinePos"));
+var _sourceUtils = require("./source-utils");
 
 var _Range = _interopRequireDefault(require("./Range"));
 
@@ -171,7 +171,10 @@ class Node {
   }
 
   constructor(type, props, context) {
-    this.context = context || null;
+    Object.defineProperty(this, 'context', {
+      value: context || null,
+      writable: true
+    });
     this.error = null;
     this.range = null;
     this.valueRange = null;
@@ -260,9 +263,9 @@ class Node {
 
   get rangeAsLinePos() {
     if (!this.range || !this.context) return undefined;
-    const start = (0, _getLinePos.default)(this.range.start, this.context.root);
+    const start = (0, _sourceUtils.getLinePos)(this.range.start, this.context.root);
     if (!start) return undefined;
-    const end = (0, _getLinePos.default)(this.range.end, this.context.root);
+    const end = (0, _sourceUtils.getLinePos)(this.range.end, this.context.root);
     return {
       start,
       end

package/dist/cst/PlainValue.js

@@ -19,7 +19,7 @@ class PlainValue extends _Node.default {
     while (ch && ch !== '\n') {
       if (inFlow && (ch === '[' || ch === ']' || ch === '{' || ch === '}' || ch === ',')) break;
       const 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;