Put breaking change from 1.3.0 behind a flag

Author: Stefan Lau

README.md

@@ -104,13 +104,30 @@ Now, in your code:
 export default function variableName;
 ```
 
+If you also want to match exported function calls you can use the third option (a boolean flag).
+
+```json
+"filenames/match-exported": [ 2, null, null, true ]
+```
+
+Now, in your code:
+
+```js
+// Considered problem only if file isn't named functionName.js or functionName/index.js
+export default functionName();
+```
+
 ### Don't allow index.js files (no-index)
 
 Having a bunch of `index.js` files can have negative influence on developer experience, e.g. when
 opening files by name. When enabling this rule. `index.js` files will always be considered a problem.
 
 ## Changelog
 
+#### 1.3.1
+
+- Put breaking change from `1.3.0` behind a flag
+
 #### 1.3.0
 
 - Support call expressions as named exports

lib/common/getExportedName.js

@@ -1,4 +1,4 @@
-function getNodeName(node) {
+function getNodeName(node, options) {
     if (node.type === "Identifier") {
         return node.name;
     }
@@ -7,18 +7,18 @@ function getNodeName(node) {
         return node.id.name;
     }
 
-    if (node.type === "CallExpression" && node.callee.type === "Identifier") {
+    if (options[2] && node.type === "CallExpression" && node.callee.type === "Identifier") {
       return node.callee.name;
     }
 }
 
-module.exports = function getExportedName(programNode) {
+module.exports = function getExportedName(programNode, options) {
     for (var i = 0; i < programNode.body.length; i += 1) {
         var node = programNode.body[i];
 
         // export default ...
         if (node.type === "ExportDefaultDeclaration") {
-            return getNodeName(node.declaration);
+            return getNodeName(node.declaration, options);
         }
 
         // module.exports = ...
@@ -30,7 +30,7 @@ module.exports = function getExportedName(programNode) {
             node.expression.left.property.type === "Identifier" &&
             node.expression.left.property.name === "exports"
         ) {
-            return getNodeName(node.expression.right);
+            return getNodeName(node.expression.right, options);
         }
     }
 };

lib/rules/match-exported.js

@@ -75,7 +75,7 @@ module.exports = function(context) {
                 absoluteFilename = path.resolve(filename),
                 parsed = parseFilename(absoluteFilename),
                 shouldIgnore = isIgnoredFilename(filename),
-                exportedName = getExportedName(node),
+                exportedName = getExportedName(node, context.options),
                 isExporting = Boolean(exportedName),
                 expectedExport = getStringToCheckAgainstExport(parsed, replacePattern),
                 transformedNames = transform(exportedName, transforms),
@@ -115,6 +115,9 @@ module.exports.schema = [
         ]
     },
     {
-        type: "string"
+        type: [ "string", "null" ]
+    },
+    {
+        type: [ "boolean", "null" ]
     }
 ];

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-filenames",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Eslint rule for consistent filenames.",
   "main": "index.js",
   "scripts": {
@@ -17,7 +17,6 @@
     "lodash.snakecase": "4.1.1",
     "lodash.upperfirst": "4.3.1"
   },
-
   "devDependencies": {
     "chai": "3.5.0",
     "coveralls": "2.13.0",

test/rules/match-exported.js

@@ -65,7 +65,7 @@ ruleTester.run("lib/rules/match-exported", exportedRule, {
         },
         {
             code: exportedCalledFunctionCode,
-            filename: "/some/dir/foo.js"
+            filename: "/some/dir/bar.js"
         },
         {
             code: exportedJsxFunctionCode,
@@ -152,13 +152,6 @@ ruleTester.run("lib/rules/match-exported", exportedRule, {
                 { message: "Filename 'bar' must match the exported name 'foo'.", column: 1, line: 1 }
             ]
         },
-        {
-            code: exportedCalledFunctionCode,
-            filename: "/some/dir/bar.js",
-            errors: [
-                { message: "Filename 'bar' must match the exported name 'foo'.", column: 1, line: 1 }
-            ]
-        },
         {
             code: exportedJsxFunctionCode,
             filename: "/some/dir/bar.js",
@@ -295,6 +288,11 @@ ruleTester.run("lib/rules/match-exported with configuration", exportedRule, {
             filename: "/some/dir/Foo.react.js",
             parserOptions: { ecmaVersion: 6, sourceType: "module", ecmaFeatures: { jsx: true } },
             options: [null, "\\.react$"]
+        },
+        {
+            code: exportedCalledFunctionCode,
+            filename: "/some/dir/foo.js",
+            options: [null, null, true]
         }
     ],
 
@@ -360,6 +358,14 @@ ruleTester.run("lib/rules/match-exported with configuration", exportedRule, {
             errors: [
                 { message: "The directory 'Foo.react' must be named 'Foo', after the exported value of its index file.", column: 1, line: 1 }
             ]
+        },
+        {
+            code: exportedCalledFunctionCode,
+            filename: "/some/dir/bar.js",
+            errors: [
+                { message: "Filename 'bar' must match the exported name 'foo'.", column: 1, line: 1 }
+            ],
+            options: [null, null, true]
         }
     ]
 });