babel-source 4.7.8 → 4.7.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTFkZmQ2ZDY4YzMwN2Q4NjNjY2ZlOGJjMzNjZTQ2ZDc3MTI3NWQ1OQ==
+    ZWVmZGQ1MDVhMjVmMGRkMTlkNTk5ZDI3YzMzMmUwZGU2MzIwMGQ5OQ==
   data.tar.gz: !binary |-
-    ZDRmMzdhMTE1ODMzY2FiMGRiZWI4Mjg4MDAzMGU5NmZlZjYwMmVmMA==
+    MWFhODgwNWY1MDllZmMyZGQ3NDQzYzg2NDk1Zjk1MjlmZTk0MDc0Ng==
 SHA512:
   metadata.gz: !binary |-
-    Y2RmMWI3Y2Q3NTk2MWFiZTdjMjU2YWZhZmFmZGQwY2M3OWYzOGVlNmE5YmIx
-    NzQ1MTJkNGIwZTFhMDlmOGE5MjQyMWFhZWRjMzNhY2JiYWUxNjUwNTUxOGRl
-    ODkyM2JjNTAxMjcxYTdjYjBjZWJlOTE0OWE2MWY0MTEwODkzNzA=
+    NjhiMGU3NmFjMjJiOTUyMmYzY2QwNzExNWY2NzE5MzliODZiMzI3YTI0NDdh
+    NDNlMTY4N2M2Njg3M2ViODMxNzU1NWI0ZDhmZGQxZTJhNTk4YzQ0MWVmNDVm
+    MmQxNjk4OWFhMDk2NDk2YmYxZDgxYWExYTc5NDRmN2I3MDAzZjc=
   data.tar.gz: !binary |-
-    MDI2OTE4Y2RiMmY1MjE1YzQwNzUzMDk0MTA2Mzk5ZDk1Mzk3M2VjY2EwOGRj
-    ZDMwMzIxOWU2NjY5MzZkNWNhMDRkYjkwY2IxZjRhYzRmMmJiNWEzMjU3MzM5
-    YjE1MzBmMzVjNjlmYzdmYTkyZDNjNmMzNDY1NGM0MTY0NTdmNDc=
+    M2Q3N2MwNzVkNDc3OGZhZDgzMjI4MzEwNDU2OTU5YWNmODVhMzI0NTYwYTEz
+    YWFiNWI5NjE1YTBkOTBkMzcyMTUxNTQyNjMwZmE5YjBmMzdlYTg0NjY3YzQ1
+    YmRlOGQwMDkzODUzZTQ4NTRkODNkMGE4ZDNmZDg5NzlhZDlmZDc=

data/lib/babel.js

@@ -3084,7 +3084,7 @@ var File = (function () {
       returnUsedHelpers: false,
       externalHelpers: false,
       auxilaryComment: "",
-      inputSourceMap: false,
+      inputSourceMap: null,
       experimental: false,
       reactCompat: false,
       playground: false,
@@ -3225,10 +3225,12 @@ var File = (function () {
   File.prototype.parseInputSourceMap = function parseInputSourceMap(code) {
     var opts = this.opts;
 
-    var inputMap = convertSourceMap.fromSource(code);
-    if (inputMap) {
-      opts.inputSourceMap = inputMap.toObject();
-      code = convertSourceMap.removeComments(code);
+    if (opts.inputSourceMap === false) {
+      var inputMap = convertSourceMap.fromSource(code);
+      if (inputMap) {
+        opts.inputSourceMap = inputMap.toObject();
+        code = convertSourceMap.removeComments(code);
+      }
     }
 
     return code;
@@ -4232,7 +4234,7 @@ function bare(node, parent, scope) {
   if (node.id) return node;
 
   var id;
-  if (t.isProperty(parent) && parent.kind === "init" && !parent.computed) {
+  if (t.isProperty(parent) && parent.kind === "init" && (!parent.computed || t.isLiteral(parent.key))) {
     // { foo() {} };
     id = parent.key;
   } else if (t.isVariableDeclarator(parent)) {
@@ -4242,9 +4244,16 @@ function bare(node, parent, scope) {
     return node;
   }
 
-  if (!t.isIdentifier(id)) return node;
+  var name;
+  if (t.isLiteral(id)) {
+    name = id.value;
+  } else if (t.isIdentifier(id)) {
+    name = id.name;
+  } else {
+    return;
+  }
 
-  var name = t.toIdentifier(id.name);
+  name = t.toIdentifier(name);
   id = t.identifier(name);
 
   var state = visit(node, name, scope);
@@ -6149,8 +6158,9 @@ function Loop(node, parent, scope, file) {
     t.ensureBlock(node);
     node.body._letDeclarators = [init];
   }
-  var blockScoping = new BlockScoping(node, node.body, parent, scope, file);
-  blockScoping.run();
+
+  var blockScoping = new BlockScoping(this, node.body, parent, scope, file);
+  return blockScoping.run();
 }
 
 function BlockStatement(block, parent, scope, file) {
@@ -6302,10 +6312,9 @@ var BlockScoping = (function () {
    * Description
    */
 
-  function BlockScoping(loopParent, block, parent, scope, file) {
+  function BlockScoping(loopPath, block, parent, scope, file) {
     _classCallCheck(this, BlockScoping);
 
-    this.loopParent = loopParent;
     this.parent = parent;
     this.scope = scope;
     this.block = block;
@@ -6315,6 +6324,12 @@ var BlockScoping = (function () {
     this.hasLetReferences = false;
     this.letReferences = block._letReferences = object();
     this.body = [];
+
+    if (loopPath) {
+      this.loopParent = loopPath.parent;
+      this.loopLabel = t.isLabeledStatement(this.loopParent) && this.loopParent.label;
+      this.loop = loopPath.node;
+    }
   }
 
   /**
@@ -6339,6 +6354,10 @@ var BlockScoping = (function () {
     } else {
       this.remap();
     }
+
+    if (this.loopLabel && !t.isLabeledStatement(this.loopParent)) {
+      return t.labeledStatement(this.loopLabel, this.loop);
+    }
   };
 
   /**
@@ -6377,11 +6396,11 @@ var BlockScoping = (function () {
 
     //
 
-    var loopParent = this.loopParent;
-    if (loopParent) {
-      traverseReplace(loopParent.right, loopParent, scope, remaps);
-      traverseReplace(loopParent.test, loopParent, scope, remaps);
-      traverseReplace(loopParent.update, loopParent, scope, remaps);
+    var loop = this.loop;
+    if (loop) {
+      traverseReplace(loop.right, loop, scope, remaps);
+      traverseReplace(loop.test, loop, scope, remaps);
+      traverseReplace(loop.update, loop, scope, remaps);
     }
 
     scope.traverse(this.block, replaceVisitor, remaps);
@@ -6397,7 +6416,7 @@ var BlockScoping = (function () {
     var outsideRefs = this.outsideLetReferences;
 
     // remap loop heads with colliding variables
-    if (this.loopParent) {
+    if (this.loop) {
       for (var name in outsideRefs) {
         var id = outsideRefs[name];
 
@@ -6518,7 +6537,7 @@ var BlockScoping = (function () {
       ignoreLabeless: false,
       innerLabels: [],
       hasReturn: false,
-      isLoop: !!this.loopParent,
+      isLoop: !!this.loop,
       map: {}
     };
 
@@ -6582,7 +6601,7 @@ var BlockScoping = (function () {
 
     body.push(t.variableDeclaration("var", [t.variableDeclarator(ret, call)]));
 
-    var loopParent = this.loopParent;
+    var loop = this.loop;
     var retCheck;
     var has = this.has;
     var cases = [];
@@ -6595,8 +6614,8 @@ var BlockScoping = (function () {
     }
 
     if (has.hasBreakContinue) {
-      if (!loopParent) {
-        throw new Error("Has no loop parent but we're trying to reassign breaks " + "and continues, something is going wrong here.");
+      if (!loop) {
+        throw new Error("Aren't in a loop and we're trying to reassign breaks and continues, something is going wrong here.");
       }
 
       for (var key in has.map) {
@@ -6611,6 +6630,16 @@ var BlockScoping = (function () {
         var single = cases[0];
         body.push(this.file.attachAuxiliaryComment(t.ifStatement(t.binaryExpression("===", ret, single.test), single.consequent[0])));
       } else {
+        // #998
+        for (var i = 0; i < cases.length; i++) {
+          var caseConsequent = cases[i].consequent[0];
+          if (t.isBreakStatement(caseConsequent) && !caseConsequent.label) {
+            var _ref;
+
+            caseConsequent.label = (_ref = this, !_ref.loopLabel && (_ref.loopLabel = this.file.scope.generateUidIdentifier("loop")), _ref.loopLabel);
+          }
+        }
+
         body.push(this.file.attachAuxiliaryComment(t.switchStatement(ret, cases)));
       }
     } else {
@@ -7561,11 +7590,8 @@ function ForOfStatement(node, parent, scope, file) {
   // todo: find out why this is necessary? #538
   loop._scopeInfo = node._scopeInfo;
 
-  if (build.replaceParent) {
-    this.parentPath.node = build.node;
-  } else {
-    return build.node;
-  }
+  if (build.replaceParent) this.parentPath.node = build.node;
+  return build.node;
 }
 
 var loose = function loose(node, parent, scope, file) {
@@ -17884,7 +17910,7 @@ switch(str.length){case 5:switch(str){case "break":case "catch":case "throw":cas
 
     expectRelational("<");
     while (!isRelational(">")) {
-      node.params.push(parseIdent());
+      node.params.push(parseTypeAnnotatableIdentifier());
       if (!isRelational(">")) {
         expect(_comma);
       }
@@ -22295,8 +22321,9 @@ Buffer.TYPED_ARRAY_SUPPORT = (function () {
  * By augmenting the instances, we can avoid modifying the `Uint8Array`
  * prototype.
  */
-function Buffer (subject, encoding, noZero) {
-  if (!(this instanceof Buffer)) return new Buffer(subject, encoding, noZero)
+function Buffer (subject, encoding) {
+  var self = this
+  if (!(self instanceof Buffer)) return new Buffer(subject, encoding)
 
   var type = typeof subject
   var length
@@ -22321,12 +22348,9 @@ function Buffer (subject, encoding, noZero) {
   if (length < 0) length = 0
   else length >>>= 0 // coerce to uint32
 
-  var self = this
   if (Buffer.TYPED_ARRAY_SUPPORT) {
     // Preferred: Return an augmented `Uint8Array` instance for best performance
-    /*eslint-disable consistent-this */
-    self = Buffer._augment(new Uint8Array(length))
-    /*eslint-enable consistent-this */
+    self = Buffer._augment(new Uint8Array(length)) // eslint-disable-line consistent-this
   } else {
     // Fallback: Return THIS instance of Buffer (created by `new`)
     self.length = length
@@ -22350,7 +22374,7 @@ function Buffer (subject, encoding, noZero) {
     }
   } else if (type === 'string') {
     self.write(subject, 0, encoding)
-  } else if (type === 'number' && !Buffer.TYPED_ARRAY_SUPPORT && !noZero) {
+  } else if (type === 'number' && !Buffer.TYPED_ARRAY_SUPPORT) {
     for (i = 0; i < length; i++) {
       self[i] = 0
     }
@@ -22361,10 +22385,10 @@ function Buffer (subject, encoding, noZero) {
   return self
 }
 
-function SlowBuffer (subject, encoding, noZero) {
-  if (!(this instanceof SlowBuffer)) return new SlowBuffer(subject, encoding, noZero)
+function SlowBuffer (subject, encoding) {
+  if (!(this instanceof SlowBuffer)) return new SlowBuffer(subject, encoding)
 
-  var buf = new Buffer(subject, encoding, noZero)
+  var buf = new Buffer(subject, encoding)
   delete buf.parent
   return buf
 }
@@ -22412,7 +22436,7 @@ Buffer.isEncoding = function isEncoding (encoding) {
 }
 
 Buffer.concat = function concat (list, totalLength) {
-  if (!isArray(list)) throw new TypeError('Usage: Buffer.concat(list[, length])')
+  if (!isArray(list)) throw new TypeError('list argument must be an Array of Buffers.')
 
   if (list.length === 0) {
     return new Buffer(0)
@@ -22805,7 +22829,7 @@ Buffer.prototype.slice = function slice (start, end) {
     newBuf = Buffer._augment(this.subarray(start, end))
   } else {
     var sliceLen = end - start
-    newBuf = new Buffer(sliceLen, undefined, true)
+    newBuf = new Buffer(sliceLen, undefined)
     for (var i = 0; i < sliceLen; i++) {
       newBuf[i] = this[i + start]
     }
@@ -27569,7 +27593,7 @@ module.exports = (function () {
 var fs = require('fs');
 var path = require('path');
 
-var commentRx = /^\s*\/(?:\/|\*)[@#]\s+sourceMappingURL=data:(?:application|text)\/json;(?:charset:\S+;)?base64,(.*)$/mg;
+var commentRx = /^\s*\/(?:\/|\*)[@#]\s+sourceMappingURL=data:(?:application|text)\/json;(?:charset[:=]\S+;)?base64,(.*)$/mg;
 var mapFileCommentRx =
   // //# sourceMappingURL=foo.js.map                       /*# sourceMappingURL=foo.js.map */
   /(?:\/\/[@#][ \t]+sourceMappingURL=(.+?)[ \t]*$)|(?:\/\*[@#][ \t]+sourceMappingURL=([^\*]+?)[ \t]*(?:\*\/){1}[ \t]*$)/mg
@@ -43926,12 +43950,16 @@ define(function (require, exports, module) {
     };
 
   /**
-   * Returns all generated line and column information for the original source
-   * and line provided. The only argument is an object with the following
-   * properties:
+   * Returns all generated line and column information for the original source,
+   * line, and column provided. If no column is provided, returns all mappings
+   * corresponding to a single line. Otherwise, returns all mappings
+   * corresponding to a single line and column.
+   *
+   * The only argument is an object with the following properties:
    *
    *   - source: The filename of the original source.
    *   - line: The line number in the original source.
+   *   - column: Optional. the column number in the original source.
    *
    * and an array of objects is returned, each with the following properties:
    *
@@ -43942,12 +43970,12 @@ define(function (require, exports, module) {
     function SourceMapConsumer_allGeneratedPositionsFor(aArgs) {
       // When there is no exact match, BasicSourceMapConsumer.prototype._findMapping
       // returns the index of the closest mapping less than the needle. By
-      // setting needle.originalColumn to Infinity, we thus find the last
-      // mapping for the given line, provided such a mapping exists.
+      // setting needle.originalColumn to 0, we thus find the last mapping for
+      // the given line, provided such a mapping exists.
       var needle = {
         source: util.getArg(aArgs, 'source'),
         originalLine: util.getArg(aArgs, 'line'),
-        originalColumn: 0
+        originalColumn: util.getArg(aArgs, 'column', 0)
       };
 
       if (this.sourceRoot != null) {
@@ -43964,11 +43992,15 @@ define(function (require, exports, module) {
                                     binarySearch.LEAST_UPPER_BOUND);
       if (index >= 0) {
         var mapping = this._originalMappings[index];
+        var originalLine = mapping.originalLine;
+        var originalColumn = mapping.originalColumn;
 
         // Iterate until either we run out of mappings, or we run into
         // a mapping for a different line. Since mappings are sorted, this is
         // guaranteed to find all mappings for the line we are searching for.
-        while (mapping && mapping.originalLine === needle.originalLine) {
+        while (mapping && mapping.originalLine === originalLine &&
+               (aArgs.column === undefined ||
+                mapping.originalColumn === originalColumn)) {
           mappings.push({
             line: util.getArg(mapping, 'generatedLine', null),
             column: util.getArg(mapping, 'generatedColumn', null),
@@ -44404,11 +44436,13 @@ define(function (require, exports, module) {
       if (index >= 0) {
         var mapping = this._originalMappings[index];
 
-        return {
-          line: util.getArg(mapping, 'generatedLine', null),
-          column: util.getArg(mapping, 'generatedColumn', null),
-          lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
-        };
+        if (mapping.source === needle.source) {
+          return {
+            line: util.getArg(mapping, 'generatedLine', null),
+            column: util.getArg(mapping, 'generatedColumn', null),
+            lastColumn: util.getArg(mapping, 'lastGeneratedColumn', null)
+          };
+        }
       }
 
       return {
@@ -46173,7 +46207,7 @@ module.exports = function (str) {
 module.exports={
   "name": "babel",
   "description": "Turn ES6 code into readable vanilla ES5 with source maps",
-  "version": "4.7.8",
+  "version": "4.7.9",
   "author": "Sebastian McKenzie <sebmck@gmail.com>",
   "homepage": "https://babeljs.io/",
   "repository": "babel/babel",
@@ -46208,7 +46242,7 @@ module.exports={
     "test": "make test"
   },
   "dependencies": {
-    "acorn-babel": "0.11.1-37",
+    "acorn-babel": "0.11.1-38",
     "ast-types": "~0.7.0",
     "chalk": "^1.0.0",
     "chokidar": "^0.12.6",

data/lib/babel/source.rb

@@ -1,7 +1,7 @@
 module Babel
   module Source
-    VERSION = "4.7.8"
-    DATE = Time.at(1426020594)
+    VERSION = "4.7.9"
+    DATE = Time.at(1426213814)
     PATH = File.expand_path("../..", __FILE__)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: babel-source
 version: !ruby/object:Gem::Version
-  version: 4.7.8
+  version: 4.7.9
 platform: ruby
 authors:
 - Sebastian McKenzie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: sebmck@gmail.com