@davidwells/extract-deps 0.0.6 → 0.0.8

package/examples/verify-basic.js

@@ -15,8 +15,6 @@ try {
   console.error(error.message)
 }
 
-console.log('foo')
-
 console.log('Verifying ESM fixture...')
 try {
   const graph = depGraph(esmFixture)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@davidwells/extract-deps",
-  "version": "0.0.6",
+  "version": "0.0.8",
   "description": "Get imports and requires from a codebase without AST",
   "main": "src/index.js",
   "exports": {

package/src/dep-graph.js

@@ -14,6 +14,14 @@ function fsExistsSync(path) {
   }
 }
 
+function isFileSync(filePath) {
+  try {
+    return fs.statSync(filePath).isFile()
+  } catch (error) {
+    return false
+  }
+}
+
 /**
  * Resolve a relative import to an actual file path
  * @param {string} baseDir - Directory containing the importing file
@@ -23,10 +31,10 @@ function fsExistsSync(path) {
 function resolveImportPath(baseDir, importPath) {
   const possibleExtensions = ['.js', '.mjs', '.ts', '.json', '']
 
-  // Try direct file resolution
+  // Try direct file resolution (must be a file, not directory)
   for (const ext of possibleExtensions) {
     const testPath = path.resolve(baseDir, importPath + ext)
-    if (fsExistsSync(testPath)) {
+    if (isFileSync(testPath)) {
       return testPath
     }
   }
@@ -124,16 +132,18 @@ function verifyImportedValuesExist(dep, targetDeps, targetPath, sourcePath, erro
  * @param {boolean} throwOnFirstError - Whether to throw immediately on first error
  * @param {boolean} verify - Whether to verify imports/exports
  * @param {boolean} verifyNodeModules - Whether to verify node_modules can be resolved
+ * @param {boolean} includeNodeModules - Whether to include node_modules in the graph
  * @param {Map<string, string[]>|null} graph - Optional map to collect dependency graph
  * @param {Set} visited - Set of already-visited file paths to avoid cycles
  */
 function buildGraphRecursively(
-  filePath, 
-  errors, 
-  throwOnFirstError, 
-  verify, 
-  verifyNodeModules, 
-  graph = null, 
+  filePath,
+  errors,
+  throwOnFirstError,
+  verify,
+  verifyNodeModules,
+  includeNodeModules,
+  graph = null,
   visited = new Set(),
 ) {
   // Avoid infinite loops
@@ -163,7 +173,7 @@ function buildGraphRecursively(
 
   // Collect all non-relative dependencies (node_modules)
   const nodeModuleDeps = []
-  if (verifyNodeModules) {
+  if (verifyNodeModules || includeNodeModules) {
     if (deps.requires && deps.requires.length > 0) {
       nodeModuleDeps.push(...deps.requires.filter(req => !req.isRelative))
     }
@@ -209,7 +219,14 @@ function buildGraphRecursively(
     }
 
     // Recursively process the imported file
-    buildGraphRecursively(resolvedPath, errors, throwOnFirstError, verify, verifyNodeModules, graph, visited)
+    buildGraphRecursively(resolvedPath, errors, throwOnFirstError, verify, verifyNodeModules, includeNodeModules, graph, visited)
+  }
+
+  // Add node_modules to graph if enabled
+  if (includeNodeModules && graph !== null) {
+    for (const dep of nodeModuleDeps) {
+      graph.get(normalizedPath).push(dep.from)
+    }
   }
 
   // Verify node_modules dependencies if enabled
@@ -247,20 +264,22 @@ function buildGraphRecursively(
  * @param {boolean} [options.buildGraph] - If true, build and return dependency graph. Default: true
  * @param {boolean} [options.verifyGraph] - If true, verify imports/exports. Default: true
  * @param {boolean} [options.verifyNodeModules] - If true, verify node_modules packages can be resolved. Default: false
+ * @param {boolean} [options.includeNodeModules] - If true, include node_modules package names in the graph. Default: false
  * @param {boolean} [options.throwOnFirstError] - If true, throw immediately on first error. Default: false
- * @returns {Map<string, string[]>|undefined} - Dependency graph where keys are file paths and values are arrays of dependency paths. Returns undefined if buildGraph is false.
+ * @returns {Map<string, string[]>|undefined} - Dependency graph where keys are file paths and values are arrays of dependency paths (or package names if includeNodeModules). Returns undefined if buildGraph is false.
  */
 function depGraph(filePath, options = {}) {
-  const { 
-    buildGraph = true, 
-    verifyGraph = true, 
-    verifyNodeModules = false, 
+  const {
+    buildGraph = true,
+    verifyGraph = true,
+    verifyNodeModules = false,
+    includeNodeModules = false,
     throwOnFirstError = false,
   } = options
   const errors = []
   const graph = buildGraph ? new Map() : null
 
-  buildGraphRecursively(filePath, errors, throwOnFirstError, verifyGraph, verifyNodeModules, graph)
+  buildGraphRecursively(filePath, errors, throwOnFirstError, verifyGraph, verifyNodeModules, includeNodeModules, graph)
 
   if (errors.length > 0) {
     const errorMessage = errors.map((err, idx) => `Dep graph error:\n ${err.message}`).join('\n')
@@ -323,7 +342,7 @@ function resolveDepPaths(filePath, options = {}) {
 if (require.main === module) {
   const entry = path.resolve(__dirname, '../tests/fixtures/cjs-deep-example/index.js')
   const graph = depGraph(entry, {
-    verifyNodeModules: false,
+    includeNodeModules: true,
     throwOnFirstError: true
   })
   console.log('graph', graph)

package/src/index.js

@@ -50,6 +50,19 @@ if (require.main === module) {
   }
   `
 
+  const code2 = `
+// Get users Lambda handler
+import _ from 'lodash'
+
+export async function handler(event, context) {
+  const data = { message: 'get function called' }
+  return {
+    statusCode: 200,
+    body: JSON.stringify(_.omit(data, [])),
+  }
+}
+  `
+
   const failCase = `
 const { test } = require('uvu')
 const assert = require('uvu/assert')
@@ -65,7 +78,7 @@ const config = await import('./config.js')
 const lerna = require('lerna')
 const { execSync, spawnSync } = require('child_process')
 `
-  const result = extractDeps(code)
+  const result = extractDeps(code2)
 
   const { imports, requires } = result
 

package/tests/dep-graph.test.js

@@ -355,4 +355,31 @@ module.exports = { missing1, missing2 }
   }
 })
 
+// Directory to index.js resolution tests
+const DIR_INDEX_FIXTURE_PATH = path.resolve(__dirname, './fixtures/dir-index-example/entry.js')
+
+test('should resolve directory import to index.js', () => {
+  const graph = depGraph(DIR_INDEX_FIXTURE_PATH)
+
+  assert.ok(graph instanceof Map, 'Should return a Map')
+  assert.ok(graph.size === 2, 'Graph should have 2 files (entry.js and shared-pkg/index.js)')
+
+  const entries = Array.from(graph.keys())
+  const hasEntry = entries.some(key => key.includes('entry.js'))
+  const hasIndex = entries.some(key => key.includes('shared-pkg/index.js'))
+
+  assert.ok(hasEntry, 'Graph should include entry.js')
+  assert.ok(hasIndex, 'Graph should resolve directory to index.js')
+})
+
+test('resolveDepPaths should work with directory imports', () => {
+  const deps = resolveDepPaths(DIR_INDEX_FIXTURE_PATH)
+
+  assert.ok(Array.isArray(deps), 'Should return an array')
+  assert.is(deps.length, 2, 'Should have 2 files')
+
+  assert.ok(deps.some(p => p.includes('shared-pkg/index.js')), 'Should include resolved index.js')
+  assert.ok(deps.some(p => p.includes('entry.js')), 'Should include entry.js')
+})
+
 test.run()

package/tests/fixtures/dir-index-example/entry.js

@@ -0,0 +1,6 @@
+// Entry file that imports directory (should resolve to index.js)
+const shared = require('./shared-pkg')
+
+module.exports = {
+  run: () => shared.helper()
+}

package/tests/fixtures/dir-index-example/shared-pkg/index.js

@@ -0,0 +1,4 @@
+// Shared package entry point
+module.exports = {
+  helper: () => 'shared'
+}