fix: Fix module resolution issue

Author: Romakita

Diff for: packages/ts-doc/src/models/DocFile.js

@@ -1,76 +1,73 @@
-const {context} = require("../context");
-const path = require("path");
-const fs = require("fs");
-const normalizePath = require("normalize-path");
-const mapExported = new Map();
+const {context} = require('../context')
+const path = require('path')
+const fs = require('fs')
+const normalizePath = require('normalize-path')
+const readPkgUp = require('read-pkg-up')
+const mapExported = new Map()
 
 class DocFile {
   /**
    *
    * @param file
    */
   constructor(file) {
-    this.file = normalizePath(file);
-    this.symbols = new Map();
-    this.contents = fs.readFileSync(file).toString();
+    this.file = normalizePath(file)
+    this.symbols = new Map()
+    this.contents = fs.readFileSync(file).toString()
   }
 
   get path() {
-    return normalizePath((this.file || "").replace(".d.ts", ".ts"));
+    return normalizePath((this.file || '').replace('.d.ts', '.ts'))
   }
 
   get srcPath() {
-    return normalizePath(context.srcResolver(this.path));
+    return normalizePath(context.srcResolver(this.path))
   }
 
   get relativePackagePath() {
-    const p = normalizePath(path.join(context.rootDir, context.packagesDir));
+    const p = normalizePath(path.join(context.rootDir, context.packagesDir))
 
-    return normalizePath(this.srcPath.replace(p, ""));
+    return normalizePath(this.srcPath.replace(p, ''))
   }
 
   get relativePath() {
-    return normalizePath(this.srcPath.replace(`${context.rootDir}/`, ""));
+    return normalizePath(this.srcPath.replace(`${context.rootDir}/`, ''))
   }
 
   get module() {
-    const [pkgName, subPkgName] = this.relativePackagePath.replace(/^\//, "").split("/");
-    const pkgSettings = context.modules[pkgName];
-    let moduleName = pkgName;
+    const [packagePath] = this.relativePackagePath.split('/src')
+    const packageDir = context.rootDir + '/' + context.packagesDir + '/' + packagePath
 
-    if (typeof pkgSettings === "object" && context.modules[pkgName][subPkgName]) {
-      moduleName = pkgName + "/" + subPkgName;
-    }
+    const {packageJson: {name}} = readPkgUp.sync({cwd: packageDir})
 
     return {
-      modulePath: path.join(context.rootDir, context.packagesDir, pkgName),
-      moduleName: `${context.scope}/${moduleName}`,
-      importFrom: `${context.scope}/${pkgName}`,
-      pkgName,
-      subPkgName
-    };
+      modulePath: packageDir,
+      moduleName: name,
+      importFrom: name,
+      pkgName: name.replace(context.scope, '')
+    }
   }
 
   requireModule() {
-    const {modulePath} = this.module;
-    let file = path.join(modulePath, "index.js");
+    const {modulePath} = this.module
+    let file = path.join(modulePath, 'index.js')
 
-    if (fs.existsSync(path.join(modulePath, "package.json"))) {
-      const pkg = require(path.join(modulePath, "package.json"));
-      file = path.join(modulePath, pkg.main);
+    if (fs.existsSync(path.join(modulePath, 'package.json'))) {
+      const pkg = require(path.join(modulePath, 'package.json'))
+      file = path.join(modulePath, pkg.main)
     }
 
     if (mapExported.has(file)) {
-      return mapExported.get(file);
+      return mapExported.get(file)
     }
 
     if (fs.existsSync(file)) {
-      mapExported.set(file, require(file));
-      return mapExported.get(file);
+      mapExported.set(file, require(file))
+      return mapExported.get(file)
     }
 
-    return undefined;
+    return undefined
   }
 }
 
-module.exports.DocFile = DocFile;
+module.exports.DocFile = DocFile

Diff for: packages/ts-doc/src/scan/scan.js

@@ -3,7 +3,6 @@
 const globby = require("globby");
 const path = require("path");
 const chalk = require("chalk");
-const logger = require("fancy-log");
 const {render} = require("../render/render");
 const {context} = require("../context");
 const {trim} = require("../utils/trim");