move codegen to cmd to avoid package conflict without build:ignore

abi/generator.go → cmd/codegen/abi/main.go

@@ -1,8 +1,7 @@
-//go:build ignore
-
 package main
 
 import (
+	"flag"
 	"fmt"
 	"go/format"
 	"io/fs"
@@ -14,15 +13,15 @@ import (
 	"github.com/tonkeeper/tongo/abi/parser"
 )
 
-const HEADER = `package abi
-// Code autogenerated. DO NOT EDIT. 
+const HEADER = `// Code generated - DO NOT EDIT.
+
+package abi
 
 import (
 %v
 )
 
 `
-const SCHEMAS_PATH = "schemas/"
 
 func mergeMethods(methods []parser.GetMethod) ([]parser.GetMethod, error) {
 	methodsMap := map[string]parser.GetMethod{}
@@ -51,9 +50,13 @@ func mergeMethods(methods []parser.GetMethod) ([]parser.GetMethod, error) {
 }
 
 func main() {
+	schemasDir := flag.String("schemas", "abi/schemas", "directory containing XML TLB schemas")
+	outputDir := flag.String("output", "abi", "directory to write generated files")
+	flag.Parse()
+
 	var abi parser.ABI
 	var methods []parser.GetMethod
-	filepath.Walk(SCHEMAS_PATH, func(path string, info fs.FileInfo, err error) error {
+	filepath.Walk(*schemasDir, func(path string, info fs.FileInfo, err error) error {
 		if !strings.HasSuffix(info.Name(), ".xml") {
 			return nil
 		}
@@ -127,7 +130,7 @@ func main() {
 		{nfts, "nfts_msg_types.go", `"github.com/tonkeeper/tongo/boc"`, `"github.com/tonkeeper/tongo/tlb"`},
 		{contractErrors, "contracts_errors.go"},
 	} {
-		file, err := os.Create(f[1])
+		file, err := os.Create(filepath.Join(*outputDir, f[1]))
 		if err != nil {
 			panic(err)
 		}
@@ -145,8 +148,11 @@ func main() {
 		if err != nil {
 			panic(err)
 		}
+		fmt.Println(filepath.Join(*outputDir, f[1]))
 	}
-	if err := os.WriteFile("messages.md", []byte(messagesMD), 0644); err != nil {
+	mdPath := filepath.Join(*outputDir, "messages.md")
+	if err := os.WriteFile(mdPath, []byte(messagesMD), 0644); err != nil {
 		panic(err)
 	}
+	fmt.Println(mdPath)
 }

tlb/generator-config.go → cmd/codegen/config/main.go

@@ -1,15 +1,20 @@
-//go:build ignore
-
 package main
 
 import (
+	"flag"
+	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/tonkeeper/tongo/tlb/parser"
 )
 
 func main() {
-	content, err := os.ReadFile("config.tlb")
+	input := flag.String("input", "tlb/config.tlb", "path to config.tlb")
+	outputDir := flag.String("output", "tlb", "directory to write generated files")
+	flag.Parse()
+
+	content, err := os.ReadFile(*input)
 	if err != nil {
 		panic(err)
 	}
@@ -23,12 +28,13 @@ func main() {
 		panic(err)
 	}
 	file := parser.File{
-		Name:    "config.go",
+		Name:    filepath.Join(*outputDir, "config.go"),
 		Package: "tlb",
 		Imports: []string{"encoding/json", "fmt"},
 		Code:    s,
 	}
 	if err := file.Save(); err != nil {
 		panic(err)
 	}
+	fmt.Println(file.Name)
 }

cmd/codegen/integers/main.go

@@ -0,0 +1,50 @@
+package main
+
+import (
+	"flag"
+	"fmt"
+	"go/format"
+	"os"
+	"path/filepath"
+
+	"github.com/tonkeeper/tongo/tlb/parser"
+)
+
+var bitsSizes = []int{80, 96, 128, 256, 264, 320, 352, 512}
+var intSizes = []int{128, 256, 257}
+var uintSizes = []int{128, 160, 220, 256}
+
+func main() {
+	outputDir := flag.String("output", "tlb", "directory to write generated files")
+	flag.Parse()
+
+	src := `// Code generated - DO NOT EDIT.
+
+package tlb
+
+import (
+	"bytes"
+	"encoding/hex"
+	"fmt"
+	"math/big"
+	"strconv"
+	"strings"
+
+	"github.com/tonkeeper/tongo/boc"
+)
+` + parser.GenerateVarUintTypes(32) +
+		parser.GenerateConstantInts(64) +
+		parser.GenerateConstantBigInts(intSizes) +
+		parser.GenerateConstantBigUints(uintSizes) +
+		parser.GenerateBitsTypes(bitsSizes)
+
+	formatted, err := format.Source([]byte(src))
+	if err != nil {
+		panic(err)
+	}
+	outPath := filepath.Join(*outputDir, "integers.go")
+	if err := os.WriteFile(outPath, formatted, 0644); err != nil {
+		panic(err)
+	}
+	fmt.Println(outPath)
+}

liteclient/generator.go → cmd/codegen/liteclient/main.go

@@ -1,16 +1,21 @@
-//go:build ignore
-
 package main
 
 import (
+	"flag"
 	"fmt"
-	"github.com/tonkeeper/tongo/tl/parser"
-	"io/ioutil"
+	"go/format"
 	"os"
+	"path/filepath"
+
+	"github.com/tonkeeper/tongo/tl/parser"
 )
 
 func main() {
-	scheme, err := ioutil.ReadFile("lite_api.tl")
+	input := flag.String("input", "liteclient/lite_api.tl", "path to lite_api.tl")
+	outputDir := flag.String("output", "liteclient", "directory to write generated files")
+	flag.Parse()
+
+	scheme, err := os.ReadFile(*input)
 	if err != nil {
 		panic(err)
 	}
@@ -30,12 +35,9 @@ func main() {
 		panic(err)
 	}
 
-	f, err := os.Create("generated.go")
-	if err != nil {
-		panic(err)
-	}
-	_, err = fmt.Fprint(f, `package liteclient
-// Code autogenerated. DO NOT EDIT. 
+	src := `// Code generated - DO NOT EDIT.
+
+package liteclient
 
 import (
 	"bytes"
@@ -45,16 +47,15 @@ import (
 	"github.com/tonkeeper/tongo/tl"
 	"io"
 )
-`)
-	if err != nil {
-		panic(err)
-	}
-	_, err = f.WriteString(types)
+` + types + functions
+
+	formatted, err := format.Source([]byte(src))
 	if err != nil {
 		panic(err)
 	}
-	_, err = f.WriteString(functions)
-	if err != nil {
+	outPath := filepath.Join(*outputDir, "generated.go")
+	if err := os.WriteFile(outPath, formatted, 0644); err != nil {
 		panic(err)
 	}
+	fmt.Println(outPath)
 }

generate.go

@@ -0,0 +1,6 @@
+package tongo
+
+//ignore(broken) go:generate go run ../cmd/codegen/config
+//go:generate go run ./cmd/codegen/abi -schemas abi/schemas -output abi
+//go:generate go run ./cmd/codegen/integers -output tlb
+//go:generate go run ./cmd/codegen/liteclient -input liteclient/lite_api.tl -output liteclient

liteclient/extensions.go

@@ -1,7 +1,5 @@
 package liteclient
 
-//go:generate go run generator.go
-
 import (
 	"bytes"
 	"fmt"

tl/parser/generator.go

@@ -6,10 +6,11 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
-	"github.com/tonkeeper/tongo/utils"
 	"go/format"
 	"strings"
 	"text/template"
+
+	"github.com/tonkeeper/tongo/utils"
 )
 
 type DefaultType struct {
@@ -636,6 +637,5 @@ func (g *Generator) generateRequestDecoder() string {
 		panic(err)
 		return ""
 	}
-	fmt.Printf("%s", buf.String())
 	return buf.String()
 }