Implement new client command for typescript with Node.js

Author: juho05

build.go

@@ -0,0 +1,37 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/code-game-project/go-utils/cgfile"
+	"github.com/code-game-project/go-utils/modules"
+)
+
+func Build() error {
+	config, err := cgfile.LoadCodeGameFile("")
+	if err != nil {
+		return err
+	}
+
+	data, err := modules.ReadCommandConfig[modules.BuildData]()
+	if err != nil {
+		return err
+	}
+
+	switch config.Type {
+	case "client":
+		return buildClient(config.Game, data.Output, config.URL)
+	case "server":
+		return buildServer(data.Output)
+	default:
+		return fmt.Errorf("Unknown project type: %s", config.Type)
+	}
+}
+
+func buildClient(gameName, output, url string) error {
+	return nil
+}
+
+func buildServer(output string) error {
+	return nil
+}

go.mod

@@ -1,11 +1,10 @@
-module github.com/code-game-project/codegame-cli-js
+module github.com/code-game-project/codegame-cli-go
 
 go 1.18
 
 require (
-	github.com/Bananenpro/cli v0.1.2
-	github.com/code-game-project/codegame-cli v0.5.0
-	github.com/spf13/pflag v1.0.5
+	github.com/Bananenpro/cli v0.2.2
+	github.com/code-game-project/go-utils v0.2.8
 )
 
 require (
@@ -15,7 +14,8 @@ require (
 	github.com/mattn/go-colorable v0.1.12 // indirect
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d // indirect
-	golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 // indirect
-	golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 // indirect
+	golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 // indirect
+	golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
 	golang.org/x/text v0.3.7 // indirect
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )

go.sum

@@ -1,13 +1,13 @@
 github.com/AlecAivazis/survey/v2 v2.3.5 h1:A8cYupsAZkjaUmhtTYv3sSqc7LO5mp1XDfqe5E/9wRQ=
 github.com/AlecAivazis/survey/v2 v2.3.5/go.mod h1:4AuI9b7RjAR+G7v9+C4YSlX/YL3K3cWNXgWXOhllqvI=
-github.com/Bananenpro/cli v0.1.2 h1:X6Fb80PxfhIItabAjp4G9roLCpj7Q0FvYc5jxX/8nAw=
-github.com/Bananenpro/cli v0.1.2/go.mod h1:JBXpIAXo/D0rlsfgCViQBicjcJY6UWUldmxvKM+ijRc=
+github.com/Bananenpro/cli v0.2.2 h1:7nMlgMGMT1rxkuqCiJuo/Jd89HTnw9psE3h/vQW57nk=
+github.com/Bananenpro/cli v0.2.2/go.mod h1:JBXpIAXo/D0rlsfgCViQBicjcJY6UWUldmxvKM+ijRc=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2 h1:+vx7roKuyA63nhn5WAunQHLTznkw5W8b1Xc0dNjp83s=
 github.com/Netflix/go-expect v0.0.0-20220104043353-73e0943537d2/go.mod h1:HBCaDeC1lPdgDeDbhX8XFpy1jqjK0IBG8W5K+xYqA0w=
 github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
 github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
-github.com/code-game-project/codegame-cli v0.5.0 h1:1lB0lIy8JcCuOhGpUvoxr/2CaRnGZ7FV3Xpy1t0VOFE=
-github.com/code-game-project/codegame-cli v0.5.0/go.mod h1:EIgSdxiXvcgVuGLmhMgif+jpyPyi4o0xelpMHhRJG0I=
+github.com/code-game-project/go-utils v0.2.8 h1:f6ZvORWmlf8uZnCSAhLJ23MdA5dGvcAPkijTLfbv+B4=
+github.com/code-game-project/go-utils v0.2.8/go.mod h1:kQ6kH9XDzdM2pnJUI1lw61Gp8XOams/E2dKABa1mBI8=
 github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
 github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -28,8 +28,6 @@ github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQ
 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
@@ -40,15 +38,16 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220422013727-9388b58f7150/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68 h1:z8Hj/bl9cOV2grsOpEaQFUaly0JWN3i97mo3jXKJNp0=
-golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220804214406-8e32c043e418 h1:9vYwv7OjYaky/tlAeD7C4oC9EsPTlaFl1H2jS++V+ME=
+golang.org/x/sys v0.0.0-20220804214406-8e32c043e418/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20210503060354-a79de5458b56/go.mod h1:tfny5GFUkzUvx4ps4ajbZsCe5lw1metzhBm9T3x7oIY=
-golang.org/x/term v0.0.0-20220526004731-065cf7ba2467 h1:CBpWXWQpIRjzmkkA+M7q9Fqnwd2mZr3AFqexg8YTfoM=
-golang.org/x/term v0.0.0-20220526004731-065cf7ba2467/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
+golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

main.go

@@ -4,38 +4,13 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/Bananenpro/cli"
-	"github.com/code-game-project/codegame-cli-js/new/client"
-	"github.com/code-game-project/codegame-cli-js/new/server"
-	"github.com/spf13/pflag"
 )
 
 func main() {
-	var gameName string
-	pflag.StringVar(&gameName, "game-name", "", "The name of the game. (required for clients)")
-
-	var url string
-	pflag.StringVar(&url, "url", "", "The URL of the game. (required for clients)")
-
-	var libraryVersion string
-	pflag.StringVar(&libraryVersion, "library-version", "latest", "The version of the JavaScript library to use, e.g. 0.8")
-
-	var typescript bool
-	pflag.BoolVar(&typescript, "typescript", false, "Whether to use TypeScript or JavaScript.")
-
-	pflag.Usage = func() {
-		fmt.Fprintf(os.Stderr, "Usage: %s <command> [...]\n", os.Args[0])
-		fmt.Fprintln(os.Stderr, "\nCommands:")
-		fmt.Fprintln(os.Stderr, "\tnew \tCreate a new project.")
-		fmt.Fprintln(os.Stderr, "\nOptions:")
-		pflag.PrintDefaults()
-	}
-
-	pflag.Parse()
-	if pflag.NArg() < 2 {
-		pflag.Usage()
+	if len(os.Args) < 2 {
+		fmt.Fprintf(os.Stderr, "USAGE: %s <command> [...]\n", os.Args[0])
 		os.Exit(1)
 	}
 
@@ -45,31 +20,35 @@ func main() {
 	}
 	projectName := filepath.Base(workingDir)
 
-	command := strings.ToLower(pflag.Arg(0))
-
-	switch command {
+	switch os.Args[1] {
 	case "new":
-		err = new(projectName, url, libraryVersion, typescript)
+		if len(os.Args) < 3 {
+			fmt.Fprintf(os.Stderr, "USAGE: %s new <client|server>\n", os.Args[0])
+			os.Exit(1)
+		}
+		switch os.Args[2] {
+		case "client":
+			err = CreateNewClient(projectName)
+		case "server":
+			err = CreateNewServer(projectName)
+		default:
+			fmt.Fprintln(os.Stderr, "Unknown project type:", os.Args[2])
+			os.Exit(1)
+		}
+	case "update":
+		err = Update()
+	case "run":
+		err = Run()
+	case "build":
+		err = Build()
 	default:
-		err = cli.Error("Unknown command: %s\n", command)
+		fmt.Fprintln(os.Stderr, "Unknown command:", os.Args[1])
+		os.Exit(1)
 	}
 	if err != nil {
+		if err != cli.ErrCanceled {
+			cli.Error(err.Error())
+		}
 		os.Exit(1)
 	}
 }
-
-func new(projectName, url, libraryVersion string, typescript bool) error {
-	projectType := strings.ToLower(pflag.Arg(1))
-
-	var err error
-	switch projectType {
-	case "client":
-		err = client.CreateNewClient(projectName, url, libraryVersion, typescript)
-	case "server":
-		err = server.CreateNewServer(projectName, libraryVersion)
-	default:
-		err = cli.Error("Unknown project type: %s\n", projectType)
-	}
-
-	return err
-}