yaml 1.5.0 → 1.5.1

package/browser/dist/Document.js

@@ -144,9 +144,7 @@ function () {
     }
   }, {
     key: "parse",
-    value: function parse(node) {
-      var _this = this;
-
+    value: function parse(node, prevDoc) {
       if (this.options.keepCstNodes) this.cstNode = node;
       if (this.options.keepNodeTypes) this.type = 'DOCUMENT';
       var _node$directives = node.directives,
@@ -161,7 +159,72 @@ function () {
         this.errors.push(error);
       }
 
+      this.parseDirectives(directives, prevDoc);
+      this.range = valueRange ? [valueRange.start, valueRange.end] : null;
+      this.setSchema();
+      this.anchors._cstAliases = [];
+      this.parseContents(contents);
+      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;
+    }
+  }, {
+    key: "parseDirectives",
+    value: function parseDirectives(directives, prevDoc) {
+      var _this = this;
+
       var directiveComments = [];
+      var hasDirectives = false;
       directives.forEach(function (directive) {
         var comment = directive.comment,
             name = directive.name;
@@ -170,12 +233,14 @@ function () {
           case 'TAG':
             _this.resolveTagDirective(directive);
 
+            hasDirectives = true;
             break;
 
           case 'YAML':
           case 'YAML:1.0':
             _this.resolveYamlDirective(directive);
 
+            hasDirectives = true;
             break;
 
           default:
@@ -189,10 +254,28 @@ function () {
 
         if (comment) directiveComments.push(comment);
       });
-      this.range = valueRange ? [valueRange.start, valueRange.end] : null;
-      this.setSchema();
-      this.anchors._cstAliases = [];
+
+      if (prevDoc && !hasDirectives && '1.1' === (this.version || prevDoc.version || this.options.version)) {
+        var copyTagPrefix = function copyTagPrefix(_ref) {
+          var handle = _ref.handle,
+              prefix = _ref.prefix;
+          return {
+            handle: handle,
+            prefix: prefix
+          };
+        };
+
+        this.tagPrefixes = prevDoc.tagPrefixes.map(copyTagPrefix);
+        this.version = prevDoc.version;
+      }
+
       this.commentBefore = directiveComments.join('\n') || null;
+    }
+  }, {
+    key: "parseContents",
+    value: function parseContents(contents) {
+      var _this2 = this;
+
       var comments = {
         before: [],
         after: []
@@ -204,10 +287,10 @@ function () {
           if (contentNodes.length === 1) {
             var msg = 'Document is not valid YAML (bad indentation?)';
 
-            _this.errors.push(new _errors.YAMLSyntaxError(node, msg));
+            _this2.errors.push(new _errors.YAMLSyntaxError(node, msg));
           }
 
-          var res = _this.resolveNode(node);
+          var res = _this2.resolveNode(node);
 
           if (spaceBefore) {
             res.spaceBefore = true;
@@ -221,9 +304,9 @@ function () {
         } else if (node.type === _constants.Type.BLANK_LINE) {
           spaceBefore = true;
 
-          if (contentNodes.length === 0 && comments.before.length > 0 && !_this.commentBefore) {
+          if (contentNodes.length === 0 && comments.before.length > 0 && !_this2.commentBefore) {
             // space-separated comments at start are parsed as document comments
-            _this.commentBefore = comments.before.join('\n');
+            _this2.commentBefore = comments.before.join('\n');
             comments.before = [];
           }
         }
@@ -263,59 +346,6 @@ 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;
     }
   }, {
     key: "resolveTagDirective",
@@ -659,7 +689,7 @@ function () {
   }, {
     key: "toJSON",
     value: function toJSON(arg) {
-      var _this2 = this;
+      var _this3 = this;
 
       var _this$options = this.options,
           keepBlobsInJSON = _this$options.keepBlobsInJSON,
@@ -678,7 +708,7 @@ function () {
           alias: [],
           aliasCount: 0,
           count: 1,
-          node: _this2.anchors.map[name]
+          node: _this3.anchors.map[name]
         };
       });
       return (0, _toJSON2.default)(this.contents, arg, ctx);
@@ -704,9 +734,9 @@ function () {
       }
 
       var tagNames = this.listNonDefaultTags();
-      this.tagPrefixes.forEach(function (_ref) {
-        var handle = _ref.handle,
-            prefix = _ref.prefix;
+      this.tagPrefixes.forEach(function (_ref2) {
+        var handle = _ref2.handle,
+            prefix = _ref2.prefix;
 
         if (tagNames.some(function (t) {
           return t.indexOf(prefix) === 0;

package/browser/dist/index.js

@@ -65,9 +65,36 @@ function (_YAMLDocument) {
 }(_Document.default);
 
 function parseAllDocuments(src, options) {
-  return (0, _parse.default)(src).map(function (cstDoc) {
-    return new Document(options).parse(cstDoc);
-  });
+  var stream = [];
+  var prev;
+  var _iteratorNormalCompletion = true;
+  var _didIteratorError = false;
+  var _iteratorError = undefined;
+
+  try {
+    for (var _iterator = (0, _parse.default)(src)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var cstDoc = _step.value;
+      var doc = new Document(options);
+      doc.parse(cstDoc, prev);
+      stream.push(doc);
+      prev = doc;
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return != null) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+
+  return stream;
 }
 
 function parseDocument(src, options) {

package/browser/util.js

@@ -6,7 +6,7 @@ var str = require('./dist/stringify')
 exports.stringifyNumber = str.stringifyNumber
 exports.stringifyString = str.stringifyString
 exports.toJSON = require('./dist/toJSON').default
-exports.Type = require('./dist/cst/Node').Type
+exports.Type = require('./dist/constants').Type
 
 var err = require('./dist/errors')
 exports.YAMLReferenceError = err.YAMLReferenceError

package/dist/Document.js

@@ -118,7 +118,7 @@ class Document {
     if (!this.schema) this.schema = new _schema.default(Object.assign({}, this.getDefaults(), this.options));
   }
 
-  parse(node) {
+  parse(node, prevDoc) {
     if (this.options.keepCstNodes) this.cstNode = node;
     if (this.options.keepNodeTypes) this.type = 'DOCUMENT';
     const {
@@ -133,7 +133,25 @@ class Document {
       this.errors.push(error);
     }
 
+    this.parseDirectives(directives, prevDoc);
+    this.range = valueRange ? [valueRange.start, valueRange.end] : null;
+    this.setSchema();
+    this.anchors._cstAliases = [];
+    this.parseContents(contents);
+    this.anchors.resolveNodes();
+
+    if (this.options.prettyErrors) {
+      for (const error of this.errors) if (error instanceof _errors.YAMLError) error.makePretty();
+
+      for (const warn of this.warnings) if (warn instanceof _errors.YAMLError) warn.makePretty();
+    }
+
+    return this;
+  }
+
+  parseDirectives(directives, prevDoc) {
     const directiveComments = [];
+    let hasDirectives = false;
     directives.forEach(directive => {
       const {
         comment,
@@ -143,11 +161,13 @@ class Document {
       switch (name) {
         case 'TAG':
           this.resolveTagDirective(directive);
+          hasDirectives = true;
           break;
 
         case 'YAML':
         case 'YAML:1.0':
           this.resolveYamlDirective(directive);
+          hasDirectives = true;
           break;
 
         default:
@@ -160,10 +180,24 @@ class Document {
 
       if (comment) directiveComments.push(comment);
     });
-    this.range = valueRange ? [valueRange.start, valueRange.end] : null;
-    this.setSchema();
-    this.anchors._cstAliases = [];
+
+    if (prevDoc && !hasDirectives && '1.1' === (this.version || prevDoc.version || this.options.version)) {
+      const copyTagPrefix = ({
+        handle,
+        prefix
+      }) => ({
+        handle,
+        prefix
+      });
+
+      this.tagPrefixes = prevDoc.tagPrefixes.map(copyTagPrefix);
+      this.version = prevDoc.version;
+    }
+
     this.commentBefore = directiveComments.join('\n') || null;
+  }
+
+  parseContents(contents) {
     const comments = {
       before: [],
       after: []
@@ -233,15 +267,6 @@ class Document {
     }
 
     this.comment = comments.after.join('\n') || null;
-    this.anchors.resolveNodes();
-
-    if (this.options.prettyErrors) {
-      for (const error of this.errors) if (error instanceof _errors.YAMLError) error.makePretty();
-
-      for (const warn of this.warnings) if (warn instanceof _errors.YAMLError) warn.makePretty();
-    }
-
-    return this;
   }
 
   resolveTagDirective(directive) {

package/dist/index.js

@@ -48,7 +48,17 @@ class Document extends _Document.default {
 }
 
 function parseAllDocuments(src, options) {
-  return (0, _parse.default)(src).map(cstDoc => new Document(options).parse(cstDoc));
+  const stream = [];
+  let prev;
+
+  for (const cstDoc of (0, _parse.default)(src)) {
+    const doc = new Document(options);
+    doc.parse(cstDoc, prev);
+    stream.push(doc);
+    prev = doc;
+  }
+
+  return stream;
 }
 
 function parseDocument(src, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -66,24 +66,24 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@babel/cli": "^7.4.3",
-    "@babel/core": "^7.4.3",
-    "@babel/plugin-proposal-class-properties": "^7.4.0",
-    "@babel/plugin-transform-runtime": "^7.4.3",
-    "@babel/preset-env": "^7.4.3",
+    "@babel/cli": "^7.4.4",
+    "@babel/core": "^7.4.4",
+    "@babel/plugin-proposal-class-properties": "^7.4.4",
+    "@babel/plugin-transform-runtime": "^7.4.4",
+    "@babel/preset-env": "^7.4.4",
     "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.7.1",
+    "babel-jest": "^24.8.0",
     "babel-plugin-trace": "^1.1.0",
     "cpy-cli": "^2.0.0",
     "eslint": "^5.16.0",
-    "eslint-config-prettier": "^4.1.0",
+    "eslint-config-prettier": "^4.2.0",
     "eslint-plugin-prettier": "^3.0.1",
-    "fast-check": "^1.13.0",
-    "jest": "^24.7.1",
-    "prettier": "^1.16.4"
+    "fast-check": "^1.14.0",
+    "jest": "^24.8.0",
+    "prettier": "^1.17.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.4.3"
+    "@babel/runtime": "^7.4.4"
   },
   "engines": {
     "node": ">= 6"

package/util.js

@@ -6,7 +6,7 @@ var str = require('./dist/stringify')
 exports.stringifyNumber = str.stringifyNumber
 exports.stringifyString = str.stringifyString
 exports.toJSON = require('./dist/toJSON').default
-exports.Type = require('./dist/cst/Node').Type
+exports.Type = require('./dist/constants').Type
 
 var err = require('./dist/errors')
 exports.YAMLReferenceError = err.YAMLReferenceError