Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update module resolution for non-relative paths #229

Merged
merged 1 commit into from
Sep 22, 2023
Merged

fix: update module resolution for non-relative paths #229

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,12 @@ const init: tsModule.server.PluginModuleFactory = ({ typescript: ts }) => {

const createModuleResolver =
(containingFile: string) =>
(moduleName: string): tsModule.ResolvedModuleFull | undefined => {
(
moduleName: string,
resolveModule: () =>
| tsModule.ResolvedModuleWithFailedLookupLocations
| undefined,
): tsModule.ResolvedModuleFull | undefined => {
if (isRelativeCSS(moduleName)) {
return {
extension: ts.Extension.Dts,
Expand All @@ -152,25 +157,21 @@ const init: tsModule.server.PluginModuleFactory = ({ typescript: ts }) => {
moduleName,
),
};
} else if (
isCSS(moduleName) &&
languageServiceHost.getResolvedModuleWithFailedLookupLocationsFromCache
) {
}
if (isCSS(moduleName)) {
// TODO: Move this section to a separate file and add basic tests.
// Attempts to locate the module using TypeScript's previous search paths. These include "baseUrl" and "paths".
const failedModule =
languageServiceHost.getResolvedModuleWithFailedLookupLocationsFromCache(
moduleName,
containingFile,
);
const resolvedModule = resolveModule();
if (!resolvedModule) return;

const baseUrl = info.project.getCompilerOptions().baseUrl;
const match = '/index.ts';

// An array of paths TypeScript searched for the module. All include .ts, .tsx, .d.ts, or .json extensions.
// NOTE: TypeScript doesn't expose this in their interfaces, which is why the type is unknown.
// https://github.com/microsoft/TypeScript/issues/28770
const failedLocations: readonly string[] = (
failedModule as unknown as {
resolvedModule as unknown as {
failedLookupLocations: readonly string[];
}
).failedLookupLocations;
Expand Down Expand Up @@ -227,7 +228,10 @@ const init: tsModule.server.PluginModuleFactory = ({ typescript: ts }) => {

return moduleNames.map(({ text: moduleName }, index) => {
try {
const resolvedModule = moduleResolver(moduleName);
const resolvedModule = moduleResolver(
moduleName,
() => resolvedModules[index],
);
if (resolvedModule) return { resolvedModule };
} catch (e) {
logger.error(e);
Expand Down Expand Up @@ -259,7 +263,12 @@ const init: tsModule.server.PluginModuleFactory = ({ typescript: ts }) => {

return moduleNames.map((moduleName, index) => {
try {
const resolvedModule = moduleResolver(moduleName);
const resolvedModule = moduleResolver(moduleName, () =>
languageServiceHost.getResolvedModuleWithFailedLookupLocationsFromCache?.(
moduleName,
containingFile,
),
);
if (resolvedModule) return resolvedModule;
} catch (e) {
logger.error(e);
Expand Down