@nx/eslint-plugin 22.5.2 → 22.5.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint-plugin",
-  "version": "22.5.2",
+  "version": "22.5.3",
   "private": false,
   "description": "The eslint-plugin package is an ESLint plugin that contains a collection of recommended ESLint rule configurations which you can extend from in your own ESLint configs, as well as an Nx-specific lint rule called enforce-module-boundaries.",
   "repository": {
@@ -34,8 +34,8 @@
     }
   },
   "dependencies": {
-    "@nx/devkit": "22.5.2",
-    "@nx/js": "22.5.2",
+    "@nx/devkit": "22.5.3",
+    "@nx/js": "22.5.3",
     "@phenomnomnominal/tsquery": "~6.1.4",
     "@typescript-eslint/type-utils": "^8.0.0",
     "@typescript-eslint/utils": "^8.0.0",
@@ -47,7 +47,7 @@
     "tslib": "^2.3.0"
   },
   "devDependencies": {
-    "nx": "22.5.2"
+    "nx": "22.5.3"
   },
   "publishConfig": {
     "access": "public"

package/src/rules/enforce-module-boundaries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enforce-module-boundaries.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/enforce-module-boundaries.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAGL,aAAa,EAmBd,MAAM,6BAA6B,CAAC;AAGrC,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,cAAc,EAAE,aAAa,EAAE,CAAC;QAChC,6BAA6B,EAAE,OAAO,CAAC;QACvC,2BAA2B,EAAE,OAAO,CAAC;QACrC,2BAA2B,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACrD,kCAAkC,EAAE,MAAM,EAAE,CAAC;QAC7C,yBAAyB,EAAE,OAAO,CAAC;QACnC,0BAA0B,EAAE,OAAO,CAAC;KACrC;CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,4CAA4C,GAC5C,+BAA+B,GAC/B,4BAA4B,GAC5B,wBAAwB,GACxB,iBAAiB,GACjB,gBAAgB,GAChB,iCAAiC,GACjC,gCAAgC,GAChC,0CAA0C,GAC1C,gCAAgC,GAChC,sCAAsC,GACtC,0BAA0B,GAC1B,6BAA6B,GAC7B,kCAAkC,GAClC,4BAA4B,CAAC;AACjC,eAAO,MAAM,SAAS,8BAA8B,CAAC;;AAErD,wBAorBG"}
+{"version":3,"file":"enforce-module-boundaries.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint-plugin/src/rules/enforce-module-boundaries.ts"],"names":[],"mappings":"AAQA,OAAO,EAEL,WAAW,EAEZ,MAAM,0BAA0B,CAAC;AAiBlC,OAAO,EAGL,aAAa,EAmBd,MAAM,6BAA6B,CAAC;AAGrC,MAAM,MAAM,OAAO,GAAG;IACpB;QACE,KAAK,EAAE,MAAM,EAAE,CAAC;QAChB,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,cAAc,EAAE,aAAa,EAAE,CAAC;QAChC,6BAA6B,EAAE,OAAO,CAAC;QACvC,2BAA2B,EAAE,OAAO,CAAC;QACrC,2BAA2B,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;QACrD,kCAAkC,EAAE,MAAM,EAAE,CAAC;QAC7C,yBAAyB,EAAE,OAAO,CAAC;QACnC,0BAA0B,EAAE,OAAO,CAAC;KACrC;CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,4CAA4C,GAC5C,+BAA+B,GAC/B,4BAA4B,GAC5B,wBAAwB,GACxB,iBAAiB,GACjB,gBAAgB,GAChB,iCAAiC,GACjC,gCAAgC,GAChC,0CAA0C,GAC1C,gCAAgC,GAChC,sCAAsC,GACtC,0BAA0B,GAC1B,6BAA6B,GAC7B,kCAAkC,GAClC,4BAA4B,CAAC;AACjC,eAAO,MAAM,SAAS,8BAA8B,CAAC;;AAErD,wBAstBG"}

package/src/rules/enforce-module-boundaries.js

@@ -196,13 +196,37 @@ exports.default = utils_1.ESLintUtils.RuleCreator(() => `https://github.com/nrwl
                                 // process each potential entry point and try to find the imports
                                 const importsToRemap = [];
                                 for (const entryPointPath of indexTsPaths) {
+                                    // Resolve wildcard paths before passing to getRelativeImportPath
+                                    let resolvedPath = entryPointPath.path;
+                                    let targetImportScope = entryPointPath.importScope;
+                                    if (resolvedPath.includes('*')) {
+                                        // For wildcard paths resolve using the actual file path from the relative import
+                                        // Step 1: Resolve the relative import to an absolute path
+                                        // Example: imp='../../models/user', fileName='/root/libs/mylib/src/main.ts'
+                                        //          => absoluteImportPath='/root/libs/models/user'
+                                        const absoluteImportPath = (0, path_1.resolve)((0, path_1.dirname)(fileName), imp);
+                                        // Step 2: Get the path relative to project path (which is the workspace root in practice)
+                                        // Example: absoluteImportPath='/root/libs/models/user', projectPath='/root'
+                                        //          => workspaceRelativePath='libs/models/user'
+                                        const workspaceRelativePath = (0, devkit_1.normalizePath)((0, path_1.relative)(projectPath, absoluteImportPath));
+                                        // Step 3: Extract the dynamic part after the base path
+                                        // Example: resolvedPath='libs/models/*', workspaceRelativePath='libs/models/user'
+                                        //          => basePath='libs/models/', dynamicPart='user'
+                                        //          => resolvedPath='libs/models/user', targetImportScope='@myorg/models/user'
+                                        const basePath = resolvedPath.replace('*', '');
+                                        if (workspaceRelativePath.startsWith(basePath)) {
+                                            const dynamicPart = workspaceRelativePath.substring(basePath.length);
+                                            resolvedPath = resolvedPath.replace('*', dynamicPart);
+                                            targetImportScope = targetImportScope.replace('*', dynamicPart);
+                                        }
+                                    }
                                     for (const importMember of imports) {
-                                        const importPath = (0, ast_utils_1.getRelativeImportPath)(importMember, (0, path_1.join)(devkit_1.workspaceRoot, entryPointPath.path));
+                                        const importPath = (0, ast_utils_1.getRelativeImportPath)(importMember, (0, path_1.join)(devkit_1.workspaceRoot, resolvedPath));
                                         // we cannot remap, so leave it as is
                                         if (importPath) {
                                             importsToRemap.push({
                                                 member: importMember,
-                                                importPath: entryPointPath.importScope,
+                                                importPath: targetImportScope,
                                             });
                                         }
                                     }