mirror of
https://github.com/safedep/pmg.git
synced 2026-08-03 07:24:09 +02:00
Sahilb315
361095182f
- Fixes issue where only the first package was scanned; now all packages in install command are parsed and processed. - Correctly separates flags (e.g., --save-dev) from package names to avoid treating them as packages. - Applies same fixes to both npm and pnpm flows. - Updated wrapper to scan all packages before installing, maintaining original CLI behavior.
63 lines
1.6 KiB
Go
63 lines
1.6 KiB
Go
package npm
|
|
|
|
import (
|
|
_ "embed"
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/safedep/pmg/pkg/common/utils"
|
|
"github.com/safedep/pmg/pkg/registry"
|
|
"github.com/safedep/pmg/pkg/wrapper"
|
|
"github.com/spf13/cobra"
|
|
)
|
|
|
|
func NewNpmCommand() *cobra.Command {
|
|
cmd := &cobra.Command{
|
|
Use: "npm [action] [package]",
|
|
Short: "Scan packages from npm registry",
|
|
DisableFlagParsing: true,
|
|
RunE: func(cmd *cobra.Command, args []string) error {
|
|
execPath, err := utils.GetExecutablePath(string(registry.RegistryNPM))
|
|
if err != nil {
|
|
fmt.Fprintf(os.Stderr, "npm not found: %v\n", err)
|
|
return err
|
|
}
|
|
|
|
if len(args) >= 2 && utils.IsInstallCommand(string(registry.RegistryNPM), args[0]) {
|
|
<<<<<<< HEAD
|
|
pmw := wrapper.NewPackageManagerWrapper(registry.RegistryNPM)
|
|
pmw.Action = args[0]
|
|
pmw.PackageName = args[1]
|
|
=======
|
|
if err := utils.ValidateEnvVars(); err != nil {
|
|
return err
|
|
}
|
|
|
|
// Parse arguments to separate flags and packages
|
|
flags, packages := utils.ParseNpmInstallArgs(args[1:])
|
|
>>>>>>> 5d0d78d (fix(npm): handle multiple packages and flag parsing correctly)
|
|
|
|
// If no packages specified, just pass through to npm
|
|
if len(packages) == 0 {
|
|
return utils.ExecCmd(execPath, args, []string{})
|
|
}
|
|
|
|
// Create single wrapper instance for all packages
|
|
pmw := wrapper.NewPackageManagerWrapper(registry.RegistryNPM, flags, packages, args[0])
|
|
if err := pmw.Wrap(); err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
if err := utils.ExecCmd(execPath, args, []string{}); err != nil {
|
|
os.Exit(1)
|
|
}
|
|
os.Exit(0)
|
|
return nil
|
|
},
|
|
}
|
|
return cmd
|
|
}
|