yaml 1.3.2 → 1.6.0

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);

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,78 +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(_, opt) {
-    if (opt && opt.mapAsMap) return this.toJSMap(opt);
-    return this.items.reduce((map, item) => {
-      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('', opt);
-            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, opt);
-      }
-
-      return map;
-    }, {});
-  }
 
-  toJSMap(opt) {
-    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(opt)) {
-              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, '', opt);
-        const value = (0, _toJSON.default)(item.value, key, opt);
-        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(_, opt) {
-    const pair = {};
-    const sk = this.stringKey;
-    pair[sk] = (0, _toJSON.default)(this.value, sk, opt);
-    return pair;
+  toJSON(_, ctx) {
+    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

@@ -18,8 +18,8 @@ class Scalar extends _Node.default {
     this.value = value;
   }
 
-  toJSON(arg, opt) {
-    return opt && opt.keep ? this.value : (0, _toJSON.default)(this.value, arg, opt);
+  toJSON(arg, ctx) {
+    return ctx && ctx.keep ? this.value : (0, _toJSON.default)(this.value, arg, ctx);
   }
 
   toString() {
@@ -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

@@ -50,8 +50,14 @@ class YAMLSeq extends _Collection.default {
     this.items[idx] = value;
   }
 
-  toJSON(_, opt) {
-    return this.items.map((v, i) => (0, _toJSON.default)(v, String(i), opt));
+  toJSON(_, ctx) {
+    const seq = [];
+    if (ctx && ctx.onCreate) ctx.onCreate(seq);
+    let i = 0;
+
+    for (const item of this.items) seq.push((0, _toJSON.default)(item, String(i++), ctx));
+
+    return seq;
   }
 
   toString(ctx, onComment, onChompKeep) {
@@ -69,6 +75,4 @@ class YAMLSeq extends _Collection.default {
 
 }
 
-exports.default = YAMLSeq;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = YAMLSeq;

package/dist/schema/index.js

@@ -5,71 +5,84 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _Node = require("../cst/Node");
+var _deprecation = require("../deprecation");
+
+var _constants = require("../constants");
 
 var _errors = require("../errors");
 
-var _Alias = _interopRequireDefault(require("./Alias"));
+var _stringify = require("../stringify");
 
-var _Collection = _interopRequireDefault(require("./Collection"));
+var _tags = require("../tags");
 
-var _core = _interopRequireDefault(require("./core"));
+var _string = require("../tags/failsafe/string");
 
-var _failsafe = _interopRequireWildcard(require("./failsafe"));
+var _Alias = _interopRequireDefault(require("./Alias"));
 
-var _json = _interopRequireDefault(require("./json"));
+var _Collection = _interopRequireDefault(require("./Collection"));
 
-var _Node2 = _interopRequireDefault(require("./Node"));
+var _Node = _interopRequireDefault(require("./Node"));
 
 var _Pair = _interopRequireDefault(require("./Pair"));
 
 var _Scalar = _interopRequireDefault(require("./Scalar"));
 
-var _string = require("./_string");
-
-var _yaml = _interopRequireDefault(require("./yaml-1.1"));
-
-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; }
 
 const isMap = ({
   type
-}) => type === _Node.Type.FLOW_MAP || type === _Node.Type.MAP;
+}) => type === _constants.Type.FLOW_MAP || type === _constants.Type.MAP;
 
 const isSeq = ({
   type
-}) => type === _Node.Type.FLOW_SEQ || type === _Node.Type.SEQ;
+}) => type === _constants.Type.FLOW_SEQ || type === _constants.Type.SEQ;
 
 class Schema {
-  static defaultStringify(value) {
-    return JSON.stringify(value);
-  }
-
   constructor({
+    customTags,
     merge,
     schema,
-    tags
+    tags: deprecatedCustomTags
   }) {
     this.merge = !!merge;
     this.name = schema;
-    this.tags = Schema.tags[schema];
+    this.tags = _tags.schemas[schema.replace(/\W/g, '')]; // 'yaml-1.1' -> 'yaml11'
 
     if (!this.tags) {
-      const keys = Object.keys(Schema.tags).map(key => JSON.stringify(key));
-      throw new Error(`Unknown schema; use one of ${keys.join(', ')}`);
+      const keys = Object.keys(_tags.schemas).map(key => JSON.stringify(key)).join(', ');
+      throw new Error(`Unknown schema "${schema}"; use one of ${keys}`);
     }
 
-    if (Array.isArray(tags)) {
-      this.tags = this.tags.concat(tags);
-    } else if (typeof tags === 'function') {
-      this.tags = tags(this.tags.slice());
+    if (!customTags && deprecatedCustomTags) {
+      customTags = deprecatedCustomTags;
+      (0, _deprecation.warnOptionDeprecation)('tags', 'customTags');
+    }
+
+    if (Array.isArray(customTags)) {
+      for (const tag of customTags) this.tags = this.tags.concat(tag);
+    } else if (typeof customTags === 'function') {
+      this.tags = customTags(this.tags.slice());
+    }
+
+    for (let i = 0; i < this.tags.length; ++i) {
+      const tag = this.tags[i];
+
+      if (typeof tag === 'string') {
+        const tagObj = _tags.tags[tag];
+
+        if (!tagObj) {
+          const keys = Object.keys(_tags.tags).map(key => JSON.stringify(key)).join(', ');
+          throw new Error(`Unknown custom tag "${tag}"; use one of ${keys}`);
+        }
+
+        this.tags[i] = tagObj;
+      }
     }
   }
 
-  createNode(value, wrapScalars, tag, onTagObj) {
+  createNode(value, wrapScalars, tag, ctx) {
     let tagObj;
 
     if (tag) {
@@ -78,18 +91,49 @@ class Schema {
       tagObj = match.find(t => !t.format) || match[0];
       if (!tagObj) throw new Error(`Tag ${tag} not found`);
     } else {
-      tagObj = this.tags.find(t => t.class && value instanceof t.class && !t.format);
+      // TODO: deprecate/remove class check
+      tagObj = this.tags.find(t => (t.identify && t.identify(value) || t.class && value instanceof t.class) && !t.format);
 
       if (!tagObj) {
-        if (value == null) return new _Scalar.default(null);
         if (typeof value.toJSON === 'function') value = value.toJSON();
         if (typeof value !== 'object') return wrapScalars ? new _Scalar.default(value) : value;
-        tagObj = value instanceof Map ? _failsafe.map : value[Symbol.iterator] ? _failsafe.seq : _failsafe.map;
+        tagObj = value instanceof Map ? _tags.tags.map : value[Symbol.iterator] ? _tags.tags.seq : _tags.tags.map;
       }
     }
 
-    if (onTagObj) onTagObj(tagObj);
-    return tagObj.createNode ? tagObj.createNode(this, value, wrapScalars) : new _Scalar.default(value);
+    if (!ctx) ctx = {
+      wrapScalars
+    };else ctx.wrapScalars = wrapScalars;
+
+    if (ctx.onTagObj) {
+      ctx.onTagObj(tagObj);
+      delete ctx.onTagObj;
+    }
+
+    const obj = {};
+
+    if (value && typeof value === 'object' && ctx.prevObjects) {
+      const prev = ctx.prevObjects.find(o => o.value === value);
+
+      if (prev) {
+        const alias = new _Alias.default(prev); // leaves source dirty; must be cleaned by caller
+
+        ctx.aliasNodes.push(alias);
+        return alias;
+      }
+
+      obj.value = value;
+      ctx.prevObjects.push(obj);
+    }
+
+    obj.node = tagObj.createNode ? tagObj.createNode(this, value, ctx) : wrapScalars ? new _Scalar.default(value) : value;
+    return obj.node;
+  }
+
+  createPair(key, value, ctx) {
+    const k = this.createNode(key, ctx.wrapScalars, null, ctx);
+    const v = this.createNode(value, ctx.wrapScalars, null, ctx);
+    return new _Pair.default(k, v);
   } // falls back to string on no match
 
 
@@ -107,7 +151,8 @@ class Schema {
         const match = str.match(test);
 
         if (match) {
-          const res = new _Scalar.default(resolve.apply(null, match));
+          let res = resolve.apply(null, match);
+          if (!(res instanceof _Scalar.default)) res = new _Scalar.default(res);
           if (format) res.format = format;
           return res;
         }
@@ -134,7 +179,7 @@ class Schema {
         if (!(res instanceof _Collection.default)) res = new _Scalar.default(res);
         node.resolved = res;
       } else {
-        const str = (0, _string.resolve)(doc, node);
+        const str = (0, _string.resolveString)(doc, node);
 
         if (typeof str === 'string' && tags.length > 0) {
           node.resolved = this.resolveScalar(str, tags);
@@ -147,7 +192,7 @@ class Schema {
     }
 
     if (!node.resolved) return null;
-    if (tagName) node.resolved.tag = tagName;
+    if (tagName && node.tag) node.resolved.tag = tagName;
     return node.resolved;
   }
 
@@ -176,33 +221,12 @@ class Schema {
       if (match.length > 0) return match.find(t => t.format === item.format) || match[0];
     }
 
-    if (item.value === null) {
-      const tagObj = this.tags.find(t => t.class === null && !t.format);
-      if (!tagObj) throw new Error('Tag not resolved for null value');
-      return tagObj;
-    }
-
     let tagObj, obj;
 
     if (item instanceof _Scalar.default) {
-      switch (typeof item.value) {
-        case 'boolean':
-          obj = new Boolean();
-          break;
-
-        case 'number':
-          obj = new Number();
-          break;
-
-        case 'string':
-          obj = new String();
-          break;
-
-        default:
-          obj = item.value;
-      }
+      obj = item.value; // TODO: deprecate/remove class check
 
-      const match = this.tags.filter(t => t.class && (obj instanceof t.class || obj && obj.constructor === t.class));
+      const match = this.tags.filter(t => t.identify && t.identify(obj) || t.class && obj instanceof t.class);
       tagObj = match.find(t => t.format === item.format) || match.find(t => !t.format);
     } else {
       obj = item;
@@ -230,7 +254,7 @@ class Schema {
       props.push(`&${anchor}`);
     }
 
-    if (node.tag && node.tag !== tagObj.tag) {
+    if (node.tag) {
       props.push(doc.stringifyTag(node.tag));
     } else if (!tagObj.default) {
       props.push(doc.stringifyTag(tagObj.tag));
@@ -241,13 +265,34 @@ class Schema {
 
   stringify(item, ctx, onComment, onChompKeep) {
     let tagObj;
-    if (!(item instanceof _Node2.default)) item = this.createNode(item, true, null, o => tagObj = o);
+
+    if (!(item instanceof _Node.default)) {
+      const createCtx = {
+        aliasNodes: [],
+        onTagObj: o => tagObj = o,
+        prevObjects: []
+      };
+      item = this.createNode(item, true, null, createCtx);
+      const {
+        anchors
+      } = ctx.doc;
+
+      for (const alias of createCtx.aliasNodes) {
+        alias.source = alias.source.node;
+        let name = anchors.getName(alias.source);
+
+        if (!name) {
+          name = anchors.newName();
+          anchors.map[name] = alias.source;
+        }
+      }
+    }
+
     ctx.tags = this;
     if (item instanceof _Pair.default) return item.toString(ctx, onComment, onChompKeep);
     if (!tagObj) tagObj = this.getTagObject(item);
     const props = this.stringifyProps(item, tagObj, ctx);
-    const stringify = tagObj.stringify || Schema.defaultStringify;
-    const str = stringify(item, ctx, onComment, onChompKeep);
+    const str = typeof tagObj.stringify === 'function' ? tagObj.stringify(item, ctx, onComment, onChompKeep) : item instanceof _Collection.default ? item.toString(ctx, onComment, onChompKeep) : (0, _stringify.stringifyString)(item, ctx, onComment, onChompKeep);
     return props ? item instanceof _Collection.default && str[0] !== '{' && str[0] !== '[' ? `${props}\n${ctx.indent}${str}` : `${props} ${str}` : str;
   }
 
@@ -261,14 +306,4 @@ _defineProperty(Schema, "defaultTags", {
   MAP: 'tag:yaml.org,2002:map',
   SEQ: 'tag:yaml.org,2002:seq',
   STR: 'tag:yaml.org,2002:str'
-});
-
-_defineProperty(Schema, "tags", {
-  core: _core.default,
-  failsafe: _failsafe.default,
-  json: _json.default,
-  'yaml-1.1': _yaml.default
-});
-
-module.exports = exports.default;
-module.exports.default = exports.default;
+});