@memoarchitect/tools 0.8.7 → 0.10.8

package/packages/tools/src/grammar/memo-sysml.langium

@@ -310,7 +310,8 @@ UsageMember:
     | InterfaceUsage
     | ActionUsage
     | PortUsage
-    | ViewUsage;
+    | ViewUsage
+    | ViewpointUsage;
 
 PartUsage:
     isVariation?='variation'? 'part' name=ID (':' type=QualifiedName multiplicity=Multiplicity?)?
@@ -401,6 +402,15 @@ ViewUsage:
     'view' name=ID (':' type=QualifiedName)?
     ('{' body+=ViewBodyMember* '}' | ';');
 
+// `ViewpointUsage = OccurrenceUsagePrefix 'viewpoint' ConstraintUsageDeclaration
+// RequirementBody` (SysML :1640). The definition form was here and the usage
+// form was not, so `viewpoint vpModelContent : MemoViewpoint { … }` could not
+// parse — and that is how the ontology's whole viewpoint catalog is written.
+// Same definition/usage pairing as ViewDefinition/ViewUsage above.
+ViewpointUsage:
+    'viewpoint' name=ID (':' type=QualifiedName)?
+    ('{' body+=UsageBodyMember* '}' | ';');
+
 ViewBodyMember:
     UsageBodyMember | ExposeMember;
 
@@ -425,8 +435,12 @@ ConnectionUsage:
         '}'
     );
 
+// The end NAME is optional. `connect a to b` is the normative binary-connector
+// shorthand — SysIDE accepts it and, since the compiler of record wins, so must
+// this grammar. Requiring `endName ::>` here rejected every untyped `connect`,
+// which is the form a relation migrated to native `connect` now takes.
 ConnectionEnd:
-    endName=FeatureName '::>' ref=ReferenceName;
+    (endName=FeatureName '::>')? ref=ReferenceName;
 
 // The BASE FEATURE of a connection definition — `abstract connection derivations
 // : Derivation[*];` in the OMG's DerivationConnections. It is not a link; it is
@@ -517,8 +531,17 @@ DottedNameSegment returns string:
 // ─── Behavior: Succession usage ─────────────────────────────────────────────
 // Syntax: first start then action1 then action2 then done ;
 
+// KerML `SuccessionDeclaration` (:845) is
+//   ( 'first' ConnectorEndMember 'then' ConnectorEndMember )?
+// — exactly ONE `then`. A chain is written as consecutive pairwise statements,
+// `first a then b; first b then c;`, which is how every succession in the
+// ontology and its examples is already written.
+//
+// This used to be `('then' …)+`, which accepted `first a then b then c;`. That
+// is not valid SysML and SysIDE — the compiler of record — rejects it, so the
+// permissive form let a model parse here and fail the gate that matters.
 SuccessionUsage:
-    'succession'? 'first' steps+=SuccessionStep ('then' steps+=SuccessionStep)+ ';';
+    'succession'? 'first' steps+=SuccessionStep 'then' steps+=SuccessionStep ';';
 
 SuccessionStep:
     ref=SuccessionRef ('if' guard=OrExpr)?;
@@ -631,7 +654,14 @@ ExhibitStateUsage:
 // That is what memo-native-requirement-relations decision 1 remodels 61 of 99
 // VerifiedBy links onto, and it is also what makes that training file parse.
 SubjectMember:
-    'subject' name=MemberName (':' type=QualifiedName multiplicity=Multiplicity?)?
+    // `redefines?` comes BEFORE the name, as in RefMember and AttributeMember.
+    // Without it, `subject :>> supportingSystem = X;` — an unnamed usage that
+    // redefines an inherited subject — cannot parse, because `name` was
+    // mandatory. `Identification` (KerML :152) makes BOTH name parts optional,
+    // so the unnamed redefining form is well-formed SysML and SysIDE accepts
+    // it. Any UseCase specialization that binds the inherited
+    // `subject supportingSystem` hits this.
+    'subject' (redefines?=(':>>' | 'redefines'))? name=MemberName (':' type=QualifiedName multiplicity=Multiplicity?)?
     (bindingOp=('=' | ':>' | ':>>')
         ('(' boundRefs+=ReferenceName (',' boundRefs+=ReferenceName)* ')'
         | boundRefs+=ReferenceName))?
@@ -737,7 +767,7 @@ ReferenceName returns string:
 // ─── Body members ────────────────────────────────────────────────────────────
 
 DefinitionBodyMember:
-    AttributeMember | PartMember | PortUsage | ItemUsage | ViewUsage | RefMember | FeatureMembershipMember | RequireConstraintMember | RequirementVerificationMember | ArcadiaMember | MetadataApplication | DocComment;
+    AttributeMember | PartMember | PortUsage | ItemUsage | ViewUsage | ViewpointUsage | RefMember | FeatureMembershipMember | RequireConstraintMember | RequirementVerificationMember | ArcadiaMember | MetadataApplication | DocComment;
 
 // The fourteen native mechanisms, gathered once so both body rules stay
 // readable and neither can drift out of step with the other.
@@ -802,8 +832,13 @@ PrimaryExpr infers ConstraintExpr:
 // it landed when that reinvention was retired. TransitionUsage is NOT listed
 // here: it already arrives through ArcadiaMember, and naming it twice makes
 // the alternation ambiguous.
+// `PackageDeclaration` is a legal usage-body member: SysIDE accepts
+// `part scrHome : UIElement { package grpHeader { part btnBack : UIElement; } }`
+// and the grammar rejected it. Grouping UI elements inside a screen is the case
+// that needed it — a package groups without asserting the part decomposition a
+// nested part would.
 UsageBodyMember:
-    AttributeMember | PartMember | PortUsage | ItemUsage | RefMember | ViewUsage | FlowConnectionUsage | MessageUsage | SuccessionUsage | ConnectionUsage | SatisfyRequirementUsage | RequirementVerificationMember | ArcadiaMember | Dependency | MetadataApplication | StateUsage | DocComment;
+    AttributeMember | PartMember | PortUsage | ItemUsage | RefMember | ViewUsage | ViewpointUsage | FlowConnectionUsage | MessageUsage | SuccessionUsage | ConnectionUsage | SatisfyRequirementUsage | RequirementVerificationMember | ArcadiaMember | Dependency | MetadataApplication | StateUsage | PackageDeclaration | DocComment;
 
 // ─── Attribute member ────────────────────────────────────────────────────────
 // Three forms:
@@ -912,11 +947,20 @@ PartMember:
 //   ref function : SystemFunction[0..1];      (keyword-named reference)
 //   ref item exchangedItem : ExchangeItem;    (item-typed reference payload)
 //   ref :>> definition = syringeDef;          (redefining a reference to a value)
+//   ref vpLogical :> viewpointDefinition = logicalArchitectureViewpoint;
+//                                              (subset a feature and bind its value)
+//
+// The last form is the native spelling used by document views. `ref` is a
+// reference feature, so it must support the same subsetting-and-value shape as
+// `part`; accepting only the latter made the in-browser parser reject SysIDE-
+// valid view declarations at `:>`.
 
 RefMember:
     'ref' (isItem?='item')? (redefines?=':>>')? name=FeatureName
     (':' isConjugated?='~'? type=QualifiedName multiplicity=Multiplicity?)?
-    ('=' value=AttributeValue)?
+    (   (bindingOp=':>' boundRef=QualifiedName ('=' subsetValue=QualifiedName)?)
+      | ('=' value=AttributeValue)
+    )?
     ';';
 
 // ─── Bare feature-membership member ──────────────────────────────────────────