fix

Author: cpuguy83

docs/examples/go-md2man.yml

@@ -1,3 +1,4 @@
+# syntax=local/dalec/frontend:latest
 # syntax=ghcr.io/project-dalec/dalec/frontend:latest
 
 name: go-md2man

internal/testrunner/runner.go

@@ -162,17 +162,44 @@ func asConstraints(opts ...ValidationOpt) llb.ConstraintsOpt {
 	})
 }
 
-// For each llb.StateOption, set the state option on the original state
+// mergeStateOptions merges multiple llb.StateOptions into a single llb.StateOption.
+//
+// Each option is applied independently to the same input state.
+// Conceptually:
+//
+//  1. Start from origState
+//  2. For each option:
+//     - create a temporary branch: diff(origState, stateN)
+//  3. Merge all resulting branches back together
+//
+// No option sees the effects of any other option.
+//
 // Example:
-// origState:
-// |-apply(opt) -> state1
-// |-apply(opt) -> state2
-// |-apply(opt) -> state3
 //
-// In the above example, each of the new states (state1,state2,state3) are direct decendants
+//	         input
+//	           |
+//	   +-------+-------+
+//	   |       |       |
+//	apply    apply   apply
+//	 opt1     opt2    opt3
+//	   |       |       |
+//	 diff1  diff2  diff3
+//	   |       |       |
+//	   +-------+-------+
+//	           |
+//	merge(input, diff1, diff2, diff3)
+//	           |
+//	         output
+//
+// All intermediate states (state1, state2, state3) are direct descendants
 // of origState.
-// If you are expecting states to apply in order (origState -> state1 -> state2 -> state3),
-// this is not the function you are looking for, see [withOptions] instead.
+//
+// If you expect options to apply sequentially
+// (origState -> state1 -> state2 -> state3),
+// This is NOT the function you want.
+//
+// This is NOT a generic solution and is only intended to be used within the context of
+// what is needed to run a spec's tests since we know the caller is resetting the state back to the original state.
 func mergeStateOptions(stateOpts []llb.StateOption, opts ...ValidationOpt) llb.StateOption {
 	return func(in llb.State) llb.State {
 		if len(stateOpts) == 0 {
@@ -186,21 +213,14 @@ func mergeStateOptions(stateOpts []llb.StateOption, opts ...ValidationOpt) llb.S
 
 		states := make([]llb.State, 0, len(opts))
 		for _, o := range stateOpts {
-			states = append(states, in.With(o))
+			diff := llb.Diff(in, in.With(o), asConstraints(opts...))
+			states = append(states, diff)
 		}
-		return dalec.MergeAtPath(in, states, "/", asConstraints(opts...))
-	}
-}
 
-// withOptions applies multiple llb.StateOption to a state in order
-func withOptions(opts []llb.StateOption) llb.StateOption {
-	return func(in llb.State) llb.State {
-		out := in
+		merged := llb.Merge(states, asConstraints(opts...))
+		diff := llb.Diff(in, merged, asConstraints(opts...))
 
-		for _, opt := range opts {
-			out = out.With(opt)
-		}
-		return out
+		return llb.Merge([]llb.State{in, diff}, asConstraints(opts...))
 	}
 }