fix: issues with pnpm workspaces with ../ importers (#97)

e2e/pnpm_workspace/lib/a/index.js

@@ -1,7 +1,9 @@
 const packageJson = require('./package.json')
+const e = require('@aspect-test/e')
 module.exports = {
     id: () =>
         `${packageJson.name}@${
             packageJson.version ? package.version : '0.0.0'
         }`,
+    idE: () => e.id(),
 }

e2e/pnpm_workspace/lib/b/index.js

@@ -1,7 +1,9 @@
 const packageJson = require('./package.json')
+const f = require('@aspect-test/f')
 module.exports = {
     id: () =>
         `${packageJson.name}@${
             packageJson.version ? package.version : '0.0.0'
         }`,
+    idF: () => f.id(),
 }

e2e/pnpm_workspace_dot_dot/.bazelignore

@@ -0,0 +1,5 @@
+root/node_modules/
+app/a/node_modules/
+app/b/node_modules/
+lib/a/node_modules/
+lib/b/node_modules/

e2e/pnpm_workspace_dot_dot/.bazelrc

@@ -0,0 +1,2 @@
+# import common bazelrc shared with e2e workspaces
+import %workspace%/../../.bazelrc.common

e2e/pnpm_workspace_dot_dot/.bazelversion

@@ -0,0 +1 @@
+../../.bazelversion

e2e/pnpm_workspace_dot_dot/WORKSPACE

@@ -0,0 +1,32 @@
+local_repository(
+    name = "aspect_rules_js",
+    path = "../..",
+)
+
+load("@aspect_rules_js//js:repositories.bzl", "rules_js_dependencies")
+
+rules_js_dependencies()
+
+load("@rules_nodejs//nodejs:repositories.bzl", "nodejs_register_toolchains")
+
+nodejs_register_toolchains(
+    name = "nodejs",
+    node_version = "16.9.0",
+)
+
+load("@aspect_bazel_lib//lib:repositories.bzl", "DEFAULT_YQ_VERSION", "register_yq_toolchains")
+
+register_yq_toolchains(
+    version = DEFAULT_YQ_VERSION,
+)
+
+load("@aspect_rules_js//js:npm_import.bzl", "translate_pnpm_lock")
+
+translate_pnpm_lock(
+    name = "npm",
+    pnpm_lock = "//root:pnpm-lock.yaml",
+)
+
+load("@npm//:repositories.bzl", "npm_repositories")
+
+npm_repositories()

e2e/pnpm_workspace_dot_dot/app/a/BUILD.bazel

@@ -0,0 +1,31 @@
+load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_test")
+load("@npm//:defs.bzl", "link_js_packages")
+
+link_js_packages()
+
+js_binary(
+    name = "main",
+    args = ["foo"],
+    data = [
+        "@npm//@aspect-test/a",
+        "@npm//@aspect-test/b",
+        "@npm//@aspect-test/c",
+        "@npm//dot_dot/app/a/@aspect-test/g",
+        "@npm//dot_dot/app/a/@lib/a",
+    ],
+    entry_point = "main.js",
+)
+
+js_test(
+    name = "test",
+    args = ["foo"],
+    data = [
+        "@npm//@aspect-test/a",
+        "@npm//@aspect-test/b",
+        "@npm//@aspect-test/c",
+        "@npm//dot_dot/app/a/@aspect-test/g",
+        "@npm//dot_dot/app/a/@lib/a",
+    ],
+    entry_point = "main.js",
+    verbose = True,
+)

e2e/pnpm_workspace_dot_dot/app/a/main.js

@@ -0,0 +1,6 @@
+console.log(process.argv)
+console.log('--@aspect-test/a--', require('@aspect-test/a').id())
+console.log('--@aspect-test/b--', require('@aspect-test/b').id())
+console.log('--@aspect-test/c--', require('@aspect-test/c').id())
+console.log('--@aspect-test/g--', require('@aspect-test/g').id())
+console.log('--@lib/a--', require('@lib/a').id())

e2e/pnpm_workspace_dot_dot/app/a/package.json

@@ -0,0 +1,11 @@
+{
+    "name": "@app/a",
+    "private": true,
+    "dependencies": {
+        "@aspect-test/a": "1.0.0",
+        "@aspect-test/b": "1.0.0",
+        "@aspect-test/c": "1.0.0",
+        "@aspect-test/g": "1.0.0",
+        "@lib/a": "workspace:*"
+    }
+}

e2e/pnpm_workspace_dot_dot/app/b/BUILD.bazel

@@ -0,0 +1,33 @@
+load("@aspect_rules_js//js:defs.bzl", "js_binary", "js_test")
+load("@npm//:defs.bzl", "link_js_packages")
+
+link_js_packages()
+
+js_binary(
+    name = "main",
+    args = ["foo"],
+    data = [
+        "@npm//@aspect-test/a",
+        "@npm//@aspect-test/b",
+        "@npm//@aspect-test/c",
+        "@npm//dot_dot/app/b/@aspect-test/h",
+        "@npm//dot_dot/app/b/@lib/b",
+        "@npm//dot_dot/app/b/@lib/b_alias",
+    ],
+    entry_point = "main.js",
+)
+
+js_test(
+    name = "test",
+    args = ["foo"],
+    data = [
+        "@npm//@aspect-test/a",
+        "@npm//@aspect-test/b",
+        "@npm//@aspect-test/c",
+        "@npm//dot_dot/app/b/@aspect-test/h",
+        "@npm//dot_dot/app/b/@lib/b",
+        "@npm//dot_dot/app/b/@lib/b_alias",
+    ],
+    entry_point = "main.js",
+    verbose = True,
+)

e2e/pnpm_workspace_dot_dot/app/b/main.js

@@ -0,0 +1,7 @@
+console.log(process.argv)
+console.log('--@aspect-test/a--', require('@aspect-test/a').id())
+console.log('--@aspect-test/b--', require('@aspect-test/b').id())
+console.log('--@aspect-test/c--', require('@aspect-test/c').id())
+console.log('--@aspect-test/h--', require('@aspect-test/h').id())
+console.log('--@lib/b--', require('@lib/b').id())
+console.log('--@lib/b_alias--', require('@lib/b_alias').id())

e2e/pnpm_workspace_dot_dot/app/b/package.json

@@ -0,0 +1,12 @@
+{
+    "name": "@app/b",
+    "private": true,
+    "dependencies": {
+        "@aspect-test/a": "1.0.0",
+        "@aspect-test/b": "1.0.0",
+        "@aspect-test/c": "1.0.0",
+        "@aspect-test/h": "1.0.0",
+        "@lib/b": "workspace:*",
+        "@lib/b_alias": "workspace:@lib/b@*"
+    }
+}

e2e/pnpm_workspace_dot_dot/lib/a/BUILD.bazel

@@ -0,0 +1,13 @@
+load("@aspect_rules_js//js:defs.bzl", "js_package")
+load("@npm//:defs.bzl", "link_js_packages")
+
+link_js_packages()
+
+js_package(
+    name = "a",
+    srcs = [
+        "index.js",
+        "package.json",
+    ],
+    visibility = ["//visibility:public"],
+)

e2e/pnpm_workspace_dot_dot/lib/a/index.js

@@ -0,0 +1,9 @@
+const packageJson = require('./package.json')
+const e = require('@aspect-test/e')
+module.exports = {
+    id: () =>
+        `${packageJson.name}@${
+            packageJson.version ? package.version : '0.0.0'
+        }`,
+    idE: () => e.id(),
+}

e2e/pnpm_workspace_dot_dot/lib/a/package.json

@@ -0,0 +1,8 @@
+{
+    "name": "@lib/a",
+    "private": true,
+    "dependencies": {
+        "@aspect-test/e": "1.0.0",
+        "@lib/b": "workspace:*"
+    }
+}

e2e/pnpm_workspace_dot_dot/lib/b/BUILD.bazel

@@ -0,0 +1,13 @@
+load("@aspect_rules_js//js:defs.bzl", "js_package")
+load("@npm//:defs.bzl", "link_js_packages")
+
+link_js_packages()
+
+js_package(
+    name = "b",
+    srcs = [
+        "index.js",
+        "package.json",
+    ],
+    visibility = ["//visibility:public"],
+)

e2e/pnpm_workspace_dot_dot/lib/b/index.js

@@ -0,0 +1,9 @@
+const packageJson = require('./package.json')
+const f = require('@aspect-test/f')
+module.exports = {
+    id: () =>
+        `${packageJson.name}@${
+            packageJson.version ? package.version : '0.0.0'
+        }`,
+    idF: () => f.id(),
+}

e2e/pnpm_workspace_dot_dot/lib/b/package.json

@@ -0,0 +1,7 @@
+{
+    "name": "@lib/b",
+    "private": true,
+    "dependencies": {
+        "@aspect-test/f": "1.0.0"
+    }
+}

e2e/pnpm_workspace_dot_dot/root/BUILD.bazel

@@ -0,0 +1,3 @@
+load("@npm//:defs.bzl", "link_js_packages")
+
+link_js_packages()

e2e/pnpm_workspace_dot_dot/root/package.json

@@ -0,0 +1,13 @@
+{
+    "name": "simple",
+    "packageManager": "[email protected]",
+    "dependencies": {
+        "@aspect-test/a": "5.0.0"
+    },
+    "devDependencies": {
+        "@aspect-test/b": "5.0.0"
+    },
+    "optionalDependencies": {
+        "@aspect-test/c": "2.0.0"
+    }
+}