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

Jump to bottom

Implements a custom resolveModuleName option #862

Merged
merged 11 commits into from
Oct 31, 2018
Merged

Implements a custom resolveModuleName option #862

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6367073
Implements a custom resolveModuleName option
arcanis Oct 26, 2018
46d721a
Addresses feedback
arcanis Oct 27, 2018
f2f6026
Adds a test
arcanis Oct 27, 2018
289d904
Adresses feedback
arcanis Oct 27, 2018
9a0540a
Expands the test scope
arcanis Oct 27, 2018
0bc78bd
Fix validateLoaderOptionNames test
johnnyreilly Oct 28, 2018
8b694a8
prettier formatting
johnnyreilly Oct 28, 2018
afa570d
Be explicit about the possible value of customResolveModuleName
johnnyreilly Oct 28, 2018
ad4ed7b
Feedback round 3
arcanis Oct 28, 2018
d8f3735
Fix lint issues
johnnyreilly Oct 29, 2018
bee1c37
Bumps package.json, updates changelog
Oct 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,8 @@ const validLoaderOptions: ValidLoaderOptions[] = [
'experimentalWatchApi',
'allowTsInNodeModules',
'experimentalFileCaching',
'projectReferences'
'projectReferences',
'resolveModuleName'
];

/**
Expand Down
16 changes: 16 additions & 0 deletions src/interfaces.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,6 +295,21 @@ export interface ReverseDependencyGraph {

export type LogLevel = 'INFO' | 'WARN' | 'ERROR';

export type ResolveModuleName = (
moduleName: string,
containingFile: string,
compilerOptions: typescript.CompilerOptions,
moduleResolutionHost: typescript.ModuleResolutionHost,
) => typescript.ResolvedModuleWithFailedLookupLocations;

export type CustomResolveModuleName = (
moduleName: string,
containingFile: string,
options: typescript.CompilerOptions,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be called compilerOptions also please?

moduleResolutionHost: typescript.ModuleResolutionHost,
parentResolver: ResolveModuleName
) => typescript.ResolvedModuleWithFailedLookupLocations;

export interface LoaderOptions {
silent: boolean;
logLevel: LogLevel;
Expand All @@ -320,6 +335,7 @@ export interface LoaderOptions {
allowTsInNodeModules: boolean;
experimentalFileCaching: boolean;
projectReferences: boolean;
resolveModuleName?: CustomResolveModuleName;
}

export interface TSFile {
Expand Down
36 changes: 25 additions & 11 deletions src/servicesHost.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import * as typescript from 'typescript';
import * as constants from './constants';
import {
ModuleResolutionHost,
CustomResolveModuleName,
ResolvedModule,
ResolveSync,
TSInstance,
Expand Down Expand Up @@ -36,7 +37,11 @@ export function makeServicesHost(
compiler,
compilerOptions,
files,
loaderOptions: { appendTsSuffixTo, appendTsxSuffixTo }
loaderOptions: {
appendTsSuffixTo,
appendTsxSuffixTo,
resolveModuleName: customResolveModuleName
}
} = instance;

const newLine =
Expand Down Expand Up @@ -148,7 +153,8 @@ export function makeServicesHost(
instance,
moduleNames,
containingFile,
getResolutionStrategy
getResolutionStrategy,
customResolveModuleName
),

getCustomTransformers: () => instance.transformers
Expand Down Expand Up @@ -426,7 +432,8 @@ function resolveModuleNames(
instance: TSInstance,
moduleNames: string[],
containingFile: string,
resolutionStrategy: ResolutionStrategy
resolutionStrategy: ResolutionStrategy,
customResolveModuleName?: CustomResolveModuleName
) {
const resolvedModules = moduleNames.map(moduleName =>
resolveModuleName(
Expand All @@ -438,7 +445,8 @@ function resolveModuleNames(
instance,
moduleName,
containingFile,
resolutionStrategy
resolutionStrategy,
customResolveModuleName
)
);

Expand Down Expand Up @@ -466,7 +474,8 @@ function resolveModuleName(
instance: TSInstance,
moduleName: string,
containingFile: string,
resolutionStrategy: ResolutionStrategy
resolutionStrategy: ResolutionStrategy,
customResolveModuleName?: CustomResolveModuleName
) {
const { compiler, compilerOptions } = instance;

Expand Down Expand Up @@ -496,12 +505,17 @@ function resolveModuleName(
// tslint:disable-next-line:no-empty
} catch (e) {}

const tsResolution = compiler.resolveModuleName(
moduleName,
containingFile,
compilerOptions,
moduleResolutionHost
);
const tsResolver = (moduleName: string, containingFile: string, compilerOptions: typescript.CompilerOptions, moduleResolutionHost: typescript.ModuleResolutionHost) =>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Given tsResolver is a pure function could we break this out in to a separate function please? That saves creating a new function each time this runs.

compiler.resolveModuleName(
moduleName,
containingFile,
compilerOptions,
moduleResolutionHost
);

const tsResolution = customResolveModuleName
? customResolveModuleName(moduleName, containingFile, compilerOptions, moduleResolutionHost, tsResolver)
: tsResolver(moduleName, containingFile, compilerOptions, moduleResolutionHost);

if (tsResolution.resolvedModule !== undefined) {
const resolvedFileName = path.normalize(
Expand Down