yaml 1.3.0 → 1.5.0

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

package/dist/schema/parseMap.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = parseMap;
 
-var _Node = require("../cst/Node");
+var _constants = require("../constants");
 
 var _PlainValue = _interopRequireDefault(require("../cst/PlainValue"));
 
@@ -26,7 +26,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function parseMap(doc, cst) {
-  if (cst.type !== _Node.Type.MAP && cst.type !== _Node.Type.FLOW_MAP) {
+  if (cst.type !== _constants.Type.MAP && cst.type !== _constants.Type.FLOW_MAP) {
     const msg = `A ${cst.type} node cannot be resolved as a mapping`;
     doc.errors.push(new _errors.YAMLSyntaxError(cst, msg));
     return null;
@@ -35,7 +35,7 @@ function parseMap(doc, cst) {
   const {
     comments,
     items
-  } = cst.type === _Node.Type.FLOW_MAP ? resolveFlowMapItems(doc, cst) : resolveBlockMapItems(doc, cst);
+  } = cst.type === _constants.Type.FLOW_MAP ? resolveFlowMapItems(doc, cst) : resolveBlockMapItems(doc, cst);
   const map = new _Map.default();
   map.items = items;
   (0, _parseUtils.resolveComments)(map, comments);
@@ -56,7 +56,7 @@ function parseMap(doc, cst) {
           const {
             type
           } = node.source;
-          if (type === _Node.Type.MAP || type === _Node.Type.FLOW_MAP) return false;
+          if (type === _constants.Type.MAP || type === _constants.Type.FLOW_MAP) return false;
           return error = 'Merge nodes aliases can only point to maps';
         }
 
@@ -95,7 +95,7 @@ const valueHasPairComment = ({
     start
   } = props[0];
   if (node && start > node.valueRange.start) return false;
-  if (src[start] !== _Node.Char.COMMENT) return false;
+  if (src[start] !== _constants.Char.COMMENT) return false;
 
   for (let i = lineStart; i < start; ++i) if (src[i] === '\n') return false;
 
@@ -104,7 +104,7 @@ const valueHasPairComment = ({
 
 function resolvePairComment(item, pair) {
   if (!valueHasPairComment(item)) return;
-  const comment = item.getPropValue(0, _Node.Char.COMMENT, true);
+  const comment = item.getPropValue(0, _constants.Char.COMMENT, true);
   let found = false;
   const cb = pair.value.commentBefore;
 
@@ -133,14 +133,14 @@ function resolveBlockMapItems(doc, cst) {
     const item = cst.items[i];
 
     switch (item.type) {
-      case _Node.Type.BLANK_LINE:
+      case _constants.Type.BLANK_LINE:
         comments.push({
           afterKey: !!key,
           before: items.length
         });
         break;
 
-      case _Node.Type.COMMENT:
+      case _constants.Type.COMMENT:
         comments.push({
           afterKey: !!key,
           before: items.length,
@@ -148,19 +148,19 @@ function resolveBlockMapItems(doc, cst) {
         });
         break;
 
-      case _Node.Type.MAP_KEY:
+      case _constants.Type.MAP_KEY:
         if (key !== undefined) items.push(new _Pair.default(key));
         if (item.error) doc.errors.push(item.error);
         key = doc.resolveNode(item.node);
         keyStart = null;
         break;
 
-      case _Node.Type.MAP_VALUE:
+      case _constants.Type.MAP_VALUE:
         {
           if (key === undefined) key = null;
           if (item.error) doc.errors.push(item.error);
 
-          if (!item.context.atLineStart && item.node && item.node.type === _Node.Type.MAP && !item.node.context.atLineStart) {
+          if (!item.context.atLineStart && item.node && item.node.type === _constants.Type.MAP && !item.node.context.atLineStart) {
             const msg = 'Nested mappings are not allowed in compact mappings';
             doc.errors.push(new _errors.YAMLSemanticError(item.node, msg));
           }
@@ -171,7 +171,7 @@ function resolveBlockMapItems(doc, cst) {
             // Comments on an empty mapping value need to be preserved, so we
             // need to construct a minimal empty node here to use instead of the
             // missing `item.node`. -- eemeli/yaml#19
-            valueNode = new _PlainValue.default(_Node.Type.PLAIN, []);
+            valueNode = new _PlainValue.default(_constants.Type.PLAIN, []);
             valueNode.context = {
               parent: item,
               src: item.context.src
@@ -212,11 +212,11 @@ function resolveBlockMapItems(doc, cst) {
           const nextItem = cst.items[j];
 
           switch (nextItem && nextItem.type) {
-            case _Node.Type.BLANK_LINE:
-            case _Node.Type.COMMENT:
+            case _constants.Type.BLANK_LINE:
+            case _constants.Type.COMMENT:
               continue next;
 
-            case _Node.Type.MAP_VALUE:
+            case _constants.Type.MAP_VALUE:
               break next;
 
             default:
@@ -296,12 +296,12 @@ function resolveFlowMapItems(doc, cst) {
       }
 
       doc.errors.push(new _errors.YAMLSyntaxError(cst, `Flow map contains an unexpected ${char}`));
-    } else if (item.type === _Node.Type.BLANK_LINE) {
+    } else if (item.type === _constants.Type.BLANK_LINE) {
       comments.push({
         afterKey: !!key,
         before: items.length
       });
-    } else if (item.type === _Node.Type.COMMENT) {
+    } else if (item.type === _constants.Type.COMMENT) {
       comments.push({
         afterKey: !!key,
         before: items.length,
@@ -325,7 +325,4 @@ function resolveFlowMapItems(doc, cst) {
     comments,
     items
   };
-}
-
-module.exports = exports.default;
-module.exports.default = exports.default;
+}

package/dist/schema/parseSeq.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = parseSeq;
 
-var _Node = require("../cst/Node");
+var _constants = require("../constants");
 
 var _errors = require("../errors");
 
@@ -18,7 +18,7 @@ var _Seq = _interopRequireDefault(require("./Seq"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function parseSeq(doc, cst) {
-  if (cst.type !== _Node.Type.SEQ && cst.type !== _Node.Type.FLOW_SEQ) {
+  if (cst.type !== _constants.Type.SEQ && cst.type !== _constants.Type.FLOW_SEQ) {
     const msg = `A ${cst.type} node cannot be resolved as a sequence`;
     doc.errors.push(new _errors.YAMLSyntaxError(cst, msg));
     return null;
@@ -27,7 +27,7 @@ function parseSeq(doc, cst) {
   const {
     comments,
     items
-  } = cst.type === _Node.Type.FLOW_SEQ ? resolveFlowSeqItems(doc, cst) : resolveBlockSeqItems(doc, cst);
+  } = cst.type === _constants.Type.FLOW_SEQ ? resolveFlowSeqItems(doc, cst) : resolveBlockSeqItems(doc, cst);
   const seq = new _Seq.default();
   seq.items = items;
   (0, _parseUtils.resolveComments)(seq, comments);
@@ -43,20 +43,20 @@ function resolveBlockSeqItems(doc, cst) {
     const item = cst.items[i];
 
     switch (item.type) {
-      case _Node.Type.BLANK_LINE:
+      case _constants.Type.BLANK_LINE:
         comments.push({
           before: items.length
         });
         break;
 
-      case _Node.Type.COMMENT:
+      case _constants.Type.COMMENT:
         comments.push({
           comment: item.comment,
           before: items.length
         });
         break;
 
-      case _Node.Type.SEQ_ITEM:
+      case _constants.Type.SEQ_ITEM:
         if (item.error) doc.errors.push(item.error);
         items.push(doc.resolveNode(item.node));
 
@@ -129,11 +129,11 @@ function resolveFlowSeqItems(doc, cst) {
         const msg = `Flow sequence contains an unexpected ${char}`;
         doc.errors.push(new _errors.YAMLSyntaxError(cst, msg));
       }
-    } else if (item.type === _Node.Type.BLANK_LINE) {
+    } else if (item.type === _constants.Type.BLANK_LINE) {
       comments.push({
         before: items.length
       });
-    } else if (item.type === _Node.Type.COMMENT) {
+    } else if (item.type === _constants.Type.COMMENT) {
       comments.push({
         comment: item.comment,
         before: items.length
@@ -164,7 +164,4 @@ function resolveFlowSeqItems(doc, cst) {
     comments,
     items
   };
-}
-
-module.exports = exports.default;
-module.exports.default = exports.default;
+}