yaml 1.3.0 → 1.5.0

package/browser/dist/schema/Pair.js

@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
@@ -19,9 +17,11 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
 var _addComment = _interopRequireDefault(require("../addComment"));
 
-var _toJSON2 = _interopRequireDefault(require("../toJSON"));
+var _toJSON = _interopRequireDefault(require("../toJSON"));
 
 var _Collection = _interopRequireDefault(require("./Collection"));
 
@@ -30,6 +30,19 @@ var _Node2 = _interopRequireDefault(require("./Node"));
 var _Scalar = _interopRequireDefault(require("./Scalar"));
 
 // Published as 'yaml/pair'
+var stringifyKey = function stringifyKey(key, jsKey, ctx) {
+  if (jsKey === null) return '';
+  if ((0, _typeof2.default)(jsKey) !== 'object') return String(jsKey);
+  if (key instanceof _Node2.default && ctx && ctx.doc) return key.toString({
+    anchors: {},
+    doc: ctx.doc,
+    indent: '',
+    inFlow: true,
+    inStringifyKey: true
+  });
+  return JSON.stringify(jsKey);
+};
+
 var Pair =
 /*#__PURE__*/
 function (_Node) {
@@ -48,12 +61,27 @@ function (_Node) {
   }
 
   (0, _createClass2.default)(Pair, [{
+    key: "addToJSMap",
+    value: function addToJSMap(ctx, map) {
+      var key = (0, _toJSON.default)(this.key, '', ctx);
+
+      if (map instanceof Map) {
+        var value = (0, _toJSON.default)(this.value, key, ctx);
+        map.set(key, value);
+      } else if (map instanceof Set) {
+        map.add(key);
+      } else {
+        var stringKey = stringifyKey(this.key, key, ctx);
+        map[stringKey] = (0, _toJSON.default)(this.value, stringKey, ctx);
+      }
+
+      return map;
+    }
+  }, {
     key: "toJSON",
-    value: function toJSON(_, opt) {
-      var pair = {};
-      var sk = this.stringKey;
-      pair[sk] = (0, _toJSON2.default)(this.value, sk, opt);
-      return pair;
+    value: function toJSON(_, ctx) {
+      var pair = ctx && ctx.mapAsMap ? new Map() : {};
+      return this.addToJSMap(ctx, pair);
     }
   }, {
     key: "toString",
@@ -96,25 +124,37 @@ function (_Node) {
       }
 
       var vcb = '';
+      var valueComment = null;
 
-      if (value) {
+      if (value instanceof _Node2.default) {
         if (value.spaceBefore) vcb = '\n';
 
         if (value.commentBefore) {
           var cs = value.commentBefore.replace(/^/gm, "".concat(ctx.indent, "#"));
           vcb += "\n".concat(cs);
         }
+
+        valueComment = value.comment;
+      } else if (value && (0, _typeof2.default)(value) === 'object') {
+        value = doc.schema.createNode(value, true);
       }
 
       ctx.implicitKey = false;
-      var valueComment = value instanceof _Node2.default && value.comment;
       chompKeep = false;
       var valueStr = doc.schema.stringify(value, ctx, function () {
         return valueComment = null;
       }, function () {
         return chompKeep = true;
       });
-      var ws = vcb || this.comment || !explicitKey && value instanceof _Collection.default ? "".concat(vcb, "\n").concat(ctx.indent) : ' ';
+      var ws = ' ';
+
+      if (vcb || this.comment) {
+        ws = "".concat(vcb, "\n").concat(ctx.indent);
+      } else if (!explicitKey && value instanceof _Collection.default) {
+        var flow = valueStr[0] === '[' || valueStr[0] === '{';
+        if (!flow || valueStr.includes('\n')) ws = "\n".concat(ctx.indent);
+      }
+
       if (chompKeep && !valueComment && onChompKeep) onChompKeep();
       return (0, _addComment.default)(str + ws + valueStr, ctx.indent, valueComment);
     }
@@ -127,22 +167,8 @@ function (_Node) {
       if (this.key == null) this.key = new _Scalar.default(null);
       this.key.commentBefore = cb;
     }
-  }, {
-    key: "stringKey",
-    get: function get() {
-      var key = (0, _toJSON2.default)(this.key);
-      if (key === null) return '';
-      if ((0, _typeof2.default)(key) === 'object') try {
-        return JSON.stringify(key);
-      } catch (e) {
-        /* should not happen, but let's ignore in any case */
-      }
-      return String(key);
-    }
   }]);
   return Pair;
 }(_Node2.default);
 
-exports.default = Pair;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = Pair;

package/browser/dist/schema/Scalar.js

@@ -38,8 +38,8 @@ function (_Node) {
 
   (0, _createClass2.default)(Scalar, [{
     key: "toJSON",
-    value: function toJSON(arg, opt) {
-      return opt && opt.keep ? this.value : (0, _toJSON2.default)(this.value, arg, opt);
+    value: function toJSON(arg, ctx) {
+      return ctx && ctx.keep ? this.value : (0, _toJSON2.default)(this.value, arg, ctx);
     }
   }, {
     key: "toString",
@@ -50,6 +50,4 @@ function (_Node) {
   return Scalar;
 }(_Node2.default);
 
-exports.default = Scalar;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = Scalar;

package/browser/dist/schema/Seq.js

@@ -78,10 +78,35 @@ function (_Collection) {
     }
   }, {
     key: "toJSON",
-    value: function toJSON(_, opt) {
-      return this.items.map(function (v, i) {
-        return (0, _toJSON2.default)(v, String(i), opt);
-      });
+    value: function toJSON(_, ctx) {
+      var seq = [];
+      if (ctx && ctx.onCreate) ctx.onCreate(seq);
+      var i = 0;
+      var _iteratorNormalCompletion = true;
+      var _didIteratorError = false;
+      var _iteratorError = undefined;
+
+      try {
+        for (var _iterator = this.items[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var item = _step.value;
+          seq.push((0, _toJSON2.default)(item, String(i++), ctx));
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
+        }
+      }
+
+      return seq;
     }
   }, {
     key: "toString",
@@ -103,6 +128,4 @@ function (_Collection) {
   return YAMLSeq;
 }(_Collection2.default);
 
-exports.default = YAMLSeq;
-module.exports = exports.default;
-module.exports.default = exports.default;
+exports.default = YAMLSeq;

package/browser/dist/schema/index.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -17,76 +15,113 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-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"));
-
 var isMap = function isMap(_ref) {
   var type = _ref.type;
-  return type === _Node.Type.FLOW_MAP || type === _Node.Type.MAP;
+  return type === _constants.Type.FLOW_MAP || type === _constants.Type.MAP;
 };
 
 var isSeq = function isSeq(_ref2) {
   var type = _ref2.type;
-  return type === _Node.Type.FLOW_SEQ || type === _Node.Type.SEQ;
+  return type === _constants.Type.FLOW_SEQ || type === _constants.Type.SEQ;
 };
 
 var Schema =
 /*#__PURE__*/
 function () {
-  (0, _createClass2.default)(Schema, null, [{
-    key: "defaultStringify",
-    value: function defaultStringify(value) {
-      return JSON.stringify(value);
-    }
-  }]);
-
   function Schema(_ref3) {
-    var merge = _ref3.merge,
+    var customTags = _ref3.customTags,
+        merge = _ref3.merge,
         schema = _ref3.schema,
-        tags = _ref3.tags;
+        deprecatedCustomTags = _ref3.tags;
     (0, _classCallCheck2.default)(this, Schema);
     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) {
-      var keys = Object.keys(Schema.tags).map(function (key) {
+      var keys = Object.keys(_tags.schemas).map(function (key) {
         return JSON.stringify(key);
-      });
-      throw new Error("Unknown schema; use one of ".concat(keys.join(', ')));
+      }).join(', ');
+      throw new Error("Unknown schema \"".concat(schema, "\"; use one of ").concat(keys));
+    }
+
+    if (!customTags && deprecatedCustomTags) {
+      customTags = deprecatedCustomTags;
+      (0, _deprecation.warnOptionDeprecation)('tags', 'customTags');
+    }
+
+    if (Array.isArray(customTags)) {
+      var _iteratorNormalCompletion = true;
+      var _didIteratorError = false;
+      var _iteratorError = undefined;
+
+      try {
+        for (var _iterator = customTags[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+          var tag = _step.value;
+          this.tags = this.tags.concat(tag);
+        }
+      } catch (err) {
+        _didIteratorError = true;
+        _iteratorError = err;
+      } finally {
+        try {
+          if (!_iteratorNormalCompletion && _iterator.return != null) {
+            _iterator.return();
+          }
+        } finally {
+          if (_didIteratorError) {
+            throw _iteratorError;
+          }
+        }
+      }
+    } else if (typeof customTags === 'function') {
+      this.tags = customTags(this.tags.slice());
     }
 
-    if (Array.isArray(tags)) {
-      this.tags = this.tags.concat(tags);
-    } else if (typeof tags === 'function') {
-      this.tags = tags(this.tags.slice());
+    for (var i = 0; i < this.tags.length; ++i) {
+      var _tag = this.tags[i];
+
+      if (typeof _tag === 'string') {
+        var tagObj = _tags.tags[_tag];
+
+        if (!tagObj) {
+          var _keys = Object.keys(_tags.tags).map(function (key) {
+            return JSON.stringify(key);
+          }).join(', ');
+
+          throw new Error("Unknown custom tag \"".concat(_tag, "\"; use one of ").concat(_keys));
+        }
+
+        this.tags[i] = tagObj;
+      }
     }
   }
 
   (0, _createClass2.default)(Schema, [{
     key: "createNode",
-    value: function createNode(value, wrapScalars, tag, onTagObj) {
+    value: function createNode(value, wrapScalars, tag, ctx) {
       var tagObj;
 
       if (tag) {
@@ -99,20 +134,54 @@ function () {
         }) || match[0];
         if (!tagObj) throw new Error("Tag ".concat(tag, " not found"));
       } else {
+        // TODO: deprecate/remove class check
         tagObj = this.tags.find(function (t) {
-          return t.class && value instanceof t.class && !t.format;
+          return (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 ((0, _typeof2.default)(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: wrapScalars
+      };else ctx.wrapScalars = wrapScalars;
+
+      if (ctx.onTagObj) {
+        ctx.onTagObj(tagObj);
+        delete ctx.onTagObj;
+      }
+
+      var obj = {};
+
+      if (value && (0, _typeof2.default)(value) === 'object' && ctx.prevObjects) {
+        var prev = ctx.prevObjects.find(function (o) {
+          return o.value === value;
+        });
+
+        if (prev) {
+          var 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;
+    }
+  }, {
+    key: "createPair",
+    value: function createPair(key, value, ctx) {
+      var k = this.createNode(key, ctx.wrapScalars, null, ctx);
+      var v = this.createNode(value, ctx.wrapScalars, null, ctx);
+      return new _Pair.default(k, v);
     } // falls back to string on no match
 
   }, {
@@ -130,7 +199,8 @@ function () {
           var match = str.match(test);
 
           if (match) {
-            var res = new _Scalar.default(resolve.apply(null, match));
+            var res = resolve.apply(null, match);
+            if (!(res instanceof _Scalar.default)) res = new _Scalar.default(res);
             if (format) res.format = format;
             return res;
           }
@@ -160,7 +230,7 @@ function () {
           if (!(res instanceof _Collection.default)) res = new _Scalar.default(res);
           node.resolved = res;
         } else {
-          var str = (0, _string.resolve)(doc, node);
+          var str = (0, _string.resolveString)(doc, node);
 
           if (typeof str === 'string' && tags.length > 0) {
             node.resolved = this.resolveScalar(str, tags);
@@ -173,7 +243,7 @@ function () {
       }
 
       if (!node.resolved) return null;
-      if (tagName) node.resolved.tag = tagName;
+      if (tagName && node.tag) node.resolved.tag = tagName;
       return node.resolved;
     }
   }, {
@@ -210,37 +280,13 @@ function () {
         }) || match[0];
       }
 
-      if (item.value === null) {
-        var _tagObj = this.tags.find(function (t) {
-          return t.class === null && !t.format;
-        });
-
-        if (!_tagObj) throw new Error('Tag not resolved for null value');
-        return _tagObj;
-      }
-
       var tagObj, obj;
 
       if (item instanceof _Scalar.default) {
-        switch ((0, _typeof2.default)(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
 
         var _match = this.tags.filter(function (t) {
-          return t.class && (obj instanceof t.class || obj && obj.constructor === t.class);
+          return t.identify && t.identify(obj) || t.class && obj instanceof t.class;
         });
 
         tagObj = _match.find(function (t) {
@@ -276,7 +322,7 @@ function () {
         props.push("&".concat(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));
@@ -288,15 +334,53 @@ function () {
     key: "stringify",
     value: function stringify(item, ctx, onComment, onChompKeep) {
       var tagObj;
-      if (!(item instanceof _Node2.default)) item = this.createNode(item, true, null, function (o) {
-        return tagObj = o;
-      });
+
+      if (!(item instanceof _Node.default)) {
+        var createCtx = {
+          aliasNodes: [],
+          onTagObj: function onTagObj(o) {
+            return tagObj = o;
+          },
+          prevObjects: []
+        };
+        item = this.createNode(item, true, null, createCtx);
+        var anchors = ctx.doc.anchors;
+        var _iteratorNormalCompletion2 = true;
+        var _didIteratorError2 = false;
+        var _iteratorError2 = undefined;
+
+        try {
+          for (var _iterator2 = createCtx.aliasNodes[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+            var alias = _step2.value;
+            alias.source = alias.source.node;
+            var name = anchors.getName(alias.source);
+
+            if (!name) {
+              name = anchors.newName();
+              anchors.map[name] = alias.source;
+            }
+          }
+        } catch (err) {
+          _didIteratorError2 = true;
+          _iteratorError2 = err;
+        } finally {
+          try {
+            if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+              _iterator2.return();
+            }
+          } finally {
+            if (_didIteratorError2) {
+              throw _iteratorError2;
+            }
+          }
+        }
+      }
+
       ctx.tags = this;
       if (item instanceof _Pair.default) return item.toString(ctx, onComment, onChompKeep);
       if (!tagObj) tagObj = this.getTagObject(item);
       var props = this.stringifyProps(item, tagObj, ctx);
-      var stringify = tagObj.stringify || Schema.defaultStringify;
-      var str = stringify(item, ctx, onComment, onChompKeep);
+      var 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] !== '[' ? "".concat(props, "\n").concat(ctx.indent).concat(str) : "".concat(props, " ").concat(str) : str;
     }
   }]);
@@ -309,12 +393,4 @@ exports.default = Schema;
   MAP: 'tag:yaml.org,2002:map',
   SEQ: 'tag:yaml.org,2002:seq',
   STR: 'tag:yaml.org,2002:str'
-});
-(0, _defineProperty2.default)(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;
+});