prevent-abbreviations: Fix shorthand import/export detection (#1215)

sindresorhus · Apr 27, 2021 · a669e31 · a669e31
1 parent 1276db5
commit a669e31
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 7 deletions.
diff --git a/rules/utils/is-shorthand-export-identifier.js b/rules/utils/is-shorthand-export-identifier.js
@@ -1,6 +1,8 @@
 'use strict';
 
-module.exports = identifier =>
+const isShorthandExportIdentifier = identifier =>
 	identifier.parent.type === 'ExportSpecifier' &&
-	identifier.parent.exported.name === identifier.name &&
-	identifier.parent.local.name === identifier.name;
+	identifier.parent.exported === identifier &&
+	identifier.parent.local === identifier;
+
+module.exports = isShorthandExportIdentifier;
diff --git a/rules/utils/is-shorthand-import-identifier.js b/rules/utils/is-shorthand-import-identifier.js
@@ -1,6 +1,8 @@
 'use strict';
 
-module.exports = identifier =>
+const isShorthandImportIdentifier = identifier =>
 	identifier.parent.type === 'ImportSpecifier' &&
-	identifier.parent.imported.name === identifier.name &&
-	identifier.parent.local.name === identifier.name;
+	identifier.parent.imported === identifier &&
+	identifier.parent.local === identifier;
+
+module.exports = isShorthandImportIdentifier;
diff --git a/test/prevent-abbreviations.mjs b/test/prevent-abbreviations.mjs
@@ -1491,6 +1491,12 @@ runTest({
 			options: customOptions,
 			errors: createErrors()
 		},
+		{
+			code: 'import {err as err} from "err";',
+			output: 'import {err as error} from "err";',
+			options: customOptions,
+			errors: createErrors()
+		},
 		{
 			code: outdent`
 				import {
@@ -1588,6 +1594,18 @@ runTest({
 			errors: createErrors()
 		},
 
+		{
+			code: outdent`
+				let err;
+				export {err as err};
+			`,
+			output: outdent`
+				let error;
+				export {error as err};
+			`,
+			errors: createErrors()
+		},
+
 		noFixingTestCase({
 			code: 'export const err = {}',
 			errors: createErrors()
@@ -1773,7 +1791,24 @@ runTest.babel({
 			`,
 			options: checkPropertiesOptions,
 			errors: createErrors()
-		})
+		}),
+		{
+			code: 'import {err as err} from "err";//2',
+			output: 'import {err as error} from "err";//2',
+			options: customOptions,
+			errors: createErrors()
+		},
+		{
+			code: outdent`
+				let err;
+				export {err as err};//2
+			`,
+			output: outdent`
+				let error;
+				export {error as err};//2
+			`,
+			errors: createErrors()
+		}
 	]
 });
 
@@ -1880,6 +1915,24 @@ runTest.typescript({
 				export type PreloadProps<TExtraProperties = null> = {};
 			`,
 			errors: [...createErrors(), ...createErrors()]
+		},
+
+		{
+			code: 'import {err as err} from "err";//',
+			output: 'import {err as error} from "err";//',
+			options: customOptions,
+			errors: createErrors()
+		},
+		{
+			code: outdent`
+				let err;
+				export {err as err};//
+			`,
+			output: outdent`
+				let error;
+				export {error as err};//
+			`,
+			errors: createErrors()
 		}
 	]
 });