eslint 1.4.1 → 1.5.1

package/lib/util/comment-event-generator.js

@@ -0,0 +1,116 @@
+/**
+ * @fileoverview The event generator for comments.
+ * @author Toru Nagashima
+ * @copyright 2015 Toru Nagashima. All rights reserved.
+ * See LICENSE file in root directory for full license.
+ */
+
+"use strict";
+
+//------------------------------------------------------------------------------
+// Helpers
+//------------------------------------------------------------------------------
+
+/**
+ * Check collection of comments to prevent double event for comment as
+ * leading and trailing, then emit event if passing
+ * @param {ASTNode[]} comments - Collection of comment nodes
+ * @param {EventEmitter} emitter - The event emitter which is the destination of events.
+ * @param {Object[]} locs - List of locations of previous comment nodes
+ * @param {string} eventName - Event name postfix
+ * @returns {void}
+ */
+function emitComments(comments, emitter, locs, eventName) {
+    if (comments.length > 0) {
+        comments.forEach(function(node) {
+            var index = locs.indexOf(node.loc);
+            if (index >= 0) {
+                locs.splice(index, 1);
+            } else {
+                locs.push(node.loc);
+                emitter.emit(node.type + eventName, node);
+            }
+        });
+    }
+}
+
+/**
+ * Shortcut to check and emit enter of comment nodes
+ * @param {CommentEventGenerator} generator - A generator to emit.
+ * @param {ASTNode[]} comments - Collection of comment nodes
+ * @returns {void}
+ */
+function emitCommentsEnter(generator, comments) {
+    emitComments(
+        comments,
+        generator.emitter,
+        generator.commentLocsEnter,
+        "Comment");
+}
+
+/**
+ * Shortcut to check and emit exit of comment nodes
+ * @param {CommentEventGenerator} generator - A generator to emit.
+ * @param {ASTNode[]} comments Collection of comment nodes
+ * @returns {void}
+ */
+function emitCommentsExit(generator, comments) {
+    emitComments(
+        comments,
+        generator.emitter,
+        generator.commentLocsExit,
+        "Comment:exit");
+}
+
+//------------------------------------------------------------------------------
+// Public Interface
+//------------------------------------------------------------------------------
+
+/**
+ * The event generator for comments.
+ * This is the decorator pattern.
+ * This generates events of comments before/after events which are generated the original generator.
+ *
+ * @param {EventGenerator} originalEventGenerator - An event generator which is the decoration target.
+ * @param {SourceCode} sourceCode - A source code which has comments.
+ * @returns {CommentEventGenerator} new instance.
+ */
+function CommentEventGenerator(originalEventGenerator, sourceCode) {
+    this.original = originalEventGenerator;
+    this.emitter = originalEventGenerator.emitter;
+    this.sourceCode = sourceCode;
+    this.commentLocsEnter = [];
+    this.commentLocsExit = [];
+}
+
+CommentEventGenerator.prototype = {
+    constructor: CommentEventGenerator,
+
+    /**
+     * Emits an event of entering comments.
+     * @param {ASTNode} node - A node which was entered.
+     * @returns {void}
+     */
+    enterNode: function enterNode(node) {
+        var comments = this.sourceCode.getComments(node);
+
+        emitCommentsEnter(this, comments.leading);
+        this.original.enterNode(node);
+        emitCommentsEnter(this, comments.trailing);
+    },
+
+    /**
+     * Emits an event of leaving comments.
+     * @param {ASTNode} node - A node which was left.
+     * @returns {void}
+     */
+    leaveNode: function leaveNode(node) {
+        var comments = this.sourceCode.getComments(node);
+
+        emitCommentsExit(this, comments.trailing);
+        this.original.leaveNode(node);
+        emitCommentsExit(this, comments.leading);
+    }
+};
+
+module.exports = CommentEventGenerator;

package/lib/util/node-event-generator.js

@@ -0,0 +1,55 @@
+/**
+ * @fileoverview The event generator for AST nodes.
+ * @author Toru Nagashima
+ * @copyright 2015 Toru Nagashima. All rights reserved.
+ * See LICENSE file in root directory for full license.
+ */
+
+"use strict";
+
+//------------------------------------------------------------------------------
+// Public Interface
+//------------------------------------------------------------------------------
+
+/**
+ * The event generator for AST nodes.
+ * This implements below interface.
+ *
+ * ```ts
+ * interface EventGenerator {
+ *     emitter: EventEmitter;
+ *     enterNode(node: ASTNode): void;
+ *     leaveNode(node: ASTNode): void;
+ * }
+ * ```
+ *
+ * @param {EventEmitter} emitter - An event emitter which is the destination of events.
+ * @returns {NodeEventGenerator} new instance.
+ */
+function NodeEventGenerator(emitter) {
+    this.emitter = emitter;
+}
+
+NodeEventGenerator.prototype = {
+    constructor: NodeEventGenerator,
+
+    /**
+     * Emits an event of entering AST node.
+     * @param {ASTNode} node - A node which was entered.
+     * @returns {void}
+     */
+    enterNode: function enterNode(node) {
+        this.emitter.emit(node.type, node);
+    },
+
+    /**
+     * Emits an event of leaving AST node.
+     * @param {ASTNode} node - A node which was left.
+     * @returns {void}
+     */
+    leaveNode: function leaveNode(node) {
+        this.emitter.emit(node.type + ":exit", node);
+    }
+};
+
+module.exports = NodeEventGenerator;

package/lib/util/source-code.js

@@ -115,12 +115,6 @@ function SourceCode(text, ast) {
      */
     this.lines = text.split(/\r\n|\r|\n|\u2028|\u2029/g);
 
-    /**
-     * Fixes to be made later on.
-     * @type Object[]
-     */
-    this._fixes = [];
-
     // create token store methods
     var tokenStore = createTokenStore(ast.tokens);
     Object.keys(tokenStore).forEach(function(methodName) {
@@ -259,8 +253,21 @@ SourceCode.prototype = {
         });
 
         return result;
-    }
+    },
 
+    /**
+     * Determines if two tokens have at least one whitespace character
+     * between them. This completely disregards comments in making the
+     * determination, so comments count as zero-length substrings.
+     * @param {Token} first The token to check after.
+     * @param {Token} second The token to check before.
+     * @returns {boolean} True if there is only space between tokens, false
+     *  if there is anything other than whitespace between tokens.
+     */
+    isSpaceBetweenTokens: function(first, second) {
+        var text = this.text.slice(first.range[1], second.range[0]);
+        return /\s/.test(text.replace(/\/\*.*?\*\//g, ""));
+    }
 };
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "1.4.1",
+  "version": "1.5.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {
@@ -38,7 +38,7 @@
     "chalk": "^1.0.0",
     "concat-stream": "^1.4.6",
     "debug": "^2.1.1",
-    "doctrine": "^0.6.2",
+    "doctrine": "^0.7.0",
     "escape-string-regexp": "^1.0.2",
     "escope": "^3.2.0",
     "espree": "^2.2.4",