yaml 1.4.0 → 1.5.0

package/dist/toJSON.js

@@ -20,7 +20,4 @@ function toJSON(value, arg, ctx) {
   }
 
   return value;
-}
-
-module.exports = exports.default;
-module.exports.default = exports.default;
+}

package/index.js

@@ -0,0 +1 @@
+module.exports = require('./dist').default

package/map.js

@@ -1 +1,2 @@
-module.exports = require('./dist/schema/Map')
+module.exports = require('./dist/schema/Map').default
+require('./dist/deprecation').warnFileDeprecation(__filename)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -18,20 +18,22 @@
     "*.js",
     "!.*.js"
   ],
-  "main": "./dist/index.js",
+  "main": "./index.js",
   "browser": {
-    "./dist/index.js": "./browser/dist/index.js",
+    "./index.js": "./browser/index.js",
     "./map.js": "./browser/map.js",
     "./pair.js": "./browser/pair.js",
     "./parse-cst.js": "./browser/parse-cst.js",
     "./scalar.js": "./browser/scalar.js",
     "./schema.js": "./browser/schema.js",
     "./seq.js": "./browser/seq.js",
+    "./types.js": "./browser/types.js",
     "./types/binary.js": "./browser/types/binary.js",
     "./types/omap.js": "./browser/types/omap.js",
     "./types/pairs.js": "./browser/types/pairs.js",
     "./types/set.js": "./browser/types/set.js",
-    "./types/timestamp.js": "./browser/types/timestamp.js"
+    "./types/timestamp.js": "./browser/types/timestamp.js",
+    "./util.js": "./browser/util.js"
   },
   "scripts": {
     "browser:build": "BABEL_ENV=browser babel src/ --out-dir browser/dist/",
@@ -64,24 +66,24 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.3.4",
-    "@babel/plugin-proposal-class-properties": "^7.3.4",
-    "@babel/plugin-transform-runtime": "^7.3.4",
-    "@babel/preset-env": "^7.3.4",
+    "@babel/cli": "^7.4.3",
+    "@babel/core": "^7.4.3",
+    "@babel/plugin-proposal-class-properties": "^7.4.0",
+    "@babel/plugin-transform-runtime": "^7.4.3",
+    "@babel/preset-env": "^7.4.3",
     "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.3.0",
-    "babel-plugin-add-module-exports": "^1.0.0",
+    "babel-jest": "^24.7.1",
     "babel-plugin-trace": "^1.1.0",
     "cpy-cli": "^2.0.0",
-    "eslint": "^5.15.1",
+    "eslint": "^5.16.0",
     "eslint-config-prettier": "^4.1.0",
-    "fast-check": "^1.12.0",
-    "jest": "^24.3.0",
+    "eslint-plugin-prettier": "^3.0.1",
+    "fast-check": "^1.13.0",
+    "jest": "^24.7.1",
     "prettier": "^1.16.4"
   },
   "dependencies": {
-    "@babel/runtime": "^7.3.4"
+    "@babel/runtime": "^7.4.3"
   },
   "engines": {
     "node": ">= 6"

package/pair.js

@@ -1 +1,2 @@
-module.exports = require('./dist/schema/Pair')
+module.exports = require('./dist/schema/Pair').default
+require('./dist/deprecation').warnFileDeprecation(__filename)

package/parse-cst.js

@@ -1 +1 @@
-module.exports = require('./dist/cst/parse')
+module.exports = require('./dist/cst/parse').default

package/scalar.js

@@ -1 +1,2 @@
-module.exports = require('./dist/schema/Scalar')
+module.exports = require('./dist/schema/Scalar').default
+require('./dist/deprecation').warnFileDeprecation(__filename)

package/schema.js

@@ -1,4 +1,7 @@
-module.exports = require('./dist/schema')
-module.exports.nullOptions = require('./dist/schema/core').nullOptions
-module.exports.stringify = require('./dist/stringify').default
-module.exports.strOptions = require('./dist/stringify').strOptions
+module.exports = require('./dist/schema').default
+var opt = require('./dist/tags/options')
+module.exports.nullOptions = opt.nullOptions
+module.exports.strOptions = opt.strOptions
+module.exports.stringify = require('./dist/stringify').stringifyString
+
+require('./dist/deprecation').warnFileDeprecation(__filename)

package/seq.js

@@ -1 +1,2 @@
-module.exports = require('./dist/schema/Seq')
+module.exports = require('./dist/schema/Seq').default
+require('./dist/deprecation').warnFileDeprecation(__filename)

package/types/binary.js

@@ -1 +1,7 @@
-module.exports = require('../dist/schema/_binary')
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+
+exports.binary = require('../dist/tags/yaml-1.1/binary').default
+exports.default = [exports.binary]
+
+require('../dist/deprecation').warnFileDeprecation(__filename)

package/types/omap.js

@@ -1 +1,2 @@
-module.exports = require('../dist/schema/_omap').default
+module.exports = require('../dist/tags/yaml-1.1/omap').default
+require('../dist/deprecation').warnFileDeprecation(__filename)

package/types/pairs.js

@@ -1 +1,2 @@
-module.exports = require('../dist/schema/_pairs').default
+module.exports = require('../dist/tags/yaml-1.1/pairs').default
+require('../dist/deprecation').warnFileDeprecation(__filename)

package/types/set.js

@@ -1 +1,2 @@
-module.exports = require('../dist/schema/_set').default
+module.exports = require('../dist/tags/yaml-1.1/set').default
+require('../dist/deprecation').warnFileDeprecation(__filename)

package/types/timestamp.js

@@ -1 +1,10 @@
-module.exports = require('../dist/schema/_timestamp')
+'use strict'
+Object.defineProperty(exports, '__esModule', { value: true })
+
+var ts = require('../dist/tags/yaml-1.1/timestamp')
+exports.default = [ts.intTime, ts.floatTime, ts.timestamp]
+exports.floatTime = ts.floatTime
+exports.intTime = ts.intTime
+exports.timestamp = ts.timestamp
+
+require('../dist/deprecation').warnFileDeprecation(__filename)

package/types.js

@@ -0,0 +1,11 @@
+var opt = require('./dist/tags/options')
+exports.binaryOptions = opt.binaryOptions
+exports.boolOptions = opt.boolOptions
+exports.nullOptions = opt.nullOptions
+exports.strOptions = opt.strOptions
+
+exports.Schema = require('./dist/schema').default
+exports.YAMLMap = require('./dist/schema/Map').default
+exports.YAMLSeq = require('./dist/schema/Seq').default
+exports.Pair = require('./dist/schema/Pair').default
+exports.Scalar = require('./dist/schema/Scalar').default

package/util.js

@@ -0,0 +1,15 @@
+exports.findPair = require('./dist/schema/Map').findPair
+exports.parseMap = require('./dist/schema/parseMap').default
+exports.parseSeq = require('./dist/schema/parseSeq').default
+
+var str = require('./dist/stringify')
+exports.stringifyNumber = str.stringifyNumber
+exports.stringifyString = str.stringifyString
+exports.toJSON = require('./dist/toJSON').default
+exports.Type = require('./dist/cst/Node').Type
+
+var err = require('./dist/errors')
+exports.YAMLReferenceError = err.YAMLReferenceError
+exports.YAMLSemanticError = err.YAMLSemanticError
+exports.YAMLSyntaxError = err.YAMLSyntaxError
+exports.YAMLWarning = err.YAMLWarning

package/browser/dist/schema/_set.js

@@ -1,215 +0,0 @@
-"use strict";
-
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.YAMLSet = void 0;
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
-var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
-var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
-
-var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
-
-var _get2 = _interopRequireDefault(require("@babel/runtime/helpers/get"));
-
-var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-
-var _errors = require("../errors");
-
-var _toJSON2 = _interopRequireDefault(require("../toJSON"));
-
-var _Map = _interopRequireWildcard(require("./Map"));
-
-var _Merge = _interopRequireDefault(require("./Merge"));
-
-var _Pair = _interopRequireDefault(require("./Pair"));
-
-var _parseMap = _interopRequireDefault(require("./parseMap"));
-
-var _Scalar = _interopRequireDefault(require("./Scalar"));
-
-var YAMLSet =
-/*#__PURE__*/
-function (_YAMLMap) {
-  (0, _inherits2.default)(YAMLSet, _YAMLMap);
-
-  function YAMLSet() {
-    var _this;
-
-    (0, _classCallCheck2.default)(this, YAMLSet);
-    _this = (0, _possibleConstructorReturn2.default)(this, (0, _getPrototypeOf2.default)(YAMLSet).call(this));
-    _this.tag = YAMLSet.tag;
-    return _this;
-  }
-
-  (0, _createClass2.default)(YAMLSet, [{
-    key: "add",
-    value: function add(key) {
-      var pair = key instanceof _Pair.default ? key : new _Pair.default(key);
-      var prev = (0, _Map.findPair)(this.items, pair.key);
-      if (!prev) this.items.push(pair);
-    }
-  }, {
-    key: "get",
-    value: function get(key, keepPair) {
-      var pair = (0, _Map.findPair)(this.items, key);
-      return !keepPair && pair instanceof _Pair.default ? pair.key instanceof _Scalar.default ? pair.key.value : pair.key : pair;
-    }
-  }, {
-    key: "set",
-    value: function set(key, value) {
-      if (typeof value !== 'boolean') throw new Error("Expected boolean value for set(key, value) in a YAML set, not ".concat((0, _typeof2.default)(value)));
-      var prev = (0, _Map.findPair)(this.items, key);
-
-      if (prev && !value) {
-        this.items.splice(this.items.indexOf(prev), 1);
-      } else if (!prev && value) {
-        this.items.push(new _Pair.default(key));
-      }
-    }
-  }, {
-    key: "toJSON",
-    value: function toJSON(_, ctx) {
-      var set = new Set();
-      if (ctx && ctx.onCreate) ctx.onCreate(set);
-      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;
-
-          if (item instanceof _Merge.default) {
-            var items = item.value.items;
-
-            for (var i = items.length - 1; i >= 0; --i) {
-              var source = items[i].source;
-
-              if (source instanceof _Map.default) {
-                var _iteratorNormalCompletion2 = true;
-                var _didIteratorError2 = false;
-                var _iteratorError2 = undefined;
-
-                try {
-                  for (var _iterator2 = source.toJSMap(ctx)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-                    var _step2$value = (0, _slicedToArray2.default)(_step2.value, 1),
-                        key = _step2$value[0];
-
-                    set.add(key);
-                  }
-                } catch (err) {
-                  _didIteratorError2 = true;
-                  _iteratorError2 = err;
-                } finally {
-                  try {
-                    if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-                      _iterator2.return();
-                    }
-                  } finally {
-                    if (_didIteratorError2) {
-                      throw _iteratorError2;
-                    }
-                  }
-                }
-              } else {
-                throw new Error('Merge sources must be maps');
-              }
-            }
-          } else {
-            set.add((0, _toJSON2.default)(item.key, '', ctx));
-          }
-        }
-      } catch (err) {
-        _didIteratorError = true;
-        _iteratorError = err;
-      } finally {
-        try {
-          if (!_iteratorNormalCompletion && _iterator.return != null) {
-            _iterator.return();
-          }
-        } finally {
-          if (_didIteratorError) {
-            throw _iteratorError;
-          }
-        }
-      }
-
-      return set;
-    }
-  }, {
-    key: "toString",
-    value: function toString(ctx, onComment, onChompKeep) {
-      if (!ctx) return JSON.stringify(this);
-      if (this.hasAllNullValues()) return (0, _get2.default)((0, _getPrototypeOf2.default)(YAMLSet.prototype), "toString", this).call(this, ctx, onComment, onChompKeep);else throw new Error('Set items must all have null values');
-    }
-  }]);
-  return YAMLSet;
-}(_Map.default);
-
-exports.YAMLSet = YAMLSet;
-(0, _defineProperty2.default)(YAMLSet, "tag", 'tag:yaml.org,2002:set');
-
-function parseSet(doc, cst) {
-  var map = (0, _parseMap.default)(doc, cst);
-  if (!map.hasAllNullValues()) throw new _errors.YAMLSemanticError(cst, 'Set items must all have null values');
-  return Object.assign(new YAMLSet(), map);
-}
-
-function createSet(schema, iterable, ctx) {
-  var set = new YAMLSet();
-  var _iteratorNormalCompletion3 = true;
-  var _didIteratorError3 = false;
-  var _iteratorError3 = undefined;
-
-  try {
-    for (var _iterator3 = iterable[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-      var value = _step3.value;
-      var v = schema.createNode(value, ctx.wrapScalars, null, ctx);
-      set.items.push(new _Pair.default(v));
-    }
-  } catch (err) {
-    _didIteratorError3 = true;
-    _iteratorError3 = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
-        _iterator3.return();
-      }
-    } finally {
-      if (_didIteratorError3) {
-        throw _iteratorError3;
-      }
-    }
-  }
-
-  return set;
-}
-
-var _default = {
-  identify: function identify(value) {
-    return value instanceof Set;
-  },
-  nodeClass: YAMLSet,
-  default: false,
-  tag: 'tag:yaml.org,2002:set',
-  resolve: parseSet,
-  createNode: createSet,
-  stringify: function stringify(value, ctx, onComment, onChompKeep) {
-    return value.toString(ctx, onComment, onChompKeep);
-  }
-};
-exports.default = _default;

package/browser/dist/schema/failsafe.js

@@ -1,125 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.seq = exports.map = void 0;
-
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-
-var _Map = _interopRequireDefault(require("./Map"));
-
-var _Pair = _interopRequireDefault(require("./Pair"));
-
-var _Seq = _interopRequireDefault(require("./Seq"));
-
-var _string = require("./_string");
-
-var _parseMap = _interopRequireDefault(require("./parseMap"));
-
-var _parseSeq = _interopRequireDefault(require("./parseSeq"));
-
-function createMap(schema, obj, ctx) {
-  var map = new _Map.default();
-
-  if (obj instanceof Map) {
-    var _iteratorNormalCompletion = true;
-    var _didIteratorError = false;
-    var _iteratorError = undefined;
-
-    try {
-      for (var _iterator = obj[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var _step$value = (0, _slicedToArray2.default)(_step.value, 2),
-            key = _step$value[0],
-            value = _step$value[1];
-
-        var k = schema.createNode(key, ctx.wrapScalars, null, ctx);
-        var v = schema.createNode(value, ctx.wrapScalars, null, ctx);
-        map.items.push(new _Pair.default(k, v));
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
-      }
-    }
-  } else if (obj && (0, _typeof2.default)(obj) === 'object') {
-    map.items = Object.keys(obj).map(function (key) {
-      var k = schema.createNode(key, ctx.wrapScalars, null, ctx);
-      var v = schema.createNode(obj[key], ctx.wrapScalars, null, ctx);
-      return new _Pair.default(k, v);
-    });
-  }
-
-  return map;
-}
-
-function createSeq(schema, obj, ctx) {
-  var seq = new _Seq.default();
-
-  if (obj && obj[Symbol.iterator]) {
-    var _iteratorNormalCompletion2 = true;
-    var _didIteratorError2 = false;
-    var _iteratorError2 = undefined;
-
-    try {
-      for (var _iterator2 = obj[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-        var it = _step2.value;
-        var v = schema.createNode(it, ctx.wrapScalars, null, ctx);
-        seq.items.push(v);
-      }
-    } catch (err) {
-      _didIteratorError2 = true;
-      _iteratorError2 = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-          _iterator2.return();
-        }
-      } finally {
-        if (_didIteratorError2) {
-          throw _iteratorError2;
-        }
-      }
-    }
-  }
-
-  return seq;
-}
-
-var map = {
-  createNode: createMap,
-  default: true,
-  nodeClass: _Map.default,
-  tag: 'tag:yaml.org,2002:map',
-  resolve: _parseMap.default,
-  stringify: function stringify(value, ctx, onComment, onChompKeep) {
-    return value.toString(ctx, onComment, onChompKeep);
-  }
-};
-exports.map = map;
-var seq = {
-  createNode: createSeq,
-  default: true,
-  nodeClass: _Seq.default,
-  tag: 'tag:yaml.org,2002:seq',
-  resolve: _parseSeq.default,
-  stringify: function stringify(value, ctx, onComment, onChompKeep) {
-    return value.toString(ctx, onComment, onChompKeep);
-  }
-};
-exports.seq = seq;
-var _default = [map, seq, _string.str];
-exports.default = _default;

package/dist/schema/_string.js

@@ -1,40 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.str = exports.resolve = void 0;
-
-var _stringify = _interopRequireWildcard(require("../stringify"));
-
-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; } }
-
-const resolve = (doc, node) => {
-  // on error, will return { str: string, errors: Error[] }
-  const res = node.strValue;
-  if (!res) return '';
-  if (typeof res === 'string') return res;
-  res.errors.forEach(error => {
-    if (!error.source) error.source = node;
-    doc.errors.push(error);
-  });
-  return res.str;
-};
-
-exports.resolve = resolve;
-const str = {
-  identify: value => typeof value === 'string',
-  default: true,
-  tag: 'tag:yaml.org,2002:str',
-  resolve,
-
-  stringify(item, ctx, onComment, onChompKeep) {
-    ctx = Object.assign({
-      actualString: true
-    }, ctx);
-    return (0, _stringify.default)(item, ctx, onComment, onChompKeep);
-  },
-
-  options: _stringify.strOptions
-};
-exports.str = str;

package/dist/schema/failsafe.js

@@ -1,74 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.seq = exports.map = void 0;
-
-var _Map = _interopRequireDefault(require("./Map"));
-
-var _Pair = _interopRequireDefault(require("./Pair"));
-
-var _Seq = _interopRequireDefault(require("./Seq"));
-
-var _string = require("./_string");
-
-var _parseMap = _interopRequireDefault(require("./parseMap"));
-
-var _parseSeq = _interopRequireDefault(require("./parseSeq"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-function createMap(schema, obj, ctx) {
-  const map = new _Map.default();
-
-  if (obj instanceof Map) {
-    for (const [key, value] of obj) {
-      const k = schema.createNode(key, ctx.wrapScalars, null, ctx);
-      const v = schema.createNode(value, ctx.wrapScalars, null, ctx);
-      map.items.push(new _Pair.default(k, v));
-    }
-  } else if (obj && typeof obj === 'object') {
-    map.items = Object.keys(obj).map(key => {
-      const k = schema.createNode(key, ctx.wrapScalars, null, ctx);
-      const v = schema.createNode(obj[key], ctx.wrapScalars, null, ctx);
-      return new _Pair.default(k, v);
-    });
-  }
-
-  return map;
-}
-
-function createSeq(schema, obj, ctx) {
-  const seq = new _Seq.default();
-
-  if (obj && obj[Symbol.iterator]) {
-    for (const it of obj) {
-      const v = schema.createNode(it, ctx.wrapScalars, null, ctx);
-      seq.items.push(v);
-    }
-  }
-
-  return seq;
-}
-
-const map = {
-  createNode: createMap,
-  default: true,
-  nodeClass: _Map.default,
-  tag: 'tag:yaml.org,2002:map',
-  resolve: _parseMap.default,
-  stringify: (value, ctx, onComment, onChompKeep) => value.toString(ctx, onComment, onChompKeep)
-};
-exports.map = map;
-const seq = {
-  createNode: createSeq,
-  default: true,
-  nodeClass: _Seq.default,
-  tag: 'tag:yaml.org,2002:seq',
-  resolve: _parseSeq.default,
-  stringify: (value, ctx, onComment, onChompKeep) => value.toString(ctx, onComment, onChompKeep)
-};
-exports.seq = seq;
-var _default = [map, seq, _string.str];
-exports.default = _default;