rev-dep 0.2.1 → 0.3.0

package/cli.js

@@ -26,9 +26,10 @@ program
     '-tc, --typescriptConfig <path>',
     'path to TypeScript config to enable TS aliases support'
   )
-  .action((filePath, entryPoints, data) => {
+  .action(async (filePath, entryPoints, data) => {
     const { compactSummary, verbose, webpackConfig, typescriptConfig } = data
-    const results = find({
+
+    const results = await find({
       entryPoints,
       filePath,
       verbose,
@@ -54,13 +55,15 @@ program
     } else {
       results.forEach((entryPointResults, index) => {
         entryPointResults.forEach((path) => {
-          console.log(path.reduce(pathToString, ''))
+          console.log(path.reduce(pathToString, ''), '\n')
         })
         if (index < results.length - 1) {
           console.log('_'.repeat(process.stdout.columns))
         }
       })
     }
+
+
   })
 
 program.parse(process.argv)

package/find.js

@@ -1,5 +1,7 @@
 const path = require('path')
 const getDepsSet = require('./getDepsSet')
+const { parseDependencyTree } = require('dpdm');
+const escapeGlob = require('glob-escape');
 
 const buildTree = (deps) => (entryPoint) => {
   const inner = (path) => {
@@ -21,6 +23,39 @@ const buildTree = (deps) => (entryPoint) => {
   return inner(entryPoint)
 }
 
+const buildTreeDpdm = (_deps) => (entryPoint) => {
+
+  const deps = Object.entries(_deps).reduce((deps, [id, data]) => {
+    if (!id.includes('node_modules')) {
+      return Object.assign({}, deps, { [id]: data ? data.filter(({ id }) => id && !id.includes('node_modules')) : data })
+    }
+    return deps
+  }, {})
+
+  const inner = (path, visited = new Set()) => {
+    if (visited.has(path)) {
+      return {
+        path,
+        children: []
+      }
+    }
+    visited.add(path);
+    const dep = deps[path]
+    if (dep === undefined) {
+      throw new Error(`Dependency '${path}' not found!`)
+    }
+
+    return {
+      path,
+      children: (dep || [])
+        .map(d => d.id)
+        .filter(path => path && !path.includes('node_modules'))
+        .map((path) => inner(path, visited))
+    }
+  }
+  return inner(entryPoint)
+}
+
 const traverse = (file) => (tree) => {
   if (tree.path === file) {
     return [[file]]
@@ -40,7 +75,7 @@ const removeInitialDot = (path) => path.replace(/^\.\//, '')
 
 const _resolveAbsolutePath = (cwd) => (p) => typeof p === 'string' ? path.resolve(cwd, p) : p
 
-const find = ({
+const find = async ({
   entryPoints,
   filePath,
   skipRegex,
@@ -51,24 +86,26 @@ const find = ({
 }) => {
   const resolveAbsolutePath = _resolveAbsolutePath(cwd)
   const absoluteEntryPoints = entryPoints.map(resolveAbsolutePath)
+  const globEscapedEntryPoints = entryPoints.map(escapeGlob);
 
   if (verbose) {
     console.log('Entry points:')
     console.log(absoluteEntryPoints)
     console.log('Getting dependency set for entry points...')
   }
-  const deps = getDepsSet(
+  const deps = typescriptConfig ? await parseDependencyTree(globEscapedEntryPoints, { context: process.cwd() }) : getDepsSet(
     absoluteEntryPoints,
     skipRegex,
     resolveAbsolutePath(webpackConfig),
     resolveAbsolutePath(typescriptConfig)
   )
+
   const cleanedEntryPoints = entryPoints.map(removeInitialDot)
   const cleanedFilePath = removeInitialDot(filePath)
   if (verbose) {
     console.log('Building dependency trees for entry points...')
   }
-  const forest = cleanedEntryPoints.map(buildTree(deps))
+  const forest = cleanedEntryPoints.map(typescriptConfig ? buildTreeDpdm(deps) : buildTree(deps))
   if (verbose) {
     console.log('Finding paths in dependency trees...')
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rev-dep",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Reverse dependency resolution tool built with dependency-cruiser",
   "main": "find.js",
   "bin": "cli.js",
@@ -30,7 +30,9 @@
   },
   "dependencies": {
     "commander": "^6.1.0",
-    "dependency-cruiser": "9.23.0"
+    "dependency-cruiser": "9.23.0",
+    "dpdm": "^3.8.0",
+    "glob-escape": "^0.0.2"
   },
   "devDependencies": {
     "eslint": "^7.11.0",