fix: mock defaults, nil guards, nav spec aliasing, field-count drift tests

Author: retran

mdl/backend/mock/mock_mutation.go

@@ -3,6 +3,8 @@
 package mock
 
 import (
+	"fmt"
+
 	"github.com/mendixlabs/mxcli/mdl/backend"
 	"github.com/mendixlabs/mxcli/model"
 	"github.com/mendixlabs/mxcli/sdk/pages"
@@ -17,7 +19,7 @@ func (m *MockBackend) OpenPageForMutation(unitID model.ID) (backend.PageMutator,
 	if m.OpenPageForMutationFunc != nil {
 		return m.OpenPageForMutationFunc(unitID)
 	}
-	return nil, nil
+	return nil, fmt.Errorf("MockBackend.OpenPageForMutation not configured")
 }
 
 // ---------------------------------------------------------------------------
@@ -28,7 +30,7 @@ func (m *MockBackend) OpenWorkflowForMutation(unitID model.ID) (backend.Workflow
 	if m.OpenWorkflowForMutationFunc != nil {
 		return m.OpenWorkflowForMutationFunc(unitID)
 	}
-	return nil, nil
+	return nil, fmt.Errorf("MockBackend.OpenWorkflowForMutation not configured")
 }
 
 // ---------------------------------------------------------------------------

mdl/backend/mpr/convert.go

@@ -263,36 +263,10 @@ func convertNavMenuItem(in *mpr.NavMenuItem) *types.NavMenuItem {
 // Conversion helpers: mdl/types -> sdk/mpr (for write methods)
 // ---------------------------------------------------------------------------
 
+// unconvertNavProfileSpec is now a pass-through since mpr.NavigationProfileSpec
+// is aliased to types.NavigationProfileSpec.
 func unconvertNavProfileSpec(s types.NavigationProfileSpec) mpr.NavigationProfileSpec {
-	out := mpr.NavigationProfileSpec{
-		LoginPage:    s.LoginPage,
-		NotFoundPage: s.NotFoundPage,
-		HasMenu:      s.HasMenu,
-	}
-	if s.HomePages != nil {
-		out.HomePages = make([]mpr.NavHomePageSpec, len(s.HomePages))
-		for i, hp := range s.HomePages {
-			out.HomePages[i] = mpr.NavHomePageSpec{IsPage: hp.IsPage, Target: hp.Target, ForRole: hp.ForRole}
-		}
-	}
-	if s.MenuItems != nil {
-		out.MenuItems = make([]mpr.NavMenuItemSpec, len(s.MenuItems))
-		for i, mi := range s.MenuItems {
-			out.MenuItems[i] = unconvertNavMenuItemSpec(mi)
-		}
-	}
-	return out
-}
-
-func unconvertNavMenuItemSpec(in types.NavMenuItemSpec) mpr.NavMenuItemSpec {
-	out := mpr.NavMenuItemSpec{Caption: in.Caption, Page: in.Page, Microflow: in.Microflow}
-	if in.Items != nil {
-		out.Items = make([]mpr.NavMenuItemSpec, len(in.Items))
-		for i, sub := range in.Items {
-			out.Items[i] = unconvertNavMenuItemSpec(sub)
-		}
-	}
-	return out
+	return s
 }
 
 func unconvertEntityMemberAccessSlice(in []types.EntityMemberAccess) []mpr.EntityMemberAccess {

mdl/backend/mpr/convert_roundtrip_test.go

@@ -7,6 +7,7 @@ package mprbackend
 
 import (
 	"errors"
+	"reflect"
 	"testing"
 
 	"github.com/mendixlabs/mxcli/mdl/types"
@@ -492,7 +493,9 @@ func TestUnconvertNavMenuItemSpec_Isolated(t *testing.T) {
 			{Caption: "Child", Microflow: "MF2"},
 		},
 	}
-	out := unconvertNavMenuItemSpec(in)
+	// Since mpr.NavMenuItemSpec is aliased to types.NavMenuItemSpec,
+	// unconvert is now a pass-through. Verify the alias holds.
+	var out mpr.NavMenuItemSpec = in
 	if out.Caption != "Parent" || out.Page != "Page1" || out.Microflow != "MF1" {
 		t.Errorf("field mismatch: %+v", out)
 	}
@@ -503,7 +506,7 @@ func TestUnconvertNavMenuItemSpec_Isolated(t *testing.T) {
 
 func TestUnconvertNavMenuItemSpec_NilItems(t *testing.T) {
 	in := types.NavMenuItemSpec{Caption: "Leaf"}
-	out := unconvertNavMenuItemSpec(in)
+	var out mpr.NavMenuItemSpec = in
 	if out.Items != nil {
 		t.Errorf("expected nil Items for leaf: %+v", out.Items)
 	}
@@ -598,3 +601,51 @@ func TestUnconvertImageCollection(t *testing.T) {
 	}
 }
 
+// ============================================================================
+// Field-count drift assertions
+// ============================================================================
+//
+// These tests catch silent field drift: if a struct gains a new field but
+// the convert/unconvert function is not updated, the test fails.
+
+func assertFieldCount(t *testing.T, name string, v any, expected int) {
+	t.Helper()
+	actual := reflect.TypeOf(v).NumField()
+	if actual != expected {
+		t.Errorf("%s field count changed: expected %d, got %d — update convert.go and this test", name, expected, actual)
+	}
+}
+
+func TestFieldCountDrift(t *testing.T) {
+	// mpr → types pairs (manually copied in convert.go).
+	// If a struct gains a field, update the convert function AND this count.
+	assertFieldCount(t, "mpr.FolderInfo", mpr.FolderInfo{}, 3)
+	assertFieldCount(t, "types.FolderInfo", types.FolderInfo{}, 3)
+	assertFieldCount(t, "mpr.UnitInfo", mpr.UnitInfo{}, 4)
+	assertFieldCount(t, "types.UnitInfo", types.UnitInfo{}, 4)
+	assertFieldCount(t, "mpr.RenameHit", mpr.RenameHit{}, 4)
+	assertFieldCount(t, "types.RenameHit", types.RenameHit{}, 4)
+	assertFieldCount(t, "mpr.RawUnit", mpr.RawUnit{}, 4)
+	assertFieldCount(t, "types.RawUnit", types.RawUnit{}, 4)
+	assertFieldCount(t, "mpr.RawUnitInfo", mpr.RawUnitInfo{}, 5)
+	assertFieldCount(t, "types.RawUnitInfo", types.RawUnitInfo{}, 5)
+	assertFieldCount(t, "mpr.RawCustomWidgetType", mpr.RawCustomWidgetType{}, 6)
+	assertFieldCount(t, "types.RawCustomWidgetType", types.RawCustomWidgetType{}, 6)
+	assertFieldCount(t, "mpr.JavaAction", mpr.JavaAction{}, 4)
+	assertFieldCount(t, "types.JavaAction", types.JavaAction{}, 4)
+	assertFieldCount(t, "mpr.JavaScriptAction", mpr.JavaScriptAction{}, 12)
+	assertFieldCount(t, "types.JavaScriptAction", types.JavaScriptAction{}, 12)
+	assertFieldCount(t, "mpr.NavigationDocument", mpr.NavigationDocument{}, 4)
+	assertFieldCount(t, "types.NavigationDocument", types.NavigationDocument{}, 4)
+	assertFieldCount(t, "mpr.JsonStructure", mpr.JsonStructure{}, 8)
+	assertFieldCount(t, "types.JsonStructure", types.JsonStructure{}, 8)
+	assertFieldCount(t, "mpr.JsonElement", mpr.JsonElement{}, 14)
+	assertFieldCount(t, "types.JsonElement", types.JsonElement{}, 14)
+	assertFieldCount(t, "mpr.ImageCollection", mpr.ImageCollection{}, 6)
+	assertFieldCount(t, "types.ImageCollection", types.ImageCollection{}, 6)
+	assertFieldCount(t, "mpr.EntityMemberAccess", mpr.EntityMemberAccess{}, 3)
+	assertFieldCount(t, "types.EntityMemberAccess", types.EntityMemberAccess{}, 3)
+	assertFieldCount(t, "mpr.EntityAccessRevocation", mpr.EntityAccessRevocation{}, 6)
+	assertFieldCount(t, "types.EntityAccessRevocation", types.EntityAccessRevocation{}, 6)
+}
+

mdl/backend/mpr/page_mutator.go

@@ -9,6 +9,8 @@ import (
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
 
+	mdlerrors "github.com/mendixlabs/mxcli/mdl/errors"
+
 	"github.com/mendixlabs/mxcli/mdl/backend"
 	"github.com/mendixlabs/mxcli/mdl/bsonutil"
 	"github.com/mendixlabs/mxcli/mdl/types"
@@ -580,10 +582,14 @@ func dSetArray(doc bson.D, key string, elements []any) {
 
 // extractBinaryIDFromDoc extracts a binary ID string from a bson.D field.
 func extractBinaryIDFromDoc(val any) string {
-	if bin, ok := val.(primitive.Binary); ok {
+	switch bin := val.(type) {
+	case primitive.Binary:
 		return types.BlobToUUID(bin.Data)
+	case []byte:
+		return types.BlobToUUID(bin)
+	default:
+		return ""
 	}
-	return ""
 }
 
 // ---------------------------------------------------------------------------
@@ -1305,8 +1311,7 @@ func setRawWidgetPropertyMut(widget bson.D, propName string, value any) error {
 func setWidgetCaptionMut(widget bson.D, value any) error {
 	caption := dGetDoc(widget, "Caption")
 	if caption == nil {
-		setTranslatableText(widget, "Caption", value)
-		return nil
+		return mdlerrors.NewValidation("widget has no Caption property")
 	}
 	setTranslatableText(caption, "", value)
 	return nil

mdl/executor/cmd_diff_local.go

@@ -497,6 +497,9 @@ func attributeBsonToMDL(_ *ExecContext, raw map[string]any) string {
 func microflowBsonToMDL(ctx *ExecContext, raw map[string]any, qualifiedName string) string {
 	qn := splitQualifiedName(qualifiedName)
 	mf := ctx.Backend.ParseMicroflowFromRaw(raw, model.ID(qn.Name), "")
+	if mf == nil {
+		return fmt.Sprintf("MICROFLOW %s\n  -- parse failed --\nEND MICROFLOW\n", qualifiedName)
+	}
 
 	entityNames, microflowNames := buildNameLookups(ctx)
 	return renderMicroflowMDL(ctx, mf, qn, entityNames, microflowNames, nil)

mdl/executor/cmd_pages_builder.go

@@ -74,7 +74,7 @@ func (pb *pageBuilder) initPluggableEngine() {
 // registerWidgetName registers a widget name and returns an error if it's already used.
 // Widget names must be unique within a page/snippet.
 
-// getProjectPath returns the project directory path from the underlying reader.
+// getProjectPath returns the project directory path from the backend.
 func (pb *pageBuilder) getProjectPath() string {
 	if pb.backend != nil {
 		return pb.backend.Path()

mdl/executor/cmd_widgets.go

@@ -209,6 +209,10 @@ func updateWidgetsInContainer(ctx *ExecContext, containerID string, widgetRefs [
 	if err != nil {
 		return 0, mdlerrors.NewBackend(fmt.Sprintf("open %s for mutation", containerName), err)
 	}
+	if mutator == nil {
+		return 0, mdlerrors.NewBackend(fmt.Sprintf("open %s for mutation", containerName),
+			fmt.Errorf("backend returned nil mutator for %s", containerID))
+	}
 
 	updated := 0
 	for _, ref := range widgetRefs {

sdk/mpr/writer_navigation.go

@@ -6,34 +6,21 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/mendixlabs/mxcli/mdl/types"
 	"github.com/mendixlabs/mxcli/model"
 
 	"go.mongodb.org/mongo-driver/bson"
 )
 
 // NavigationProfileSpec describes the desired state for a navigation profile.
-type NavigationProfileSpec struct {
-	HomePages    []NavHomePageSpec
-	LoginPage    string // qualified page name, empty to clear
-	NotFoundPage string // qualified page name, empty to clear
-	MenuItems    []NavMenuItemSpec
-	HasMenu      bool // true = replace menu (even if empty)
-}
+// Aliased from mdl/types to avoid duplicate definitions.
+type NavigationProfileSpec = types.NavigationProfileSpec
 
 // NavHomePageSpec describes a home page entry.
-type NavHomePageSpec struct {
-	IsPage  bool
-	Target  string // qualified name
-	ForRole string // empty for default
-}
+type NavHomePageSpec = types.NavHomePageSpec
 
 // NavMenuItemSpec describes a menu item.
-type NavMenuItemSpec struct {
-	Caption   string
-	Page      string
-	Microflow string
-	Items     []NavMenuItemSpec
-}
+type NavMenuItemSpec = types.NavMenuItemSpec
 
 // UpdateNavigationProfile patches a navigation profile's home pages, login page, and menu.
 func (w *Writer) UpdateNavigationProfile(navDocID model.ID, profileName string, spec NavigationProfileSpec) error {