feat: skip for tgz

Signed-off-by: Dmitry Mordvinov <dmitry.mordvinov@flant.com>

Author: dmmordvi

pkg/action/package.go

@@ -64,7 +64,7 @@ func (p *Package) Run(path string, _ map[string]interface{}, opts helmopts.HelmO
 	}
 
 	if tsbundle.BundleEnabled {
-		if err := tsbundle.ProcessChartRecursive(context.Background(), ch, path, true); err != nil {
+		if err := tsbundle.BundleTSChartsRecursive(context.Background(), ch, path, true); err != nil {
 			return "", errors.Wrap(err, "unable to process TypeScript files in chart")
 		}
 	}

pkg/chart/chart.go

@@ -20,6 +20,7 @@ import (
 	"regexp"
 	"strings"
 
+	"github.com/samber/lo"
 	"github.com/werf/3p-helm/pkg/werf/secrets/runtimedata"
 )
 
@@ -55,8 +56,6 @@ type Chart struct {
 	Files []*File `json:"files" copy:"shallow"`
 	// Files that are used at runtime, but should not be saved to secret/configmap.
 	RuntimeFiles []*File `json:"-" copy:"shallow"`
-	// Dependencies for RuntimeFiles that are used at runtime, but should not be saved to secret/configmap and not added to packaged chart.
-	RuntimeDepsFiles []*File `json:"-" copy:"shallow"`
 
 	parent       *Chart
 	dependencies []*Chart
@@ -176,18 +175,40 @@ func (ch *Chart) CRDObjects() []CRD {
 	return crds
 }
 
+func hasManifestExtension(fname string) bool {
+	ext := filepath.Ext(fname)
+	return strings.EqualFold(ext, ".yaml") || strings.EqualFold(ext, ".yml") || strings.EqualFold(ext, ".json")
+}
+
 func (ch *Chart) AddRuntimeFile(name string, data []byte) {
 	ch.Raw = append(ch.Raw, &File{Name: name, Data: data})
 
-	ch.RuntimeFiles = append(ch.RuntimeFiles, &File{name, data})
+	ch.RuntimeFiles = append(ch.RuntimeFiles, &File{Name: name, Data: data})
 	if !ch.IsRoot() {
 		root := ch.Root()
-		rawName := filepath.Join(strings.TrimPrefix(ch.ChartFullPath(), root.Name()+"/"), name)
+		rawName := getRootRawFileName(ch, name)
 		root.Raw = append(root.Raw, &File{Name: rawName, Data: data})
 	}
 }
 
-func hasManifestExtension(fname string) bool {
-	ext := filepath.Ext(fname)
-	return strings.EqualFold(ext, ".yaml") || strings.EqualFold(ext, ".yml") || strings.EqualFold(ext, ".json")
+func (ch *Chart) RemoveRuntimeFile(name string) {
+	ch.Raw = lo.Reject(ch.Raw, func(f *File, _ int) bool {
+		return f.Name == name
+	})
+
+	ch.RuntimeFiles = lo.Reject(ch.RuntimeFiles, func(f *File, _ int) bool {
+		return f.Name == name
+	})
+
+	if !ch.IsRoot() {
+		root := ch.Root()
+		rawName := getRootRawFileName(ch, name)
+		root.Raw = lo.Reject(root.Raw, func(f *File, _ int) bool {
+			return f.Name == rawName
+		})
+	}
+}
+
+func getRootRawFileName(ch *Chart, name string) string {
+	return filepath.Join(strings.TrimPrefix(ch.ChartFullPath(), ch.Root().Name()+"/"), name)
 }

pkg/chart/loader/load.go

@@ -173,9 +173,7 @@ func LoadFiles(files []*BufferedFile, opts helmopts.HelmOptions) (*chart.Chart,
 			fname := strings.TrimPrefix(f.Name, "charts/")
 			cname := strings.SplitN(fname, "/", 2)[0]
 			subcharts[cname] = append(subcharts[cname], &BufferedFile{Name: fname, Data: f.Data})
-		case strings.HasPrefix(f.Name, "ts/node_modules/"):
-			c.RuntimeDepsFiles = append(c.RuntimeDepsFiles, &chart.File{Name: f.Name, Data: f.Data})
-		case strings.HasPrefix(f.Name, "ts/"):
+		case strings.HasPrefix(f.Name, "ts/") && !strings.HasPrefix(f.Name, "ts/node_modules/"):
 			c.RuntimeFiles = append(c.RuntimeFiles, &chart.File{Name: f.Name, Data: f.Data})
 		default:
 			c.Files = append(c.Files, &chart.File{Name: f.Name, Data: f.Data})

pkg/werf/ts/bundle.go

@@ -56,7 +56,7 @@ func RunDenoBundle(ctx context.Context, chartPath, entryPoint string) ([]uint8,
 	return output, nil
 }
 
-func ProcessChartRecursive(ctx context.Context, chart *helmchart.Chart, path string, rebuild bool) error {
+func BundleTSChartsRecursive(ctx context.Context, chart *helmchart.Chart, path string, rebuild bool) error {
 	entrypoint, bundle := GetEntrypointAndBundle(chart.RuntimeFiles)
 	if entrypoint == "" {
 		return nil
@@ -68,8 +68,11 @@ func ProcessChartRecursive(ctx context.Context, chart *helmchart.Chart, path str
 			return fmt.Errorf("build TypeScript bundle: %w", err)
 		}
 
-		bundle = bundleRes
-		chart.AddRuntimeFile(ChartTSBundleFile, bundle)
+		if rebuild && bundle != nil {
+			chart.RemoveRuntimeFile(ChartTSBundleFile)
+		}
+
+		chart.AddRuntimeFile(ChartTSBundleFile, bundleRes)
 	}
 
 	deps := chart.Dependencies()
@@ -79,15 +82,22 @@ func ProcessChartRecursive(ctx context.Context, chart *helmchart.Chart, path str
 
 	for _, dep := range deps {
 		depPath := filepath.Join(path, "charts", dep.Name())
-		if err := ProcessChartRecursive(ctx, dep, depPath, rebuild); err != nil {
+
+		if _, err := os.Stat(depPath); err != nil {
+			// Subchart loaded from .tgz or missing on disk — skip,
+			// deno bundle needs a real directory to work with.
+			continue
+		}
+
+		if err := BundleTSChartsRecursive(ctx, dep, depPath, rebuild); err != nil {
 			return fmt.Errorf("process dependency %q: %w", dep.Name(), err)
 		}
 	}
 
 	return nil
 }
 
-func GetEntrypointAndBundle(files []*helmchart.File) (string, []byte) {
+func GetEntrypointAndBundle(files []*helmchart.File) (string, *helmchart.File) {
 	entrypoint := findEntrypointInFiles(files)
 	if entrypoint == "" {
 		return "", nil
@@ -101,7 +111,7 @@ func GetEntrypointAndBundle(files []*helmchart.File) (string, []byte) {
 		return entrypoint, nil
 	}
 
-	return entrypoint, bundleFile.Data
+	return entrypoint, bundleFile
 }
 
 func findEntrypointInFiles(files []*helmchart.File) string {