test: add nested package json case (#40)

JounQin · autofix-ci[bot] · web-flow · commit c0c056a9b030 · 2025-03-29T12:16:44.000+08:00
Co-authored-by: autofix-ci[bot] &lt;114827586+autofix-ci[bot]@users.noreply.github.com&gt;
diff --git a/.github/actions/pnpm/action.yml b/.github/actions/pnpm/action.yml
@@ -28,9 +28,16 @@ runs:
         corepack enable
         pnpm install
 
-    - name: yarn
+    - name: yarn pnp
       shell: bash
       run: |
         cd fixtures/pnp
         corepack enable
         yarn install
+
+    - name: nested-package-json
+      shell: bash
+      run: |
+        cd fixtures/misc/nested-package-json
+        corepack enable
+        yarn install
diff --git a/fixtures/misc/nested-package-json/.gitignore b/fixtures/misc/nested-package-json/.gitignore
@@ -0,0 +1,6 @@
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
diff --git a/fixtures/misc/nested-package-json/.yarnrc.yml b/fixtures/misc/nested-package-json/.yarnrc.yml
@@ -0,0 +1,3 @@
+enableTelemetry: false
+
+nodeLinker: node-modules
diff --git a/fixtures/misc/nested-package-json/package.json b/fixtures/misc/nested-package-json/package.json
@@ -0,0 +1,7 @@
+{
+  "name": "nested-test",
+  "packageManager": "yarn@4.8.0",
+  "dependencies": {
+    "@root/package": "link:./package"
+  }
+}
diff --git a/fixtures/misc/nested-package-json/package/nested/package.json b/fixtures/misc/nested-package-json/package/nested/package.json
@@ -0,0 +1,4 @@
+{
+  "main": "../output/nested.js",
+  "types": "../output/nested.d.ts"
+}
diff --git a/fixtures/misc/nested-package-json/package/output/index.d.ts b/fixtures/misc/nested-package-json/package/output/index.d.ts
diff --git a/fixtures/misc/nested-package-json/package/output/index.js b/fixtures/misc/nested-package-json/package/output/index.js
diff --git a/fixtures/misc/nested-package-json/package/output/nested.d.ts b/fixtures/misc/nested-package-json/package/output/nested.d.ts
diff --git a/fixtures/misc/nested-package-json/package/output/nested.js b/fixtures/misc/nested-package-json/package/output/nested.js
diff --git a/fixtures/misc/nested-package-json/package/package.json b/fixtures/misc/nested-package-json/package/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@root/package",
+  "version": "0.0.1",
+  "main": "./output/index.js",
+  "types": "./output/index.d.ts"
+}
diff --git a/fixtures/misc/nested-package-json/yarn.lock b/fixtures/misc/nested-package-json/yarn.lock
@@ -0,0 +1,20 @@
+# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 8
+  cacheKey: 10c0
+
+"@root/package@link:./package::locator=nested-test%40workspace%3A.":
+  version: 0.0.0-use.local
+  resolution: "@root/package@link:./package::locator=nested-test%40workspace%3A."
+  languageName: node
+  linkType: soft
+
+"nested-test@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "nested-test@workspace:."
+  dependencies:
+    "@root/package": "link:./package"
+  languageName: unknown
+  linkType: soft
diff --git a/fixtures/pnp/package.json b/fixtures/pnp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pnp",
-  "packageManager": "yarn@4.7.0",
+  "packageManager": "yarn@4.8.0",
   "dependencies": {
     "beachball": "^2.51.0",
     "is-even": "^1.0.0",
diff --git a/justfile b/justfile
@@ -15,6 +15,7 @@ init:
 install:
   pnpm install
   cd fixtures/pnp && yarn
+  cd fixtures/misc/nested-package-json && yarn
 
 # When ready, run the same CI commands
 ready:
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
@@ -3,3 +3,5 @@ packages:
   - napi
   - fixtures/pnpm
   - fixtures/pnpm-workspace/**
+ignoredBuiltDependencies:
+  - esbuild
diff --git a/src/tests/resolve.rs b/src/tests/resolve.rs
@@ -118,6 +118,23 @@ fn resolve_hash_as_module() {
     assert_eq!(resolution, Err(ResolveError::NotFound("#a".into())));
 }
 
+#[test]
+fn resolve_nested_dir_with_package_json() {
+    let f = super::fixture_root().join("misc/nested-package-json");
+    let resolver = Resolver::new(ResolveOptions::default());
+
+    #[rustfmt::skip]
+    let data = [
+        ("normal entry", f.clone(), "@root/package", f.join("package/output/index.js")),
+        ("nested entry", f.clone(), "@root/package/nested", f.join("package/output/nested.js")),
+    ];
+
+    for (comment, path, request, expected) in data {
+        let resolved_path = resolver.resolve(&path, request).map(|r| r.full_path());
+        assert_eq!(resolved_path, Ok(expected), "{comment} {path:?} {request}");
+    }
+}
+
 #[cfg(windows)]
 #[test]
 fn resolve_normalized_on_windows() {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+enableTelemetry: false`
	`2`	`+`
	`3`	`+nodeLinker: node-modules`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +{
 +  "name": "nested-test",
 +  "packageManager": "[email protected]",
 +  "dependencies": {
 +    "@root/package": "link:./package"
 +  }
 +}