fix: allow to pass context to PathPlugin, basic tests

Author: s-panferov

src/__test__/paths-plugin.ts

@@ -0,0 +1,32 @@
+import {
+    src, webpackConfig, tsconfig,
+    compile, expectErrors, spec
+} from './utils';
+
+import { PathPlugin } from '../paths-plugin';
+
+spec(__filename, async function() {
+    src('index.ts', `
+        import App from 'ui/app'
+
+        const app = new App()
+        app.render();
+    `);
+
+    src('./ui/app/index.ts', `
+        export default class App { render() { return 'App' } }
+    `);
+
+    tsconfig({
+        baseUrl: '.',
+        paths: {
+            "ui/*": [ "./src/ui/*" ]
+        }
+    });
+
+    const config = webpackConfig();
+    (config.resolve as any).plugins = [ new PathPlugin() ];
+    let stats = await compile(config);
+
+    expectErrors(stats, 0);
+});

src/__test__/utils.ts

@@ -65,7 +65,7 @@ export function webpackConfig(...enchance: any[]): webpack.Configuration {
             filename: '[name].js'
         },
         resolve: {
-            extensions: ['.ts', '.tsx', '.js', '.jsx'],
+            extensions: ['.ts', '.tsx', '.js', '.jsx']
         },
         module: {
             loaders: [
@@ -236,10 +236,14 @@ export function expectErrors(stats: any, count: number, errors: string[] = []) {
     expect(stats.compilation.errors.length).eq(count);
 }
 
-export function tsconfig(compilerOptions?: any, config?: any) {
+export function tsconfig(
+    compilerOptions?: any,
+    config?: any
+) {
     const res = _.merge({
         compilerOptions: _.merge({
-            target: 'es6'
+            target: 'es6',
+            moduleResolution: 'node'
         }, compilerOptions)
     }, config);
     return file('tsconfig.json', json(res));
@@ -271,7 +275,7 @@ export function touchFile(fileName: string): Promise<any> {
         .then(source => writeFile(fileName, source));
 }
 
-export function compile(config?): Promise<any> {
+export function compile(config): Promise<any> {
     return new Promise((resolve, reject) => {
         const compiler = webpack(config);
 

src/index.ts

@@ -4,7 +4,7 @@ import * as path from 'path';
 import { findCompiledModule, cache } from './cache';
 import * as helpers from './helpers';
 import { QueryOptions, Loader, ensureInstance, Instance, getRootCompiler } from './instance';
-import { PathsPlugin } from './paths-plugin';
+import { PathPlugin } from './paths-plugin';
 import { CheckerPlugin as _CheckerPlugin } from './watch-mode';
 
 const loaderUtils = require('loader-utils');
@@ -19,7 +19,7 @@ function loader(text) {
 }
 
 namespace loader {
-    export const TsConfigPathsPlugin = PathsPlugin;
+    export const TsConfigPathsPlugin = PathPlugin;
     export const CheckerPlugin = _CheckerPlugin;
 }
 

src/instance.ts

@@ -85,12 +85,17 @@ export function ensureInstance(
     }
 
     const watching = isWatching(rootCompiler);
+    const context = process.cwd();
 
-    const context = rootCompiler.context;
     let compilerInfo = setupTs(query.compiler);
     let { tsImpl } = compilerInfo;
 
-    let { configFilePath, compilerConfig, loaderConfig } = readConfigFile(context, query, options, tsImpl);
+    let { configFilePath, compilerConfig, loaderConfig } = readConfigFile(
+        context,
+        query,
+        options,
+        tsImpl
+    );
 
     applyDefaults(
         configFilePath,

src/paths-plugin.ts

@@ -50,7 +50,11 @@ function escapeRegExp(str) {
   return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
 }
 
-export class PathsPlugin implements ResolverPlugin {
+export interface PathPluginOptions {
+    context?: string;
+}
+
+export class PathPlugin implements ResolverPlugin {
     source: string;
     target: string;
     ts: typeof ts;
@@ -61,13 +65,15 @@ export class PathsPlugin implements ResolverPlugin {
     mappings: Mapping[];
     absoluteBaseUrl: string;
 
-    constructor(config: LoaderConfig & ts.CompilerOptions = {} as any) {
+    constructor(config: LoaderConfig & ts.CompilerOptions & PathPluginOptions = {} as any) {
         this.source = 'described-resolve';
         this.target = 'resolve';
 
         this.ts = setupTs(config.compiler).tsImpl;
 
-        let { configFilePath, compilerConfig } = readConfigFile(process.cwd(), config, {}, this.ts);
+        let context = config.context || process.cwd();
+        let { configFilePath, compilerConfig } = readConfigFile(context, config, {}, this.ts);
+
         this.options = compilerConfig.options;
         this.configFilePath = configFilePath;