fix: use "dir" as plugin key to have a consistent tree

Author: MrWook

lib/find-plugins.js

@@ -8,7 +8,7 @@ async function findPlugins (dir, options) {
   const { opts, prefix } = options
 
   const pluginTree = {
-    [prefix || '/']: { hooks: [], plugins: [] }
+    [dir]: { hooks: [], plugins: [] }
   }
 
   await buildTree(pluginTree, dir, { prefix, opts, depth: 0, hooks: [] })
@@ -18,8 +18,8 @@ async function findPlugins (dir, options) {
 
 async function buildTree (pluginTree, dir, { prefix, opts, depth, hooks }) {
   // check to see if hooks or plugins have been added to this prefix, initialize if not
-  if (!pluginTree[prefix]) {
-    pluginTree[prefix] = { hooks: [], plugins: [] }
+  if (!pluginTree[dir]) {
+    pluginTree[dir] = { hooks: [], plugins: [] }
   }
 
   const dirEntries = await readdir(dir, { withFileTypes: true })
@@ -47,6 +47,7 @@ function findCurrentDirHooks (pluginTree, { dir, dirEntries, hooks, opts, prefix
   let currentDirHooks = []
   // Hooks were passed in, create new array specific to this plugin item
   for (const hook of hooks) {
+    console.log(hook)
     currentDirHooks.push(hook)
   }
 
@@ -65,7 +66,7 @@ function findCurrentDirHooks (pluginTree, { dir, dirEntries, hooks, opts, prefix
     currentDirHooks.push({ file, type })
   }
 
-  pluginTree[prefix || '/'].hooks = currentDirHooks
+  pluginTree[dir].hooks = currentDirHooks
 
   return currentDirHooks
 }
@@ -78,7 +79,7 @@ function processIndexDirEntryIfExists (pluginTree, { opts, dirEntries, dir, pref
   const file = join(dir, indexDirEntry.name)
   const { language, type } = getScriptType(file, opts.packageType)
   handleTypeScriptSupport(file, language, true)
-  accumulatePlugin({ file, type, opts, pluginTree, prefix })
+  accumulatePlugin({ dir, file, type, opts, pluginTree, prefix })
 
   const hasNoDirectory = dirEntries.every((dirEntry) => !dirEntry.isDirectory())
 
@@ -98,7 +99,7 @@ async function processDirContents (pluginTree, { dirEntries, opts, indexDirEntry
     } else if (indexDirEntry) {
       // An index.js file is present in the directory so we ignore the others modules (but not the subdirectories)
     } else if (dirEntry.isFile() && opts.scriptPattern.test(dirEntry.name)) {
-      processFile(pluginTree, { file, opts, dirEntry, pluginTree, prefix })
+      processFile(pluginTree, { dir, file, opts, dirEntry, pluginTree, prefix })
     }
   }
 }
@@ -119,17 +120,17 @@ async function processDirectory (pluginTree, { prefix, opts, dirEntry, dir, file
   await buildTree(pluginTree, file, { opts, prefix: prefixBreadCrumb, depth: depth + 1, hooks })
 }
 
-function processFile (pluginTree, { file, opts, dirEntry, prefix }) {
+function processFile (pluginTree, { dir, file, opts, dirEntry, prefix }) {
   const { language, type } = getScriptType(file, opts.packageType)
   handleTypeScriptSupport(file, language)
 
   // Don't place hook in plugin queue
   if (!opts.autoHooksPattern.test(dirEntry.name)) {
-    accumulatePlugin({ file, type, opts, pluginTree, prefix })
+    accumulatePlugin({ dir, file, type, opts, pluginTree, prefix })
   }
 }
 
-function accumulatePlugin ({ file, type, opts, pluginTree, prefix }) {
+function accumulatePlugin ({ dir, file, type, opts, pluginTree, prefix }) {
   // Replace backward slash to forward slash for consistent behavior between windows and posix.
   const filePath = '/' + relative(opts.dir, file).replace(/\\/gu, '/')
   if (opts.matchFilter && !filterPath(filePath, opts.matchFilter)) {
@@ -140,7 +141,7 @@ function accumulatePlugin ({ file, type, opts, pluginTree, prefix }) {
     return
   }
 
-  pluginTree[prefix || '/'].plugins.push({ file, type, prefix })
+  pluginTree[dir].plugins.push({ file, type, prefix })
 }
 
 function handleTypeScriptSupport (file, language, isHook = false) {