Skip to content

Commit 414ddbb

Browse files
engalarclaude
authored andcommitted
fix: CI integration test failures
- Use mxbuild 11.6.4 in CI (matches widget templates, was 11.8.0) - Restore COLON? in MODIFY ATTRIBUTE grammar rule (lost during rebase) - Fix duplicate widget name when direct children exist with childSlots defined — skip auto-slot Phase 2 when applyChildSlots handles defaults Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent 208724e commit 414ddbb

3 files changed

Lines changed: 5925 additions & 5878 deletions

File tree

mdl/executor/widget_engine.go

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,7 +492,7 @@ func (e *PluggableWidgetEngine) Build(def *WidgetDefinition, w *ast.WidgetV3) (*
492492
}
493493
}
494494
// Phase 2: Default slot — unmatched direct children go to first unmatched Widgets property.
495-
// Skip children already consumed by .def.json child slots (matched by type).
495+
// Skip if .def.json has childSlots defined — applyChildSlots already handles direct children.
496496
defSlotContainers := make(map[string]bool)
497497
for _, s := range slots {
498498
defSlotContainers[strings.ToUpper(s.MDLContainer)] = true
@@ -502,8 +502,11 @@ func (e *PluggableWidgetEngine) Build(def *WidgetDefinition, w *ast.WidgetV3) (*
502502
if matchedChildren[i] {
503503
continue
504504
}
505+
if len(slots) > 0 {
506+
continue // applyChildSlots handles both container and direct children
507+
}
505508
if defSlotContainers[strings.ToUpper(child.Type)] {
506-
continue // already consumed by applyChildSlots
509+
continue
507510
}
508511
widgetBSON, err := e.pageBuilder.buildWidgetV3ToBSON(child)
509512
if err != nil {

mdl/grammar/MDLParser.g4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -709,8 +709,8 @@ alterEntityAction
709709
| ADD COLUMN attributeDefinition
710710
| RENAME ATTRIBUTE attributeName TO attributeName
711711
| RENAME COLUMN attributeName TO attributeName
712-
| MODIFY ATTRIBUTE attributeName dataType attributeConstraint*
713-
| MODIFY COLUMN attributeName dataType attributeConstraint*
712+
| MODIFY ATTRIBUTE attributeName COLON? dataType attributeConstraint*
713+
| MODIFY COLUMN attributeName COLON? dataType attributeConstraint*
714714
| DROP ATTRIBUTE attributeName
715715
| DROP COLUMN attributeName
716716
| SET DOCUMENTATION STRING_LITERAL

0 commit comments

Comments
 (0)