yaml 1.6.0 → 1.8.0

package/browser/dist/schema/Merge.js

@@ -1,64 +1,41 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-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"));
-
-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 _Map = _interopRequireDefault(require("./Map"));
-
-var _Pair2 = _interopRequireDefault(require("./Pair"));
-
-var _Scalar = _interopRequireDefault(require("./Scalar"));
-
-var _Seq = _interopRequireDefault(require("./Seq"));
-
-var MERGE_KEY = '<<';
-exports.MERGE_KEY = MERGE_KEY;
-
-var Merge =
-/*#__PURE__*/
-function (_Pair) {
-  (0, _inherits2.default)(Merge, _Pair);
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+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 YAMLMap from './Map';
+import Pair from './Pair';
+import Scalar from './Scalar';
+import Seq from './Seq';
+export var MERGE_KEY = '<<';
+
+var Merge = /*#__PURE__*/function (_Pair) {
+  _inherits(Merge, _Pair);
 
   function Merge(pair) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, Merge);
+    _classCallCheck(this, Merge);
 
-    if (pair instanceof _Pair2.default) {
+    if (pair instanceof Pair) {
       var seq = pair.value;
 
-      if (!(seq instanceof _Seq.default)) {
-        seq = new _Seq.default();
+      if (!(seq instanceof Seq)) {
+        seq = new Seq();
         seq.items.push(pair.value);
         seq.range = pair.value.range;
       }
 
-      _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Merge).call(this, pair.key, seq));
+      _this = _possibleConstructorReturn(this, _getPrototypeOf(Merge).call(this, pair.key, seq));
       _this.range = pair.range;
     } else {
-      _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Merge).call(this, new _Scalar.default(MERGE_KEY), new _Seq.default()));
+      _this = _possibleConstructorReturn(this, _getPrototypeOf(Merge).call(this, new Scalar(MERGE_KEY), new Seq()));
     }
 
     _this.type = 'MERGE_PAIR';
-    return (0, _possibleConstructorReturn2.default)(_this);
+    return _possibleConstructorReturn(_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
@@ -68,7 +45,7 @@ function (_Pair) {
   // later mapping nodes. -- http://yaml.org/type/merge.html
 
 
-  (0, _createClass2.default)(Merge, [{
+  _createClass(Merge, [{
     key: "addToJSMap",
     value: function addToJSMap(ctx, map) {
       var _iteratorNormalCompletion = true;
@@ -78,7 +55,7 @@ function (_Pair) {
       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');
+          if (!(source instanceof YAMLMap)) throw new Error('Merge sources must be maps');
           var srcMap = source.toJSON(null, ctx, Map);
           var _iteratorNormalCompletion2 = true;
           var _didIteratorError2 = false;
@@ -86,7 +63,7 @@ function (_Pair) {
 
           try {
             for (var _iterator2 = srcMap[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-              var _step2$value = (0, _slicedToArray2.default)(_step2.value, 2),
+              var _step2$value = _slicedToArray(_step2.value, 2),
                   key = _step2$value[0],
                   value = _step2$value[1];
 
@@ -95,7 +72,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) {
@@ -134,14 +111,17 @@ function (_Pair) {
     key: "toString",
     value: function toString(ctx, onComment) {
       var seq = this.value;
-      if (seq.items.length > 1) return (0, _get2.default)((0, _getPrototypeOf2.default)(Merge.prototype), "toString", this).call(this, ctx, onComment);
+      if (seq.items.length > 1) return _get(_getPrototypeOf(Merge.prototype), "toString", this).call(this, ctx, onComment);
       this.value = seq.items[0];
-      var str = (0, _get2.default)((0, _getPrototypeOf2.default)(Merge.prototype), "toString", this).call(this, ctx, onComment);
+
+      var str = _get(_getPrototypeOf(Merge.prototype), "toString", this).call(this, ctx, onComment);
+
       this.value = seq;
       return str;
     }
   }]);
+
   return Merge;
-}(_Pair2.default);
+}(Pair);
 
-exports.default = Merge;
+export { Merge as default };

package/browser/dist/schema/Node.js

@@ -1,16 +1,7 @@
-"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"));
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 
 var Node = function Node() {
-  (0, _classCallCheck2.default)(this, Node);
+  _classCallCheck(this, Node);
 };
 
-exports.default = Node;
+export { Node as default };

package/browser/dist/schema/Pair.js

@@ -1,39 +1,21 @@
-"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 _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-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 _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-var _addComment = _interopRequireDefault(require("../addComment"));
-
-var _toJSON = _interopRequireDefault(require("../toJSON"));
-
-var _Collection = _interopRequireDefault(require("./Collection"));
-
-var _Node2 = _interopRequireDefault(require("./Node"));
-
-var _Scalar = _interopRequireDefault(require("./Scalar"));
-
+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 _inherits from "@babel/runtime/helpers/inherits";
+import _typeof from "@babel/runtime/helpers/typeof";
 // Published as 'yaml/pair'
+import addComment from '../addComment';
+import { Type } from '../constants';
+import toJSON from '../toJSON';
+import Collection from './Collection';
+import Node from './Node';
+import Scalar from './Scalar';
+
 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({
+  if (_typeof(jsKey) !== 'object') return String(jsKey);
+  if (key instanceof Node && ctx && ctx.doc) return key.toString({
     anchors: {},
     doc: ctx.doc,
     indent: '',
@@ -43,36 +25,36 @@ var stringifyKey = function stringifyKey(key, jsKey, ctx) {
   return JSON.stringify(jsKey);
 };
 
-var Pair =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(Pair, _Node);
+var Pair = /*#__PURE__*/function (_Node) {
+  _inherits(Pair, _Node);
 
   function Pair(key) {
     var _this;
 
     var value = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
-    (0, _classCallCheck2.default)(this, Pair);
-    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Pair).call(this));
+
+    _classCallCheck(this, Pair);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(Pair).call(this));
     _this.key = key;
     _this.value = value;
     _this.type = 'PAIR';
     return _this;
   }
 
-  (0, _createClass2.default)(Pair, [{
+  _createClass(Pair, [{
     key: "addToJSMap",
     value: function addToJSMap(ctx, map) {
-      var key = (0, _toJSON.default)(this.key, '', ctx);
+      var key = toJSON(this.key, '', ctx);
 
       if (map instanceof Map) {
-        var value = (0, _toJSON.default)(this.value, key, ctx);
+        var value = toJSON(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);
+        map[stringKey] = toJSON(this.value, stringKey, ctx);
       }
 
       return map;
@@ -87,10 +69,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;
+      var keyComment = key instanceof Node && key.comment;
+
+      if (simpleKeys) {
+        if (keyComment) {
+          throw new Error('With simple keys, key nodes cannot have comments');
+        }
+
+        if (key instanceof Collection) {
+          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 || key.type === Type.BLOCK_FOLDED || key.type === Type.BLOCK_LITERAL);
       var _ctx = ctx,
           doc = _ctx.doc,
           indent = _ctx.indent;
@@ -104,11 +99,11 @@ function (_Node) {
       }, function () {
         return chompKeep = true;
       });
-      str = (0, _addComment.default)(str, ctx.indent, keyComment);
+      str = addComment(str, ctx.indent, keyComment);
 
-      if (ctx.allNullValues) {
+      if (ctx.allNullValues && !simpleKeys) {
         if (this.comment) {
-          str = (0, _addComment.default)(str, ctx.indent, this.comment);
+          str = addComment(str, ctx.indent, this.comment);
           if (onComment) onComment();
         } else if (chompKeep && !keyComment && onChompKeep) onChompKeep();
 
@@ -119,14 +114,14 @@ function (_Node) {
 
       if (this.comment) {
         // expected (but not strictly required) to be a single-line comment
-        str = (0, _addComment.default)(str, ctx.indent, this.comment);
+        str = addComment(str, ctx.indent, this.comment);
         if (onComment) onComment();
       }
 
       var vcb = '';
       var valueComment = null;
 
-      if (value instanceof _Node2.default) {
+      if (value instanceof Node) {
         if (value.spaceBefore) vcb = '\n';
 
         if (value.commentBefore) {
@@ -135,11 +130,12 @@ function (_Node) {
         }
 
         valueComment = value.comment;
-      } else if (value && (0, _typeof2.default)(value) === 'object') {
+      } else if (value && _typeof(value) === 'object') {
         value = doc.schema.createNode(value, true);
       }
 
       ctx.implicitKey = false;
+      if (!explicitKey && !this.comment && value instanceof Scalar) ctx.indentAtStart = str.length + 1;
       chompKeep = false;
       var valueStr = doc.schema.stringify(value, ctx, function () {
         return valueComment = null;
@@ -150,13 +146,13 @@ function (_Node) {
 
       if (vcb || this.comment) {
         ws = "".concat(vcb, "\n").concat(ctx.indent);
-      } else if (!explicitKey && value instanceof _Collection.default) {
+      } else if (!explicitKey && value instanceof Collection) {
         var flow = valueStr[0] === '[' || valueStr[0] === '{';
         if (!flow || valueStr.includes('\n')) ws = "\n".concat(ctx.indent);
       }
 
       if (chompKeep && !valueComment && onChompKeep) onChompKeep();
-      return (0, _addComment.default)(str + ws + valueStr, ctx.indent, valueComment);
+      return addComment(str + ws + valueStr, ctx.indent, valueComment);
     }
   }, {
     key: "commentBefore",
@@ -164,11 +160,12 @@ function (_Node) {
       return this.key && this.key.commentBefore;
     },
     set: function set(cb) {
-      if (this.key == null) this.key = new _Scalar.default(null);
+      if (this.key == null) this.key = new Scalar(null);
       this.key.commentBefore = cb;
     }
   }]);
+
   return Pair;
-}(_Node2.default);
+}(Node);
 
-exports.default = Pair;
+export { Pair as default };

package/browser/dist/schema/Scalar.js

@@ -1,45 +1,29 @@
-"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 _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-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 _toJSON2 = _interopRequireDefault(require("../toJSON"));
-
-var _Node2 = _interopRequireDefault(require("./Node"));
-
+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 _inherits from "@babel/runtime/helpers/inherits";
 // Published as 'yaml/scalar'
-var Scalar =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(Scalar, _Node);
+import _toJSON from '../toJSON';
+import Node from './Node';
+
+var Scalar = /*#__PURE__*/function (_Node) {
+  _inherits(Scalar, _Node);
 
   function Scalar(value) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, Scalar);
-    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Scalar).call(this));
+    _classCallCheck(this, Scalar);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(Scalar).call(this));
     _this.value = value;
     return _this;
   }
 
-  (0, _createClass2.default)(Scalar, [{
+  _createClass(Scalar, [{
     key: "toJSON",
     value: function toJSON(arg, ctx) {
-      return ctx && ctx.keep ? this.value : (0, _toJSON2.default)(this.value, arg, ctx);
+      return ctx && ctx.keep ? this.value : _toJSON(this.value, arg, ctx);
     }
   }, {
     key: "toString",
@@ -47,7 +31,8 @@ function (_Node) {
       return String(this.value);
     }
   }]);
+
   return Scalar;
-}(_Node2.default);
+}(Node);
 
-exports.default = Scalar;
+export { Scalar as default };

package/browser/dist/schema/Seq.js

@@ -1,48 +1,30 @@
-"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 _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 _toJSON2 = _interopRequireDefault(require("../toJSON"));
-
-var _Collection2 = _interopRequireDefault(require("./Collection"));
-
-var _Scalar = _interopRequireDefault(require("./Scalar"));
-
+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";
 // Published as 'yaml/seq'
+import _toJSON from '../toJSON';
+import Collection from './Collection';
+import Scalar from './Scalar';
+
 function asItemIndex(key) {
-  var idx = key instanceof _Scalar.default ? key.value : key;
+  var idx = key instanceof Scalar ? key.value : key;
   if (idx && typeof idx === 'string') idx = Number(idx);
   return Number.isInteger(idx) && idx >= 0 ? idx : null;
 }
 
-var YAMLSeq =
-/*#__PURE__*/
-function (_Collection) {
-  (0, _inherits2.default)(YAMLSeq, _Collection);
+var YAMLSeq = /*#__PURE__*/function (_Collection) {
+  _inherits(YAMLSeq, _Collection);
 
   function YAMLSeq() {
-    (0, _classCallCheck2.default)(this, YAMLSeq);
-    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLSeq).apply(this, arguments));
+    _classCallCheck(this, YAMLSeq);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(YAMLSeq).apply(this, arguments));
   }
 
-  (0, _createClass2.default)(YAMLSeq, [{
+  _createClass(YAMLSeq, [{
     key: "add",
     value: function add(value) {
       this.items.push(value);
@@ -61,7 +43,7 @@ function (_Collection) {
       var idx = asItemIndex(key);
       if (typeof idx !== 'number') return undefined;
       var it = this.items[idx];
-      return !keepScalar && it instanceof _Scalar.default ? it.value : it;
+      return !keepScalar && it instanceof Scalar ? it.value : it;
     }
   }, {
     key: "has",
@@ -89,7 +71,7 @@ function (_Collection) {
       try {
         for (var _iterator = this.items[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
           var item = _step.value;
-          seq.push((0, _toJSON2.default)(item, String(i++), ctx));
+          seq.push(_toJSON(item, String(i++), ctx));
         }
       } catch (err) {
         _didIteratorError = true;
@@ -112,7 +94,7 @@ function (_Collection) {
     key: "toString",
     value: function toString(ctx, onComment, onChompKeep) {
       if (!ctx) return JSON.stringify(this);
-      return (0, _get2.default)((0, _getPrototypeOf2.default)(YAMLSeq.prototype), "toString", this).call(this, ctx, {
+      return _get(_getPrototypeOf(YAMLSeq.prototype), "toString", this).call(this, ctx, {
         blockItem: function blockItem(n) {
           return n.type === 'comment' ? n.str : "- ".concat(n.str);
         },
@@ -125,7 +107,8 @@ function (_Collection) {
       }, onComment, onChompKeep);
     }
   }]);
+
   return YAMLSeq;
-}(_Collection2.default);
+}(Collection);
 
-exports.default = YAMLSeq;
+export { YAMLSeq as default };