feat: resolve all the pnpm issues without hoisted config (#136)

.changeset/spicy-wasps-agree.md

@@ -0,0 +1,5 @@
+---
+"app-builder-bin": patch
+---
+
+feat: resolve all the pnpm issues without hostied config

Makefile

@@ -44,6 +44,7 @@ test:
 	cd pkg/node-modules/npm-demo/ && npm install
 	cd pkg/node-modules/tar-demo/ && npm install
 	cd pkg/node-modules/yarn-demo/ && yarn
+	cd pkg/node-modules/parse-demo/ && yarn
 	go test -v ./pkg/...
 
 assets:

pkg/node-modules/nodeModuleCollector.go

@@ -6,7 +6,6 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/develar/app-builder/pkg/fs"
 	"github.com/develar/app-builder/pkg/log"
 	"github.com/develar/errors"
 	jsoniter "github.com/json-iterator/go"
@@ -250,24 +249,7 @@ func (t *Collector) resolveDependency(parentNodeModuleDir string, name string) (
 		}
 	}
 
-	realParentNodeModuleDir := fs.FindParentWithFile(parentNodeModuleDir, name)
-	if realParentNodeModuleDir == "" {
-		return nil, nil
-	}
-
-	// XXX consumers expect the node_modules shape or the dependency tree ?
-	// hoist the depends to the actual parent
-	if realParentNodeModuleDir != parentNodeModuleDir {
-		dependencyNameToDependency = t.NodeModuleDirToDependencyMap[realParentNodeModuleDir]
-		if dependencyNameToDependency != nil {
-			dependency := (*dependencyNameToDependency)[name]
-			if dependency != nil {
-				return nil, nil
-			}
-		}
-	}
-
-	dependencyDir := filepath.Join(realParentNodeModuleDir, name)
+	dependencyDir := filepath.Join(parentNodeModuleDir, name)
 	info, err := os.Stat(dependencyDir)
 	if err == nil && !info.IsDir() {
 		return nil, nil
@@ -325,12 +307,6 @@ func findNearestNodeModuleDir(dir string) (string, error) {
 		return "", nil
 	}
 
-	realDir, err := filepath.EvalSymlinks(dir)
-	if err != nil {
-		return "", errors.WithStack(err)
-	}
-	dir = realDir
-
 	guardCount := 0
 	for {
 		nodeModuleDir := filepath.Join(dir, "node_modules")

pkg/node-modules/nodeModuleCollector_test.go

@@ -131,3 +131,30 @@ func TestReadDependencyTreeForYarn(t *testing.T) {
 	g.Expect(collector.HoiestedDependencyMap["ms"].Version).To(Equal("2.1.1"))
 	g.Expect(collector.HoiestedDependencyMap["ms"].dir).To(Equal(filepath.Join(Dirname(), "yarn-demo/packages/test-app/node_modules/ms")))
 }
+
+func TestReadDependencyTreeForParse(t *testing.T) {
+	g := NewGomegaWithT(t)
+
+	collector := &Collector{
+		unresolvedDependencies:       make(map[string]bool),
+		excludedDependencies:         make(map[string]bool),
+		NodeModuleDirToDependencyMap: make(map[string]*map[string]*Dependency),
+	}
+
+	dir := path.Join(Dirname(), "parse-demo")
+
+	dependency, err := readPackageJson(dir)
+	dependency.dir = dir
+
+	g.Expect(err).NotTo(HaveOccurred())
+
+	err = collector.readDependencyTree(dependency)
+	g.Expect(err).NotTo(HaveOccurred())
+	collector.processHoistDependencyMap()
+
+	g.Expect(collector.HoiestedDependencyMap["parse-asn1"].dir).To(Equal(filepath.Join(Dirname(), "parse-demo/node_modules/parse-asn1")))
+	g.Expect(collector.HoiestedDependencyMap["parse-asn1"].Version).To(Equal("5.1.7"))
+
+	g.Expect(collector.HoiestedDependencyMap["asn1.js"].dir).To(Equal(filepath.Join(Dirname(), "parse-demo/node_modules/asn1.js")))
+	g.Expect(collector.HoiestedDependencyMap["asn1.js"].Version).To(Equal("4.10.1"))
+}

pkg/node-modules/parse-demo/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "parse-demo",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+     "parse-asn1":"5.1.7"
+  }
+}