feat(gno.land/cmd): auto load and sort pkgs from examples (#763)

* feat: add gno.mod to each package * feat: add logic to load and sort gno pkgs * feat(gno.land/cmd): auto load pkgs from examples * fix failing tests * Use more concise if statement * Move pkg loading and sorting logic to gnomod * Fix review comments * Fix gno.mod files * Extract visit() as named func * Skip draft or depends on draft * s/v0.0.0/v0.0.0-latest * Fix `ListPkgs()` * Test `ListPkgs()` * oversight: remove print statement * Export `Pkg` and add field `draft` * Refactor and improvements * make fmt * ListPkgs(): don't skip nested pkgs * Add gno.mod files to `tests/subtests` * No need to subtests manually
gnolang · Jun 19, 2023 · 24770d5 · 24770d5
1 parent 3ec10a9
commit 24770d5
Show file tree

Hide file tree

Showing 49 changed files with 661 additions and 43 deletions.
diff --git a/examples/gno.land/p/demo/acl/gno.mod b/examples/gno.land/p/demo/acl/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/p/demo/acl
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/p/demo/testutils" v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/avl/gno.mod b/examples/gno.land/p/demo/avl/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/demo/avl
diff --git a/examples/gno.land/p/demo/bank/gno.mod b/examples/gno.land/p/demo/bank/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/demo/bank
diff --git a/examples/gno.land/p/demo/blog/gno.mod b/examples/gno.land/p/demo/blog/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/p/demo/blog
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/dom/gno.mod b/examples/gno.land/p/demo/dom/gno.mod
@@ -0,0 +1,5 @@
+module gno.land/p/demo/dom
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/flow/gno.mod b/examples/gno.land/p/demo/flow/gno.mod
@@ -0,0 +1 @@
+module "gno.land/p/demo/flow"
diff --git a/examples/gno.land/p/demo/gnode/gno.mod b/examples/gno.land/p/demo/gnode/gno.mod
@@ -0,0 +1 @@
+module "gno.land/p/demo/gnode"
diff --git a/examples/gno.land/p/demo/grc/exts/gno.mod b/examples/gno.land/p/demo/grc/exts/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/demo/grc/exts
diff --git a/examples/gno.land/p/demo/grc/grc1155/gno.mod b/examples/gno.land/p/demo/grc/grc1155/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/p/demo/grc/grc1155
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/r/demo/users" v0.0.0-latest
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/grc/grc20/gno.mod b/examples/gno.land/p/demo/grc/grc20/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/p/demo/grc/grc20
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+ "gno.land/p/demo/grc/exts" v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/grc/grc721/gno.mod b/examples/gno.land/p/demo/grc/grc721/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/p/demo/grc/grc721
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/r/demo/users" v0.0.0-latest
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/grc/grc777/gno.mod b/examples/gno.land/p/demo/grc/grc777/gno.mod
@@ -0,0 +1,5 @@
+module gno.land/p/demo/grc/grc777
+
+require (
+ "gno.land/p/demo/grc/exts" v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/groups/gno.mod b/examples/gno.land/p/demo/groups/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/p/demo/groups
+
+require (
+ "gno.land/r/demo/boards" v0.0.0-latest
+ "gno.land/p/demo/maths" v0.0.0-latest
+ "gno.land/p/demo/testutils" v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/maths/gno.mod b/examples/gno.land/p/demo/maths/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/demo/maths
diff --git a/examples/gno.land/p/demo/rand/gno.mod b/examples/gno.land/p/demo/rand/gno.mod
@@ -0,0 +1,3 @@
+// Draft
+
+module gno.land/p/demo/rand 
diff --git a/examples/gno.land/p/demo/releases/gno.mod b/examples/gno.land/p/demo/releases/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/demo/releases
diff --git a/examples/gno.land/p/demo/stack/gno.mod b/examples/gno.land/p/demo/stack/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/demo/stack
diff --git a/examples/gno.land/p/demo/tests/gno.mod b/examples/gno.land/p/demo/tests/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/p/demo/tests
+
+require (
+ "gno.land/p/demo/tests/subtests" v0.0.0-latest
+ "gno.land/r/demo/tests" v0.0.0-latest
+)
diff --git a/examples/gno.land/p/demo/tests/subtests/gno.mod b/examples/gno.land/p/demo/tests/subtests/gno.mod
@@ -0,0 +1,4 @@
+module gno.land/p/demo/tests/subtests
+
+// TODO: this file should not exist. 
+// This is a temporary workaround. Until https://github.com/gnolang/gno/issues/852
diff --git a/examples/gno.land/p/demo/testutils/gno.mod b/examples/gno.land/p/demo/testutils/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/demo/testutils
diff --git a/examples/gno.land/p/demo/ufmt/gno.mod b/examples/gno.land/p/demo/ufmt/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/demo/ufmt
diff --git a/examples/gno.land/r/demo/art/gnoface/gno.mod b/examples/gno.land/r/demo/art/gnoface/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/r/demo/art/gnoface
+
+require (
+ "gno.land/p/demo/rand" v0.0.0-latest
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/art/millipede/gno.mod b/examples/gno.land/r/demo/art/millipede/gno.mod
@@ -0,0 +1,5 @@
+module gno.land/r/demo/art/millipede
+
+require (
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/banktest/gno.mod b/examples/gno.land/r/demo/banktest/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/demo/banktest
diff --git a/examples/gno.land/r/demo/boards/gno.mod b/examples/gno.land/r/demo/boards/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/r/demo/boards
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/r/demo/users" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/deep/very/deep/gno.mod b/examples/gno.land/r/demo/deep/very/deep/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/demo/deep/very/deep
diff --git a/examples/gno.land/r/demo/foo1155/gno.mod b/examples/gno.land/r/demo/foo1155/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/r/demo/foo1155
+
+require (
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+ "gno.land/p/demo/grc/grc1155" v0.0.0-latest
+ "gno.land/r/demo/users" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/foo20/gno.mod b/examples/gno.land/r/demo/foo20/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/r/demo/foo20
+
+require (
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+ "gno.land/p/demo/grc/grc20" v0.0.0-latest
+ "gno.land/r/demo/users" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/foo721/gno.mod b/examples/gno.land/r/demo/foo721/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/r/demo/foo721
+
+require (
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+ "gno.land/p/demo/grc/grc721" v0.0.0-latest
+ "gno.land/r/demo/users" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/groups/gno.mod b/examples/gno.land/r/demo/groups/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/r/demo/groups
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/r/demo/users" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/markdown_test/gno.mod b/examples/gno.land/r/demo/markdown_test/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/demo/markdown_test
diff --git a/examples/gno.land/r/demo/nft/gno.mod b/examples/gno.land/r/demo/nft/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/r/demo/nft
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/p/demo/grc/grc721" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/releases_example/gno.mod b/examples/gno.land/r/demo/releases_example/gno.mod
@@ -0,0 +1,5 @@
+module gno.land/r/demo/releases_example
+
+require (
+ "gno.land/p/demo/releases" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/tests/gno.mod b/examples/gno.land/r/demo/tests/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/r/demo/tests
+
+require (
+ "gno.land/p/demo/testutils" v0.0.0-latest
+ "gno.land/r/demo/tests/subtests" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/tests/subtests/gno.mod b/examples/gno.land/r/demo/tests/subtests/gno.mod
@@ -0,0 +1,4 @@
+module gno.land/r/demo/tests/subtests
+
+// TODO: this file should not exist. 
+// This is a temporary workaround. Until https://github.com/gnolang/gno/issues/852
diff --git a/examples/gno.land/r/demo/tests_foo/gno.mod b/examples/gno.land/r/demo/tests_foo/gno.mod
@@ -0,0 +1,5 @@
+module gno.land/r/demo/tests_foo
+
+require (
+ "gno.land/r/demo/tests" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/types/gno.mod b/examples/gno.land/r/demo/types/gno.mod
@@ -0,0 +1,5 @@
+module gno.land/r/demo/types
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/users/gno.mod b/examples/gno.land/r/demo/users/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/r/demo/users
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/p/demo/testutils" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/x/outfmt/gno.mod b/examples/gno.land/r/demo/x/outfmt/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/r/demo/x/outfmt
+
+require (
+ "gno.land/p/demo/rand" v0.0.0-latest
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/demo/x/upgrade/gno.mod b/examples/gno.land/r/demo/x/upgrade/gno.mod
@@ -0,0 +1,3 @@
+// Draft
+
+module gno.land/r/demo/x/upgrade
diff --git a/examples/gno.land/r/gnoland/blog/gno.mod b/examples/gno.land/r/gnoland/blog/gno.mod
@@ -0,0 +1,6 @@
+module gno.land/r/gnoland/blog
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/p/demo/blog" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/gnoland/faucet/gno.mod b/examples/gno.land/r/gnoland/faucet/gno.mod
@@ -0,0 +1,7 @@
+module gno.land/r/gnoland/faucet
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+ "gno.land/p/demo/testutils" v0.0.0-latest
+ "gno.land/p/demo/ufmt" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/system/names/gno.mod b/examples/gno.land/r/system/names/gno.mod
@@ -0,0 +1,5 @@
+module gno.land/r/system/names
+
+require (
+ "gno.land/p/demo/avl" v0.0.0-latest
+)
diff --git a/examples/gno.land/r/system/rewards/gno.mod b/examples/gno.land/r/system/rewards/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/system/rewards
diff --git a/examples/gno.land/r/system/validators/gno.mod b/examples/gno.land/r/system/validators/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/system/validators
diff --git a/gno.land/cmd/gnoland/main.go b/gno.land/cmd/gnoland/main.go
@@ -14,6 +14,7 @@ import (
 
  "github.com/gnolang/gno/gno.land/pkg/gnoland"
  gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
+ "github.com/gnolang/gno/gnovm/pkg/gnomod"
  "github.com/gnolang/gno/tm2/pkg/amino"
  abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types"
  "github.com/gnolang/gno/tm2/pkg/bft/config"
@@ -228,33 +229,25 @@ func makeGenesisDoc(
  // Load initial packages from examples.
  test1 := crypto.MustAddressFromString("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
  txs := []std.Tx{}
- for _, path := range []string{
- "p/demo/ufmt",
- "p/demo/avl",
- "p/demo/grc/exts",
- "p/demo/grc/grc20",
- "p/demo/grc/grc721",
- "p/demo/grc/grc1155",
- "p/demo/maths",
- "p/demo/blog",
- "r/demo/users",
- "r/demo/foo20",
- "r/demo/foo1155",
- "r/demo/boards",
- "r/demo/banktest",
- "r/demo/types",
- "r/demo/markdown_test",
- "r/gnoland/blog",
- "r/gnoland/faucet",
- "r/system/validators",
- "r/system/names",
- "r/system/rewards",
- "r/demo/deep/very/deep",
- } {
+
+ // List initial packages to load from examples.
+ pkgs, err := gnomod.ListPkgs(filepath.Join("..", "examples"))
+ if err != nil {
+ panic(fmt.Errorf("listing gno packages: %w", err))
+ }
+
+ // Sort packages by dependencies.
+ sortedPkgs, err := pkgs.Sort()
+ if err != nil {
+ panic(fmt.Errorf("sorting packages: %w", err))
+ }
+
+ // Filter out draft packages.
+ nonDraftPkgs := sortedPkgs.GetNonDraftPkgs()
+
+ for _, pkg := range nonDraftPkgs {
  // open files in directory as MemPackage.
- fsPath := filepath.Join("..", "examples", "gno.land", path)
- importPath := "gno.land/" + path
- memPkg := gno.ReadMemPackage(fsPath, importPath)
+ memPkg := gno.ReadMemPackage(pkg.Path(), pkg.Name())
  var tx std.Tx
  tx.Msgs = []std.Msg{
  vmm.MsgAddPackage{