Merge pull request #4 from n0izn0iz/no-require

feat: upgrade gno to latest and adapt to `require` support drop

Author: gfanton

go.mod

@@ -5,7 +5,7 @@ module github.com/gnoverse/gnopls
 go 1.23.1
 
 require (
-	github.com/gnolang/gno v0.0.0-20241111130702-2e9f5ce8ecc9
+	github.com/gnolang/gno v0.0.0-20241217133227-fdedae90bfc1
 	github.com/google/go-cmp v0.6.0
 	github.com/jba/templatecheck v0.7.0
 	golang.org/x/mod v0.21.0

go.sum

@@ -51,6 +51,8 @@ github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMo
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gnolang/gno v0.0.0-20241111130702-2e9f5ce8ecc9 h1:KdfD615fbKz7YgrccElqxYAXjUfk1PEp8hG2UbZvheE=
 github.com/gnolang/gno v0.0.0-20241111130702-2e9f5ce8ecc9/go.mod h1:UlU+FYRfmTCIvmid4S7rUuWsjOuIPGSwjREof1T0WAs=
+github.com/gnolang/gno v0.0.0-20241217133227-fdedae90bfc1 h1:w4Yx08+Gwrt1nybd2Bpp/IfJVSFKkbiscE5sfPvaL1o=
+github.com/gnolang/gno v0.0.0-20241217133227-fdedae90bfc1/go.mod h1:xXhCN7qw5tPQqzQ1Qi0LvCl43xgAg/r6lovGUdd2j0U=
 github.com/gnolang/overflow v0.0.0-20170615021017-4d914c927216 h1:GKvsK3oLWG9B1GL7WP/VqwM6C92j5tIvB844oggL9Lk=
 github.com/gnolang/overflow v0.0.0-20170615021017-4d914c927216/go.mod h1:xJhtEL7ahjM1WJipt89gel8tHzfIl/LyMY+lCYh38d8=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

pkg/resolver/driver.go

@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/gnolang/gno/gnovm/pkg/gnoenv"
-	"github.com/gnolang/gno/gnovm/pkg/gnomod"
 	"github.com/gnoverse/gnopls/internal/packages"
 	"github.com/gnoverse/gnopls/pkg/eventlogger"
 )
@@ -100,40 +99,40 @@ func Resolve(req *packages.DriverRequest, patterns ...string) (*packages.DriverR
 
 	// Discover packages
 
-	pkgs := gnomod.PkgList{}
+	gnomods := []string{}
 	for _, target := range targets {
 		dir, file := filepath.Split(target)
 		if file == "..." {
-			pkgQueryRes, err := ListPkgs(dir)
+			gnomodsRes, err := listGnomods(dir)
 			if err != nil {
 				logger.Error("failed to get pkg list", slog.String("error", err.Error()))
 				return nil, err
 			}
-			pkgs = append(pkgs, pkgQueryRes...)
+			gnomods = append(gnomods, gnomodsRes...)
 		} else if strings.HasPrefix(target, "file=") {
 			dir = strings.TrimPrefix(dir, "file=")
-			pkgQueryRes, err := ListPkgs(dir)
+			gnomodsRes, err := listGnomods(dir)
 			if err != nil {
 				logger.Error("failed to get pkg", slog.String("error", err.Error()))
 				return nil, err
 			}
-			if len(pkgQueryRes) != 1 {
+			if len(gnomodsRes) != 1 {
 				logger.Warn("unexpected number of packages",
 					slog.String("arg", target),
-					slog.Int("count", len(pkgQueryRes)),
+					slog.Int("count", len(gnomodsRes)),
 				)
 			}
-			pkgs = append(pkgs, pkgQueryRes...)
+			gnomods = append(gnomods, gnomodsRes...)
 		} else {
 			logger.Warn("unknown arg shape", slog.String("value", target))
 		}
 	}
-	logger.Info("discovered packages", slog.Int("count", len(pkgs)))
+	logger.Info("discovered packages", slog.Int("count", len(gnomods)))
 
 	// Convert packages
 
-	for _, pkg := range pkgs {
-		pkg, err := gnoPkgToGo(&pkg, logger)
+	for _, pkg := range gnomods {
+		pkg, err := gnoPkgToGo(pkg, logger)
 		if err != nil {
 			logger.Error("failed to convert gno pkg to go pkg", slog.String("error", err.Error()))
 			continue

pkg/resolver/resolver.go

@@ -10,18 +10,27 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gnolang/gno/gnovm/pkg/gnomod"
 	"github.com/gnoverse/gnopls/internal/packages"
+	"golang.org/x/mod/modfile"
 )
 
-func gnoPkgToGo(gnoPkg *gnomod.Pkg, logger *slog.Logger) (*packages.Package, error) {
-	// TODO: support subpkgs
-	gnomodFile, err := gnomod.ParseAt(gnoPkg.Dir)
+func gnoPkgToGo(gnomodPath string, logger *slog.Logger) (*packages.Package, error) {
+	gnomodBytes, err := os.ReadFile(gnomodPath)
 	if err != nil {
-		return nil, fmt.Errorf("failed to parse gno module at %q: %w", gnoPkg.Dir, err)
+		return nil, err
+	}
+	gnomodFile, err := modfile.ParseLax(gnomodPath, gnomodBytes, nil)
+	if err != nil {
+		return nil, err
 	}
+	if gnomodFile == nil || gnomodFile.Module == nil {
+		return nil, fmt.Errorf("%s:1:1: missing module", gnomodPath)
+	}
+	dir := filepath.Dir(gnomodPath)
+
+	// TODO: support subpkgs
 
-	pkgDir := filepath.Clean(gnoPkg.Dir)
+	pkgDir := filepath.Clean(dir)
 
 	gnoFiles := []string{}
 	otherFiles := []string{}
@@ -109,8 +118,9 @@ func resolveNameAndImports(gnoFiles []string, logger *slog.Logger) (string, map[
 	return bestName, imports, nil
 }
 
-func ListPkgs(root string) (gnomod.PkgList, error) {
-	var pkgs []gnomod.Pkg
+// listGnomods recursively finds all gnomods at root
+func listGnomods(root string) ([]string, error) {
+	var gnomods []string
 
 	err := filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
 		if err != nil {
@@ -120,40 +130,15 @@ func ListPkgs(root string) (gnomod.PkgList, error) {
 			return nil
 		}
 		gnoModPath := filepath.Join(path, "gno.mod")
-		data, err := os.ReadFile(gnoModPath)
-		if os.IsNotExist(err) {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-
-		gnoMod, err := gnomod.Parse(gnoModPath, data)
-		if err != nil {
-			return nil
-		}
-		gnoMod.Sanitize()
-		if err := gnoMod.Validate(); err != nil {
+		if _, err := os.Stat(gnoModPath); err != nil {
 			return nil
 		}
-
-		pkgs = append(pkgs, gnomod.Pkg{
-			Dir:   path,
-			Name:  gnoMod.Module.Mod.Path,
-			Draft: gnoMod.Draft,
-			Requires: func() []string {
-				var reqs []string
-				for _, req := range gnoMod.Require {
-					reqs = append(reqs, req.Mod.Path)
-				}
-				return reqs
-			}(),
-		})
+		gnomods = append(gnomods, gnoModPath)
 		return nil
 	})
 	if err != nil {
 		return nil, err
 	}
 
-	return pkgs, nil
+	return gnomods, nil
 }