v3.3.4

.jscsrc

@@ -33,7 +33,6 @@
   "requireCommaBeforeLineBreak": true,
   "requireSpaceBeforeBinaryOperators": true,
   "requireSpaceAfterBinaryOperators": true,
-  "requireCamelCaseOrUpperCaseIdentifiers": true,
   "requireLineFeedAtFileEnd": true,
   "requireCapitalizedConstructors": true,
   "requireDotNotation": true,

CHANGELOG.md

@@ -11,10 +11,18 @@
 
 _Note: Gaps between patch versions are faulty/broken releases._
 
+## 3.3.4
+
+ * **Polish**
+  * Add istanbul `require` interop.
+ * **Bug Fix**
+  * Fix incorrect source map column tracking in specific scenarios.
+
 ## 3.3.3
 
- * **Bug Fix**
+ * **Polish**
   * Remap top level `this` to `undefined` instead of throwing an error.
+ * **Bug Fix**
   * Run `selfContained` transformer over the regenerator runtime when building `6to5-runtime`.
   * Fix `t.isReferenced` not properly allowing `value` nodes.
 

bin/6to5-node

@@ -5,7 +5,7 @@
  * when found, before invoking the "real" _6to5-node(1) executable.
  */
 
-var args  = ["--harmony", __dirname + "/_6to5-node"];
+var args  = [__dirname + "/_6to5-node"];
 
 process.argv.slice(2).forEach(function(arg){
   var flag = arg.split("=")[0];

lib/6to5/generation/index.js

@@ -179,7 +179,7 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
     newline(true);
 
     if (opts.before) opts.before();
-    this.map.mark(node, "start");
+    this.map.mark(node);
 
     this[node.type](node, this.buildPrint(node), parent);
 
@@ -189,7 +189,6 @@ CodeGenerator.prototype.print = function (node, parent, opts) {
     }
     if (needsParens) this.push(")");
 
-    this.map.mark(node, "end");
     if (opts.after) opts.after();
 
     newline(false);

lib/6to5/generation/source-map.js

@@ -30,7 +30,7 @@ SourceMap.prototype.get = function () {
   }
 };
 
-SourceMap.prototype.mark = function (node, type) {
+SourceMap.prototype.mark = function (node) {
   var loc = node.loc;
   if (!loc) return; // no location info
 
@@ -46,9 +46,7 @@ SourceMap.prototype.mark = function (node, type) {
     column: position.column
   };
 
-  var original = loc[type];
-
-  if (generated.line === original.line && generated.column === original.column) return; // nothing to map
+  var original = loc.start;
 
   map.addMapping({
     source: this.opts.sourceFileName,

lib/6to5/register.js

@@ -34,20 +34,14 @@ var cache = registerCache.get();
 var transformOpts = {};
 var ignoreRegex   = /node_modules/;
 var onlyRegex;
-var whitelist     = [];
 var exts          = {};
 var maps          = {};
-var old           = require.extensions[".js"];
 
 var mtime = function (filename) {
   return +fs.statSync(filename).mtime;
 };
 
-var loader = function (m, filename) {
-  if ((ignoreRegex && ignoreRegex.test(filename)) || (onlyRegex && !onlyRegex.test(filename))) {
-    return old.apply(this, arguments);
-  }
-
+var compile = function (filename) {
   var result;
 
   if (cache) {
@@ -57,11 +51,12 @@ var loader = function (m, filename) {
     }
   }
 
-  result = result || to5.transformFileSync(filename, extend({
-    whitelist: whitelist,
-    sourceMap: true,
-    ast:       false
-  }, transformOpts));
+  if (!result) {
+    result = to5.transformFileSync(filename, extend({
+      sourceMap: true,
+      ast:       false
+    }, transformOpts));
+  }
 
   if (cache) {
     result.mtime = mtime(filename);
@@ -70,7 +65,43 @@ var loader = function (m, filename) {
 
   maps[filename] = result.map;
 
-  m._compile(result.code, filename);
+  return result.code;
+};
+
+var shouldIgnore = function (filename) {
+  return (ignoreRegex && ignoreRegex.test(filename)) || (onlyRegex && !onlyRegex.test(filename));
+};
+
+var istanbulLoader = function (m, filename, old) {
+  // we need to monkey patch fs.readFileSync so we can hook into
+  // what istanbul gets, it's extremely dirty but it's the only way
+  var _readFileSync = fs.readFileSync;
+
+  fs.readFileSync = function () {
+    fs.readFileSync = _readFileSync;
+    return compile(filename);
+  };
+
+  old(m, filename);
+};
+
+var normalLoader = function (m, filename) {
+  m._compile(compile(filename), filename);
+};
+
+var registerExtension = function (ext) {
+  var old = require.extensions[ext];
+
+  var loader = normalLoader;
+  if (process.env.running_under_istanbul) loader = istanbulLoader; // jshint ignore:line
+
+  require.extensions[ext] = function (m, filename) {
+    if (shouldIgnore(filename)) {
+      old(m, filename);
+    } else {
+      loader(m, filename, old);
+    }
+  };
 };
 
 var hookExtensions = function (_exts) {
@@ -82,7 +113,7 @@ var hookExtensions = function (_exts) {
 
   each(_exts, function (ext) {
     exts[ext] = require.extensions[ext];
-    require.extensions[ext] = loader;
+    registerExtension(ext);
   });
 };
 

lib/6to5/transformation/transformers/index.js

@@ -12,7 +12,6 @@ module.exports = {
   "playground.objectGetterMemoization":    require("./playground/object-getter-memoization"),
 
   react:                                   require("./other/react"),
-  "optimisation.react":                    require("./optimisation/react"),
 
   _modules:                                require("./internal/modules"),
 

lib/6to5/transformation/transformers/optimisation/react/base.js

@@ -1,55 +0,0 @@
-module.exports = BaseOptimiser;
-
-var object = require("../../../../helpers/object");
-
-/**
- * Description
- *
- * @param {Node} node
- */
-
-function BaseOptimiser(node) {
-  this.methods = object();
-  this.types   = object();
-
-  this.node  = node;
-}
-
-/**
- * Description
- */
-
-BaseOptimiser.prototype.run = function () {
-  this.getMethods();
-  this.getTypes();
-};
-
-/**
- * Add an `ObjectExpression` `node` that contains `propTypes`.
- *
- * Search it and match it against the types that we can optimise
- * and register it for consumption later.
- *
- * @param {Node} node
- */
-
-BaseOptimiser.prototype.addPropTypes = function (node) {
-  var props = node.properties;
-
-  for (var i = 0; i < props.length; i++) {
-    this.addPropType(props[i]);
-  }
-};
-
-/**
- * Register a `Property` node as a prop type.
- *
- * We'll try and resolve it to a known type if we can and normalise
- * it for consumption later.
- *
- * @param {Node} prop
- */
-
-BaseOptimiser.prototype.addPropType = function () {
-
-};

lib/6to5/transformation/transformers/optimisation/react/create-class.js

@@ -1,51 +0,0 @@
-module.exports = CreateClassOptimiser;
-
-var BaseOptimiser = require("./base");
-var util          = require("../../../../util");
-var t             = require("../../../../types");
-
-function CreateClassOptimiser() {
-  BaseOptimiser.apply(this, arguments);
-}
-
-util.inherits(CreateClassOptimiser, BaseOptimiser);
-
-/**
- * Get all function expressions.
- */
-
-CreateClassOptimiser.prototype.getMethods = function () {
-  var props = this.node.properties;
-
-  for (var i = 0; i < props.length; i++) {
-    var prop = props[i];
-
-    // irrelevant
-    if (!t.isFunctionExpression(prop.value)) continue;
-
-    // deopt
-    if (prop.computed) continue;
-
-    this.methods[prop.key.name] = prop;
-  }
-};
-
-/**
- * Find a `propTypes` property.
- */
-
-CreateClassOptimiser.prototype.getTypes = function () {
-  var props = this.node.properties;
-
-  for (var i = 0; i < props.length; i++) {
-    var prop = props[i];
-    var key  = t.toComputedKey(prop, prop.key);
-
-    if (t.isLiteral(key, { value: "propTypes" }) && t.isObjectExpression(prop.value)) {
-      this.addPropTypes(prop.value);
-      return;
-    }
-  }
-
-  // not found
-};

lib/6to5/transformation/transformers/optimisation/react/index.js

@@ -1,17 +0,0 @@
-var CreateClassOptimiser = require("./create-class");
-var NativeClassOptimiser = require("./native-class");
-var react                = require("../../../helpers/react");
-
-exports.optional = true;
-
-exports.CallExpression = function (node) {
-  if (react.isCreateClass(node)) {
-    new CreateClassOptimiser(node.arguments[0]).run();
-  }
-};
-
-exports.CallExpression = function (node) {
-  if (react.isReactComponent(node.superClass)) {
-    new NativeClassOptimiser(node).run();
-  }
-};

lib/6to5/transformation/transformers/optimisation/react/native-class.js

@@ -1,42 +0,0 @@
-module.exports = NativeClassOptimiser;
-
-var BaseOptimiser = require("./base");
-var util          = require("../../../../util");
-var t             = require("../../../../types");
-
-function NativeClassOptimiser() {
-  BaseOptimiser.apply(this, arguments);
-}
-
-util.inherits(NativeClassOptimiser, BaseOptimiser);
-
-/**
- * Get all instance methods.
- */
-
-NativeClassOptimiser.prototype.getMethods = function () {
-  var body = this.node.body;
-
-  for (var i = 0; i < body.length; i++) {
-    var node = body[i];
-
-    // PrivateDeclaration etc
-    if (!t.isMethodDefinition(node)) continue;
-
-    // deopt
-    if (node.computed) continue;
-
-    // irrelevant
-    if (node.static) continue;
-
-    this.methods[node.key.name] = node;
-  }
-};
-
-/**
- * Description
- */
-
-NativeClassOptimiser.prototype.getTypes = function () {
-
-};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://6to5.org/",
   "repository": "6to5/6to5",

packages/6to5-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "6to5-runtime",
   "description": "6to5 selfContained runtime",
-  "version": "3.3.2",
+  "version": "3.3.3",
   "repository": "6to5/6to5",
   "author": "Sebastian McKenzie <sebmck@gmail.com>"
 }

test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/bar/bar.js

@@ -1,4 +1,4 @@
 "use strict";
 
 var Test = function Test() {};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9iYXIvYmFyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0lBQU0sSUFBSSxZQUFKLElBQUkiLCJmaWxlIjoic3JjL2Jhci9iYXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyJjbGFzcyBUZXN0IHtcblxufSJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9iYXIvYmFyLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0lBQU0sZ0JBQUEiLCJmaWxlIjoic3JjL2Jhci9iYXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyJjbGFzcyBUZXN0IHtcblxufSJdfQ==

test/fixtures/bin/6to5/dir --out-dir --source-maps-inline/out-files/lib/foo.js

@@ -3,4 +3,4 @@
 arr.map(function (x) {
   return x * MULTIPLIER;
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9mb28uanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQUEsQ0FBQztTQUFJLENBQUMsR0FBRyxVQUFVO0NBQUEsQ0FBQyxDQUFDIiwiZmlsZSI6InNyYy9mb28uanMiLCJzb3VyY2VzQ29udGVudCI6WyJhcnIubWFwKHggPT4geCAqIE1VTFRJUExJRVIpOyJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNyYy9mb28uanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxJQUFJLElBQUksVUFBQTtTQUFLLElBQUkiLCJmaWxlIjoic3JjL2Zvby5qcyIsInNvdXJjZXNDb250ZW50IjpbImFyci5tYXAoeCA9PiB4ICogTVVMVElQTElFUik7Il19

test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/bar/bar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["src/bar/bar.js"],"names":[],"mappings":";;IAAM,IAAI,YAAJ,IAAI","file":"src/bar/bar.js","sourcesContent":["class Test {\n\n}"]}
+{"version":3,"sources":["src/bar/bar.js"],"names":[],"mappings":";;IAAM,gBAAA","file":"src/bar/bar.js","sourcesContent":["class Test {\n\n}"]}

test/fixtures/bin/6to5/dir --out-dir --source-maps/out-files/lib/foo.js.map

@@ -1 +1 @@
-{"version":3,"sources":["src/foo.js"],"names":[],"mappings":";;AAAA,GAAG,CAAC,GAAG,CAAC,UAAA,CAAC;SAAI,CAAC,GAAG,UAAU;CAAA,CAAC,CAAC","file":"src/foo.js","sourcesContent":["arr.map(x => x * MULTIPLIER);"]}
+{"version":3,"sources":["src/foo.js"],"names":[],"mappings":";;AAAA,IAAI,IAAI,UAAA;SAAK,IAAI","file":"src/foo.js","sourcesContent":["arr.map(x => x * MULTIPLIER);"]}

test/fixtures/bin/6to5/filename --out-file --source-maps-inline/out-files/script2.js

@@ -4,4 +4,4 @@ arr.map(function (x) {
   return x * MULTIPLIER;
 });
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDO1NBQUksQ0FBQyxHQUFHLFVBQVU7Q0FBQSxDQUFDLENBQUMiLCJmaWxlIjoic2NyaXB0Mi5qcyIsInNvdXJjZXNDb250ZW50IjpbImFyci5tYXAoeCA9PiB4ICogTVVMVElQTElFUik7Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLElBQUksSUFBSSxVQUFBO1NBQUssSUFBSSIsImZpbGUiOiJzY3JpcHQyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0=

test/fixtures/bin/6to5/filenames --out-file --source-maps-inline/out-files/script3.js

@@ -7,5 +7,4 @@ arr.map(function (x) {
   return x * MULTIPLIER;
 });
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7SUFBTSxJQUFJLFlBQUosSUFBSTs7OztBQ0FWLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBQSxDQUFDO1NBQUksQ0FBQyxHQUFHLFVBQVU7Q0FBQSxDQUFDLENBQUMiLCJmaWxlIjoic2NyaXB0My5qcyIsInNvdXJjZXNDb250ZW50IjpbImNsYXNzIFRlc3Qge1xuXG59IiwiYXJyLm1hcCh4ID0+IHggKiBNVUxUSVBMSUVSKTsiXX0=
-
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNjcmlwdC5qcyIsInNjcmlwdDIuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7SUFBTSxnQkFBQTs7OztBQ0FOLElBQUksSUFBSSxVQUFBO1NBQUssSUFBSSIsImZpbGUiOiJzY3JpcHQzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiY2xhc3MgVGVzdCB7XG5cbn0iLCJhcnIubWFwKHggPT4geCAqIE1VTFRJUExJRVIpOyJdfQ==

test/fixtures/bin/6to5/filenames --out-file --source-maps/out-files/script3.js.map

@@ -1 +1 @@
-{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;IAAM,IAAI,YAAJ,IAAI;;;;ACAV,GAAG,CAAC,GAAG,CAAC,UAAA,CAAC;SAAI,CAAC,GAAG,UAAU;CAAA,CAAC,CAAC","file":"script3.js","sourcesContent":["class Test {\n\n}","arr.map(x => x * MULTIPLIER);"]}
+{"version":3,"sources":["script.js","script2.js"],"names":[],"mappings":";;IAAM,gBAAA;;;;ACAN,IAAI,IAAI,UAAA;SAAK,IAAI","file":"script3.js","sourcesContent":["class Test {\n\n}","arr.map(x => x * MULTIPLIER);"]}

test/fixtures/bin/6to5/stdin --out-file --source-maps/out-files/test.js.map

@@ -1 +1 @@
-{"version":3,"sources":["stdin"],"names":[],"mappings":";;AAAA,GAAG,CAAC,GAAG,CAAC,UAAA,CAAC;SAAI,CAAC,GAAG,CAAC;CAAA,CAAC,CAAC","file":"test.js","sourcesContent":["arr.map(x => x * x);"]}
+{"version":3,"sources":["stdin"],"names":[],"mappings":";;AAAA,IAAI,IAAI,UAAA;SAAK,IAAI","file":"test.js","sourcesContent":["arr.map(x => x * x);"]}

test/fixtures/bin/6to5/stdin --source-maps-inline/stdout.txt

@@ -4,4 +4,4 @@ arr.map(function (x) {
   return x * x;
 });
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZGluIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFBLENBQUM7U0FBSSxDQUFDLEdBQUcsQ0FBQztDQUFBLENBQUMsQ0FBQyIsImZpbGUiOiJzdGRvdXQiLCJzb3VyY2VzQ29udGVudCI6WyJhcnIubWFwKHggPT4geCAqIHgpOyJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInN0ZGluIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsSUFBSSxJQUFJLFVBQUE7U0FBSyxJQUFJIiwiZmlsZSI6InN0ZG91dCIsInNvdXJjZXNDb250ZW50IjpbImFyci5tYXAoeCA9PiB4ICogeCk7Il19

test/fixtures/transformation/source-maps/arrow-function/source-mappings.json

@@ -1,10 +1,10 @@
 [{
   "original": {
     "line": 1,
-    "column": 18
+    "column": 13
   },
   "generated": {
     "line": 4,
-    "column": 14
+    "column": 10
   }
 }]

test/fixtures/transformation/source-maps/full/source-map.json

@@ -3,6 +3,6 @@
   "file": "source-maps/full/expected.js",
   "sources": ["source-maps/full/actual.js"],
   "names": [],
-  "mappings": ";;AAAA,GAAG,CAAC,GAAG,CAAC,UAAA,CAAC;SAAI,CAAC,GAAG,CAAC;CAAA,CAAC,CAAC",
+  "mappings": ";;AAAA,IAAI,IAAI,UAAA;SAAK,IAAI",
   "sourcesContent": ["arr.map(x => x * x);"]
 }

test/fixtures/transformation/source-maps/inline/expected.js

@@ -3,4 +3,4 @@
 arr.map(function (x) {
   return x * x;
 });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNvdXJjZS1tYXBzL2lubGluZS9hY3R1YWwuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQUEsQ0FBQztTQUFJLENBQUMsR0FBRyxDQUFDO0NBQUEsQ0FBQyxDQUFDIiwiZmlsZSI6InNvdXJjZS1tYXBzL2lubGluZS9leHBlY3RlZC5qcyIsInNvdXJjZXNDb250ZW50IjpbImFyci5tYXAoeCA9PiB4ICogeCk7Il19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNvdXJjZS1tYXBzL2lubGluZS9hY3R1YWwuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxJQUFJLElBQUksVUFBQTtTQUFLLElBQUkiLCJmaWxlIjoic291cmNlLW1hcHMvaW5saW5lL2V4cGVjdGVkLmpzIiwic291cmNlc0NvbnRlbnQiOlsiYXJyLm1hcCh4ID0+IHggKiB4KTsiXX0=