Skip to content

Commit 511cde8

Browse files
akoclaude
andcommitted
feat(mdl): create/describe/drop/list message definition documents on 11.15
Adds `create [or modify] message definition M.Name [folder] for M.Entity [as '…'] { members }`, `describe|drop message definition`, `list message definitions` and two-part `alter message definition M.Name …`. A mapping's `with message definition M.Name` resolves against the documents. A three-part name resolves to the converted document and is stored as M.Name. The document form is refused below 11.15 and the collection form from 11.15 on, each with a hint. describe prints the document form, so describe -> exec round-trips (checked against Studio Pro-converted documents). Part of #987. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent e136250 commit 511cde8

31 files changed

Lines changed: 997 additions & 41 deletions

‎cmd/mxcli/lsp_completions_gen.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎mdl/ast/ast_messagedefinition.go‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,34 @@ type CreateMessageDefinitionCollectionStmt struct {
2525

2626
func (s *CreateMessageDefinitionCollectionStmt) isStatement() {}
2727

28+
// CreateMessageDefinitionStmt represents one message definition as its own
29+
// document — a MessageDefinitions$MessageDefinition2, Mendix 11.15's storage
30+
// (ako/mxcli#987):
31+
//
32+
// CREATE [OR MODIFY] MESSAGE DEFINITION Module.Name [FOLDER 'path']
33+
// FOR Module.Entity [AS 'Exposed'] { members };
34+
//
35+
// Definition carries the collection entry's shape, so the two forms share the
36+
// builder; its Name is Name.Name.
37+
type CreateMessageDefinitionStmt struct {
38+
CreateGuard
39+
Name QualifiedName
40+
Folder string
41+
CreateOrModify bool
42+
Definition *MessageDefinitionDef
43+
}
44+
45+
func (s *CreateMessageDefinitionStmt) isStatement() {}
46+
47+
// DropMessageDefinitionStmt represents DROP MESSAGE DEFINITION Module.Name, the
48+
// 11.15 document.
49+
type DropMessageDefinitionStmt struct {
50+
DropGuard
51+
Name QualifiedName
52+
}
53+
54+
func (s *DropMessageDefinitionStmt) isStatement() {}
55+
2856
// MessageDefinitionDef is one `definition <Name> for <Entity>` inside a
2957
// collection.
3058
//
@@ -99,6 +127,9 @@ type AlterMessageDefinitionStmt struct {
99127
// Collection and Definition come from the three-part name.
100128
Collection QualifiedName
101129
Definition string
130+
// Document is set instead for a two-part name, Module.Name: an 11.15
131+
// MessageDefinition2 document (ako/mxcli#987).
132+
Document QualifiedName
102133
// Op is "ADD", "DROP" or "SET".
103134
Op string
104135
// Member is the member being added (ADD).

‎mdl/ast/ast_query.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ const (
9999
ShowWorkflowGroups // SHOW WORKFLOW GROUPS (project settings, not a module listing)
100100
ShowJsonStructures // SHOW JSON STRUCTURES [IN module]
101101
ShowMessageDefinitionCollections // SHOW MESSAGE DEFINITION COLLECTIONS [IN module]
102+
ShowMessageDefinitions // SHOW MESSAGE DEFINITIONS [IN module] (11.15 documents)
102103
ShowImportMappings // SHOW IMPORT MAPPINGS [IN module]
103104
ShowExportMappings // SHOW EXPORT MAPPINGS [IN module]
104105
ShowModels // SHOW MODELS [IN module] (agent-editor Model documents)
@@ -247,6 +248,8 @@ func (t ShowObjectType) String() string {
247248
return "JSON STRUCTURES"
248249
case ShowMessageDefinitionCollections:
249250
return "MESSAGE DEFINITION COLLECTIONS"
251+
case ShowMessageDefinitions:
252+
return "MESSAGE DEFINITIONS"
250253
case ShowImportMappings:
251254
return "IMPORT MAPPINGS"
252255
case ShowExportMappings:
@@ -359,6 +362,7 @@ const (
359362
DescribeContractMessage // DESCRIBE CONTRACT MESSAGE Service.MessageName
360363
DescribeJsonStructure // DESCRIBE JSON STRUCTURE Module.Name
361364
DescribeMessageDefinitionCollection // DESCRIBE MESSAGE DEFINITION COLLECTION Module.Name
365+
DescribeMessageDefinition // DESCRIBE MESSAGE DEFINITION Module.Name (11.15 document)
362366
DescribeNanoflow // DESCRIBE NANOFLOW Module.Name
363367
DescribeRule // DESCRIBE RULE Module.Name
364368
DescribeImportMapping // DESCRIBE IMPORT MAPPING Module.Name
@@ -448,6 +452,8 @@ func (t DescribeObjectType) String() string {
448452
return "CONTRACT MESSAGE"
449453
case DescribeMessageDefinitionCollection:
450454
return "MESSAGE DEFINITION COLLECTION"
455+
case DescribeMessageDefinition:
456+
return "MESSAGE DEFINITION"
451457
case DescribeJsonStructure:
452458
return "JSON STRUCTURE"
453459
case DescribeNanoflow:

‎mdl/executor/cmd_create_guard.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@ func createGuardTargetOf(stmt ast.Statement) (createGuardTarget, bool) {
193193
return doc("json structure", s.Name, func(ctx *ExecContext) (any, error) { return ctx.Backend.ListJsonStructures() })
194194
case *ast.CreateMessageDefinitionCollectionStmt:
195195
return doc("message definition collection", s.Name, func(ctx *ExecContext) (any, error) { return ctx.Backend.ListMessageDefinitionCollections() })
196+
case *ast.CreateMessageDefinitionStmt:
197+
return doc("message definition", s.Name, func(ctx *ExecContext) (any, error) { return ctx.Backend.ListMessageDefinitionDocuments() })
196198
case *ast.CreateImportMappingStmt:
197199
return doc("import mapping", s.Name, func(ctx *ExecContext) (any, error) { return ctx.Backend.ListImportMappings() })
198200
case *ast.CreateExportMappingStmt:

‎mdl/executor/cmd_export_mappings.go‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -352,16 +352,24 @@ func execCreateExportMapping(ctx *ExecContext, s *ast.CreateExportMappingStmt) e
352352
if existing != nil {
353353
existingMD, existingMD2 = existing.MessageDefinition, existing.MessageDefinition2
354354
}
355+
// A message definition is resolved first: the reference stored is the
356+
// resolved one, which on 11.15 is the document's Module.Name even when the
357+
// script wrote the pre-11.15 three-part form (ako/mxcli#987).
358+
var md *model.MessageDefinition
359+
mdRef := s.SchemaRef.String()
360+
if s.SchemaKind == "MESSAGE_DEFINITION" {
361+
var mdErr error
362+
md, mdRef, mdErr = findMessageDefinition(ctx, mdRef)
363+
if mdErr != nil {
364+
return mdlerrors.NewValidation(fmt.Sprintf("export mapping %s: %v", s.Name.String(), mdErr))
365+
}
366+
}
355367
em.MessageDefinition, em.MessageDefinition2 = mappingMessageDefinitionKeys(
356368
ctx.Backend.ProjectVersion(), existing != nil, existingMD, existingMD2,
357-
s.SchemaKind == "MESSAGE_DEFINITION", s.SchemaRef.String())
369+
s.SchemaKind == "MESSAGE_DEFINITION", mdRef)
358370

359371
// See the import twin: a message definition has its own builder (#263).
360372
if s.SchemaKind == "MESSAGE_DEFINITION" {
361-
md, err := findMessageDefinition(ctx.Backend, s.SchemaRef.String())
362-
if err != nil {
363-
return mdlerrors.NewValidation(fmt.Sprintf("export mapping %s: %v", s.Name.String(), err))
364-
}
365373
if s.RootElement != nil {
366374
root, err := buildExportMappingFromMessageDefinition(s.Name.Module, s.RootElement,
367375
md.Root, "", "", true, ctx.Backend)

‎mdl/executor/cmd_import_mappings.go‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -449,17 +449,25 @@ func execCreateImportMapping(ctx *ExecContext, s *ast.CreateImportMappingStmt) e
449449
if existing != nil {
450450
existingMD, existingMD2 = existing.MessageDefinition, existing.MessageDefinition2
451451
}
452+
// A message definition is resolved first: the reference stored is the
453+
// resolved one, which on 11.15 is the document's Module.Name even when the
454+
// script wrote the pre-11.15 three-part form (ako/mxcli#987).
455+
var md *model.MessageDefinition
456+
mdRef := s.SchemaRef.String()
457+
if s.SchemaKind == "MESSAGE_DEFINITION" {
458+
var mdErr error
459+
md, mdRef, mdErr = findMessageDefinition(ctx, mdRef)
460+
if mdErr != nil {
461+
return mdlerrors.NewValidation(fmt.Sprintf("import mapping %s: %v", s.Name.String(), mdErr))
462+
}
463+
}
452464
im.MessageDefinition, im.MessageDefinition2 = mappingMessageDefinitionKeys(
453465
ctx.Backend.ProjectVersion(), existing != nil, existingMD, existingMD2,
454-
s.SchemaKind == "MESSAGE_DEFINITION", s.SchemaRef.String())
466+
s.SchemaKind == "MESSAGE_DEFINITION", mdRef)
455467

456468
// A message definition resolves against the domain model, not a payload
457469
// sample, and the mapping stores both path families — its own builder (#263).
458470
if s.SchemaKind == "MESSAGE_DEFINITION" {
459-
md, err := findMessageDefinition(ctx.Backend, s.SchemaRef.String())
460-
if err != nil {
461-
return mdlerrors.NewValidation(fmt.Sprintf("import mapping %s: %v", s.Name.String(), err))
462-
}
463471
if s.RootElement != nil {
464472
root, err := buildImportMappingFromMessageDefinition(s.Name.Module, s.RootElement,
465473
md.Root, "", "", true, ctx.Backend)

0 commit comments

Comments
 (0)