Merge pull request #344 from javierbrea/release

Release v5.0.1

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 ### Removed
 ### BREAKING CHANGES
 
+## [5.0.1] - 2024-11-11
+
+- fix([#340](https://github.com/javierbrea/eslint-plugin-boundaries/issues/340)): Fix bug producing that target option had captured values from the target dependency when templating `${from}` property ([@DeyLak](https://github.com/DeyLak))
+
 ## [5.0.0] - 2024-11-05
 
 ### Changed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-boundaries",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Eslint plugin checking architecture boundaries between elements",
   "keywords": [
     "eslint",

sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.organization=javierbrea
 sonar.projectKey=javierbrea_eslint-plugin-boundaries
-sonar.projectVersion=5.0.0
+sonar.projectVersion=5.0.1
 
 sonar.javascript.file.suffixes=.js
 sonar.sourceEncoding=UTF-8

src/helpers/rules.js

@@ -137,7 +137,7 @@ function isMatchElementType(
   return isMatchElementKey(elementInfo, matcher, options, "type", elementsToCompareCapturedValues);
 }
 
-function getElementRules(elementInfo, options, mainKey) {
+function getElementRules(targetElement, options, mainKey, fromElement) {
   if (!options.rules) {
     return [];
   }
@@ -150,7 +150,7 @@ function getElementRules(elementInfo, options, mainKey) {
       };
     })
     .filter((rule) => {
-      return ruleMatch(rule[key], elementInfo, isMatchElementType, elementInfo).result;
+      return ruleMatch(rule[key], targetElement, isMatchElementType, fromElement).result;
     });
 }
 
@@ -172,10 +172,12 @@ function elementRulesAllowDependency({
   isMatch,
   rulesMainKey: mainKey,
 }) {
+  const targetElement = elementToGetRulesFrom(element, dependency, mainKey);
   const [result, report, ruleReport] = getElementRules(
-    elementToGetRulesFrom(element, dependency, mainKey),
+    targetElement,
     options,
     mainKey,
+    targetElement === element ? dependency : element,
   ).reduce(
     (allowed, rule) => {
       if (rule.disallow) {

test/rules/layered/entry-point.spec.js

@@ -0,0 +1,76 @@
+const { ENTRY_POINT: RULE } = require("../../../src/constants/rules");
+const { SETTINGS, createRuleTester, pathResolvers } = require("../../support/helpers");
+
+const rule = require(`../../../src/rules/${RULE}`);
+
+const { absoluteFilePath } = pathResolvers("layered");
+
+const settings = SETTINGS.layered;
+
+// https://github.com/javierbrea/eslint-plugin-boundaries/issues/340
+const options = [
+  {
+    // disallow all entry-points by default
+    default: "disallow",
+    rules: [
+      {
+        target: ["modules"],
+        allow: "**",
+      },
+      {
+        target: [
+          // Any element, except the same as target
+          ["modules", { elementName: "!(${from.elementName})" }],
+        ],
+        // Any file, except index.js
+        disallow: "!(index.js)",
+      },
+    ],
+  },
+];
+
+const ruleTester = createRuleTester(settings);
+
+ruleTester.run(RULE, rule, {
+  valid: [
+    // helper can be imported inside the same module
+    {
+      filename: absoluteFilePath("modules/module-a/components/ComponentA.js"),
+      code: "import { someHelper } from '../helpers.js'",
+      options,
+    },
+    // helper can be imported from the pubic module API, defined in index.js
+    {
+      filename: absoluteFilePath("modules/module-b/components/ComponentB.js"),
+      code: "import { someHelper } from 'modules/module-a'",
+      options,
+    },
+  ],
+  invalid: [
+    // Any other file than index.js can't be imported from other module
+    {
+      filename: absoluteFilePath("modules/module-b/components/ComponentB.js"),
+      code: "import { someHelper } from 'modules/module-a/helpers.js'",
+      options,
+      errors: [
+        {
+          message:
+            "The entry point 'helpers.js' is not allowed in elements of type 'modules' with elementName '!(module-a)'. Disallowed in rule 2",
+          type: "Literal",
+        },
+      ],
+    },
+    {
+      filename: absoluteFilePath("modules/module-b/components/ComponentB.js"),
+      code: "import { someHelper } from 'modules/module-a/components/ComponentA.js'",
+      options,
+      errors: [
+        {
+          message:
+            "The entry point 'components' is not allowed in elements of type 'modules' with elementName '!(module-a)'. Disallowed in rule 2",
+          type: "Literal",
+        },
+      ],
+    },
+  ],
+});

test/support/helpers.js

@@ -182,6 +182,22 @@ const SETTINGS = {
       },
     },
   },
+  layered: {
+    "boundaries/elements": [
+      {
+        type: "modules",
+        mode: "file",
+        pattern: ["modules/*/**", "modules/*.*"],
+        capture: ["elementName"],
+      },
+    ],
+    "import/resolver": {
+      "eslint-import-resolver-node": {},
+      [path.resolve(process.cwd(), "resolver-legacy-alias")]: {
+        modules: `./${codeFilePath("layered", "modules")}`,
+      },
+    },
+  },
 };
 
 const TYPESCRIPT_SETTINGS = {