Move unresolved module handling to resolveModuleName internally (close

 #206, close #258)

fixtures/dts/assets.d.ts

@@ -0,0 +1,6 @@
+declare module '*.svg';
+
+declare module '*.html?raw' {
+  const value: string;
+  export default value;
+}

fixtures/dts/block.html

@@ -0,0 +1 @@
+<div>content</div>

fixtures/dts/index.ts

@@ -0,0 +1,7 @@
+import b from './block.html?raw';
+import s from './image.svg';
+import n from './normal';
+
+b;
+s;
+n;

fixtures/dts/normal.ts

@@ -0,0 +1 @@
+export default 1;

fixtures/dts/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "@fixtures/dts"
+}

fixtures/dts/tsconfig.json

@@ -0,0 +1 @@
+{}

src/ProjectPrincipal.ts

@@ -6,7 +6,7 @@ import { getJSDocTags, isInModuleBlock } from './typescript/ast-helpers.js';
 import { createHosts } from './typescript/createHosts.js';
 import { getImportsAndExports } from './typescript/getImportsAndExports.js';
 import { SourceFileManager } from './typescript/SourceFileManager.js';
-import { isMaybePackageName } from './util/modules.js';
+import { isMaybePackageName, sanitizeSpecifier } from './util/modules.js';
 import { dirname, extname, isInNodeModules, join } from './util/path.js';
 import { timerify } from './util/Performance.js';
 import type { SyncCompilers, AsyncCompilers } from './types/compilers.js';
@@ -198,8 +198,7 @@ export class ProjectPrincipal {
           this.addEntryPath(resolvedModule.resolvedFileName, { skipExportsAnalysis: true });
         }
       } else {
-        // Strip special Webpack stuff (https://webpack.js.org/concepts/loaders/)
-        const sanitizedSpecifier = specifier.replace(/^([?!|-]+)?([^!?]+).*/, '$2');
+        const sanitizedSpecifier = sanitizeSpecifier(specifier);
         if (isMaybePackageName(sanitizedSpecifier)) {
           external.add(sanitizedSpecifier);
         } else {

src/typescript/getImportsAndExports.ts

@@ -1,10 +1,7 @@
-import { existsSync } from 'node:fs';
 import { isBuiltin } from 'node:module';
-// eslint-disable-next-line n/no-restricted-import
-import { resolve, dirname } from 'node:path';
 import ts from 'typescript';
 import { getOrSet } from '../util/map.js';
-import { isMaybePackageName } from '../util/modules.js';
+import { isMaybePackageName, sanitizeSpecifier } from '../util/modules.js';
 import { isInNodeModules } from '../util/path.js';
 import {
   isDeclarationFileExtension,
@@ -102,26 +99,22 @@ export const getImportsAndExports = (sourceFile: BoundSourceFile, options: GetIm
             addInternalImport({ identifier, specifier, symbol, filePath, isReExport });
           }
 
-          if (!isMaybePackageName(specifier)) return;
+          const sanitizedSpecifier = sanitizeSpecifier(specifier);
+          if (!isMaybePackageName(sanitizedSpecifier)) return;
 
           if (isDeclarationFileExtension(module.resolvedModule.extension)) {
             // We use TypeScript's module resolution, but it returns DTS references. In the rest of the program we want
             // the package name based on the original specifier.
-            externalImports.add(specifier);
+            externalImports.add(sanitizedSpecifier);
           } else {
-            externalImports.add(module.resolvedModule.packageId?.name ?? specifier);
+            externalImports.add(module.resolvedModule.packageId?.name ?? sanitizedSpecifier);
           }
         } else {
           addInternalImport({ identifier, specifier, symbol, filePath, isReExport });
         }
       }
     } else {
-      const filePath = resolve(dirname(sourceFile.fileName), specifier);
-      if (existsSync(filePath)) {
-        unresolvedImports.add(filePath); // TODO Optimize (it's not unresolved)
-      } else {
-        unresolvedImports.add(specifier);
-      }
+      unresolvedImports.add(specifier);
     }
   };
 

src/typescript/resolveModuleNames.ts

@@ -1,4 +1,7 @@
+import { existsSync } from 'node:fs';
 import ts from 'typescript';
+import { sanitizeSpecifier } from '../util/modules.js';
+import { dirname, extname, isInternal, join } from '../util/path.js';
 import { ensureRealFilePath, isVirtualFilePath } from './utils.js';
 
 export function createCustomModuleResolver(
@@ -11,7 +14,31 @@ export function createCustomModuleResolver(
   }
 
   function resolveModuleName(name: string, containingFile: string): ts.ResolvedModule | undefined {
-    const tsResolvedModule = ts.resolveModuleName(name, containingFile, compilerOptions, ts.sys).resolvedModule;
+    const sanitizedSpecifier = sanitizeSpecifier(name);
+
+    const tsResolvedModule = ts.resolveModuleName(
+      sanitizedSpecifier,
+      containingFile,
+      compilerOptions,
+      ts.sys
+    ).resolvedModule;
+
+    // When TS does not resolve it, and it's not a registered virtual file ext, try `fs.existsSync`
+    if (!tsResolvedModule) {
+      const extension = extname(sanitizedSpecifier);
+      if (extension && isInternal(sanitizedSpecifier) && !virtualFileExtensions.includes(extension)) {
+        const resolvedFileName = join(dirname(containingFile), sanitizedSpecifier);
+        if (existsSync(resolvedFileName)) {
+          return {
+            resolvedFileName,
+            // @ts-expect-error Without this, TS throws for "unknown extension"
+            extension,
+            isExternalLibraryImport: false,
+            resolvedUsingTsExtension: false,
+          };
+        }
+      }
+    }
 
     if (virtualFileExtensions.length === 0) return tsResolvedModule;
 

src/util/modules.ts

@@ -56,3 +56,6 @@ export const getEntryPathFromManifest = (cwd: string, dir: string, manifest: Pac
   // Glob, as we only want source files that exist and not (generated) files that are .gitignore'd
   return _glob({ cwd, workingDir: dir, patterns: Array.from(entryPaths) });
 };
+
+// Strip `?search` and other proprietary directives from the specifier (e.g. https://webpack.js.org/concepts/loaders/)
+export const sanitizeSpecifier = (specifier: string) => specifier.replace(/^([?!|-]+)?([^!?]+).*/, '$2');

tests/dts.test.ts

@@ -0,0 +1,21 @@
+import assert from 'node:assert/strict';
+import test from 'node:test';
+import { main } from '../src/index.js';
+import { resolve } from '../src/util/path.js';
+import baseArguments from './helpers/baseArguments.js';
+import baseCounters from './helpers/baseCounters.js';
+
+const cwd = resolve('fixtures/dts');
+
+test('Include declaration files and allow unknown extensions', async () => {
+  const { counters } = await main({
+    ...baseArguments,
+    cwd,
+  });
+
+  assert.deepEqual(counters, {
+    ...baseCounters,
+    processed: 3,
+    total: 3,
+  });
+});

tests/unresolved-rtl.test.ts

@@ -7,7 +7,7 @@ import baseCounters from './helpers/baseCounters.js';
 
 const cwd = resolve('fixtures/מסמכים');
 
-test('Report unresolved imports', async () => {
+test('Report unresolved imports (rtl)', async () => {
   const { counters } = await main({
     ...baseArguments,
     cwd,