yaml 1.3.1 → 1.5.1

package/dist/cst/Node.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.Char = exports.Type = void 0;
+exports.default = void 0;
+
+var _constants = require("../constants");
 
 var _getLinePos = _interopRequireDefault(require("./getLinePos"));
 
@@ -11,37 +13,7 @@ var _Range = _interopRequireDefault(require("./Range"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-const 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;
-const Char = {
-  ANCHOR: '&',
-  COMMENT: '#',
-  TAG: '!',
-  DIRECTIVES_END: '-',
-  DOCUMENT_END: '.'
-  /** Root class of all nodes */
-
-};
-exports.Char = Char;
-
+/** Root class of all nodes */
 class Node {
   static addStringTerminator(src, offset, str) {
     if (str[str.length - 1] === '\n') return str;
@@ -59,7 +31,7 @@ class Node {
     if (sep) {
       if (ch0 !== sep) return false;
     } else {
-      if (ch0 !== Char.DIRECTIVES_END && ch0 !== Char.DOCUMENT_END) return false;
+      if (ch0 !== _constants.Char.DIRECTIVES_END && ch0 !== _constants.Char.DOCUMENT_END) return false;
     }
 
     const ch1 = src[offset + 1];
@@ -219,7 +191,7 @@ class Node {
 
   get anchor() {
     for (let i = 0; i < this.props.length; ++i) {
-      const anchor = this.getPropValue(i, Char.ANCHOR, true);
+      const anchor = this.getPropValue(i, _constants.Char.ANCHOR, true);
       if (anchor != null) return anchor;
     }
 
@@ -230,7 +202,7 @@ class Node {
     const comments = [];
 
     for (let i = 0; i < this.props.length; ++i) {
-      const comment = this.getPropValue(i, Char.COMMENT, true);
+      const comment = this.getPropValue(i, _constants.Char.COMMENT, true);
       if (comment != null) comments.push(comment);
     }
 
@@ -256,7 +228,7 @@ class Node {
       } = this.context;
 
       for (let i = 0; i < this.props.length; ++i) {
-        if (src[this.props[i].start] === Char.COMMENT) return true;
+        if (src[this.props[i].start] === _constants.Char.COMMENT) return true;
       }
     }
 
@@ -270,7 +242,7 @@ class Node {
       } = this.context;
 
       for (let i = 0; i < this.props.length; ++i) {
-        if (src[this.props[i].start] !== Char.COMMENT) return true;
+        if (src[this.props[i].start] !== _constants.Char.COMMENT) return true;
       }
     }
 
@@ -282,7 +254,7 @@ class Node {
   }
 
   get jsonLike() {
-    const jsonLikeTypes = [Type.FLOW_MAP, Type.FLOW_SEQ, Type.QUOTE_DOUBLE, Type.QUOTE_SINGLE];
+    const jsonLikeTypes = [_constants.Type.FLOW_MAP, _constants.Type.FLOW_SEQ, _constants.Type.QUOTE_DOUBLE, _constants.Type.QUOTE_SINGLE];
     return jsonLikeTypes.indexOf(this.type) !== -1;
   }
 
@@ -308,7 +280,7 @@ class Node {
 
   get tag() {
     for (let i = 0; i < this.props.length; ++i) {
-      const tag = this.getPropValue(i, Char.TAG, false);
+      const tag = this.getPropValue(i, _constants.Char.TAG, false);
 
       if (tag != null) {
         if (tag[1] === '<') {
@@ -351,7 +323,7 @@ class Node {
       src
     } = this.context;
 
-    if (src[start] === Char.COMMENT) {
+    if (src[start] === _constants.Char.COMMENT) {
       const end = Node.endOfLine(src, start + 1);
       const commentRange = new _Range.default(start, end);
       this.props.push(commentRange);

package/dist/cst/ParseContext.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
+var _constants = require("../constants");
+
 var _errors = require("../errors");
 
 var _Alias = _interopRequireDefault(require("./Alias"));
@@ -17,7 +19,7 @@ var _CollectionItem = _interopRequireDefault(require("./CollectionItem"));
 
 var _FlowCollection = _interopRequireDefault(require("./FlowCollection"));
 
-var _Node = _interopRequireWildcard(require("./Node"));
+var _Node = _interopRequireDefault(require("./Node"));
 
 var _PlainValue = _interopRequireDefault(require("./PlainValue"));
 
@@ -27,8 +29,6 @@ var _QuoteSingle = _interopRequireDefault(require("./QuoteSingle"));
 
 var _Range = _interopRequireDefault(require("./Range"));
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = Object.defineProperty && Object.getOwnPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : {}; if (desc.get || desc.set) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } } newObj.default = obj; return newObj; } }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -46,37 +46,37 @@ class ParseContext {
   static parseType(src, offset, inFlow) {
     switch (src[offset]) {
       case '*':
-        return _Node.Type.ALIAS;
+        return _constants.Type.ALIAS;
 
       case '>':
-        return _Node.Type.BLOCK_FOLDED;
+        return _constants.Type.BLOCK_FOLDED;
 
       case '|':
-        return _Node.Type.BLOCK_LITERAL;
+        return _constants.Type.BLOCK_LITERAL;
 
       case '{':
-        return _Node.Type.FLOW_MAP;
+        return _constants.Type.FLOW_MAP;
 
       case '[':
-        return _Node.Type.FLOW_SEQ;
+        return _constants.Type.FLOW_SEQ;
 
       case '?':
-        return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _Node.Type.MAP_KEY : _Node.Type.PLAIN;
+        return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _constants.Type.MAP_KEY : _constants.Type.PLAIN;
 
       case ':':
-        return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _Node.Type.MAP_VALUE : _Node.Type.PLAIN;
+        return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _constants.Type.MAP_VALUE : _constants.Type.PLAIN;
 
       case '-':
-        return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _Node.Type.SEQ_ITEM : _Node.Type.PLAIN;
+        return !inFlow && _Node.default.atBlank(src, offset + 1, true) ? _constants.Type.SEQ_ITEM : _constants.Type.PLAIN;
 
       case '"':
-        return _Node.Type.QUOTE_DOUBLE;
+        return _constants.Type.QUOTE_DOUBLE;
 
       case "'":
-        return _Node.Type.QUOTE_SINGLE;
+        return _constants.Type.QUOTE_SINGLE;
 
       default:
-        return _Node.Type.PLAIN;
+        return _constants.Type.PLAIN;
     }
   }
 
@@ -99,36 +99,36 @@ class ParseContext {
       let node;
 
       switch (type) {
-        case _Node.Type.ALIAS:
+        case _constants.Type.ALIAS:
           node = new _Alias.default(type, props);
           break;
 
-        case _Node.Type.BLOCK_FOLDED:
-        case _Node.Type.BLOCK_LITERAL:
+        case _constants.Type.BLOCK_FOLDED:
+        case _constants.Type.BLOCK_LITERAL:
           node = new _BlockValue.default(type, props);
           break;
 
-        case _Node.Type.FLOW_MAP:
-        case _Node.Type.FLOW_SEQ:
+        case _constants.Type.FLOW_MAP:
+        case _constants.Type.FLOW_SEQ:
           node = new _FlowCollection.default(type, props);
           break;
 
-        case _Node.Type.MAP_KEY:
-        case _Node.Type.MAP_VALUE:
-        case _Node.Type.SEQ_ITEM:
+        case _constants.Type.MAP_KEY:
+        case _constants.Type.MAP_VALUE:
+        case _constants.Type.SEQ_ITEM:
           node = new _CollectionItem.default(type, props);
           break;
 
-        case _Node.Type.COMMENT:
-        case _Node.Type.PLAIN:
+        case _constants.Type.COMMENT:
+        case _constants.Type.PLAIN:
           node = new _PlainValue.default(type, props);
           break;
 
-        case _Node.Type.QUOTE_DOUBLE:
+        case _constants.Type.QUOTE_DOUBLE:
           node = new _QuoteDouble.default(type, props);
           break;
 
-        case _Node.Type.QUOTE_SINGLE:
+        case _constants.Type.QUOTE_SINGLE:
           node = new _QuoteSingle.default(type, props);
           break;
 
@@ -149,7 +149,7 @@ class ParseContext {
       }
 
       if (context.nodeStartsCollection(node)) {
-        if (!node.error && !context.atLineStart && context.parent.type === _Node.Type.DOCUMENT) {
+        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)');
         }
 
@@ -213,20 +213,20 @@ class ParseContext {
     offset = _Node.default.endOfWhiteSpace(src, offset);
     let ch = src[offset];
 
-    while (ch === _Node.Char.ANCHOR || ch === _Node.Char.COMMENT || ch === _Node.Char.TAG || ch === '\n') {
+    while (ch === _constants.Char.ANCHOR || ch === _constants.Char.COMMENT || ch === _constants.Char.TAG || ch === '\n') {
       if (ch === '\n') {
         const lineStart = offset + 1;
 
         const inEnd = _Node.default.endOfIndent(src, lineStart);
 
         const indentDiff = inEnd - (lineStart + this.indent);
-        const noIndicatorAsIndent = parent.type === _Node.Type.SEQ_ITEM && parent.context.atLineStart;
+        const noIndicatorAsIndent = parent.type === _constants.Type.SEQ_ITEM && parent.context.atLineStart;
         if (!_Node.default.nextNodeIsIndented(src[inEnd], indentDiff, !noIndicatorAsIndent)) break;
         this.atLineStart = true;
         this.lineStart = lineStart;
         lineHasProps = false;
         offset = inEnd;
-      } else if (ch === _Node.Char.COMMENT) {
+      } else if (ch === _constants.Char.COMMENT) {
         const end = _Node.default.endOfLine(src, offset + 1);
 
         props.push(new _Range.default(offset, end));
@@ -234,7 +234,7 @@ class ParseContext {
       } else {
         let end = _Node.default.endOfIdentifier(src, offset + 1);
 
-        if (ch === _Node.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 === _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))) {
           // 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
@@ -269,6 +269,4 @@ class ParseContext {
 
 }
 
-exports.default = ParseContext;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = ParseContext;

package/dist/cst/PlainValue.js

@@ -158,6 +158,4 @@ class PlainValue extends _Node.default {
 
 }
 
-exports.default = PlainValue;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = PlainValue;

package/dist/cst/QuoteDouble.js

@@ -234,6 +234,4 @@ class QuoteDouble extends _Node.default {
 
 }
 
-exports.default = QuoteDouble;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = QuoteDouble;

package/dist/cst/QuoteSingle.js

@@ -110,6 +110,4 @@ class QuoteSingle extends _Node.default {
 
 }
 
-exports.default = QuoteSingle;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = QuoteSingle;

package/dist/cst/Range.js

@@ -60,6 +60,4 @@ class Range {
 
 }
 
-exports.default = Range;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = Range;

package/dist/cst/getLinePos.js

@@ -76,7 +76,4 @@ function getLinePos(offset, cst) {
   }
 
   return undefined;
-}
-
-module.exports = exports.default;
-module.exports.default = exports.default;
+}

package/dist/cst/parse.js

@@ -52,7 +52,4 @@ function parse(src) {
   documents.toString = () => documents.join('...\n');
 
   return documents;
-}
-
-module.exports = exports.default;
-module.exports.default = exports.default;
+}

package/dist/deprecation.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.warnFileDeprecation = warnFileDeprecation;
+exports.warnOptionDeprecation = warnOptionDeprecation;
+
+/* global global, console */
+function warn(msg) {
+  if (global && global.process && global.process.emitWarning) {
+    global.process.emitWarning(msg, 'DeprecationWarning');
+  } else {
+    // eslint-disable-next-line no-console
+    console.warn(`DeprecationWarning: ${msg}`);
+  }
+}
+
+function warnFileDeprecation(filename) {
+  if (global && global._YAML_SILENCE_DEPRECATION_WARNINGS) return;
+  const path = filename.replace(/.*yaml[/\\]/i, '').replace(/\.js$/, '').replace(/\\/g, '/');
+  warn(`The endpoint 'yaml/${path}' will be removed in a future release.`);
+}
+
+const warned = {};
+
+function warnOptionDeprecation(name, alternative) {
+  if (global && global._YAML_SILENCE_DEPRECATION_WARNINGS) return;
+  if (warned[name]) return;
+  warned[name] = true;
+  let msg = `The option '${name}' will be removed in a future release`;
+  msg += alternative ? `, use '${alternative}' instead.` : '.';
+  warn(msg);
+}

package/dist/errors.js

@@ -3,70 +3,64 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.YAMLWarning = exports.YAMLSyntaxError = exports.YAMLSemanticError = exports.YAMLReferenceError = void 0;
+exports.YAMLWarning = exports.YAMLSyntaxError = exports.YAMLSemanticError = exports.YAMLReferenceError = exports.YAMLError = void 0;
 
 var _Node = _interopRequireDefault(require("./cst/Node"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-class YAMLReferenceError extends ReferenceError {
-  constructor(source, message) {
-    if (!message || !(source instanceof _Node.default)) {
-      throw new Error('Invalid arguments for new YAMLReferenceError');
-    }
-
+class YAMLError extends Error {
+  constructor(name, source, message) {
+    if (!message || !(source instanceof _Node.default)) throw new Error(`Invalid arguments for new ${name}`);
     super();
-    this.name = 'YAMLReferenceError';
+    this.name = name;
     this.message = message;
     this.source = source;
   }
 
+  makePretty() {
+    if (this.source) {
+      this.nodeType = this.source.type;
+      this.range = this.source.range;
+      this.linePos = this.source.rangeAsLinePos;
+      delete this.source;
+    }
+  }
+
 }
 
-exports.YAMLReferenceError = YAMLReferenceError;
+exports.YAMLError = YAMLError;
 
-class YAMLSemanticError extends SyntaxError {
+class YAMLReferenceError extends YAMLError {
   constructor(source, message) {
-    if (!message || !(source instanceof _Node.default)) {
-      throw new Error('Invalid arguments for new YAMLSemanticError');
-    }
+    super('YAMLReferenceError', source, message);
+  }
 
-    super();
-    this.name = 'YAMLSemanticError';
-    this.message = message;
-    this.source = source;
+}
+
+exports.YAMLReferenceError = YAMLReferenceError;
+
+class YAMLSemanticError extends YAMLError {
+  constructor(source, message) {
+    super('YAMLSemanticError', source, message);
   }
 
 }
 
 exports.YAMLSemanticError = YAMLSemanticError;
 
-class YAMLSyntaxError extends SyntaxError {
+class YAMLSyntaxError extends YAMLError {
   constructor(source, message) {
-    if (!message || !(source instanceof _Node.default)) {
-      throw new Error('Invalid arguments for new YAMLSyntaxError');
-    }
-
-    super();
-    this.name = 'YAMLSyntaxError';
-    this.message = message;
-    this.source = source;
+    super('YAMLSyntaxError', source, message);
   }
 
 }
 
 exports.YAMLSyntaxError = YAMLSyntaxError;
 
-class YAMLWarning extends Error {
+class YAMLWarning extends YAMLError {
   constructor(source, message) {
-    if (!message || !(source instanceof _Node.default)) {
-      throw new Error('Invalid arguments for new YAMLWarning');
-    }
-
-    super();
-    this.name = 'YAMLWarning';
-    this.message = message;
-    this.source = source;
+    super('YAMLWarning', source, message);
   }
 
 }

package/dist/index.js

@@ -17,10 +17,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 /* global console */
 const defaultOptions = {
+  anchorPrefix: 'a',
+  customTags: null,
+  keepCstNodes: false,
   keepNodeTypes: true,
   keepBlobsInJSON: true,
   mapAsMap: false,
-  tags: null,
+  maxAliasCount: 100,
+  prettyErrors: false,
+  // TODO Set true in v2
   version: '1.2'
 };
 
@@ -43,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) {
@@ -82,6 +97,4 @@ var _default = {
   parseDocument,
   stringify
 };
-exports.default = _default;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = _default;

package/dist/listTagNames.js

@@ -35,6 +35,4 @@ const visit = (node, tags) => {
 
 var _default = node => Object.keys(visit(node, {}));
 
-exports.default = _default;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = _default;

package/dist/schema/Alias.js

@@ -5,26 +5,56 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _Node = require("../cst/Node");
+var _constants = require("../constants");
+
+var _errors = require("../errors");
 
 var _toJSON = _interopRequireDefault(require("../toJSON"));
 
-var _Node2 = _interopRequireDefault(require("./Node"));
+var _Collection = _interopRequireDefault(require("./Collection"));
+
+var _Node = _interopRequireDefault(require("./Node"));
+
+var _Pair = _interopRequireDefault(require("./Pair"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-class Alias extends _Node2.default {
+const getAliasCount = (node, anchors) => {
+  if (node instanceof Alias) {
+    const anchor = anchors.find(a => a.node === node.source);
+    return anchor.count * anchor.aliasCount;
+  } else if (node instanceof _Collection.default) {
+    let count = 0;
+
+    for (const item of node.items) {
+      const c = getAliasCount(item, anchors);
+      if (c > count) count = c;
+    }
+
+    return count;
+  } else if (node instanceof _Pair.default) {
+    const kc = getAliasCount(node.key, anchors);
+    const vc = getAliasCount(node.value, anchors);
+    return Math.max(kc, vc);
+  }
+
+  return 1;
+};
+
+class Alias extends _Node.default {
   static stringify({
     range,
     source
   }, {
     anchors,
     doc,
-    implicitKey
+    implicitKey,
+    inStringifyKey
   }) {
-    const anchor = Object.keys(anchors).find(a => anchors[a] === source);
+    let anchor = Object.keys(anchors).find(a => anchors[a] === source);
+    if (!anchor && inStringifyKey) anchor = doc.anchors.getName(source) || doc.anchors.newName();
     if (anchor) return `*${anchor}${implicitKey ? ' ' : ''}`;
     const msg = doc.anchors.getName(source) ? 'Alias node must be after source node' : 'Source node not found for alias node';
     throw new Error(`${msg} [${range}]`);
@@ -33,22 +63,47 @@ class Alias extends _Node2.default {
   constructor(source) {
     super();
     this.source = source;
-    this.type = _Node.Type.ALIAS;
+    this.type = _constants.Type.ALIAS;
   }
 
   set tag(t) {
     throw new Error('Alias nodes cannot have tags');
   }
 
-  toJSON(arg, opt) {
-    return (0, _toJSON.default)(this.source, arg, opt);
+  toJSON(arg, ctx) {
+    if (!ctx) return (0, _toJSON.default)(this.source, arg, ctx);
+    const {
+      anchors,
+      maxAliasCount
+    } = ctx;
+    const anchor = anchors.find(a => a.node === this.source);
+
+    if (!anchor || !anchor.res) {
+      const msg = 'This should not happen: Alias anchor was not resolved?';
+      if (this.cstNode) throw new _errors.YAMLReferenceError(this.cstNode, msg);else throw new ReferenceError(msg);
+    }
+
+    if (maxAliasCount >= 0) {
+      anchor.count += 1;
+      if (anchor.aliasCount === 0) anchor.aliasCount = getAliasCount(this.source, anchors);
+
+      if (anchor.count * anchor.aliasCount > maxAliasCount) {
+        const msg = 'Excessive alias count indicates a resource exhaustion attack';
+        if (this.cstNode) throw new _errors.YAMLReferenceError(this.cstNode, msg);else throw new ReferenceError(msg);
+      }
+    }
+
+    return anchor.res;
+  } // Only called when stringifying an alias mapping key while constructing
+  // Object output.
+
+
+  toString(ctx) {
+    return Alias.stringify(this, ctx);
   }
 
 }
 
 exports.default = Alias;
 
-_defineProperty(Alias, "default", true);
-
-module.exports = exports.default;
-module.exports.default = exports.default;
+_defineProperty(Alias, "default", true);