yaml 1.6.0 → 1.8.0

package/browser/dist/index.js

@@ -1,29 +1,12 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _parse = _interopRequireDefault(require("./cst/parse"));
-
-var _Document = _interopRequireDefault(require("./Document"));
-
-var _errors = require("./errors");
-
-var _schema = _interopRequireDefault(require("./schema"));
-
-/* global console */
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _inherits from "@babel/runtime/helpers/inherits";
+import parseCST from './cst/parse';
+import YAMLDocument from './Document';
+import { YAMLSemanticError } from './errors';
+import Schema from './schema';
+import { warn } from './warnings';
 var defaultOptions = {
   anchorPrefix: 'a',
   customTags: null,
@@ -34,6 +17,7 @@ var defaultOptions = {
   maxAliasCount: 100,
   prettyErrors: false,
   // TODO Set true in v2
+  simpleKeys: false,
   version: '1.2'
 };
 
@@ -46,23 +30,22 @@ function createNode(value) {
     wrapScalars = true;
   }
 
-  var options = Object.assign({}, _Document.default.defaults[defaultOptions.version], defaultOptions);
-  var schema = new _schema.default(options);
+  var options = Object.assign({}, YAMLDocument.defaults[defaultOptions.version], defaultOptions);
+  var schema = new Schema(options);
   return schema.createNode(value, wrapScalars, tag);
 }
 
-var Document =
-/*#__PURE__*/
-function (_YAMLDocument) {
-  (0, _inherits2.default)(Document, _YAMLDocument);
+var Document = /*#__PURE__*/function (_YAMLDocument) {
+  _inherits(Document, _YAMLDocument);
 
   function Document(options) {
-    (0, _classCallCheck2.default)(this, Document);
-    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Document).call(this, Object.assign({}, defaultOptions, options)));
+    _classCallCheck(this, Document);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(Document).call(this, Object.assign({}, defaultOptions, options)));
   }
 
   return Document;
-}(_Document.default);
+}(YAMLDocument);
 
 function parseAllDocuments(src, options) {
   var stream = [];
@@ -72,7 +55,7 @@ function parseAllDocuments(src, options) {
   var _iteratorError = undefined;
 
   try {
-    for (var _iterator = (0, _parse.default)(src)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+    for (var _iterator = parseCST(src)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var cstDoc = _step.value;
       var doc = new Document(options);
       doc.parse(cstDoc, prev);
@@ -98,22 +81,21 @@ function parseAllDocuments(src, options) {
 }
 
 function parseDocument(src, options) {
-  var cst = (0, _parse.default)(src);
+  var cst = parseCST(src);
   var doc = new Document(options).parse(cst[0]);
 
   if (cst.length > 1) {
     var errMsg = 'Source contains multiple documents; please use YAML.parseAllDocuments()';
-    doc.errors.unshift(new _errors.YAMLSemanticError(cst[1], errMsg));
+    doc.errors.unshift(new YAMLSemanticError(cst[1], errMsg));
   }
 
   return doc;
 }
 
 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 warn(warning);
   });
   if (doc.errors.length > 0) throw doc.errors[0];
   return doc.toJSON();
@@ -125,14 +107,13 @@ function stringify(value, options) {
   return String(doc);
 }
 
-var _default = {
+export default {
   createNode: createNode,
   defaultOptions: defaultOptions,
   Document: Document,
   parse: parse,
   parseAllDocuments: parseAllDocuments,
-  parseCST: _parse.default,
+  parseCST: parseCST,
   parseDocument: parseDocument,
   stringify: stringify
-};
-exports.default = _default;
+};

package/browser/dist/listTagNames.js

@@ -1,33 +1,21 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-var _Collection = _interopRequireDefault(require("./schema/Collection"));
-
-var _Pair = _interopRequireDefault(require("./schema/Pair"));
-
-var _Scalar = _interopRequireDefault(require("./schema/Scalar"));
+import _typeof from "@babel/runtime/helpers/typeof";
+import Collection from './schema/Collection';
+import Pair from './schema/Pair';
+import Scalar from './schema/Scalar';
 
 var visit = function visit(node, tags) {
-  if (node && (0, _typeof2.default)(node) === 'object') {
+  if (node && _typeof(node) === 'object') {
     var tag = node.tag;
 
-    if (node instanceof _Collection.default) {
+    if (node instanceof Collection) {
       if (tag) tags[tag] = true;
       node.items.forEach(function (n) {
         return visit(n, tags);
       });
-    } else if (node instanceof _Pair.default) {
+    } else if (node instanceof Pair) {
       visit(node.key, tags);
       visit(node.value, tags);
-    } else if (node instanceof _Scalar.default) {
+    } else if (node instanceof Scalar) {
       if (tag) tags[tag] = true;
     }
   }
@@ -35,8 +23,6 @@ var visit = function visit(node, tags) {
   return tags;
 };
 
-var _default = function _default(node) {
+export default (function (node) {
   return Object.keys(visit(node, {}));
-};
-
-exports.default = _default;
+});

package/browser/dist/schema/Alias.js

@@ -1,35 +1,15 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _constants = require("../constants");
-
-var _errors = require("../errors");
-
-var _toJSON2 = _interopRequireDefault(require("../toJSON"));
-
-var _Collection = _interopRequireDefault(require("./Collection"));
-
-var _Node2 = _interopRequireDefault(require("./Node"));
-
-var _Pair = _interopRequireDefault(require("./Pair"));
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { Type } from '../constants';
+import { YAMLReferenceError } from '../errors';
+import _toJSON from '../toJSON';
+import Collection from './Collection';
+import Node from './Node';
+import Pair from './Pair';
 
 var getAliasCount = function getAliasCount(node, anchors) {
   if (node instanceof Alias) {
@@ -37,7 +17,7 @@ var getAliasCount = function getAliasCount(node, anchors) {
       return a.node === node.source;
     });
     return anchor.count * anchor.aliasCount;
-  } else if (node instanceof _Collection.default) {
+  } else if (node instanceof Collection) {
     var count = 0;
     var _iteratorNormalCompletion = true;
     var _didIteratorError = false;
@@ -65,7 +45,7 @@ var getAliasCount = function getAliasCount(node, anchors) {
     }
 
     return count;
-  } else if (node instanceof _Pair.default) {
+  } else if (node instanceof Pair) {
     var kc = getAliasCount(node.key, anchors);
     var vc = getAliasCount(node.value, anchors);
     return Math.max(kc, vc);
@@ -74,11 +54,10 @@ var getAliasCount = function getAliasCount(node, anchors) {
   return 1;
 };
 
-var Alias =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(Alias, _Node);
-  (0, _createClass2.default)(Alias, null, [{
+var Alias = /*#__PURE__*/function (_Node) {
+  _inherits(Alias, _Node);
+
+  _createClass(Alias, null, [{
     key: "stringify",
     value: function stringify(_ref, _ref2) {
       var range = _ref.range,
@@ -100,28 +79,30 @@ function (_Node) {
   function Alias(source) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, Alias);
-    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Alias).call(this));
+    _classCallCheck(this, Alias);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(Alias).call(this));
     _this.source = source;
-    _this.type = _constants.Type.ALIAS;
+    _this.type = Type.ALIAS;
     return _this;
   }
 
-  (0, _createClass2.default)(Alias, [{
+  _createClass(Alias, [{
     key: "toJSON",
     value: function toJSON(arg, ctx) {
       var _this2 = this;
 
-      if (!ctx) return (0, _toJSON2.default)(this.source, arg, ctx);
+      if (!ctx) return _toJSON(this.source, arg, ctx);
       var anchors = ctx.anchors,
           maxAliasCount = ctx.maxAliasCount;
       var anchor = anchors.find(function (a) {
         return a.node === _this2.source;
       });
+      /* istanbul ignore if */
 
-      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);
+        if (this.cstNode) throw new YAMLReferenceError(this.cstNode, msg);else throw new ReferenceError(msg);
       }
 
       if (maxAliasCount >= 0) {
@@ -130,7 +111,7 @@ function (_Node) {
 
         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);
+          if (this.cstNode) throw new YAMLReferenceError(this.cstNode, _msg);else throw new ReferenceError(_msg);
         }
       }
 
@@ -149,8 +130,10 @@ function (_Node) {
       throw new Error('Alias nodes cannot have tags');
     }
   }]);
+
   return Alias;
-}(_Node2.default);
+}(Node);
+
+_defineProperty(Alias, "default", true);
 
-exports.default = Alias;
-(0, _defineProperty2.default)(Alias, "default", true);
+export { Alias as default };

package/browser/dist/schema/Collection.js

@@ -1,82 +1,67 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.isEmptyPath = void 0;
-
-var _toArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toArray"));
-
-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 _getPrototypeOf3 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-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"));
-
-var _addComment = _interopRequireDefault(require("../addComment"));
-
-var _Node2 = _interopRequireDefault(require("./Node"));
+import _toArray from "@babel/runtime/helpers/toArray";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _assertThisInitialized from "@babel/runtime/helpers/assertThisInitialized";
+import _inherits from "@babel/runtime/helpers/inherits";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _typeof from "@babel/runtime/helpers/typeof";
+import addComment from '../addComment';
+import Node from './Node';
+import Pair from './Pair';
+import Scalar from './Scalar';
+
+function collectionFromPath(schema, path, value) {
+  var v = value;
+
+  for (var i = path.length - 1; i >= 0; --i) {
+    var k = path[i];
+    var o = Number.isInteger(k) && k >= 0 ? [] : {};
+    o[k] = v;
+    v = o;
+  }
 
-var _Pair = _interopRequireDefault(require("./Pair"));
+  return schema.createNode(v, false);
+} // null, undefined, or an empty non-string iterable (e.g. [])
 
-var _Scalar = _interopRequireDefault(require("./Scalar"));
 
-// null, undefined, or an empty non-string iterable (e.g. [])
-var isEmptyPath = function isEmptyPath(path) {
-  return path == null || (0, _typeof2.default)(path) === 'object' && path[Symbol.iterator]().next().done;
+export var isEmptyPath = function isEmptyPath(path) {
+  return path == null || _typeof(path) === 'object' && path[Symbol.iterator]().next().done;
 };
 
-exports.isEmptyPath = isEmptyPath;
-
-var Collection =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(Collection, _Node);
-
-  function Collection() {
-    var _getPrototypeOf2;
+var Collection = /*#__PURE__*/function (_Node) {
+  _inherits(Collection, _Node);
 
+  function Collection(schema) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, Collection);
+    _classCallCheck(this, Collection);
 
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(Collection).call(this));
+
+    _defineProperty(_assertThisInitialized(_this), "items", []);
 
-    _this = (0, _possibleConstructorReturn2.default)(this, (_getPrototypeOf2 = (0, _getPrototypeOf3.default)(Collection)).call.apply(_getPrototypeOf2, [this].concat(args)));
-    (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "items", []);
+    _this.schema = schema;
     return _this;
   }
 
-  (0, _createClass2.default)(Collection, [{
+  _createClass(Collection, [{
     key: "addIn",
     value: function addIn(path, value) {
       if (isEmptyPath(path)) this.add(value);else {
-        var _path = (0, _toArray2.default)(path),
+        var _path = _toArray(path),
             key = _path[0],
             rest = _path.slice(1);
 
         var node = this.get(key, true);
-        if (node instanceof Collection) node.addIn(rest, value);else throw new Error("Expected YAML collection at ".concat(key, ". Remaining path: ").concat(rest));
+        if (node instanceof Collection) node.addIn(rest, value);else if (node === undefined && this.schema) this.set(key, collectionFromPath(this.schema, rest, value));else throw new Error("Expected YAML collection at ".concat(key, ". Remaining path: ").concat(rest));
       }
     }
   }, {
     key: "deleteIn",
     value: function deleteIn(_ref) {
-      var _ref2 = (0, _toArray2.default)(_ref),
+      var _ref2 = _toArray(_ref),
           key = _ref2[0],
           rest = _ref2.slice(1);
 
@@ -87,26 +72,26 @@ function (_Node) {
   }, {
     key: "getIn",
     value: function getIn(_ref3, keepScalar) {
-      var _ref4 = (0, _toArray2.default)(_ref3),
+      var _ref4 = _toArray(_ref3),
           key = _ref4[0],
           rest = _ref4.slice(1);
 
       var node = this.get(key, true);
-      if (rest.length === 0) return !keepScalar && node instanceof _Scalar.default ? node.value : node;else return node instanceof Collection ? node.getIn(rest, keepScalar) : undefined;
+      if (rest.length === 0) return !keepScalar && node instanceof Scalar ? node.value : node;else return node instanceof Collection ? node.getIn(rest, keepScalar) : undefined;
     }
   }, {
     key: "hasAllNullValues",
     value: function hasAllNullValues() {
       return this.items.every(function (node) {
-        if (!(node instanceof _Pair.default)) return false;
+        if (!(node instanceof Pair)) return false;
         var n = node.value;
-        return n == null || n instanceof _Scalar.default && n.value == null && !n.commentBefore && !n.comment && !n.tag;
+        return n == null || n instanceof Scalar && n.value == null && !n.commentBefore && !n.comment && !n.tag;
       });
     }
   }, {
     key: "hasIn",
     value: function hasIn(_ref5) {
-      var _ref6 = (0, _toArray2.default)(_ref5),
+      var _ref6 = _toArray(_ref5),
           key = _ref6[0],
           rest = _ref6.slice(1);
 
@@ -117,7 +102,7 @@ function (_Node) {
   }, {
     key: "setIn",
     value: function setIn(_ref7, value) {
-      var _ref8 = (0, _toArray2.default)(_ref7),
+      var _ref8 = _toArray(_ref7),
           key = _ref8[0],
           rest = _ref8.slice(1);
 
@@ -125,10 +110,12 @@ function (_Node) {
         this.set(key, value);
       } else {
         var node = this.get(key, true);
-        if (node instanceof Collection) node.setIn(rest, value);else throw new Error("Expected YAML collection at ".concat(key, ". Remaining path: ").concat(rest));
+        if (node instanceof Collection) node.setIn(rest, value);else if (node === undefined && this.schema) this.set(key, collectionFromPath(this.schema, rest, value));else throw new Error("Expected YAML collection at ".concat(key, ". Remaining path: ").concat(rest));
       }
     } // overridden in implementations
 
+    /* istanbul ignore next */
+
   }, {
     key: "toJSON",
     value: function toJSON() {
@@ -183,7 +170,7 @@ function (_Node) {
         });
         if (inFlow && !hasItemWithNewLine && str.includes('\n')) hasItemWithNewLine = true;
         if (inFlow && i < _this2.items.length - 1) str += ',';
-        str = (0, _addComment.default)(str, itemIndent, comment);
+        str = addComment(str, itemIndent, comment);
         if (chompKeep && (comment || inFlow)) chompKeep = false;
         nodes.push({
           type: 'item',
@@ -271,8 +258,10 @@ function (_Node) {
       return str;
     }
   }]);
+
   return Collection;
-}(_Node2.default);
+}(Node);
+
+_defineProperty(Collection, "maxFlowStringSingleLineLength", 60);
 
-exports.default = Collection;
-(0, _defineProperty2.default)(Collection, "maxFlowStringSingleLineLength", 60);
+export { Collection as default };

package/browser/dist/schema/Map.js

@@ -1,33 +1,14 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.findPair = findPair;
-exports.default = 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"));
-
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _Collection2 = _interopRequireDefault(require("./Collection"));
-
-var _Pair = _interopRequireDefault(require("./Pair"));
-
-var _Scalar = _interopRequireDefault(require("./Scalar"));
-
-function findPair(items, key) {
-  var k = key instanceof _Scalar.default ? key.value : key;
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _get from "@babel/runtime/helpers/get";
+import _inherits from "@babel/runtime/helpers/inherits";
+import Collection from './Collection';
+import Pair from './Pair';
+import Scalar from './Scalar';
+export function findPair(items, key) {
+  var k = key instanceof Scalar ? key.value : key;
   var _iteratorNormalCompletion = true;
   var _didIteratorError = false;
   var _iteratorError = undefined;
@@ -36,7 +17,7 @@ function findPair(items, key) {
     for (var _iterator = items[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
       var it = _step.value;
 
-      if (it instanceof _Pair.default) {
+      if (it instanceof Pair) {
         if (it.key === key || it.key === k) return it;
         if (it.key && it.key.value === k) return it;
       }
@@ -59,23 +40,32 @@ function findPair(items, key) {
   return undefined;
 }
 
-var YAMLMap =
-/*#__PURE__*/
-function (_Collection) {
-  (0, _inherits2.default)(YAMLMap, _Collection);
+var YAMLMap = /*#__PURE__*/function (_Collection) {
+  _inherits(YAMLMap, _Collection);
 
   function YAMLMap() {
-    (0, _classCallCheck2.default)(this, YAMLMap);
-    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLMap).apply(this, arguments));
+    _classCallCheck(this, YAMLMap);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(YAMLMap).apply(this, arguments));
   }
 
-  (0, _createClass2.default)(YAMLMap, [{
+  _createClass(YAMLMap, [{
     key: "add",
-    value: function add(pair) {
-      if (!pair) pair = new _Pair.default(pair);else if (!(pair instanceof _Pair.default)) pair = new _Pair.default(pair.key || pair, pair.value);
+    value: function add(pair, overwrite) {
+      if (!pair) pair = new Pair(pair);else if (!(pair instanceof Pair)) pair = new Pair(pair.key || pair, pair.value);
       var prev = findPair(this.items, pair.key);
-      if (prev) throw new Error("Key ".concat(pair.key, " already set"));
-      this.items.push(pair);
+      var sortEntries = this.schema && this.schema.sortMapEntries;
+
+      if (prev) {
+        if (overwrite) prev.value = pair.value;else throw new Error("Key ".concat(pair.key, " already set"));
+      } else if (sortEntries) {
+        var i = this.items.findIndex(function (item) {
+          return sortEntries(pair, item) < 0;
+        });
+        if (i === -1) this.items.push(pair);else this.items.splice(i, 0, pair);
+      } else {
+        this.items.push(pair);
+      }
     }
   }, {
     key: "delete",
@@ -90,7 +80,7 @@ function (_Collection) {
     value: function get(key, keepScalar) {
       var it = findPair(this.items, key);
       var node = it && it.value;
-      return !keepScalar && node instanceof _Scalar.default ? node.value : node;
+      return !keepScalar && node instanceof Scalar ? node.value : node;
     }
   }, {
     key: "has",
@@ -100,8 +90,7 @@ function (_Collection) {
   }, {
     key: "set",
     value: function set(key, value) {
-      var prev = findPair(this.items, key);
-      if (prev) prev.value = value;else this.items.push(new _Pair.default(key, value));
+      this.add(new Pair(key, value), true);
     }
     /**
      * @param {*} arg ignored
@@ -152,7 +141,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 _Pair.default)) throw new Error("Map items must all be pairs; found ".concat(JSON.stringify(item), " instead"));
+          if (!(item instanceof Pair)) throw new Error("Map items must all be pairs; found ".concat(JSON.stringify(item), " instead"));
         }
       } catch (err) {
         _didIteratorError3 = true;
@@ -169,7 +158,7 @@ function (_Collection) {
         }
       }
 
-      return (0, _get2.default)((0, _getPrototypeOf2.default)(YAMLMap.prototype), "toString", this).call(this, ctx, {
+      return _get(_getPrototypeOf(YAMLMap.prototype), "toString", this).call(this, ctx, {
         blockItem: function blockItem(n) {
           return n.str;
         },
@@ -182,7 +171,8 @@ function (_Collection) {
       }, onComment, onChompKeep);
     }
   }]);
+
   return YAMLMap;
-}(_Collection2.default);
+}(Collection);
 
-exports.default = YAMLMap;
+export { YAMLMap as default };