yaml 1.5.1 → 1.6.0

package/browser/dist/Document.js

@@ -52,6 +52,7 @@ function () {
     this.commentBefore = null;
     this.comment = null;
     this.contents = null;
+    this.directivesEndMarker = null;
     this.errors = [];
     this.options = options;
     this.schema = null;
@@ -151,6 +152,7 @@ function () {
           directives = _node$directives === void 0 ? [] : _node$directives,
           _node$contents = node.contents,
           contents = _node$contents === void 0 ? [] : _node$contents,
+          directivesEndMarker = node.directivesEndMarker,
           error = node.error,
           valueRange = node.valueRange;
 
@@ -160,6 +162,7 @@ function () {
       }
 
       this.parseDirectives(directives, prevDoc);
+      if (directivesEndMarker) this.directivesEndMarker = true;
       this.range = valueRange ? [valueRange.start, valueRange.end] : null;
       this.setSchema();
       this.anchors._cstAliases = [];
@@ -719,7 +722,6 @@ function () {
       if (this.errors.length > 0) throw new Error('Document with errors cannot be stringified');
       this.setSchema();
       var lines = [];
-      if (this.commentBefore) lines.push(this.commentBefore.replace(/^/gm, '#'), '');
       var hasDirectives = false;
 
       if (this.version) {
@@ -745,7 +747,13 @@ function () {
           hasDirectives = true;
         }
       });
-      if (hasDirectives) lines.push('---');
+      if (hasDirectives || this.directivesEndMarker) lines.push('---');
+
+      if (this.commentBefore) {
+        if (hasDirectives || !this.directivesEndMarker) lines.unshift('');
+        lines.unshift(this.commentBefore.replace(/^/gm, '#'));
+      }
+
       var ctx = {
         anchors: {},
         doc: this,
@@ -756,7 +764,7 @@ function () {
 
       if (this.contents) {
         if (this.contents instanceof _Node.default) {
-          if (this.contents.spaceBefore && hasDirectives) lines.push('');
+          if (this.contents.spaceBefore && (hasDirectives || this.directivesEndMarker)) 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;

package/browser/dist/cst/Document.js

@@ -56,6 +56,8 @@ function (_Node) {
     _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(Document).call(this, _constants.Type.DOCUMENT));
     _this.directives = null;
     _this.contents = null;
+    _this.directivesEndMarker = null;
+    _this.documentEndMarker = null;
     return _this;
   }
 
@@ -125,7 +127,10 @@ function (_Node) {
         }
       }
 
-      if (src[offset]) return offset + 3;
+      if (src[offset]) {
+        this.directivesEndMarker = new _Range.default(offset, offset + 3);
+        return offset + 3;
+      }
 
       if (hasDirectives) {
         this.error = new _errors.YAMLSemanticError(this, 'Missing directives-end indicator line');
@@ -214,6 +219,7 @@ function (_Node) {
       this.valueRange.end = offset;
 
       if (src[offset]) {
+        this.documentEndMarker = new _Range.default(offset, offset + 3);
         offset += 3;
 
         if (src[offset]) {
@@ -269,9 +275,11 @@ function (_Node) {
       this.directives.forEach(function (node) {
         offset = node.setOrigRanges(cr, offset);
       });
+      if (this.directivesEndMarker) offset = this.directivesEndMarker.setOrigRange(cr, offset);
       this.contents.forEach(function (node) {
         offset = node.setOrigRanges(cr, offset);
       });
+      if (this.documentEndMarker) offset = this.documentEndMarker.setOrigRange(cr, offset);
       return offset;
     }
   }, {

package/browser/dist/cst/FlowCollection.js

@@ -94,7 +94,15 @@ function (_Node) {
               }
 
               offset = _Node2.default.endOfIndent(src, lineStart);
-              if (offset - lineStart <= indent) this.error = new _errors.YAMLSemanticError(this, 'Insufficient indentation in flow collection');
+
+              if (offset <= lineStart + indent) {
+                char = src[offset];
+
+                if (offset < lineStart + indent || char !== ']' && char !== '}') {
+                  var msg = 'Insufficient indentation in flow collection';
+                  this.error = new _errors.YAMLSemanticError(this, msg);
+                }
+              }
             }
             break;
 

package/dist/Document.js

@@ -41,6 +41,7 @@ class Document {
     this.commentBefore = null;
     this.comment = null;
     this.contents = null;
+    this.directivesEndMarker = null;
     this.errors = [];
     this.options = options;
     this.schema = null;
@@ -124,6 +125,7 @@ class Document {
     const {
       directives = [],
       contents = [],
+      directivesEndMarker,
       error,
       valueRange
     } = node;
@@ -134,6 +136,7 @@ class Document {
     }
 
     this.parseDirectives(directives, prevDoc);
+    if (directivesEndMarker) this.directivesEndMarker = true;
     this.range = valueRange ? [valueRange.start, valueRange.end] : null;
     this.setSchema();
     this.anchors._cstAliases = [];
@@ -592,7 +595,6 @@ class Document {
     if (this.errors.length > 0) throw new Error('Document with errors cannot be stringified');
     this.setSchema();
     const lines = [];
-    if (this.commentBefore) lines.push(this.commentBefore.replace(/^/gm, '#'), '');
     let hasDirectives = false;
 
     if (this.version) {
@@ -616,7 +618,13 @@ class Document {
         hasDirectives = true;
       }
     });
-    if (hasDirectives) lines.push('---');
+    if (hasDirectives || this.directivesEndMarker) lines.push('---');
+
+    if (this.commentBefore) {
+      if (hasDirectives || !this.directivesEndMarker) lines.unshift('');
+      lines.unshift(this.commentBefore.replace(/^/gm, '#'));
+    }
+
     const ctx = {
       anchors: {},
       doc: this,
@@ -627,7 +635,7 @@ class Document {
 
     if (this.contents) {
       if (this.contents instanceof _Node.default) {
-        if (this.contents.spaceBefore && hasDirectives) lines.push('');
+        if (this.contents.spaceBefore && (hasDirectives || this.directivesEndMarker)) 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;

package/dist/cst/Document.js

@@ -35,6 +35,8 @@ class Document extends _Node.default {
     super(_constants.Type.DOCUMENT);
     this.directives = null;
     this.contents = null;
+    this.directivesEndMarker = null;
+    this.documentEndMarker = null;
   }
 
   parseDirectives(start) {
@@ -103,7 +105,10 @@ class Document extends _Node.default {
       }
     }
 
-    if (src[offset]) return offset + 3;
+    if (src[offset]) {
+      this.directivesEndMarker = new _Range.default(offset, offset + 3);
+      return offset + 3;
+    }
 
     if (hasDirectives) {
       this.error = new _errors.YAMLSemanticError(this, 'Missing directives-end indicator line');
@@ -190,6 +195,7 @@ class Document extends _Node.default {
     this.valueRange.end = offset;
 
     if (src[offset]) {
+      this.documentEndMarker = new _Range.default(offset, offset + 3);
       offset += 3;
 
       if (src[offset]) {
@@ -244,9 +250,11 @@ class Document extends _Node.default {
     this.directives.forEach(node => {
       offset = node.setOrigRanges(cr, offset);
     });
+    if (this.directivesEndMarker) offset = this.directivesEndMarker.setOrigRange(cr, offset);
     this.contents.forEach(node => {
       offset = node.setOrigRanges(cr, offset);
     });
+    if (this.documentEndMarker) offset = this.documentEndMarker.setOrigRange(cr, offset);
     return offset;
   }
 

package/dist/cst/FlowCollection.js

@@ -74,7 +74,15 @@ class FlowCollection extends _Node.default {
             }
 
             offset = _Node.default.endOfIndent(src, lineStart);
-            if (offset - lineStart <= indent) this.error = new _errors.YAMLSemanticError(this, 'Insufficient indentation in flow collection');
+
+            if (offset <= lineStart + indent) {
+              char = src[offset];
+
+              if (offset < lineStart + indent || char !== ']' && char !== '}') {
+                const msg = 'Insufficient indentation in flow collection';
+                this.error = new _errors.YAMLSemanticError(this, msg);
+              }
+            }
           }
           break;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "1.5.1",
+  "version": "1.6.0",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -67,23 +67,24 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.4.4",
-    "@babel/core": "^7.4.4",
+    "@babel/core": "^7.4.5",
     "@babel/plugin-proposal-class-properties": "^7.4.4",
     "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
+    "@babel/preset-env": "^7.4.5",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^24.8.0",
     "babel-plugin-trace": "^1.1.0",
+    "common-tags": "^1.8.0",
     "cpy-cli": "^2.0.0",
     "eslint": "^5.16.0",
-    "eslint-config-prettier": "^4.2.0",
-    "eslint-plugin-prettier": "^3.0.1",
-    "fast-check": "^1.14.0",
+    "eslint-config-prettier": "^4.3.0",
+    "eslint-plugin-prettier": "^3.1.0",
+    "fast-check": "^1.15.1",
     "jest": "^24.8.0",
-    "prettier": "^1.17.0"
+    "prettier": "^1.17.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.4.4"
+    "@babel/runtime": "^7.4.5"
   },
   "engines": {
     "node": ">= 6"