Implement client commands for JS with Node

Author: juho05

go.mod

@@ -1,10 +1,10 @@
-module github.com/code-game-project/codegame-cli-go
+module github.com/code-game-project/codegame-cli-js
 
 go 1.18
 
 require (
 	github.com/Bananenpro/cli v0.2.2
-	github.com/code-game-project/go-utils v0.2.8
+	github.com/code-game-project/go-utils v0.2.9
 )
 
 require (

go.sum

@@ -8,6 +8,8 @@ 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/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/code-game-project/go-utils v0.2.9 h1:ezaxxLBAQRwFnIXso+zKPL7AJnuAMIcMwrhLruoyOa8=
+github.com/code-game-project/go-utils v0.2.9/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=

new_client.go

@@ -17,21 +17,24 @@ import (
 //go:embed templates/new/client/package.json.tmpl
 var clientPackageJSONTemplate string
 
-//go:embed templates/new/client/index.js.tmpl
+//go:embed templates/new/client/js/app.js.tmpl
 var clientJSIndexTemplate string
 
-//go:embed templates/new/client/game.js.tmpl
+//go:embed templates/new/client/js/game.js.tmpl
 var clientJSGameTemplate string
 
-//go:embed templates/new/client/tsconfig.json.tmpl
+//go:embed templates/new/client/ts/tsconfig.json.tmpl
 var clientTSConfigTemplate string
 
-//go:embed templates/new/client/index.ts.tmpl
+//go:embed templates/new/client/ts/index.ts.tmpl
 var clientTSIndexTemplate string
 
-//go:embed templates/new/client/game.ts.tmpl
+//go:embed templates/new/client/ts/game.ts.tmpl
 var clientTSGameTemplate string
 
+//go:embed templates/new/client/js/index.html.tmpl
+var clientIndexHTMLTemplate string
+
 func CreateNewClient(projectName string) error {
 	data, err := modules.ReadCommandConfig[modules.NewClientData]()
 	if err != nil {
@@ -102,9 +105,11 @@ func CreateNewClient(projectName string) error {
 		if err != nil {
 			return err
 		}
-		_, err = exec.Execute(true, "npm", "install", "--save-dev", "typescript", "@types/node")
-		if err != nil {
-			return err
+		if typescript {
+			_, err = exec.Execute(true, "npm", "install", "--save-dev", "typescript", "@types/node")
+			if err != nil {
+				return err
+			}
 		}
 		cli.FinishLoading()
 	}
@@ -190,15 +195,21 @@ func execClientTemplate(projectName string, info server.GameInfo, eventNames, co
 		}
 	} else {
 		if !update {
-			err := ExecTemplate(clientJSIndexTemplate, "src/index.js", data)
+			err := ExecTemplate(clientJSIndexTemplate, "app.js", data)
 			if err != nil {
 				return err
 			}
 		}
-		err := ExecTemplate(clientJSGameTemplate, filepath.Join("src", info.Name, "game.js"), data)
+		err := ExecTemplate(clientJSGameTemplate, filepath.Join(info.Name, "game.js"), data)
 		if err != nil {
 			return err
 		}
+		if !node {
+			err := ExecTemplate(clientIndexHTMLTemplate, "index.html", data)
+			if err != nil {
+				return err
+			}
+		}
 	}
 
 	if !update && node {

run.go

@@ -27,7 +27,7 @@ func Run() error {
 	runtime := config.LangConfig["runtime"]
 	node := runtime == "node"
 
-	if !typescript || !node {
+	if !node {
 		panic("not implemented")
 	}
 
@@ -51,7 +51,12 @@ func runClient(url string, args []string, typescript, node bool) error {
 		}
 	}
 
-	cmdArgs := []string{"dist/index.js"}
+	path := "app.js"
+	if typescript {
+		path = "dist/index.js"
+	}
+
+	cmdArgs := []string{path}
 	cmdArgs = append(cmdArgs, args...)
 
 	env := []string{"CG_GAME_URL=" + url}

templates/new/client/game.js.tmpl

@@ -0,0 +1,3 @@
+import { Game, Verbosity } from './{{.GameName}}/game.js';
+
+const { game } = await Game.fromArgv({}, Verbosity.DEBUG);