domaintrail 0.1.0 → 0.3.0

package/dist/dt.js

@@ -49,6 +49,9 @@ function isEventDecl(item) {
 function isExistsExpr(item) {
   return reflection.isInstance(item, ExistsExpr.$type);
 }
+function isFieldSet(item) {
+  return reflection.isInstance(item, FieldSet.$type);
+}
 function isIdType(item) {
   return reflection.isInstance(item, IdType.$type);
 }
@@ -103,10 +106,11 @@ function isUnionDecl(item) {
 function isValueObject(item) {
   return reflection.isInstance(item, ValueObject.$type);
 }
-var Aggregate, AggregateMember, BinaryExpr, BoolLiteral, Command, Context, ContextElement, CountExpr, DataMember, DecimalLiteral, Entity, EnumDecl, EnumValue, ErrorDecl, EventDecl, ExistsExpr, Expression, Field, IdType, IntLiteral, Invariant, LambdaParam, LengthExpr, MatchesExpr, MemberAccess, Model, Multiplicity, NameRef, NotExpr, OwnsField, Parameter, PrimitiveDecl, QuantifierExpr, RangeExpr, ReferenceField, State, StringLiteral, TermEntry, Terms, TypeDecl, TypeRef, UnionDecl, ValueObject, Variant, DomainAstReflection, reflection;
+var Aggregate, AggregateMember, BinaryExpr, BoolLiteral, Command, Context, ContextElement, CountExpr, DataMember, DecimalLiteral, Entity, EnumDecl, EnumValue, ErrorDecl, EventDecl, ExistsExpr, Expression, Field, FieldSet, IdType, IntLiteral, Invariant, LambdaParam, LengthExpr, MatchesExpr, MemberAccess, Model, Multiplicity, NameRef, NotExpr, OwnsField, Parameter, PrimitiveDecl, QuantifierExpr, RangeExpr, ReferenceField, State, StringLiteral, TermEntry, Terms, Transition, TypeDecl, TypeRef, UnionDecl, ValueObject, Variant, DomainAstReflection, reflection;
 var init_ast = __esm(() => {
   Aggregate = {
     $type: "Aggregate",
+    fieldSets: "fieldSets",
     label: "label",
     members: "members",
     name: "name"
@@ -129,11 +133,10 @@ var init_ast = __esm(() => {
     emits: "emits",
     errors: "errors",
     factory: "factory",
-    from: "from",
     label: "label",
     name: "name",
     params: "params",
-    to: "to"
+    transitions: "transitions"
   };
   Context = {
     $type: "Context",
@@ -160,6 +163,7 @@ var init_ast = __esm(() => {
   };
   Entity = {
     $type: "Entity",
+    fieldSets: "fieldSets",
     label: "label",
     members: "members",
     name: "name"
@@ -177,12 +181,14 @@ var init_ast = __esm(() => {
   };
   ErrorDecl = {
     $type: "ErrorDecl",
+    fieldSets: "fieldSets",
     label: "label",
     members: "members",
     name: "name"
   };
   EventDecl = {
     $type: "EventDecl",
+    fieldSets: "fieldSets",
     label: "label",
     members: "members",
     name: "name",
@@ -202,6 +208,13 @@ var init_ast = __esm(() => {
     name: "name",
     type: "type"
   };
+  FieldSet = {
+    $type: "FieldSet",
+    fieldSets: "fieldSets",
+    label: "label",
+    members: "members",
+    name: "name"
+  };
   IdType = {
     $type: "IdType",
     base: "base",
@@ -320,6 +333,11 @@ var init_ast = __esm(() => {
     $type: "Terms",
     entries: "entries"
   };
+  Transition = {
+    $type: "Transition",
+    from: "from",
+    to: "to"
+  };
   TypeDecl = {
     $type: "TypeDecl"
   };
@@ -338,6 +356,7 @@ var init_ast = __esm(() => {
   };
   ValueObject = {
     $type: "ValueObject",
+    fieldSets: "fieldSets",
     label: "label",
     members: "members",
     name: "name"
@@ -353,6 +372,12 @@ var init_ast = __esm(() => {
       Aggregate: {
         name: Aggregate.$type,
         properties: {
+          fieldSets: {
+            name: Aggregate.fieldSets,
+            defaultValue: [],
+            referenceType: FieldSet.$type,
+            optional: true
+          },
           label: {
             name: Aggregate.label,
             optional: true
@@ -417,12 +442,6 @@ var init_ast = __esm(() => {
             defaultValue: false,
             optional: true
           },
-          from: {
-            name: Command.from,
-            defaultValue: [],
-            referenceType: State.$type,
-            optional: true
-          },
           label: {
             name: Command.label,
             optional: true
@@ -435,10 +454,9 @@ var init_ast = __esm(() => {
             defaultValue: [],
             optional: true
           },
-          to: {
-            name: Command.to,
+          transitions: {
+            name: Command.transitions,
             defaultValue: [],
-            referenceType: State.$type,
             optional: true
           }
         },
@@ -508,6 +526,12 @@ var init_ast = __esm(() => {
       Entity: {
         name: Entity.$type,
         properties: {
+          fieldSets: {
+            name: Entity.fieldSets,
+            defaultValue: [],
+            referenceType: FieldSet.$type,
+            optional: true
+          },
           label: {
             name: Entity.label,
             optional: true
@@ -557,6 +581,12 @@ var init_ast = __esm(() => {
       ErrorDecl: {
         name: ErrorDecl.$type,
         properties: {
+          fieldSets: {
+            name: ErrorDecl.fieldSets,
+            defaultValue: [],
+            referenceType: FieldSet.$type,
+            optional: true
+          },
           label: {
             name: ErrorDecl.label,
             optional: true
@@ -575,6 +605,12 @@ var init_ast = __esm(() => {
       EventDecl: {
         name: EventDecl.$type,
         properties: {
+          fieldSets: {
+            name: EventDecl.fieldSets,
+            defaultValue: [],
+            referenceType: FieldSet.$type,
+            optional: true
+          },
           label: {
             name: EventDecl.label,
             optional: true
@@ -629,6 +665,30 @@ var init_ast = __esm(() => {
         },
         superTypes: [DataMember.$type]
       },
+      FieldSet: {
+        name: FieldSet.$type,
+        properties: {
+          fieldSets: {
+            name: FieldSet.fieldSets,
+            defaultValue: [],
+            referenceType: FieldSet.$type,
+            optional: true
+          },
+          label: {
+            name: FieldSet.label,
+            optional: true
+          },
+          members: {
+            name: FieldSet.members,
+            defaultValue: [],
+            optional: true
+          },
+          name: {
+            name: FieldSet.name
+          }
+        },
+        superTypes: [ContextElement.$type]
+      },
       IdType: {
         name: IdType.$type,
         properties: {
@@ -951,6 +1011,23 @@ var init_ast = __esm(() => {
         },
         superTypes: []
       },
+      Transition: {
+        name: Transition.$type,
+        properties: {
+          from: {
+            name: Transition.from,
+            defaultValue: [],
+            referenceType: State.$type,
+            optional: true
+          },
+          to: {
+            name: Transition.to,
+            defaultValue: [],
+            referenceType: State.$type
+          }
+        },
+        superTypes: []
+      },
       TypeDecl: {
         name: TypeDecl.$type,
         properties: {},
@@ -1001,6 +1078,12 @@ var init_ast = __esm(() => {
       ValueObject: {
         name: ValueObject.$type,
         properties: {
+          fieldSets: {
+            name: ValueObject.fieldSets,
+            defaultValue: [],
+            referenceType: FieldSet.$type,
+            optional: true
+          },
           label: {
             name: ValueObject.label,
             optional: true
@@ -1093,7 +1176,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1105,7 +1188,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -1205,7 +1288,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@38"
+                "$ref": "#/rules@41"
               },
               "arguments": []
             }
@@ -1221,7 +1304,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             }
@@ -1269,35 +1352,42 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@11"
+              "$ref": "#/rules@13"
             },
             "arguments": []
           },
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@13"
+              "$ref": "#/rules@15"
             },
             "arguments": []
           },
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@14"
+              "$ref": "#/rules@16"
             },
             "arguments": []
           },
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@23"
+              "$ref": "#/rules@26"
+            },
+            "arguments": []
+          },
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@27"
             },
             "arguments": []
           },
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@24"
+              "$ref": "#/rules@11"
             },
             "arguments": []
           }
@@ -1324,7 +1414,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1336,7 +1426,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -1353,7 +1443,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@26"
+                "$ref": "#/rules@29"
               },
               "arguments": []
             }
@@ -1389,7 +1479,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1401,7 +1491,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -1418,7 +1508,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@26"
+                "$ref": "#/rules@29"
               },
               "arguments": []
             }
@@ -1458,7 +1548,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@28"
+                    "$ref": "#/rules@31"
                   },
                   "arguments": []
                 },
@@ -1471,7 +1561,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@29"
+                    "$ref": "#/rules@32"
                   },
                   "arguments": []
                 }
@@ -1504,7 +1594,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1516,7 +1606,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -1590,7 +1680,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1602,7 +1692,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -1631,7 +1721,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1643,12 +1733,20 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
             "cardinality": "?"
           },
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@12"
+            },
+            "arguments": [],
+            "cardinality": "?"
+          },
           {
             "$type": "Group",
             "elements": [
@@ -1663,7 +1761,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@16"
+                    "$ref": "#/rules@18"
                   },
                   "arguments": []
                 },
@@ -1682,6 +1780,142 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
       "fragment": false,
       "parameters": []
     },
+    {
+      "$type": "ParserRule",
+      "name": "FieldSet",
+      "definition": {
+        "$type": "Group",
+        "elements": [
+          {
+            "$type": "Keyword",
+            "value": "fields"
+          },
+          {
+            "$type": "Assignment",
+            "feature": "name",
+            "operator": "=",
+            "terminal": {
+              "$type": "RuleCall",
+              "rule": {
+                "$ref": "#/rules@47"
+              },
+              "arguments": []
+            }
+          },
+          {
+            "$type": "Assignment",
+            "feature": "label",
+            "operator": "=",
+            "terminal": {
+              "$type": "RuleCall",
+              "rule": {
+                "$ref": "#/rules@46"
+              },
+              "arguments": []
+            },
+            "cardinality": "?"
+          },
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@12"
+            },
+            "arguments": [],
+            "cardinality": "?"
+          },
+          {
+            "$type": "Keyword",
+            "value": "{"
+          },
+          {
+            "$type": "Assignment",
+            "feature": "members",
+            "operator": "+=",
+            "terminal": {
+              "$type": "RuleCall",
+              "rule": {
+                "$ref": "#/rules@18"
+              },
+              "arguments": []
+            },
+            "cardinality": "*"
+          },
+          {
+            "$type": "Keyword",
+            "value": "}"
+          }
+        ]
+      },
+      "entry": false,
+      "fragment": false,
+      "parameters": []
+    },
+    {
+      "$type": "ParserRule",
+      "fragment": true,
+      "name": "WithFieldSets",
+      "definition": {
+        "$type": "Group",
+        "elements": [
+          {
+            "$type": "Keyword",
+            "value": "with"
+          },
+          {
+            "$type": "Assignment",
+            "feature": "fieldSets",
+            "operator": "+=",
+            "terminal": {
+              "$type": "CrossReference",
+              "type": {
+                "$ref": "#/rules@11"
+              },
+              "terminal": {
+                "$type": "RuleCall",
+                "rule": {
+                  "$ref": "#/rules@42"
+                },
+                "arguments": []
+              },
+              "deprecatedSyntax": false,
+              "isMulti": false
+            }
+          },
+          {
+            "$type": "Group",
+            "elements": [
+              {
+                "$type": "Keyword",
+                "value": ","
+              },
+              {
+                "$type": "Assignment",
+                "feature": "fieldSets",
+                "operator": "+=",
+                "terminal": {
+                  "$type": "CrossReference",
+                  "type": {
+                    "$ref": "#/rules@11"
+                  },
+                  "terminal": {
+                    "$type": "RuleCall",
+                    "rule": {
+                      "$ref": "#/rules@42"
+                    },
+                    "arguments": []
+                  },
+                  "deprecatedSyntax": false,
+                  "isMulti": false
+                }
+              }
+            ],
+            "cardinality": "*"
+          }
+        ]
+      },
+      "entry": false,
+      "parameters": []
+    },
     {
       "$type": "ParserRule",
       "name": "UnionDecl",
@@ -1699,7 +1933,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1711,7 +1945,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -1731,7 +1965,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@38"
+                    "$ref": "#/rules@41"
                   },
                   "arguments": []
                 }
@@ -1755,7 +1989,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                       "terminal": {
                         "$type": "RuleCall",
                         "rule": {
-                          "$ref": "#/rules@39"
+                          "$ref": "#/rules@42"
                         },
                         "arguments": []
                       },
@@ -1780,7 +2014,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@12"
+                "$ref": "#/rules@14"
               },
               "arguments": []
             },
@@ -1809,7 +2043,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1821,7 +2055,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -1841,7 +2075,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@16"
+                    "$ref": "#/rules@18"
                   },
                   "arguments": []
                 },
@@ -1877,7 +2111,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1889,12 +2123,20 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
             "cardinality": "?"
           },
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@12"
+            },
+            "arguments": [],
+            "cardinality": "?"
+          },
           {
             "$type": "Keyword",
             "value": "{"
@@ -1906,7 +2148,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@16"
+                "$ref": "#/rules@18"
               },
               "arguments": []
             },
@@ -1939,7 +2181,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -1951,12 +2193,20 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
             "cardinality": "?"
           },
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@12"
+            },
+            "arguments": [],
+            "cardinality": "?"
+          },
           {
             "$type": "Keyword",
             "value": "{"
@@ -1968,7 +2218,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@15"
+                "$ref": "#/rules@17"
               },
               "arguments": []
             },
@@ -1993,21 +2243,21 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@16"
+              "$ref": "#/rules@18"
             },
             "arguments": []
           },
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@17"
+              "$ref": "#/rules@19"
             },
             "arguments": []
           },
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@21"
+              "$ref": "#/rules@23"
             },
             "arguments": []
           }
@@ -2026,28 +2276,28 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@18"
+              "$ref": "#/rules@20"
             },
             "arguments": []
           },
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@19"
+              "$ref": "#/rules@21"
             },
             "arguments": []
           },
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@20"
+              "$ref": "#/rules@22"
             },
             "arguments": []
           },
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@28"
+              "$ref": "#/rules@31"
             },
             "arguments": []
           }
@@ -2074,7 +2324,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -2086,7 +2336,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -2106,7 +2356,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@16"
+                    "$ref": "#/rules@18"
                   },
                   "arguments": []
                 },
@@ -2138,7 +2388,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@38"
+                "$ref": "#/rules@41"
               },
               "arguments": []
             }
@@ -2154,7 +2404,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@25"
+                "$ref": "#/rules@28"
               },
               "arguments": []
             }
@@ -2166,7 +2416,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@27"
+                "$ref": "#/rules@30"
               },
               "arguments": []
             },
@@ -2179,7 +2429,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -2208,7 +2458,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@38"
+                "$ref": "#/rules@41"
               },
               "arguments": []
             }
@@ -2224,7 +2474,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@25"
+                "$ref": "#/rules@28"
               },
               "arguments": []
             }
@@ -2236,7 +2486,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@27"
+                "$ref": "#/rules@30"
               },
               "arguments": []
             },
@@ -2249,7 +2499,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -2278,7 +2528,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@38"
+                "$ref": "#/rules@41"
               },
               "arguments": []
             }
@@ -2294,7 +2544,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@25"
+                "$ref": "#/rules@28"
               },
               "arguments": []
             }
@@ -2306,7 +2556,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@27"
+                "$ref": "#/rules@30"
               },
               "arguments": []
             },
@@ -2323,12 +2573,12 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "CrossReference",
               "type": {
-                "$ref": "#/rules@14"
+                "$ref": "#/rules@16"
               },
               "terminal": {
                 "$type": "RuleCall",
                 "rule": {
-                  "$ref": "#/rules@39"
+                  "$ref": "#/rules@42"
                 },
                 "arguments": []
               },
@@ -2343,7 +2593,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -2382,7 +2632,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@38"
+                "$ref": "#/rules@41"
               },
               "arguments": []
             }
@@ -2401,7 +2651,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@22"
+                    "$ref": "#/rules@25"
                   },
                   "arguments": []
                 }
@@ -2420,7 +2670,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                     "terminal": {
                       "$type": "RuleCall",
                       "rule": {
-                        "$ref": "#/rules@22"
+                        "$ref": "#/rules@25"
                       },
                       "arguments": []
                     }
@@ -2442,7 +2692,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -2451,28 +2701,16 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "Group",
             "elements": [
-              {
-                "$type": "Keyword",
-                "value": "from"
-              },
               {
                 "$type": "Assignment",
-                "feature": "from",
+                "feature": "transitions",
                 "operator": "+=",
                 "terminal": {
-                  "$type": "CrossReference",
-                  "type": {
-                    "$ref": "#/rules@17"
-                  },
-                  "terminal": {
-                    "$type": "RuleCall",
-                    "rule": {
-                      "$ref": "#/rules@44"
-                    },
-                    "arguments": []
+                  "$type": "RuleCall",
+                  "rule": {
+                    "$ref": "#/rules@24"
                   },
-                  "deprecatedSyntax": false,
-                  "isMulti": false
+                  "arguments": []
                 }
               },
               {
@@ -2480,26 +2718,19 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "elements": [
                   {
                     "$type": "Keyword",
-                    "value": "|"
+                    "value": ",",
+                    "cardinality": "?"
                   },
                   {
                     "$type": "Assignment",
-                    "feature": "from",
+                    "feature": "transitions",
                     "operator": "+=",
                     "terminal": {
-                      "$type": "CrossReference",
-                      "type": {
-                        "$ref": "#/rules@17"
-                      },
-                      "terminal": {
-                        "$type": "RuleCall",
-                        "rule": {
-                          "$ref": "#/rules@44"
-                        },
-                        "arguments": []
+                      "$type": "RuleCall",
+                      "rule": {
+                        "$ref": "#/rules@24"
                       },
-                      "deprecatedSyntax": false,
-                      "isMulti": false
+                      "arguments": []
                     }
                   }
                 ],
@@ -2513,21 +2744,21 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "elements": [
               {
                 "$type": "Keyword",
-                "value": "to"
+                "value": "emits"
               },
               {
                 "$type": "Assignment",
-                "feature": "to",
+                "feature": "emits",
                 "operator": "+=",
                 "terminal": {
                   "$type": "CrossReference",
                   "type": {
-                    "$ref": "#/rules@17"
+                    "$ref": "#/rules@26"
                   },
                   "terminal": {
                     "$type": "RuleCall",
                     "rule": {
-                      "$ref": "#/rules@44"
+                      "$ref": "#/rules@42"
                     },
                     "arguments": []
                   },
@@ -2540,21 +2771,21 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "elements": [
                   {
                     "$type": "Keyword",
-                    "value": "|"
+                    "value": ","
                   },
                   {
                     "$type": "Assignment",
-                    "feature": "to",
+                    "feature": "emits",
                     "operator": "+=",
                     "terminal": {
                       "$type": "CrossReference",
                       "type": {
-                        "$ref": "#/rules@17"
+                        "$ref": "#/rules@26"
                       },
                       "terminal": {
                         "$type": "RuleCall",
                         "rule": {
-                          "$ref": "#/rules@44"
+                          "$ref": "#/rules@42"
                         },
                         "arguments": []
                       },
@@ -2573,21 +2804,21 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "elements": [
               {
                 "$type": "Keyword",
-                "value": "emits"
+                "value": "errors"
               },
               {
                 "$type": "Assignment",
-                "feature": "emits",
+                "feature": "errors",
                 "operator": "+=",
                 "terminal": {
                   "$type": "CrossReference",
                   "type": {
-                    "$ref": "#/rules@23"
+                    "$ref": "#/rules@27"
                   },
                   "terminal": {
                     "$type": "RuleCall",
                     "rule": {
-                      "$ref": "#/rules@39"
+                      "$ref": "#/rules@42"
                     },
                     "arguments": []
                   },
@@ -2604,17 +2835,17 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                   },
                   {
                     "$type": "Assignment",
-                    "feature": "emits",
+                    "feature": "errors",
                     "operator": "+=",
                     "terminal": {
                       "$type": "CrossReference",
                       "type": {
-                        "$ref": "#/rules@23"
+                        "$ref": "#/rules@27"
                       },
                       "terminal": {
                         "$type": "RuleCall",
                         "rule": {
-                          "$ref": "#/rules@39"
+                          "$ref": "#/rules@42"
                         },
                         "arguments": []
                       },
@@ -2627,27 +2858,35 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
               }
             ],
             "cardinality": "?"
-          },
+          }
+        ]
+      },
+      "entry": false,
+      "fragment": false,
+      "parameters": []
+    },
+    {
+      "$type": "ParserRule",
+      "name": "Transition",
+      "definition": {
+        "$type": "Group",
+        "elements": [
           {
             "$type": "Group",
             "elements": [
-              {
-                "$type": "Keyword",
-                "value": "errors"
-              },
               {
                 "$type": "Assignment",
-                "feature": "errors",
+                "feature": "from",
                 "operator": "+=",
                 "terminal": {
                   "$type": "CrossReference",
                   "type": {
-                    "$ref": "#/rules@24"
+                    "$ref": "#/rules@19"
                   },
                   "terminal": {
                     "$type": "RuleCall",
                     "rule": {
-                      "$ref": "#/rules@39"
+                      "$ref": "#/rules@47"
                     },
                     "arguments": []
                   },
@@ -2660,21 +2899,21 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "elements": [
                   {
                     "$type": "Keyword",
-                    "value": ","
+                    "value": "|"
                   },
                   {
                     "$type": "Assignment",
-                    "feature": "errors",
+                    "feature": "from",
                     "operator": "+=",
                     "terminal": {
                       "$type": "CrossReference",
                       "type": {
-                        "$ref": "#/rules@24"
+                        "$ref": "#/rules@19"
                       },
                       "terminal": {
                         "$type": "RuleCall",
                         "rule": {
-                          "$ref": "#/rules@39"
+                          "$ref": "#/rules@47"
                         },
                         "arguments": []
                       },
@@ -2687,6 +2926,60 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
               }
             ],
             "cardinality": "?"
+          },
+          {
+            "$type": "Keyword",
+            "value": "->"
+          },
+          {
+            "$type": "Assignment",
+            "feature": "to",
+            "operator": "+=",
+            "terminal": {
+              "$type": "CrossReference",
+              "type": {
+                "$ref": "#/rules@19"
+              },
+              "terminal": {
+                "$type": "RuleCall",
+                "rule": {
+                  "$ref": "#/rules@47"
+                },
+                "arguments": []
+              },
+              "deprecatedSyntax": false,
+              "isMulti": false
+            }
+          },
+          {
+            "$type": "Group",
+            "elements": [
+              {
+                "$type": "Keyword",
+                "value": "|"
+              },
+              {
+                "$type": "Assignment",
+                "feature": "to",
+                "operator": "+=",
+                "terminal": {
+                  "$type": "CrossReference",
+                  "type": {
+                    "$ref": "#/rules@19"
+                  },
+                  "terminal": {
+                    "$type": "RuleCall",
+                    "rule": {
+                      "$ref": "#/rules@47"
+                    },
+                    "arguments": []
+                  },
+                  "deprecatedSyntax": false,
+                  "isMulti": false
+                }
+              }
+            ],
+            "cardinality": "*"
           }
         ]
       },
@@ -2707,7 +3000,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@38"
+                "$ref": "#/rules@41"
               },
               "arguments": []
             }
@@ -2723,7 +3016,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@25"
+                "$ref": "#/rules@28"
               },
               "arguments": []
             }
@@ -2735,7 +3028,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@27"
+                "$ref": "#/rules@30"
               },
               "arguments": []
             },
@@ -2748,7 +3041,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -2787,7 +3080,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -2799,12 +3092,20 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
             "cardinality": "?"
           },
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@12"
+            },
+            "arguments": [],
+            "cardinality": "?"
+          },
           {
             "$type": "Group",
             "elements": [
@@ -2819,7 +3120,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@18"
+                    "$ref": "#/rules@20"
                   },
                   "arguments": []
                 },
@@ -2855,7 +3156,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -2867,12 +3168,20 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
             "cardinality": "?"
           },
+          {
+            "$type": "RuleCall",
+            "rule": {
+              "$ref": "#/rules@12"
+            },
+            "arguments": [],
+            "cardinality": "?"
+          },
           {
             "$type": "Group",
             "elements": [
@@ -2887,7 +3196,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@18"
+                    "$ref": "#/rules@20"
                   },
                   "arguments": []
                 },
@@ -2919,7 +3228,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@26"
+                "$ref": "#/rules@29"
               },
               "arguments": []
             }
@@ -2936,7 +3245,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
               "terminal": {
                 "$type": "RuleCall",
                 "rule": {
-                  "$ref": "#/rules@39"
+                  "$ref": "#/rules@42"
                 },
                 "arguments": []
               },
@@ -3016,7 +3325,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@42"
+                    "$ref": "#/rules@45"
                   },
                   "arguments": []
                 }
@@ -3035,7 +3344,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                     "terminal": {
                       "$type": "RuleCall",
                       "rule": {
-                        "$ref": "#/rules@42"
+                        "$ref": "#/rules@45"
                       },
                       "arguments": []
                     }
@@ -3080,7 +3389,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@44"
+                "$ref": "#/rules@47"
               },
               "arguments": []
             }
@@ -3092,7 +3401,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@43"
+                "$ref": "#/rules@46"
               },
               "arguments": []
             },
@@ -3109,7 +3418,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
             "terminal": {
               "$type": "RuleCall",
               "rule": {
-                "$ref": "#/rules@29"
+                "$ref": "#/rules@32"
               },
               "arguments": []
             }
@@ -3130,7 +3439,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
       "definition": {
         "$type": "RuleCall",
         "rule": {
-          "$ref": "#/rules@30"
+          "$ref": "#/rules@33"
         },
         "arguments": []
       },
@@ -3151,7 +3460,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@31"
+              "$ref": "#/rules@34"
             },
             "arguments": []
           },
@@ -3183,7 +3492,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@31"
+                    "$ref": "#/rules@34"
                   },
                   "arguments": []
                 }
@@ -3210,7 +3519,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@32"
+              "$ref": "#/rules@35"
             },
             "arguments": []
           },
@@ -3242,7 +3551,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@32"
+                    "$ref": "#/rules@35"
                   },
                   "arguments": []
                 }
@@ -3269,7 +3578,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@33"
+              "$ref": "#/rules@36"
             },
             "arguments": []
           },
@@ -3301,7 +3610,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@33"
+                    "$ref": "#/rules@36"
                   },
                   "arguments": []
                 }
@@ -3328,7 +3637,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@34"
+              "$ref": "#/rules@37"
             },
             "arguments": []
           },
@@ -3388,7 +3697,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                     "terminal": {
                       "$type": "RuleCall",
                       "rule": {
-                        "$ref": "#/rules@34"
+                        "$ref": "#/rules@37"
                       },
                       "arguments": []
                     }
@@ -3418,7 +3727,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                     "terminal": {
                       "$type": "RuleCall",
                       "rule": {
-                        "$ref": "#/rules@34"
+                        "$ref": "#/rules@37"
                       },
                       "arguments": []
                     }
@@ -3434,7 +3743,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                     "terminal": {
                       "$type": "RuleCall",
                       "rule": {
-                        "$ref": "#/rules@34"
+                        "$ref": "#/rules@37"
                       },
                       "arguments": []
                     }
@@ -3481,7 +3790,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@34"
+                    "$ref": "#/rules@37"
                   },
                   "arguments": []
                 }
@@ -3491,7 +3800,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@35"
+              "$ref": "#/rules@38"
             },
             "arguments": []
           }
@@ -3514,7 +3823,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@36"
+              "$ref": "#/rules@39"
             },
             "arguments": []
           },
@@ -3541,7 +3850,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@38"
+                    "$ref": "#/rules@41"
                   },
                   "arguments": []
                 }
@@ -3575,7 +3884,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
               {
                 "$type": "RuleCall",
                 "rule": {
-                  "$ref": "#/rules@29"
+                  "$ref": "#/rules@32"
                 },
                 "arguments": []
               },
@@ -3610,7 +3919,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@29"
+                    "$ref": "#/rules@32"
                   },
                   "arguments": []
                 }
@@ -3646,7 +3955,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@29"
+                    "$ref": "#/rules@32"
                   },
                   "arguments": []
                 }
@@ -3682,7 +3991,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@29"
+                    "$ref": "#/rules@32"
                   },
                   "arguments": []
                 }
@@ -3718,7 +4027,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@29"
+                    "$ref": "#/rules@32"
                   },
                   "arguments": []
                 }
@@ -3734,7 +4043,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@43"
+                    "$ref": "#/rules@46"
                   },
                   "arguments": []
                 }
@@ -3784,7 +4093,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@29"
+                    "$ref": "#/rules@32"
                   },
                   "arguments": []
                 }
@@ -3800,7 +4109,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@37"
+                    "$ref": "#/rules@40"
                   },
                   "arguments": []
                 }
@@ -3816,7 +4125,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@29"
+                    "$ref": "#/rules@32"
                   },
                   "arguments": []
                 }
@@ -3884,7 +4193,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@41"
+                    "$ref": "#/rules@44"
                   },
                   "arguments": []
                 }
@@ -3918,7 +4227,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@42"
+                    "$ref": "#/rules@45"
                   },
                   "arguments": []
                 }
@@ -3942,7 +4251,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@43"
+                    "$ref": "#/rules@46"
                   },
                   "arguments": []
                 }
@@ -3966,7 +4275,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
                 "terminal": {
                   "$type": "RuleCall",
                   "rule": {
-                    "$ref": "#/rules@38"
+                    "$ref": "#/rules@41"
                   },
                   "arguments": []
                 }
@@ -3989,7 +4298,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
         "terminal": {
           "$type": "RuleCall",
           "rule": {
-            "$ref": "#/rules@38"
+            "$ref": "#/rules@41"
           },
           "arguments": []
         }
@@ -4008,7 +4317,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@44"
+              "$ref": "#/rules@47"
             },
             "arguments": []
           },
@@ -4027,6 +4336,14 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "Keyword",
             "value": "persistent"
+          },
+          {
+            "$type": "Keyword",
+            "value": "fields"
+          },
+          {
+            "$type": "Keyword",
+            "value": "with"
           }
         ]
       },
@@ -4044,7 +4361,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "RuleCall",
             "rule": {
-              "$ref": "#/rules@44"
+              "$ref": "#/rules@47"
             },
             "arguments": []
           },
@@ -4058,7 +4375,7 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
               {
                 "$type": "RuleCall",
                 "rule": {
-                  "$ref": "#/rules@44"
+                  "$ref": "#/rules@47"
                 },
                 "arguments": []
               }
@@ -4191,19 +4508,19 @@ var loadedDomainGrammar, DomainGrammar = () => loadedDomainGrammar ?? (loadedDom
           {
             "$type": "SimpleType",
             "typeRef": {
-              "$ref": "#/rules@11"
+              "$ref": "#/rules@13"
             }
           },
           {
             "$type": "SimpleType",
             "typeRef": {
-              "$ref": "#/rules@13"
+              "$ref": "#/rules@15"
             }
           },
           {
             "$type": "SimpleType",
             "typeRef": {
-              "$ref": "#/rules@14"
+              "$ref": "#/rules@16"
             }
           }
         ]
@@ -4555,6 +4872,17 @@ class ModelIndex {
   get errors() {
     return this.elements.filter(isErrorDecl);
   }
+  get fieldSets() {
+    return this.elements.filter(isFieldSet);
+  }
+}
+function fieldSetsOf(el) {
+  return [...new Set(el.fieldSets.map((r) => r.ref).filter((f) => !!f))];
+}
+function includedFields(el) {
+  if (isFieldSet(el))
+    return [];
+  return fieldSetsOf(el).flatMap((fieldSet) => fieldsOf(fieldSet.members).map((field) => ({ field, fieldSet })));
 }
 function primitiveInvariants(p) {
   if (p.constraint)
@@ -4613,6 +4941,11 @@ function buildModel(index, fileOf) {
     line: (node.$cstNode?.range.start.line ?? 0) + 1,
     endLine: (node.$cstNode?.range.end.line ?? 0) + 1
   });
+  const included = (el) => includedFields(el).map(({ field: f, fieldSet }) => ({ ...field(f), fieldSet: elementId(fieldSet.$container.name, fieldSet.name) }));
+  const withFieldSets = (el) => {
+    const sets = fieldSetsOf(el);
+    return sets.length && !isFieldSet(el) ? { fieldSets: sets.map((s) => elementId(s.$container.name, s.name)) } : {};
+  };
   for (const el of index.elements) {
     const id = elementId(el.$container.name, el.name);
     if (elements[id])
@@ -4656,14 +4989,16 @@ function buildModel(index, fileOf) {
         };
       });
     } else if (isAggregate(el)) {
-      base.fields = commonFields(el).map(field);
+      Object.assign(base, withFieldSets(el));
+      base.fields = [...included(el), ...commonFields(el).map(field)];
       base.invariants = invariantsOf(el.members).map(invariant);
       base.states = statesOf(el).map((s) => state(id, s, loc, field));
       base.commands = commandsOf(el).map((c) => command(id, c, loc, field));
     } else {
+      Object.assign(base, withFieldSets(el));
       if (isEventDecl(el) && el.persistent)
         base.persistent = true;
-      base.fields = fieldsOf(el.members).map(field);
+      base.fields = [...included(el), ...fieldsOf(el.members).map(field)];
       base.invariants = invariantsOf(el.members).map(invariant);
     }
     elements[id] = base;
@@ -4704,6 +5039,8 @@ function kindOf(el) {
     return "event";
   if (isErrorDecl(el))
     return "error";
+  if (isFieldSet(el))
+    return "fieldSet";
   throw new Error(`unknown element ${el.$type}`);
 }
 function typeExpr(ref) {
@@ -4765,55 +5102,293 @@ function command(aggId, c, loc, field) {
     ...described(c),
     factory: c.factory,
     params: c.params.map(field),
-    from: c.from.map((r) => r.$refText),
-    to: c.to.map((r) => r.$refText),
+    transitions: c.transitions.map((t) => ({ from: t.from.map((r) => r.$refText), to: t.to.map((r) => r.$refText) })),
     emits: c.emits.map(qname),
     errors: c.errors.map(qname),
     location: loc(c)
   };
 }
-var optional = (key, value) => value ? { [key]: value } : {}, sourceText = (e) => e?.$cstNode?.text.replace(/\s+/g, " ").trim() ?? "";
-var init_build = __esm(() => {
+var optional = (key, value) => value ? { [key]: value } : {}, sourceText = (e) => e?.$cstNode?.text.replace(/\s+/g, " ").trim() ?? "";
+var init_build = __esm(() => {
+  init_ast();
+  init_labels();
+  init_types();
+  init_model_index();
+  init_ids();
+});
+
+// src/core/checker/commands.ts
+function checkCommands(index, sink) {
+  for (const agg of index.aggregates) {
+    const stateful = statesOf(agg).length > 0;
+    for (const cmd of commandsOf(agg)) {
+      const label = `${cmd.factory ? "Factory command" : "Command"} '${cmd.name}'`;
+      if (!stateful) {
+        if (cmd.transitions.length > 0) {
+          sink.error("M006", `${label} declares state transitions, but aggregate '${agg.name}' has no states.`, cmd, "transitions", 0);
+        }
+        continue;
+      }
+      if (cmd.factory) {
+        if (cmd.transitions.length !== 1) {
+          sink.error("M006", `${label} must declare exactly one transition to its initial state(s), e.g. '-> Draft'.`, cmd, cmd.transitions.length ? "transitions" : "name", cmd.transitions.length ? 1 : undefined);
+        }
+        cmd.transitions.forEach((t) => {
+          if (t.from.length > 0)
+            sink.error("M006", `${label} creates a new '${agg.name}' and cannot have source states; write '-> ${t.to.map((r) => r.$refText).join(" | ")}'.`, t, "from");
+        });
+      } else {
+        if (cmd.transitions.length === 0) {
+          sink.error("M006", `${label} must declare its state transitions, e.g. 'Draft -> Submitted' (or be declared with 'create command').`, cmd, "name");
+        }
+        cmd.transitions.forEach((t) => {
+          if (t.from.length === 0)
+            sink.error("M006", `${label} has a transition without source states; write 'State -> ...' (only a 'create command' starts with '->').`, t);
+        });
+      }
+      const sources = new Set;
+      for (const t of cmd.transitions) {
+        t.from.forEach((r, i) => {
+          if (sources.has(r.$refText)) {
+            sink.error("M006", `State '${r.$refText}' is the source of more than one transition of command '${cmd.name}'; its outcome must be decided by one transition (use 'A -> B | C').`, t, "from", i);
+          }
+          sources.add(r.$refText);
+        });
+        const targets = new Set;
+        t.to.forEach((r, i) => {
+          if (targets.has(r.$refText))
+            sink.warning("M006", `State '${r.$refText}' is listed more than once.`, t, "to", i);
+          targets.add(r.$refText);
+        });
+      }
+    }
+  }
+}
+var init_commands = __esm(() => {
+  init_model_index();
+});
+
+// src/generator/naming.ts
+function generatedNames(index, ctx) {
+  const out = [];
+  const seen = new Set;
+  for (const el of index.elementsOf(ctx)) {
+    if (seen.has(el.name))
+      continue;
+    seen.add(el.name);
+    if (!isAggregate(el)) {
+      out.push({ name: el.name, origin: `${KIND_LABELS[el.$type]} '${el.name}'`, node: el });
+      if (isIdType(el) || isPrimitiveDecl(el)) {
+        out.push({ name: makeTypeName(el), origin: `the constructor of '${el.name}'`, node: el });
+        if (primitiveInvariants(el).length)
+          out.push({ name: invalidTypeName(el), origin: `the error of '${el.name}'`, node: el });
+      }
+      continue;
+    }
+    const states = firstByName(statesOf(el));
+    out.push({ name: el.name, origin: `aggregate '${el.name}'`, node: el });
+    if (states.length > 0) {
+      out.push({ name: commonTypeName(el), origin: `common fields of '${el.name}'`, node: el });
+      for (const s of states) {
+        out.push({ name: stateTypeName(el, s), origin: `state '${el.name}.${s.name}'`, node: s });
+      }
+    }
+    const commands = firstByName(commandsOf(el));
+    if (commands.length > 0) {
+      out.push({ name: commandsInterfaceName(el), origin: `commands of '${el.name}'`, node: el });
+    }
+    for (const c of commands) {
+      out.push({ name: commandTypeName(el, c), origin: `command '${el.name}.${c.name}'`, node: c });
+      if (states.length > 0 && targetsVary(c.factory, c.transitions.map((t) => t.to.map((r) => r.$refText)))) {
+        out.push({ name: byStateTypeName(el, c), origin: `the handlers per state of '${el.name}.${c.name}'`, node: c });
+      }
+    }
+    if (commands.some((c) => c.emits.length > 0)) {
+      out.push({ name: aggregateEventTypeName(el), origin: `the union of the events of '${el.name}'`, node: el });
+    }
+  }
+  const persistent = index.elementsOf(ctx).find((el) => isEventDecl(el) && el.persistent);
+  if (persistent)
+    out.push({ name: PERSISTENT_EVENT_TYPE, origin: "the union of persistent events", node: persistent });
+  const event = index.elementsOf(ctx).find(isEventDecl);
+  if (event)
+    out.push({ name: DOMAIN_EVENT_TYPE, origin: "the union of the events", node: event });
+  const aggregate = index.elementsOf(ctx).find(isAggregate);
+  if (aggregate)
+    out.push({ name: AGGREGATE_TYPE, origin: "the union of the aggregates", node: aggregate });
+  return out;
+}
+function firstByName(items) {
+  const seen = new Set;
+  return items.filter((i) => !seen.has(i.name) && seen.add(i.name));
+}
+var RUNTIME_NAMES, EVENT_TAG = "type", STATE_TAG = "state", pascal = (s) => s.charAt(0).toUpperCase() + s.slice(1), camel = (s) => s.charAt(0).toLowerCase() + s.slice(1), commonTypeName = (agg) => `${agg.name}Common`, stateTypeName = (agg, state) => `${typeof state === "string" ? state : state.name}${agg.name}`, commandTypeName = (agg, cmd) => `${pascal(cmd.name)}${agg.name}`, commandsInterfaceName = (agg) => `${agg.name}Commands`, byStateTypeName = (agg, cmd) => `${commandTypeName(agg, cmd)}ByState`, targetsVary = (factory, targets) => !factory && new Set(targets.map((t) => [...new Set(t)].sort().join("|"))).size > 1, aggregateParamName = (agg) => camel(agg.name), makeTypeName = (p) => `Make${p.name}`, invalidTypeName = (p) => `Invalid${p.name}`, PERSISTENT_EVENT_TYPE = "PersistentEvent", DOMAIN_EVENT_TYPE = "DomainEvent", AGGREGATE_TYPE = "Aggregate", aggregateEventTypeName = (agg) => `${agg.name}Event`, KIND_LABELS, TS_RESERVED;
+var init_naming = __esm(() => {
   init_ast();
-  init_labels();
-  init_types();
   init_model_index();
-  init_ids();
+  RUNTIME_NAMES = ["Result", "Ok", "Err", "Decimal", "Timestamp", "ok", "err", "byState"];
+  KIND_LABELS = {
+    IdType: "id",
+    PrimitiveDecl: "primitive",
+    EnumDecl: "enum",
+    ValueObject: "value object",
+    UnionDecl: "union",
+    Entity: "entity",
+    EventDecl: "event",
+    ErrorDecl: "error",
+    FieldSet: "field set"
+  };
+  TS_RESERVED = new Set([
+    "break",
+    "case",
+    "catch",
+    "class",
+    "const",
+    "continue",
+    "debugger",
+    "default",
+    "delete",
+    "do",
+    "else",
+    "enum",
+    "export",
+    "extends",
+    "false",
+    "finally",
+    "for",
+    "function",
+    "if",
+    "import",
+    "in",
+    "instanceof",
+    "new",
+    "null",
+    "return",
+    "super",
+    "switch",
+    "this",
+    "throw",
+    "true",
+    "try",
+    "typeof",
+    "var",
+    "void",
+    "while",
+    "with",
+    "yield",
+    "let",
+    "static",
+    "implements",
+    "interface",
+    "package",
+    "private",
+    "protected",
+    "public",
+    "await",
+    "any",
+    "boolean",
+    "number",
+    "string",
+    "symbol",
+    "never",
+    "unknown",
+    "object",
+    "undefined",
+    "bigint"
+  ]);
 });
 
-// src/core/checker/commands.ts
-function checkCommands(index, sink) {
+// src/core/checker/events.ts
+function checkEventIds(index, sink) {
   for (const agg of index.aggregates) {
-    const stateful = statesOf(agg).length > 0;
+    const idType = identityField(agg)?.type?.decl?.ref;
+    if (!idType || !isIdType(idType))
+      continue;
+    const checked = new Set;
     for (const cmd of commandsOf(agg)) {
-      const label = `${cmd.factory ? "Factory command" : "Command"} '${cmd.name}'`;
-      if (!stateful) {
-        if (cmd.from.length > 0 || cmd.to.length > 0) {
-          sink.error("M006", `${label} declares states, but aggregate '${agg.name}' has no states.`, cmd, cmd.from.length > 0 ? "from" : "to");
-        }
-        continue;
-      }
-      if (cmd.factory && cmd.from.length > 0) {
-        sink.error("M006", `${label} creates a new '${agg.name}' and cannot have input states ('from').`, cmd, "from");
-      }
-      if (!cmd.factory && cmd.from.length === 0) {
-        sink.error("M006", `${label} must declare its input state(s) with 'from' (or be declared with 'create command').`, cmd, "name");
-      }
-      if (cmd.to.length === 0) {
-        sink.error("M006", `${label} must declare its output state(s) with 'to'.`, cmd, "name");
+      cmd.emits.forEach((r, i) => {
+        const ev = r.ref;
+        if (!ev || checked.has(ev))
+          return;
+        checked.add(ev);
+        const fields = [...includedFields(ev).map((x) => x.field), ...ev.members];
+        if (fields.some((f) => f.type?.decl?.ref === idType))
+          return;
+        const typeName = idType.$container.name === ev.$container.name ? idType.name : `${idType.$container.name}.${idType.name}`;
+        sink.warning("M017", `Event '${ev.name}' emitted by '${agg.name}.${cmd.name}' has no field of type '${idType.name}' to tell which '${agg.name}' it is about (e.g. '${camel(agg.name)}Id: ${typeName}').`, cmd, "emits", i);
+      });
+    }
+  }
+}
+var init_events = __esm(() => {
+  init_ast();
+  init_naming();
+  init_model_index();
+});
+
+// src/core/checker/field-sets.ts
+function checkFieldSets(index, sink) {
+  for (const fs of index.fieldSets) {
+    for (const m of fs.members) {
+      if (isInvariant(m)) {
+        sink.error("M016", `Field set '${fs.name}' cannot hold invariants; write invariant '${m.name}' in the elements that use it.`, m, "name");
+      } else if (isOwnsField(m) || isReferenceField(m)) {
+        const keyword = isOwnsField(m) ? "owns" : "references";
+        sink.error("M016", `A field set holds plain fields only; '${m.name}' is declared with '${keyword}'.`, m, "name");
+      } else if (m.name === "id") {
+        sink.error("M016", `Field set '${fs.name}' cannot declare 'id'; the identity is declared by each aggregate and entity itself.`, m, "name");
       }
-      for (const [prop, refs] of [["from", cmd.from], ["to", cmd.to]]) {
-        const seen = new Set;
-        refs.forEach((r, i) => {
-          if (seen.has(r.$refText))
-            sink.warning("M006", `State '${r.$refText}' is listed more than once.`, cmd, prop, i);
-          seen.add(r.$refText);
-        });
+    }
+  }
+  for (const el of index.elements) {
+    if (!("fieldSets" in el) || el.fieldSets.length === 0)
+      continue;
+    if (isFieldSet(el) || isValueObject(el) || isErrorDecl(el)) {
+      const what = isFieldSet(el) ? `field set '${el.name}' cannot include other field sets` : `${isValueObject(el) ? "value object" : "error"} '${el.name}' cannot take field sets`;
+      sink.error("M016", `'with' is only for aggregates, entities and events; ${what}.`, el, "fieldSets");
+      continue;
+    }
+    if (isAggregate(el) || isEntity(el) || isEventDecl(el))
+      checkUses(el, sink);
+  }
+}
+function checkUses(el, sink) {
+  const seen = new Set;
+  el.fieldSets.forEach((r, i) => {
+    if (!r.ref)
+      return;
+    if (seen.has(r.ref))
+      sink.warning("M016", `Field set '${r.$refText}' is listed more than once.`, el, "fieldSets", i);
+    seen.add(r.ref);
+  });
+  const from = new Map;
+  for (const { field, fieldSet } of includedFields(el)) {
+    const first = from.get(field.name);
+    if (first === undefined) {
+      from.set(field.name, fieldSet.name);
+    } else if (first !== fieldSet.name) {
+      const at = el.fieldSets.findIndex((r) => r.ref === fieldSet);
+      sink.error("M016", `Field '${field.name}' of field set '${fieldSet.name}' is also declared in field set '${first}', both used by '${el.name}'.`, el, "fieldSets", at);
+    }
+  }
+  const own = isAggregate(el) ? commonFields(el) : fieldsOf(el.members);
+  for (const f of own) {
+    const fs = from.get(f.name);
+    if (fs)
+      sink.error("M016", `Field '${f.name}' of '${el.name}' is already taken from field set '${fs}'.`, f, "name");
+  }
+  if (isAggregate(el)) {
+    for (const s of statesOf(el)) {
+      for (const f of fieldsOf(s.members)) {
+        const fs = from.get(f.name);
+        if (fs)
+          sink.error("M016", `Field '${f.name}' of state '${s.name}' shadows the field of field set '${fs}' in '${el.name}'.`, f, "name");
       }
     }
   }
 }
-var init_commands = __esm(() => {
+var init_field_sets = __esm(() => {
+  init_ast();
   init_model_index();
 });
 
@@ -4826,7 +5401,7 @@ function checkInvariants(index, sink) {
       checkAggregate(el, ctx, index, sink);
     } else if (isEntity(el) || isValueObject(el)) {
       const members = el.members;
-      const fields = new Map(fieldsOf(members).map((f) => [f.name, f]));
+      const fields = new Map([...includedFields(el).map((x) => x.field), ...fieldsOf(members)].map((f) => [f.name, f]));
       for (const inv of invariantsOf(members)) {
         checkInvariant(inv, { ctx, fields, stateOnly: new Map, lambdas: [], present: new Set }, index, sink);
       }
@@ -4863,7 +5438,7 @@ function checkPrimitive(p, ctx, index, sink) {
   }
 }
 function checkAggregate(agg, ctx, index, sink) {
-  const common = new Map(commonFields(agg).map((f) => [f.name, f]));
+  const common = new Map([...includedFields(agg).map((x) => x.field), ...commonFields(agg)].map((f) => [f.name, f]));
   const states = statesOf(agg);
   const stateOnly = (except) => {
     const m = new Map;
@@ -5085,7 +5660,7 @@ class ExprChecker {
         return ERROR;
       }
       case "struct": {
-        const f = fieldsOf(recv.decl.members).find((x) => x.name === m);
+        const f = [...includedFields(recv.decl).map((x) => x.field), ...fieldsOf(recv.decl.members)].find((x) => x.name === m);
         if (f)
           return narrow(memberType(f), pathOf(e) ?? "", scope);
         this.sink.error("M001", `'${recv.decl.name}' has no field '${m}'.`, e, "member");
@@ -5214,11 +5789,12 @@ function checkLabels(index, sink) {
         sameLabel(invariantsOf(v.members).map((i) => ({ node: i, name: i.name, label: i.label })), `the invariants of '${el.name}.${v.name}'`, sink);
       }
     } else if (isAggregate(el)) {
+      const included = includedFields(el).map((x) => x.field);
       const common = commonFields(el);
       const states = statesOf(el);
-      fieldScope(common, `'${el.name}'`);
+      fieldScope(common, `'${el.name}'`, included);
       for (const s of states)
-        fieldScope(fieldsOf(s.members), `state '${el.name}.${s.name}'`, common);
+        fieldScope(fieldsOf(s.members), `state '${el.name}.${s.name}'`, [...included, ...common]);
       sameLabel(states.map((s) => ({ node: s, name: s.name, label: s.label })), `the states of '${el.name}'`, sink);
       sameLabel(commandsOf(el).map((c) => ({ node: c, name: c.name, label: c.label })), `the commands of '${el.name}'`, sink);
       const invariants = [...invariantsOf(el.members), ...states.flatMap((s) => invariantsOf(s.members))];
@@ -5226,7 +5802,7 @@ function checkLabels(index, sink) {
       for (const c of commandsOf(el))
         fieldScope(c.params, `command '${el.name}.${c.name}'`);
     } else if ("members" in el) {
-      fieldScope(fieldsOf(el.members), `'${el.name}'`);
+      fieldScope(fieldsOf(el.members), `'${el.name}'`, includedFields(el).map((x) => x.field));
       if (isEntity(el) || isValueObject(el)) {
         sameLabel(invariantsOf(el.members).map((i) => ({ node: i, name: i.name, label: i.label })), `the invariants of '${el.name}'`, sink);
       }
@@ -5355,7 +5931,7 @@ function checkShared(index, sink) {
     const ctx = el.$container.name;
     if (!shared.has(ctx))
       continue;
-    if (!isPrimitiveDecl(el) && !isEnumDecl(el) && !isValueObject(el) && !isUnionDecl(el)) {
+    if (!isPrimitiveDecl(el) && !isEnumDecl(el) && !isValueObject(el) && !isUnionDecl(el) && !isFieldSet(el)) {
       sink.error("M014", `Shared context '${ctx}' can only contain ${ALLOWED}; found ${kind(el)} '${el.name}'.`, el, "name");
     }
     for (const ref of AstUtils4.streamAllContents(el).filter(isTypeRef)) {
@@ -5384,7 +5960,7 @@ function kind(el) {
   const names = { Aggregate: "aggregate", Entity: "entity", IdType: "ID", EventDecl: "event", ErrorDecl: "error" };
   return names[el.$type] ?? el.$type;
 }
-var ALLOWED = "domain primitives, enums, value objects, unions and terms";
+var ALLOWED = "domain primitives, enums, value objects, unions, field sets and terms";
 var init_shared = __esm(() => {
   init_ast();
 });
@@ -5403,6 +5979,11 @@ function checkStructure(index, sink) {
     for (const f of allFields2(el))
       checkFieldKind(el, f, sink);
   }
+  for (const fs of index.fieldSets) {
+    for (const f of fieldsOf(fs.members))
+      if (f.$type === "Field")
+        checkFieldKind(fs, f, sink);
+  }
   checkPayloads(index, sink);
   checkIdentity(index, sink);
   checkOwningAggregates(index, sink);
@@ -5561,123 +6142,6 @@ var init_structure = __esm(() => {
   init_model_index();
 });
 
-// src/generator/naming.ts
-function generatedNames(index, ctx) {
-  const out = [];
-  const seen = new Set;
-  for (const el of index.elementsOf(ctx)) {
-    if (seen.has(el.name))
-      continue;
-    seen.add(el.name);
-    if (!isAggregate(el)) {
-      out.push({ name: el.name, origin: `${KIND_LABELS[el.$type]} '${el.name}'`, node: el });
-      if (isIdType(el) || isPrimitiveDecl(el)) {
-        out.push({ name: makeTypeName(el), origin: `the constructor of '${el.name}'`, node: el });
-        if (primitiveInvariants(el).length)
-          out.push({ name: invalidTypeName(el), origin: `the error of '${el.name}'`, node: el });
-      }
-      continue;
-    }
-    const states = firstByName(statesOf(el));
-    out.push({ name: el.name, origin: `aggregate '${el.name}'`, node: el });
-    if (states.length > 0) {
-      out.push({ name: commonTypeName(el), origin: `common fields of '${el.name}'`, node: el });
-      for (const s of states) {
-        out.push({ name: stateTypeName(el, s), origin: `state '${el.name}.${s.name}'`, node: s });
-      }
-    }
-    const commands = firstByName(commandsOf(el));
-    if (commands.length > 0) {
-      out.push({ name: commandsInterfaceName(el), origin: `commands of '${el.name}'`, node: el });
-    }
-    for (const c of commands) {
-      out.push({ name: commandTypeName(el, c), origin: `command '${el.name}.${c.name}'`, node: c });
-    }
-  }
-  const persistent = index.elementsOf(ctx).find((el) => isEventDecl(el) && el.persistent);
-  if (persistent)
-    out.push({ name: PERSISTENT_EVENT_TYPE, origin: "the union of persistent events", node: persistent });
-  return out;
-}
-function firstByName(items) {
-  const seen = new Set;
-  return items.filter((i) => !seen.has(i.name) && seen.add(i.name));
-}
-var RUNTIME_NAMES, EVENT_TAG = "type", STATE_TAG = "state", pascal = (s) => s.charAt(0).toUpperCase() + s.slice(1), camel = (s) => s.charAt(0).toLowerCase() + s.slice(1), commonTypeName = (agg) => `${agg.name}Common`, stateTypeName = (agg, state) => `${typeof state === "string" ? state : state.name}${agg.name}`, commandTypeName = (agg, cmd) => `${pascal(cmd.name)}${agg.name}`, commandsInterfaceName = (agg) => `${agg.name}Commands`, aggregateParamName = (agg) => camel(agg.name), makeTypeName = (p) => `Make${p.name}`, invalidTypeName = (p) => `Invalid${p.name}`, PERSISTENT_EVENT_TYPE = "PersistentEvent", KIND_LABELS, TS_RESERVED;
-var init_naming = __esm(() => {
-  init_ast();
-  init_model_index();
-  RUNTIME_NAMES = ["Result", "Ok", "Err", "Decimal", "Timestamp", "ok", "err"];
-  KIND_LABELS = {
-    IdType: "id",
-    PrimitiveDecl: "primitive",
-    EnumDecl: "enum",
-    ValueObject: "value object",
-    UnionDecl: "union",
-    Entity: "entity",
-    EventDecl: "event",
-    ErrorDecl: "error"
-  };
-  TS_RESERVED = new Set([
-    "break",
-    "case",
-    "catch",
-    "class",
-    "const",
-    "continue",
-    "debugger",
-    "default",
-    "delete",
-    "do",
-    "else",
-    "enum",
-    "export",
-    "extends",
-    "false",
-    "finally",
-    "for",
-    "function",
-    "if",
-    "import",
-    "in",
-    "instanceof",
-    "new",
-    "null",
-    "return",
-    "super",
-    "switch",
-    "this",
-    "throw",
-    "true",
-    "try",
-    "typeof",
-    "var",
-    "void",
-    "while",
-    "with",
-    "yield",
-    "let",
-    "static",
-    "implements",
-    "interface",
-    "package",
-    "private",
-    "protected",
-    "public",
-    "await",
-    "any",
-    "boolean",
-    "number",
-    "string",
-    "symbol",
-    "never",
-    "unknown",
-    "object",
-    "undefined",
-    "bigint"
-  ]);
-});
-
 // src/core/checker/tsnames.ts
 function checkTsNames(index, sink) {
   const contexts = index.contextNames;
@@ -5702,11 +6166,18 @@ function checkTsNames(index, sink) {
     }
   }
   for (const el of [...index.events, ...index.errors]) {
+    const kind = el.$type === "EventDecl" ? "event" : "error";
     for (const f of el.members) {
       if (f.name === EVENT_TAG) {
-        sink.error("M011", `Field '${EVENT_TAG}' is reserved for the discriminant of generated ${el.$type === "EventDecl" ? "event" : "error"} types.`, f, "name");
+        sink.error("M011", `Field '${EVENT_TAG}' is reserved for the discriminant of generated ${kind} types.`, f, "name");
       }
     }
+    for (const { field, fieldSet } of includedFields(el)) {
+      if (field.name !== EVENT_TAG)
+        continue;
+      const at = el.fieldSets.findIndex((r) => r.ref === fieldSet);
+      sink.error("M011", `Field '${EVENT_TAG}' of field set '${fieldSet.name}' is reserved for the discriminant of generated ${kind} types.`, el, "fieldSets", at);
+    }
   }
   for (const agg of index.elements.filter(isAggregate)) {
     const self = aggregateParamName(agg);
@@ -5857,7 +6328,9 @@ async function analyze(sources) {
     checkShared(index, sink);
     checkStructure(index, sink);
     checkUnions(index, sink);
+    checkFieldSets(index, sink);
     checkCommands(index, sink);
+    checkEventIds(index, sink);
     checkInvariants(index, sink);
     checkTsNames(index, sink);
     checkLabels(index, sink);
@@ -5910,6 +6383,8 @@ var init_analyze = __esm(() => {
   init_build();
   init_ids();
   init_commands();
+  init_events();
+  init_field_sets();
   init_expressions();
   init_labels2();
   init_names();
@@ -5923,13 +6398,15 @@ var init_analyze = __esm(() => {
     from: "M006",
     to: "M006",
     emits: "M007",
-    errors: "M007"
+    errors: "M007",
+    fieldSets: "M016"
   };
   LINK_KINDS = {
     from: "state",
     to: "state",
     emits: "event",
     errors: "error",
+    fieldSets: "field set",
     target: "aggregate",
     decl: "type"
   };
@@ -6134,7 +6611,7 @@ var init_files = __esm(() => {
 });
 
 // src/model/model.ts
-var elementsIn = (model, ctx) => Object.values(model.elements).filter((e) => e.context === ctx), elementList = (model) => Object.values(model.elements), allFieldsOf = (el) => [
+var elementsIn = (model, ctx) => Object.values(model.elements).filter((e) => e.context === ctx), elementList = (model) => Object.values(model.elements), ownFields = (el) => el.fields.filter((f) => !f.fieldSet), allFieldsOf = (el) => [
   ...el.fields,
   ...(el.states ?? []).flatMap((s) => s.fields),
   ...(el.variants ?? []).flatMap((v) => v.fields)
@@ -6308,8 +6785,10 @@ function contextDependencies(model) {
       else if (f.type.kind === "ref")
         add(f.type.ref, path);
     };
-    for (const f of el.fields)
+    for (const f of ownFields(el))
       field(f, f.name);
+    for (const fs of el.fieldSets ?? [])
+      add(fs, "with");
     for (const s of el.states ?? [])
       for (const f of s.fields)
         field(f, `${s.name}.${f.name}`);
@@ -6382,13 +6861,14 @@ function fieldLine(f, ctx, model, indent = "") {
       label: `${marker}${f.label ?? f.name}`,
       both: `${marker}${f.label ? `${f.label} ` : ""}${f.name}`
     }),
-    value: anyLang({ name: byName + f.multiplicity, label: byLabel + f.multiplicity, both: byName + f.multiplicity })
+    value: anyLang({ name: byName + f.multiplicity, label: byLabel + f.multiplicity, both: byName + f.multiplicity }),
+    ...f.fieldSet && { origin: named(typeText({ kind: "ref", ref: f.fieldSet, text: "" }, ctx, model.sharedContexts), lookupLabel(model, f.fieldSet), (l) => l) }
   };
 }
 function bodyUnits(lines) {
   return Math.max(0, ...TEXT_VARIANTS.map(([g, m]) => {
     const key = Math.max(0, ...lines.filter((l) => l.value).map((l) => textUnits(l.key[g][m])));
-    const value = Math.max(0, ...lines.map((l) => l.value ? textUnits(l.value[g][m]) : 0));
+    const value = Math.max(0, ...lines.map((l) => l.value ? textUnits(l.value[g][m]) + (l.origin ? COLUMN_GAP + textUnits(l.origin[g][m]) : 0) : 0));
     const keyOnly = Math.max(0, ...lines.filter((l) => !l.value).map((l) => textUnits(l.key[g][m])));
     return Math.max(value ? key + COLUMN_GAP + value : 0, keyOnly);
   }));
@@ -6697,21 +7177,25 @@ function buildStateGraph(agg, model, labels = "both") {
   }
   const stateNode = (name) => stateful ? states.find((s) => s.name === name)?.id : agg.id;
   for (const c of commands) {
-    const sources = c.factory ? [initialNodeId(agg.id)] : stateful ? c.from.map(stateNode) : [agg.id];
-    const targets = stateful ? c.to.map(stateNode) : [agg.id];
+    const pairs = stateful ? c.transitions.flatMap((t) => {
+      const sources = c.factory ? [initialNodeId(agg.id)] : t.from.map(stateNode);
+      return sources.flatMap((source) => t.to.map((to) => [source, stateNode(to)]));
+    }) : [[c.factory ? initialNodeId(agg.id) : agg.id, agg.id]];
     const label = commandLabel(c);
     const events = eventsLabel(c, model);
-    for (const source of sources) {
-      for (const target of targets) {
-        if (!source || !target)
-          continue;
-        const id = `${c.id}|${source}->${target}`;
-        const node = source === target ? nodes.find((n) => n.id === source) : undefined;
-        if (node)
-          (node.internal ??= []).push({ id, elementId: c.id, label, ...events && { events } });
-        else
-          edges.push({ id, kind: "transition", source, target, label, ...events && { events } });
-      }
+    const seen = new Set;
+    for (const [source, target] of pairs) {
+      if (!source || !target)
+        continue;
+      const id = `${c.id}|${source}->${target}`;
+      if (seen.has(id))
+        continue;
+      seen.add(id);
+      const node = source === target ? nodes.find((n) => n.id === source) : undefined;
+      if (node)
+        (node.internal ??= []).push({ id, elementId: c.id, label, ...events && { events } });
+      else
+        edges.push({ id, kind: "transition", source, target, label, ...events && { events } });
     }
   }
   const sizedNodes = nodes.map((n) => sizedState(n, labels));
@@ -6784,7 +7268,8 @@ var init_build2 = __esm(() => {
     primitive: stereotype("ドメインプリミティブ", "primitive"),
     id: stereotype("ID", "id"),
     event: stereotype("ドメインイベント", "event"),
-    error: stereotype("エラー", "error")
+    error: stereotype("エラー", "error"),
+    fieldSet: stereotype("項目セット", "field set")
   };
 });
 
@@ -7328,6 +7813,20 @@ export interface Err<E> {
 export const ok = <T>(value: T): Ok<T> => ({ ok: true, value });
 export const err = <E>(error: E): Err<E> => ({ ok: false, error });
 
+/** Arguments of a handler after the first. */
+type ArgsAfterFirst<F> = F extends (first: any, ...args: infer A) => unknown ? A : never;
+
+/**
+ * Implements a command from one handler per state (a generated \`<Command>ByState\` type): the result calls the handler
+ * of its first argument's \`${STATE_TAG}\` with the same arguments, and is assignable to the command's contract.
+ *
+ *     changeNote: byState<Sales.ChangeNoteOrderByState>({ Draft: (order, note) => …, Confirmed: (order, note) => … })
+ */
+export const byState =
+    <H extends { readonly [state: string]: (subject: any, ...args: any[]) => unknown }>(handlers: H) =>
+    <S extends { readonly ${STATE_TAG}: keyof H }>(subject: S, ...args: ArgsAfterFirst<H[keyof H]>): ReturnType<H[S['${STATE_TAG}']]> =>
+        handlers[subject.${STATE_TAG}](subject, ...args) as ReturnType<H[S['${STATE_TAG}']]>;
+
 /** Decimal values are carried as strings so that no precision is lost. */
 export type Decimal = string & { readonly __brand: 'Decimal' };
 
@@ -7362,6 +7861,7 @@ var oneLine = (s) => comment(s).replace(/\n+/g, " ");
 var describedLines = (d) => [d.label, d.doc].filter((x) => !!x);
 var PERSISTENT_LINE = "@persistent Persisted: storing this event is part of its contract.";
 var invariantLines = (invs) => invs.map((i) => `@invariant ${i.name}${i.label ? ` (${i.label})` : ""}: ${i.source}`);
+var unique2 = (names) => [...new Set(names)];
 
 class ContextEmitter {
   model;
@@ -7398,7 +7898,11 @@ class ContextEmitter {
         case "valueObject":
         case "entity":
           this.jsdoc([...describedLines(el), ...invariantLines(el.invariants)]);
-          this.iface(el.name, undefined, [], el.fields);
+          this.iface(el.name, this.fieldSets(el), [], ownFields(el));
+          break;
+        case "fieldSet":
+          this.jsdoc([...describedLines(el), `Fields taken on with \`with ${el.name}\`.`]);
+          this.iface(el.name, [], [], el.fields);
           break;
         case "union":
           this.union(el);
@@ -7406,7 +7910,7 @@ class ContextEmitter {
         case "event":
         case "error":
           this.jsdoc([...describedLines(el), ...el.persistent ? [PERSISTENT_LINE] : []]);
-          this.iface(el.name, undefined, [`readonly ${EVENT_TAG}: '${el.name}';`], el.fields);
+          this.iface(el.name, this.fieldSets(el), [`readonly ${EVENT_TAG}: '${el.name}';`], ownFields(el));
           break;
         case "aggregate":
           this.aggregate(el);
@@ -7415,6 +7919,7 @@ class ContextEmitter {
       this.out.push("");
     }
     this.persistentEvents();
+    this.unions();
     const body = this.out.join(`
 `);
     const runtime = ["Decimal", "Result", "Timestamp"].filter((n) => new RegExp(`\\b${n}\\b`).test(body));
@@ -7433,6 +7938,24 @@ class ContextEmitter {
     this.line(`export type ${PERSISTENT_EVENT_TYPE} = ${events.map((e) => e.name).join(" | ")};`);
     this.out.push("");
   }
+  unions() {
+    const els = elementsIn(this.model, this.ctx);
+    const events = els.filter((el) => el.kind === "event");
+    if (events.length) {
+      this.jsdoc([`Events of ${this.ctx}.`]);
+      this.line(`export type ${DOMAIN_EVENT_TYPE} = ${events.map((e) => e.name).join(" | ")};`);
+      this.out.push("");
+    }
+    const aggregates = els.filter((el) => el.kind === "aggregate");
+    if (aggregates.length) {
+      this.jsdoc([`Aggregates of ${this.ctx}.`]);
+      this.line(`export type ${AGGREGATE_TYPE} = ${aggregates.map((e) => e.name).join(" | ")};`);
+      this.out.push("");
+    }
+  }
+  fieldSets(el) {
+    return (el.fieldSets ?? []).map((f) => this.ref(f));
+  }
   primitive(p) {
     const base = PRIMITIVES[p.base ?? "String"];
     const summary = p.kind === "id" && !p.label ? [`Identifier of ${p.name}.`] : [];
@@ -7487,14 +8010,14 @@ class ContextEmitter {
     const states = agg.states ?? [];
     if (states.length === 0) {
       this.jsdoc([...describedLines(agg), ...invariantLines(agg.invariants)]);
-      this.iface(agg.name, undefined, [], agg.fields);
+      this.iface(agg.name, this.fieldSets(agg), [], ownFields(agg));
     } else {
       this.jsdoc([`Fields shared by every state of ${agg.label ? `${agg.label} (${agg.name})` : agg.name}.`, ...invariantLines(agg.invariants)]);
-      this.iface(commonTypeName(agg), undefined, [], agg.fields);
+      this.iface(commonTypeName(agg), this.fieldSets(agg), [], ownFields(agg));
       for (const s of states) {
         this.out.push("");
         this.jsdoc([...describedLines(s), ...invariantLines(s.invariants)]);
-        this.iface(stateTypeName(agg, s), commonTypeName(agg), [`readonly ${STATE_TAG}: '${s.name}';`], s.fields);
+        this.iface(stateTypeName(agg, s), [commonTypeName(agg)], [`readonly ${STATE_TAG}: '${s.name}';`], s.fields);
       }
       this.out.push("");
       this.jsdoc(describedLines(agg));
@@ -7516,33 +8039,53 @@ class ContextEmitter {
       }
       this.line("}");
     }
+    const events = [...new Set(commands.flatMap((c) => c.emits))];
+    if (events.length > 0) {
+      this.out.push("");
+      this.jsdoc([`Events that the commands of ${agg.name} may emit.`]);
+      this.line(`export type ${aggregateEventTypeName(agg)} = ${events.map((e) => this.ref(e)).join(" | ")};`);
+    }
   }
   command(agg, c) {
     const stateful = (agg.states ?? []).length > 0;
-    const stateUnion = (names) => stateful ? names.map((n) => stateTypeName(agg, n)).join(" | ") : agg.name;
-    const params = [];
-    if (!c.factory)
-      params.push(`${aggregateParamName(agg)}: ${stateUnion(c.from)}`);
-    for (const p of c.params)
-      params.push(`${p.name}: ${this.fieldType(p)}${p.cardinality === "optional" ? " | undefined" : ""}`);
-    const output = stateUnion(c.to);
+    const stateUnion = (names) => stateful ? unique2(names).map((n) => stateTypeName(agg, n)).join(" | ") : agg.name;
+    const transitions = stateful ? c.transitions : [];
+    const generic = stateful && targetsVary(c.factory, transitions.map((t) => t.to));
+    const input = stateUnion(transitions.flatMap((t) => t.from));
+    const self = aggregateParamName(agg);
+    const params = c.params.map((p) => `${p.name}: ${this.fieldType(p)}${p.cardinality === "optional" ? " | undefined" : ""}`);
     const events = c.emits.length === 0 ? "never" : c.emits.map((e) => this.ref(e)).join(" | ");
     const eventArray = c.emits.length > 1 ? `readonly (${events})[]` : `readonly ${events}[]`;
     const errors = c.errors.length === 0 ? "never" : c.errors.map((e) => this.ref(e)).join(" | ");
-    const transition = c.factory ? `new -> ${c.to.join(" | ") || agg.name}` : stateful ? `${c.from.join(" | ")} -> ${c.to.join(" | ")}` : "";
+    const result = (output) => `Result<readonly [${output}, ${eventArray}], ${errors}>`;
+    const transition = c.factory ? `new -> ${transitions[0]?.to.join(" | ") || agg.name}` : transitions.map((t) => `${t.from.join(" | ")} -> ${t.to.join(" | ")}`).join("; ");
     this.jsdoc([
       `${agg.name}.${c.name}${transition ? ` (${transition})` : ""}${c.factory ? " — factory" : ""}`,
       ...describedLines(c),
       ...c.params.filter((p) => p.label || p.doc).map((p) => `@param ${p.name} ${[p.label, p.doc].filter(Boolean).join(" — ")}`)
     ]);
-    this.line(`export type ${commandTypeName(agg, c)} = (`);
-    for (const p of params)
+    this.line(`export type ${commandTypeName(agg, c)} = ${generic ? `<S extends ${input}>` : ""}(`);
+    for (const p of [...c.factory ? [] : [`${self}: ${generic ? "S" : input}`], ...params])
       this.line(`    ${p},`);
-    this.line(`) => Result<readonly [${output}, ${eventArray}], ${errors}>;`);
+    if (!generic) {
+      this.line(`) => ${result(stateUnion(transitions[0]?.to ?? []))};`);
+      return;
+    }
+    this.line(`) => ReturnType<${byStateTypeName(agg, c)}[S['${STATE_TAG}']]>;`);
+    this.out.push("");
+    this.jsdoc([`${agg.name}.${c.name}, one handler per source state; implement it with \`byState\` from the runtime.`]);
+    this.line(`export type ${byStateTypeName(agg, c)} = {`);
+    for (const t of transitions) {
+      for (const from of t.from) {
+        const args = [`${self}: ${stateTypeName(agg, from)}`, ...params].join(", ");
+        this.line(`    readonly ${from}: (${args}) => ${result(stateUnion(t.to))};`);
+      }
+    }
+    this.line("};");
   }
-  iface(name, base, extra, fields) {
+  iface(name, bases, extra, fields) {
     const lines = [...extra, ...fields.flatMap((f) => this.property(f))];
-    const ext = base ? ` extends ${base}` : "";
+    const ext = bases.length ? ` extends ${bases.join(", ")}` : "";
     if (lines.length === 0) {
       this.line(`export interface ${name}${ext} {}`);
       return;
@@ -7599,7 +8142,7 @@ class ContextEmitter {
 }
 
 // docs/guide.md
-var guide_default = "# DomainTrail guide\n\n`dt` checks domain models written in the DomainTrail DSL (`.dt` files) and generates TypeScript types and command\ncontracts from them. The DSL describes domain **structure and contracts** only — never business logic, which is written\nby hand against the generated types.\n\nThis guide is what `dt guide` prints. It is written for people and AI agents using `dt` without other documentation.\n\n## Workflow\n\n1. Write or edit `.dt` files (see [DSL](#dsl) and [File layout](#file-layout-recommended)).\n2. Run `dt check` and fix every reported problem until it exits 0.\n3. Run `dt generate ts` to write the TypeScript (it runs `check` first and writes nothing on errors).\n4. Implement the generated contracts in your own code, and type-check that code with your own TypeScript setup\n   (e.g. `tsc --noEmit`). `dt` does not run the TypeScript compiler.\n\n`dt view` starts the Live View, a browser page where people watch the model update as files are saved. It is a server\nthat keeps running and never exits by itself (stop it with Ctrl+C), so do not wait for it to finish: run it in the\nbackground, or use `dt check` for a result.\n\n`dt --help` and `dt <command> --help` list the options with examples.\n\n```bash\ndt check                        # every *.dt file below the current directory\ndt -r domain check              # below domain/ (or as configured by a domaintrail.jsonc found there or above)\ndt generate ts                  # into <root>/generated/domain\ndt generate ts --out src/domain/generated\ndt view --port 8080             # http://127.0.0.1:8080, until Ctrl+C\n```\n\n## Output and exit codes\n\n`check` (and `generate ts`, which checks first) prints one line per problem, sorted by file and position, then a\nsummary:\n\n```text\nsales/order.dt:2:11 - warning L002: Term 'note' (\"備考\") is not used by any field or parameter in context 'Sales'.\nsales/order.dt:8:32 - error M009: count() requires a collection, but got 'Money'.\n1 file(s) checked: 1 error(s), 1 warning(s).\n```\n\nPaths are relative to the root, lines and columns 1-based. Errors go to stderr, warnings to stdout. Fix errors first;\nwarnings do not fail the check. Other failures (missing root, invalid config, port in use, …) are one line on stderr.\n\n| Exit code | Meaning |\n|---|---|\n| 0 | success (`check`: no errors; warnings are allowed) |\n| 1 | the model has errors, no `.dt` file was found, generation was refused, or the root / a file could not be read |\n| 2 | invalid configuration (`domaintrail.jsonc` / `--config`, including a context name in `generate.ts.contexts` that the model does not have) or an unknown `generate` target |\n\nCommands that use the model look for a config file first; `--root` (`-r`, default `.`) is where that search starts.\n\n## Configuration\n\n`domaintrail.jsonc` (comments and trailing commas allowed) or `domaintrail.json` is looked up in `--root` and its\nparents, like `tsconfig.json`; `--config <file>` (`-c`) picks one explicitly. All paths in it are relative to the config\nfile, and its directory becomes the root. Without a config file, the defaults apply with `--root` as the root.\nEvery key is optional.\n\n```jsonc\n{\n  \"$schema\": \"./node_modules/domaintrail/schema/domaintrail.schema.json\",\n  // globs of DSL files; \"!\" excludes (node_modules, .git, .domaintrail are never scanned)\n  \"sources\": [\"domain/**/*.dt\", \"!domain/drafts/**\"],      // default: [\"**/*.dt\"]\n  \"generate\": {\n    \"ts\": {\n      \"out\": \"src/domain/generated\",                        // default: \"generated/domain\"\n      // contexts written elsewhere than \"out\" (optional)\n      \"contexts\": { \"Common\": { \"out\": \"packages/shared/src/generated\" } }\n    }\n  },\n  \"view\": { \"port\": 4321, \"host\": \"127.0.0.1\" }             // defaults shown\n}\n```\n\nCLI options win over the file: `generate ts --out`, `view --port`, `view --host`. `--out` replaces `generate.ts.out`\nonly; contexts listed in `generate.ts.contexts` keep their own directories. Sources and output directories, `--out`\nincluded, must stay inside the config file's directory (the root without a config file): an absolute path or one with\n`..` is a config error, and an output directory reached through a symlink stops generation. A name in `generate.ts.contexts` that is not a context of the model is a config\nerror, reported by `generate ts` once the model has been checked.\n\n## File layout (recommended)\n\nFile names and directories carry no meaning: every matching `.dt` file belongs to the workspace, and a context may be\nsplit across any files. The recommended layout is one directory per context and one file per aggregate:\n\n```text\ncommon/context.dt      shared context Common \"共通\" { ... }      // a shared context has no aggregates\nsales/context.dt       /// 説明  context Sales \"販売\" { terms { ... } }\nsales/order.dt         context Sales { id OrderId ...  aggregate Order { ... }  entity OrderItem ...  event OrderPlaced ... }\nsales/customer.dt      context Sales { id CustomerId ...  aggregate Customer { ... } }\nbilling/context.dt     /// 説明  context Billing \"請求\" { terms { ... } }\nbilling/invoice.dt     context Billing { id InvoiceId ...  aggregate Invoice { ... } }\n```\n\n- `<context>/<aggregate>.dt` holds the aggregate and what only it uses: its ID, entities, events, errors, enums,\n  primitives and values.\n- `<context>/context.dt` holds the context's name (表示名), description and `terms`, and the elements used by several\n  of its aggregates or by none. The other files open the context without a name: `context Sales { ... }`.\n- An aggregate's ID stays in the aggregate's file even when other aggregates reference it.\n- Directory and file names are kebab-case: `PurchaseOrder` → `purchase-order.dt`, `OrderFulfillment` →\n  `order-fulfillment/`.\n\nThis is a convention, not a rule: `check` neither requires nor warns about any layout.\n\n## DSL\n\nThe examples below are the files of one valid workspace (the file name is in the first comment).\n\n### Contexts and aggregates\n\n```dt\n// sales/order.dt\ncontext Sales {                          // a bounded context; may be split across files\n  id OrderId: UUID                       // ID type with a base primitive type\n  id OrderItemId: UUID\n  enum CancelReason { Requested Other }  // commas between values are optional\n  value Address { city: String street: String }\n\n  aggregate Order {\n    id: OrderId                          // identity field of its own ID type (required)\n    owns items: OrderItem[0..*]          // owned entity / value inside the aggregate\n    references customer: CustomerId -> Customer   // another aggregate, by ID\n    owns shipTo: Address?                // ? = optional\n    note: String?\n\n    invariant quantitiesPositive {       // applies to every state; sees the common fields\n      all(items, item => item.quantity > 0)\n    }\n\n    create command place(customer: CustomerId) to Draft emits OrderPlaced   // factory: no `from`\n\n    state Draft\n    state Confirmed {\n      confirmedAt: Timestamp             // exists only in this state\n      invariant hasItems { count(items) > 0 and count(items) <= 100 }   // sees common + Confirmed fields\n    }\n    state Cancelled {\n      reason: CancelReason\n      invariant otherNeedsNote { reason == CancelReason.Other implies exists(note) }\n    }\n\n    command confirm(at: Timestamp)\n      from Draft\n      to Confirmed                       // several: `to A | B`\n      emits OrderConfirmed               // events that MAY be emitted (0..n)\n      errors EmptyOrder                  // errors that MAY be returned\n\n    command cancel(reason: CancelReason) from Draft | Confirmed to Cancelled emits OrderCancelled\n  }\n\n  entity OrderItem { id: OrderItemId quantity: Quantity owns unitPrice: Money }\n\n  persistent event OrderPlaced { orderId: OrderId }      // storing it is part of its contract\n  persistent event OrderConfirmed { orderId: OrderId confirmedAt: Timestamp }\n  event OrderCancelled { orderId: OrderId reason: CancelReason }   // not persisted (default)\n  error EmptyOrder                       // payload optional: error E { field: Type }\n}\n```\n\n```dt\n// sales/customer.dt\ncontext Sales {\n  id CustomerId: UUID\n\n  aggregate Customer {                   // no states: commands have no `from` / `to`\n    id: CustomerId\n    email: EmailAddress                  // from the shared context Common\n    active: Bool\n    owns addresses: Address[0..*]\n\n    invariant activeHasAddress { active == true implies count(addresses) > 0 }\n    invariant servedArea { active == false or any(addresses, a => a.city == \"Tokyo\" or not (a.city == \"Osaka\")) }\n\n    command changeEmail(email: EmailAddress) errors EmailTaken\n  }\n\n  error EmailTaken { email: EmailAddress }\n}\n```\n\n- Context elements: `id`, `primitive`, `enum`, `value`, `union`, `entity`, `aggregate`, `event`, `error`.\n- Fields: `name: Type`, `owns name: Type` (entities and values held by the aggregate),\n  `references name: IdType -> Aggregate` (other aggregates, by ID only). Entities are owned by exactly one aggregate.\n- Primitive types: `String`, `Int`, `Decimal`, `Bool`, `Timestamp`, `UUID`.\n- Multiplicity after the type: `?`, `[0..1]`, `[0..*]`, `[1..*]`, `[n..m]`.\n- Aggregate members: fields, `invariant`, `state` (with its own fields and invariants), `command`.\n  An aggregate with states needs `to` on every command and `from` on every non-`create` one; without states, neither.\n- `create command` makes a new aggregate; other commands take the aggregate in one of their `from` states.\n- `value`, `state`, `event` and `error` bodies are optional (`state Draft`, `error EmptyOrder`).\n- Other contexts' elements are referenced with qualified names: `Sales.OrderId`, `-> Sales.Order`.\n- Comments: `// …` and `/* … */`; `///` is a description (see [Names](#names-labels-and-descriptions)).\n\n### Domain primitives\n\nA single value with domain meaning and constraints, wrapping a primitive type. Values combining several fields are\nvalue objects.\n\n```dt\n// sales/primitives.dt\ncontext Sales {\n  primitive Quantity \"数量\": Int { value in 1..999 }     // one anonymous constraint\n  primitive Sku: String {                                 // or named invariants\n    invariant format \"形式\" { matches(value, \"^[A-Z]{3}-\\d{4}$\") }\n    invariant maxLength { length(value) <= 8 }\n  }\n  id InvoiceNo: String { matches(value, \"^INV-\\d{8}$\") }  // an ID is a domain primitive used as identity\n}\n```\n\n- The base is always a primitive type; a domain primitive cannot refine another one or an enum.\n- Inside the constraint only `value` (of the base type) is visible; `length(value)`, `matches(value, \"regex\")` and\n  ranges `value in 1..999` (negative literals allowed) are available there.\n- Regular expressions are written as in JavaScript: backslashes are not string escapes (`\"\\d\"` means `\\d`).\n- Elsewhere a domain primitive compares with literals and with the same domain primitive, not with another domain\n  primitive or a plain field of its base type (M009).\n- Only IDs can be identity fields and reference types. Domain primitives cannot be owned.\n\n### Unions\n\nA value whose shape depends on a kind fixed when it is made (a tagged union). Use a union for a classification that\nnever changes, and aggregate states for a lifecycle that commands move through.\n\n```dt\n// sales/payment.dt\ncontext Sales {\n  union Payer \"支払者\" {                                  // discriminator `kind` by default\n    CUSTOMER \"顧客\" { customerId: CustomerId }\n    COMPANY \"法人\" { name: String  billingEmail: EmailAddress? }\n  }\n  enum PaymentMethod { CARD TRANSFER }\n  union PaymentDetails by method: PaymentMethod {        // `by name`, optionally bound to an enum\n    CARD { last4: String }                               // exactly the enum's values (M015)\n    TRANSFER { bankCode: String }\n  }\n}\n```\n\n- A union is a value type: usable like a value object (fields, `owns`, parameters, payloads, shared contexts).\n  Variants hold value fields and invariants (seeing their own fields); entities and aggregates are not allowed.\n- In invariants, `payer.kind` compares with `Payer.COMPANY` (or the bound enum's values); variant fields are not\n  accessible from outside the union.\n\n### Shared contexts\n\n```dt\n// common/context.dt\nshared context Common \"共通\" {            // shared kernel: usable by simple name from every context\n  terms { currency: \"通貨\" }\n  enum Currency { JPY USD }\n  value Money { amount: Decimal currency: Currency }\n  primitive EmailAddress: String { matches(value, \"^[^@\\s]+@[^@\\s]+$\") }\n}\n```\n\n- `Money` and `Common.Money` both work in other contexts. A context's own element with the same name wins (M014 warning).\n- A shared context holds only domain primitives, enums, value objects, unions and terms, and depends only on shared\n  contexts. Its `terms` apply to fields of every context that has no term of its own for the name.\n\n### Names (labels and descriptions)\n\n```dt\n// billing/context.dt\n/// 注文への請求と支払いを扱う。\ncontext Billing \"請求\" {\n  terms {                                  // field / parameter names, defined once per context\n    /// 請求書が支払われた日時。\n    paidAt: \"支払日時\"\n  }\n}\n```\n\n```dt\n// billing/invoice.dt\ncontext Billing {                          // other files open the context without a name\n  id InvoiceId \"請求書ID\": UUID\n\n  /// 注文1件に対する請求。\n  aggregate Invoice \"請求書\" {             // declarations: a string after the name\n    id: InvoiceId\n    references order: Sales.OrderId -> Sales.Order \"請求対象\"   // an inline label on a field\n    owns amount: Money \"請求金額\"\n    state Open \"未払い\"\n    state Paid \"支払済み\" { paidAt: Timestamp }               // → 支払日時 (from terms)\n    invariant positive \"金額が正\" { amount.amount > 0 }\n    create command issue(order: Sales.OrderId, amount: Money) \"請求書を発行する\" to Open\n    command pay(at: Timestamp \"支払日時\") \"支払う\" from Open to Paid emits InvoicePaid\n  }\n  enum InvoiceKind \"請求区分\" { Regular \"通常\" Refund \"返金\" }\n  event InvoicePaid \"支払完了\" { invoiceId: InvoiceId paidAt: Timestamp }\n}\n```\n\n- Declarations (context, id, primitive, enum and its values, value, union and its variants, entity, aggregate, state,\n  command, invariant, event, error) take an optional string label after the name.\n- A field or parameter is named by, in order: its inline string → the context's `terms` → the name of its type\n  (for `references`, the target aggregate) → the English name.\n- `///` lines directly above a declaration or term are its description.\n- Labels appear in the Live View and as JSDoc in the generated TypeScript; identifiers and generated type names stay\n  English.\n\n### Invariant expressions\n\n- Literals: `true`, `false`, `42`, `-1`, `3.14`, `\"text\"`; enum values `CancelReason.Other`.\n- Field paths: `note`, `item.quantity`, `amount.amount`.\n- Operators, loosest first: `implies`, `or`, `and`, `== != < <= > >=`, `x in 1..9`, `not`.\n- Functions: `exists(x)` (an optional is present; narrows `x` on the right of `and` / `implies`), `count(c)`,\n  `all(c, x => …)`, `any(c, x => …)`, and in domain primitives `length(value)`, `matches(value, \"regex\")`.\n- An invariant must be a Bool expression. Only its type is checked, not whether it holds.\n\n## Rules\n\n| Code | Check |\n|---|---|\n| SYNTAX | lexer / parser errors |\n| M001 | types, aggregates and names in invariants resolve |\n| M002 | names are unique in their scope (also across files of one context) |\n| M003 | an entity is owned by exactly one aggregate (warning when owned by none) |\n| M004 | no ownership across aggregate boundaries (entities need `owns`, aggregates need `references`, …) |\n| M005 | a reference's ID type matches the identity of the target aggregate |\n| M006 | command input/output states exist and fit the aggregate (factory / stateful / stateless) |\n| M007 | `emits` / `errors` refer to existing events / errors |\n| M008 | an invariant is a Bool expression |\n| M009 | operators and operands have compatible types |\n| M010 | state-specific fields are used only in their own state's invariants |\n| M011 | generated TypeScript names do not collide |\n| M012 | the ownership graph has no cycles |\n| M013 | aggregates and entities have an `id` field of their own ID type |\n| M014 | shared contexts: only value types, no dependency on other contexts, consistent `shared`, unambiguous names (shadowing is a warning) |\n| M015 | unions: at least one variant, variants match the bound enum exactly, no variant field named like the discriminator |\n| L001 | (warning) an inline field label disagrees with the term, or context fragments disagree on the context name |\n| L002 | (warning) a term is not used by any field or parameter |\n| L003 | (warning) different things in one scope share a Japanese name |\n\n## Generated TypeScript\n\nPer context a module (`Sales.ts`, …) with ID brands, enums, value objects, entities, unions, a discriminated union per\nstateful aggregate (`DraftOrder | ConfirmedOrder | …`), event / error types with a `type` tag, a function type per\ncommand and an `<Aggregate>Commands` interface to implement, plus `index.ts` and `_runtime.ts`. A domain primitive\ngets a branded type and a constructor contract `Make<Name>` to implement by hand.\n\n```ts\nexport type ConfirmOrder = (\n    order: DraftOrder,\n    at: Timestamp,\n) => Result<readonly [ConfirmedOrder, readonly OrderConfirmed[]], EmptyOrder>;\n```\n\n### Generated code and your code\n\nThe generated files are the **contract**, your code is the **implementation**:\n\n- Generated: types only — the shapes of the model, the command signatures (`ConfirmOrder`, `OrderCommands`) and the\n  constructor signatures of domain primitives (`MakeQuantity`). Invariants appear as JSDoc (`@invariant`); nothing in\n  the generated code checks them.\n- Yours: everything that runs — command implementations, `Make<Name>` constructors, invariant checks — in your own\n  files, which import the generated modules (never the other way round) and are type-checked against them.\n\n```ts\n// src/primitives.ts — your code\nimport { err, ok, type Sales } from '../generated/domain/index.js';\n\nexport const makeQuantity: Sales.MakeQuantity = (value) =>\n    Number.isInteger(value) && value >= 1 && value <= 999 ? ok(value as Sales.Quantity) : err({ type: 'InvalidQuantity', value, invariant: 'valid' });\n```\n\nDo not edit generated files: change the `.dt` sources and generate again. Adding properties or methods to generated\ntypes (declaration merging, editing the output) is not supported; write functions that take the generated types.\n\n### Output directories\n\nBy default every context goes to `generate.ts.out`. Contexts listed in `generate.ts.contexts` go to their own\ndirectory instead, e.g. a shared context into a package used by several applications. Each directory written to gets\nits own `_runtime.ts` and an `index.ts` re-exporting only the contexts in it; a module imports other contexts by\nrelative path (`import type * as Common from '../../packages/shared/src/generated/Common.js'`). The runtimes are\nidentical, so values typed with one are accepted where the other is expected.\n\nEach run replaces the files generated before (recognized by their header). The files written are recorded in\n`.domaintrail/generated.json` under the root, and generated files of earlier runs that are no longer written (an output\ndirectory moved, a context removed) are deleted, along with a directory left empty. Only recorded paths inside the root\nand not reached through a symlink are deleted; other entries in that file are ignored. Other files are never deleted —\nneither hand-written files nor generated files you edited — and generation stops instead of overwriting one.\n";
+var guide_default = "# DomainTrail guide\n\n`dt` checks domain models written in the DomainTrail DSL (`.dt` files) and generates TypeScript types and command\ncontracts from them. The DSL describes domain **structure and contracts** only — never business logic, which is written\nby hand against the generated types.\n\nThis guide is what `dt guide` prints. It is written for people and AI agents using `dt` without other documentation.\n\n## Workflow\n\n1. Write or edit `.dt` files (see [DSL](#dsl) and [File layout](#file-layout-recommended)).\n2. Run `dt check` and fix every reported problem until it exits 0.\n3. Run `dt generate ts` to write the TypeScript (it runs `check` first and writes nothing on errors).\n4. Implement the generated contracts in your own code, and type-check that code with your own TypeScript setup\n   (e.g. `tsc --noEmit`). `dt` does not run the TypeScript compiler.\n\n`dt view` starts the Live View, a browser page where people watch the model update as files are saved. It is a server\nthat keeps running and never exits by itself (stop it with Ctrl+C), so do not wait for it to finish: run it in the\nbackground, or use `dt check` for a result.\n\n`dt --help` and `dt <command> --help` list the options with examples.\n\n```bash\ndt check                        # every *.dt file below the current directory\ndt -r domain check              # below domain/ (or as configured by a domaintrail.jsonc found there or above)\ndt generate ts                  # into <root>/generated/domain\ndt generate ts --out src/domain/generated\ndt view --port 8080             # http://127.0.0.1:8080, until Ctrl+C\n```\n\n## Output and exit codes\n\n`check` (and `generate ts`, which checks first) prints one line per problem, sorted by file and position, then a\nsummary:\n\n```text\nsales/order.dt:2:11 - warning L002: Term 'note' (\"備考\") is not used by any field or parameter in context 'Sales'.\nsales/order.dt:8:32 - error M009: count() requires a collection, but got 'Money'.\n1 file(s) checked: 1 error(s), 1 warning(s).\n```\n\nPaths are relative to the root, lines and columns 1-based. Errors go to stderr, warnings to stdout. Fix errors first;\nwarnings do not fail the check. Other failures (missing root, invalid config, port in use, …) are one line on stderr.\n\n| Exit code | Meaning |\n|---|---|\n| 0 | success (`check`: no errors; warnings are allowed) |\n| 1 | the model has errors, no `.dt` file was found, generation was refused, or the root / a file could not be read |\n| 2 | invalid configuration (`domaintrail.jsonc` / `--config`, including a context name in `generate.ts.contexts` that the model does not have) or an unknown `generate` target |\n\nCommands that use the model look for a config file first; `--root` (`-r`, default `.`) is where that search starts.\n\n## Configuration\n\n`domaintrail.jsonc` (comments and trailing commas allowed) or `domaintrail.json` is looked up in `--root` and its\nparents, like `tsconfig.json`; `--config <file>` (`-c`) picks one explicitly. All paths in it are relative to the config\nfile, and its directory becomes the root. Without a config file, the defaults apply with `--root` as the root.\nEvery key is optional.\n\n```jsonc\n{\n  \"$schema\": \"./node_modules/domaintrail/schema/domaintrail.schema.json\",\n  // globs of DSL files; \"!\" excludes (node_modules, .git, .domaintrail are never scanned)\n  \"sources\": [\"domain/**/*.dt\", \"!domain/drafts/**\"],      // default: [\"**/*.dt\"]\n  \"generate\": {\n    \"ts\": {\n      \"out\": \"src/domain/generated\",                        // default: \"generated/domain\"\n      // contexts written elsewhere than \"out\" (optional)\n      \"contexts\": { \"Common\": { \"out\": \"packages/shared/src/generated\" } }\n    }\n  },\n  \"view\": { \"port\": 4321, \"host\": \"127.0.0.1\" }             // defaults shown\n}\n```\n\nCLI options win over the file: `generate ts --out`, `view --port`, `view --host`. `--out` replaces `generate.ts.out`\nonly; contexts listed in `generate.ts.contexts` keep their own directories. Sources and output directories, `--out`\nincluded, must stay inside the config file's directory (the root without a config file): an absolute path or one with\n`..` is a config error, and an output directory reached through a symlink stops generation. A name in `generate.ts.contexts` that is not a context of the model is a config\nerror, reported by `generate ts` once the model has been checked.\n\n## File layout (recommended)\n\nFile names and directories carry no meaning: every matching `.dt` file belongs to the workspace, and a context may be\nsplit across any files. The recommended layout is one directory per context and one file per aggregate:\n\n```text\ncommon/context.dt      shared context Common \"共通\" { ... }      // a shared context has no aggregates\nsales/context.dt       /// 説明  context Sales \"販売\" { terms { ... } }\nsales/order.dt         context Sales { id OrderId ...  aggregate Order { ... }  entity OrderItem ...  event OrderPlaced ... }\nsales/customer.dt      context Sales { id CustomerId ...  aggregate Customer { ... } }\nbilling/context.dt     /// 説明  context Billing \"請求\" { terms { ... } }\nbilling/invoice.dt     context Billing { id InvoiceId ...  aggregate Invoice { ... } }\n```\n\n- `<context>/<aggregate>.dt` holds the aggregate and what only it uses: its ID, entities, events, errors, enums,\n  primitives and values.\n- `<context>/context.dt` holds the context's name (表示名), description and `terms`, and the elements used by several\n  of its aggregates or by none (field sets, for example). The other files open the context without a name: `context Sales { ... }`.\n- An aggregate's ID stays in the aggregate's file even when other aggregates reference it.\n- Directory and file names are kebab-case: `PurchaseOrder` → `purchase-order.dt`, `OrderFulfillment` →\n  `order-fulfillment/`.\n\nThis is a convention, not a rule: `check` neither requires nor warns about any layout.\n\n## DSL\n\nThe examples below are the files of one valid workspace (the file name is in the first comment).\n\n### Contexts and aggregates\n\n```dt\n// sales/order.dt\ncontext Sales {                          // a bounded context; may be split across files\n  id OrderId: UUID                       // ID type with a base primitive type\n  id OrderItemId: UUID\n  enum CancelReason { Requested Other }  // commas between values are optional\n  value Address { city: String street: String }\n\n  aggregate Order {\n    id: OrderId                          // identity field of its own ID type (required)\n    owns items: OrderItem[0..*]          // owned entity / value inside the aggregate\n    references customer: CustomerId -> Customer   // another aggregate, by ID\n    owns shipTo: Address?                // ? = optional\n    note: String?\n\n    invariant quantitiesPositive {       // applies to every state; sees the common fields\n      all(items, item => item.quantity > 0)\n    }\n\n    create command place(customer: CustomerId) -> Draft emits OrderPlaced   // factory: `-> State`, no source\n\n    state Draft\n    state Confirmed {\n      confirmedAt: Timestamp             // exists only in this state\n      invariant hasItems { count(items) > 0 and count(items) <= 100 }   // sees common + Confirmed fields\n    }\n    state Cancelled {\n      reason: CancelReason\n      invariant otherNeedsNote { reason == CancelReason.Other implies exists(note) }\n    }\n\n    command confirm(at: Timestamp)\n      Draft -> Confirmed                 // a transition: source state(s) -> target state(s)\n      emits OrderConfirmed               // events that MAY be emitted (0..n)\n      errors EmptyOrder                  // errors that MAY be returned\n\n    command cancel(reason: CancelReason) Draft | Confirmed -> Cancelled emits OrderCancelled   // from either\n\n    command changeNote(note: String?)    // one transition per input state: the output depends on the input\n      Draft -> Draft\n      Confirmed -> Confirmed             // also on one line: `Draft -> Draft, Confirmed -> Confirmed`\n  }\n\n  entity OrderItem { id: OrderItemId quantity: Quantity owns unitPrice: Money }\n\n  persistent event OrderPlaced { orderId: OrderId }      // storing it is part of its contract\n  persistent event OrderConfirmed { orderId: OrderId confirmedAt: Timestamp }\n  event OrderCancelled { orderId: OrderId reason: CancelReason }   // not persisted (default)\n  error EmptyOrder                       // payload optional: error E { field: Type }\n}\n```\n\n```dt\n// sales/customer.dt\ncontext Sales {\n  id CustomerId: UUID\n\n  aggregate Customer {                   // no states: commands have no transitions\n    id: CustomerId\n    email: EmailAddress                  // from the shared context Common\n    active: Bool\n    owns addresses: Address[0..*]\n\n    invariant activeHasAddress { active == true implies count(addresses) > 0 }\n    invariant servedArea { active == false or any(addresses, a => a.city == \"Tokyo\" or not (a.city == \"Osaka\")) }\n\n    command changeEmail(email: EmailAddress) errors EmailTaken\n  }\n\n  error EmailTaken { email: EmailAddress }\n}\n```\n\n- Context elements: `id`, `primitive`, `enum`, `value`, `union`, `entity`, `aggregate`, `event`, `error`, and `fields`\n  (see [Field sets](#field-sets)).\n- Fields: `name: Type`, `owns name: Type` (entities and values held by the aggregate),\n  `references name: IdType -> Aggregate` (other aggregates, by ID only). Entities are owned by exactly one aggregate.\n- Primitive types: `String`, `Int`, `Decimal`, `Bool`, `Timestamp`, `UUID`.\n- Multiplicity after the type: `?`, `[0..1]`, `[0..*]`, `[1..*]`, `[n..m]`.\n- Aggregate members: fields, `invariant`, `state` (with its own fields and invariants), `command`.\n- Command transitions follow the parameters (and label), before `emits` / `errors`: `A | B -> C | D` means \"in `A` or\n  `B`, the command ends in `C` or `D`\". Separate several transitions by line breaks or commas. A state may be the\n  source of one transition of a command only, so the input state decides the possible outputs; for several possible\n  outcomes, list them on the right: `InProgress -> InProgress | Completed`.\n- In an aggregate with states, a `create command` makes a new aggregate and has exactly one transition without\n  sources (`-> Draft`, or `-> A | B`); every other command has one or more transitions, each with sources. Without\n  states, commands have no transitions. A command that keeps the state writes it out: `Draft -> Draft`.\n- `value`, `state`, `event` and `error` bodies are optional (`state Draft`, `error EmptyOrder`).\n- Other contexts' elements are referenced with qualified names: `Sales.OrderId`, `-> Sales.Order`.\n- Comments: `// …` and `/* … */`; `///` is a description (see [Names](#names-labels-and-descriptions)).\n\n### Domain primitives\n\nA single value with domain meaning and constraints, wrapping a primitive type. Values combining several fields are\nvalue objects.\n\n```dt\n// sales/primitives.dt\ncontext Sales {\n  primitive Quantity \"数量\": Int { value in 1..999 }     // one anonymous constraint\n  primitive Sku: String {                                 // or named invariants\n    invariant format \"形式\" { matches(value, \"^[A-Z]{3}-\\d{4}$\") }\n    invariant maxLength { length(value) <= 8 }\n  }\n  id InvoiceNo: String { matches(value, \"^INV-\\d{8}$\") }  // an ID is a domain primitive used as identity\n}\n```\n\n- The base is always a primitive type; a domain primitive cannot refine another one or an enum.\n- Inside the constraint only `value` (of the base type) is visible; `length(value)`, `matches(value, \"regex\")` and\n  ranges `value in 1..999` (negative literals allowed) are available there.\n- Regular expressions are written as in JavaScript: backslashes are not string escapes (`\"\\d\"` means `\\d`).\n- Elsewhere a domain primitive compares with literals and with the same domain primitive, not with another domain\n  primitive or a plain field of its base type (M009).\n- Only IDs can be identity fields and reference types. Domain primitives cannot be owned.\n\n### Unions\n\nA value whose shape depends on a kind fixed when it is made (a tagged union). Use a union for a classification that\nnever changes, and aggregate states for a lifecycle that commands move through.\n\n```dt\n// sales/payment.dt\ncontext Sales {\n  union Payer \"支払者\" {                                  // discriminator `kind` by default\n    CUSTOMER \"顧客\" { customerId: CustomerId }\n    COMPANY \"法人\" { name: String  billingEmail: EmailAddress? }\n  }\n  enum PaymentMethod { CARD TRANSFER }\n  union PaymentDetails by method: PaymentMethod {        // `by name`, optionally bound to an enum\n    CARD { last4: String }                               // exactly the enum's values (M015)\n    TRANSFER { bankCode: String }\n  }\n}\n```\n\n- A union is a value type: usable like a value object (fields, `owns`, parameters, payloads, shared contexts).\n  Variants hold value fields and invariants (seeing their own fields); entities and aggregates are not allowed.\n- In invariants, `payer.kind` compares with `Payer.COMPANY` (or the bound enum's values); variant fields are not\n  accessible from outside the union.\n\n### Shared contexts\n\n```dt\n// common/context.dt\nshared context Common \"共通\" {            // shared kernel: usable by simple name from every context\n  terms { currency: \"通貨\" }\n  enum Currency { JPY USD }\n  value Money { amount: Decimal currency: Currency }\n  primitive EmailAddress: String { matches(value, \"^[^@\\s]+@[^@\\s]+$\") }\n}\n```\n\n- `Money` and `Common.Money` both work in other contexts. A context's own element with the same name wins (M014 warning).\n- A shared context holds only domain primitives, enums, value objects, unions, field sets and terms, and depends only on\n  shared contexts. Its `terms` apply to fields of every context that has no term of its own for the name.\n\n### Field sets\n\nFields that several aggregates, entities or events have for the same domain reason are written once as a field set\nand taken on with `with`.\n\n```dt\n// common/tenancy.dt\nshared context Common {\n  /// 契約者（テナント）。業務データはテナントごとに分かれる。\n  primitive TenantId \"テナントID\": UUID\n  fields Tenanted \"テナント所属\" {          // a field set: plain fields only\n    tenant: TenantId \"テナント\"\n  }\n}\n```\n\n```dt\n// expenses/expense.dt\ncontext Expenses \"経費\" {\n  id ExpenseId \"経費申請ID\": UUID\n  id StaffId \"職員ID\": UUID\n\n  /// 規程により、申請の受付には実施者を記録する。\n  fields Performed \"実施記録\" {\n    performedBy: StaffId \"実施者\"\n  }\n\n  aggregate Expense \"経費申請\" with Tenanted {   // tenant first, then its own fields\n    id: ExpenseId\n    applicant: StaffId \"申請者\"\n    approver: StaffId? \"承認者\"\n    invariant notSelfApproved \"申請者は承認できない\" { exists(approver) implies approver != applicant }\n\n    create command submit(applicant: StaffId \"申請者\") \"申請する\" emits ExpenseSubmitted\n    command approve(approver: StaffId \"承認者\", approvedAt: Timestamp \"承認日時\") \"承認する\" emits ExpenseApproved\n  }\n\n  event ExpenseSubmitted \"申請受付\" with Tenanted, Performed { expenseId: ExpenseId }\n  event ExpenseApproved \"承認\" with Tenanted {\n    expenseId: ExpenseId\n    approver: StaffId \"承認者\"          // a business role, named by the role\n    approvedAt: Timestamp \"承認日時\"    // when it happened in business terms\n  }\n}\n```\n\n- `fields Name \"label\" { ... }` holds plain fields, written like any other field (type, multiplicity, label, `///`).\n  No `owns`, `references`, invariants, `with` or `id` inside (M016).\n- `with A, B` after the name and label of an `aggregate`, `entity` or `event` (only those, M016). A field set is\n  referenced like a type: by name in its own context and from shared contexts, as `Context.Name` otherwise.\n- The fields come first, in the order of `with`, and then count as the element's own: invariants see them, and an\n  aggregate's states share them. A name may come from one place only, the element or one of its field sets (M016).\n- The identity of aggregates and entities is never a field set: every aggregate and entity declares `id` itself (M013).\n- A command's event should say which aggregate it is about: it needs a field of the aggregate's ID type, its own or\n  from a field set (M017 warning). An event emitted by several aggregates needs the ID type of each (optional fields\n  count).\n\n### Domain fields and technical fields\n\nWrite a field in the DSL when **domain experts talk about it, or a business rule (an invariant, a transition, a\ncommand's decision) refers to it**. A field that is neither is technical: leave it out of the DSL and of the generated\ncode, and add it in your own code around the generated types (see [Technical metadata](#technical-metadata)).\n\n- **Required by the kind of element** (the ID of an aggregate or entity): enforced by the language (M013), not a field\n  set.\n- **Chosen for some elements** (a tenant, a recorded performer): a field set and `with`.\n- **Technical**: event ID, the time the system recorded something (`recordedAt`), optimistic-lock `version`,\n  `createdAt` / `updatedAt`, correlation / causation IDs, the system's acting account, schema versions.\n\nTwo cases look alike but are not:\n\n- **When**: the time something happened in business terms is domain — rules refer to it (\"within 30 days of\n  confirmation\"). Name it by its meaning (`confirmedAt: Timestamp \"確定日時\"`). If every event is to carry its business\n  time, say so with a field set: `fields Occurred { occurredAt: Timestamp \"発生日時\" }`. The time the system recorded it\n  is technical. The two differ with late entry, offline work and imports.\n- **Who**: a business role (approver, person in charge) is domain — rules refer to it (\"the applicant cannot\n  approve\"). Name it by the role (`approvedBy: StaffId \"承認者\"`), usually passed from the command's parameters to the\n  event. If regulations require recording the performer of every operation,\n  `fields Performed { performedBy: StaffId \"実施者\" }`. The login account, service account or IP address is technical; it differs with proxy entry and batches.\n\n### Names (labels and descriptions)\n\n```dt\n// billing/context.dt\n/// 注文への請求と支払いを扱う。\ncontext Billing \"請求\" {\n  terms {                                  // field / parameter names, defined once per context\n    /// 請求書が支払われた日時。\n    paidAt: \"支払日時\"\n  }\n}\n```\n\n```dt\n// billing/invoice.dt\ncontext Billing {                          // other files open the context without a name\n  id InvoiceId \"請求書ID\": UUID\n\n  /// 注文1件に対する請求。\n  aggregate Invoice \"請求書\" {             // declarations: a string after the name\n    id: InvoiceId\n    references order: Sales.OrderId -> Sales.Order \"請求対象\"   // an inline label on a field\n    owns amount: Money \"請求金額\"\n    state Open \"未払い\"\n    state Paid \"支払済み\" { paidAt: Timestamp }               // → 支払日時 (from terms)\n    invariant positive \"金額が正\" { amount.amount > 0 }\n    create command issue(order: Sales.OrderId, amount: Money) \"請求書を発行する\" -> Open\n    command pay(at: Timestamp \"支払日時\") \"支払う\" Open -> Paid emits InvoicePaid\n  }\n  enum InvoiceKind \"請求区分\" { Regular \"通常\" Refund \"返金\" }\n  event InvoicePaid \"支払完了\" { invoiceId: InvoiceId paidAt: Timestamp }\n}\n```\n\n- Declarations (context, id, primitive, enum and its values, value, union and its variants, entity, aggregate, state,\n  command, invariant, event, error) take an optional string label after the name.\n- A field or parameter is named by, in order: its inline string → the context's `terms` → the name of its type\n  (for `references`, the target aggregate) → the English name.\n- `///` lines directly above a declaration or term are its description.\n- Labels appear in the Live View and as JSDoc in the generated TypeScript; identifiers and generated type names stay\n  English.\n\n### Invariant expressions\n\n- Literals: `true`, `false`, `42`, `-1`, `3.14`, `\"text\"`; enum values `CancelReason.Other`.\n- Field paths: `note`, `item.quantity`, `amount.amount`.\n- Operators, loosest first: `implies`, `or`, `and`, `== != < <= > >=`, `x in 1..9`, `not`.\n- Functions: `exists(x)` (an optional is present; narrows `x` on the right of `and` / `implies`), `count(c)`,\n  `all(c, x => …)`, `any(c, x => …)`, and in domain primitives `length(value)`, `matches(value, \"regex\")`.\n- An invariant must be a Bool expression. Only its type is checked, not whether it holds.\n\n## Rules\n\n| Code | Check |\n|---|---|\n| SYNTAX | lexer / parser errors |\n| M001 | types, aggregates and names in invariants resolve |\n| M002 | names are unique in their scope (also across files of one context) |\n| M003 | an entity is owned by exactly one aggregate (warning when owned by none) |\n| M004 | no ownership across aggregate boundaries (entities need `owns`, aggregates need `references`, …) |\n| M005 | a reference's ID type matches the identity of the target aggregate |\n| M006 | command transitions: states exist; stateful: `create` has one `-> X`, others one or more `A -> B` with sources; a state is the source of one transition per command; stateless: none |\n| M007 | `emits` / `errors` refer to existing events / errors |\n| M008 | an invariant is a Bool expression |\n| M009 | operators and operands have compatible types |\n| M010 | state-specific fields are used only in their own state's invariants |\n| M011 | generated TypeScript names do not collide |\n| M012 | the ownership graph has no cycles |\n| M013 | aggregates and entities have an `id` field of their own ID type |\n| M014 | shared contexts: only value types, no dependency on other contexts, consistent `shared`, unambiguous names (shadowing is a warning) |\n| M015 | unions: at least one variant, variants match the bound enum exactly, no variant field named like the discriminator |\n| M016 | field sets: plain fields only (no `id`), `with` only on aggregates, entities and events, each field name from one place |\n| M017 | (warning) an event emitted by an aggregate's command has a field of that aggregate's ID type |\n| L001 | (warning) an inline field label disagrees with the term, or context fragments disagree on the context name |\n| L002 | (warning) a term is not used by any field or parameter |\n| L003 | (warning) different things in one scope share a Japanese name |\n\n## Generated TypeScript\n\nPer context a module (`Sales.ts`, …) with ID brands, enums, value objects, entities, unions, a discriminated union per\nstateful aggregate (`DraftOrder | ConfirmedOrder | …`), event / error types with a `type` tag, a function type per\ncommand and an `<Aggregate>Commands` interface to implement, plus `index.ts` and `_runtime.ts`. A domain primitive\ngets a branded type and a constructor contract `Make<Name>` to implement by hand. A field set is an interface that the\nelements using it extend (`interface Expense extends Common.Tenanted`; for a stateful aggregate, its `…Common`).\n\nUnions to name groups of them, each generated only when it has a member:\n\n| Type | Members |\n|---|---|\n| `DomainEvent` | every event of the context |\n| `PersistentEvent` | the events declared `persistent` |\n| `Aggregate` | every aggregate of the context |\n| `<Aggregate>Event` (`OrderEvent`) | the events the aggregate's commands may emit (also of other contexts) |\n\n```ts\nexport type ConfirmOrder = (\n    order: DraftOrder,\n    at: Timestamp,\n) => Result<readonly [ConfirmedOrder, readonly OrderConfirmed[]], EmptyOrder>;\n```\n\nA command takes the aggregate in any source state of its transitions. When every transition has the same targets\n(`Draft | Confirmed -> Cancelled`), it returns them, as above. When the targets differ by transition, the command\nalso gets a `<Command>ByState` type with one handler per source state (keyed by the state's name), and the command is\ngeneric over the input state, returning what the handler of that state returns. A caller with a `DraftOrder` gets a\n`DraftOrder` back, never a `ConfirmedOrder`; a caller with `DraftOrder | ConfirmedOrder` gets either:\n\n```ts\nexport type ChangeNoteOrder = <S extends DraftOrder | ConfirmedOrder>(\n    order: S,\n    note: string | undefined,\n) => ReturnType<ChangeNoteOrderByState[S['state']]>;\n\nexport type ChangeNoteOrderByState = {\n    readonly Draft: (order: DraftOrder, note: string | undefined) => Result<readonly [DraftOrder, readonly never[]], never>;\n    readonly Confirmed: (order: ConfirmedOrder, note: string | undefined) => Result<readonly [ConfirmedOrder, readonly never[]], never>;\n};\n```\n\nImplement such a command with `byState` from the runtime: it takes the handlers and calls the one of the aggregate's\n`state`. Each handler is checked against its own transition — returning a `ConfirmedOrder` from the `Draft` handler,\nor leaving a handler out, is a compile error — and no type assertion is needed. Pass the `…ByState` type as the type\nargument so that the handlers' parameters are typed from it:\n\n```ts\n// src/note.ts — your code\nimport { byState, ok, type Sales } from '../generated/domain/index.js';\n\nexport const changeNote: Sales.OrderCommands['changeNote'] = byState<Sales.ChangeNoteOrderByState>({\n    Draft: (order, note) => ok([{ ...order, note }, []] as const),\n    Confirmed: (order, note) => ok([{ ...order, note }, []] as const),\n});\n```\n\n(TypeScript does not narrow `S` inside a hand-written implementation of the generic contract, which is why the\nhandlers exist: written directly, the implementation needs a type assertion on its result.)\n\n### Generated code and your code\n\nThe generated files are the **contract**, your code is the **implementation**:\n\n- Generated: types only — the shapes of the model, the command signatures (`ConfirmOrder`, `OrderCommands`,\n  `ChangeNoteOrderByState`) and the constructor signatures of domain primitives (`MakeQuantity`). Invariants appear as\n  JSDoc (`@invariant`); nothing in the generated code checks them. The one exception is `_runtime.ts`, whose few\n  helpers (`ok`, `err`, `byState`) are the same for every model.\n- Yours: everything that runs — command implementations, `Make<Name>` constructors, invariant checks — in your own\n  files, which import the generated modules (never the other way round) and are type-checked against them.\n\n```ts\n// src/primitives.ts — your code\nimport { err, ok, type Sales } from '../generated/domain/index.js';\n\nexport const makeQuantity: Sales.MakeQuantity = (value) =>\n    Number.isInteger(value) && value >= 1 && value <= 999 ? ok(value as Sales.Quantity) : err({ type: 'InvalidQuantity', value, invariant: 'valid' });\n```\n\nDo not edit generated files: change the `.dt` sources and generate again. Adding properties or methods to generated\ntypes (declaration merging, editing the output) is not supported; write functions that take the generated types.\n\n### Technical metadata\n\nTechnical fields (see [Domain fields and technical fields](#domain-fields-and-technical-fields)) are added by your code,\naround the generated types. Keep the two apart in an envelope, `{ event, meta }`, rather than an intersection\n(`E & Meta`): names cannot clash, and domain and technical fields stay separate. `dt` generates no envelope type.\n\n```ts\n// src/stored.ts — your code: metadata of stored events and aggregates\nimport type { Sales } from '../generated/domain/index.js';\n\nexport interface EventMeta {\n    readonly eventId: string;\n    readonly recordedAt: Date;\n    readonly correlationId?: string;\n    readonly causationId?: string;\n}\n\n/** What Sales records in addition. */\nexport interface SalesEventMeta extends EventMeta {\n    readonly accountId: string;\n}\n\nexport type Stored<E, M extends EventMeta = EventMeta> = { readonly event: E; readonly meta: M };\n\nexport type StoredSalesEvent = Stored<Sales.PersistentEvent, SalesEventMeta>;\n\nexport interface AggregateMeta {\n    readonly version: number;\n    readonly createdAt: Date;\n    readonly updatedAt: Date;\n}\n\nexport type Versioned<A, M extends AggregateMeta = AggregateMeta> = { readonly aggregate: A; readonly meta: M };\n\nexport interface OrderRepository {\n    load(id: Sales.OrderId): Promise<Versioned<Sales.Order> | undefined>;\n    save(order: Versioned<Sales.Order>, events: readonly Sales.OrderEvent[]): Promise<void>;\n}\n```\n\nMetadata that only some kinds of event carry can be keyed by the event's `type`:\n\n```ts\n// src/meta-by-event.ts — your code\nimport type { Sales } from '../generated/domain/index.js';\nimport type { EventMeta } from './stored.js';\n\ninterface MetaByEvent {\n    OrderPlaced: { readonly channel: 'web' | 'store' };\n}\n\nexport type MetaOf<E extends { type: string }> = EventMeta & (E['type'] extends keyof MetaByEvent ? MetaByEvent[E['type']] : {});\n\n/** One envelope per kind of event, so that a union of events gives a union of envelopes. */\nexport type StoredEvent<E extends { type: string }> = E extends unknown ? { readonly event: E; readonly meta: MetaOf<E> } : never;\n\nexport const channelOf = (s: StoredEvent<Sales.OrderPlaced>): 'web' | 'store' => s.meta.channel;\nexport type StoredSalesEvents = StoredEvent<Sales.DomainEvent>;\n```\n\n### Output directories\n\nBy default every context goes to `generate.ts.out`. Contexts listed in `generate.ts.contexts` go to their own\ndirectory instead, e.g. a shared context into a package used by several applications. Each directory written to gets\nits own `_runtime.ts` and an `index.ts` re-exporting only the contexts in it; a module imports other contexts by\nrelative path (`import type * as Common from '../../packages/shared/src/generated/Common.js'`). The runtimes are\nidentical, so values typed with one are accepted where the other is expected.\n\nEach run replaces the files generated before (recognized by their header). The files written are recorded in\n`.domaintrail/generated.json` under the root, and generated files of earlier runs that are no longer written (an output\ndirectory moved, a context removed) are deleted, along with a directory left empty. Only recorded paths inside the root\nand not reached through a symlink are deleted; other entries in that file are ignored. Other files are never deleted —\nneither hand-written files nor generated files you edited — and generation stops instead of overwriting one.\n";
 
 // src/cli/main.ts
 var defaultIO = {