yaml 1.3.0 → 1.5.0

package/README.md

@@ -2,7 +2,7 @@
 
 `yaml` is a JavaScript parser and stringifier for [YAML](http://yaml.org/), a human friendly data serialization standard. It supports both parsing and stringifying data using all versions of YAML, along with all common data schemas. As a particularly distinguishing feature, `yaml` fully supports reading and writing comments and blank lines in YAML documents.
 
-The library is released under the ISC open source license, and the code is [available on GitHub](https://github.com/eemeli/yaml/). It has no external dependencies, and is usable in both browser and node environments.
+The library is released under the ISC open source license, and the code is [available on GitHub](https://github.com/eemeli/yaml/). It runs on Node.js 6 and later with no external dependencies, and in browsers from IE 11 upwards (Note: `@babel/runtime` is used only by the `"browser"` entry point).
 
 For more information, see the project's documentation site: [**eemeli.org/yaml**](https://eemeli.org/yaml/)
 
@@ -18,7 +18,7 @@ Note: `yaml` 0.x and 1.x are rather different implementations. For the earlier `
 
 ## API Overview
 
-The API provided by `yaml` has three layers, depending on how deep you need to go: [Pure JavaScript](https://eemeli.org/yaml/#pure-javascript), [YAML Documents](https://eemeli.org/yaml/#yaml-documents), and the [CST Parser](https://eemeli.org/yaml/#cst-parser). The first has the simplest API and "just works", the second gets you all the bells and whistles supported by the library along with a decent [AST](https://eemeli.org/yaml/#content-nodes), and the third is the closest to YAML source, making it fast, raw, and crude.
+The API provided by `yaml` has three layers, depending on how deep you need to go: [Parse & Stringify](https://eemeli.org/yaml/#parse-amp-stringify), [Documents](https://eemeli.org/yaml/#documents), and the [CST Parser](https://eemeli.org/yaml/#cst-parser). The first has the simplest API and "just works", the second gets you all the bells and whistles supported by the library along with a decent [AST](https://eemeli.org/yaml/#content-nodes), and the third is the closest to YAML source, making it fast, raw, and crude.
 
 ```js
 import YAML from 'yaml'
@@ -26,33 +26,31 @@ import YAML from 'yaml'
 const YAML = require('yaml')
 ```
 
-### Pure JavaScript
+### Parse & Stringify
 
-* [`YAML.parse(str, options): value`](https://eemeli.org/yaml/#yaml-parse)
-* [`YAML.stringify(value, options): string`](https://eemeli.org/yaml/#yaml-stringify)
+- [`YAML.parse(str, options): value`](https://eemeli.org/yaml/#yaml-parse)
+- [`YAML.stringify(value, options): string`](https://eemeli.org/yaml/#yaml-stringify)
 
 ### YAML Documents
 
-* [`YAML.createNode(value, wrapScalars, tag): Node`](https://eemeli.org/yaml/#creating-nodes)
-* [`YAML.defaultOptions`](https://eemeli.org/yaml/#options)
-* [`YAML.Document`](https://eemeli.org/yaml/#yaml-documents)
-  * [`constructor(options)`](https://eemeli.org/yaml/#creating-documents)
-  * [`defaults`](https://eemeli.org/yaml/#options)
-  * [`#anchors`](https://eemeli.org/yaml/#working-with-anchors)
-  * [`#contents`](https://eemeli.org/yaml/#content-nodes)
-  * [`#errors`](https://eemeli.org/yaml/#errors)
-* [`YAML.parseAllDocuments(str, options): YAML.Document[]`](https://eemeli.org/yaml/#parsing-documents)
-* [`YAML.parseDocument(str, options): YAML.Document`](https://eemeli.org/yaml/#parsing-documents)
+- [`YAML.createNode(value, wrapScalars, tag): Node`](https://eemeli.org/yaml/#creating-nodes)
+- [`YAML.defaultOptions`](https://eemeli.org/yaml/#options)
+- [`YAML.Document`](https://eemeli.org/yaml/#yaml-documents)
+  - [`constructor(options)`](https://eemeli.org/yaml/#creating-documents)
+  - [`defaults`](https://eemeli.org/yaml/#options)
+  - [`#anchors`](https://eemeli.org/yaml/#working-with-anchors)
+  - [`#contents`](https://eemeli.org/yaml/#content-nodes)
+  - [`#errors`](https://eemeli.org/yaml/#errors)
+- [`YAML.parseAllDocuments(str, options): YAML.Document[]`](https://eemeli.org/yaml/#parsing-documents)
+- [`YAML.parseDocument(str, options): YAML.Document`](https://eemeli.org/yaml/#parsing-documents)
 
 ```js
-import Map from 'yaml/map'
-import Pair from 'yaml/pair'
-import Seq from 'yaml/seq'
+import { Pair, YAMLMap, YAMLSeq } from 'yaml/types'
 ```
 
-* [`new Map()`](https://eemeli.org/yaml/#creating-nodes)
-* [`new Pair(key, value)`](https://eemeli.org/yaml/#creating-nodes)
-* [`new Seq()`](https://eemeli.org/yaml/#creating-nodes)
+- [`new Pair(key, value)`](https://eemeli.org/yaml/#creating-nodes)
+- [`new YAMLMap()`](https://eemeli.org/yaml/#creating-nodes)
+- [`new YAMLSeq()`](https://eemeli.org/yaml/#creating-nodes)
 
 ### CST Parser
 
@@ -60,8 +58,8 @@ import Seq from 'yaml/seq'
 import parseCST from 'yaml/parse-cst'
 ```
 
-* [`parseCST(str): CSTDocument[]`](https://eemeli.org/yaml/#parsecst)
-* [`YAML.parseCST(str): CSTDocument[]`](https://eemeli.org/yaml/#parsecst)
+- [`parseCST(str): CSTDocument[]`](https://eemeli.org/yaml/#parsecst)
+- [`YAML.parseCST(str): CSTDocument[]`](https://eemeli.org/yaml/#parsecst)
 
 ## YAML.parse
 
@@ -119,3 +117,11 @@ YAML.stringify({ number: 3, plain: 'string', block: 'two\nlines\n' })
 //   lines
 // `
 ```
+
+---
+
+Browser testing provided by:
+
+<a href="https://www.browserstack.com/open-source">
+<img width=200 src="https://eemeli.org/yaml/images/browserstack.svg" />
+</a>

package/browser/dist/Anchors.js

@@ -26,9 +26,17 @@ var _Seq = _interopRequireDefault(require("./schema/Seq"));
 var Anchors =
 /*#__PURE__*/
 function () {
-  function Anchors() {
+  (0, _createClass2.default)(Anchors, null, [{
+    key: "validAnchorNode",
+    value: function validAnchorNode(node) {
+      return node instanceof _Scalar.default || node instanceof _Seq.default || node instanceof _Map.default;
+    }
+  }]);
+
+  function Anchors(prefix) {
     (0, _classCallCheck2.default)(this, Anchors);
     (0, _defineProperty2.default)(this, "map", {});
+    this.prefix = prefix;
   }
 
   (0, _createClass2.default)(Anchors, [{
@@ -75,6 +83,7 @@ function () {
   }, {
     key: "newName",
     value: function newName(prefix) {
+      if (!prefix) prefix = this.prefix;
       var names = Object.keys(this.map);
 
       for (var i = 1; true; ++i) {
@@ -124,7 +133,7 @@ function () {
       } else {
         if (!name) {
           if (!node) return null;
-          name = this.newName('a');
+          name = this.newName();
         }
 
         map[name] = node;
@@ -132,15 +141,8 @@ function () {
 
       return name;
     }
-  }], [{
-    key: "validAnchorNode",
-    value: function validAnchorNode(node) {
-      return node instanceof _Scalar.default || node instanceof _Seq.default || node instanceof _Map.default;
-    }
   }]);
   return Anchors;
 }();
 
-exports.default = Anchors;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = Anchors;

package/browser/dist/Document.js

@@ -21,7 +21,7 @@ var _addComment = _interopRequireDefault(require("./addComment"));
 
 var _Anchors = _interopRequireDefault(require("./Anchors"));
 
-var _Node = require("./cst/Node");
+var _constants = require("./constants");
 
 var _errors = require("./errors");
 
@@ -33,12 +33,14 @@ var _Alias = _interopRequireDefault(require("./schema/Alias"));
 
 var _Collection = _interopRequireWildcard(require("./schema/Collection"));
 
-var _toJSON2 = _interopRequireDefault(require("./toJSON"));
+var _Node = _interopRequireDefault(require("./schema/Node"));
 
 var _Scalar = _interopRequireDefault(require("./schema/Scalar"));
 
+var _toJSON2 = _interopRequireDefault(require("./toJSON"));
+
 var isCollectionItem = function isCollectionItem(node) {
-  return node && [_Node.Type.MAP_KEY, _Node.Type.MAP_VALUE, _Node.Type.SEQ_ITEM].includes(node.type);
+  return node && [_constants.Type.MAP_KEY, _constants.Type.MAP_VALUE, _constants.Type.SEQ_ITEM].includes(node.type);
 };
 
 var Document =
@@ -46,7 +48,7 @@ var Document =
 function () {
   function Document(options) {
     (0, _classCallCheck2.default)(this, Document);
-    this.anchors = new _Anchors.default();
+    this.anchors = new _Anchors.default(options.anchorPrefix);
     this.commentBefore = null;
     this.comment = null;
     this.contents = null;
@@ -216,7 +218,7 @@ function () {
         } else if (node.comment !== null) {
           var cc = contentNodes.length === 0 ? comments.before : comments.after;
           cc.push(node.comment);
-        } else if (node.type === _Node.Type.BLANK_LINE) {
+        } else if (node.type === _constants.Type.BLANK_LINE) {
           spaceBefore = true;
 
           if (contentNodes.length === 0 && comments.before.length > 0 && !_this.commentBefore) {
@@ -262,6 +264,57 @@ function () {
 
       this.comment = comments.after.join('\n') || null;
       this.anchors.resolveNodes();
+
+      if (this.options.prettyErrors) {
+        var _iteratorNormalCompletion = true;
+        var _didIteratorError = false;
+        var _iteratorError = undefined;
+
+        try {
+          for (var _iterator = this.errors[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+            var _error = _step.value;
+            if (_error instanceof _errors.YAMLError) _error.makePretty();
+          }
+        } catch (err) {
+          _didIteratorError = true;
+          _iteratorError = err;
+        } finally {
+          try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+              _iterator.return();
+            }
+          } finally {
+            if (_didIteratorError) {
+              throw _iteratorError;
+            }
+          }
+        }
+
+        var _iteratorNormalCompletion2 = true;
+        var _didIteratorError2 = false;
+        var _iteratorError2 = undefined;
+
+        try {
+          for (var _iterator2 = this.warnings[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+            var warn = _step2.value;
+            if (warn instanceof _errors.YAMLError) warn.makePretty();
+          }
+        } catch (err) {
+          _didIteratorError2 = true;
+          _iteratorError2 = err;
+        } finally {
+          try {
+            if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+              _iterator2.return();
+            }
+          } finally {
+            if (_didIteratorError2) {
+              throw _iteratorError2;
+            }
+          }
+        }
+      }
+
       return this;
     }
   }, {
@@ -371,21 +424,21 @@ function () {
       }
 
       switch (type) {
-        case _Node.Type.BLOCK_FOLDED:
-        case _Node.Type.BLOCK_LITERAL:
-        case _Node.Type.QUOTE_DOUBLE:
-        case _Node.Type.QUOTE_SINGLE:
+        case _constants.Type.BLOCK_FOLDED:
+        case _constants.Type.BLOCK_LITERAL:
+        case _constants.Type.QUOTE_DOUBLE:
+        case _constants.Type.QUOTE_SINGLE:
           return _schema.default.defaultTags.STR;
 
-        case _Node.Type.FLOW_MAP:
-        case _Node.Type.MAP:
+        case _constants.Type.FLOW_MAP:
+        case _constants.Type.MAP:
           return _schema.default.defaultTags.MAP;
 
-        case _Node.Type.FLOW_SEQ:
-        case _Node.Type.SEQ:
+        case _constants.Type.FLOW_SEQ:
+        case _constants.Type.SEQ:
           return _schema.default.defaultTags.SEQ;
 
-        case _Node.Type.PLAIN:
+        case _constants.Type.PLAIN:
           return nonSpecific ? _schema.default.defaultTags.STR : null;
 
         default:
@@ -406,22 +459,22 @@ function () {
         after: []
       };
       var props = isCollectionItem(node.context.parent) ? node.context.parent.props.concat(node.props) : node.props;
-      var _iteratorNormalCompletion = true;
-      var _didIteratorError = false;
-      var _iteratorError = undefined;
+      var _iteratorNormalCompletion3 = true;
+      var _didIteratorError3 = false;
+      var _iteratorError3 = undefined;
 
       try {
-        for (var _iterator = props[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-          var _step$value = _step.value,
-              start = _step$value.start,
-              end = _step$value.end;
+        for (var _iterator3 = props[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+          var _step3$value = _step3.value,
+              start = _step3$value.start,
+              end = _step3$value.end;
 
           switch (node.context.src[start]) {
-            case _Node.Char.COMMENT:
+            case _constants.Char.COMMENT:
               {
                 if (!node.commentHasRequiredWhitespace(start)) {
-                  var _msg8 = 'Comments must be separated from other tokens by white space characters';
-                  errors.push(new _errors.YAMLSemanticError(node, _msg8));
+                  var _msg7 = 'Comments must be separated from other tokens by white space characters';
+                  errors.push(new _errors.YAMLSemanticError(node, _msg7));
                 }
 
                 var c = node.context.src.slice(start + 1, end);
@@ -436,19 +489,19 @@ function () {
               }
               break;
 
-            case _Node.Char.ANCHOR:
+            case _constants.Char.ANCHOR:
               if (hasAnchor) {
-                var _msg9 = 'A node can have at most one anchor';
-                errors.push(new _errors.YAMLSemanticError(node, _msg9));
+                var _msg8 = 'A node can have at most one anchor';
+                errors.push(new _errors.YAMLSemanticError(node, _msg8));
               }
 
               hasAnchor = true;
               break;
 
-            case _Node.Char.TAG:
+            case _constants.Char.TAG:
               if (hasTag) {
-                var _msg10 = 'A node can have at most one tag';
-                errors.push(new _errors.YAMLSemanticError(node, _msg10));
+                var _msg9 = 'A node can have at most one tag';
+                errors.push(new _errors.YAMLSemanticError(node, _msg9));
               }
 
               hasTag = true;
@@ -456,16 +509,16 @@ function () {
           }
         }
       } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
+        _didIteratorError3 = true;
+        _iteratorError3 = err;
       } finally {
         try {
-          if (!_iteratorNormalCompletion && _iterator.return != null) {
-            _iterator.return();
+          if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
+            _iterator3.return();
           }
         } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
+          if (_didIteratorError3) {
+            throw _iteratorError3;
           }
         }
       }
@@ -484,7 +537,7 @@ function () {
 
       var res;
 
-      if (node.type === _Node.Type.ALIAS) {
+      if (node.type === _constants.Type.ALIAS) {
         if (hasAnchor || hasTag) {
           var msg = 'An alias node must not specify any properties';
           errors.push(new _errors.YAMLSemanticError(node, msg));
@@ -504,21 +557,16 @@ function () {
         res = new _Alias.default(src);
 
         anchors._cstAliases.push(res);
-
-        if (!src.resolved) {
-          var _msg6 = 'Alias node contains a circular reference, which cannot be resolved as JSON';
-          this.warnings.push(new _errors.YAMLWarning(node, _msg6));
-        }
       } else {
         var tagName = this.resolveTagName(node);
 
         if (tagName) {
           res = schema.resolveNodeWithFallback(this, node, tagName);
         } else {
-          if (node.type !== _Node.Type.PLAIN) {
-            var _msg7 = "Failed to resolve ".concat(node.type, " node here");
+          if (node.type !== _constants.Type.PLAIN) {
+            var _msg6 = "Failed to resolve ".concat(node.type, " node here");
 
-            errors.push(new _errors.YAMLSyntaxError(node, _msg7));
+            errors.push(new _errors.YAMLSyntaxError(node, _msg6));
             return null;
           }
 
@@ -611,16 +659,29 @@ function () {
   }, {
     key: "toJSON",
     value: function toJSON(arg) {
-      var cr = this.warnings.find(function (w) {
-        return /circular reference/.test(w.message);
-      });
-      if (cr) throw new _errors.YAMLSemanticError(cr.source, cr.message);
-      var keep = this.options.keepBlobsInJSON && (typeof arg !== 'string' || !(this.contents instanceof _Scalar.default));
-      var mapAsMap = keep && !!this.options.mapAsMap;
-      return (0, _toJSON2.default)(this.contents, arg, {
+      var _this2 = this;
+
+      var _this$options = this.options,
+          keepBlobsInJSON = _this$options.keepBlobsInJSON,
+          mapAsMap = _this$options.mapAsMap,
+          maxAliasCount = _this$options.maxAliasCount;
+      var keep = keepBlobsInJSON && (typeof arg !== 'string' || !(this.contents instanceof _Scalar.default));
+      var ctx = {
+        doc: this,
         keep: keep,
-        mapAsMap: mapAsMap
+        mapAsMap: keep && !!mapAsMap,
+        maxAliasCount: maxAliasCount
+      };
+      var anchorNames = Object.keys(this.anchors.map);
+      if (anchorNames.length > 0) ctx.anchors = anchorNames.map(function (name) {
+        return {
+          alias: [],
+          aliasCount: 0,
+          count: 1,
+          node: _this2.anchors.map[name]
+        };
       });
+      return (0, _toJSON2.default)(this.contents, arg, ctx);
     }
   }, {
     key: "toString",
@@ -664,11 +725,14 @@ function () {
       var contentComment = null;
 
       if (this.contents) {
-        if (this.contents.spaceBefore && hasDirectives) lines.push('');
-        if (this.contents.commentBefore) lines.push(this.contents.commentBefore.replace(/^/gm, '#')); // top-level block scalars need to be indented if followed by a comment
+        if (this.contents instanceof _Node.default) {
+          if (this.contents.spaceBefore && hasDirectives) lines.push('');
+          if (this.contents.commentBefore) lines.push(this.contents.commentBefore.replace(/^/gm, '#')); // top-level block scalars need to be indented if followed by a comment
+
+          ctx.forceBlockIndent = !!this.comment;
+          contentComment = this.contents.comment;
+        }
 
-        ctx.forceBlockIndent = !!this.comment;
-        contentComment = this.contents.comment;
         var onChompKeep = contentComment ? null : function () {
           return chompKeep = true;
         };
@@ -726,6 +790,4 @@ exports.default = Document;
       prefix: _schema.default.defaultPrefix
     }]
   }
-});
-module.exports = exports.default;
-module.exports.default = exports.default;
+});

package/browser/dist/constants.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Type = exports.Char = void 0;
+var Char = {
+  ANCHOR: '&',
+  COMMENT: '#',
+  TAG: '!',
+  DIRECTIVES_END: '-',
+  DOCUMENT_END: '.'
+};
+exports.Char = Char;
+var Type = {
+  ALIAS: 'ALIAS',
+  BLANK_LINE: 'BLANK_LINE',
+  BLOCK_FOLDED: 'BLOCK_FOLDED',
+  BLOCK_LITERAL: 'BLOCK_LITERAL',
+  COMMENT: 'COMMENT',
+  DIRECTIVE: 'DIRECTIVE',
+  DOCUMENT: 'DOCUMENT',
+  FLOW_MAP: 'FLOW_MAP',
+  FLOW_SEQ: 'FLOW_SEQ',
+  MAP: 'MAP',
+  MAP_KEY: 'MAP_KEY',
+  MAP_VALUE: 'MAP_VALUE',
+  PLAIN: 'PLAIN',
+  QUOTE_DOUBLE: 'QUOTE_DOUBLE',
+  QUOTE_SINGLE: 'QUOTE_SINGLE',
+  SEQ: 'SEQ',
+  SEQ_ITEM: 'SEQ_ITEM'
+};
+exports.Type = Type;

package/browser/dist/cst/Alias.js

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

package/browser/dist/cst/BlankLine.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -19,7 +17,9 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
-var _Node2 = _interopRequireWildcard(require("./Node"));
+var _constants = require("../constants");
+
+var _Node2 = _interopRequireDefault(require("./Node"));
 
 var _Range = _interopRequireDefault(require("./Range"));
 
@@ -30,7 +30,7 @@ function (_Node) {
 
   function BlankLine() {
     (0, _classCallCheck2.default)(this, BlankLine);
-    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(BlankLine).call(this, _Node2.Type.BLANK_LINE));
+    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(BlankLine).call(this, _constants.Type.BLANK_LINE));
   }
 
   (0, _createClass2.default)(BlankLine, [{
@@ -66,6 +66,4 @@ function (_Node) {
   return BlankLine;
 }(_Node2.default);
 
-exports.default = BlankLine;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = BlankLine;

package/browser/dist/cst/BlockValue.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -21,7 +19,9 @@ var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
 
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
-var _Node2 = _interopRequireWildcard(require("./Node"));
+var _constants = require("../constants");
+
+var _Node2 = _interopRequireDefault(require("./Node"));
 
 var _Range = _interopRequireDefault(require("./Range"));
 
@@ -222,7 +222,7 @@ function (_Node) {
       }
 
       var bi = indent + this.blockIndent;
-      var folded = this.type === _Node2.Type.BLOCK_FOLDED;
+      var folded = this.type === _constants.Type.BLOCK_FOLDED;
       var atStart = true;
       var str = '';
       var sep = '';

package/browser/dist/cst/Collection.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -22,13 +20,15 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
+var _constants = require("../constants");
+
 var _BlankLine = _interopRequireDefault(require("./BlankLine"));
 
 var _CollectionItem = _interopRequireDefault(require("./CollectionItem"));
 
 var _Comment = _interopRequireDefault(require("./Comment"));
 
-var _Node2 = _interopRequireWildcard(require("./Node"));
+var _Node2 = _interopRequireDefault(require("./Node"));
 
 var _Range = _interopRequireDefault(require("./Range"));
 
@@ -46,14 +46,14 @@ function grabCollectionEndComments(node) {
   for (var i = len - 1; i >= 0; --i) {
     var n = cnode.items[i];
 
-    if (n.type === _Node2.Type.COMMENT) {
+    if (n.type === _constants.Type.COMMENT) {
       // Keep sufficiently indented comments with preceding node
       var _n$context = n.context,
           indent = _n$context.indent,
           lineStart = _n$context.lineStart;
       if (indent > 0 && n.range.start >= lineStart + indent) break;
       ci = i;
-    } else if (n.type === _Node2.Type.BLANK_LINE) ci = i;else break;
+    } else if (n.type === _constants.Type.BLANK_LINE) ci = i;else break;
   }
 
   if (ci === -1) return null;
@@ -82,7 +82,7 @@ function (_Node) {
       var ch = src[offset];
       if (!ch) return false;
       if (offset >= lineStart + indent) return true;
-      if (ch !== '#') return false;
+      if (ch !== '#' && ch !== '\n') return false;
       return Collection.nextContentHasIndent(src, offset, indent);
     }
   }]);
@@ -91,7 +91,7 @@ function (_Node) {
     var _this;
 
     (0, _classCallCheck2.default)(this, Collection);
-    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Collection).call(this, firstItem.type === _Node2.Type.SEQ_ITEM ? _Node2.Type.SEQ : _Node2.Type.MAP));
+    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Collection).call(this, firstItem.type === _constants.Type.SEQ_ITEM ? _constants.Type.SEQ : _constants.Type.MAP));
 
     for (var i = firstItem.props.length - 1; i >= 0; --i) {
       if (firstItem.props[i].start < firstItem.context.lineStart) {
@@ -200,7 +200,7 @@ function (_Node) {
           break;
         }
 
-        if (firstItem.type === _Node2.Type.SEQ_ITEM !== (ch === '-')) {
+        if (firstItem.type === _constants.Type.SEQ_ITEM !== (ch === '-')) {
           var typeswitch = true;
 
           if (ch === '-') {