yaml 1.7.1 → 1.8.2

package/browser/dist/cst/ParseContext.js

@@ -1,42 +1,54 @@
-"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 _constants = require("../constants");
-
-var _errors = require("../errors");
-
-var _Alias = _interopRequireDefault(require("./Alias"));
-
-var _BlockValue = _interopRequireDefault(require("./BlockValue"));
-
-var _Collection = _interopRequireDefault(require("./Collection"));
-
-var _CollectionItem = _interopRequireDefault(require("./CollectionItem"));
-
-var _FlowCollection = _interopRequireDefault(require("./FlowCollection"));
-
-var _Node = _interopRequireDefault(require("./Node"));
-
-var _PlainValue = _interopRequireDefault(require("./PlainValue"));
-
-var _QuoteDouble = _interopRequireDefault(require("./QuoteDouble"));
-
-var _QuoteSingle = _interopRequireDefault(require("./QuoteSingle"));
-
-var _Range = _interopRequireDefault(require("./Range"));
-
+import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
+import _createClass from "@babel/runtime/helpers/createClass";
+import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import { Char, Type } from '../constants';
+import { YAMLSyntaxError } from '../errors';
+import Alias from './Alias';
+import BlockValue from './BlockValue';
+import Collection from './Collection';
+import CollectionItem from './CollectionItem';
+import FlowCollection from './FlowCollection';
+import Node from './Node';
+import PlainValue from './PlainValue';
+import QuoteDouble from './QuoteDouble';
+import QuoteSingle from './QuoteSingle';
+import Range from './Range';
+
+function createNewNode(type, props) {
+  switch (type) {
+    case Type.ALIAS:
+      return new Alias(type, props);
+
+    case Type.BLOCK_FOLDED:
+    case Type.BLOCK_LITERAL:
+      return new BlockValue(type, props);
+
+    case Type.FLOW_MAP:
+    case Type.FLOW_SEQ:
+      return new FlowCollection(type, props);
+
+    case Type.MAP_KEY:
+    case Type.MAP_VALUE:
+    case Type.SEQ_ITEM:
+      return new CollectionItem(type, props);
+
+    case Type.COMMENT:
+    case Type.PLAIN:
+      return new PlainValue(type, props);
+
+    case Type.QUOTE_DOUBLE:
+      return new QuoteDouble(type, props);
+
+    case Type.QUOTE_SINGLE:
+      return new QuoteSingle(type, props);
+
+    /* istanbul ignore next */
+
+    default:
+      return null;
+    // should never happen
+  }
+}
 /**
  * @param {boolean} atLineStart - Node starts at beginning of line
  * @param {boolean} inFlow - true if currently in a flow context
@@ -46,45 +58,45 @@ var _Range = _interopRequireDefault(require("./Range"));
  * @param {Node} parent - The parent of the node
  * @param {string} src - Source of the YAML document
  */
-var ParseContext =
-/*#__PURE__*/
-function () {
-  (0, _createClass2.default)(ParseContext, null, [{
+
+
+var ParseContext = /*#__PURE__*/function () {
+  _createClass(ParseContext, null, [{
     key: "parseType",
     value: function parseType(src, offset, inFlow) {
       switch (src[offset]) {
         case '*':
-          return _constants.Type.ALIAS;
+          return Type.ALIAS;
 
         case '>':
-          return _constants.Type.BLOCK_FOLDED;
+          return Type.BLOCK_FOLDED;
 
         case '|':
-          return _constants.Type.BLOCK_LITERAL;
+          return Type.BLOCK_LITERAL;
 
         case '{':
-          return _constants.Type.FLOW_MAP;
+          return Type.FLOW_MAP;
 
         case '[':
-          return _constants.Type.FLOW_SEQ;
+          return Type.FLOW_SEQ;
 
         case '?':
-          return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _constants.Type.MAP_KEY : _constants.Type.PLAIN;
+          return !inFlow && Node.atBlank(src, offset + 1, true) ? Type.MAP_KEY : Type.PLAIN;
 
         case ':':
-          return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _constants.Type.MAP_VALUE : _constants.Type.PLAIN;
+          return !inFlow && Node.atBlank(src, offset + 1, true) ? Type.MAP_VALUE : Type.PLAIN;
 
         case '-':
-          return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _constants.Type.SEQ_ITEM : _constants.Type.PLAIN;
+          return !inFlow && Node.atBlank(src, offset + 1, true) ? Type.SEQ_ITEM : Type.PLAIN;
 
         case '"':
-          return _constants.Type.QUOTE_DOUBLE;
+          return Type.QUOTE_DOUBLE;
 
         case "'":
-          return _constants.Type.QUOTE_SINGLE;
+          return Type.QUOTE_SINGLE;
 
         default:
-          return _constants.Type.PLAIN;
+          return Type.PLAIN;
       }
     }
   }]);
@@ -102,9 +114,10 @@ function () {
         lineStart = _ref.lineStart,
         parent = _ref.parent;
 
-    (0, _classCallCheck2.default)(this, ParseContext);
-    (0, _defineProperty2.default)(this, "parseNode", function (overlay, start) {
-      if (_Node.default.atDocumentBoundary(_this.src, start)) return null;
+    _classCallCheck(this, ParseContext);
+
+    _defineProperty(this, "parseNode", function (overlay, start) {
+      if (Node.atDocumentBoundary(_this.src, start)) return null;
       var context = new ParseContext(_this, overlay);
 
       var _context$parseProps = context.parseProps(start),
@@ -112,52 +125,14 @@ function () {
           type = _context$parseProps.type,
           valueStart = _context$parseProps.valueStart;
 
-      var node;
-
-      switch (type) {
-        case _constants.Type.ALIAS:
-          node = new _Alias.default(type, props);
-          break;
-
-        case _constants.Type.BLOCK_FOLDED:
-        case _constants.Type.BLOCK_LITERAL:
-          node = new _BlockValue.default(type, props);
-          break;
-
-        case _constants.Type.FLOW_MAP:
-        case _constants.Type.FLOW_SEQ:
-          node = new _FlowCollection.default(type, props);
-          break;
-
-        case _constants.Type.MAP_KEY:
-        case _constants.Type.MAP_VALUE:
-        case _constants.Type.SEQ_ITEM:
-          node = new _CollectionItem.default(type, props);
-          break;
-
-        case _constants.Type.COMMENT:
-        case _constants.Type.PLAIN:
-          node = new _PlainValue.default(type, props);
-          break;
-
-        case _constants.Type.QUOTE_DOUBLE:
-          node = new _QuoteDouble.default(type, props);
-          break;
-
-        case _constants.Type.QUOTE_SINGLE:
-          node = new _QuoteSingle.default(type, props);
-          break;
-
-        default:
-          node.error = new _errors.YAMLSyntaxError(node, "Unknown node type: ".concat(JSON.stringify(type)));
-          node.range = new _Range.default(start, start + 1);
-          return node;
-      }
-
+      var node = createNewNode(type, props);
       var offset = node.parse(context, valueStart);
-      node.range = new _Range.default(start, offset);
+      node.range = new Range(start, offset);
+      /* istanbul ignore if */
 
       if (offset <= start) {
+        // This should never happen, but if it does, let's make sure to at least
+        // step one character forward to avoid a busy loop.
         node.error = new Error("Node#parse consumed no characters");
         node.error.parseEnd = offset;
         node.error.source = node;
@@ -165,18 +140,19 @@ function () {
       }
 
       if (context.nodeStartsCollection(node)) {
-        if (!node.error && !context.atLineStart && context.parent.type === _constants.Type.DOCUMENT) {
-          node.error = new _errors.YAMLSyntaxError(node, 'Block collection must not have preceding content here (e.g. directives-end indicator)');
+        if (!node.error && !context.atLineStart && context.parent.type === Type.DOCUMENT) {
+          node.error = new YAMLSyntaxError(node, 'Block collection must not have preceding content here (e.g. directives-end indicator)');
         }
 
-        var collection = new _Collection.default(node);
+        var collection = new Collection(node);
         offset = collection.parse(new ParseContext(context), offset);
-        collection.range = new _Range.default(start, offset);
+        collection.range = new Range(start, offset);
         return collection;
       }
 
       return node;
     });
+
     this.atLineStart = atLineStart != null ? atLineStart : orig.atLineStart || false;
     this.inCollection = inCollection != null ? inCollection : orig.inCollection || false;
     this.inFlow = inFlow != null ? inFlow : orig.inFlow || false;
@@ -185,21 +161,20 @@ function () {
     this.parent = parent != null ? parent : orig.parent || {};
     this.root = orig.root;
     this.src = orig.src;
-  } // for logging
-
+  }
 
-  (0, _createClass2.default)(ParseContext, [{
+  _createClass(ParseContext, [{
     key: "nodeStartsCollection",
     value: function nodeStartsCollection(node) {
       var inCollection = this.inCollection,
           inFlow = this.inFlow,
           src = this.src;
       if (inCollection || inFlow) return false;
-      if (node instanceof _CollectionItem.default) return true; // check for implicit key
+      if (node instanceof CollectionItem) return true; // check for implicit key
 
       var offset = node.range.end;
       if (src[offset] === '\n' || src[offset - 1] === '\n') return false;
-      offset = _Node.default.endOfWhiteSpace(src, offset);
+      offset = Node.endOfWhiteSpace(src, offset);
       return src[offset] === ':';
     } // Anchor and tag are before type, which determines the node implementation
     // class; hence this intermediate step.
@@ -212,48 +187,45 @@ function () {
           src = this.src;
       var props = [];
       var lineHasProps = false;
-      offset = _Node.default.endOfWhiteSpace(src, offset);
+      offset = Node.endOfWhiteSpace(src, offset);
       var ch = src[offset];
 
-      while (ch === _constants.Char.ANCHOR || ch === _constants.Char.COMMENT || ch === _constants.Char.TAG || ch === '\n') {
+      while (ch === Char.ANCHOR || ch === Char.COMMENT || ch === Char.TAG || ch === '\n') {
         if (ch === '\n') {
           var lineStart = offset + 1;
-
-          var inEnd = _Node.default.endOfIndent(src, lineStart);
-
+          var inEnd = Node.endOfIndent(src, lineStart);
           var indentDiff = inEnd - (lineStart + this.indent);
-          var noIndicatorAsIndent = parent.type === _constants.Type.SEQ_ITEM && parent.context.atLineStart;
-          if (!_Node.default.nextNodeIsIndented(src[inEnd], indentDiff, !noIndicatorAsIndent)) break;
+          var noIndicatorAsIndent = parent.type === Type.SEQ_ITEM && parent.context.atLineStart;
+          if (!Node.nextNodeIsIndented(src[inEnd], indentDiff, !noIndicatorAsIndent)) break;
           this.atLineStart = true;
           this.lineStart = lineStart;
           lineHasProps = false;
           offset = inEnd;
-        } else if (ch === _constants.Char.COMMENT) {
-          var end = _Node.default.endOfLine(src, offset + 1);
-
-          props.push(new _Range.default(offset, end));
+        } else if (ch === Char.COMMENT) {
+          var end = Node.endOfLine(src, offset + 1);
+          props.push(new Range(offset, end));
           offset = end;
         } else {
-          var _end = _Node.default.endOfIdentifier(src, offset + 1);
+          var _end = Node.endOfIdentifier(src, offset + 1);
 
-          if (ch === _constants.Char.TAG && src[_end] === ',' && /^[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+,\d\d\d\d(-\d\d){0,2}\/\S/.test(src.slice(offset + 1, _end + 13))) {
+          if (ch === Char.TAG && src[_end] === ',' && /^[a-zA-Z0-9-]+\.[a-zA-Z0-9-]+,\d\d\d\d(-\d\d){0,2}\/\S/.test(src.slice(offset + 1, _end + 13))) {
             // Let's presume we're dealing with a YAML 1.0 domain tag here, rather
             // than an empty but 'foo.bar' private-tagged node in a flow collection
             // followed without whitespace by a plain string starting with a year
             // or date divided by something.
-            _end = _Node.default.endOfIdentifier(src, _end + 5);
+            _end = Node.endOfIdentifier(src, _end + 5);
           }
 
-          props.push(new _Range.default(offset, _end));
+          props.push(new Range(offset, _end));
           lineHasProps = true;
-          offset = _Node.default.endOfWhiteSpace(src, _end);
+          offset = Node.endOfWhiteSpace(src, _end);
         }
 
         ch = src[offset];
       } // '- &a : b' has an anchor on an empty node
 
 
-      if (lineHasProps && ch === ':' && _Node.default.atBlank(src, offset + 1, true)) offset -= 1;
+      if (lineHasProps && ch === ':' && Node.atBlank(src, offset + 1, true)) offset -= 1;
       var type = ParseContext.parseType(src, offset, inFlow);
       return {
         props: props,
@@ -268,21 +240,9 @@ function () {
      * @returns {?Node} - null if at a document boundary
      */
 
-  }, {
-    key: "pretty",
-    get: function get() {
-      var obj = {
-        start: "".concat(this.lineStart, " + ").concat(this.indent),
-        in: [],
-        parent: this.parent.type
-      };
-      if (!this.atLineStart) obj.start += ' + N';
-      if (this.inCollection) obj.in.push('collection');
-      if (this.inFlow) obj.in.push('flow');
-      return obj;
-    }
   }]);
+
   return ParseContext;
 }();
 
-exports.default = ParseContext;
+export { ParseContext as default };

package/browser/dist/cst/PlainValue.js

@@ -1,37 +1,21 @@
-"use strict";
+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 Node from './Node';
+import Range from './Range';
 
-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 _Node2 = _interopRequireDefault(require("./Node"));
-
-var _Range = _interopRequireDefault(require("./Range"));
-
-var PlainValue =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(PlainValue, _Node);
+var PlainValue = /*#__PURE__*/function (_Node) {
+  _inherits(PlainValue, _Node);
 
   function PlainValue() {
-    (0, _classCallCheck2.default)(this, PlainValue);
-    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(PlainValue).apply(this, arguments));
+    _classCallCheck(this, PlainValue);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(PlainValue).apply(this, arguments));
   }
 
-  (0, _createClass2.default)(PlainValue, [{
+  _createClass(PlainValue, [{
     key: "parseBlockValue",
     value: function parseBlockValue(start) {
       var _this$context = this.context,
@@ -42,10 +26,8 @@ function (_Node) {
       var valueEnd = start;
 
       for (var ch = src[offset]; ch === '\n'; ch = src[offset]) {
-        if (_Node2.default.atDocumentBoundary(src, offset + 1)) break;
-
-        var end = _Node2.default.endOfBlockIndent(src, indent, offset + 1);
-
+        if (Node.atDocumentBoundary(src, offset + 1)) break;
+        var end = Node.endOfBlockIndent(src, indent, offset + 1);
         if (end === null || src[end] === '#') break;
 
         if (src[end] === '\n') {
@@ -99,8 +81,8 @@ function (_Node) {
         offset = PlainValue.endOfLine(src, start, inFlow);
       }
 
-      this.valueRange = new _Range.default(start, offset);
-      offset = _Node2.default.endOfWhiteSpace(src, offset);
+      this.valueRange = new Range(start, offset);
+      offset = Node.endOfWhiteSpace(src, offset);
       offset = this.parseComment(offset);
 
       if (!this.hasComment || this.valueRange.isEmpty()) {
@@ -135,7 +117,7 @@ function (_Node) {
         var _ch = src[i];
 
         if (_ch === '\n') {
-          var _Node$foldNewline = _Node2.default.foldNewline(src, i, -1),
+          var _Node$foldNewline = Node.foldNewline(src, i, -1),
               fold = _Node$foldNewline.fold,
               offset = _Node$foldNewline.offset;
 
@@ -177,7 +159,8 @@ function (_Node) {
       return offset;
     }
   }]);
+
   return PlainValue;
-}(_Node2.default);
+}(Node);
 
-exports.default = PlainValue;
+export { PlainValue as default };

package/browser/dist/cst/QuoteDouble.js

@@ -1,39 +1,22 @@
-"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 _errors = require("../errors");
-
-var _Node2 = _interopRequireDefault(require("./Node"));
-
-var _Range = _interopRequireDefault(require("./Range"));
-
-var QuoteDouble =
-/*#__PURE__*/
-function (_Node) {
-  (0, _inherits2.default)(QuoteDouble, _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 { YAMLSemanticError, YAMLSyntaxError } from '../errors';
+import Node from './Node';
+import Range from './Range';
+
+var QuoteDouble = /*#__PURE__*/function (_Node) {
+  _inherits(QuoteDouble, _Node);
 
   function QuoteDouble() {
-    (0, _classCallCheck2.default)(this, QuoteDouble);
-    return (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(QuoteDouble).apply(this, arguments));
+    _classCallCheck(this, QuoteDouble);
+
+    return _possibleConstructorReturn(this, _getPrototypeOf(QuoteDouble).apply(this, arguments));
   }
 
-  (0, _createClass2.default)(QuoteDouble, [{
+  _createClass(QuoteDouble, [{
     key: "parseCharCode",
     value: function parseCharCode(offset, length, errors) {
       var src = this.context.src;
@@ -42,7 +25,7 @@ function (_Node) {
       var code = ok ? parseInt(cc, 16) : NaN;
 
       if (isNaN(code)) {
-        errors.push(new _errors.YAMLSyntaxError(this, "Invalid escape sequence ".concat(src.substr(offset - 2, length + 2))));
+        errors.push(new YAMLSyntaxError(this, "Invalid escape sequence ".concat(src.substr(offset - 2, length + 2))));
         return src.substr(offset - 2, length + 2);
       }
 
@@ -62,8 +45,8 @@ function (_Node) {
       this.context = context;
       var src = context.src;
       var offset = QuoteDouble.endOfQuote(src, start + 1);
-      this.valueRange = new _Range.default(start, offset);
-      offset = _Node2.default.endOfWhiteSpace(src, offset);
+      this.valueRange = new Range(start, offset);
+      offset = Node.endOfWhiteSpace(src, offset);
       offset = this.parseComment(offset);
       return offset;
     }
@@ -82,7 +65,7 @@ function (_Node) {
       var _this$context = this.context,
           indent = _this$context.indent,
           src = _this$context.src;
-      if (src[end - 1] !== '"') errors.push(new _errors.YAMLSyntaxError(this, 'Missing closing "quote')); // Using String#replace is too painful with escaped newlines preceded by
+      if (src[end - 1] !== '"') errors.push(new YAMLSyntaxError(this, 'Missing closing "quote')); // Using String#replace is too painful with escaped newlines preceded by
       // escaped backslashes; also, this should be faster.
 
       var str = '';
@@ -91,16 +74,16 @@ function (_Node) {
         var ch = src[i];
 
         if (ch === '\n') {
-          if (_Node2.default.atDocumentBoundary(src, i + 1)) errors.push(new _errors.YAMLSemanticError(this, 'Document boundary indicators are not allowed within string values'));
+          if (Node.atDocumentBoundary(src, i + 1)) errors.push(new YAMLSemanticError(this, 'Document boundary indicators are not allowed within string values'));
 
-          var _Node$foldNewline = _Node2.default.foldNewline(src, i, indent),
+          var _Node$foldNewline = Node.foldNewline(src, i, indent),
               fold = _Node$foldNewline.fold,
               offset = _Node$foldNewline.offset,
               error = _Node$foldNewline.error;
 
           str += fold;
           i = offset;
-          if (error) errors.push(new _errors.YAMLSemanticError(this, 'Multi-line double-quoted string needs to be sufficiently indented'));
+          if (error) errors.push(new YAMLSemanticError(this, 'Multi-line double-quoted string needs to be sufficiently indented'));
         } else if (ch === '\\') {
           i += 1;
 
@@ -214,7 +197,7 @@ function (_Node) {
               break;
 
             default:
-              errors.push(new _errors.YAMLSyntaxError(this, "Invalid escape sequence ".concat(src.substr(i - 1, 2))));
+              errors.push(new YAMLSyntaxError(this, "Invalid escape sequence ".concat(src.substr(i - 1, 2))));
               str += '\\' + src[i];
           }
         } else if (ch === ' ' || ch === '\t') {
@@ -251,7 +234,8 @@ function (_Node) {
       return offset + 1;
     }
   }]);
+
   return QuoteDouble;
-}(_Node2.default);
+}(Node);
 
-exports.default = QuoteDouble;
+export { QuoteDouble as default };