@dcoder-x/plugin-shared 0.1.12 → 0.1.13

package/dist/extractors/ComponentExtractor.js

@@ -24,14 +24,21 @@ class ComponentExtractor {
         // parent route happened to import them first.
         const fileRouteIndex = new Map();
         for (const route of this.routes) {
-            const relFwd = route.filePath.replace(/\\/g, '/');
-            fileRouteIndex.set(relFwd, route.path);
-            // Also index by just the basename-less relative path variations
             fileRouteIndex.set(route.filePath, route.path);
+            fileRouteIndex.set(route.filePath.replace(/\\/g, '/'), route.path);
+        }
+        // Stop the module walk at other route entry files — they will be
+        // processed in their own iteration with the correct route assigned.
+        const allRouteFiles = new Set();
+        for (const route of this.routes) {
+            allRouteFiles.add(route.filePath);
+            allRouteFiles.add(route.filePath.replace(/\\/g, '/'));
         }
         const seen = new Set(); // deduplicate across routes
         for (const route of this.routes) {
-            const moduleFiles = this.getModuleFilesForRoute(route.filePath);
+            // The stop boundary excludes the current entry file itself (we need to visit it).
+            const stopAt = new Set([...allRouteFiles].filter((f) => f !== route.filePath && f !== route.filePath.replace(/\\/g, '/')));
+            const moduleFiles = this.getModuleFilesForRoute(route.filePath, stopAt);
             for (const filePath of moduleFiles) {
                 if (seen.has(filePath))
                     continue;
@@ -62,9 +69,15 @@ class ComponentExtractor {
             fileRouteIndex.set(route.filePath, route.path);
             fileRouteIndex.set(route.filePath.replace(/\\/g, '/'), route.path);
         }
+        const allRouteFiles = new Set();
+        for (const route of this.routes) {
+            allRouteFiles.add(route.filePath);
+            allRouteFiles.add(route.filePath.replace(/\\/g, '/'));
+        }
         const seen = new Set();
         for (const route of this.routes) {
-            const moduleFiles = this.getModuleFilesForRoute(route.filePath);
+            const stopAt = new Set([...allRouteFiles].filter((f) => f !== route.filePath && f !== route.filePath.replace(/\\/g, '/')));
+            const moduleFiles = this.getModuleFilesForRoute(route.filePath, stopAt);
             for (const filePath of moduleFiles) {
                 if (seen.has(filePath))
                     continue;
@@ -121,15 +134,13 @@ class ComponentExtractor {
         }
         return components;
     }
-    getModuleFilesForRoute(entryFilePath) {
+    getModuleFilesForRoute(entryFilePath, stopAt) {
         if (this.source.type === 'webpack') {
-            return this.walkWebpackGraph(entryFilePath, this.source.compilation);
+            return this.walkWebpackGraph(entryFilePath, this.source.compilation, stopAt);
         }
-        return this.walkRollupGraph(entryFilePath, this.source.moduleGraph);
+        return this.walkRollupGraph(entryFilePath, this.source.moduleGraph, stopAt);
     }
-    walkWebpackGraph(entryFilePath, compilation) {
-        // Normalise to relative forward-slash paths so visited keys and injectedMap
-        // keys are consistent across macOS and Windows.
+    walkWebpackGraph(entryFilePath, compilation, stopAt) {
         const toRelFwd = (p) => path_1.default.isAbsolute(p)
             ? path_1.default.relative(process.cwd(), p).replace(/\\/g, '/')
             : p.replace(/\\/g, '/');
@@ -139,6 +150,9 @@ class ComponentExtractor {
             const current = queue.shift();
             if (visited.has(current))
                 continue;
+            // Stop recursing into other route entry files — they own their own walk.
+            if (stopAt && current !== toRelFwd(entryFilePath) && (stopAt.has(current) || stopAt.has(path_1.default.resolve(process.cwd(), current))))
+                continue;
             visited.add(current);
             const mod = this.findWebpackModule(compilation, current);
             let queuedFromWebpackGraph = false;
@@ -150,10 +164,7 @@ class ComponentExtractor {
                     }
                 }
             }
-            // Fallback for webpack variants where moduleGraph helpers are unavailable.
             if (!queuedFromWebpackGraph) {
-                // getFileImportPaths resolves to absolute paths via resolveImportFile;
-                // normalise them before queuing.
                 for (const depPath of this.getFileImportPaths(current)) {
                     if (depPath && !depPath.includes('node_modules')) {
                         queue.push(toRelFwd(depPath));
@@ -266,24 +277,25 @@ class ComponentExtractor {
         }
         return resolved;
     }
-    walkRollupGraph(entryFilePath, graph) {
-        // Normalise the entry to a relative forward-slash path so it matches the
-        // keys stored by ClippyVitePlugin (which also normalises to relative).
+    walkRollupGraph(entryFilePath, graph, stopAt) {
         const toRelFwd = (p) => path_1.default.isAbsolute(p)
             ? path_1.default.relative(process.cwd(), p).replace(/\\/g, '/')
             : p.replace(/\\/g, '/');
+        const entryKey = toRelFwd(entryFilePath);
         const visited = new Set();
-        const queue = [toRelFwd(entryFilePath)];
+        const queue = [entryKey];
         while (queue.length > 0) {
             const current = queue.shift();
             if (visited.has(current))
                 continue;
+            // Stop recursing into other route entry files — they own their own walk.
+            if (stopAt && current !== entryKey && (stopAt.has(current) || stopAt.has(path_1.default.resolve(process.cwd(), current))))
+                continue;
             visited.add(current);
             const mod = graph.get(current);
             if (!mod)
                 continue;
             for (const importId of mod.importedIds) {
-                // importedIds are already relative keys after the vite plugin normalised them
                 if (importId && !importId.includes('node_modules')) {
                     queue.push(toRelFwd(importId));
                 }

package/dist/extractors/RouteExtractor.js

@@ -194,16 +194,32 @@ class RouteExtractor {
         const expr = elementAttr.value?.expression;
         if (!expr)
             return null;
-        // Try each JSX component name in document order; first match in the import map wins.
-        // Wrapper components like <Can> or <RouteGuard> won't be in the map, so we fall
-        // through to the actual page component nested inside them.
+        // Collect all JSX component names in document order (outermost first, then
+        // children). For each, resolve via the import map, then pick the best candidate:
+        // a file under pages/ beats a wrapper/provider/layout/guard/context.
         const componentNames = this.collectJSXComponentNames(expr);
+        const candidates = [];
         for (const componentName of componentNames) {
             const resolved = importMap.get(componentName);
             if (resolved)
-                return resolved;
+                candidates.push(resolved);
         }
-        return null;
+        if (candidates.length === 0)
+            return null;
+        // Score: page files rank highest, known non-page patterns rank lowest.
+        const score = (filePath) => {
+            const p = filePath.replace(/\\/g, '/').toLowerCase();
+            if (p.includes('/pages/'))
+                return 3;
+            if (p.includes('/views/') || p.includes('/screens/'))
+                return 2;
+            // Wrappers, providers, guards, layouts, contexts are structural — not page components
+            if (/\/(contexts?|providers?|guards?|layouts?|wrappers?|hoc|utils?|helpers?)\//.test(p) ||
+                /(provider|context|guard|layout|redirect|catchall|catch-all)/.test(p))
+                return 0;
+            return 1;
+        };
+        return candidates.reduce((best, c) => (score(c) >= score(best) ? c : best));
     }
     collectJSXComponentNames(node) {
         if (!node)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcoder-x/plugin-shared",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "private": false,
   "main": "dist/index.js",
   "types": "dist/index.d.ts",