yaml 1.5.1 → 1.7.2

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.5.1",
+  "version": "1.7.2",
   "license": "ISC",
   "author": "Eemeli Aro <eemeli@gmail.com>",
   "repository": "github:eemeli/yaml",
@@ -38,6 +38,7 @@
   "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,7 +50,7 @@
     "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": {
@@ -66,24 +67,25 @@
     "singleQuote": true
   },
   "devDependencies": {
-    "@babel/cli": "^7.4.4",
-    "@babel/core": "^7.4.4",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/plugin-transform-runtime": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
-    "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.8.0",
+    "@babel/cli": "^7.6.4",
+    "@babel/core": "^7.6.4",
+    "@babel/plugin-proposal-class-properties": "^7.5.5",
+    "@babel/plugin-transform-runtime": "^7.6.2",
+    "@babel/preset-env": "^7.6.3",
+    "babel-eslint": "^10.0.3",
+    "babel-jest": "^24.9.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.2.0",
-    "eslint-plugin-prettier": "^3.0.1",
-    "fast-check": "^1.14.0",
-    "jest": "^24.8.0",
-    "prettier": "^1.17.0"
+    "eslint": "^6.5.1",
+    "eslint-config-prettier": "^6.4.0",
+    "eslint-plugin-prettier": "^3.1.1",
+    "fast-check": "^1.17.0",
+    "jest": "^24.9.0",
+    "prettier": "^1.18.2"
   },
   "dependencies": {
-    "@babel/runtime": "^7.4.4"
+    "@babel/runtime": "^7.6.3"
   },
   "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/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/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;
-}