feat(cli): implement yomo run --production to skip compile step (#1093)

Author: fanweixiao

cli/cli.go

@@ -64,11 +64,16 @@ func loadOptionsFromViper(v *viper.Viper, opts *serverless.Options) {
 	opts.Runtime = v.GetString("runtime")
 }
 
+// parseFileArg parses the filename from command line arguments or uses default files if none provided.
+// It updates the given serverless.Options with the filename and validates it via checkOptions.
+// Returns nil if a valid filename is found, otherwise continues trying default files.
 func parseFileArg(args []string, opts *serverless.Options, defaultFiles ...string) error {
+	// parse filename from args, like `yomo run app.go`
 	if len(args) >= 1 && args[0] != "" {
 		opts.Filename = args[0]
 		return checkOptions(opts)
 	}
+	// if no filename is provided, use the default files
 	for _, f := range defaultFiles {
 		opts.Filename = f
 		err := checkOptions(opts)

cli/run.go

@@ -67,9 +67,14 @@ var runCmd = &cobra.Command{
 			return
 		}
 
-		if err := s.Build(true); err != nil {
-			log.FailureStatusEvent(os.Stdout, "%s", err.Error())
-			os.Exit(127)
+		// if has `--production` flag, skip s.Build() process
+		isProduction := opts.Production
+		log.InfoStatusEvent(os.Stdout, "production mode is %v", opts.Production)
+		if !isProduction {
+			if err := s.Build(true); err != nil {
+				log.FailureStatusEvent(os.Stdout, "%s", err.Error())
+				os.Exit(127)
+			}
 		}
 
 		log.InfoStatusEvent(
@@ -93,6 +98,7 @@ func init() {
 	runCmd.Flags().StringVarP(&opts.ModFile, "modfile", "m", "", "custom go.mod")
 	runCmd.Flags().StringVarP(&opts.Credential, "credential", "d", "", "client credential payload, eg: `token:dBbBiRE7`")
 	runCmd.Flags().StringVarP(&opts.Runtime, "runtime", "r", "", "serverless runtime type")
+	runCmd.Flags().BoolVarP(&opts.Production, "production", "p", false, "run in production mode, skip the build process")
 
 	viper.BindPFlags(viper.RunViper, runCmd.Flags())
 }

cli/serverless/nodejs/runtime.go

@@ -89,10 +89,11 @@ func (w *NodejsWrapper) WorkDir() string {
 
 // Build defines how to build the serverless llm function.
 func (w *NodejsWrapper) Build(env []string) error {
-	// 1. generate .wrapper.ts file
-	dstPath := filepath.Join(w.workDir, wrapperTS)
+	// 1. generate ./src/.wrapper.ts file
+	dstPath := filepath.Join(w.workDir, "src/", wrapperTS)
+	// remove the old one
 	_ = os.Remove(dstPath)
-
+	// create new one
 	if err := w.genWrapperTS(w.functionName, dstPath); err != nil {
 		return err
 	}
@@ -137,80 +138,44 @@ func (w *NodejsWrapper) Build(env []string) error {
 		return err
 	}
 
-	// 4. copy files other than .ts file from src/ to dist/src/ because tsc do not do that
-	srcDir := filepath.Join(w.workDir, "src")
-	dstDir := filepath.Join(w.workDir, "dist/src")
-	if err := os.MkdirAll(dstDir, 0755); err != nil {
-		return err
-	}
-	// copy all files from src/ to dist/
-	err = filepath.Walk(srcDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if path == srcDir {
-			return nil
-		}
-
-		// Get relative path to maintain directory structure
-		relPath, err := filepath.Rel(srcDir, path)
-		if err != nil {
-			return fmt.Errorf("failed to get relative path: %v", err)
-		}
-
-		if filepath.Ext(path) == ".ts" {
-			return nil
-		}
+	// 4. copy src/app.ts to dist/app.ts
+	baseFileName := filepath.Base(w.entryTSFile)
+	srcEntryPath := w.entryTSFile
+	dstEntryPath := filepath.Join(w.outputDir, baseFileName)
 
-		// Create destination path with same structure
-		dstPath := filepath.Join(dstDir, relPath)
+	data, err := os.ReadFile(srcEntryPath)
+	if err != nil {
+		return fmt.Errorf("failed to read file %s: %v", srcEntryPath, err)
+	}
 
-		// Check if the destination directory exists
-		dstDir := filepath.Dir(dstPath)
-		if _, err := os.Stat(dstDir); os.IsNotExist(err) {
-			return fmt.Errorf("destination directory %s does not exist", dstDir)
-		}
+	if err := os.WriteFile(dstEntryPath, data, 0644); err != nil {
+		return fmt.Errorf("failed to write file %s: %v", dstEntryPath, err)
+	}
 
-		// Copy the file to ./dist/src/
-		if info.IsDir() {
-			return os.MkdirAll(dstPath, info.Mode())
-		} else {
-			// Read the source file
-			data, err := os.ReadFile(path)
-			if err != nil {
-				return fmt.Errorf("failed to read file %s: %v", path, err)
-			}
-
-			// Write to the destination file
-			if err := os.WriteFile(dstPath, data, info.Mode()); err != nil {
-				return fmt.Errorf("failed to write file %s: %v", dstPath, err)
-			}
-
-			log.InfoStatusEvent(os.Stdout, "copied %s to %s\n", path, dstPath)
-			return nil
-		}
-	})
+	// log.InfoStatusEvent(os.Stdout, "Copied %s to %s", srcEntryPath, dstEntryPath)
 
 	return err
 }
 
 // Run runs the serverless function
 func (w *NodejsWrapper) Run(env []string) error {
+	// ./dist/.wrapper.js
+	entryJSFile := filepath.Join(w.outputDir, wrapperJS)
 	// try to run with bunjs
 	// first, check if bun is installed
 	bunPath, err := exec.LookPath("bun")
 	if err == nil {
 		// bun is installed, run the wrapper with bun
-		// get the version of tsgo/tsc
+		// get the version of bun
 		var bunVersion string
 		if v, err := checkVersion("bun"); err != nil {
 			return err
 		} else {
 			bunVersion = v
 		}
-		log.InfoStatusEvent(os.Stdout, "Runtime is Bun (Version %s)", bunVersion)
+		log.InfoStatusEvent(os.Stdout, "Runtime is Bun (Version %s), %s", bunVersion, entryJSFile)
 
-		cmd := exec.Command(bunPath, wrapperTS)
+		cmd := exec.Command(bunPath, "run", entryJSFile)
 		cmd.Dir = w.workDir
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
@@ -220,18 +185,27 @@ func (w *NodejsWrapper) Run(env []string) error {
 	}
 
 	// if bun is not found, fallback to nodejs
-	cmd := exec.Command(w.nodePath, filepath.Join(w.outputDir, wrapperJS))
+	cmd := exec.Command(w.nodePath, entryJSFile)
 	cmd.Dir = w.workDir
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	cmd.Env = env
 
+	var nodeVersion string
+	if v, err := checkVersion("node"); err != nil {
+		return err
+	} else {
+		nodeVersion = v
+	}
+
+	log.InfoStatusEvent(os.Stdout, "Runtime is Node.js (Version %s), %s, %s", nodeVersion, w.nodePath, entryJSFile)
+
 	return cmd.Run()
 }
 
 func (w *NodejsWrapper) genWrapperTS(functionName, dstPath string) error {
-	baseFilename := "./src/" + filepath.Base(w.fileName)
-	entryTS := baseFilename + ".ts"
+	baseFilename := "./" + filepath.Base(w.fileName)
+	entryTS := "./dist/" + baseFilename + ".ts"
 
 	data := struct {
 		WorkDir      string

cli/serverless/nodejs/serverless.go

@@ -43,10 +43,11 @@ func (s *nodejsServerless) Setup(opts *serverless.Options) error {
     "module": "commonjs",
     "forceConsistentCasingInFileNames": true,
     "strict": true,
-    "outDir": "dist",
+    "outDir": "./dist",
+    "rootDir": "./src",
     "skipLibCheck": true
   },
-  "include": ["src/**/*", ".wrapper.ts"],
+  "include": ["src/**/*", "src/.wrapper.ts"],
   "exclude": ["node_modules"]
 }`
 		if err := os.WriteFile(tsconfigPath, []byte(tsconfigContent), 0644); err != nil {

cli/serverless/options.go

@@ -14,4 +14,6 @@ type Options struct {
 	Credential string
 	// Runtime specifies the serverless runtime environment type
 	Runtime string
+	// Production indicates whether to run in production mode
+	Production bool
 }

cli/serverless/serverless.go

@@ -56,8 +56,10 @@ func LoadEnvFile(envDir string) error {
 	return nil
 }
 
-// Create returns a new serverless instance with options.
+// Create returns a new serverless instance with options
 func Create(opts *Options) (Serverless, error) {
+	// TODO: need refactor to infer serverless runtime from `--runtime` flag or `RUNTIME` env,
+	// instead of inferring from file extension here.
 	ext := filepath.Ext(opts.Filename)
 
 	driversMu.RLock()

go.mod

@@ -4,7 +4,7 @@ go 1.23.0
 
 require (
 	cloud.google.com/go/vertexai v0.13.4
-	github.com/anthropics/anthropic-sdk-go v1.2.0
+	github.com/anthropics/anthropic-sdk-go v1.2.1
 	github.com/briandowns/spinner v1.23.2
 	github.com/caarlos0/env/v6 v6.10.1
 	github.com/fatih/color v1.18.0
@@ -17,7 +17,7 @@ require (
 	github.com/matoous/go-nanoid/v2 v2.1.0
 	github.com/quic-go/quic-go v0.52.0
 	github.com/robfig/cron/v3 v3.0.1
-	github.com/sashabaranov/go-openai v1.40.0
+	github.com/sashabaranov/go-openai v1.40.1
 	github.com/shirou/gopsutil/v3 v3.24.5
 	github.com/spf13/cobra v1.9.1
 	github.com/spf13/pflag v1.0.6

go.sum

@@ -27,8 +27,8 @@ dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D
 git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
-github.com/anthropics/anthropic-sdk-go v1.2.0 h1:RQzJUqaROewrPTl7Rl4hId/TqmjFvfnkmhHJ6pP1yJ8=
-github.com/anthropics/anthropic-sdk-go v1.2.0/go.mod h1:AapDW22irxK2PSumZiQXYUFvsdQgkwIWlpESweWZI/c=
+github.com/anthropics/anthropic-sdk-go v1.2.1 h1:zwRsDe3+KEJNDwKdbtum4P3UsQ9Uc8y/WmBE+V2WElk=
+github.com/anthropics/anthropic-sdk-go v1.2.1/go.mod h1:AapDW22irxK2PSumZiQXYUFvsdQgkwIWlpESweWZI/c=
 github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
 github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -184,8 +184,8 @@ github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sagikazarmark/locafero v0.9.0 h1:GbgQGNtTrEmddYDSAH9QLRyfAHY12md+8YFTqyMTC9k=
 github.com/sagikazarmark/locafero v0.9.0/go.mod h1:UBUyz37V+EdMS3hDF3QWIiVr/2dPrx49OMO0Bn0hJqk=
-github.com/sashabaranov/go-openai v1.40.0 h1:Peg9Iag5mUJtPW00aYatlsn97YML0iNULiLNe74iPrU=
-github.com/sashabaranov/go-openai v1.40.0/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
+github.com/sashabaranov/go-openai v1.40.1 h1:bJ08Iwct5mHBVkuvG6FEcb9MDTfsXdTYPGjYLRdeTEU=
+github.com/sashabaranov/go-openai v1.40.1/go.mod h1:lj5b/K+zjTSFxVLijLSTDZuP7adOgerWeFyZLUhAKRg=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI=
 github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk=

pkg/wrapper/wrapper.go

@@ -26,13 +26,13 @@ type SFNWrapper interface {
 	Run(env []string) error
 }
 
-// BuildAndRun builds and runs the serverless function.
-func BuildAndRun(name, zipperAddr, credential string, wrapper SFNWrapper, env []string) error {
-	if err := wrapper.Build(env); err != nil {
-		return err
-	}
-	return Run(name, zipperAddr, credential, wrapper, env)
-}
+// // BuildAndRun builds and runs the serverless function.
+// func BuildAndRun(name, zipperAddr, credential string, wrapper SFNWrapper, env []string) error {
+// 	if err := wrapper.Build(env); err != nil {
+// 		return err
+// 	}
+// 	return Run(name, zipperAddr, credential, wrapper, env)
+// }
 
 // Run runs the serverless function.
 func Run(name, zipperAddr, credential string, wrapper SFNWrapper, env []string) error {