feat: deno runtime for typescript

.golangci.yaml

@@ -76,6 +76,7 @@ linters:
     gosec:
       excludes:
         - G306
+        - G110 # Potential DoS vulnerability via decompression bomb
     wsl_v5:
       allow-whole-block: true
     wrapcheck:

cmd/nelm/chart.go

@@ -18,14 +18,14 @@ func newChartCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*cobra.
 		cli.GroupCommandOptions{},
 	)
 
-	cmd.AddCommand(newChartInitCommand(ctx, afterAllCommandsBuiltFuncs))
 	cmd.AddCommand(newChartRenderCommand(ctx, afterAllCommandsBuiltFuncs))
 	cmd.AddCommand(newChartDependencyCommand(ctx, afterAllCommandsBuiltFuncs))
 	cmd.AddCommand(newChartDownloadCommand(ctx, afterAllCommandsBuiltFuncs))
 	cmd.AddCommand(newChartUploadCommand(ctx, afterAllCommandsBuiltFuncs))
 	cmd.AddCommand(newChartPackCommand(ctx, afterAllCommandsBuiltFuncs))
 	cmd.AddCommand(newChartLintCommand(ctx, afterAllCommandsBuiltFuncs))
 	cmd.AddCommand(newChartSecretCommand(ctx, afterAllCommandsBuiltFuncs))
+	cmd.AddCommand(newChartTSCommand(ctx, afterAllCommandsBuiltFuncs))
 
 	return cmd
 }

cmd/nelm/chart_lint.go

@@ -261,6 +261,20 @@ func newChartLintCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*co
 			return fmt.Errorf("add flag: %w", err)
 		}
 
+		if err := cli.AddFlag(cmd, &cfg.IgnoreBundleJS, "ignore-bundle-js", false, IgnoreBundleJSFlagDescription, cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                tsFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
+		if err := cli.AddFlag(cmd, &cfg.DenoBinaryPath, "deno-binary-path", "", "Path to the Deno binary to use instead of auto-downloading.", cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                tsFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
 		if err := cli.AddFlag(cmd, &cfg.LogColorMode, "color-mode", common.DefaultLogColorMode, "Color mode for logs. "+allowedLogColorModesHelp(), cli.AddFlagOptions{
 			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
 			Group:                miscFlagGroup,

cmd/nelm/chart_pack.go

@@ -11,12 +11,13 @@ import (
 	"github.com/werf/common-go/pkg/cli"
 	helm_v3 "github.com/werf/nelm/internal/helm/cmd/helm"
 	"github.com/werf/nelm/internal/helm/pkg/chart/loader"
+	"github.com/werf/nelm/internal/helm/pkg/werf/helmopts"
 	"github.com/werf/nelm/internal/ts"
-	"github.com/werf/nelm/pkg/featgate"
 	"github.com/werf/nelm/pkg/log"
 )
 
 func newChartPackCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*cobra.Command]func(cmd *cobra.Command) error) *cobra.Command {
+	opts := helmopts.TypeScriptOptions{}
 	cmd := lo.Must(lo.Find(helmRootCmd.Commands(), func(c *cobra.Command) bool {
 		return strings.HasPrefix(c.Use, "package")
 	}))
@@ -33,23 +34,28 @@ func newChartPackCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*co
 		helmSettings := helm_v3.Settings
 
 		ctx = log.SetupLogging(ctx, lo.Ternary(helmSettings.Debug, log.DebugLevel, log.InfoLevel), log.SetupLoggingOptions{})
+		ctx = ts.NewContextWithTSOptions(ctx, opts)
+		cmd.SetContext(ctx)
 
 		loader.NoChartLockWarning = ""
 
-		if featgate.FeatGateTypescript.Enabled() {
-			for _, chartPath := range args {
-				if err := ts.BuildVendorBundleToDir(ctx, chartPath); err != nil {
-					return fmt.Errorf("build TypeScript vendor bundle in %q: %w", chartPath, err)
-				}
-			}
-		}
-
 		if err := originalRunE(cmd, args); err != nil {
 			return err
 		}
 
 		return nil
 	}
 
+	afterAllCommandsBuiltFuncs[cmd] = func(cmd *cobra.Command) error {
+		if err := cli.AddFlag(cmd, &opts.DenoBinaryPath, "deno-binary-path", "", "Path to the Deno binary to use instead of auto-downloading.", cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                tsFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
+		return nil
+	}
+
 	return cmd
 }

cmd/nelm/chart_render.go

@@ -248,6 +248,20 @@ func newChartRenderCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*
 			return fmt.Errorf("add flag: %w", err)
 		}
 
+		if err := cli.AddFlag(cmd, &cfg.IgnoreBundleJS, "ignore-bundle-js", false, IgnoreBundleJSFlagDescription, cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                tsFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
+		if err := cli.AddFlag(cmd, &cfg.DenoBinaryPath, "deno-binary-path", "", "Path to the Deno binary to use instead of auto-downloading.", cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                tsFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
 		if err := cli.AddFlag(cmd, &cfg.LogColorMode, "color-mode", common.DefaultLogColorMode, "Color mode for logs. "+allowedLogColorModesHelp(), cli.AddFlagOptions{
 			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
 			Group:                miscFlagGroup,

cmd/nelm/chart_ts.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"context"
+
+	"github.com/spf13/cobra"
+
+	"github.com/werf/common-go/pkg/cli"
+)
+
+func newChartTSCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*cobra.Command]func(cmd *cobra.Command) error) *cobra.Command {
+	cmd := cli.NewGroupCommand(
+		ctx,
+		"ts",
+		"Manage TypeScript charts.",
+		"Manage TypeScript charts.",
+		tsCmdGroup,
+		cli.GroupCommandOptions{},
+	)
+
+	cmd.AddCommand(newChartTSInitCommand(ctx, afterAllCommandsBuiltFuncs))
+	cmd.AddCommand(newChartTSBuildCommand(ctx, afterAllCommandsBuiltFuncs))
+
+	return cmd
+}

cmd/nelm/chart_init.go → cmd/nelm/chart_ts_build.go

@@ -13,23 +13,23 @@ import (
 	"github.com/werf/nelm/pkg/log"
 )
 
-type chartInitConfig struct {
-	action.ChartInitOptions
+type chartTSBuildConfig struct {
+	action.ChartTSBuildOptions
 
 	LogColorMode string
 	LogLevel     string
 }
 
-func newChartInitCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*cobra.Command]func(cmd *cobra.Command) error) *cobra.Command {
-	cfg := &chartInitConfig{}
+func newChartTSBuildCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*cobra.Command]func(cmd *cobra.Command) error) *cobra.Command {
+	cfg := &chartTSBuildConfig{}
 
 	cmd := cli.NewSubCommand(
 		ctx,
-		"init [PATH]",
-		"Initialize a new chart.",
-		"Initialize a new chart in the specified directory. If PATH is not specified, uses the current directory.",
+		"build [PATH]",
+		"Build TypeScript chart.",
+		"Build TypeScript chart in the specified directory. If PATH is not specified, uses the current directory.",
 		10, // priority for ordering in help
-		chartCmdGroup,
+		tsCmdGroup,
 		cli.SubCommandOptions{
 			Args: cobra.MaximumNArgs(1),
 			ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
@@ -45,39 +45,40 @@ func newChartInitCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*co
 				cfg.ChartDirPath = args[0]
 			}
 
-			if err := action.ChartInit(ctx, cfg.ChartInitOptions); err != nil {
-				return fmt.Errorf("chart init: %w", err)
+			if err := action.ChartTSBuild(ctx, cfg.ChartTSBuildOptions); err != nil {
+				return fmt.Errorf("chart build: %w", err)
 			}
 
 			return nil
 		},
 	)
 
 	afterAllCommandsBuiltFuncs[cmd] = func(cmd *cobra.Command) error {
-		if err := cli.AddFlag(cmd, &cfg.TS, "ts", false, "Initialize TypeScript chart", cli.AddFlagOptions{
-			Group: mainFlagGroup,
+		if err := cli.AddFlag(cmd, &cfg.LogColorMode, "color-mode", common.DefaultLogColorMode, "Color mode for logs. "+allowedLogColorModesHelp(), cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                miscFlagGroup,
 		}); err != nil {
 			return fmt.Errorf("add flag: %w", err)
 		}
 
-		if err := cli.AddFlag(cmd, &cfg.TempDirPath, "temp-dir", "", "The directory for temporary files. By default, create a new directory in the default system directory for temporary files", cli.AddFlagOptions{
-			GetEnvVarRegexesFunc: cli.GetFlagGlobalEnvVarRegexes,
+		if err := cli.AddFlag(cmd, &cfg.LogLevel, "log-level", string(log.InfoLevel), "Set log level. "+allowedLogLevelsHelp(), cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
 			Group:                miscFlagGroup,
-			Type:                 cli.FlagTypeDir,
 		}); err != nil {
 			return fmt.Errorf("add flag: %w", err)
 		}
 
-		if err := cli.AddFlag(cmd, &cfg.LogColorMode, "color-mode", common.DefaultLogColorMode, "Color mode for logs. "+allowedLogColorModesHelp(), cli.AddFlagOptions{
+		if err := cli.AddFlag(cmd, &cfg.DenoBinaryPath, "deno-binary-path", "", "Path to the Deno binary to use instead of auto-downloading.", cli.AddFlagOptions{
 			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
-			Group:                miscFlagGroup,
+			Group:                tsFlagGroup,
 		}); err != nil {
 			return fmt.Errorf("add flag: %w", err)
 		}
 
-		if err := cli.AddFlag(cmd, &cfg.LogLevel, "log-level", string(log.InfoLevel), "Set log level. "+allowedLogLevelsHelp(), cli.AddFlagOptions{
-			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+		if err := cli.AddFlag(cmd, &cfg.TempDirPath, "temp-dir", "", "The directory for temporary files. By default, create a new directory in the default system directory for temporary files", cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalEnvVarRegexes,
 			Group:                miscFlagGroup,
+			Type:                 cli.FlagTypeDir,
 		}); err != nil {
 			return fmt.Errorf("add flag: %w", err)
 		}

cmd/nelm/chart_ts_init.go

@@ -0,0 +1,83 @@
+package main
+
+import (
+	"cmp"
+	"context"
+	"fmt"
+
+	"github.com/spf13/cobra"
+
+	"github.com/werf/common-go/pkg/cli"
+	"github.com/werf/nelm/pkg/action"
+	"github.com/werf/nelm/pkg/common"
+	"github.com/werf/nelm/pkg/log"
+)
+
+type chartTSInitConfig struct {
+	action.ChartTSInitOptions
+
+	LogColorMode string
+	LogLevel     string
+}
+
+func newChartTSInitCommand(ctx context.Context, afterAllCommandsBuiltFuncs map[*cobra.Command]func(cmd *cobra.Command) error) *cobra.Command {
+	cfg := &chartTSInitConfig{}
+
+	cmd := cli.NewSubCommand(
+		ctx,
+		"init [PATH]",
+		"Initialize the files needed to render manifests using TypeScript.",
+		"Initialize the files needed to render manifests using TypeScript. If PATH is not specified, uses the current directory.",
+		20, // priority for ordering in help
+		tsCmdGroup,
+		cli.SubCommandOptions{
+			Args: cobra.MaximumNArgs(1),
+			ValidArgsFunction: func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+				return nil, cobra.ShellCompDirectiveFilterDirs
+			},
+		},
+		func(cmd *cobra.Command, args []string) error {
+			ctx = log.SetupLogging(ctx, cmp.Or(log.Level(cfg.LogLevel), log.InfoLevel), log.SetupLoggingOptions{
+				ColorMode: cfg.LogColorMode,
+			})
+
+			if len(args) > 0 {
+				cfg.ChartDirPath = args[0]
+			}
+
+			if err := action.ChartTSInit(ctx, cfg.ChartTSInitOptions); err != nil {
+				return fmt.Errorf("chart ts init: %w", err)
+			}
+
+			return nil
+		},
+	)
+
+	afterAllCommandsBuiltFuncs[cmd] = func(cmd *cobra.Command) error {
+		if err := cli.AddFlag(cmd, &cfg.TempDirPath, "temp-dir", "", "The directory for temporary files. By default, create a new directory in the default system directory for temporary files", cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalEnvVarRegexes,
+			Group:                miscFlagGroup,
+			Type:                 cli.FlagTypeDir,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
+		if err := cli.AddFlag(cmd, &cfg.LogColorMode, "color-mode", common.DefaultLogColorMode, "Color mode for logs. "+allowedLogColorModesHelp(), cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                miscFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
+		if err := cli.AddFlag(cmd, &cfg.LogLevel, "log-level", string(log.InfoLevel), "Set log level. "+allowedLogLevelsHelp(), cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                miscFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
+		return nil
+	}
+
+	return cmd
+}

cmd/nelm/common.go

@@ -9,6 +9,8 @@ import (
 	"github.com/werf/nelm/pkg/log"
 )
 
+const IgnoreBundleJSFlagDescription = "Do not use the existing bundle.js file. Requires TypeScript source files and Deno to rebuild."
+
 var helmRootCmd *cobra.Command
 
 func allowedLogColorModesHelp() string {

cmd/nelm/groups.go

@@ -9,13 +9,15 @@ var (
 	chartCmdGroup           = cli.NewCommandGroup("chart", "Chart commands:", 90)
 	secretCmdGroup          = cli.NewCommandGroup("secret", "Secret commands:", 80)
 	dependencyCmdGroup      = cli.NewCommandGroup("dependency", "Dependency commands:", 70)
+	tsCmdGroup              = cli.NewCommandGroup("ts", "TypeScript commands:", 60)
 	repoCmdGroup            = cli.NewCommandGroup("repo", "Repo commands:", 60)
 	miscCmdGroup            = cli.NewCommandGroup("misc", "Other commands:", 0)
 	mainFlagGroup           = cli.NewFlagGroup("main", "Options:", 100)
 	valuesFlagGroup         = cli.NewFlagGroup("values", "Values options:", 90)
 	secretFlagGroup         = cli.NewFlagGroup("secret", "Secret options:", 80)
 	resourceValidationGroup = cli.NewFlagGroup("resource-validation", "Resource validation options:", 75)
 	patchFlagGroup          = cli.NewFlagGroup("patch", "Patch options:", 70)
+	tsFlagGroup             = cli.NewFlagGroup("typescript", "TypeScript options:", 67)
 	progressFlagGroup       = cli.NewFlagGroup("progress", "Progress options:", 65)
 	chartRepoFlagGroup      = cli.NewFlagGroup("chart-repo", "Chart repository options:", 60)
 	kubeConnectionFlagGroup = cli.NewFlagGroup("kube-connection", "Kubernetes connection options:", 50)

cmd/nelm/release_install.go

@@ -313,6 +313,20 @@ func newReleaseInstallCommand(ctx context.Context, afterAllCommandsBuiltFuncs ma
 			return fmt.Errorf("add flag: %w", err)
 		}
 
+		if err := cli.AddFlag(cmd, &cfg.IgnoreBundleJS, "ignore-bundle-js", false, IgnoreBundleJSFlagDescription, cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                tsFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
+		if err := cli.AddFlag(cmd, &cfg.DenoBinaryPath, "deno-binary-path", "", "Path to the Deno binary to use instead of auto-downloading.", cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                tsFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
 		if err := cli.AddFlag(cmd, &cfg.PlanArtifactPath, "use-plan", "", "Use the gzip-compressed JSON plan file from the specified path during release install", cli.AddFlagOptions{
 			GetEnvVarRegexesFunc: cli.GetFlagLocalEnvVarRegexes,
 			Group:                mainFlagGroup,

cmd/nelm/release_plan_install.go

@@ -313,6 +313,20 @@ func newReleasePlanInstallCommand(ctx context.Context, afterAllCommandsBuiltFunc
 			return fmt.Errorf("add flag: %w", err)
 		}
 
+		if err := cli.AddFlag(cmd, &cfg.IgnoreBundleJS, "ignore-bundle-js", false, IgnoreBundleJSFlagDescription, cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                tsFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
+		if err := cli.AddFlag(cmd, &cfg.DenoBinaryPath, "deno-binary-path", "", "Path to the Deno binary to use instead of auto-downloading.", cli.AddFlagOptions{
+			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
+			Group:                tsFlagGroup,
+		}); err != nil {
+			return fmt.Errorf("add flag: %w", err)
+		}
+
 		if err := cli.AddFlag(cmd, &cfg.Timeout, "timeout", 0, "Fail if not finished in time", cli.AddFlagOptions{
 			GetEnvVarRegexesFunc: cli.GetFlagGlobalAndLocalEnvVarRegexes,
 			Group:                mainFlagGroup,