feat: replace pubspec.lock parser

Author: G-Rath

pkg/lockfile/parse-pubspec-lock.go

@@ -1,93 +1,11 @@
 package lockfile
 
 import (
-	"fmt"
-	"os"
-
-	"gopkg.in/yaml.v3"
+	"github.com/google/osv-scalibr/extractor/filesystem/language/dart/pubspec"
 )
 
-type PubspecLockDescription struct {
-	Name string `yaml:"name"`
-	URL  string `yaml:"url"`
-	Path string `yaml:"path"`
-	Ref  string `yaml:"resolved-ref"`
-}
-
-func (pld *PubspecLockDescription) UnmarshalYAML(value *yaml.Node) error {
-	var m struct {
-		Name string `yaml:"name"`
-		URL  string `yaml:"url"`
-		Path string `yaml:"path"`
-		Ref  string `yaml:"resolved-ref"`
-	}
-
-	err := value.Decode(&m)
-
-	if err == nil {
-		pld.Name = m.Name
-		pld.Path = m.Path
-		pld.URL = m.URL
-		pld.Ref = m.Ref
-
-		return nil
-	}
-
-	var str *string
-
-	err = value.Decode(&str)
-
-	if err != nil {
-		return fmt.Errorf("%w", err)
-	}
-
-	pld.Path = *str
-
-	return nil
-}
-
-type PubspecLockPackage struct {
-	Source      string                 `yaml:"source"`
-	Description PubspecLockDescription `yaml:"description"`
-	Version     string                 `yaml:"version"`
-}
-
-type PubspecLockfile struct {
-	Packages map[string]PubspecLockPackage `yaml:"packages,omitempty"`
-	Sdks     map[string]string             `yaml:"sdks"`
-}
-
 const PubEcosystem Ecosystem = "Pub"
 
 func ParsePubspecLock(pathToLockfile string) ([]PackageDetails, error) {
-	var parsedLockfile *PubspecLockfile
-
-	lockfileContents, err := os.ReadFile(pathToLockfile)
-
-	if err != nil {
-		return []PackageDetails{}, fmt.Errorf("could not read %s: %w", pathToLockfile, err)
-	}
-
-	err = yaml.Unmarshal(lockfileContents, &parsedLockfile)
-
-	if err != nil {
-		return []PackageDetails{}, fmt.Errorf("could not parse %s: %w", pathToLockfile, err)
-	}
-	if parsedLockfile == nil {
-		return []PackageDetails{}, nil
-	}
-
-	packages := make([]PackageDetails, 0, len(parsedLockfile.Packages))
-
-	for name, pkg := range parsedLockfile.Packages {
-		packages = append(packages, PackageDetails{
-			Name:      name,
-			Version:   pkg.Version,
-			Commit:    pkg.Description.Ref,
-			Ecosystem: PubEcosystem,
-			CompareAs: PubEcosystem,
-		})
-	}
-
-	return packages, nil
+	return extract(pathToLockfile, pubspec.New(), PubEcosystem)
 }

pkg/lockfile/parse-pubspec-lock_test.go

@@ -33,10 +33,7 @@ func TestParsePubspecLock_Empty(t *testing.T) {
 
 	packages, err := lockfile.ParsePubspecLock("testdata/pub/empty.lock")
 
-	if err != nil {
-		t.Errorf("Got unexpected error: %v", err)
-	}
-
+	expectErrContaining(t, err, "could not parse")
 	expectPackages(t, packages, []lockfile.PackageDetails{})
 }