yaml 1.6.0 → 1.8.0

package/dist/tags/yaml-1.1/index.js

@@ -25,6 +25,10 @@ var _timestamp = require("./timestamp");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+const boolStringify = ({
+  value
+}) => value ? _options.boolOptions.trueStr : _options.boolOptions.falseStr;
+
 var _default = _failsafe.default.concat([{
   identify: value => value == null,
   createNode: (schema, value, ctx) => ctx.wrapScalars ? new _Scalar.default(null) : null,
@@ -41,9 +45,7 @@ var _default = _failsafe.default.concat([{
   test: /^(?:Y|y|[Yy]es|YES|[Tt]rue|TRUE|[Oo]n|ON)$/,
   resolve: () => true,
   options: _options.boolOptions,
-  stringify: ({
-    value
-  }) => value ? _options.boolOptions.trueStr : _options.boolOptions.falseStr
+  stringify: boolStringify
 }, {
   identify: value => typeof value === 'boolean',
   default: true,
@@ -51,9 +53,7 @@ var _default = _failsafe.default.concat([{
   test: /^(?:N|n|[Nn]o|NO|[Ff]alse|FALSE|[Oo]ff|OFF)$/i,
   resolve: () => false,
   options: _options.boolOptions,
-  stringify: ({
-    value
-  }) => value ? _options.boolOptions.trueStr : _options.boolOptions.falseStr
+  stringify: boolStringify
 }, {
   identify: value => typeof value === 'number',
   default: true,

package/dist/tags/yaml-1.1/omap.js

@@ -71,11 +71,9 @@ function parseOMap(doc, cst) {
   const pairs = (0, _pairs.parsePairs)(doc, cst);
   const seenKeys = [];
 
-  for (const _ref of pairs.items) {
-    const {
-      key
-    } = _ref;
-
+  for (const {
+    key
+  } of pairs.items) {
     if (key instanceof _Scalar.default) {
       if (seenKeys.includes(key.value)) {
         const msg = 'Ordered maps must not include duplicate keys';

package/dist/tags/yaml-1.1/pairs.js

@@ -42,7 +42,7 @@ function parsePairs(doc, cst) {
 }
 
 function createPairs(schema, iterable, ctx) {
-  const pairs = new _Seq.default();
+  const pairs = new _Seq.default(schema);
   pairs.tag = 'tag:yaml.org,2002:pairs';
 
   for (const it of iterable) {

package/dist/tags/yaml-1.1/set.js

@@ -17,7 +17,9 @@ var _Scalar = _interopRequireDefault(require("../../schema/Scalar"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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 _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+
+function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 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; }
 

package/dist/{deprecation.js → warnings.js}

@@ -3,23 +3,28 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.warn = warn;
 exports.warnFileDeprecation = warnFileDeprecation;
 exports.warnOptionDeprecation = warnOptionDeprecation;
 
 /* global global, console */
-function warn(msg) {
-  if (global && global.process && global.process.emitWarning) {
-    global.process.emitWarning(msg, 'DeprecationWarning');
-  } else {
+function warn(warning, type) {
+  if (global && global._YAML_SILENCE_WARNINGS) return;
+  const {
+    emitWarning
+  } = global && global.process; // This will throw in Jest if `warning` is an Error instance due to
+  // https://github.com/facebook/jest/issues/2549
+
+  if (emitWarning) emitWarning(warning, type);else {
     // eslint-disable-next-line no-console
-    console.warn(`DeprecationWarning: ${msg}`);
+    console.warn(type ? `${type}: ${warning}` : warning);
   }
 }
 
 function warnFileDeprecation(filename) {
   if (global && global._YAML_SILENCE_DEPRECATION_WARNINGS) return;
   const path = filename.replace(/.*yaml[/\\]/i, '').replace(/\.js$/, '').replace(/\\/g, '/');
-  warn(`The endpoint 'yaml/${path}' will be removed in a future release.`);
+  warn(`The endpoint 'yaml/${path}' will be removed in a future release.`, 'DeprecationWarning');
 }
 
 const warned = {};
@@ -30,5 +35,5 @@ function warnOptionDeprecation(name, alternative) {
   warned[name] = true;
   let msg = `The option '${name}' will be removed in a future release`;
   msg += alternative ? `, use '${alternative}' instead.` : '.';
-  warn(msg);
+  warn(msg, 'DeprecationWarning');
 }

package/map.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yaml",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -16,8 +16,10 @@
     "dist/",
     "types/",
     "*.js",
+    "*.mjs",
     "!.*.js"
   ],
+  "type": "commonjs",
   "main": "./index.js",
   "browser": {
     "./index.js": "./browser/index.js",
@@ -35,9 +37,22 @@
     "./types/timestamp.js": "./browser/types/timestamp.js",
     "./util.js": "./browser/util.js"
   },
+  "exports": {
+    ".": "./index.js",
+    "./parse-cst": "./parse-cst.js",
+    "./types": {
+      "require": "./types.js",
+      "import": "./types.mjs"
+    },
+    "./util": {
+      "require": "./util.js",
+      "import": "./util.mjs"
+    }
+  },
   "scripts": {
     "browser:build": "BABEL_ENV=browser babel src/ --out-dir browser/dist/",
     "browser:copy": "cpy '*.js' '!*.config.js' types/ browser/ --parents",
+    "clean": "git clean -fdxe node_modules",
     "dist:build": "babel src/ --out-dir dist/",
     "build": "npm run dist:build && npm run browser:build && npm run browser:copy",
     "prettier": "prettier --write \"{src,tests}/**/*.js\"",
@@ -49,10 +64,13 @@
     "docs:deploy": "cd docs/ && ./deploy.sh",
     "docs": "cd docs/ && bundle exec middleman server",
     "preversion": "npm test && npm run build",
-    "prepublishOnly": "npm test && npm run build"
+    "prepublishOnly": "npm run clean && npm test && npm run build"
   },
   "browserslist": "> 0.5%, not dead",
   "jest": {
+    "collectCoverageFrom": [
+      "src/**/*.js"
+    ],
     "testMatch": [
       "**/tests/**/*.js"
     ],
@@ -66,25 +84,25 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@babel/cli": "^7.4.4",
-    "@babel/core": "^7.4.5",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.5",
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.8.0",
+    "@babel/cli": "^7.8.4",
+    "@babel/core": "^7.8.7",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/plugin-transform-runtime": "^7.8.3",
+    "@babel/preset-env": "^7.8.7",
+    "babel-eslint": "^10.1.0",
+    "babel-jest": "^25.1.0",
     "babel-plugin-trace": "^1.1.0",
     "common-tags": "^1.8.0",
-    "cpy-cli": "^2.0.0",
-    "eslint": "^5.16.0",
-    "eslint-config-prettier": "^4.3.0",
-    "eslint-plugin-prettier": "^3.1.0",
-    "fast-check": "^1.15.1",
-    "jest": "^24.8.0",
-    "prettier": "^1.17.1"
+    "cpy-cli": "^3.1.0",
+    "eslint": "^6.8.0",
+    "eslint-config-prettier": "^6.10.0",
+    "eslint-plugin-prettier": "^3.1.2",
+    "fast-check": "^1.23.0",
+    "jest": "^25.1.0",
+    "prettier": "^1.19.1"
   },
   "dependencies": {
-    "@babel/runtime": "^7.4.5"
+    "@babel/runtime": "^7.8.7"
   },
   "engines": {
     "node": ">= 6"

package/pair.js

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

package/scalar.js

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

package/schema.js

@@ -4,4 +4,4 @@ module.exports.nullOptions = opt.nullOptions
 module.exports.strOptions = opt.strOptions
 module.exports.stringify = require('./dist/stringify').stringifyString
 
-require('./dist/deprecation').warnFileDeprecation(__filename)
+require('./dist/warnings').warnFileDeprecation(__filename)

package/seq.js

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

package/types/binary.js

@@ -4,4 +4,4 @@ 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)
+require('../dist/warnings').warnFileDeprecation(__filename)

package/types/omap.js

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

package/types/pairs.js

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

package/types/set.js

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

package/types/timestamp.js

@@ -7,4 +7,4 @@ exports.floatTime = ts.floatTime
 exports.intTime = ts.intTime
 exports.timestamp = ts.timestamp
 
-require('../dist/deprecation').warnFileDeprecation(__filename)
+require('../dist/warnings').warnFileDeprecation(__filename)

package/types.mjs

@@ -0,0 +1,20 @@
+import opt from './dist/tags/options.js'
+export const binaryOptions = opt.binaryOptions
+export const boolOptions = opt.boolOptions
+export const nullOptions = opt.nullOptions
+export const strOptions = opt.strOptions
+
+import schema from './dist/schema/index.js'
+export const Schema = schema.default
+
+import map from './dist/schema/Map.js'
+export const YAMLMap = map.default
+
+import seq from './dist/schema/Seq.js'
+export const YAMLSeq = seq.default
+
+import pair from './dist/schema/Pair.js'
+export const Pair = pair.default
+
+import scalar from './dist/schema/Scalar.js'
+export const Scalar = scalar.default

package/util.mjs

@@ -0,0 +1,24 @@
+import map from './dist/schema/Map.js'
+export const findPair = map.findPair
+
+import parseMapPkg from './dist/schema/parseMap.js'
+export const parseMap = parseMapPkg.default
+
+import parseSeqPkg from './dist/schema/parseSeq.js'
+export const parseSeq = parseSeqPkg.default
+
+import str from './dist/stringify.js'
+export const stringifyNumber = str.stringifyNumber
+export const stringifyString = str.stringifyString
+
+import toJsonPkg from './dist/toJSON.js'
+export const toJSON = toJsonPkg.default
+
+import constants from './dist/constants.js'
+export const Type = constants.Type
+
+import err from './dist/errors.js'
+export const YAMLReferenceError = err.YAMLReferenceError
+export const YAMLSemanticError = err.YAMLSemanticError
+export const YAMLSyntaxError = err.YAMLSyntaxError
+export const YAMLWarning = err.YAMLWarning

package/browser/dist/cst/getLinePos.js

@@ -1,79 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = getLinePos;
-
-function findLineStarts(src) {
-  var ls = [0];
-  var offset = src.indexOf('\n');
-
-  while (offset !== -1) {
-    offset += 1;
-    ls.push(offset);
-    offset = src.indexOf('\n', offset);
-  }
-
-  return ls;
-}
-/**
- * Determine the line/col position matching a character offset.
- *
- * Accepts a source string or a CST document as the second parameter. With
- * the latter, starting indices for lines are cached in the document as
- * `lineStarts: number[]`.
- *
- * Returns a one-indexed `{ line, col }` location if found, or
- * `undefined` otherwise.
- *
- * @param {number} offset
- * @param {string|Document|Document[]} cst
- * @returns {{ line: number, col: number }|undefined}
- */
-
-
-function getLinePos(offset, cst) {
-  if (typeof offset === 'number' && offset >= 0) {
-    var lineStarts, srcLength;
-
-    if (typeof cst === 'string') {
-      lineStarts = findLineStarts(cst);
-      srcLength = cst.length;
-    } else {
-      if (Array.isArray(cst)) cst = cst[0];
-
-      if (cst) {
-        if (!cst.lineStarts) cst.lineStarts = findLineStarts(cst.context.src);
-        lineStarts = cst.lineStarts;
-        srcLength = cst.context.src.length;
-      }
-    }
-
-    if (lineStarts && offset <= srcLength) {
-      for (var i = 0; i < lineStarts.length; ++i) {
-        var start = lineStarts[i];
-
-        if (offset < start) {
-          return {
-            line: i,
-            col: offset - lineStarts[i - 1] + 1
-          };
-        }
-
-        if (offset === start) return {
-          line: i + 1,
-          col: 1
-        };
-      }
-
-      var line = lineStarts.length;
-      return {
-        line: line,
-        col: offset - lineStarts[line - 1] + 1
-      };
-    }
-  }
-
-  return undefined;
-}

package/browser/dist/deprecation.js

@@ -1,34 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.warnFileDeprecation = warnFileDeprecation;
-exports.warnOptionDeprecation = warnOptionDeprecation;
-
-/* global global, console */
-function warn(msg) {
-  if (global && global.process && global.process.emitWarning) {
-    global.process.emitWarning(msg, 'DeprecationWarning');
-  } else {
-    // eslint-disable-next-line no-console
-    console.warn("DeprecationWarning: ".concat(msg));
-  }
-}
-
-function warnFileDeprecation(filename) {
-  if (global && global._YAML_SILENCE_DEPRECATION_WARNINGS) return;
-  var path = filename.replace(/.*yaml[/\\]/i, '').replace(/\.js$/, '').replace(/\\/g, '/');
-  warn("The endpoint 'yaml/".concat(path, "' will be removed in a future release."));
-}
-
-var warned = {};
-
-function warnOptionDeprecation(name, alternative) {
-  if (global && global._YAML_SILENCE_DEPRECATION_WARNINGS) return;
-  if (warned[name]) return;
-  warned[name] = true;
-  var msg = "The option '".concat(name, "' will be removed in a future release");
-  msg += alternative ? ", use '".concat(alternative, "' instead.") : '.';
-  warn(msg);
-}

package/dist/cst/getLinePos.js

@@ -1,79 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = getLinePos;
-
-function findLineStarts(src) {
-  const ls = [0];
-  let offset = src.indexOf('\n');
-
-  while (offset !== -1) {
-    offset += 1;
-    ls.push(offset);
-    offset = src.indexOf('\n', offset);
-  }
-
-  return ls;
-}
-/**
- * Determine the line/col position matching a character offset.
- *
- * Accepts a source string or a CST document as the second parameter. With
- * the latter, starting indices for lines are cached in the document as
- * `lineStarts: number[]`.
- *
- * Returns a one-indexed `{ line, col }` location if found, or
- * `undefined` otherwise.
- *
- * @param {number} offset
- * @param {string|Document|Document[]} cst
- * @returns {{ line: number, col: number }|undefined}
- */
-
-
-function getLinePos(offset, cst) {
-  if (typeof offset === 'number' && offset >= 0) {
-    let lineStarts, srcLength;
-
-    if (typeof cst === 'string') {
-      lineStarts = findLineStarts(cst);
-      srcLength = cst.length;
-    } else {
-      if (Array.isArray(cst)) cst = cst[0];
-
-      if (cst) {
-        if (!cst.lineStarts) cst.lineStarts = findLineStarts(cst.context.src);
-        lineStarts = cst.lineStarts;
-        srcLength = cst.context.src.length;
-      }
-    }
-
-    if (lineStarts && offset <= srcLength) {
-      for (let i = 0; i < lineStarts.length; ++i) {
-        const start = lineStarts[i];
-
-        if (offset < start) {
-          return {
-            line: i,
-            col: offset - lineStarts[i - 1] + 1
-          };
-        }
-
-        if (offset === start) return {
-          line: i + 1,
-          col: 1
-        };
-      }
-
-      const line = lineStarts.length;
-      return {
-        line,
-        col: offset - lineStarts[line - 1] + 1
-      };
-    }
-  }
-
-  return undefined;
-}