Merge pull request esm-dev#238 from marcushultman/infer-types

esm: infer types if an index.d.ts exists next to main
marcushultman · Dec 26, 2021 · 49a67ca · 49a67ca
2 parents 5e16204 + 9940bf6
commit 49a67ca
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/server/esm.go b/server/esm.go
@@ -26,7 +26,8 @@ type ESM struct {
 }
 
 func initESM(wd string, pkg Pkg, checkExports bool, isDev bool) (esm *ESM, err error) {
-	packageFile := path.Join(wd, "node_modules", pkg.Name, "package.json")
+	packageDir := path.Join(wd, "node_modules", pkg.Name)
+	packageFile := path.Join(packageDir, "package.json")
 
 	var p NpmPackage
 	err = utils.ParseJSONFile(packageFile, &p)
@@ -185,6 +186,15 @@ func initESM(wd string, pkg Pkg, checkExports bool, isDev bool) (esm *ESM, err e
 		// 	esm.ExportDefault = exportDefault
 		// }
 	}
+
+	if (path.Dir(esm.Main) != "" && esm.Types == "" && esm.Typings == "") {
+		typesPath := path.Join(path.Dir(esm.Main), "index.d.ts")
+
+		if (fileExists(path.Join(packageDir, typesPath))) {
+			esm.Types = typesPath
+		}
+	}
+
 	return
 }