eslint-plugin-grouped-import 1.0.3 → 1.0.5

package/README.md

@@ -42,6 +42,52 @@ However, the rule checks if there exists a similar, more specific path in option
 If so, the import node will be sorted into the group with the more specific path.
 **Note**: imports with extensions, i.e. `.css`, will **ALWAYS** take precedence.
 
+If there is a relative option path in the config, the same precedence rule applies.
+Extension imports will be sorted into extension groups first, then the imports will be sorted according to the option paths.
+
+For example, with the config
+```json
+{
+  "relative": [
+    {
+      "path": "./"
+    }
+  ],
+  "landing": [
+    {
+      "path": "./landing"
+    }
+  ],
+  "images": [
+    {
+      "path": ".png"
+    }
+  ]
+}
+```
+
+and imports
+```js
+import Layout from './landing/Layout';
+import banner from './landing/banner.png';
+import data from './data.json';
+import landingData from './landing/data.json';
+```
+
+the plugin will group the imports thus:
+```js
+// landing
+import Layout from './landing/Layout';
+import landingData from './landing/data.json'
+
+// images
+import banner from './landing/banner.png';
+
+// relative
+import data from './data.json';
+;
+```
+
 The rule checks for 7 specific things which are described in the *Rule examples* section
 
 ## Rule examples

package/lib/grouped-imports.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ruleMessages = void 0;
 const lodash_1 = __importDefault(require("lodash"));
 exports.ruleMessages = {
     noComments: 'Imports must be accompanied by comments',
@@ -226,17 +227,28 @@ const getImportsByGroup = (options, allOptionsPaths, importNodes) => {
     return lodash_1.default.reduce(options, (acc, option, key) => {
         const groupPaths = lodash_1.default.map(option, o => o.path);
         const filteredImports = lodash_1.default.filter(importNodes, (node) => {
-            return lodash_1.default.some(groupPaths, (groupPath) => {
-                // check if there's a more specific path in option values
-                const similarOptionValue = lodash_1.default.find(allOptionsPaths, optionValue => lodash_1.default.includes(optionValue, groupPath) && optionValue !== groupPath);
+            const isCurrentNodeInGroupAndPath = (lodash_1.default.includes(allOptionsPaths, node.source.value) && !lodash_1.default.includes(groupPaths, node.source.value));
+            return !isCurrentNodeInGroupAndPath && lodash_1.default.some(groupPaths, (groupPath) => {
                 const importValue = node.source.value;
-                const regularImport = lodash_1.default.includes(importValue, groupPath);
-                const similarImport = lodash_1.default.includes(importValue, similarOptionValue) ||
-                    (/\.\w/gi.test(importValue) && !/\.\w/gi.test(groupPath));
-                return regularImport && !similarImport;
+                const groupedImport = lodash_1.default.includes(importValue, groupPath);
+                // check if there's a more specific path in option values
+                const moreSpecificOptionPath = lodash_1.default.find(allOptionsPaths, optionValue => lodash_1.default.includes(optionValue, groupPath) && optionValue !== groupPath && lodash_1.default.includes(importValue, optionValue));
+                const importWithExtension = (/\.\w/gi).test(importValue);
+                if (importWithExtension && groupedImport) {
+                    // check if there's a more specific option path with extension
+                    const moreSpecificExtensionPath = lodash_1.default.find(allOptionsPaths, (optionValue) => {
+                        // if the option path has an extension, check if it corresponds to the import value extension
+                        const isExtensionOptionPath = (/\.\w/gi).test(optionValue);
+                        const notCurrentGroupPath = groupPath !== optionValue;
+                        const importValInOptionPath = lodash_1.default.includes(importValue, optionValue);
+                        return isExtensionOptionPath && notCurrentGroupPath && importValInOptionPath;
+                    });
+                    return groupedImport && !Boolean(moreSpecificExtensionPath) && !Boolean(moreSpecificOptionPath);
+                }
+                return groupedImport && !Boolean(moreSpecificOptionPath);
             });
         });
-        return Object.assign({}, acc, { [key]: filteredImports });
+        return Object.assign(Object.assign({}, acc), { [key]: filteredImports });
     }, {});
 };
 const composeNewCodeLines = (lines, lasCommentLine, lastImportLine) => (newLines, index, excludeLineNumbers) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-grouped-import",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Group imports based on the import path",
   "main": "lib/index.js",
   "scripts": {
@@ -25,14 +25,13 @@
   "repository": "github:kairome/eslint-plugin-grouped-import",
   "devDependencies": {
     "@types/eslint": "^4.16.6",
-    "@types/lodash": "^4.14.155",
     "@types/node": "^11.10.4",
     "@typescript-eslint/parser": "^1.4.2",
     "eslint": "^7.32.0",
     "jest": "^23.6.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.21",
     "ts-jest": "^23.10.4",
-    "typescript": "~3.4.0"
+    "typescript": "^4.9.5"
   },
   "peerDependencies": {
     "eslint": "^5.0.0 || ^7.0.0"