yaml 1.6.0 → 1.8.0

package/browser/dist/Anchors.js

@@ -1,65 +1,49 @@
-"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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _Alias = _interopRequireDefault(require("./schema/Alias"));
-
-var _Map = _interopRequireDefault(require("./schema/Map"));
-
-var _Merge = _interopRequireDefault(require("./schema/Merge"));
-
-var _Scalar = _interopRequireDefault(require("./schema/Scalar"));
-
-var _Seq = _interopRequireDefault(require("./schema/Seq"));
-
-var Anchors =
-/*#__PURE__*/
-function () {
-  (0, _createClass2.default)(Anchors, null, [{
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import Alias from './schema/Alias';
+import Map from './schema/Map';
+import Merge from './schema/Merge';
+import Scalar from './schema/Scalar';
+import Seq from './schema/Seq';
+
+var Anchors = /*#__PURE__*/function () {
+  _createClass(Anchors, null, [{
     key: "validAnchorNode",
     value: function validAnchorNode(node) {
-      return node instanceof _Scalar.default || node instanceof _Seq.default || node instanceof _Map.default;
+      return node instanceof Scalar || node instanceof Seq || node instanceof Map;
     }
   }]);
 
   function Anchors(prefix) {
-    (0, _classCallCheck2.default)(this, Anchors);
-    (0, _defineProperty2.default)(this, "map", {});
+    _classCallCheck(this, Anchors);
+
+    _defineProperty(this, "map", {});
+
     this.prefix = prefix;
   }
 
-  (0, _createClass2.default)(Anchors, [{
+  _createClass(Anchors, [{
     key: "createAlias",
     value: function createAlias(node, name) {
       this.setAnchor(node, name);
-      return new _Alias.default(node);
+      return new Alias(node);
     }
   }, {
     key: "createMergePair",
     value: function createMergePair() {
       var _this = this;
 
-      var merge = new _Merge.default();
+      var merge = new Merge();
 
       for (var _len = arguments.length, sources = new Array(_len), _key = 0; _key < _len; _key++) {
         sources[_key] = arguments[_key];
       }
 
       merge.value.items = sources.map(function (s) {
-        if (s instanceof _Alias.default) {
-          if (s.source instanceof _Map.default) return s;
-        } else if (s instanceof _Map.default) {
+        if (s instanceof Alias) {
+          if (s.source instanceof Map) return s;
+        } else if (s instanceof Map) {
           return _this.createAlias(s);
         }
 
@@ -142,7 +126,8 @@ function () {
       return name;
     }
   }]);
+
   return Anchors;
 }();
 
-exports.default = Anchors;
+export { Anchors as default };

package/browser/dist/Document.js

@@ -1,54 +1,28 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = 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 _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _addComment = _interopRequireDefault(require("./addComment"));
-
-var _Anchors = _interopRequireDefault(require("./Anchors"));
-
-var _constants = require("./constants");
-
-var _errors = require("./errors");
-
-var _listTagNames = _interopRequireDefault(require("./listTagNames"));
-
-var _schema = _interopRequireDefault(require("./schema"));
-
-var _Alias = _interopRequireDefault(require("./schema/Alias"));
-
-var _Collection = _interopRequireWildcard(require("./schema/Collection"));
-
-var _Node = _interopRequireDefault(require("./schema/Node"));
-
-var _Scalar = _interopRequireDefault(require("./schema/Scalar"));
-
-var _toJSON2 = _interopRequireDefault(require("./toJSON"));
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import addComment from './addComment';
+import Anchors from './Anchors';
+import { Char, Type } from './constants';
+import { YAMLError, YAMLReferenceError, YAMLSemanticError, YAMLSyntaxError, YAMLWarning } from './errors';
+import listTagNames from './listTagNames';
+import Schema from './schema';
+import Alias from './schema/Alias';
+import Collection, { isEmptyPath } from './schema/Collection';
+import Node from './schema/Node';
+import Scalar from './schema/Scalar';
+import _toJSON from './toJSON';
 
 var isCollectionItem = function isCollectionItem(node) {
-  return node && [_constants.Type.MAP_KEY, _constants.Type.MAP_VALUE, _constants.Type.SEQ_ITEM].includes(node.type);
+  return node && [Type.MAP_KEY, Type.MAP_VALUE, Type.SEQ_ITEM].includes(node.type);
 };
 
-var Document =
-/*#__PURE__*/
-function () {
+var Document = /*#__PURE__*/function () {
   function Document(options) {
-    (0, _classCallCheck2.default)(this, Document);
-    this.anchors = new _Anchors.default(options.anchorPrefix);
+    _classCallCheck(this, Document);
+
+    this.anchors = new Anchors(options.anchorPrefix);
     this.commentBefore = null;
     this.comment = null;
     this.contents = null;
@@ -61,10 +35,10 @@ function () {
     this.warnings = [];
   }
 
-  (0, _createClass2.default)(Document, [{
+  _createClass(Document, [{
     key: "assertCollectionContents",
     value: function assertCollectionContents() {
-      if (this.contents instanceof _Collection.default) return true;
+      if (this.contents instanceof Collection) return true;
       throw new Error('Expected a YAML collection as document contents');
     }
   }, {
@@ -88,7 +62,7 @@ function () {
   }, {
     key: "deleteIn",
     value: function deleteIn(path) {
-      if ((0, _Collection.isEmptyPath)(path)) {
+      if (isEmptyPath(path)) {
         if (this.contents == null) return false;
         this.contents = null;
         return true;
@@ -105,24 +79,24 @@ function () {
   }, {
     key: "get",
     value: function get(key, keepScalar) {
-      return this.contents instanceof _Collection.default ? this.contents.get(key, keepScalar) : undefined;
+      return this.contents instanceof Collection ? this.contents.get(key, keepScalar) : undefined;
     }
   }, {
     key: "getIn",
     value: function getIn(path, keepScalar) {
-      if ((0, _Collection.isEmptyPath)(path)) return !keepScalar && this.contents instanceof _Scalar.default ? this.contents.value : this.contents;
-      return this.contents instanceof _Collection.default ? this.contents.getIn(path, keepScalar) : undefined;
+      if (isEmptyPath(path)) return !keepScalar && this.contents instanceof Scalar ? this.contents.value : this.contents;
+      return this.contents instanceof Collection ? this.contents.getIn(path, keepScalar) : undefined;
     }
   }, {
     key: "has",
     value: function has(key) {
-      return this.contents instanceof _Collection.default ? this.contents.has(key) : false;
+      return this.contents instanceof Collection ? this.contents.has(key) : false;
     }
   }, {
     key: "hasIn",
     value: function hasIn(path) {
-      if ((0, _Collection.isEmptyPath)(path)) return this.contents !== undefined;
-      return this.contents instanceof _Collection.default ? this.contents.hasIn(path) : false;
+      if (isEmptyPath(path)) return this.contents !== undefined;
+      return this.contents instanceof Collection ? this.contents.hasIn(path) : false;
     }
   }, {
     key: "set",
@@ -133,15 +107,27 @@ function () {
   }, {
     key: "setIn",
     value: function setIn(path, value) {
-      if ((0, _Collection.isEmptyPath)(path)) this.contents = value;else {
+      if (isEmptyPath(path)) this.contents = value;else {
         this.assertCollectionContents();
         this.contents.setIn(path, value);
       }
     }
   }, {
     key: "setSchema",
-    value: function setSchema() {
-      if (!this.schema) this.schema = new _schema.default(Object.assign({}, this.getDefaults(), this.options));
+    value: function setSchema(id, customTags) {
+      if (!id && !customTags && this.schema) return;
+      if (typeof id === 'number') id = id.toFixed(1);
+
+      if (id === '1.0' || id === '1.1' || id === '1.2') {
+        if (this.version) this.version = id;else this.options.version = id;
+        delete this.options.schema;
+      } else if (id && typeof id === 'string') {
+        this.options.schema = id;
+      }
+
+      if (Array.isArray(customTags)) this.options.customTags = customTags;
+      var opt = Object.assign({}, this.getDefaults(), this.options);
+      this.schema = new Schema(opt);
     }
   }, {
     key: "parse",
@@ -177,7 +163,7 @@ function () {
         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();
+            if (_error instanceof YAMLError) _error.makePretty();
           }
         } catch (err) {
           _didIteratorError = true;
@@ -201,7 +187,7 @@ function () {
         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();
+            if (warn instanceof YAMLError) warn.makePretty();
           }
         } catch (err) {
           _didIteratorError2 = true;
@@ -250,7 +236,7 @@ function () {
             if (name) {
               var msg = "YAML only supports %TAG and %YAML directives, and not %".concat(name);
 
-              _this.warnings.push(new _errors.YAMLWarning(directive, msg));
+              _this.warnings.push(new YAMLWarning(directive, msg));
             }
 
         }
@@ -290,7 +276,7 @@ function () {
           if (contentNodes.length === 1) {
             var msg = 'Document is not valid YAML (bad indentation?)';
 
-            _this2.errors.push(new _errors.YAMLSyntaxError(node, msg));
+            _this2.errors.push(new YAMLSyntaxError(node, msg));
           }
 
           var res = _this2.resolveNode(node);
@@ -304,7 +290,7 @@ function () {
         } else if (node.comment !== null) {
           var cc = contentNodes.length === 0 ? comments.before : comments.after;
           cc.push(node.comment);
-        } else if (node.type === _constants.Type.BLANK_LINE) {
+        } else if (node.type === Type.BLANK_LINE) {
           spaceBefore = true;
 
           if (contentNodes.length === 0 && comments.before.length > 0 && !_this2.commentBefore) {
@@ -328,7 +314,7 @@ function () {
             var cb = comments.before.join('\n') || null;
 
             if (cb) {
-              var cbNode = this.contents instanceof _Collection.default && this.contents.items[0] ? this.contents.items[0] : this.contents;
+              var cbNode = this.contents instanceof Collection && this.contents.items[0] ? this.contents.items[0] : this.contents;
               cbNode.commentBefore = cbNode.commentBefore ? "".concat(cb, "\n").concat(cbNode.commentBefore) : cb;
             }
           } else {
@@ -353,7 +339,7 @@ function () {
   }, {
     key: "resolveTagDirective",
     value: function resolveTagDirective(directive) {
-      var _directive$parameters = (0, _slicedToArray2.default)(directive.parameters, 2),
+      var _directive$parameters = _slicedToArray(directive.parameters, 2),
           handle = _directive$parameters[0],
           prefix = _directive$parameters[1];
 
@@ -367,36 +353,36 @@ function () {
           });
         } else {
           var msg = 'The %TAG directive must only be given at most once per handle in the same document.';
-          this.errors.push(new _errors.YAMLSemanticError(directive, msg));
+          this.errors.push(new YAMLSemanticError(directive, msg));
         }
       } else {
         var _msg = 'Insufficient parameters given for %TAG directive';
-        this.errors.push(new _errors.YAMLSemanticError(directive, _msg));
+        this.errors.push(new YAMLSemanticError(directive, _msg));
       }
     }
   }, {
     key: "resolveYamlDirective",
     value: function resolveYamlDirective(directive) {
-      var _directive$parameters2 = (0, _slicedToArray2.default)(directive.parameters, 1),
+      var _directive$parameters2 = _slicedToArray(directive.parameters, 1),
           version = _directive$parameters2[0];
 
       if (directive.name === 'YAML:1.0') version = '1.0';
 
       if (this.version) {
         var msg = 'The %YAML directive must only be given at most once per document.';
-        this.errors.push(new _errors.YAMLSemanticError(directive, msg));
+        this.errors.push(new YAMLSemanticError(directive, msg));
       }
 
       if (!version) {
         var _msg2 = 'Insufficient parameters given for %YAML directive';
-        this.errors.push(new _errors.YAMLSemanticError(directive, _msg2));
+        this.errors.push(new YAMLSemanticError(directive, _msg2));
       } else {
         if (!Document.defaults[version]) {
           var v0 = this.version || this.options.version;
 
           var _msg3 = "Document will be parsed as YAML ".concat(v0, " rather than YAML ").concat(version);
 
-          this.warnings.push(new _errors.YAMLWarning(directive, _msg3));
+          this.warnings.push(new YAMLWarning(directive, _msg3));
         }
 
         this.version = version;
@@ -417,7 +403,7 @@ function () {
         if (verbatim) {
           if (verbatim !== '!' && verbatim !== '!!') return verbatim;
           var msg = "Verbatim tags aren't resolved, so ".concat(verbatim, " is invalid.");
-          this.errors.push(new _errors.YAMLSemanticError(node, msg));
+          this.errors.push(new YAMLSemanticError(node, msg));
         } else if (handle === '!' && !suffix) {
           nonSpecific = true;
         } else {
@@ -447,32 +433,32 @@ function () {
               return prefix.prefix + decodeURIComponent(suffix);
             }
 
-            this.errors.push(new _errors.YAMLSemanticError(node, "The ".concat(handle, " tag has no suffix.")));
+            this.errors.push(new YAMLSemanticError(node, "The ".concat(handle, " tag has no suffix.")));
           } else {
             var _msg4 = "The ".concat(handle, " tag handle is non-default and was not declared.");
 
-            this.errors.push(new _errors.YAMLSemanticError(node, _msg4));
+            this.errors.push(new YAMLSemanticError(node, _msg4));
           }
         }
       }
 
       switch (type) {
-        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 Type.BLOCK_FOLDED:
+        case Type.BLOCK_LITERAL:
+        case Type.QUOTE_DOUBLE:
+        case Type.QUOTE_SINGLE:
+          return Schema.defaultTags.STR;
 
-        case _constants.Type.FLOW_MAP:
-        case _constants.Type.MAP:
-          return _schema.default.defaultTags.MAP;
+        case Type.FLOW_MAP:
+        case Type.MAP:
+          return Schema.defaultTags.MAP;
 
-        case _constants.Type.FLOW_SEQ:
-        case _constants.Type.SEQ:
-          return _schema.default.defaultTags.SEQ;
+        case Type.FLOW_SEQ:
+        case Type.SEQ:
+          return Schema.defaultTags.SEQ;
 
-        case _constants.Type.PLAIN:
-          return nonSpecific ? _schema.default.defaultTags.STR : null;
+        case Type.PLAIN:
+          return nonSpecific ? Schema.defaultTags.STR : null;
 
         default:
           return null;
@@ -503,11 +489,11 @@ function () {
               end = _step3$value.end;
 
           switch (node.context.src[start]) {
-            case _constants.Char.COMMENT:
+            case Char.COMMENT:
               {
                 if (!node.commentHasRequiredWhitespace(start)) {
                   var _msg7 = 'Comments must be separated from other tokens by white space characters';
-                  errors.push(new _errors.YAMLSemanticError(node, _msg7));
+                  errors.push(new YAMLSemanticError(node, _msg7));
                 }
 
                 var c = node.context.src.slice(start + 1, end);
@@ -522,19 +508,19 @@ function () {
               }
               break;
 
-            case _constants.Char.ANCHOR:
+            case Char.ANCHOR:
               if (hasAnchor) {
                 var _msg8 = 'A node can have at most one anchor';
-                errors.push(new _errors.YAMLSemanticError(node, _msg8));
+                errors.push(new YAMLSemanticError(node, _msg8));
               }
 
               hasAnchor = true;
               break;
 
-            case _constants.Char.TAG:
+            case Char.TAG:
               if (hasTag) {
                 var _msg9 = 'A node can have at most one tag';
-                errors.push(new _errors.YAMLSemanticError(node, _msg9));
+                errors.push(new YAMLSemanticError(node, _msg9));
               }
 
               hasTag = true;
@@ -570,10 +556,10 @@ function () {
 
       var res;
 
-      if (node.type === _constants.Type.ALIAS) {
+      if (node.type === Type.ALIAS) {
         if (hasAnchor || hasTag) {
           var msg = 'An alias node must not specify any properties';
-          errors.push(new _errors.YAMLSemanticError(node, msg));
+          errors.push(new YAMLSemanticError(node, msg));
         }
 
         var _name = node.rawValue;
@@ -582,12 +568,12 @@ function () {
         if (!src) {
           var _msg5 = "Aliased anchor not found: ".concat(_name);
 
-          errors.push(new _errors.YAMLReferenceError(node, _msg5));
+          errors.push(new YAMLReferenceError(node, _msg5));
           return null;
         } // Lazy resolution for circular references
 
 
-        res = new _Alias.default(src);
+        res = new Alias(src);
 
         anchors._cstAliases.push(res);
       } else {
@@ -596,10 +582,10 @@ function () {
         if (tagName) {
           res = schema.resolveNodeWithFallback(this, node, tagName);
         } else {
-          if (node.type !== _constants.Type.PLAIN) {
+          if (node.type !== Type.PLAIN) {
             var _msg6 = "Failed to resolve ".concat(node.type, " node here");
 
-            errors.push(new _errors.YAMLSyntaxError(node, _msg6));
+            errors.push(new YAMLSyntaxError(node, _msg6));
             return null;
           }
 
@@ -632,8 +618,8 @@ function () {
   }, {
     key: "listNonDefaultTags",
     value: function listNonDefaultTags() {
-      return (0, _listTagNames.default)(this.contents).filter(function (t) {
-        return t.indexOf(_schema.default.defaultPrefix) !== 0;
+      return listTagNames(this.contents).filter(function (t) {
+        return t.indexOf(Schema.defaultPrefix) !== 0;
       });
     }
   }, {
@@ -698,7 +684,7 @@ function () {
           keepBlobsInJSON = _this$options.keepBlobsInJSON,
           mapAsMap = _this$options.mapAsMap,
           maxAliasCount = _this$options.maxAliasCount;
-      var keep = keepBlobsInJSON && (typeof arg !== 'string' || !(this.contents instanceof _Scalar.default));
+      var keep = keepBlobsInJSON && (typeof arg !== 'string' || !(this.contents instanceof Scalar));
       var ctx = {
         doc: this,
         keep: keep,
@@ -714,7 +700,7 @@ function () {
           node: _this3.anchors.map[name]
         };
       });
-      return (0, _toJSON2.default)(this.contents, arg, ctx);
+      return _toJSON(this.contents, arg, ctx);
     }
   }, {
     key: "toString",
@@ -763,7 +749,7 @@ function () {
       var contentComment = null;
 
       if (this.contents) {
-        if (this.contents instanceof _Node.default) {
+        if (this.contents instanceof Node) {
           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
 
@@ -777,7 +763,7 @@ function () {
         var body = this.schema.stringify(this.contents, ctx, function () {
           return contentComment = null;
         }, onChompKeep);
-        lines.push((0, _addComment.default)(body, '', contentComment));
+        lines.push(addComment(body, '', contentComment));
       } else if (this.contents !== undefined) {
         lines.push(this.schema.stringify(this.contents, ctx));
       }
@@ -790,17 +776,17 @@ function () {
       return lines.join('\n') + '\n';
     }
   }]);
+
   return Document;
 }();
 
-exports.default = Document;
-(0, _defineProperty2.default)(Document, "defaults", {
+_defineProperty(Document, "defaults", {
   '1.0': {
     schema: 'yaml-1.1',
     merge: true,
     tagPrefixes: [{
       handle: '!',
-      prefix: _schema.default.defaultPrefix
+      prefix: Schema.defaultPrefix
     }, {
       handle: '!!',
       prefix: 'tag:private.yaml.org,2002:'
@@ -814,7 +800,7 @@ exports.default = Document;
       prefix: '!'
     }, {
       handle: '!!',
-      prefix: _schema.default.defaultPrefix
+      prefix: Schema.defaultPrefix
     }]
   },
   '1.2': {
@@ -825,7 +811,9 @@ exports.default = Document;
       prefix: '!'
     }, {
       handle: '!!',
-      prefix: _schema.default.defaultPrefix
+      prefix: Schema.defaultPrefix
     }]
   }
-});
+});
+
+export { Document as default };

package/browser/dist/addComment.js

@@ -1,17 +1,8 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.addCommentBefore = addCommentBefore;
-exports.default = addComment;
-
-function addCommentBefore(str, indent, comment) {
+export function addCommentBefore(str, indent, comment) {
   if (!comment) return str;
   var cc = comment.replace(/[\s\S]^/gm, "$&".concat(indent, "#"));
   return "#".concat(cc, "\n").concat(indent).concat(str);
 }
-
-function addComment(str, indent, comment) {
+export default function addComment(str, indent, comment) {
   return !comment ? str : comment.indexOf('\n') === -1 ? "".concat(str, " #").concat(comment) : "".concat(str, "\n") + comment.replace(/^/gm, "".concat(indent || '', "#"));
 }

package/browser/dist/constants.js

@@ -1,18 +1,11 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Type = exports.Char = void 0;
-var Char = {
+export var Char = {
   ANCHOR: '&',
   COMMENT: '#',
   TAG: '!',
   DIRECTIVES_END: '-',
   DOCUMENT_END: '.'
 };
-exports.Char = Char;
-var Type = {
+export var Type = {
   ALIAS: 'ALIAS',
   BLANK_LINE: 'BLANK_LINE',
   BLOCK_FOLDED: 'BLOCK_FOLDED',
@@ -30,5 +23,4 @@ var Type = {
   QUOTE_SINGLE: 'QUOTE_SINGLE',
   SEQ: 'SEQ',
   SEQ_ITEM: 'SEQ_ITEM'
-};
-exports.Type = Type;
+};