Make export-name RegExp more strict

microsoft · Nov 5, 2018 · d014bc5 · d014bc5
1 parent 9b4180f
commit d014bc5
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/src/exportNameRule.ts b/src/exportNameRule.ts
@@ -157,7 +157,7 @@ export class ExportNameWalker extends Lint.RuleWalker {
 
     private validateExport(exportedName: string, node: ts.Node): void {
         const flags = Rule.getIgnoreCase(this.getOptions()) ? 'i' : '';
-        const regex: RegExp = new RegExp(exportedName + '..*', flags); // filename must be exported name plus any extension
+        const regex: RegExp = new RegExp(`^${exportedName}\\..+`, flags); // filename must be exported name plus any extension
         if (!regex.test(this.getFilename())) {
             if (!this.isSuppressed(exportedName)) {
                 const failureString: string = Rule.FAILURE_STRING + this.getSourceFile().fileName + ' and ' + exportedName;

diff --git a/src/tests/ExportNameRuleTests.ts b/src/tests/ExportNameRuleTests.ts
@@ -257,14 +257,28 @@ describe('exportNameRule', (): void => {
                 {
                     failure:
                         'The exported module or identifier name must match the file name. ' +
-                        'Found: test-data/ExportName/ExportNameRuleFailingTestInput2.tsx and ThisIsNotTheNameOfTheFile',
+                        'Found: test-data/ExportName/ExportNameRuleFailingTestInput2.tsx and ExportNameRuleFailingTestInput',
                     name: 'test-data/ExportName/ExportNameRuleFailingTestInput2.tsx',
                     ruleName: 'export-name',
                     startPosition: { character: 10, line: 2 }
                 }
             ]);
         });
 
+        it('for prefixed name', (): void => {
+            const inputFile: string = 'test-data/ExportName/PrefixedExpectedClassName.ts';
+            TestHelper.assertViolations(ruleName, inputFile, [
+                {
+                    failure:
+                        'The exported module or identifier name must match the file name. ' +
+                        'Found: test-data/ExportName/PrefixedExpectedClassName.ts and ExpectedClassName',
+                    name: 'test-data/ExportName/PrefixedExpectedClassName.ts',
+                    ruleName: 'export-name',
+                    startPosition: { character: 10, line: 2 }
+                }
+            ]);
+        });
+
         it('for conflicting name in namespace', (): void => {
             const inputScript: string = `
                 namespace com.example {

diff --git a/test-data/ExportName/ExportNameRuleFailingTestInput2.tsx b/test-data/ExportName/ExportNameRuleFailingTestInput2.tsx
@@ -1,2 +1,2 @@
-class ThisIsNotTheNameOfTheFile {}
-export = ThisIsNotTheNameOfTheFile; // does not match filename
+class ExportNameRuleFailingTestInput {}
+export = ExportNameRuleFailingTestInput; // does not match filename
diff --git a/test-data/ExportName/ExportNameRulePassingTestInput2.tsx b/test-data/ExportName/ExportNameRulePassingTestInput2.tsx
@@ -1,2 +1,2 @@
-class ExportNameRulePassingTestInput {}
-export = ExportNameRulePassingTestInput; // matches filename
+class ExportNameRulePassingTestInput2 {}
+export = ExportNameRulePassingTestInput2; // matches filename
diff --git a/tslint.json b/tslint.json
@@ -60,7 +60,7 @@
         "chai-prefer-contains-to-index-of": true,
         "chai-vague-errors": true,
         "encoding": true,
-        "export-name": true,
+        "export-name": [true, { "allow": ["^Rule$"] }],
         "function-name": true,
         "import-name": true,
         "informative-docs": true,