Merge pull request #56 from sfc-gh-jlai/main

Add support for scoped packages within monorepos

gazelle/resolve.go

@@ -413,10 +413,19 @@ func (lang *JS) isNpmDependency(imp string, jsConfig *JsConfig) (bool, string, b
 		return true, npmLabel, false
 	}
 
+	// Is the original package found in package.json ?
+	if npmLabel, ok := jsConfig.NpmDependencies.Dependencies[imp]; ok {
+		return true, npmLabel, false
+	}
+
 	if npmLabel, ok := jsConfig.NpmDependencies.DevDependencies[packageRoot]; ok {
 		return true, npmLabel, true
 	}
 
+	if npmLabel, ok := jsConfig.NpmDependencies.DevDependencies[imp]; ok {
+		return true, npmLabel, true
+	}
+
 	// Assume all @ imports are npm dependencies
 	if strings.HasPrefix(imp, "@types/") {
 		// Need to ignore @types/, since these are checked greedily

tests/BUILD

@@ -66,5 +66,6 @@ go_binary(
         "ts_conversion",
         "visibility",
         "web_assets_module",
+        "monorepo",
     ]
 ]

tests/monorepo/package.json

@@ -0,0 +1,7 @@
+{
+  "name": "monorepo",
+  "description": "A test case",
+  "version": "0.0.0",
+  "dependencies": {
+  }
+}

tests/monorepo/project_a/BUILD.in

@@ -0,0 +1,2 @@
+# gazelle:js_package_file package.json :node_modules
+# gazelle:js_collect_all

tests/monorepo/project_a/BUILD.out

@@ -0,0 +1,17 @@
+load("@aspect_rules_js//js:defs.bzl", "js_library")
+load("@aspect_rules_ts//ts:defs.bzl", "ts_project")
+
+# gazelle:js_package_file package.json :node_modules
+# gazelle:js_collect_all
+
+js_library(
+    name = "package_json",
+    srcs = ["package.json"],
+)
+
+ts_project(
+    name = "project_a",
+    srcs = ["a.ts"],
+    data = ["//project_a:node_modules/@emotion/react"],
+    deps = ["//project_a:node_modules/@emotion/react"],
+)

tests/monorepo/project_a/a.ts

@@ -0,0 +1 @@
+import '@emotion/react'

tests/monorepo/project_a/package.json

@@ -0,0 +1,8 @@
+{
+  "name": "monorepo_project_a", 
+  "description": "A test case",
+  "version": "0.0.0",
+  "dependencies": {
+    "@emotion/react": "11.11.4"
+  }
+}