@module-federation/third-party-dts-extractor 0.13.0 → 0.13.1

package/dist/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @module-federation/third-party-dts-extractor
 
+## 0.13.1
+
+### Patch Changes
+
+- 723d0f8: fix(third-party-dts-extractor): correctly sets the source of the package types
+
 ## 0.13.0
 
 ### Patch Changes

package/dist/index.js

@@ -13,9 +13,55 @@ var _path = require('path'); var _path2 = _interopRequireDefault(_path);
 var _resolve = require('resolve'); var _resolve2 = _interopRequireDefault(_resolve);
 
 // packages/third-party-dts-extractor/src/utils.ts
+
+var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
 function getTypedName(name) {
   return `@types/${name.replace(/^@/, "").replace("/", "__")}`;
 }
+function getPackageRootDir(packageName) {
+  if (!packageName) {
+    throw new Error("No package name provided.");
+  }
+  const entryFile = __require.resolve(packageName);
+  const entryDir = _path2.default.dirname(entryFile);
+  let fallbackPackageJsonPath = _path2.default.join(
+    entryDir,
+    "package.json"
+  );
+  if (!_fs2.default.existsSync(fallbackPackageJsonPath)) {
+    fallbackPackageJsonPath = null;
+  }
+  const match = packageName.match(/^@[^/]+\/(.+)$/);
+  const localName = match ? match[1] : packageName;
+  let currentDir = entryDir;
+  while (_path2.default.basename(currentDir) !== localName && // Keep going if names differ
+  _path2.default.dirname(currentDir) !== currentDir) {
+    try {
+      currentDir = _path2.default.dirname(currentDir);
+    } catch (err) {
+      if (err.code === "EACCES") {
+        continue;
+      } else {
+        throw err;
+      }
+    }
+  }
+  if (_path2.default.basename(currentDir) === localName) {
+    const candidate = _path2.default.join(currentDir, "package.json");
+    if (_fs2.default.existsSync(candidate)) {
+      const pkgContent = JSON.parse(_fs2.default.readFileSync(candidate, "utf8"));
+      if (pkgContent.name === packageName) {
+        return currentDir;
+      }
+    }
+  }
+  if (fallbackPackageJsonPath) {
+    return entryDir;
+  }
+  throw new Error(
+    `Could not find a matching package.json for "${packageName}" and no fallback was found.`
+  );
+}
 
 // packages/third-party-dts-extractor/src/ThirdPartyExtractor.ts
 var ignoredPkgs = ["typescript"];
@@ -66,7 +112,8 @@ var ThirdPartyExtractor = class {
       if (isNodeUtils(importEntry, importPath)) {
         return;
       }
-      const pkgJsonPath = _findpkg2.default.sync(importEntry);
+      const packageDir = getPackageRootDir(importPath);
+      const pkgJsonPath = _path2.default.join(packageDir, "package.json");
       const dir = _path2.default.dirname(pkgJsonPath);
       const pkg = JSON.parse(_fsextra2.default.readFileSync(pkgJsonPath, "utf-8"));
       const types = pkg.types || pkg.typings;
@@ -74,8 +121,9 @@ var ThirdPartyExtractor = class {
         return;
       }
       if (types) {
-        this.addPkgs(pkg.name, dir);
-        return dir;
+        const typesDir = _path2.default.dirname(_path2.default.resolve(dir, types));
+        this.addPkgs(pkg.name, typesDir);
+        return typesDir;
       } else if (_fsextra2.default.existsSync(_path2.default.resolve(dir, "index.d.ts"))) {
         this.addPkgs(pkg.name, dir);
         return dir;

package/dist/index.mjs

@@ -8,14 +8,60 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 
 // packages/third-party-dts-extractor/src/ThirdPartyExtractor.ts
 import findPkg from "find-pkg";
-import fs from "fs-extra";
-import path from "path";
+import fs2 from "fs-extra";
+import path2 from "path";
 import resolve from "resolve";
 
 // packages/third-party-dts-extractor/src/utils.ts
+import path from "node:path";
+import fs from "node:fs";
 function getTypedName(name) {
   return `@types/${name.replace(/^@/, "").replace("/", "__")}`;
 }
+function getPackageRootDir(packageName) {
+  if (!packageName) {
+    throw new Error("No package name provided.");
+  }
+  const entryFile = __require.resolve(packageName);
+  const entryDir = path.dirname(entryFile);
+  let fallbackPackageJsonPath = path.join(
+    entryDir,
+    "package.json"
+  );
+  if (!fs.existsSync(fallbackPackageJsonPath)) {
+    fallbackPackageJsonPath = null;
+  }
+  const match = packageName.match(/^@[^/]+\/(.+)$/);
+  const localName = match ? match[1] : packageName;
+  let currentDir = entryDir;
+  while (path.basename(currentDir) !== localName && // Keep going if names differ
+  path.dirname(currentDir) !== currentDir) {
+    try {
+      currentDir = path.dirname(currentDir);
+    } catch (err) {
+      if (err.code === "EACCES") {
+        continue;
+      } else {
+        throw err;
+      }
+    }
+  }
+  if (path.basename(currentDir) === localName) {
+    const candidate = path.join(currentDir, "package.json");
+    if (fs.existsSync(candidate)) {
+      const pkgContent = JSON.parse(fs.readFileSync(candidate, "utf8"));
+      if (pkgContent.name === packageName) {
+        return currentDir;
+      }
+    }
+  }
+  if (fallbackPackageJsonPath) {
+    return entryDir;
+  }
+  throw new Error(
+    `Could not find a matching package.json for "${packageName}" and no fallback was found.`
+  );
+}
 
 // packages/third-party-dts-extractor/src/ThirdPartyExtractor.ts
 var ignoredPkgs = ["typescript"];
@@ -53,7 +99,7 @@ var ThirdPartyExtractor = class {
     if (this.pkgs[importPath]) {
       return;
     }
-    if (path.isAbsolute(importPath)) {
+    if (path2.isAbsolute(importPath)) {
       return;
     }
     if (importPath.startsWith(".")) {
@@ -66,17 +112,19 @@ var ThirdPartyExtractor = class {
       if (isNodeUtils(importEntry, importPath)) {
         return;
       }
-      const pkgJsonPath = findPkg.sync(importEntry);
-      const dir = path.dirname(pkgJsonPath);
-      const pkg = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
+      const packageDir = getPackageRootDir(importPath);
+      const pkgJsonPath = path2.join(packageDir, "package.json");
+      const dir = path2.dirname(pkgJsonPath);
+      const pkg = JSON.parse(fs2.readFileSync(pkgJsonPath, "utf-8"));
       const types = pkg.types || pkg.typings;
       if (dir === this.context) {
         return;
       }
       if (types) {
-        this.addPkgs(pkg.name, dir);
-        return dir;
-      } else if (fs.existsSync(path.resolve(dir, "index.d.ts"))) {
+        const typesDir = path2.dirname(path2.resolve(dir, types));
+        this.addPkgs(pkg.name, typesDir);
+        return typesDir;
+      } else if (fs2.existsSync(path2.resolve(dir, "index.d.ts"))) {
         this.addPkgs(pkg.name, dir);
         return dir;
       } else {
@@ -86,8 +134,8 @@ var ThirdPartyExtractor = class {
             basedir: this.context
           })
         );
-        const typedDir = path.dirname(typedPkgJsonPath);
-        fs.readFileSync(typedPkgJsonPath, "utf-8");
+        const typedDir = path2.dirname(typedPkgJsonPath);
+        fs2.readFileSync(typedPkgJsonPath, "utf-8");
         this.addPkgs(typedPkgName, typedDir);
         return typedDir;
       }
@@ -116,7 +164,7 @@ var ThirdPartyExtractor = class {
     }
     const ensureDir = async (dir) => {
       try {
-        await fs.mkdir(dir, { recursive: true });
+        await fs2.mkdir(dir, { recursive: true });
       } catch (err) {
         if (err.code !== "EEXIST")
           throw err;
@@ -126,21 +174,21 @@ var ThirdPartyExtractor = class {
       if (srcDir.startsWith(".")) {
         return;
       }
-      const files = await fs.readdir(srcDir);
+      const files = await fs2.readdir(srcDir);
       await Promise.all(
         files.map(async (file) => {
-          const fullPath = path.join(srcDir, file);
+          const fullPath = path2.join(srcDir, file);
           if (["node_modules", "bin"].includes(file)) {
             return;
           }
-          const stats = await fs.lstat(fullPath);
+          const stats = await fs2.lstat(fullPath);
           if (stats.isDirectory()) {
-            const destFullPath = path.join(destDir, file);
+            const destFullPath = path2.join(destDir, file);
             await ensureDir(destFullPath);
             await copyFiles(fullPath, destFullPath);
           } else {
             if (fullPath.endsWith(".d.ts") || fullPath.endsWith("package.json")) {
-              await fs.copyFile(fullPath, path.join(destDir, file));
+              await fs2.copyFile(fullPath, path2.join(destDir, file));
             }
           }
         })
@@ -150,7 +198,7 @@ var ThirdPartyExtractor = class {
     await Promise.all(
       Object.keys(this.pkgs).map(async (pkgName) => {
         const pkgDir = this.pkgs[pkgName];
-        const destDir = path.resolve(this.destDir, pkgName);
+        const destDir = path2.resolve(this.destDir, pkgName);
         await ensureDir(destDir);
         await copyFiles(pkgDir, destDir);
       })

package/dist/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/third-party-dts-extractor",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "files": [
     "dist/",
     "README.md"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@module-federation/third-party-dts-extractor",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "files": [
     "dist/",
     "README.md"