missing derived properties implementation to go further

Author: antoineatstariongroup

SysML2.NET.CodeGenerator/HandleBarHelpers/RulesHelper.cs

@@ -579,7 +579,17 @@ private static void ProcessAlternatives(EncodedTextWriter writer, IClass umlClas
 
                             if (targetProperty != null)
                             {
-                                writer.WriteSafeString($"if(poco.{targetProperty.QueryPropertyNameBasedOnUmlProperties()}.Count == 0){Environment.NewLine}");
+                                // Use cursor state for ';' vs '{' decision. By the time the body
+                                // is reached, previous methods (prefix, declaration) have already
+                                // consumed typing, multiplicity, etc. from the shared cursor.
+                                // GetOrCreateCursor returns the same cursor at its current position.
+                                // Use cursor state for ';' vs '{' decision. Previous methods
+                                // (prefix, declaration) have consumed typing/multiplicity from
+                                // the shared cursor via GetOrCreateCursor. If cursor.Current is
+                                // null, no body members remain → emit ';'.
+                                var bodyPropertyAccess = targetProperty.QueryPropertyNameBasedOnUmlProperties();
+                                writer.WriteSafeString($"if(cursorCache.GetOrCreateCursor(poco.Id, \"{targetProperty.Name}\", poco.{bodyPropertyAccess}).Current == null){Environment.NewLine}");
+
                                 writer.WriteSafeString($"{{{Environment.NewLine}");
                                 writer.WriteSafeString($"stringBuilder.AppendLine(\"{terminalValue}\");{Environment.NewLine}");
                                 writer.WriteSafeString($"}}{Environment.NewLine}");
@@ -627,7 +637,8 @@ private static void ProcessAlternatives(EncodedTextWriter writer, IClass umlClas
                                         {
                                             var propertyAccessName = targetProperty.QueryPropertyNameBasedOnUmlProperties();
 
-                                            writer.WriteSafeString($"if(poco.{propertyAccessName}.Count == 0){Environment.NewLine}");
+                                            writer.WriteSafeString($"if(cursorCache.GetOrCreateCursor(poco.Id, \"{targetProperty.Name}\", poco.{propertyAccessName}).Current == null){Environment.NewLine}");
+
                                             writer.WriteSafeString($"{{{Environment.NewLine}");
                                             writer.WriteSafeString($"stringBuilder.AppendLine(\"{terminalValue}\");{Environment.NewLine}");
                                             writer.WriteSafeString($"}}{Environment.NewLine}");
@@ -721,7 +732,8 @@ private static void ProcessAlternatives(EncodedTextWriter writer, IClass umlClas
                                             {
                                                 var propertyAccessName = targetProperty.QueryPropertyNameBasedOnUmlProperties();
 
-                                                writer.WriteSafeString($"if(poco.{propertyAccessName}.Count == 0){Environment.NewLine}");
+                                                writer.WriteSafeString($"if(cursorCache.GetOrCreateCursor(poco.Id, \"{targetProperty.Name}\", poco.{propertyAccessName}).Current == null){Environment.NewLine}");
+
                                                 writer.WriteSafeString($"{{{Environment.NewLine}");
                                                 writer.WriteSafeString($"stringBuilder.AppendLine(\"{terminalValue}\");{Environment.NewLine}");
                                                 writer.WriteSafeString($"}}{Environment.NewLine}");
@@ -2846,6 +2858,27 @@ private static string ResolveContentTypeGuard(string cursorVariableName, Textual
 
             if (complementaryProperty == null)
             {
+                // No complementary composite property exists on this class (e.g., Usage is not
+                // a Relationship). Follow the rule's same-property assignment one level deeper:
+                // if the rule has ownedRelationship += PrefixMetadataMember, recurse into
+                // PrefixMetadataMember which IS a Relationship and has ownedRelatedElement.
+                var samePropertyAssignment = referencedRule.Alternatives
+                    .SelectMany(alt => alt.Elements)
+                    .OfType<AssignmentElement>()
+                    .FirstOrDefault(a => (a.Operator == "+=" || a.Operator == "=")
+                                         && string.Equals(a.Property, outerPropertyName, StringComparison.OrdinalIgnoreCase)
+                                         && a.Value is NonTerminalElement);
+
+                if (samePropertyAssignment?.Value is NonTerminalElement innerNonTerminal)
+                {
+                    var innerRule = ruleGenerationContext.AllRules.SingleOrDefault(x => x.RuleName == innerNonTerminal.Name);
+
+                    if (innerRule != null)
+                    {
+                        return ResolveContentTypeGuard(cursorVariableName, innerRule, outerPropertyName, umlClass, ruleGenerationContext);
+                    }
+                }
+
                 return null;
             }
 
@@ -3088,7 +3121,7 @@ private static void DeclareCursorIfRequired(EncodedTextWriter writer, IClass uml
         /// Terminals after which no trailing space should be emitted,
         /// because the next element is directly adjacent (e.g., content inside angle brackets, closing angle bracket, or the <c>~</c> prefix operator).
         /// </summary>
-        private static readonly HashSet<string> NoTrailingSpaceTerminals = ["<", ">", "~"];
+        private static readonly HashSet<string> NoTrailingSpaceTerminals = ["<", ">", "~", "[", "(", "#", ".", "'", "*"];
 
         /// <summary>
         /// Writes the <c>stringBuilder.Append</c> or <c>stringBuilder.AppendLine</c> call for a terminal value,
@@ -3128,7 +3161,7 @@ private static void WriteTerminalAppend(EncodedTextWriter writer, string termina
                 return;
             }
 
-            writer.WriteSafeString($"stringBuilder.Append(\"{terminalValue}\");");
+            writer.WriteSafeString($"stringBuilder.Append(\"{terminalValue} \");");
         }
 
         /// <summary>

SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/BindingConnectorAsUsageTextualNotationBuilder.cs

@@ -65,7 +65,7 @@ public static void BuildBindingConnectorAsUsage(SysML2.NET.Core.POCO.Systems.Con
             }
             ownedRelationshipCursor.Move();
 
-            stringBuilder.Append("=");
+            stringBuilder.Append("= ");
 
             if (ownedRelationshipCursor.Current != null)
             {

SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/ConnectionUsageTextualNotationBuilder.cs

@@ -141,7 +141,7 @@ public static void BuildNaryConnectorPart(SysML2.NET.Core.POCO.Systems.Connectio
                 ownedRelationshipCursor.Move();
 
             }
-            stringBuilder.Append(")");
+            stringBuilder.Append(") ");
 
         }
 

SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/ConnectorTextualNotationBuilder.cs

@@ -147,7 +147,7 @@ public static void BuildNaryConnectorDeclaration(SysML2.NET.Core.POCO.Kernel.Con
                 ownedRelationshipCursor.Move();
 
             }
-            stringBuilder.Append(")");
+            stringBuilder.Append(") ");
 
         }
 

SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/DefinitionTextualNotationBuilder.cs

@@ -73,7 +73,7 @@ public static void BuildDefinitionPrefix(SysML2.NET.Core.POCO.Systems.Definition
                 SharedTextualNotationBuilder.BuildBasicDefinitionPrefix(poco, cursorCache, stringBuilder);
             }
             var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);
-            while (ownedRelationshipCursor.Current != null && ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership)
+            while (ownedRelationshipCursor.Current is SysML2.NET.Core.POCO.Root.Namespaces.IOwningMembership owningMembershipGuard && owningMembershipGuard.OwnedRelatedElement.OfType<SysML2.NET.Core.POCO.Systems.Metadata.IMetadataUsage>().Any())
             {
                 BuildDefinitionExtensionKeyword(poco, cursorCache, stringBuilder);
             }

SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/ElementFilterMembershipTextualNotationBuilder.cs

@@ -83,7 +83,7 @@ public static void BuildFilterPackageMember(SysML2.NET.Core.POCO.Kernel.Packages
             }
             ownedRelatedElementCursor.Move();
 
-            stringBuilder.Append("]");
+            stringBuilder.Append("] ");
 
         }
     }

SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/EnumerationDefinitionTextualNotationBuilder.cs

@@ -43,7 +43,7 @@ public static partial class EnumerationDefinitionTextualNotationBuilder
         /// <param name="stringBuilder">The <see cref="StringBuilder" /> that contains the entire textual notation</param>
         public static void BuildEnumerationBody(SysML2.NET.Core.POCO.Systems.Enumerations.IEnumerationDefinition poco, ICursorCache cursorCache, StringBuilder stringBuilder)
         {
-            if (poco.OwnedRelationship.Count == 0)
+            if (cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship).Current == null)
             {
                 stringBuilder.AppendLine(";");
             }

SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/ExpressionTextualNotationBuilder.cs

@@ -141,7 +141,7 @@ public static void BuildSequenceExpression(SysML2.NET.Core.POCO.Kernel.Functions
         {
             stringBuilder.Append("(");
             BuildSequenceExpressionList(poco, cursorCache, stringBuilder);
-            stringBuilder.Append(")");
+            stringBuilder.Append(") ");
 
         }
 

SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/FeatureTextualNotationBuilder.cs

@@ -140,7 +140,7 @@ public static void BuildTypings(SysML2.NET.Core.POCO.Core.Features.IFeature poco
         public static void BuildTypedBy(SysML2.NET.Core.POCO.Core.Features.IFeature poco, ICursorCache cursorCache, StringBuilder stringBuilder)
         {
             var ownedRelationshipCursor = cursorCache.GetOrCreateCursor(poco.Id, "ownedRelationship", poco.OwnedRelationship);
-            stringBuilder.Append(":");
+            stringBuilder.Append(": ");
 
             if (ownedRelationshipCursor.Current != null)
             {
@@ -1033,7 +1033,7 @@ public static void BuildArgumentList(SysML2.NET.Core.POCO.Core.Features.IFeature
                     break;
             }
 
-            stringBuilder.Append(")");
+            stringBuilder.Append(") ");
 
         }
 
@@ -1138,7 +1138,7 @@ public static void BuildNamedArgument(SysML2.NET.Core.POCO.Core.Features.IFeatur
             }
             ownedRelationshipCursor.Move();
 
-            stringBuilder.Append("=");
+            stringBuilder.Append("= ");
 
             if (ownedRelationshipCursor.Current != null)
             {

SysML2.NET/TextualNotation/AutoGenTextualNotationBuilder/IndexExpressionTextualNotationBuilder.cs

@@ -68,7 +68,7 @@ public static void BuildIndexExpression(SysML2.NET.Core.POCO.Kernel.Expressions.
             }
             ownedRelationshipCursor.Move();
 
-            stringBuilder.Append(")");
+            stringBuilder.Append(") ");
 
         }
     }