[application-package] resolve modules in the application context

Signed-off-by: Anton Kosiakov <anton.kosyakov@typefox.io>

Author: akosyakov

dev-packages/application-package/src/application-package.ts

@@ -5,13 +5,15 @@
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
 
+import * as fs from 'fs-extra';
 import * as paths from 'path';
 import { readJsonFile, writeJsonFile } from './json-file';
 import { NpmRegistry, NodePackage, PublishedNodePackage, sortByKey } from './npm-registry';
 import { Extension, ExtensionPackage, RawExtensionPackage } from './extension-package';
 import { ExtensionPackageCollector } from './extension-package-collector';
 
 export type ApplicationLog = (message?: any, ...optionalParams: any[]) => void;
+export type ApplicationModuleLoader = (modulePath: string) => string;
 export type ApplicationPackageTarget = 'browser' | 'electron';
 export class ApplicationPackageOptions {
     readonly projectPath: string;
@@ -55,7 +57,10 @@ export class ApplicationPackage extends ApplicationPackageOptions {
      */
     get extensionPackages(): ReadonlyArray<ExtensionPackage> {
         if (!this._extensionPackages) {
-            const collector = new ExtensionPackageCollector(raw => this.newExtensionPackage(raw));
+            const collector = new ExtensionPackageCollector(
+                raw => this.newExtensionPackage(raw),
+                this.loadModule
+            );
             this._extensionPackages = collector.collect(this.pck);
         }
         return this._extensionPackages;
@@ -202,4 +207,19 @@ export class ApplicationPackage extends ApplicationPackageOptions {
         });
     }
 
+    protected _moduleLoader: undefined | ApplicationModuleLoader;
+    get loadModule(): ApplicationModuleLoader {
+        if (!this._moduleLoader) {
+            const loaderPath = this.path('.application-module-loader.js');
+            fs.writeFileSync(loaderPath, 'module.exports = modulePath => require.resolve(modulePath);');
+            this._moduleLoader = require(loaderPath) as ApplicationModuleLoader;
+            fs.removeSync(loaderPath);
+        }
+        return this._moduleLoader!;
+    }
+
+    resolveModulePath(moduleName: string, ...segments: string[]): string {
+        return paths.resolve(this.loadModule(moduleName + '/package.json'), '..', ...segments);
+    }
+
 }

dev-packages/application-package/src/extension-package-collector.ts

@@ -15,7 +15,8 @@ export class ExtensionPackageCollector {
     protected readonly visited = new Map<string, boolean>();
 
     constructor(
-        protected readonly extensionPackageFactory: (raw: PublishedNodePackage) => ExtensionPackage
+        protected readonly extensionPackageFactory: (raw: PublishedNodePackage) => ExtensionPackage,
+        protected readonly loadModule: (modulePath: string) => string
     ) { }
 
     collect(pck: NodePackage): ReadonlyArray<ExtensionPackage> {
@@ -40,7 +41,7 @@ export class ExtensionPackageCollector {
         }
         this.visited.set(name, true);
 
-        const packagePath = require.resolve(name + '/package.json');
+        const packagePath = this.loadModule(name + '/package.json');
         const pck: NodePackage = readJsonFile(packagePath);
         if (RawExtensionPackage.is(pck)) {
             const version = pck.version;

dev-packages/application-package/src/generator/webpack-generator.ts

@@ -19,7 +19,7 @@ export class WebpackGenerator extends AbstractGenerator {
     }
 
     protected resolve(moduleName: string, path: string): string {
-        return this.pck.relative(paths.resolve(require.resolve(moduleName + '/package.json'), '../' + path)).split(paths.sep).join('/');
+        return this.pck.resolveModulePath(moduleName, path).split(paths.sep).join('/');
     }
 
     protected compileWebpackConfig(): string {

packages/extension-manager/.gitignore

@@ -1 +1 @@
-testproject_temp
+*_test_temp

packages/extension-manager/src/node/application-project.spec.ts

@@ -6,6 +6,7 @@
  */
 
 import * as path from 'path';
+import * as temp from 'temp';
 import * as fs from 'fs-extra';
 import * as assert from 'assert';
 import { DidStopInstallationParam } from "../common/extension-protocol";
@@ -16,8 +17,8 @@ process.on('unhandledRejection', (reason, promise) => {
     throw reason;
 });
 
+let appProjectPath: string;
 let appProject: ApplicationProject;
-const appProjectPath = path.resolve(__dirname, '..', '..', 'test-resources', 'testproject_temp');
 
 export async function assertInstallation(expectation: {
     installed?: string[],
@@ -51,8 +52,10 @@ describe("application-project", function () {
 
     beforeEach(function () {
         this.timeout(50000);
-        fs.removeSync(appProjectPath);
-        fs.ensureDirSync(appProjectPath);
+        appProjectPath = temp.mkdirSync({
+            suffix: '_project_test_temp',
+            dir: path.resolve(__dirname, '..', '..')
+        });
         appProject = extensionNodeTestContainer({
             projectPath: appProjectPath,
             target: 'browser',

packages/extension-manager/src/node/node-extension-server.spec.ts

@@ -5,6 +5,7 @@
  * You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
  */
 
+import * as temp from 'temp';
 import * as path from 'path';
 import * as fs from 'fs-extra';
 import * as assert from 'assert';
@@ -16,10 +17,9 @@ process.on('unhandledRejection', (reason, promise) => {
     throw reason;
 });
 
+let appProjectPath: string;
 let appProject: ApplicationProject;
 let server: ExtensionServer;
-const testProjectPath = path.resolve(__dirname, '..', '..', 'test-resources', 'testproject');
-const appProjectPath = path.resolve(__dirname, '..', '..', 'test-resources', 'testproject_temp');
 
 export function waitForDidChange(): Promise<void> {
     return new Promise(resolve => {
@@ -33,8 +33,18 @@ describe("node-extension-server", function () {
 
     beforeEach(function () {
         this.timeout(50000);
-        fs.removeSync(appProjectPath);
-        fs.copySync(testProjectPath, appProjectPath);
+
+        appProjectPath = temp.mkdirSync({
+            suffix: '_server_test_temp',
+            dir: path.resolve(__dirname, '..', '..')
+        });
+        fs.writeJsonSync(path.resolve(appProjectPath, 'package.json'), {
+            "dependencies": {
+                "@theia/core": "0.1.0",
+                "@theia/extension-manager": "0.1.0"
+            }
+        });
+
         const container = extensionNodeTestContainer({
             projectPath: appProjectPath,
             target: 'browser',