eslint-plugin-fsd-paths-check 0.0.13 → 0.0.14

package/lib/helpers/getNormalizedProjectPath.js

@@ -0,0 +1,12 @@
+const {toNamespacedPath} = require("path");
+
+function getNormalizedProjectPath(fullPath) {
+    const fromNamespaced = toNamespacedPath(fullPath);
+    const fromNormalized = fromNamespaced.split(`\\`).join(`/`);
+
+    return fromNormalized.split(`src/`)[1];
+}
+
+module.exports = {
+    getNormalizedProjectPath
+};

package/lib/helpers/isSameModuleImport.js

@@ -1,5 +1,6 @@
 const { isPathRelative } = require("./isPathRelative");
 const path = require("path");
+const { getNormalizedProjectPath } = require("./getNormalizedProjectPath");
 
 function isSameModuleImport(from, to, fsdLayers, noSlicesLayers) {
     if(isPathRelative(to)) {
@@ -15,8 +16,7 @@ function isSameModuleImport(from, to, fsdLayers, noSlicesLayers) {
         return false;
     }
 
-    const fromNormalized = path.toNamespacedPath(from);
-    const fromProject = fromNormalized.split(`src/`)[1];
+    const fromProject = getNormalizedProjectPath(from)
 
     if(!fromProject) {
         return false;

package/lib/rules/enforce-public-api-imports.js

@@ -1,7 +1,6 @@
 "use strict";
 
 const { isPathRelative } = require("../helpers/isPathRelative");
-const path = require("path");
 const {isSameModuleImport} = require("../helpers/isSameModuleImport");
 
 const fsdLayers = {

package/lib/rules/enforce-relative-path-within-slice.js

@@ -2,6 +2,7 @@
 
 const path = require("path");
 const { isSameModuleImport } = require("../helpers/isSameModuleImport");
+const { getNormalizedProjectPath } = require("../helpers/getNormalizedProjectPath");
 
 const fsdLayers = {
   'shared': 'shared',
@@ -62,7 +63,7 @@ const importExportDeclaration = (context) => (node) => {
       node,
       messageId: `useRelativePathWithinSlice`,
       fix(fixer) {
-        const projectFromPath = getProjectPath(currentFile);
+        const projectFromPath = getNormalizedProjectPath(currentFile);
         const currentDir = path.dirname(projectFromPath);
         const relativePath = path.relative(currentDir, pathTo);
         const finalRelativePath = relativePath.startsWith(`.`) ? relativePath : `./${relativePath}`;
@@ -73,8 +74,4 @@ const importExportDeclaration = (context) => (node) => {
   }
 }
 
-function getProjectPath(fullPath) {
-  const fromNormalized = path.toNamespacedPath(fullPath);
 
-  return fromNormalized.split(`src/`)[1];
-}

package/lib/rules/forbid-imports-from-upper-slices.js

@@ -3,6 +3,7 @@
 const path = require("path");
 const {isPathRelative} = require("../helpers/isPathRelative");
 const micromatch = require("micromatch");
+const {getNormalizedProjectPath} = require("../helpers/getNormalizedProjectPath");
 
 const fsdLayers = {
   'shared': 'shared',
@@ -61,11 +62,10 @@ const importExportDeclaration = (context) => (node) => {
   const { alias = '', ignoreImportPatterns = [] } = context.options[0] ?? {};
 
   const getCurrentFileLayer = (currentFilePath) => {
-    const normalizedPath = path.toNamespacedPath(currentFilePath);
-    const projectPath = normalizedPath?.split('src')[1];
+    const projectPath = getNormalizedProjectPath(currentFilePath)
     const segments = projectPath?.split('/');
 
-    return segments?.[1];
+    return segments?.[0];
   }
 
   const getImportLayer = (value) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-fsd-paths-check",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "description": "Plugin to check feature sliced design paths correctness",
   "keywords": [
     "eslint",