fix: async bugs fixes (#283)

Author: dobarx

cmd/internal/telemetry/telemetry.go

@@ -89,7 +89,7 @@ func SetupOtelp(ctx context.Context, otelpURL, version string) (shutdown func(co
 }
 
 func createReportDir(dir string) (string, error) {
-	err := os.MkdirAll(dir, 0o755)
+	err := os.MkdirAll(dir, 0o750)
 	if err != nil {
 		return "", err
 	}
@@ -102,7 +102,7 @@ func createReportDir(dir string) (string, error) {
 			path += "_" + strconv.Itoa(i)
 		}
 		if _, err := os.Stat(path); os.IsNotExist(err) {
-			err := os.Mkdir(path, 0o755)
+			err := os.Mkdir(path, 0o750)
 			if err != nil {
 				return "", err
 			}
@@ -137,7 +137,7 @@ func SetupStdout(ctx context.Context, debugDir, version string) (shutdown func(c
 	if err != nil {
 		return nil, err
 	}
-	logFile, err := os.Create(filepath.Join(dir, "logs.json"))
+	logFile, err := os.Create(filepath.Join(dir, "logs.json")) //nolint:gosec // Safe file path construction in a controlled directory
 	if err != nil {
 		return nil, err
 	}
@@ -160,7 +160,7 @@ func SetupStdout(ctx context.Context, debugDir, version string) (shutdown func(c
 		log.WithResource(resource),
 	)
 	global.SetLoggerProvider(logProvider)
-	traceFile, err := os.Create(filepath.Join(dir, "traces.json"))
+	traceFile, err := os.Create(filepath.Join(dir, "traces.json")) //nolint:gosec // Safe file path construction in a controlled directory
 	if err != nil {
 		handleErr(err)
 		return
@@ -182,7 +182,7 @@ func SetupStdout(ctx context.Context, debugDir, version string) (shutdown func(c
 		trace.WithResource(resource),
 	)
 	otel.SetTracerProvider(traceProvider)
-	metricFile, err := os.Create(filepath.Join(dir, "metrics.json"))
+	metricFile, err := os.Create(filepath.Join(dir, "metrics.json")) //nolint:gosec // Safe file path construction in a controlled directory
 	if err != nil {
 		handleErr(err)
 		return

cmd/root.go

@@ -194,7 +194,9 @@ func Execute() {
 		rootSpan.End()
 	}
 	if rootCleanup != nil {
-		rootCleanup(rootCtx)
+		if cleanupErr := rootCleanup(rootCtx); cleanupErr != nil {
+			slog.ErrorContext(rootCtx, "Failed to clean up", "error", cleanupErr)
+		}
 	}
 	os.Exit(exitCode)
 }

engine/depends_on_ref_test.go

@@ -0,0 +1,95 @@
+package engine
+
+import "testing"
+
+func TestDependsOnWithRefBlocks(t *testing.T) {
+	renderTest(
+		t, "depends_on with ref blocks",
+		[]string{`
+			section "foo" {
+			  title = "Foo title"
+
+			  content text {
+				value = "Foo text"
+			  }
+			}
+
+			content text "baz" {
+			  value = "Baz text"
+			}
+
+			document "test1" {
+			  // Define reference blocks first
+			  section ref "aaa" {
+				base = section.foo
+				title = "Foo overload 1"
+			  }
+
+			  content ref "bbb" {
+				base = content.text.baz
+			  }
+			  
+			  // Then reference them in depends_on
+			  content text {
+				depends_on = [
+				  "section.ref.aaa",
+				  "content.ref.bbb",
+				]
+				value = "Doc content is ready"
+			  }
+			}
+		`},
+		[]string{
+			"# Foo overload 1",
+			"Foo text",
+			"Baz text",
+			"Doc content is ready",
+		},
+		optDocName("test1"),
+	)
+
+	renderTest(
+		t, "depends_on before ref blocks",
+		[]string{`
+			section "foo" {
+			  title = "Foo title"
+
+			  content text {
+				value = "Foo text"
+			  }
+			}
+
+			content text "baz" {
+			  value = "Baz text"
+			}
+
+			document "test1" {
+			  // Reference blocks in depends_on before they're defined
+			  content text {
+				depends_on = [
+				  "section.ref.aaa",
+				  "content.ref.bbb",
+				]
+				value = "Doc content is ready"
+			  }
+			  
+			  // Define reference blocks after depending on them
+			  section ref "aaa" {
+				base = section.foo
+				title = "Foo overload 1"
+			  }
+
+			  content ref "bbb" {
+				base = content.text.baz
+			  }
+			}
+		`},
+		[]string{
+			"Doc content is ready",
+			"# Foo overload 1",
+			"Foo text",
+			"Baz text",
+		},
+		optDocName("test1"),
+	)
+}

engine/engine_test.go

@@ -832,3 +832,78 @@ func TestEngineRenderContent(t *testing.T) {
 		optDocName("test"),
 	)
 }
+
+func TestDependencyContextAccess(t *testing.T) {
+	// Test case 1: Access dependency blocks via context
+	renderTest(
+		t, "Access dependency blocks via context",
+		[]string{`
+			document "test" {
+				content text "foo" {
+					value = "first result"
+				}
+				
+				content text "bar" {
+					depends_on = ["content.text.foo"]
+					value = "second result"
+				}
+				
+				content text "baz" {
+					depends_on = ["content.text.foo", "content.text.bar"]
+					value = "Dependency foo: {{ .dependency.content.text.foo.markdown }} and bar: {{ .dependency.content.text.bar.markdown }}"
+				}
+			}
+		`},
+		[]string{
+			"first result",
+			"second result",
+			"Dependency foo: first result and bar: second result",
+		},
+		optDocName("test"),
+	)
+
+	// Test case 2: Access section dependency blocks via context
+	renderTest(
+		t, "Access section dependency blocks via context",
+		[]string{`
+			section "foo" {
+				title = "Foo section"
+				content text {
+					value = "foo content"
+				}
+			}
+			
+			document "test" {
+				section ref "bar" {
+					base = section.foo
+					title = "Bar section"
+				}
+				
+				content text {
+					depends_on = ["section.ref.bar"]
+					value = <<-EOT
+						Dependency: {{ .dependency | toPrettyJson }}
+						Section title: {{ .dependency.section.ref.bar.meta.title }}
+					EOT
+				}
+			}
+		`},
+		[]string{
+			"# Bar section",
+			"foo content",
+			"Dependency: {\n" +
+				"  \"section\": {\n" +
+				"    \"ref\": {\n" +
+				"      \"bar\": {\n" +
+				"        \"meta\": {\n" +
+				"          \"title\": \"foo\"\n" +
+				"        }\n" +
+				"      }\n" +
+				"    }\n" +
+				"  }\n" +
+				"}\n" +
+				"Section title: foo",
+		},
+		optDocName("test"),
+	)
+}

engine/engine_vars_test.go

@@ -118,7 +118,8 @@ func TestEngineVarsHandling(t *testing.T) {
   "sectVar": "sectVar"
 }`,
 			`3: {
-  "docVar": "docVar"
+  "docVar": "docVar",
+  "sectVar": "sectVar"
 }`,
 		},
 	)