feat: show source file that tries to include unresolved file (#105)

Co-authored-by: Stephan Meijer <[email protected]>
smeijer · Apr 21, 2023 · 23f6080 · 23f6080
1 parent f637d98
commit 23f6080
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 17 deletions.
diff --git a/src/__tests__/cli.ts b/src/__tests__/cli.ts
@@ -190,6  190,15 @@ cases(
       exitCode: 1,
       stdout: /1 unresolved imports.*.\/foo/s,
     },
     {
       name: 'should show the source of the unresolved import',
       files: [
         { name: 'package.json', content: '{ "main": "index.js" }' },
         { name: 'index.js', content: `import foo from './foo';` },
       ],
       exitCode: 1,
       stdout: /\.\/foo.*at index\.js/s,
     },
     {
       name: 'should ignore untracked files that are not imported',
       files: [

diff --git a/src/__tests__/delete.ts b/src/__tests__/delete.ts
@@ -74,7  74,7 @@ describe('removeUnused', () => {
     const rm = jest.spyOn(fs, 'rm');
 
     const { removedDeps, deletedFiles, error } = await removeUnused(
-      { ...result, unresolved: ['unused-package'] },
       { ...result, unresolved: [['unused-package', []]] },
       context,
     );
 

diff --git a/src/__tests__/print.ts b/src/__tests__/print.ts
@@ -48,7  48,7 @@ describe('printResults', () => {
 
   it('should print summary and unresolved, unimported, and unused tables populated', () => {
     const expectedProcessedResult = {
-      unresolved: ['string', 'string'],
       unresolved: <[string, string[]][]>[['string', ['string']]],
       unimported: ['string', 'string', 'string', 'string'],
       unused: ['string', 'string', 'string'],
       clean: false,
@@ -61,16  61,15 @@ describe('printResults', () => {
       ────────────────────────────────────────────────────────────────────────────────
              entry file          : src/client/main.js
 
-             unresolved imports  : 2
              unresolved imports  : 1
              unused dependencies : 3
              unimported files    : 4
 
 
       ─────┬──────────────────────────────────────────────────────────────────────────
-           │ 2 unresolved imports
            │ 1 unresolved imports
       ─────┼──────────────────────────────────────────────────────────────────────────
-         1 │ string
-         2 │ string
          1 │ string at string
       ─────┴──────────────────────────────────────────────────────────────────────────
 
 

diff --git a/src/index.ts b/src/index.ts
@@ -191,6  191,7 @@ export async function main(args: CliArguments): Promise<void> {
         preset: config.preset,
         dependencies,
         pathTransforms: config.pathTransforms,
         root: context.cwd,
       };
 
       // we can't use the third argument here, to keep feeding to traverseResult
@@ -217,8  218,8 @@ export async function main(args: CliArguments): Promise<void> {
       subResult.modules.forEach((module) => {
         traverseResult.modules.add(module);
       });
-      subResult.unresolved.forEach((unresolved) => {
-        traverseResult.unresolved.add(unresolved);
       subResult.unresolved.forEach((unresolved, key) => {
         traverseResult.unresolved.set(key, unresolved);
       });
 
       for (const [key, stat] of subResult.files) {

diff --git a/src/print.ts b/src/print.ts
@@ -26,7  26,11 @@ export function formatList(caption: string, records: string[]): string {
 
 export function formatMetaTable(
   caption: string,
-  data: { unresolved: string[]; unimported: string[]; unused: string[] },
   data: {
     unresolved: [string, string[]][];
     unimported: string[];
     unused: string[];
   },
   context: Context,
 ): string {
   const entryFiles = context.config.entryFiles;
@@ -129,7  133,9 @@ export function printResults(result: ProcessedResult, context: Context): void {
     console.log(
       formatList(
         chalk.redBright(`${unresolved.length} unresolved imports`),
-        unresolved,
         unresolved.map(([item, sources]) => {
           return `${item} ${chalk.gray(`at ${sources.join(', ')}`)}`;
         }),
       ),
     );
   }

diff --git a/src/process.ts b/src/process.ts
@@ -3,7  3,7 @@ import { Context } from './index';
 import { ensureArray } from './ensureArray';
 
 export interface ProcessedResult {
-  unresolved: string[];
   unresolved: [string, string[]][];
   unimported: string[];
   unused: string[];
   clean: boolean;
@@ -26,7  26,7 @@ export async function processResults(
   const ignoreUnimportedIdx = index(context.config.ignoreUnimported);
 
   const unresolved = Array.from(traverseResult.unresolved).filter(
-    (x) => !ignoreUnresolvedIdx[x],
     ([x]) => !ignoreUnresolvedIdx[x],
   );
 
   const unused = Object.keys(context.dependencies).filter(

diff --git a/src/traverse.ts b/src/traverse.ts
@@ -1,4  1,4 @@
-import { dirname, extname } from 'path';
 import { dirname, extname, relative } from 'path';
 
 import {
   AST_NODE_TYPES,
@@ -29,7  29,7 @@ export interface FileStats {
 }
 
 export interface TraverseResult {
-  unresolved: Set<string>;
   unresolved: Map<string, string[]>;
   files: Map<string, FileStats>;
   modules: Set<string>;
 }
@@ -328,7  328,7 @@ async function parse(path: string, config: TraverseConfig): Promise<FileStats> {
 }
 
 export const getResultObject = () => ({
-  unresolved: new Set<string>(),
   unresolved: new Map<string, string[]>(),
   modules: new Set<string>(),
   files: new Map<string, FileStats>(),
 });
@@ -342,6  342,7 @@ export interface TraverseConfig {
   preset?: string;
   dependencies: MapLike<string>;
   pathTransforms?: MapLike<string>;
   root: string;
 }
 
 export async function traverse(
@@ -366,7  367,7 @@ export async function traverse(
     return result;
   }
 
-  let parseResult;
   let parseResult: FileStats;
   try {
     const generator = () => parse(String(path), config);
 
@@ -381,7  382,10 @@ export async function traverse(
           result.modules.add(file.name);
           break;
         case 'unresolved':
-          result.unresolved.add(file.path);
           const current = result.unresolved.get(file.path) || [];
           const path = relative(config.root, parseResult.path);
           const next = current.includes(path) ? current : [...current, path];
           result.unresolved.set(file.path, next);
           break;
         case 'source_file':
           if (result.files.has(file.path)) {