use slices.DeleteFunc, and some minor fixes

Author: savil

go.mod

@@ -39,8 +39,8 @@ require (
 	github.com/stretchr/testify v1.8.2
 	github.com/wk8/go-ordered-map/v2 v2.1.8
 	github.com/zealic/go2node v0.1.0
-	golang.org/x/exp v0.0.0-20230321023759-10a507213a29
-	golang.org/x/mod v0.9.0
+	golang.org/x/exp v0.0.0-20230807204917-050eac23e9de
+	golang.org/x/mod v0.11.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 )

go.sum

@@ -223,10 +223,10 @@ github.com/yuin/gopher-lua v0.0.0-20190514113301-1cd887cd7036/go.mod h1:gqRgreBU
 github.com/zaffka/mongodb-boltdb-mock v0.0.0-20221014194232-b4bb03fbe3a0/go.mod h1:GsDD1qsG+86MeeCG7ndi6Ei3iGthKL3wQ7PTFigDfNY=
 github.com/zealic/go2node v0.1.0 h1:ofxpve08cmLJBwFdI0lPCk9jfwGWOSD+s6216x0oAaA=
 github.com/zealic/go2node v0.1.0/go.mod h1:GrkFr+HctXwP7vzcU9RsgtAeJjTQ6Ud0IPCQAqpTfBg=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
-golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
-golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/exp v0.0.0-20230807204917-050eac23e9de h1:l5Za6utMv/HsBWWqzt4S8X17j+kt1uVETUX5UFhn2rE=
+golang.org/x/exp v0.0.0-20230807204917-050eac23e9de/go.mod h1:FXUEEKJgO7OQYeo8N01OfiKP8RXMtf6e8aTskBGqWdc=
+golang.org/x/mod v0.11.0 h1:bUO06HqtnRcc/7l71XBe4WcqTZ+3AH1J59zWDDwLKgU=
+golang.org/x/mod v0.11.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

internal/devconfig/packages.go

@@ -6,6 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 	orderedmap "github.com/wk8/go-ordered-map/v2"
+	"golang.org/x/exp/slices"
 )
 
 type jsonKind int
@@ -33,7 +34,7 @@ type Packages struct {
 // example:
 // ["package1", "package2@latest", "[email protected]"]
 func (pkgs *Packages) VersionedNames() []string {
-	result := []string{}
+	result := make([]string, 0, len(pkgs.Collection))
 	for _, p := range pkgs.Collection {
 		name := p.name
 		if p.Version != "" {
@@ -51,15 +52,11 @@ func (pkgs *Packages) Add(versionedName string) {
 }
 
 // Remove removes a package from the list of packages
-func (pkgs *Packages) Remove(versionedName string) error {
+func (pkgs *Packages) Remove(versionedName string) {
 	name, version := parseVersionedName(versionedName)
-	for idx, pkg := range pkgs.Collection {
-		if pkg.name == name && pkg.Version == version {
-			pkgs.Collection = append(pkgs.Collection[:idx], pkgs.Collection[idx+1:]...)
-			return nil
-		}
-	}
-	return errors.Errorf("package %s not found", versionedName)
+	pkgs.Collection = slices.DeleteFunc(pkgs.Collection, func(pkg Package) bool {
+		return pkg.name == name && pkg.Version == version
+	})
 }
 
 func (pkgs *Packages) UnmarshalJSON(data []byte) error {
@@ -97,7 +94,7 @@ func (pkgs *Packages) UnmarshalJSON(data []byte) error {
 
 func (pkgs *Packages) MarshalJSON() ([]byte, error) {
 	if pkgs.jsonKind == jsonList {
-		packagesList := []string{}
+		packagesList := make([]string, 0, len(pkgs.Collection))
 		for _, p := range pkgs.Collection {
 
 			// Version may be empty for unversioned packages
@@ -167,15 +164,14 @@ func (p *Package) UnmarshalJSON(data []byte) error {
 	}
 
 	// Second, attempt to unmarshal as a Package struct
-	type Alias Package // Use an alias-type to avoid infinite recursion
-	alias := &Alias{}
+	type packageAlias Package // Use an alias-type to avoid infinite recursion
+	alias := &packageAlias{}
 	if err := json.Unmarshal(data, alias); err != nil {
 		return errors.WithStack(err)
 	}
 
-	// more robust way to copy all fields from alias?
+	*p = Package(*alias)
 	p.kind = regular
-	p.Version = alias.Version
 	return nil
 }
 
@@ -185,8 +181,8 @@ func (p Package) MarshalJSON() ([]byte, error) {
 	}
 
 	// If we have a regular package, we want to marshal the entire struct:
-	type Alias Package // Use an alias-type to avoid infinite recursion
-	return json.Marshal((Alias)(p))
+	type packageAlias Package // Use an alias-type to avoid infinite recursion
+	return json.Marshal((packageAlias)(p))
 }
 
 // parseVersionedName parses the name and version from package@version representation

internal/impl/packages.go

@@ -136,9 +136,7 @@ func (d *Devbox) Remove(ctx context.Context, pkgs ...string) error {
 		found, _ := d.findPackageByName(pkg)
 		if found != "" {
 			packagesToUninstall = append(packagesToUninstall, found)
-			if err := d.cfg.Packages.Remove(found); err != nil {
-				return errors.WithStack(err)
-			}
+			d.cfg.Packages.Remove(found)
 		} else {
 			missingPkgs = append(missingPkgs, pkg)
 		}