External/pmg
1
0
Fork 0
mirror of https://github.com/safedep/pmg.git synced 2026-08-03 07:24:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: unify package dependency resolution and improve PyPI version handling using registry adapter

Browse Source
This commit is contained in:
Sahilb315
2025-05-20 21:23:48 +05:30
parent 722ee05376
commit 0b4729f18b
9 changed files with 448 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/npm/npm.go
+16 -1
View File
@@ -4,6 +4,7 @@ import (
"context"
"github.com/safedep/dry/log"
"github.com/safedep/pmg/config"
"github.com/safedep/pmg/internal/flows"
"github.com/safedep/pmg/internal/ui"
"github.com/safedep/pmg/packagemanager"
@@ -31,6 +32,20 @@ func executeNpmFlow(ctx context.Context, args []string) error {
if err != nil {
ui.Fatalf("Failed to create npm package manager proxy: %s", err)
}
config, err := config.FromContext(ctx)
if err != nil {
ui.Fatalf("Failed to get config: %s", err)
}
return flows.Common(packageManager).Run(ctx, args)
packageResolverConfig := packagemanager.NewDefaultNpmDependencyResolverConfig()
packageResolverConfig.IncludeTransitiveDependencies = config.Transitive
packageResolverConfig.TransitiveDepth = config.TransitiveDepth
packageResolverConfig.IncludeDevDependencies = config.IncludeDevDependencies
packageResolver, err := packagemanager.NewNpmDependencyResolver(packageResolverConfig)
if err != nil {
ui.Fatalf("Failed to create dependency resolver: %s", err)
}
return flows.Common(packageManager, packageResolver, config).Run(ctx, args)
}
cmd/npm/pnpm.go
+13 -1
View File
@@ -5,6 +5,7 @@ import (
_ "embed"
"github.com/safedep/dry/log"
"github.com/safedep/pmg/config"
"github.com/safedep/pmg/internal/flows"
"github.com/safedep/pmg/internal/ui"
"github.com/safedep/pmg/packagemanager"
@@ -32,6 +33,17 @@ func executePnpmFlow(ctx context.Context, args []string) error {
if err != nil {
ui.Fatalf("Failed to create pnpm package manager proxy: %s", err)
}
config, err := config.FromContext(ctx)
if err != nil {
ui.Fatalf("Failed to get config: %s", err)
}
return flows.Common(packageManager).Run(ctx, args)
packageResolverConfig := packagemanager.NewDefaultNpmDependencyResolverConfig()
packageResolverConfig.IncludeTransitiveDependencies = config.Transitive
packageResolverConfig.TransitiveDepth = config.TransitiveDepth
packageResolverConfig.IncludeDevDependencies = config.IncludeDevDependencies
packageResolver, err := packagemanager.NewNpmDependencyResolver(packageResolverConfig)
return flows.Common(packageManager, packageResolver, config).Run(ctx, args)
}