yaml 1.6.0 → 1.8.0

package/browser/dist/cst/CollectionItem.js

@@ -1,49 +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 _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _constants = require("../constants");
-
-var _errors = require("../errors");
-
-var _BlankLine = _interopRequireDefault(require("./BlankLine"));
-
-var _Node2 = _interopRequireDefault(require("./Node"));
-
-var _Range = _interopRequireDefault(require("./Range"));
-
-var CollectionItem =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(CollectionItem, _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 _get from "@babel/runtime/helpers/get";
+import _inherits from "@babel/runtime/helpers/inherits";
+import { Type } from '../constants';
+import { YAMLSemanticError } from '../errors';
+import BlankLine from './BlankLine';
+import Node from './Node';
+import Range from './Range';
+
+var CollectionItem = /*#__PURE__*/function (_Node) {
+  _inherits(CollectionItem, _Node);
 
   function CollectionItem(type, props) {
     var _this;
 
-    (0, _classCallCheck2.default)(this, CollectionItem);
-    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(CollectionItem).call(this, type, props));
+    _classCallCheck(this, CollectionItem);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(CollectionItem).call(this, type, props));
     _this.node = null;
     return _this;
   }
 
-  (0, _createClass2.default)(CollectionItem, [{
+  _createClass(CollectionItem, [{
     key: "parse",
 
     /**
@@ -57,41 +37,39 @@ function (_Node) {
           src = context.src;
       var atLineStart = context.atLineStart,
           lineStart = context.lineStart;
-      if (!atLineStart && this.type === _constants.Type.SEQ_ITEM) this.error = new _errors.YAMLSemanticError(this, 'Sequence items must not have preceding content on the same line');
+      if (!atLineStart && this.type === Type.SEQ_ITEM) this.error = new YAMLSemanticError(this, 'Sequence items must not have preceding content on the same line');
       var indent = atLineStart ? start - lineStart : context.indent;
-
-      var offset = _Node2.default.endOfWhiteSpace(src, start + 1);
-
+      var offset = Node.endOfWhiteSpace(src, start + 1);
       var ch = src[offset];
+      var inlineComment = ch === '#';
+      var comments = [];
+      var blankLine = null;
 
       while (ch === '\n' || ch === '#') {
         if (ch === '#') {
-          var _end = _Node2.default.endOfLine(src, offset + 1);
+          var _end = Node.endOfLine(src, offset + 1);
 
-          this.props.push(new _Range.default(offset, _end));
+          comments.push(new Range(offset, _end));
           offset = _end;
         } else {
           atLineStart = true;
           lineStart = offset + 1;
+          var wsEnd = Node.endOfWhiteSpace(src, lineStart);
 
-          var wsEnd = _Node2.default.endOfWhiteSpace(src, lineStart);
-
-          if (src[wsEnd] === '\n') {
-            var blankLine = new _BlankLine.default();
+          if (src[wsEnd] === '\n' && comments.length === 0) {
+            blankLine = new BlankLine();
             lineStart = blankLine.parse({
               src: src
             }, lineStart);
-            var items = context.parent.items || context.parent.contents;
-            items.push(blankLine);
           }
 
-          offset = _Node2.default.endOfIndent(src, lineStart);
+          offset = Node.endOfIndent(src, lineStart);
         }
 
         ch = src[offset];
       }
 
-      if (_Node2.default.nextNodeIsIndented(ch, offset - (lineStart + indent), this.type !== _constants.Type.SEQ_ITEM)) {
+      if (Node.nextNodeIsIndented(ch, offset - (lineStart + indent), this.type !== Type.SEQ_ITEM)) {
         this.node = parseNode({
           atLineStart: atLineStart,
           inCollection: false,
@@ -99,19 +77,39 @@ function (_Node) {
           lineStart: 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
+          var 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) {
+          var c = comments[0];
+          this.props.push(c);
+          offset = c.end;
+        } else {
+          offset = Node.endOfLine(src, start + 1);
+        }
+      }
+
       var end = this.node ? this.node.valueRange.end : offset;
-      this.valueRange = new _Range.default(start, end);
+      this.valueRange = new Range(start, end);
       return offset;
     }
   }, {
     key: "setOrigRanges",
     value: function setOrigRanges(cr, offset) {
-      offset = (0, _get2.default)((0, _getPrototypeOf2.default)(CollectionItem.prototype), "setOrigRanges", this).call(this, cr, offset);
+      offset = _get(_getPrototypeOf(CollectionItem.prototype), "setOrigRanges", this).call(this, cr, offset);
       return this.node ? this.node.setOrigRanges(cr, offset) : offset;
     }
   }, {
@@ -123,7 +121,7 @@ function (_Node) {
           value = this.value;
       if (value != null) return value;
       var str = node ? src.slice(range.start, node.range.start) + String(node) : src.slice(range.start, range.end);
-      return _Node2.default.addStringTerminator(src, range.end, str);
+      return Node.addStringTerminator(src, range.end, str);
     }
   }, {
     key: "includesTrailingLines",
@@ -131,7 +129,8 @@ function (_Node) {
       return !!this.node && this.node.includesTrailingLines;
     }
   }]);
+
   return CollectionItem;
-}(_Node2.default);
+}(Node);
 
-exports.default = CollectionItem;
+export { CollectionItem as default };

package/browser/dist/cst/Comment.js

@@ -1,36 +1,19 @@
-"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 _constants = require("../constants");
-
-var _Node2 = _interopRequireDefault(require("./Node"));
-
-var _Range = _interopRequireDefault(require("./Range"));
-
-var Comment =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(Comment, _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";
+import { Type } from '../constants';
+import Node from './Node';
+import Range from './Range';
+
+var Comment = /*#__PURE__*/function (_Node) {
+  _inherits(Comment, _Node);
 
   function Comment() {
-    (0, _classCallCheck2.default)(this, Comment);
-    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Comment).call(this, _constants.Type.COMMENT));
+    _classCallCheck(this, Comment);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(Comment).call(this, Type.COMMENT));
   }
   /**
    * Parses a comment line from the source
@@ -41,16 +24,17 @@ function (_Node) {
    */
 
 
-  (0, _createClass2.default)(Comment, [{
+  _createClass(Comment, [{
     key: "parse",
     value: function parse(context, start) {
       this.context = context;
       var offset = this.parseComment(start);
-      this.range = new _Range.default(start, offset);
+      this.range = new Range(start, offset);
       return offset;
     }
   }]);
+
   return Comment;
-}(_Node2.default);
+}(Node);
 
-exports.default = Comment;
+export { Comment as default };

package/browser/dist/cst/Directive.js

@@ -1,63 +1,26 @@
-"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 _constants = require("../constants");
-
-var _Node2 = _interopRequireDefault(require("./Node"));
-
-var _Range = _interopRequireDefault(require("./Range"));
-
-var Directive =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(Directive, _Node);
-  (0, _createClass2.default)(Directive, null, [{
-    key: "endOfDirective",
-    value: function endOfDirective(src, offset) {
-      var ch = src[offset];
-
-      while (ch && ch !== '\n' && ch !== '#') {
-        ch = src[offset += 1];
-      } // last char can't be whitespace
-
-
-      ch = src[offset - 1];
-
-      while (ch === ' ' || ch === '\t') {
-        offset -= 1;
-        ch = src[offset - 1];
-      }
-
-      return offset;
-    }
-  }]);
+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 { Type } from '../constants';
+import Node from './Node';
+import Range from './Range';
+
+var Directive = /*#__PURE__*/function (_Node) {
+  _inherits(Directive, _Node);
 
   function Directive() {
     var _this;
 
-    (0, _classCallCheck2.default)(this, Directive);
-    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Directive).call(this, _constants.Type.DIRECTIVE));
+    _classCallCheck(this, Directive);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(Directive).call(this, Type.DIRECTIVE));
     _this.name = null;
     return _this;
   }
 
-  (0, _createClass2.default)(Directive, [{
+  _createClass(Directive, [{
     key: "parseName",
     value: function parseName(start) {
       var src = this.context.src;
@@ -82,7 +45,7 @@ function (_Node) {
         ch = src[offset += 1];
       }
 
-      this.valueRange = new _Range.default(start, offset);
+      this.valueRange = new Range(start, offset);
       return offset;
     }
   }, {
@@ -92,7 +55,7 @@ function (_Node) {
       var offset = this.parseName(start + 1);
       offset = this.parseParameters(offset);
       offset = this.parseComment(offset);
-      this.range = new _Range.default(start, offset);
+      this.range = new Range(start, offset);
       return offset;
     }
   }, {
@@ -102,7 +65,8 @@ function (_Node) {
       return raw ? raw.trim().split(/[ \t]+/) : [];
     }
   }]);
+
   return Directive;
-}(_Node2.default);
+}(Node);
 
-exports.default = Directive;
+export { Directive as default };

package/browser/dist/cst/Document.js

@@ -1,49 +1,25 @@
-"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 _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _constants = require("../constants");
-
-var _errors = require("../errors");
-
-var _BlankLine = _interopRequireDefault(require("./BlankLine"));
-
-var _Collection = require("./Collection");
-
-var _Comment = _interopRequireDefault(require("./Comment"));
-
-var _Directive = _interopRequireDefault(require("./Directive"));
-
-var _Node2 = _interopRequireDefault(require("./Node"));
-
-var _Range = _interopRequireDefault(require("./Range"));
-
-var Document =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(Document, _Node);
-  (0, _createClass2.default)(Document, null, [{
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
+import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
+import _get from "@babel/runtime/helpers/get";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _inherits from "@babel/runtime/helpers/inherits";
+import { Char, Type } from '../constants';
+import { YAMLSemanticError, YAMLSyntaxError } from '../errors';
+import BlankLine from './BlankLine';
+import { grabCollectionEndComments } from './Collection';
+import Comment from './Comment';
+import Directive from './Directive';
+import Node from './Node';
+import Range from './Range';
+
+var Document = /*#__PURE__*/function (_Node) {
+  _inherits(Document, _Node);
+
+  _createClass(Document, null, [{
     key: "startCommentOrEndBlankLine",
     value: function startCommentOrEndBlankLine(src, start) {
-      var offset = _Node2.default.endOfWhiteSpace(src, start);
-
+      var offset = Node.endOfWhiteSpace(src, start);
       var ch = src[offset];
       return ch === '#' || ch === '\n' ? offset : start;
     }
@@ -52,8 +28,9 @@ function (_Node) {
   function Document() {
     var _this;
 
-    (0, _classCallCheck2.default)(this, Document);
-    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Document).call(this, _constants.Type.DOCUMENT));
+    _classCallCheck(this, Document);
+
+    _this = _possibleConstructorReturn(this, _getPrototypeOf(Document).call(this, Type.DOCUMENT));
     _this.directives = null;
     _this.contents = null;
     _this.directivesEndMarker = null;
@@ -61,7 +38,7 @@ function (_Node) {
     return _this;
   }
 
-  (0, _createClass2.default)(Document, [{
+  _createClass(Document, [{
     key: "parseDirectives",
     value: function parseDirectives(start) {
       var src = this.context.src;
@@ -70,13 +47,13 @@ function (_Node) {
       var hasDirectives = false;
       var offset = start;
 
-      while (!_Node2.default.atDocumentBoundary(src, offset, _constants.Char.DIRECTIVES_END)) {
+      while (!Node.atDocumentBoundary(src, offset, Char.DIRECTIVES_END)) {
         offset = Document.startCommentOrEndBlankLine(src, offset);
 
         switch (src[offset]) {
           case '\n':
             if (atLineStart) {
-              var blankLine = new _BlankLine.default();
+              var blankLine = new BlankLine();
               offset = blankLine.parse({
                 src: src
               }, offset);
@@ -93,7 +70,7 @@ function (_Node) {
 
           case '#':
             {
-              var comment = new _Comment.default();
+              var comment = new Comment();
               offset = comment.parse({
                 src: src
               }, offset);
@@ -104,7 +81,7 @@ function (_Node) {
 
           case '%':
             {
-              var directive = new _Directive.default();
+              var directive = new Directive();
               offset = directive.parse({
                 parent: this,
                 src: src
@@ -117,7 +94,7 @@ function (_Node) {
 
           default:
             if (hasDirectives) {
-              this.error = new _errors.YAMLSemanticError(this, 'Missing directives-end indicator line');
+              this.error = new YAMLSemanticError(this, 'Missing directives-end indicator line');
             } else if (this.directives.length > 0) {
               this.contents = this.directives;
               this.directives = [];
@@ -128,12 +105,12 @@ function (_Node) {
       }
 
       if (src[offset]) {
-        this.directivesEndMarker = new _Range.default(offset, offset + 3);
+        this.directivesEndMarker = new Range(offset, offset + 3);
         return offset + 3;
       }
 
       if (hasDirectives) {
-        this.error = new _errors.YAMLSemanticError(this, 'Missing directives-end indicator line');
+        this.error = new YAMLSemanticError(this, 'Missing directives-end indicator line');
       } else if (this.directives.length > 0) {
         this.contents = this.directives;
         this.directives = [];
@@ -154,16 +131,15 @@ function (_Node) {
         lineStart -= 1;
       }
 
-      var offset = _Node2.default.endOfWhiteSpace(src, start);
-
+      var offset = Node.endOfWhiteSpace(src, start);
       var atLineStart = lineStart === start;
-      this.valueRange = new _Range.default(offset);
+      this.valueRange = new Range(offset);
 
-      while (!_Node2.default.atDocumentBoundary(src, offset, _constants.Char.DOCUMENT_END)) {
+      while (!Node.atDocumentBoundary(src, offset, Char.DOCUMENT_END)) {
         switch (src[offset]) {
           case '\n':
             if (atLineStart) {
-              var blankLine = new _BlankLine.default();
+              var blankLine = new BlankLine();
               offset = blankLine.parse({
                 src: src
               }, offset);
@@ -181,7 +157,7 @@ function (_Node) {
 
           case '#':
             {
-              var comment = new _Comment.default();
+              var comment = new Comment();
               offset = comment.parse({
                 src: src
               }, offset);
@@ -192,8 +168,7 @@ function (_Node) {
 
           default:
             {
-              var iEnd = _Node2.default.endOfIndent(src, offset);
-
+              var iEnd = Node.endOfIndent(src, offset);
               var context = {
                 atLineStart: atLineStart,
                 indent: -1,
@@ -208,7 +183,7 @@ function (_Node) {
               this.contents.push(node);
               offset = node.range.end;
               atLineStart = false;
-              var ec = (0, _Collection.grabCollectionEndComments)(node);
+              var ec = grabCollectionEndComments(node);
               if (ec) Array.prototype.push.apply(this.contents, ec);
             }
         }
@@ -219,14 +194,14 @@ function (_Node) {
       this.valueRange.end = offset;
 
       if (src[offset]) {
-        this.documentEndMarker = new _Range.default(offset, offset + 3);
+        this.documentEndMarker = new Range(offset, offset + 3);
         offset += 3;
 
         if (src[offset]) {
-          offset = _Node2.default.endOfWhiteSpace(src, offset);
+          offset = Node.endOfWhiteSpace(src, offset);
 
           if (src[offset] === '#') {
-            var _comment = new _Comment.default();
+            var _comment = new Comment();
 
             offset = _comment.parse({
               src: src
@@ -243,7 +218,7 @@ function (_Node) {
               break;
 
             default:
-              this.error = new _errors.YAMLSyntaxError(this, 'Document end marker line cannot have a non-comment suffix');
+              this.error = new YAMLSyntaxError(this, 'Document end marker line cannot have a non-comment suffix');
           }
         }
       }
@@ -271,7 +246,7 @@ function (_Node) {
   }, {
     key: "setOrigRanges",
     value: function setOrigRanges(cr, offset) {
-      offset = (0, _get2.default)((0, _getPrototypeOf2.default)(Document.prototype), "setOrigRanges", this).call(this, cr, offset);
+      offset = _get(_getPrototypeOf(Document.prototype), "setOrigRanges", this).call(this, cr, offset);
       this.directives.forEach(function (node) {
         offset = node.setOrigRanges(cr, offset);
       });
@@ -292,7 +267,7 @@ function (_Node) {
       var str = directives.join('');
 
       if (contents.length > 0) {
-        if (directives.length > 0 || contents[0].type === _constants.Type.COMMENT) str += '---\n';
+        if (directives.length > 0 || contents[0].type === Type.COMMENT) str += '---\n';
         str += contents.join('');
       }
 
@@ -300,7 +275,8 @@ function (_Node) {
       return str;
     }
   }]);
+
   return Document;
-}(_Node2.default);
+}(Node);
 
-exports.default = Document;
+export { Document as default };