chore: pr comments

Author: denis256

internal/hclparse/autoinclude.go

@@ -79,8 +79,8 @@ func (a *AutoIncludeHCL) Resolve(evalCtx *hcl.EvalContext) (*AutoIncludeResolved
 
 	body, ok := a.Remain.(*hclsyntax.Body)
 	if !ok {
-		// Non-syntax body — return result without EvalCtx since partial evaluation is not possible.
-		return &AutoIncludeResolved{RawBody: a.Remain}, nil
+		// Non-syntax body — return result with EvalCtx even though partial evaluation is not possible.
+		return &AutoIncludeResolved{EvalCtx: evalCtx, RawBody: a.Remain}, nil
 	}
 
 	var (
@@ -135,6 +135,15 @@ func resolveDependencyBlock(block *hclsyntax.Block, evalCtx *hcl.EvalContext) (A
 		return AutoIncludeDependency{}, diags
 	}
 
+	if val.Type() != cty.String {
+		return AutoIncludeDependency{}, hcl.Diagnostics{{
+			Severity: hcl.DiagError,
+			Summary:  "Invalid config_path type",
+			Detail:   "dependency config_path must evaluate to a string",
+			Subject:  configPathAttr.Expr.Range().Ptr(),
+		}}
+	}
+
 	return AutoIncludeDependency{
 		Name:       name,
 		ConfigPath: val.AsString(),

internal/hclparse/generate.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclsyntax"
 	"github.com/hashicorp/hcl/v2/hclwrite"
+	"github.com/zclconf/go-cty/cty"
 )
 
 const (
@@ -179,11 +180,7 @@ func rangeBytes(src []byte, r hcl.Range) []byte {
 
 // quotedStringTokens creates hclwrite tokens for a quoted string literal.
 func quotedStringTokens(value string) hclwrite.Tokens {
-	return hclwrite.Tokens{
-		{Type: hclsyntax.TokenOQuote, Bytes: []byte{'"'}},
-		{Type: hclsyntax.TokenQuotedLit, Bytes: []byte(value)},
-		{Type: hclsyntax.TokenCQuote, Bytes: []byte{'"'}},
-	}
+	return hclwrite.TokensForValue(cty.StringVal(value))
 }
 
 // rawTokens wraps raw bytes as a single hclwrite token. hclwrite.Format

internal/hclparse/parse.go

@@ -223,6 +223,14 @@ func processStackIncludes(stackFile *StackFileHCL, stackDir string) error {
 			return errors.Errorf("failed to decode include %q: %s", inc.Name, decodeDiags.Error())
 		}
 
+		if included.Locals != nil {
+			return errors.Errorf("included stack file %q must not define locals", inc.Name)
+		}
+
+		if len(included.Includes) > 0 {
+			return errors.Errorf("included stack file %q must not define nested includes", inc.Name)
+		}
+
 		stackFile.Units = append(stackFile.Units, included.Units...)
 		stackFile.Stacks = append(stackFile.Stacks, included.Stacks...)
 	}
@@ -236,9 +244,15 @@ func buildRefsWithAbsPath(stackTargetDir string, units []*UnitBlockHCL) []Compon
 	refs := make([]ComponentRef, 0, len(units))
 
 	for _, u := range units {
+		unitPath := filepath.Join(stackTargetDir, u.Path)
+
+		if u.NoStack != nil && *u.NoStack {
+			unitPath = filepath.Join(filepath.Dir(stackTargetDir), u.Path)
+		}
+
 		refs = append(refs, ComponentRef{
 			Name: u.Name,
-			Path: filepath.Join(stackTargetDir, u.Path),
+			Path: unitPath,
 		})
 	}
 

internal/hclparse/stack.go

@@ -174,7 +174,13 @@ func UnitPathsFromStackDir(stackDir string) []string {
 
 	paths := make([]string, 0, len(result.Units))
 	for _, unit := range result.Units {
-		paths = append(paths, filepath.Join(stackDir, StackDir, unit.Path))
+		unitPath := filepath.Join(stackDir, StackDir, unit.Path)
+
+		if unit.NoStack != nil && *unit.NoStack {
+			unitPath = filepath.Join(stackDir, unit.Path)
+		}
+
+		paths = append(paths, unitPath)
 	}
 
 	return paths

pkg/config/dependency.go

@@ -735,6 +735,8 @@ func collectStackUnitOutputs(ctx context.Context, pctx *ParsingContext, l log.Lo
 		if len(outputMap) > 0 {
 			convertedOutput, err := gocty.ToCtyValue(outputMap, generateTypeFromValuesMap(outputMap))
 			if err != nil {
+				l.Debugf("Failed to convert output map for stack unit %s: %v", unit.Name, err)
+
 				continue
 			}
 

pkg/config/stack.go

@@ -113,12 +113,10 @@ func GenerateStackFile(ctx context.Context, l log.Logger, pctx *ParsingContext,
 
 		parseResult, parseErr := intHclparse.ParseStackFile(&intHclparse.ParseStackFileInput{Src: stackSrcBytes, Filename: stackFilePath, StackDir: stackSourceDir, Values: values})
 		if parseErr != nil {
-			l.Debugf("Autoinclude parse for %s: %v", stackFilePath, parseErr)
+			return errors.Errorf("autoinclude parse failed for %s: %w", stackFilePath, parseErr)
 		}
 
-		if parseErr == nil {
-			autoIncludes = parseResult.AutoIncludes
-		}
+		autoIncludes = parseResult.AutoIncludes
 	}
 
 	genOpts := generateOpts{