yaml 1.4.0 → 1.5.0

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

@@ -18,11 +18,14 @@ 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'
 };
 
@@ -84,6 +87,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,7 +63,7 @@ class Alias extends _Node2.default {
   constructor(source) {
     super();
     this.source = source;
-    this.type = _Node.Type.ALIAS;
+    this.type = _constants.Type.ALIAS;
   }
 
   set tag(t) {
@@ -41,15 +71,39 @@ class Alias extends _Node2.default {
   }
 
   toJSON(arg, ctx) {
-    const anchor = ctx && ctx.anchors && ctx.anchors.find(a => a.node === this.source);
-    return anchor && anchor.res || (0, _toJSON.default)(this.source, 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);

package/dist/schema/Map.js

@@ -6,19 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 exports.findPair = findPair;
 exports.default = void 0;
 
-var _toJSON = _interopRequireDefault(require("../toJSON"));
-
 var _Collection = _interopRequireDefault(require("./Collection"));
 
-var _Merge = _interopRequireDefault(require("./Merge"));
-
 var _Pair = _interopRequireDefault(require("./Pair"));
 
 var _Scalar = _interopRequireDefault(require("./Scalar"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-// Published as 'yaml/map'
 function findPair(items, key) {
   const k = key instanceof _Scalar.default ? key.value : key;
 
@@ -61,82 +56,19 @@ class YAMLMap extends _Collection.default {
     const prev = findPair(this.items, key);
     if (prev) prev.value = value;else this.items.push(new _Pair.default(key, value));
   }
+  /**
+   * @param {*} arg ignored
+   * @param {*} ctx Conversion context, originally set in Document#toJSON()
+   * @param {Class} Type If set, forces the returned collection type
+   * @returns {*} Instance of Type, Map, or Object
+   */
 
-  toJSON(_, ctx) {
-    if (ctx && ctx.mapAsMap) return this.toJSMap(ctx);
-    const map = {};
-    if (ctx && ctx.onCreate) ctx.onCreate(map);
-
-    for (const item of this.items) {
-      if (item instanceof _Merge.default) {
-        // If the value associated with a merge key is a single mapping node,
-        // each of its key/value pairs is inserted into the current mapping,
-        // unless the key already exists in it. If the value associated with the
-        // merge key is a sequence, then this sequence is expected to contain
-        // mapping nodes and each of these nodes is merged in turn according to
-        // its order in the sequence. Keys in mapping nodes earlier in the
-        // sequence override keys specified in later mapping nodes.
-        // -- http://yaml.org/type/merge.html
-        const keys = Object.keys(map);
-        const {
-          items
-        } = item.value;
-
-        for (let i = items.length - 1; i >= 0; --i) {
-          const {
-            source
-          } = items[i];
-
-          if (source instanceof YAMLMap) {
-            const obj = source.toJSON('', ctx);
-            Object.keys(obj).forEach(key => {
-              if (!keys.includes(key)) map[key] = obj[key];
-            });
-          } else {
-            throw new Error('Merge sources must be maps');
-          }
-        }
-      } else {
-        const {
-          stringKey,
-          value
-        } = item;
-        map[stringKey] = (0, _toJSON.default)(value, stringKey, ctx);
-      }
-    }
 
-    return map;
-  }
-
-  toJSMap(ctx) {
-    const map = new Map();
+  toJSON(_, ctx, Type) {
+    const map = Type ? new Type() : ctx && ctx.mapAsMap ? new Map() : {};
     if (ctx && ctx.onCreate) ctx.onCreate(map);
 
-    for (const item of this.items) {
-      if (item instanceof _Merge.default) {
-        const {
-          items
-        } = item.value;
-
-        for (let i = items.length - 1; i >= 0; --i) {
-          const {
-            source
-          } = items[i];
-
-          if (source instanceof YAMLMap) {
-            for (const [key, value] of source.toJSMap(ctx)) {
-              if (!map.has(key)) map.set(key, value);
-            }
-          } else {
-            throw new Error('Merge sources must be maps');
-          }
-        }
-      } else {
-        const key = (0, _toJSON.default)(item.key, '', ctx);
-        const value = (0, _toJSON.default)(item.value, key, ctx);
-        map.set(key, value);
-      }
-    }
+    for (const item of this.items) item.addToJSMap(ctx, map);
 
     return map;
   }

package/dist/schema/Merge.js

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.MERGE_KEY = void 0;
 
+var _Map = _interopRequireDefault(require("./Map"));
+
 var _Pair = _interopRequireDefault(require("./Pair"));
 
 var _Scalar = _interopRequireDefault(require("./Scalar"));
@@ -34,6 +36,35 @@ class Merge extends _Pair.default {
     }
 
     this.type = 'MERGE_PAIR';
+  } // If the value associated with a merge key is a single mapping node, each of
+  // its key/value pairs is inserted into the current mapping, unless the key
+  // already exists in it. If the value associated with the merge key is a
+  // sequence, then this sequence is expected to contain mapping nodes and each
+  // of these nodes is merged in turn according to its order in the sequence.
+  // Keys in mapping nodes earlier in the sequence override keys specified in
+  // later mapping nodes. -- http://yaml.org/type/merge.html
+
+
+  addToJSMap(ctx, map) {
+    for (const _ref of this.value.items) {
+      const {
+        source
+      } = _ref;
+      if (!(source instanceof _Map.default)) throw new Error('Merge sources must be maps');
+      const srcMap = source.toJSON(null, ctx, Map);
+
+      for (const [key, value] of srcMap) {
+        if (map instanceof Map) {
+          if (!map.has(key)) map.set(key, value);
+        } else if (map instanceof Set) {
+          map.add(key);
+        } else {
+          if (!map.hasOwnProperty(key)) map[key] = value;
+        }
+      }
+    }
+
+    return map;
   }
 
   toString(ctx, onComment) {

package/dist/schema/Node.js

@@ -7,6 +7,4 @@ exports.default = void 0;
 
 class Node {}
 
-exports.default = Node;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = Node;

package/dist/schema/Pair.js

@@ -18,6 +18,19 @@ var _Scalar = _interopRequireDefault(require("./Scalar"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 // Published as 'yaml/pair'
+const stringifyKey = (key, jsKey, ctx) => {
+  if (jsKey === null) return '';
+  if (typeof jsKey !== 'object') return String(jsKey);
+  if (key instanceof _Node.default && ctx && ctx.doc) return key.toString({
+    anchors: {},
+    doc: ctx.doc,
+    indent: '',
+    inFlow: true,
+    inStringifyKey: true
+  });
+  return JSON.stringify(jsKey);
+};
+
 class Pair extends _Node.default {
   constructor(key, value = null) {
     super();
@@ -35,22 +48,25 @@ class Pair extends _Node.default {
     this.key.commentBefore = cb;
   }
 
-  get stringKey() {
-    const key = (0, _toJSON.default)(this.key);
-    if (key === null) return '';
-    if (typeof key === 'object') try {
-      return JSON.stringify(key);
-    } catch (e) {
-      /* should not happen, but let's ignore in any case */
+  addToJSMap(ctx, map) {
+    const key = (0, _toJSON.default)(this.key, '', ctx);
+
+    if (map instanceof Map) {
+      const value = (0, _toJSON.default)(this.value, key, ctx);
+      map.set(key, value);
+    } else if (map instanceof Set) {
+      map.add(key);
+    } else {
+      const stringKey = stringifyKey(this.key, key, ctx);
+      map[stringKey] = (0, _toJSON.default)(this.value, stringKey, ctx);
     }
-    return String(key);
+
+    return map;
   }
 
   toJSON(_, ctx) {
-    const pair = {};
-    const sk = this.stringKey;
-    pair[sk] = (0, _toJSON.default)(this.value, sk, ctx);
-    return pair;
+    const pair = ctx && ctx.mapAsMap ? new Map() : {};
+    return this.addToJSMap(ctx, pair);
   }
 
   toString(ctx, onComment, onChompKeep) {
@@ -124,6 +140,4 @@ class Pair extends _Node.default {
 
 }
 
-exports.default = Pair;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = Pair;

package/dist/schema/Scalar.js

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

package/dist/schema/Seq.js

@@ -75,6 +75,4 @@ class YAMLSeq extends _Collection.default {
 
 }
 
-exports.default = YAMLSeq;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = YAMLSeq;