yaml 1.3.2 → 1.6.0

package/browser/dist/cst/getLinePos.js

@@ -76,7 +76,4 @@ function getLinePos(offset, cst) {
   }
 
   return undefined;
-}
-
-module.exports = exports.default;
-module.exports.default = exports.default;
+}

package/browser/dist/cst/parse.js

@@ -56,7 +56,4 @@ function parse(src) {
   };
 
   return documents;
-}
-
-module.exports = exports.default;
-module.exports.default = exports.default;
+}

package/browser/dist/deprecation.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+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 {
+    // eslint-disable-next-line no-console
+    console.warn("DeprecationWarning: ".concat(msg));
+  }
+}
+
+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."));
+}
+
+var warned = {};
+
+function warnOptionDeprecation(name, alternative) {
+  if (global && global._YAML_SILENCE_DEPRECATION_WARNINGS) return;
+  if (warned[name]) return;
+  warned[name] = true;
+  var msg = "The option '".concat(name, "' will be removed in a future release");
+  msg += alternative ? ", use '".concat(alternative, "' instead.") : '.';
+  warn(msg);
+}

package/browser/dist/errors.js

@@ -5,10 +5,12 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.YAMLWarning = exports.YAMLSyntaxError = exports.YAMLSemanticError = exports.YAMLReferenceError = void 0;
+exports.YAMLWarning = exports.YAMLSyntaxError = exports.YAMLSemanticError = exports.YAMLReferenceError = exports.YAMLError = void 0;
 
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
+
 var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 
 var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
@@ -19,106 +21,95 @@ var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/w
 
 var _Node = _interopRequireDefault(require("./cst/Node"));
 
-var YAMLReferenceError =
+var YAMLError =
 /*#__PURE__*/
-function (_ReferenceError) {
-  (0, _inherits2.default)(YAMLReferenceError, _ReferenceError);
+function (_Error) {
+  (0, _inherits2.default)(YAMLError, _Error);
 
-  function YAMLReferenceError(source, message) {
+  function YAMLError(name, source, message) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, YAMLReferenceError);
-
-    if (!message || !(source instanceof _Node.default)) {
-      throw new Error('Invalid arguments for new YAMLReferenceError');
-    }
-
-    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLReferenceError).call(this));
-    _this.name = 'YAMLReferenceError';
+    (0, _classCallCheck2.default)(this, YAMLError);
+    if (!message || !(source instanceof _Node.default)) throw new Error("Invalid arguments for new ".concat(name));
+    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLError).call(this));
+    _this.name = name;
     _this.message = message;
     _this.source = source;
     return _this;
   }
 
+  (0, _createClass2.default)(YAMLError, [{
+    key: "makePretty",
+    value: function makePretty() {
+      if (this.source) {
+        this.nodeType = this.source.type;
+        this.range = this.source.range;
+        this.linePos = this.source.rangeAsLinePos;
+        delete this.source;
+      }
+    }
+  }]);
+  return YAMLError;
+}((0, _wrapNativeSuper2.default)(Error));
+
+exports.YAMLError = YAMLError;
+
+var YAMLReferenceError =
+/*#__PURE__*/
+function (_YAMLError) {
+  (0, _inherits2.default)(YAMLReferenceError, _YAMLError);
+
+  function YAMLReferenceError(source, message) {
+    (0, _classCallCheck2.default)(this, YAMLReferenceError);
+    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLReferenceError).call(this, 'YAMLReferenceError', source, message));
+  }
+
   return YAMLReferenceError;
-}((0, _wrapNativeSuper2.default)(ReferenceError));
+}(YAMLError);
 
 exports.YAMLReferenceError = YAMLReferenceError;
 
 var YAMLSemanticError =
 /*#__PURE__*/
-function (_SyntaxError) {
-  (0, _inherits2.default)(YAMLSemanticError, _SyntaxError);
+function (_YAMLError2) {
+  (0, _inherits2.default)(YAMLSemanticError, _YAMLError2);
 
   function YAMLSemanticError(source, message) {
-    var _this2;
-
     (0, _classCallCheck2.default)(this, YAMLSemanticError);
-
-    if (!message || !(source instanceof _Node.default)) {
-      throw new Error('Invalid arguments for new YAMLSemanticError');
-    }
-
-    _this2 = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLSemanticError).call(this));
-    _this2.name = 'YAMLSemanticError';
-    _this2.message = message;
-    _this2.source = source;
-    return _this2;
+    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLSemanticError).call(this, 'YAMLSemanticError', source, message));
   }
 
   return YAMLSemanticError;
-}((0, _wrapNativeSuper2.default)(SyntaxError));
+}(YAMLError);
 
 exports.YAMLSemanticError = YAMLSemanticError;
 
 var YAMLSyntaxError =
 /*#__PURE__*/
-function (_SyntaxError2) {
-  (0, _inherits2.default)(YAMLSyntaxError, _SyntaxError2);
+function (_YAMLError3) {
+  (0, _inherits2.default)(YAMLSyntaxError, _YAMLError3);
 
   function YAMLSyntaxError(source, message) {
-    var _this3;
-
     (0, _classCallCheck2.default)(this, YAMLSyntaxError);
-
-    if (!message || !(source instanceof _Node.default)) {
-      throw new Error('Invalid arguments for new YAMLSyntaxError');
-    }
-
-    _this3 = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLSyntaxError).call(this));
-    _this3.name = 'YAMLSyntaxError';
-    _this3.message = message;
-    _this3.source = source;
-    return _this3;
+    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLSyntaxError).call(this, 'YAMLSyntaxError', source, message));
   }
 
   return YAMLSyntaxError;
-}((0, _wrapNativeSuper2.default)(SyntaxError));
+}(YAMLError);
 
 exports.YAMLSyntaxError = YAMLSyntaxError;
 
 var YAMLWarning =
 /*#__PURE__*/
-function (_Error) {
-  (0, _inherits2.default)(YAMLWarning, _Error);
+function (_YAMLError4) {
+  (0, _inherits2.default)(YAMLWarning, _YAMLError4);
 
   function YAMLWarning(source, message) {
-    var _this4;
-
     (0, _classCallCheck2.default)(this, YAMLWarning);
-
-    if (!message || !(source instanceof _Node.default)) {
-      throw new Error('Invalid arguments for new YAMLWarning');
-    }
-
-    _this4 = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLWarning).call(this));
-    _this4.name = 'YAMLWarning';
-    _this4.message = message;
-    _this4.source = source;
-    return _this4;
+    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLWarning).call(this, 'YAMLWarning', source, message));
   }
 
   return YAMLWarning;
-}((0, _wrapNativeSuper2.default)(Error));
+}(YAMLError);
 
 exports.YAMLWarning = YAMLWarning;

package/browser/dist/index.js

@@ -25,10 +25,15 @@ var _schema = _interopRequireDefault(require("./schema"));
 
 /* global console */
 var defaultOptions = {
+  anchorPrefix: 'a',
+  customTags: null,
+  keepCstNodes: false,
   keepNodeTypes: true,
   keepBlobsInJSON: true,
   mapAsMap: false,
-  tags: null,
+  maxAliasCount: 100,
+  prettyErrors: false,
+  // TODO Set true in v2
   version: '1.2'
 };
 
@@ -60,9 +65,36 @@ function (_YAMLDocument) {
 }(_Document.default);
 
 function parseAllDocuments(src, options) {
-  return (0, _parse.default)(src).map(function (cstDoc) {
-    return new Document(options).parse(cstDoc);
-  });
+  var stream = [];
+  var prev;
+  var _iteratorNormalCompletion = true;
+  var _didIteratorError = false;
+  var _iteratorError = undefined;
+
+  try {
+    for (var _iterator = (0, _parse.default)(src)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var cstDoc = _step.value;
+      var doc = new Document(options);
+      doc.parse(cstDoc, prev);
+      stream.push(doc);
+      prev = doc;
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+
+  return stream;
 }
 
 function parseDocument(src, options) {
@@ -103,6 +135,4 @@ var _default = {
   parseDocument: parseDocument,
   stringify: stringify
 };
-exports.default = _default;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = _default;

package/browser/dist/listTagNames.js

@@ -39,6 +39,4 @@ var _default = function _default(node) {
   return Object.keys(visit(node, {}));
 };
 
-exports.default = _default;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = _default;

package/browser/dist/schema/Alias.js

@@ -19,11 +19,60 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _Node2 = require("../cst/Node");
+var _constants = require("../constants");
+
+var _errors = require("../errors");
 
 var _toJSON2 = _interopRequireDefault(require("../toJSON"));
 
-var _Node3 = _interopRequireDefault(require("./Node"));
+var _Collection = _interopRequireDefault(require("./Collection"));
+
+var _Node2 = _interopRequireDefault(require("./Node"));
+
+var _Pair = _interopRequireDefault(require("./Pair"));
+
+var getAliasCount = function getAliasCount(node, anchors) {
+  if (node instanceof Alias) {
+    var anchor = anchors.find(function (a) {
+      return a.node === node.source;
+    });
+    return anchor.count * anchor.aliasCount;
+  } else if (node instanceof _Collection.default) {
+    var count = 0;
+    var _iteratorNormalCompletion = true;
+    var _didIteratorError = false;
+    var _iteratorError = undefined;
+
+    try {
+      for (var _iterator = node.items[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+        var item = _step.value;
+        var c = getAliasCount(item, anchors);
+        if (c > count) count = c;
+      }
+    } catch (err) {
+      _didIteratorError = true;
+      _iteratorError = err;
+    } finally {
+      try {
+        if (!_iteratorNormalCompletion && _iterator.return != null) {
+          _iterator.return();
+        }
+      } finally {
+        if (_didIteratorError) {
+          throw _iteratorError;
+        }
+      }
+    }
+
+    return count;
+  } else if (node instanceof _Pair.default) {
+    var kc = getAliasCount(node.key, anchors);
+    var vc = getAliasCount(node.value, anchors);
+    return Math.max(kc, vc);
+  }
+
+  return 1;
+};
 
 var Alias =
 /*#__PURE__*/
@@ -36,10 +85,12 @@ function (_Node) {
           source = _ref.source;
       var anchors = _ref2.anchors,
           doc = _ref2.doc,
-          implicitKey = _ref2.implicitKey;
+          implicitKey = _ref2.implicitKey,
+          inStringifyKey = _ref2.inStringifyKey;
       var anchor = Object.keys(anchors).find(function (a) {
         return anchors[a] === source;
       });
+      if (!anchor && inStringifyKey) anchor = doc.anchors.getName(source) || doc.anchors.newName();
       if (anchor) return "*".concat(anchor).concat(implicitKey ? ' ' : '');
       var msg = doc.anchors.getName(source) ? 'Alias node must be after source node' : 'Source node not found for alias node';
       throw new Error("".concat(msg, " [").concat(range, "]"));
@@ -52,14 +103,45 @@ function (_Node) {
     (0, _classCallCheck2.default)(this, Alias);
     _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Alias).call(this));
     _this.source = source;
-    _this.type = _Node2.Type.ALIAS;
+    _this.type = _constants.Type.ALIAS;
     return _this;
   }
 
   (0, _createClass2.default)(Alias, [{
     key: "toJSON",
-    value: function toJSON(arg, opt) {
-      return (0, _toJSON2.default)(this.source, arg, opt);
+    value: function toJSON(arg, ctx) {
+      var _this2 = this;
+
+      if (!ctx) return (0, _toJSON2.default)(this.source, arg, ctx);
+      var anchors = ctx.anchors,
+          maxAliasCount = ctx.maxAliasCount;
+      var anchor = anchors.find(function (a) {
+        return a.node === _this2.source;
+      });
+
+      if (!anchor || !anchor.res) {
+        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);
+      }
+
+      if (maxAliasCount >= 0) {
+        anchor.count += 1;
+        if (anchor.aliasCount === 0) anchor.aliasCount = getAliasCount(this.source, anchors);
+
+        if (anchor.count * anchor.aliasCount > maxAliasCount) {
+          var _msg = 'Excessive alias count indicates a resource exhaustion attack';
+          if (this.cstNode) throw new _errors.YAMLReferenceError(this.cstNode, _msg);else throw new ReferenceError(_msg);
+        }
+      }
+
+      return anchor.res;
+    } // Only called when stringifying an alias mapping key while constructing
+    // Object output.
+
+  }, {
+    key: "toString",
+    value: function toString(ctx) {
+      return Alias.stringify(this, ctx);
     }
   }, {
     key: "tag",
@@ -68,9 +150,7 @@ function (_Node) {
     }
   }]);
   return Alias;
-}(_Node3.default);
+}(_Node2.default);
 
 exports.default = Alias;
-(0, _defineProperty2.default)(Alias, "default", true);
-module.exports = exports.default;
-module.exports.default = exports.default;
+(0, _defineProperty2.default)(Alias, "default", true);

package/browser/dist/schema/Collection.js

@@ -17,10 +17,10 @@ var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime
 
 var _getPrototypeOf3 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
+
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
@@ -57,7 +57,7 @@ function (_Node) {
     }
 
     _this = (0, _possibleConstructorReturn2.default)(this, (_getPrototypeOf2 = (0, _getPrototypeOf3.default)(Collection)).call.apply(_getPrototypeOf2, [this].concat(args)));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)((0, _assertThisInitialized2.default)(_this)), "items", []);
+    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "items", []);
     return _this;
   }
 

package/browser/dist/schema/Map.js

@@ -8,8 +8,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.findPair = findPair;
 exports.default = void 0;
 
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -22,17 +20,12 @@ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
-var _toJSON2 = _interopRequireDefault(require("../toJSON"));
-
 var _Collection2 = _interopRequireDefault(require("./Collection"));
 
-var _Merge = _interopRequireDefault(require("./Merge"));
-
 var _Pair = _interopRequireDefault(require("./Pair"));
 
 var _Scalar = _interopRequireDefault(require("./Scalar"));
 
-// Published as 'yaml/map'
 function findPair(items, key) {
   var k = key instanceof _Scalar.default ? key.value : key;
   var _iteratorNormalCompletion = true;
@@ -110,52 +103,18 @@ function (_Collection) {
       var prev = findPair(this.items, key);
       if (prev) prev.value = value;else this.items.push(new _Pair.default(key, value));
     }
-  }, {
-    key: "toJSON",
-    value: function toJSON(_, opt) {
-      if (opt && opt.mapAsMap) return this.toJSMap(opt);
-      return this.items.reduce(function (map, item) {
-        if (item instanceof _Merge.default) {
-          (function () {
-            // 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 keys = Object.keys(map);
-            var items = item.value.items;
-
-            for (var i = items.length - 1; i >= 0; --i) {
-              var source = items[i].source;
-
-              if (source instanceof YAMLMap) {
-                (function () {
-                  var obj = source.toJSON('', opt);
-                  Object.keys(obj).forEach(function (key) {
-                    if (!keys.includes(key)) map[key] = obj[key];
-                  });
-                })();
-              } else {
-                throw new Error('Merge sources must be maps');
-              }
-            }
-          })();
-        } else {
-          var stringKey = item.stringKey,
-              value = item.value;
-          map[stringKey] = (0, _toJSON2.default)(value, stringKey, opt);
-        }
+    /**
+     * @param {*} arg ignored
+     * @param {*} ctx Conversion context, originally set in Document#toJSON()
+     * @param {Class} Type If set, forces the returned collection type
+     * @returns {*} Instance of Type, Map, or Object
+     */
 
-        return map;
-      }, {});
-    }
   }, {
-    key: "toJSMap",
-    value: function toJSMap(opt) {
-      var map = new Map();
+    key: "toJSON",
+    value: function toJSON(_, ctx, Type) {
+      var map = Type ? new Type() : ctx && ctx.mapAsMap ? new Map() : {};
+      if (ctx && ctx.onCreate) ctx.onCreate(map);
       var _iteratorNormalCompletion2 = true;
       var _didIteratorError2 = false;
       var _iteratorError2 = undefined;
@@ -163,49 +122,7 @@ function (_Collection) {
       try {
         for (var _iterator2 = this.items[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
           var item = _step2.value;
-
-          if (item instanceof _Merge.default) {
-            var items = item.value.items;
-
-            for (var i = items.length - 1; i >= 0; --i) {
-              var source = items[i].source;
-
-              if (source instanceof YAMLMap) {
-                var _iteratorNormalCompletion3 = true;
-                var _didIteratorError3 = false;
-                var _iteratorError3 = undefined;
-
-                try {
-                  for (var _iterator3 = source.toJSMap(opt)[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-                    var _step3$value = (0, _slicedToArray2.default)(_step3.value, 2),
-                        key = _step3$value[0],
-                        value = _step3$value[1];
-
-                    if (!map.has(key)) map.set(key, value);
-                  }
-                } catch (err) {
-                  _didIteratorError3 = true;
-                  _iteratorError3 = err;
-                } finally {
-                  try {
-                    if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
-                      _iterator3.return();
-                    }
-                  } finally {
-                    if (_didIteratorError3) {
-                      throw _iteratorError3;
-                    }
-                  }
-                }
-              } else {
-                throw new Error('Merge sources must be maps');
-              }
-            }
-          } else {
-            var key = (0, _toJSON2.default)(item.key, '', opt);
-            var value = (0, _toJSON2.default)(item.value, key, opt);
-            map.set(key, value);
-          }
+          item.addToJSMap(ctx, map);
         }
       } catch (err) {
         _didIteratorError2 = true;
@@ -228,26 +145,26 @@ function (_Collection) {
     key: "toString",
     value: function toString(ctx, onComment, onChompKeep) {
       if (!ctx) return JSON.stringify(this);
-      var _iteratorNormalCompletion4 = true;
-      var _didIteratorError4 = false;
-      var _iteratorError4 = undefined;
+      var _iteratorNormalCompletion3 = true;
+      var _didIteratorError3 = false;
+      var _iteratorError3 = undefined;
 
       try {
-        for (var _iterator4 = this.items[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-          var item = _step4.value;
+        for (var _iterator3 = this.items[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+          var item = _step3.value;
           if (!(item instanceof _Pair.default)) throw new Error("Map items must all be pairs; found ".concat(JSON.stringify(item), " instead"));
         }
       } catch (err) {
-        _didIteratorError4 = true;
-        _iteratorError4 = err;
+        _didIteratorError3 = true;
+        _iteratorError3 = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
-            _iterator4.return();
+          if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
+            _iterator3.return();
           }
         } finally {
-          if (_didIteratorError4) {
-            throw _iteratorError4;
+          if (_didIteratorError3) {
+            throw _iteratorError3;
           }
         }
       }