Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[node] Adding nodejs package alias mapping #276

Merged
merged 1 commit into from
Aug 2, 2024
+46 −4
Merged

[node] Adding nodejs package alias mapping #276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions internal/backends/nodejs/grab.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,10 @@ func filterImports(ctx context.Context, foundPaths map[string]bool) map[string][
}
}

if pkg, ok := moduleToNpmjsPackageAliases[mod]; ok {
mod = pkg
}

pkgs[mod] = []api.PkgName{api.PkgName(mod)}
}

Expand Down
32 changes: 28 additions & 4 deletions internal/backends/nodejs/nodejs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,13 @@ var NodejsYarnBackend = api.LanguageBackend{
}
cmd := []string{"yarn", "add"}
for name, spec := range pkgs {
arg := string(name)
name := string(name)
if found, ok := moduleToYarnpkgPackageAliases[name]; ok {
delete(pkgs, api.PkgName(name))
name = found
pkgs[api.PkgName(name)] = api.PkgSpec(spec)
}
arg := name
if spec != "" {
arg += "@" + string(spec)
}
Expand Down Expand Up @@ -493,7 +499,13 @@ var NodejsPNPMBackend = api.LanguageBackend{
}
cmd := []string{"pnpm", "add"}
for name, spec := range pkgs {
arg := string(name)
name := string(name)
if found, ok := moduleToNpmjsPackageAliases[name]; ok {
delete(pkgs, api.PkgName(name))
name = found
pkgs[api.PkgName(name)] = api.PkgSpec(spec)
}
arg := name
if spec != "" {
arg += "@" + string(spec)
}
Expand Down Expand Up @@ -587,7 +599,13 @@ var NodejsNPMBackend = api.LanguageBackend{
}
cmd := []string{"npm", "install"}
for name, spec := range pkgs {
arg := string(name)
name := string(name)
if found, ok := moduleToNpmjsPackageAliases[name]; ok {
delete(pkgs, api.PkgName(name))
name = found
pkgs[api.PkgName(name)] = api.PkgSpec(spec)
}
arg := name
if spec != "" {
arg += "@" + string(spec)
}
Expand Down Expand Up @@ -671,7 +689,13 @@ var BunBackend = api.LanguageBackend{
}
cmd := []string{"bun", "add"}
for name, spec := range pkgs {
arg := string(name)
name := string(name)
if found, ok := moduleToNpmjsPackageAliases[name]; ok {
delete(pkgs, api.PkgName(name))
name = found
pkgs[api.PkgName(name)] = api.PkgSpec(spec)
}
arg := name
if spec != "" {
arg += "@" + string(spec)
}
Expand Down
14 changes: 14 additions & 0 deletions internal/backends/nodejs/nodejs.override.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package nodejs

/* Proxy packages
*
* These are packages that provide helpful aliases, but otherwise provide no functionality.
* We should prefer the real version.
*/
var moduleToNpmjsPackageAliases = map[string]string{
"tsc": "typescript",
}

var moduleToYarnpkgPackageAliases = map[string]string{
"tsc": "typescript",
}
Loading