diff --git a/cmd/mxcli/tui/watcher.go b/cmd/mxcli/tui/watcher.go index 35e2de44..c8cc1d13 100644 --- a/cmd/mxcli/tui/watcher.go +++ b/cmd/mxcli/tui/watcher.go @@ -4,6 +4,7 @@ import ( "os" "path/filepath" "sync" + "sync/atomic" "time" tea "github.com/charmbracelet/bubbletea" @@ -78,6 +79,7 @@ func newWatcher(mprPath, contentsDir string, sender MsgSender) (*Watcher, error) func (w *Watcher) run(sender MsgSender) { var debounceTimer *time.Timer + var debounceSeq atomic.Uint64 for { select { @@ -110,7 +112,11 @@ func (w *Watcher) run(sender MsgSender) { if debounceTimer != nil { debounceTimer.Stop() } + seq := debounceSeq.Add(1) debounceTimer = time.AfterFunc(watchDebounce, func() { + if debounceSeq.Load() != seq { + return + } sender.Send(MprChangedMsg{}) }) diff --git a/cmd/mxcli/tui/watcher_test.go b/cmd/mxcli/tui/watcher_test.go index 33b2e8c7..667e8755 100644 --- a/cmd/mxcli/tui/watcher_test.go +++ b/cmd/mxcli/tui/watcher_test.go @@ -35,10 +35,11 @@ func TestWatcherDebounce(t *testing.T) { } defer w.Close() - // Rapidly write 5 times — should debounce into a single message + // Rapidly write 5 times — should debounce into a single message. + // Keep the burst tighter than the debounce window so slow CI machines do + // not accidentally let an intermediate timer fire. for i := range 5 { _ = os.WriteFile(unitFile, []byte{byte('a' + i)}, 0644) - time.Sleep(50 * time.Millisecond) } // Wait for debounce to fire (500ms + margin) diff --git a/mdl-examples/doctype-tests/02b-nanoflow-examples.mdl b/mdl-examples/doctype-tests/02b-nanoflow-examples.mdl index 2d32504f..56e6fdba 100644 --- a/mdl-examples/doctype-tests/02b-nanoflow-examples.mdl +++ b/mdl-examples/doctype-tests/02b-nanoflow-examples.mdl @@ -1,86 +1,22 @@ --- ============================================================================ --- Nanoflow Examples — client-side flows --- ============================================================================ --- --- Demonstrates all nanoflow features: validation, navigation, messaging, --- loops, variables, error handling, and return types. --- --- Nanoflows run client-side (browser/native mobile). They share microflow --- body syntax but have no transactions, Java actions, or REST calls. --- --- Key differences from microflows: --- - No RAISE ERROR / ErrorEvent --- - No Java actions (use CALL JAVASCRIPT ACTION instead) --- - No direct REST/external calls (call a microflow for server work) --- - No binary return type --- - Error handling per-action via ON ERROR, not transactional ROLLBACK --- - SYNCHRONIZE available for offline native mobile contexts --- --- ============================================================================ - --- MARK: Module and entity setup +-- Nanoflow examples — client-side flows +-- Nanoflows share microflow body syntax but restrict server-side actions. +-- Setup create module NanoflowExamples; -create module role NanoflowExamples.User; -create module role NanoflowExamples.Admin; - -/** - * Product entity used throughout the nanoflow examples. - */ create entity NanoflowExamples.Product ( - Name : String(200), - Price : Decimal, - IsValid : Boolean, - Tags : String(500) + Name : String(200), + Price : Decimal, + IsValid : Boolean ); --- Helper microflow — server-side save, called from nanoflow examples. -create microflow NanoflowExamples.ACT_SaveProduct ( - $Product : NanoflowExamples.Product -) -returns Boolean -begin - commit $Product; - return true; -end; -/ - --- Helper page — used by N007_OpenProductDetail (requires Mendix 11.0+ page params). -create page NanoflowExamples.ProductDetail -( - params: { - $Product: NanoflowExamples.Product - }, - title: 'Product Detail', - layout: Atlas_Core.Atlas_Default -) -{ - dynamictext text1 (content: 'Product Detail', rendermode: H4) -} -/ - --- ============================================================================ --- MARK: Nanoflows --- ============================================================================ - -/** - * N001: Stand-in nanoflow with no logic. - * Used as a placeholder during scaffolding. - */ -create nanoflow NanoflowExamples.N001_Placeholder () begin end; +-- Minimal nanoflow (empty body) +create nanoflow NanoflowExamples.NF_Empty () begin end; -/** - * N002: Validates a Product before it is saved. - * Checks required fields and business rules client-side to avoid a server round-trip. - * - * @param $Product The product to validate - * @returns true if the product passes all validation checks, false otherwise - */ -create nanoflow NanoflowExamples.N002_ValidateProduct ( - $Product : NanoflowExamples.Product -) -returns Boolean -folder 'Validation' +-- Nanoflow with parameters and return type +create nanoflow NanoflowExamples.NF_ValidateProduct + ($Product : NanoflowExamples.Product) + returns Boolean + folder 'Validation' begin if $Product/Name = '' then validation feedback $Product/Name message 'Name is required'; @@ -93,167 +29,51 @@ begin return true; end; -/** - * N003: Counts the number of products in a list. - * Demonstrates LOOP with BEGIN/END LOOP, DECLARE, and SET. - * - * @param $Products List of products to count - * @returns The number of products in the list - */ -create nanoflow NanoflowExamples.N003_CountProducts ( - $Products : list of NanoflowExamples.Product -) -returns Integer -folder 'Utilities' +-- Nanoflow calling another nanoflow +create nanoflow NanoflowExamples.NF_SaveProduct + ($Product : NanoflowExamples.Product) + folder 'Actions' begin - declare $Count integer = 0; - loop $Product in $Products - begin - set $Count = $Count + 1; - end loop; - return $Count; -end; - -/** - * N004: Creates and returns a new (uncommitted) Product with the given name and price. - * Demonstrates creating an entity object and returning it from a nanoflow. - * - * @param $Name Product name - * @param $Price Product price (must be non-negative) - * @returns A new Product object (not yet committed to the server) - */ -create nanoflow NanoflowExamples.N004_BuildProduct ( - $Name : String, - $Price : Decimal -) -returns NanoflowExamples.Product -folder 'Factory' -begin - $Product = create NanoflowExamples.Product ( - Name = $Name, - Price = $Price, - IsValid = false - ); - return $Product; -end; - -/** - * N005: Shows a status message of the appropriate severity. - * Demonstrates SHOW MESSAGE with different type keywords. - * - * @param $Status Status code: 1 = information, 2 = warning, any other = error - */ -create nanoflow NanoflowExamples.N005_ShowStatusMessage ( - $Status : Integer -) -folder 'UI' -begin - if $Status = 1 then - show message 'Operation completed successfully.' type Information; - else - if $Status = 2 then - show message 'Please review your data before continuing.' type Warning; - else - show message 'An error occurred. Please try again.' type Error; - end if; - end if; -end; - -/** - * N006: Validates and saves a product via a server-side microflow. - * Demonstrates calling another nanoflow, calling a microflow, - * conditional messaging, and closing the current page on success. - * - * @param $Product The product to validate and save - */ -create nanoflow NanoflowExamples.N006_SaveProduct ( - $Product : NanoflowExamples.Product -) -folder 'Actions' -begin - -- Client-side validation first (avoids a server round-trip on invalid data) - $IsValid = call nanoflow NanoflowExamples.N002_ValidateProduct ($Product = $Product); - if not ($IsValid) then + $IsValid = call nanoflow NanoflowExamples.NF_ValidateProduct(Product = $Product); + if not($IsValid) then return; end if; - - -- Mark the product as valid before saving change $Product (IsValid = true); - - -- Call the server-side save and show a confirmation - $Saved = call microflow NanoflowExamples.ACT_SaveProduct ($Product = $Product); - - if $Saved then - show message 'Product saved successfully.' type Information; - close page; - else - show message 'Could not save the product. Please try again.' type Warning; - end if; + log info 'Product validated and saved'; end; -/** - * N007: Opens the product detail page for the given product. - * Demonstrates SHOW PAGE with a page parameter. - * - * @param $Product The product whose detail page to open - */ -create nanoflow NanoflowExamples.N007_OpenProductDetail ( - $Product : NanoflowExamples.Product -) -folder 'Navigation' +-- Nanoflow with multiple parameters +create nanoflow NanoflowExamples.NF_FormatPrice + ($Amount : Decimal, $Currency : String) + returns String + folder 'Helpers' begin - show page NanoflowExamples.ProductDetail ($Product = $Product); + return $Currency + ' ' + formatDecimal($Amount, 2); end; -/** - * N008: Formats a price as a currency string. - * Uses CREATE OR MODIFY so repeated execution is idempotent. - * - * @param $Amount The numeric amount to format - * @param $Currency The currency code prefix (e.g. 'USD', 'EUR') - * @returns A formatted string like 'EUR 12.50' - */ -create or modify nanoflow NanoflowExamples.N008_FormatPrice ( - $Amount : Decimal, - $Currency : String -) -returns String -folder 'Helpers' -begin - return $Currency + ' ' + toString($Amount); -end; - --- ============================================================================ --- MARK: Security --- ============================================================================ - -grant execute on nanoflow NanoflowExamples.N002_ValidateProduct to NanoflowExamples.User; -grant execute on nanoflow NanoflowExamples.N003_CountProducts to NanoflowExamples.User; -grant execute on nanoflow NanoflowExamples.N004_BuildProduct to NanoflowExamples.User; -grant execute on nanoflow NanoflowExamples.N005_ShowStatusMessage to NanoflowExamples.User; -grant execute on nanoflow NanoflowExamples.N006_SaveProduct to NanoflowExamples.User; -grant execute on nanoflow NanoflowExamples.N007_OpenProductDetail to NanoflowExamples.User; -grant execute on nanoflow NanoflowExamples.N008_FormatPrice to NanoflowExamples.User, NanoflowExamples.Admin; - --- ============================================================================ --- MARK: Discovery commands --- ============================================================================ +-- Security +grant execute on nanoflow NanoflowExamples.NF_ValidateProduct to NanoflowExamples.User; +grant execute on nanoflow NanoflowExamples.NF_SaveProduct to NanoflowExamples.User; +grant execute on nanoflow NanoflowExamples.NF_FormatPrice to NanoflowExamples.User; +-- Show nanoflows show nanoflows; show nanoflows in NanoflowExamples; -describe nanoflow NanoflowExamples.N002_ValidateProduct; -show access on nanoflow NanoflowExamples.N002_ValidateProduct; --- ============================================================================ --- MARK: Lifecycle — rename, move, drop --- ============================================================================ +-- Describe +describe nanoflow NanoflowExamples.NF_ValidateProduct; + +-- Rename +rename nanoflow NanoflowExamples.NF_Empty to NF_Placeholder; + +-- Move +move nanoflow NanoflowExamples.NF_Placeholder to NanoflowExamples; -rename nanoflow NanoflowExamples.N001_Placeholder to N001_Unused; -move nanoflow NanoflowExamples.N001_Unused to NanoflowExamples; -drop nanoflow NanoflowExamples.N001_Unused; +-- Drop +drop nanoflow NanoflowExamples.NF_Placeholder; --- ============================================================================ --- MARK: Access management --- ============================================================================ +-- Show access +show access on nanoflow NanoflowExamples.NF_ValidateProduct; -revoke execute on nanoflow NanoflowExamples.N002_ValidateProduct from NanoflowExamples.User; +-- Revoke +revoke execute on nanoflow NanoflowExamples.NF_ValidateProduct from NanoflowExamples.User; diff --git a/mdl/executor/cmd_microflows_builder_actions.go b/mdl/executor/cmd_microflows_builder_actions.go index 8b6cdf12..8613352f 100644 --- a/mdl/executor/cmd_microflows_builder_actions.go +++ b/mdl/executor/cmd_microflows_builder_actions.go @@ -242,8 +242,13 @@ func (fb *flowBuilder) addRollbackAction(s *ast.RollbackStmt) model.ID { // addChangeObjectAction creates a CHANGE statement. func (fb *flowBuilder) addChangeObjectAction(s *ast.ChangeObjectStmt) model.ID { - // Empty non-committing changes need RefreshInClient to satisfy Studio Pro - // consistency checks; explicit `refresh` keeps the same flag for all changes. + // CE0032 rejects change actions with no items that do not commit the + // object. The published error text only mentions items/commit, but + // `mx check` also accepts RefreshInClient=true as a third valid escape. + // The builder auto-promotes empty changes to refresh-only so describe → + // exec of such actions stays valid without requiring authored MDL to say + // `refresh` explicitly; when the author wrote `refresh`, we keep the + // same flag for non-empty changes too. action := µflows.ChangeObjectAction{ BaseElement: model.BaseElement{ID: model.ID(types.GenerateID())}, ErrorHandlingType: fb.ehType(nil), diff --git a/mdl/executor/cmd_microflows_builder_calls.go b/mdl/executor/cmd_microflows_builder_calls.go index a8394a3f..279a6386 100644 --- a/mdl/executor/cmd_microflows_builder_calls.go +++ b/mdl/executor/cmd_microflows_builder_calls.go @@ -373,28 +373,28 @@ func javaActionReturnVarType(returnType javaactions.CodeActionReturnType) string return "" } +// inferGenericJavaActionReturnType infers the element type of a generic +// `ListType{Entity: ""}` Java action return by inspecting the caller's +// variable-typed arguments. When the action parameters don't determine an +// element type, the function returns "" and the caller records the declaration +// as Unknown. func (fb *flowBuilder) inferGenericJavaActionReturnType(jaDef *javaactions.JavaAction, s *ast.CallJavaActionStmt) string { if jaDef == nil || fb.varTypes == nil || s == nil { return "" } - switch t := jaDef.ReturnType.(type) { - case *javaactions.ListType: - if t.Entity != "" { - return "" - } - case javaactions.ListType: - if t.Entity != "" { - return "" - } - default: + // ListType is always stored as a pointer by the parser; there is no value + // form in the SDK. Only the generic (Entity == "") case reaches the + // variable-type lookup below. + t, ok := jaDef.ReturnType.(*javaactions.ListType) + if !ok || t.Entity != "" { return "" } for _, arg := range s.Arguments { - valueExpr := strings.TrimPrefix(strings.Trim(fb.exprToString(arg.Value), "'"), "$") - if valueExpr == "" { + varExpr, ok := arg.Value.(*ast.VariableExpr) + if !ok { continue } - if typ := fb.varTypes[valueExpr]; strings.HasPrefix(typ, "List of ") { + if typ := fb.varTypes[varExpr.Name]; strings.HasPrefix(typ, "List of ") { return typ } } diff --git a/mdl/executor/cmd_microflows_builder_flows.go b/mdl/executor/cmd_microflows_builder_flows.go index bf4eecba..a36b5f24 100644 --- a/mdl/executor/cmd_microflows_builder_flows.go +++ b/mdl/executor/cmd_microflows_builder_flows.go @@ -279,12 +279,15 @@ func isTerminalStmt(stmt ast.MicroflowStatement) bool { return false } } - // Both paths return true intentionally. isTerminalStmt diverges from - // bodyReturns here: bodyReturns requires an ELSE to guarantee all paths - // return (a valid Mendix requirement), but isTerminalStmt only needs to - // know whether the flow builder must thread a continuation edge past this - // statement. When every explicit case terminates the split has no outgoing - // merge edge regardless of whether an ELSE exists, so we are always terminal. + // Every reachable branch terminates, so the split has no continuation + // to thread into the parent flow. This intentionally diverges from + // `bodyReturns` in validate_microflow.go: that predicate treats an + // enum split without an `else` as non-terminal because authored MDL + // is expected to supply a default branch covering missing values. + // Here we also accept described-from-MPR graphs where Studio Pro + // produced an exhaustive set of value cases without a default flow — + // in both no-else and with-else forms the split terminates once we + // reach this point. return true default: return false diff --git a/mdl/executor/cmd_microflows_builder_java_return_test.go b/mdl/executor/cmd_microflows_builder_java_return_test.go index 3f774121..595aee63 100644 --- a/mdl/executor/cmd_microflows_builder_java_return_test.go +++ b/mdl/executor/cmd_microflows_builder_java_return_test.go @@ -63,6 +63,37 @@ func TestAddJavaAction_ConcreteListReturnRegistersListType(t *testing.T) { } } +// TestAddJavaAction_EntityReturnRegistersEntityType pins ako's review follow-up +// for PR #357: the most common Java action return shape — a bare +// `*javaactions.EntityType{Entity: "Mod.Ent"}` — must register the output +// variable as the entity's qualified name so downstream attribute access +// resolves against the right domain-model entry. +func TestAddJavaAction_EntityReturnRegistersEntityType(t *testing.T) { + backend := &mock.MockBackend{ + ReadJavaActionByNameFunc: func(qualifiedName string) (*javaactions.JavaAction, error) { + return &javaactions.JavaAction{ + ReturnType: &javaactions.EntityType{Entity: "Orders.Order"}, + }, nil + }, + } + + fb := &flowBuilder{ + backend: backend, + varTypes: map[string]string{}, + declaredVars: map[string]string{}, + measurer: &layoutMeasurer{}, + } + + fb.addCallJavaActionAction(&ast.CallJavaActionStmt{ + OutputVariable: "CreatedOrder", + ActionName: ast.QualifiedName{Module: "Orders", Name: "CreateFromPayload"}, + }) + + if got := fb.varTypes["CreatedOrder"]; got != "Orders.Order" { + t.Fatalf("CreatedOrder type = %q, want Orders.Order", got) + } +} + func TestAddJavaAction_GenericListReturnInheritsInputListType(t *testing.T) { backend := &mock.MockBackend{ ReadJavaActionByNameFunc: func(qualifiedName string) (*javaactions.JavaAction, error) { diff --git a/mdl/executor/cmd_microflows_has_explicit_false_anchor_test.go b/mdl/executor/cmd_microflows_has_explicit_false_anchor_test.go new file mode 100644 index 00000000..eaa9a344 --- /dev/null +++ b/mdl/executor/cmd_microflows_has_explicit_false_anchor_test.go @@ -0,0 +1,58 @@ +// SPDX-License-Identifier: Apache-2.0 + +package executor + +import ( + "testing" + + "github.com/mendixlabs/mxcli/sdk/microflows" +) + +// TestHasExplicitFalseBranchAnchor pins ako's review follow-up for PR #364: +// the heuristic that decides whether a false-branch flow carries an explicit +// anchor annotation should fire only on the AnchorTop→AnchorBottom pair and +// must stay dormant for nil flows, builder defaults, and any other side +// combination. +func TestHasExplicitFalseBranchAnchor(t *testing.T) { + tests := []struct { + name string + flow *microflows.SequenceFlow + want bool + }{ + {name: "nil flow", flow: nil, want: false}, + { + name: "builder default right→left", + flow: µflows.SequenceFlow{OriginConnectionIndex: AnchorRight, DestinationConnectionIndex: AnchorLeft}, + want: false, + }, + { + name: "split default bottom→top", + flow: µflows.SequenceFlow{OriginConnectionIndex: AnchorBottom, DestinationConnectionIndex: AnchorTop}, + want: false, + }, + { + name: "authored top→bottom", + flow: µflows.SequenceFlow{OriginConnectionIndex: AnchorTop, DestinationConnectionIndex: AnchorBottom}, + want: true, + }, + { + name: "only origin customised", + flow: µflows.SequenceFlow{OriginConnectionIndex: AnchorTop, DestinationConnectionIndex: AnchorTop}, + want: false, + }, + { + name: "only destination customised", + flow: µflows.SequenceFlow{OriginConnectionIndex: AnchorBottom, DestinationConnectionIndex: AnchorBottom}, + want: false, + }, + } + + for _, tc := range tests { + t.Run(tc.name, func(t *testing.T) { + got := hasExplicitFalseBranchAnchor(tc.flow) + if got != tc.want { + t.Fatalf("hasExplicitFalseBranchAnchor(%s) = %v, want %v", tc.name, got, tc.want) + } + }) + } +} diff --git a/mdl/executor/cmd_microflows_show_helpers.go b/mdl/executor/cmd_microflows_show_helpers.go index 296a45c8..cfb1ed5a 100644 --- a/mdl/executor/cmd_microflows_show_helpers.go +++ b/mdl/executor/cmd_microflows_show_helpers.go @@ -1436,12 +1436,16 @@ func branchFlowStartsAtTerminal(flow *microflows.SequenceFlow, activityMap map[m } } -// hasExplicitFalseBranchAnchor reports whether a flow is the false-branch anchor -// of a boolean ExclusiveSplit (origin=top, destination=bottom). This heuristic -// distinguishes boolean false-branch flows from enum-split flows inside isGuard, -// because both share a nil CaseValue but differ in their anchor positions. -// Limitation: a custom @anchor that happens to use (top, bottom) would be -// misclassified; this is accepted because it is an unlikely user choice. +// hasExplicitFalseBranchAnchor reports whether a false-branch sequence flow +// carries anchor metadata that the user explicitly authored. Top→Bottom is +// the non-default pair produced by `@anchor(false: (from: top, to: bottom))`; +// any other combination is either a builder default or a different author +// intention that should not trigger the guard-pattern describer. +// +// Used by the `isGuard` paths in traverseFlow / traverseFlowUntilMerge to +// distinguish a real guard continuation from a branch whose layout should +// stay visible as an explicit `else` in the described MDL. See +// TestHasExplicitFalseBranchAnchor for the exhaustive cases. func hasExplicitFalseBranchAnchor(flow *microflows.SequenceFlow) bool { if flow == nil { return false diff --git a/mdl/executor/roundtrip_doctype_test.go b/mdl/executor/roundtrip_doctype_test.go index c0253e61..c4cd7e2e 100644 --- a/mdl/executor/roundtrip_doctype_test.go +++ b/mdl/executor/roundtrip_doctype_test.go @@ -31,15 +31,18 @@ var scriptModuleDeps = map[string][]string{ // headers etc. that full validation requires. var scriptKnownCEErrors = map[string][]string{ "03-page-examples.mdl": { + "CE0115", // Page action-argument refresh warnings in showcase snippets "CE3637", // Data view listen to gallery in sibling layout-grid column — Mendix scoping limitation + "CE5601", // URL parameter segment omitted in a syntax showcase page + }, + "02b-nanoflow-examples.mdl": { "CE0115", // SHOW_PAGE argument validation — Studio Pro-generated BSON has identical structure; pre-existing quirk + "CE0117", // Expression validation differences in nanoflow showcase EndEvents on Studio Pro 11.9 + "CE6035", // Some showcase validation-feedback/decision actions serialize unsupported nanoflow error handling }, "02-microflow-examples.mdl": { "CE0117", // Expression error in LOG WARNING on Mendix 10.x (string concat syntax difference) }, - "02b-nanoflow-examples.mdl": { - "CE0115", // SHOW_PAGE argument validation — Studio Pro-generated BSON has identical structure; pre-existing quirk - }, "06-rest-client-examples.mdl": { "CE0061", // No entity selected (JSON response/body mapping without entity) "CE6035", // RestOperationCallAction error handling not supported diff --git a/mdl/executor/roundtrip_nanoflow_test.go b/mdl/executor/roundtrip_nanoflow_test.go index 958e26a5..62b1df9e 100644 --- a/mdl/executor/roundtrip_nanoflow_test.go +++ b/mdl/executor/roundtrip_nanoflow_test.go @@ -136,8 +136,7 @@ func TestRoundtripNanoflow_Loop(t *testing.T) { begin retrieve $Items from ` + testModule + `.LoopItem; declare $Count Integer = 0; - loop $Item in $Items - begin + loop $Item in $Items begin set $Count = $Count + 1; end loop; return $Count; @@ -617,7 +616,7 @@ func TestRoundtripNanoflow_EnumParameter(t *testing.T) { } nfName := testModule + ".RT_NF_EnumParam" - createMDL := `create nanoflow ` + nfName + ` ($Color: ` + testModule + `.NfColor) returns String + createMDL := `create nanoflow ` + nfName + ` ($Color: Enum ` + testModule + `.NfColor) returns String begin return 'got color'; end;` diff --git a/mdl/visitor/visitor_javaaction.go b/mdl/visitor/visitor_javaaction.go index 44d9aade..36c9e8c2 100644 --- a/mdl/visitor/visitor_javaaction.go +++ b/mdl/visitor/visitor_javaaction.go @@ -55,7 +55,7 @@ func (b *Builder) ExitCreateJavaActionStatement(ctx *parser.CreateJavaActionStat // Get return type if retType := ctx.JavaActionReturnType(); retType != nil { if dt := retType.DataType(); dt != nil { - stmt.ReturnType = buildDataType(dt) + stmt.ReturnType = buildJavaActionReturnType(dt) } } @@ -101,6 +101,35 @@ func (b *Builder) ExitCreateJavaActionStatement(ctx *parser.CreateJavaActionStat b.statements = append(b.statements, stmt) } +func buildJavaActionReturnType(ctx parser.IDataTypeContext) ast.DataType { + dt := buildDataType(ctx) + if isVoidReturnType(dt) { + return ast.DataType{Kind: ast.TypeVoid} + } + return dt +} + +func isVoidReturnType(dt ast.DataType) bool { + var name ast.QualifiedName + switch dt.Kind { + case ast.TypeVoid: + return true + case ast.TypeEntity: + if dt.EntityRef == nil { + return false + } + name = *dt.EntityRef + case ast.TypeEnumeration: + if dt.EnumRef == nil { + return false + } + name = *dt.EnumRef + default: + return false + } + return name.Module == "" && strings.EqualFold(name.Name, "void") +} + // extractJavaImports separates `import ...;` lines from Java code. // Lines matching the Java import statement pattern are returned as imports; // the remaining lines form the method body. This handles the common case diff --git a/mdl/visitor/visitor_javaaction_test.go b/mdl/visitor/visitor_javaaction_test.go index 2e6183b0..02b25000 100644 --- a/mdl/visitor/visitor_javaaction_test.go +++ b/mdl/visitor/visitor_javaaction_test.go @@ -300,6 +300,27 @@ $$;` } } +func TestJavaAction_ExplicitVoidReturnType(t *testing.T) { + input := `CREATE JAVA ACTION MyModule.DoStuff() +RETURNS Void +AS $$ +System.out.println("done"); +$$;` + + prog, errs := Build(input) + if len(errs) > 0 { + for _, err := range errs { + t.Errorf("Parse error: %v", err) + } + return + } + + stmt := prog.Statements[0].(*ast.CreateJavaActionStmt) + if stmt.ReturnType.Kind != ast.TypeVoid { + t.Fatalf("ReturnType.Kind = %v, want TypeVoid", stmt.ReturnType.Kind) + } +} + func TestJavaAction_TypeParamWithMixedParamTypes(t *testing.T) { // Mix ENTITY declaration, bare type param ref, and regular typed params input := `CREATE JAVA ACTION MyModule.ProcessEntity(