yaml 1.4.0 → 1.5.0

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,7 +103,7 @@ 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;
   }
 
@@ -61,10 +112,36 @@ function (_Node) {
     value: function toJSON(arg, ctx) {
       var _this2 = this;
 
-      var anchor = ctx && ctx.anchors && ctx.anchors.find(function (a) {
+      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;
       });
-      return anchor && anchor.res || (0, _toJSON2.default)(this.source, arg, ctx);
+
+      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",
@@ -73,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/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,11 +103,17 @@ function (_Collection) {
       var prev = findPair(this.items, key);
       if (prev) prev.value = value;else this.items.push(new _Pair.default(key, value));
     }
+    /**
+     * @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
+     */
+
   }, {
     key: "toJSON",
-    value: function toJSON(_, ctx) {
-      if (ctx && ctx.mapAsMap) return this.toJSMap(ctx);
-      var map = {};
+    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;
@@ -123,40 +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) {
-            (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('', ctx);
-                    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, ctx);
-          }
+          item.addToJSMap(ctx, map);
         }
       } catch (err) {
         _didIteratorError2 = true;
@@ -176,10 +142,9 @@ function (_Collection) {
       return map;
     }
   }, {
-    key: "toJSMap",
-    value: function toJSMap(ctx) {
-      var map = new Map();
-      if (ctx && ctx.onCreate) ctx.onCreate(map);
+    key: "toString",
+    value: function toString(ctx, onComment, onChompKeep) {
+      if (!ctx) return JSON.stringify(this);
       var _iteratorNormalCompletion3 = true;
       var _didIteratorError3 = false;
       var _iteratorError3 = undefined;
@@ -187,49 +152,7 @@ function (_Collection) {
       try {
         for (var _iterator3 = this.items[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
           var item = _step3.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 _iteratorNormalCompletion4 = true;
-                var _didIteratorError4 = false;
-                var _iteratorError4 = undefined;
-
-                try {
-                  for (var _iterator4 = source.toJSMap(ctx)[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-                    var _step4$value = (0, _slicedToArray2.default)(_step4.value, 2),
-                        key = _step4$value[0],
-                        value = _step4$value[1];
-
-                    if (!map.has(key)) map.set(key, value);
-                  }
-                } catch (err) {
-                  _didIteratorError4 = true;
-                  _iteratorError4 = err;
-                } finally {
-                  try {
-                    if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
-                      _iterator4.return();
-                    }
-                  } finally {
-                    if (_didIteratorError4) {
-                      throw _iteratorError4;
-                    }
-                  }
-                }
-              } else {
-                throw new Error('Merge sources must be maps');
-              }
-            }
-          } else {
-            var key = (0, _toJSON2.default)(item.key, '', ctx);
-            var value = (0, _toJSON2.default)(item.value, key, ctx);
-            map.set(key, value);
-          }
+          if (!(item instanceof _Pair.default)) throw new Error("Map items must all be pairs; found ".concat(JSON.stringify(item), " instead"));
         }
       } catch (err) {
         _didIteratorError3 = true;
@@ -246,36 +169,6 @@ function (_Collection) {
         }
       }
 
-      return map;
-    }
-  }, {
-    key: "toString",
-    value: function toString(ctx, onComment, onChompKeep) {
-      if (!ctx) return JSON.stringify(this);
-      var _iteratorNormalCompletion5 = true;
-      var _didIteratorError5 = false;
-      var _iteratorError5 = undefined;
-
-      try {
-        for (var _iterator5 = this.items[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-          var item = _step5.value;
-          if (!(item instanceof _Pair.default)) throw new Error("Map items must all be pairs; found ".concat(JSON.stringify(item), " instead"));
-        }
-      } catch (err) {
-        _didIteratorError5 = true;
-        _iteratorError5 = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion5 && _iterator5.return != null) {
-            _iterator5.return();
-          }
-        } finally {
-          if (_didIteratorError5) {
-            throw _iteratorError5;
-          }
-        }
-      }
-
       return (0, _get2.default)((0, _getPrototypeOf2.default)(YAMLMap.prototype), "toString", this).call(this, ctx, {
         blockItem: function blockItem(n) {
           return n.str;

package/browser/dist/schema/Merge.js

@@ -7,6 +7,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.MERGE_KEY = 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"));
@@ -19,6 +21,8 @@ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
+var _Map = _interopRequireDefault(require("./Map"));
+
 var _Pair2 = _interopRequireDefault(require("./Pair"));
 
 var _Scalar = _interopRequireDefault(require("./Scalar"));
@@ -55,9 +59,78 @@ function (_Pair) {
 
     _this.type = 'MERGE_PAIR';
     return (0, _possibleConstructorReturn2.default)(_this);
-  }
+  } // If the value associated with a merge key is a single mapping node, each of
+  // its key/value pairs is inserted into the current mapping, unless the key
+  // already exists in it. If the value associated with the merge key is a
+  // sequence, then this sequence is expected to contain mapping nodes and each
+  // of these nodes is merged in turn according to its order in the sequence.
+  // Keys in mapping nodes earlier in the sequence override keys specified in
+  // later mapping nodes. -- http://yaml.org/type/merge.html
+
 
   (0, _createClass2.default)(Merge, [{
+    key: "addToJSMap",
+    value: function addToJSMap(ctx, map) {
+      var _iteratorNormalCompletion = true;
+      var _didIteratorError = false;
+      var _iteratorError = undefined;
+
+      try {
+        for (var _iterator = this.value.items[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var source = _step.value.source;
+          if (!(source instanceof _Map.default)) throw new Error('Merge sources must be maps');
+          var srcMap = source.toJSON(null, ctx, Map);
+          var _iteratorNormalCompletion2 = true;
+          var _didIteratorError2 = false;
+          var _iteratorError2 = undefined;
+
+          try {
+            for (var _iterator2 = srcMap[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+              var _step2$value = (0, _slicedToArray2.default)(_step2.value, 2),
+                  key = _step2$value[0],
+                  value = _step2$value[1];
+
+              if (map instanceof Map) {
+                if (!map.has(key)) map.set(key, value);
+              } else if (map instanceof Set) {
+                map.add(key);
+              } else {
+                if (!map.hasOwnProperty(key)) map[key] = value;
+              }
+            }
+          } catch (err) {
+            _didIteratorError2 = true;
+            _iteratorError2 = err;
+          } finally {
+            try {
+              if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+                _iterator2.return();
+              }
+            } finally {
+              if (_didIteratorError2) {
+                throw _iteratorError2;
+              }
+            }
+          }
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
+        }
+      }
+
+      return map;
+    }
+  }, {
     key: "toString",
     value: function toString(ctx, onComment) {
       var seq = this.value;

package/browser/dist/schema/Node.js

@@ -13,6 +13,4 @@ var Node = function Node() {
   (0, _classCallCheck2.default)(this, Node);
 };
 
-exports.default = Node;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = Node;

package/browser/dist/schema/Pair.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -19,9 +17,11 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _addComment = _interopRequireDefault(require("../addComment"));
 
-var _toJSON2 = _interopRequireDefault(require("../toJSON"));
+var _toJSON = _interopRequireDefault(require("../toJSON"));
 
 var _Collection = _interopRequireDefault(require("./Collection"));
 
@@ -30,6 +30,19 @@ var _Node2 = _interopRequireDefault(require("./Node"));
 var _Scalar = _interopRequireDefault(require("./Scalar"));
 
 // Published as 'yaml/pair'
+var stringifyKey = function stringifyKey(key, jsKey, ctx) {
+  if (jsKey === null) return '';
+  if ((0, _typeof2.default)(jsKey) !== 'object') return String(jsKey);
+  if (key instanceof _Node2.default && ctx && ctx.doc) return key.toString({
+    anchors: {},
+    doc: ctx.doc,
+    indent: '',
+    inFlow: true,
+    inStringifyKey: true
+  });
+  return JSON.stringify(jsKey);
+};
+
 var Pair =
 /*#__PURE__*/
 function (_Node) {
@@ -48,12 +61,27 @@ function (_Node) {
   }
 
   (0, _createClass2.default)(Pair, [{
+    key: "addToJSMap",
+    value: function addToJSMap(ctx, map) {
+      var key = (0, _toJSON.default)(this.key, '', ctx);
+
+      if (map instanceof Map) {
+        var value = (0, _toJSON.default)(this.value, key, ctx);
+        map.set(key, value);
+      } else if (map instanceof Set) {
+        map.add(key);
+      } else {
+        var stringKey = stringifyKey(this.key, key, ctx);
+        map[stringKey] = (0, _toJSON.default)(this.value, stringKey, ctx);
+      }
+
+      return map;
+    }
+  }, {
     key: "toJSON",
     value: function toJSON(_, ctx) {
-      var pair = {};
-      var sk = this.stringKey;
-      pair[sk] = (0, _toJSON2.default)(this.value, sk, ctx);
-      return pair;
+      var pair = ctx && ctx.mapAsMap ? new Map() : {};
+      return this.addToJSMap(ctx, pair);
     }
   }, {
     key: "toString",
@@ -139,22 +167,8 @@ function (_Node) {
       if (this.key == null) this.key = new _Scalar.default(null);
       this.key.commentBefore = cb;
     }
-  }, {
-    key: "stringKey",
-    get: function get() {
-      var key = (0, _toJSON2.default)(this.key);
-      if (key === null) return '';
-      if ((0, _typeof2.default)(key) === 'object') try {
-        return JSON.stringify(key);
-      } catch (e) {
-        /* should not happen, but let's ignore in any case */
-      }
-      return String(key);
-    }
   }]);
   return Pair;
 }(_Node2.default);
 
-exports.default = Pair;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = Pair;

package/browser/dist/schema/Scalar.js

@@ -50,6 +50,4 @@ function (_Node) {
   return Scalar;
 }(_Node2.default);
 
-exports.default = Scalar;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = Scalar;

package/browser/dist/schema/Seq.js

@@ -128,6 +128,4 @@ function (_Collection) {
   return YAMLSeq;
 }(_Collection2.default);
 
-exports.default = YAMLSeq;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = YAMLSeq;