Fixed resolution of imported module FQNs

Author: Sebastian Wendorf

typescript/src/core/processors/import-declaration.processor.ts

@@ -27,11 +27,11 @@ export class ImportDeclarationProcessor extends Processor {
                 let target = new FQN("");
                 let isModule = false;
                 if (specifier.type === AST_NODE_TYPES.ImportSpecifier) {
-                    const importSourceFqn = ModulePathUtils.toFQN(importSource);
+                    const importSourceFqn = ModulePathUtils.toFQN(NodeUtils.resolveImportPath(importSource, globalContext.projectInfo, globalContext.sourceFilePathAbsolute));
                     const importedName = specifier.imported.type === AST_NODE_TYPES.Identifier ? specifier.imported.name : specifier.imported.raw;
                     target = new FQN(importSourceFqn.globalFqn + "." + importedName, importSourceFqn.localFqn + "." + importedName);
                 } else if (specifier.type === AST_NODE_TYPES.ImportDefaultSpecifier) {
-                    const importSourceFqn = ModulePathUtils.toFQN(importSource);
+                    const importSourceFqn = ModulePathUtils.toFQN(NodeUtils.resolveImportPath(importSource, globalContext.projectInfo, globalContext.sourceFilePathAbsolute));
                     target = new FQN(importSourceFqn.globalFqn + ".default", importSourceFqn.localFqn + ".default");
                 } else if (specifier.type === AST_NODE_TYPES.ImportNamespaceSpecifier) {
                     target = new FQN(path.resolve(globalContext.projectInfo.rootPath, importSource), importSource);

typescript/src/core/utils/modulepath.utils.ts

@@ -202,7 +202,7 @@ export class ModulePathUtils {
      * @param modulePath absolute, relative, or node path
      * @param projectInfo ProjectInfo of the project that is currently being post-processed
      * @param projects list of all processed projects
-     * @returns whether the path is outside the project (or one of its subprojects) or not
+     * @returns whether the path is outside the project (and its subprojects) or not
      */
     static isExternal(modulePath: string, projectInfo: LCEProjectInfo, projects: LCEProject[]): boolean {
         let moduleIndex: ModuleIndex | undefined = this.moduleIndexes.get(projectInfo.configPath);