v4.0.2

modularize the `sourceMapToComment` method

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2015 Sebastian McKenzie
+Copyright (c) 2014-2015 Sebastian McKenzie <sebmck@gmail.com>
 
 MIT License
 

Makefile

@@ -25,7 +25,7 @@ build:
 	node $(BROWSERIFY_CMD) -e lib/babel/polyfill.js >dist/polyfill.js
 	node $(UGLIFY_CMD) dist/polyfill.js >dist/polyfill.min.js
 
-	node $(BROWSERIFY_CMD) lib/babel/api/browser.js -s to5 >dist/babel.js
+	node $(BROWSERIFY_CMD) lib/babel/api/browser.js -s babel >dist/babel.js
 	node $(UGLIFY_CMD) dist/babel.js >dist/babel.min.js
 
 	node bin/babel-external-helpers >dist/external-helpers.js

bin/babel/file.js

@@ -1,10 +1,10 @@
-var sourceMap = require("source-map");
-var chokidar  = require("chokidar");
-var util2     = require("../../lib/babel/util");
-var path      = require("path");
-var util      = require("./util");
-var fs        = require("fs");
-var _         = require("lodash");
+var sourceMapToComment = require("source-map-to-comment");
+var sourceMap          = require("source-map");
+var chokidar           = require("chokidar");
+var path               = require("path");
+var util               = require("./util");
+var fs                 = require("fs");
+var _                  = require("lodash");
 
 module.exports = function (commander, filenames) {
   var results = [];
@@ -42,7 +42,7 @@ module.exports = function (commander, filenames) {
     });
 
     if (commander.sourceMapsInline || (!commander.outFile && commander.sourceMaps)) {
-      code += "\n" + util2.sourceMapToComment(map);
+      code += "\n" + sourceMapToComment(map);
     }
 
     return {

lib/babel/helpers/code-frame.js

@@ -1,6 +1,5 @@
 // syntax highlighting based on https://github.com/dominictarr/ansi-highlight by the fantastic Dominic Tarr
 
-var supportsColor = require("supports-color");
 var tokenize      = require("js-tokenizer");
 var chalk         = require("chalk");
 var util          = require("../util");
@@ -43,7 +42,7 @@ var highlight = function (text) {
 module.exports = function (lines, lineNumber, colNumber) {
   colNumber = Math.max(colNumber, 0);
 
-  if (supportsColor) {
+  if (chalk.supportsColor) {
     lines = highlight(lines);
   }
 

lib/babel/helpers/levenshtein.js

@@ -1,38 +0,0 @@
-// taken from stackoverflow, it's crap i know.
-
-module.exports = function (a, b) {
-  if (a.length === 0) return b.length;
-  if (b.length === 0) return a.length;
-
-  var matrix = [];
-
-  // increment along the first column of each row
-  var i;
-  for (i = 0; i <= b.length; i++) {
-    matrix[i] = [i];
-  }
-
-  // increment each column in the first row
-  var j;
-  for (j = 0; j <= a.length; j++) {
-    matrix[0][j] = j;
-  }
-
-  // Fill in the rest of the matrix
-  for (i = 1; i <= b.length; i++) {
-    for (j = 1; j <= a.length; j++) {
-      if (b.charAt(i - 1) == a.charAt(j - 1)) {
-        matrix[i][j] = matrix[i - 1][j - 1];
-      } else {
-        matrix[i][j] = Math.min(
-          matrix[i - 1][j - 1] + 1, // substitution
-          Math.min(
-            matrix[i][j - 1] + 1, // insertion
-            matrix[i - 1][j] + 1) // deletion
-          );
-      }
-    }
-  }
-
-  return matrix[b.length][a.length];
-};

lib/babel/messages.js

@@ -9,7 +9,7 @@ exports.messages = {
   scopeDuplicateDeclaration: "Duplicate declaration $1",
   undeclaredVariable: "Reference to undeclared variable $1",
   undeclaredVariableSuggestion: "Reference to undeclared variable $1 - did you mean $2?",
-  settersInvalidParamLength: "Setters must have only one parameter",
+  settersInvalidParamLength: "Setters must have exactly one parameter",
   noAssignmentsInForHead: "No assignments allowed in for-in/of head",
   expectedMemberExpressionOrIdentifier: "Expected type MemeberExpression or Identifier",
   invalidParentForThisNode: "We don't know how to handle this node within the current parent - please open an issue",

lib/babel/transformation/file.js

@@ -4,18 +4,19 @@ module.exports = File;
 
 var SHEBANG_REGEX = /^\#\!.*/;
 
-var isFunction = require("lodash/lang/isFunction");
-var transform  = require("./index");
-var generate   = require("../generation");
-var defaults   = require("lodash/object/defaults");
-var includes   = require("lodash/collection/includes");
-var clone      = require("../helpers/clone");
-var parse      = require("../helpers/parse");
-var Scope      = require("../traversal/scope");
-var util       = require("../util");
-var path       = require("path");
-var each       = require("lodash/collection/each");
-var t          = require("../types");
+var sourceMapToComment = require("source-map-to-comment");
+var isFunction         = require("lodash/lang/isFunction");
+var transform          = require("./index");
+var generate           = require("../generation");
+var defaults           = require("lodash/object/defaults");
+var includes           = require("lodash/collection/includes");
+var clone              = require("../helpers/clone");
+var parse              = require("../helpers/parse");
+var Scope              = require("../traversal/scope");
+var util               = require("../util");
+var path               = require("path");
+var each               = require("lodash/collection/each");
+var t                  = require("../types");
 
 function File(opts) {
   this.dynamicImportedNoDefault = [];
@@ -454,7 +455,7 @@ File.prototype.generate = function () {
   }
 
   if (opts.sourceMap === "inline") {
-    result.code += "\n" + util.sourceMapToComment(result.map);
+    result.code += "\n" + sourceMapToComment(result.map);
     result.map = null;
   }
 

lib/babel/transformation/transformers/es6/properties.computed.js

@@ -51,7 +51,7 @@ var loose = function (node, body, objId) {
     body.push(t.expressionStatement(
       t.assignmentExpression(
         "=",
-        t.memberExpression(objId, prop.key, prop.computed),
+        t.memberExpression(objId, prop.key, prop.computed || t.isLiteral(prop.key)),
         prop.value
       )
     ));

lib/babel/transformation/transformers/validation/undeclared-variable-check.js

@@ -1,6 +1,6 @@
 "use strict";
 
-var levenshtein = require("../../../helpers/levenshtein");
+var levenshtein = require("leven");
 var messages    = require("../../../messages");
 var t           = require("../../../types");
 

lib/babel/util.js

@@ -76,12 +76,6 @@ exports.isAbsolute = function (loc) {
   return false;
 };
 
-exports.sourceMapToComment = function (map) {
-  var json = JSON.stringify(map);
-  var base64 = new Buffer(json).toString("base64");
-  return "//# sourceMappingURL=data:application/json;base64," + base64;
-};
-
 var templateVisitor = {
   enter: function (node, parent, scope, nodes) {
     if (t.isExpressionStatement(node)) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
@@ -41,38 +41,37 @@
     "acorn-babel": "0.11.1-32",
     "ast-types": "~0.6.1",
     "chalk": "^0.5.1",
-    "chokidar": "0.12.6",
-    "commander": "2.6.0",
+    "chokidar": "^0.12.6",
+    "commander": "^2.6.0",
     "core-js": "^0.5.4",
     "debug": "^2.1.1",
-    "detect-indent": "3.0.0",
-    "estraverse": "1.9.1",
-    "esutils": "1.1.6",
-    "fs-readdir-recursive": "0.1.0",
-    "globals": "^5.1.0",
-    "js-tokenizer": "1.3.3",
-    "lodash": "3.0.0",
-    "output-file-sync": "1.1.0",
-    "private": "0.1.6",
-    "regenerator-babel": "0.8.10-1",
-    "regexpu": "1.1.0",
-    "roadrunner": "1.0.4",
-    "source-map": "0.1.43",
-    "source-map-support": "0.2.9",
-    "supports-color": "1.2.0",
-    "useragent": "^2.1.5"
+    "detect-indent": "^3.0.0",
+    "estraverse": "^1.9.1",
+    "esutils": "^1.1.6",
+    "fs-readdir-recursive": "^0.1.0",
+    "globals": "^6.2.0",
+    "js-tokenizer": "^1.3.3",
+    "leven": "^1.0.1",
+    "lodash": "^3.2.0",
+    "output-file-sync": "^1.1.0",
+    "private": "^0.1.6",
+    "regenerator-babel": "0.8.10-2",
+    "regexpu": "^1.1.1",
+    "source-map": "^0.1.43",
+    "source-map-support": "^0.2.9",
+    "source-map-to-comment": "^1.0.0"
   },
   "devDependencies": {
-    "browserify": "8.1.1",
-    "chai": "1.10.0",
-    "esvalid": "1.1.0",
-    "istanbul": "0.3.5",
-    "jscs": "1.10.0",
-    "jshint": "2.6.0",
-    "jshint-stylish": "1.0.0",
-    "matcha": "0.6.0",
-    "mocha": "2.1.0",
-    "rimraf": "2.2.8",
-    "uglify-js": "2.4.16"
+    "browserify": "^8.1.3",
+    "chai": "^2.0.0",
+    "esvalid": "^1.1.0",
+    "istanbul": "^0.3.5",
+    "jscs": "^1.11.3",
+    "jshint": "^2.6.0",
+    "jshint-stylish": "^1.0.0",
+    "matcha": "^0.6.0",
+    "mocha": "^2.1.0",
+    "rimraf": "^2.2.8",
+    "uglify-js": "^2.4.16"
   }
 }

packages/babel-runtime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "babel-runtime",
   "description": "babel selfContained runtime",
-  "version": "3.6.5",
+  "version": "4.0.1",
   "repository": "babel/babel",
   "author": "Sebastian McKenzie <sebmck@gmail.com>"
-}
+}

test/fixtures/transformation/validation-setters/options.json

@@ -1,3 +1,3 @@
 {
-  "throws": "Setters must have only one parameter"
+  "throws": "Setters must have exactly one parameter"
 }