From 54191a699b58628e6bf0f176af27ba98f827f3da Mon Sep 17 00:00:00 2001
From: Fabian Stamm <dev@fabianstamm.de>
Date: Wed, 2 Oct 2024 18:51:24 +0200
Subject: [PATCH] Change some name visibilities

---
 grammar.js          |   15 +-
 src/grammar.json    |   16 +-
 src/node-types.json |  108 ++--
 src/parser.c        | 1168 +++++++++++++++++++++----------------------
 4 files changed, 644 insertions(+), 663 deletions(-)

diff --git a/grammar.js b/grammar.js
index 9e6e79d..c8312d9 100644
--- a/grammar.js
+++ b/grammar.js
@@ -5,7 +5,6 @@ module.exports = grammar({
   name: "jrpc",
 
   rules: {
-    // TODO: add the actual grammar rules
     document: ($) => repeat($._statement),
     _statement: ($) =>
       choice(
@@ -24,10 +23,10 @@ module.exports = grammar({
     enum_values: ($) =>
       seq(
         "{",
-        optional(seq($.enum_value, repeat(seq(",", $.enum_value)))),
+        optional(seq($._enum_value, repeat(seq(",", $._enum_value)))),
         "}",
       ),
-    enum_value: ($) =>
+    _enum_value: ($) =>
       choice($.enum_value_declaration, $.enum_value_assignment),
     enum_value_assignment: ($) => seq($.identifier, "=", $.number),
     enum_value_declaration: ($) => seq($.identifier),
@@ -73,7 +72,7 @@ module.exports = grammar({
         field("name", $.identifier),
         field("parameters", $.function_arguments),
         ":",
-        field("return_type", $.type),
+        field("return_type", $._type),
         ";",
       ),
     function_arguments: ($) =>
@@ -88,7 +87,7 @@ module.exports = grammar({
       seq(
         field("argument_identifier", $.identifier),
         ":",
-        field("argument_type", $.type),
+        field("argument_type", $._type),
       ),
 
     pair: ($) =>
@@ -96,14 +95,14 @@ module.exports = grammar({
         field("key", $.identifier),
         optional("?"),
         ":",
-        field("value", $.type),
+        field("value", $._type),
       ),
 
-    type: ($) =>
+    _type: ($) =>
       choice($.map_type, $.array_type, $.primitive_type, $.identifier),
     primitive_type: ($) => choice("int", "string", "float", "boolean", "void"),
     array_type: ($) => seq(choice($.primitive_type, $.identifier), "[]"),
-    map_type: ($) => seq("{", $.map_key_type, ",", $.type, "}"),
+    map_type: ($) => seq("{", $.map_key_type, ",", $._type, "}"),
     map_key_type: ($) => choice("int", "string"),
 
     identifier: ($) => /[a-zA-Z_][a-zA-Z_0-9]*/,
diff --git a/src/grammar.json b/src/grammar.json
index 38d3806..ca59bb6 100644
--- a/src/grammar.json
+++ b/src/grammar.json
@@ -140,7 +140,7 @@
               "members": [
                 {
                   "type": "SYMBOL",
-                  "name": "enum_value"
+                  "name": "_enum_value"
                 },
                 {
                   "type": "REPEAT",
@@ -153,7 +153,7 @@
                       },
                       {
                         "type": "SYMBOL",
-                        "name": "enum_value"
+                        "name": "_enum_value"
                       }
                     ]
                   }
@@ -171,7 +171,7 @@
         }
       ]
     },
-    "enum_value": {
+    "_enum_value": {
       "type": "CHOICE",
       "members": [
         {
@@ -451,7 +451,7 @@
           "name": "return_type",
           "content": {
             "type": "SYMBOL",
-            "name": "type"
+            "name": "_type"
           }
         },
         {
@@ -526,7 +526,7 @@
           "name": "argument_type",
           "content": {
             "type": "SYMBOL",
-            "name": "type"
+            "name": "_type"
           }
         }
       ]
@@ -563,12 +563,12 @@
           "name": "value",
           "content": {
             "type": "SYMBOL",
-            "name": "type"
+            "name": "_type"
           }
         }
       ]
     },
-    "type": {
+    "_type": {
       "type": "CHOICE",
       "members": [
         {
@@ -653,7 +653,7 @@
         },
         {
           "type": "SYMBOL",
-          "name": "type"
+          "name": "_type"
         },
         {
           "type": "STRING",
diff --git a/src/node-types.json b/src/node-types.json
index 7c5e2ec..db0e13f 100644
--- a/src/node-types.json
+++ b/src/node-types.json
@@ -132,25 +132,6 @@
       ]
     }
   },
-  {
-    "type": "enum_value",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "enum_value_assignment",
-          "named": true
-        },
-        {
-          "type": "enum_value_declaration",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "enum_value_assignment",
     "named": true,
@@ -194,7 +175,11 @@
       "required": false,
       "types": [
         {
-          "type": "enum_value",
+          "type": "enum_value_assignment",
+          "named": true
+        },
+        {
+          "type": "enum_value_declaration",
           "named": true
         }
       ]
@@ -219,7 +204,19 @@
         "required": true,
         "types": [
           {
-            "type": "type",
+            "type": "array_type",
+            "named": true
+          },
+          {
+            "type": "identifier",
+            "named": true
+          },
+          {
+            "type": "map_type",
+            "named": true
+          },
+          {
+            "type": "primitive_type",
             "named": true
           }
         ]
@@ -288,12 +285,24 @@
       "multiple": true,
       "required": true,
       "types": [
+        {
+          "type": "array_type",
+          "named": true
+        },
+        {
+          "type": "identifier",
+          "named": true
+        },
         {
           "type": "map_key_type",
           "named": true
         },
         {
-          "type": "type",
+          "type": "map_type",
+          "named": true
+        },
+        {
+          "type": "primitive_type",
           "named": true
         }
       ]
@@ -318,7 +327,19 @@
         "required": true,
         "types": [
           {
-            "type": "type",
+            "type": "array_type",
+            "named": true
+          },
+          {
+            "type": "identifier",
+            "named": true
+          },
+          {
+            "type": "map_type",
+            "named": true
+          },
+          {
+            "type": "primitive_type",
             "named": true
           }
         ]
@@ -378,7 +399,19 @@
         "required": true,
         "types": [
           {
-            "type": "type",
+            "type": "array_type",
+            "named": true
+          },
+          {
+            "type": "identifier",
+            "named": true
+          },
+          {
+            "type": "map_type",
+            "named": true
+          },
+          {
+            "type": "primitive_type",
             "named": true
           }
         ]
@@ -453,33 +486,6 @@
       ]
     }
   },
-  {
-    "type": "type",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "array_type",
-          "named": true
-        },
-        {
-          "type": "identifier",
-          "named": true
-        },
-        {
-          "type": "map_type",
-          "named": true
-        },
-        {
-          "type": "primitive_type",
-          "named": true
-        }
-      ]
-    }
-  },
   {
     "type": "type_declaration",
     "named": true,
diff --git a/src/parser.c b/src/parser.c
index ba8c7d4..c40b00d 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -5,7 +5,7 @@
 #endif
 
 #define LANGUAGE_VERSION 14
-#define STATE_COUNT 105
+#define STATE_COUNT 103
 #define LARGE_STATE_COUNT 2
 #define SYMBOL_COUNT 63
 #define ALIAS_COUNT 0
@@ -50,7 +50,7 @@ enum ts_symbol_identifiers {
   sym_attribute = 32,
   sym_enum_declaration = 33,
   sym_enum_values = 34,
-  sym_enum_value = 35,
+  sym__enum_value = 35,
   sym_enum_value_assignment = 36,
   sym_enum_value_declaration = 37,
   sym_define_declaration = 38,
@@ -64,7 +64,7 @@ enum ts_symbol_identifiers {
   sym_function_arguments = 46,
   sym_function_argument = 47,
   sym_pair = 48,
-  sym_type = 49,
+  sym__type = 49,
   sym_primitive_type = 50,
   sym_array_type = 51,
   sym_map_type = 52,
@@ -116,7 +116,7 @@ static const char * const ts_symbol_names[] = {
   [sym_attribute] = "attribute",
   [sym_enum_declaration] = "enum_declaration",
   [sym_enum_values] = "enum_values",
-  [sym_enum_value] = "enum_value",
+  [sym__enum_value] = "_enum_value",
   [sym_enum_value_assignment] = "enum_value_assignment",
   [sym_enum_value_declaration] = "enum_value_declaration",
   [sym_define_declaration] = "define_declaration",
@@ -130,7 +130,7 @@ static const char * const ts_symbol_names[] = {
   [sym_function_arguments] = "function_arguments",
   [sym_function_argument] = "function_argument",
   [sym_pair] = "pair",
-  [sym_type] = "type",
+  [sym__type] = "_type",
   [sym_primitive_type] = "primitive_type",
   [sym_array_type] = "array_type",
   [sym_map_type] = "map_type",
@@ -182,7 +182,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_attribute] = sym_attribute,
   [sym_enum_declaration] = sym_enum_declaration,
   [sym_enum_values] = sym_enum_values,
-  [sym_enum_value] = sym_enum_value,
+  [sym__enum_value] = sym__enum_value,
   [sym_enum_value_assignment] = sym_enum_value_assignment,
   [sym_enum_value_declaration] = sym_enum_value_declaration,
   [sym_define_declaration] = sym_define_declaration,
@@ -196,7 +196,7 @@ static const TSSymbol ts_symbol_map[] = {
   [sym_function_arguments] = sym_function_arguments,
   [sym_function_argument] = sym_function_argument,
   [sym_pair] = sym_pair,
-  [sym_type] = sym_type,
+  [sym__type] = sym__type,
   [sym_primitive_type] = sym_primitive_type,
   [sym_array_type] = sym_array_type,
   [sym_map_type] = sym_map_type,
@@ -353,8 +353,8 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [sym_enum_value] = {
-    .visible = true,
+  [sym__enum_value] = {
+    .visible = false,
     .named = true,
   },
   [sym_enum_value_assignment] = {
@@ -409,8 +409,8 @@ static const TSSymbolMetadata ts_symbol_metadata[] = {
     .visible = true,
     .named = true,
   },
-  [sym_type] = {
-    .visible = true,
+  [sym__type] = {
+    .visible = false,
     .named = true,
   },
   [sym_primitive_type] = {
@@ -627,8 +627,6 @@ static const TSStateId ts_primary_state_ids[STATE_COUNT] = {
   [100] = 100,
   [101] = 101,
   [102] = 102,
-  [103] = 103,
-  [104] = 104,
 };
 
 static bool ts_lex(TSLexer *lexer, TSStateId state) {
@@ -1337,51 +1335,51 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [24] = {.lex_state = 0},
   [25] = {.lex_state = 0},
   [26] = {.lex_state = 0},
-  [27] = {.lex_state = 4},
-  [28] = {.lex_state = 2},
+  [27] = {.lex_state = 2},
+  [28] = {.lex_state = 0},
   [29] = {.lex_state = 2},
-  [30] = {.lex_state = 2},
+  [30] = {.lex_state = 0},
   [31] = {.lex_state = 2},
-  [32] = {.lex_state = 0},
-  [33] = {.lex_state = 0},
+  [32] = {.lex_state = 2},
+  [33] = {.lex_state = 4},
   [34] = {.lex_state = 1},
   [35] = {.lex_state = 1},
-  [36] = {.lex_state = 1},
+  [36] = {.lex_state = 4},
   [37] = {.lex_state = 2},
-  [38] = {.lex_state = 4},
-  [39] = {.lex_state = 0},
+  [38] = {.lex_state = 2},
+  [39] = {.lex_state = 1},
   [40] = {.lex_state = 0},
-  [41] = {.lex_state = 0},
+  [41] = {.lex_state = 4},
   [42] = {.lex_state = 4},
-  [43] = {.lex_state = 4},
-  [44] = {.lex_state = 2},
+  [43] = {.lex_state = 0},
+  [44] = {.lex_state = 0},
   [45] = {.lex_state = 0},
   [46] = {.lex_state = 0},
-  [47] = {.lex_state = 0},
-  [48] = {.lex_state = 4},
+  [47] = {.lex_state = 4},
+  [48] = {.lex_state = 0},
   [49] = {.lex_state = 0},
-  [50] = {.lex_state = 0},
+  [50] = {.lex_state = 4},
   [51] = {.lex_state = 0},
-  [52] = {.lex_state = 4},
-  [53] = {.lex_state = 0},
-  [54] = {.lex_state = 2},
-  [55] = {.lex_state = 0},
-  [56] = {.lex_state = 4},
-  [57] = {.lex_state = 2},
+  [52] = {.lex_state = 0},
+  [53] = {.lex_state = 2},
+  [54] = {.lex_state = 4},
+  [55] = {.lex_state = 2},
+  [56] = {.lex_state = 0},
+  [57] = {.lex_state = 0},
   [58] = {.lex_state = 0},
   [59] = {.lex_state = 0},
   [60] = {.lex_state = 0},
-  [61] = {.lex_state = 0},
+  [61] = {.lex_state = 4},
   [62] = {.lex_state = 0},
-  [63] = {.lex_state = 4},
+  [63] = {.lex_state = 0},
   [64] = {.lex_state = 0},
   [65] = {.lex_state = 0},
-  [66] = {.lex_state = 2},
-  [67] = {.lex_state = 2},
+  [66] = {.lex_state = 0},
+  [67] = {.lex_state = 0},
   [68] = {.lex_state = 0},
   [69] = {.lex_state = 0},
   [70] = {.lex_state = 0},
-  [71] = {.lex_state = 0},
+  [71] = {.lex_state = 2},
   [72] = {.lex_state = 0},
   [73] = {.lex_state = 0},
   [74] = {.lex_state = 0},
@@ -1391,30 +1389,28 @@ static const TSLexMode ts_lex_modes[STATE_COUNT] = {
   [78] = {.lex_state = 0},
   [79] = {.lex_state = 0},
   [80] = {.lex_state = 0},
-  [81] = {.lex_state = 0},
+  [81] = {.lex_state = 2},
   [82] = {.lex_state = 0},
   [83] = {.lex_state = 0},
   [84] = {.lex_state = 2},
   [85] = {.lex_state = 0},
   [86] = {.lex_state = 2},
-  [87] = {.lex_state = 0},
-  [88] = {.lex_state = 2},
+  [87] = {.lex_state = 2},
+  [88] = {.lex_state = 0},
   [89] = {.lex_state = 0},
   [90] = {.lex_state = 0},
-  [91] = {.lex_state = 2},
+  [91] = {.lex_state = 0},
   [92] = {.lex_state = 0},
   [93] = {.lex_state = 0},
-  [94] = {.lex_state = 0},
+  [94] = {.lex_state = 2},
   [95] = {.lex_state = 0},
   [96] = {.lex_state = 0},
-  [97] = {.lex_state = 0},
+  [97] = {.lex_state = 2},
   [98] = {.lex_state = 0},
-  [99] = {.lex_state = 2},
+  [99] = {.lex_state = 0},
   [100] = {.lex_state = 0},
   [101] = {.lex_state = 0},
-  [102] = {.lex_state = 0},
-  [103] = {.lex_state = 0},
-  [104] = {.lex_state = 2},
+  [102] = {.lex_state = 2},
 };
 
 static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
@@ -1447,7 +1443,7 @@ static const uint16_t ts_parse_table[LARGE_STATE_COUNT][SYMBOL_COUNT] = {
     [sym_number] = ACTIONS(1),
   },
   [1] = {
-    [sym_document] = STATE(85),
+    [sym_document] = STATE(82),
     [sym__statement] = STATE(2),
     [sym_type_declaration] = STATE(2),
     [sym_enum_declaration] = STATE(2),
@@ -1507,16 +1503,15 @@ static const uint16_t ts_small_parse_table[] = {
       sym_import_declaration,
       sym_service_declaration,
       aux_sym_document_repeat1,
-  [56] = 6,
+  [56] = 5,
     ACTIONS(34), 1,
       anon_sym_LBRACE,
     ACTIONS(38), 1,
       sym_identifier,
-    STATE(32), 1,
+    STATE(28), 1,
       sym_primitive_type,
-    STATE(92), 1,
-      sym_type,
-    STATE(39), 2,
+    STATE(89), 3,
+      sym__type,
       sym_array_type,
       sym_map_type,
     ACTIONS(36), 5,
@@ -1525,16 +1520,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_boolean,
       anon_sym_void,
-  [80] = 6,
+  [78] = 5,
     ACTIONS(34), 1,
       anon_sym_LBRACE,
     ACTIONS(38), 1,
       sym_identifier,
-    STATE(32), 1,
+    STATE(28), 1,
       sym_primitive_type,
-    STATE(87), 1,
-      sym_type,
-    STATE(39), 2,
+    STATE(85), 3,
+      sym__type,
       sym_array_type,
       sym_map_type,
     ACTIONS(36), 5,
@@ -1543,16 +1537,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_boolean,
       anon_sym_void,
-  [104] = 6,
+  [100] = 5,
     ACTIONS(34), 1,
       anon_sym_LBRACE,
     ACTIONS(38), 1,
       sym_identifier,
-    STATE(32), 1,
+    STATE(28), 1,
       sym_primitive_type,
-    STATE(100), 1,
-      sym_type,
-    STATE(39), 2,
+    STATE(98), 3,
+      sym__type,
       sym_array_type,
       sym_map_type,
     ACTIONS(36), 5,
@@ -1561,16 +1554,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_boolean,
       anon_sym_void,
-  [128] = 6,
+  [122] = 5,
     ACTIONS(34), 1,
       anon_sym_LBRACE,
     ACTIONS(38), 1,
       sym_identifier,
-    STATE(32), 1,
+    STATE(28), 1,
       sym_primitive_type,
-    STATE(76), 1,
-      sym_type,
-    STATE(39), 2,
+    STATE(75), 3,
+      sym__type,
       sym_array_type,
       sym_map_type,
     ACTIONS(36), 5,
@@ -1579,16 +1571,15 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_boolean,
       anon_sym_void,
-  [152] = 6,
+  [144] = 5,
     ACTIONS(34), 1,
       anon_sym_LBRACE,
     ACTIONS(38), 1,
       sym_identifier,
-    STATE(32), 1,
+    STATE(28), 1,
       sym_primitive_type,
-    STATE(90), 1,
-      sym_type,
-    STATE(39), 2,
+    STATE(88), 3,
+      sym__type,
       sym_array_type,
       sym_map_type,
     ACTIONS(36), 5,
@@ -1597,7 +1588,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_float,
       anon_sym_boolean,
       anon_sym_void,
-  [176] = 6,
+  [166] = 6,
     ACTIONS(40), 1,
       anon_sym_RBRACE,
     ACTIONS(42), 1,
@@ -1613,7 +1604,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_service_notification,
       sym_service_function,
       aux_sym_service_functions_repeat2,
-  [198] = 6,
+  [188] = 6,
     ACTIONS(48), 1,
       anon_sym_RBRACE,
     ACTIONS(50), 1,
@@ -1629,7 +1620,7 @@ static const uint16_t ts_small_parse_table[] = {
       sym_service_notification,
       sym_service_function,
       aux_sym_service_functions_repeat2,
-  [220] = 6,
+  [210] = 6,
     ACTIONS(42), 1,
       anon_sym_AT,
     ACTIONS(44), 1,
@@ -1645,10 +1636,10 @@ static const uint16_t ts_small_parse_table[] = {
       sym_service_notification,
       sym_service_function,
       aux_sym_service_functions_repeat2,
-  [242] = 3,
+  [232] = 3,
     ACTIONS(63), 1,
       anon_sym_LBRACE,
-    STATE(16), 1,
+    STATE(18), 1,
       sym_attributes,
     ACTIONS(61), 6,
       ts_builtin_sym_end,
@@ -1657,20 +1648,20 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [257] = 5,
+  [247] = 5,
     ACTIONS(42), 1,
       anon_sym_AT,
     ACTIONS(44), 1,
       anon_sym_notification,
     ACTIONS(46), 1,
       sym_identifier,
-    STATE(27), 2,
+    STATE(33), 2,
       sym_function_decorator,
       aux_sym_service_functions_repeat1,
-    STATE(38), 2,
+    STATE(36), 2,
       sym_service_notification,
       sym_service_function,
-  [275] = 1,
+  [265] = 1,
     ACTIONS(65), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1678,7 +1669,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [284] = 1,
+  [274] = 1,
     ACTIONS(67), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1686,7 +1677,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [293] = 1,
+  [283] = 1,
     ACTIONS(69), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1694,7 +1685,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [302] = 1,
+  [292] = 1,
     ACTIONS(71), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1702,7 +1693,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [311] = 1,
+  [301] = 1,
     ACTIONS(73), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1710,7 +1701,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [320] = 1,
+  [310] = 1,
     ACTIONS(75), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1718,7 +1709,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [329] = 1,
+  [319] = 1,
     ACTIONS(77), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1726,7 +1717,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [338] = 1,
+  [328] = 1,
     ACTIONS(79), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1734,7 +1725,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [347] = 1,
+  [337] = 1,
     ACTIONS(81), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1742,7 +1733,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [356] = 1,
+  [346] = 1,
     ACTIONS(83), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1750,7 +1741,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [365] = 1,
+  [355] = 1,
     ACTIONS(85), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1758,7 +1749,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [374] = 1,
+  [364] = 1,
     ACTIONS(87), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1766,7 +1757,7 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [383] = 1,
+  [373] = 1,
     ACTIONS(89), 6,
       ts_builtin_sym_end,
       anon_sym_type,
@@ -1774,427 +1765,415 @@ static const uint16_t ts_small_parse_table[] = {
       anon_sym_define,
       anon_sym_import,
       anon_sym_service,
-  [392] = 3,
+  [382] = 3,
     ACTIONS(91), 1,
-      anon_sym_AT,
-    ACTIONS(94), 2,
-      anon_sym_notification,
-      sym_identifier,
-    STATE(27), 2,
-      sym_function_decorator,
-      aux_sym_service_functions_repeat1,
-  [404] = 4,
-    ACTIONS(96), 1,
       anon_sym_RBRACE,
-    ACTIONS(98), 1,
+    ACTIONS(93), 1,
       sym_identifier,
-    STATE(102), 1,
-      sym_pair,
-    STATE(28), 2,
-      sym_attribute,
-      aux_sym_attributes_repeat1,
-  [418] = 4,
-    ACTIONS(101), 1,
-      anon_sym_RBRACE,
-    ACTIONS(103), 1,
-      sym_identifier,
-    STATE(61), 1,
-      sym_enum_value,
-    STATE(75), 2,
+    STATE(57), 3,
+      sym__enum_value,
       sym_enum_value_assignment,
       sym_enum_value_declaration,
-  [432] = 4,
-    ACTIONS(105), 1,
-      anon_sym_RBRACE,
-    ACTIONS(107), 1,
-      sym_identifier,
-    STATE(102), 1,
-      sym_pair,
-    STATE(28), 2,
-      sym_attribute,
-      aux_sym_attributes_repeat1,
-  [446] = 4,
-    ACTIONS(107), 1,
-      sym_identifier,
-    ACTIONS(109), 1,
-      anon_sym_RBRACE,
-    STATE(102), 1,
-      sym_pair,
-    STATE(30), 2,
-      sym_attribute,
-      aux_sym_attributes_repeat1,
-  [460] = 2,
-    ACTIONS(113), 1,
+  [394] = 2,
+    ACTIONS(97), 1,
       anon_sym_LBRACK_RBRACK,
-    ACTIONS(111), 4,
+    ACTIONS(95), 4,
       anon_sym_RBRACE,
       anon_sym_SEMI,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [470] = 1,
-    ACTIONS(115), 5,
+  [404] = 4,
+    ACTIONS(99), 1,
+      anon_sym_RBRACE,
+    ACTIONS(101), 1,
+      sym_identifier,
+    STATE(93), 1,
+      sym_pair,
+    STATE(29), 2,
+      sym_attribute,
+      aux_sym_attributes_repeat1,
+  [418] = 1,
+    ACTIONS(104), 5,
       anon_sym_RBRACE,
       anon_sym_SEMI,
       anon_sym_COMMA,
       anon_sym_RPAREN,
       anon_sym_LBRACK_RBRACK,
-  [478] = 3,
+  [426] = 4,
+    ACTIONS(106), 1,
+      anon_sym_RBRACE,
+    ACTIONS(108), 1,
+      sym_identifier,
+    STATE(93), 1,
+      sym_pair,
+    STATE(32), 2,
+      sym_attribute,
+      aux_sym_attributes_repeat1,
+  [440] = 4,
+    ACTIONS(108), 1,
+      sym_identifier,
+    ACTIONS(110), 1,
+      anon_sym_RBRACE,
+    STATE(93), 1,
+      sym_pair,
+    STATE(29), 2,
+      sym_attribute,
+      aux_sym_attributes_repeat1,
+  [454] = 3,
+    ACTIONS(112), 1,
+      anon_sym_AT,
+    ACTIONS(115), 2,
+      anon_sym_notification,
+      sym_identifier,
+    STATE(33), 2,
+      sym_function_decorator,
+      aux_sym_service_functions_repeat1,
+  [466] = 3,
     ACTIONS(117), 1,
       anon_sym_DQUOTE,
-    STATE(36), 1,
+    STATE(35), 1,
       aux_sym__string_content,
     ACTIONS(119), 2,
       sym_string_content,
       sym_escape_sequence,
-  [489] = 3,
+  [477] = 3,
     ACTIONS(121), 1,
       anon_sym_DQUOTE,
-    STATE(34), 1,
+    STATE(35), 1,
       aux_sym__string_content,
     ACTIONS(123), 2,
       sym_string_content,
       sym_escape_sequence,
-  [500] = 3,
-    ACTIONS(125), 1,
-      anon_sym_DQUOTE,
-    STATE(36), 1,
-      aux_sym__string_content,
-    ACTIONS(127), 2,
-      sym_string_content,
-      sym_escape_sequence,
-  [511] = 4,
-    ACTIONS(107), 1,
-      sym_identifier,
-    ACTIONS(130), 1,
-      anon_sym_RBRACE,
-    STATE(31), 1,
-      sym_attribute,
-    STATE(102), 1,
-      sym_pair,
-  [524] = 2,
+  [488] = 2,
     ACTIONS(48), 2,
       anon_sym_RBRACE,
       anon_sym_AT,
-    ACTIONS(132), 2,
+    ACTIONS(126), 2,
       anon_sym_notification,
       sym_identifier,
-  [533] = 1,
-    ACTIONS(111), 4,
+  [497] = 4,
+    ACTIONS(108), 1,
+      sym_identifier,
+    ACTIONS(128), 1,
       anon_sym_RBRACE,
-      anon_sym_SEMI,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [540] = 1,
+    STATE(31), 1,
+      sym_attribute,
+    STATE(93), 1,
+      sym_pair,
+  [510] = 2,
+    ACTIONS(93), 1,
+      sym_identifier,
+    STATE(70), 3,
+      sym__enum_value,
+      sym_enum_value_assignment,
+      sym_enum_value_declaration,
+  [519] = 3,
+    ACTIONS(130), 1,
+      anon_sym_DQUOTE,
+    STATE(34), 1,
+      aux_sym__string_content,
+    ACTIONS(132), 2,
+      sym_string_content,
+      sym_escape_sequence,
+  [530] = 1,
     ACTIONS(134), 4,
       anon_sym_RBRACE,
       anon_sym_SEMI,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [547] = 1,
-    ACTIONS(136), 4,
+  [537] = 2,
+    ACTIONS(136), 2,
+      anon_sym_RBRACE,
+      anon_sym_AT,
+    ACTIONS(138), 2,
+      anon_sym_notification,
+      sym_identifier,
+  [546] = 2,
+    ACTIONS(140), 2,
+      anon_sym_RBRACE,
+      anon_sym_AT,
+    ACTIONS(142), 2,
+      anon_sym_notification,
+      sym_identifier,
+  [555] = 1,
+    ACTIONS(144), 4,
       anon_sym_RBRACE,
       anon_sym_SEMI,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [554] = 2,
-    ACTIONS(138), 2,
-      anon_sym_RBRACE,
-      anon_sym_AT,
-    ACTIONS(140), 2,
-      anon_sym_notification,
-      sym_identifier,
-  [563] = 2,
-    ACTIONS(142), 2,
-      anon_sym_RBRACE,
-      anon_sym_AT,
-    ACTIONS(144), 2,
-      anon_sym_notification,
-      sym_identifier,
-  [572] = 3,
-    ACTIONS(103), 1,
-      sym_identifier,
-    STATE(72), 1,
-      sym_enum_value,
-    STATE(75), 2,
-      sym_enum_value_assignment,
-      sym_enum_value_declaration,
-  [583] = 3,
+  [562] = 3,
     ACTIONS(146), 1,
-      anon_sym_COMMA,
+      anon_sym_RBRACE,
     ACTIONS(148), 1,
-      anon_sym_RPAREN,
-    STATE(53), 1,
-      aux_sym_function_arguments_repeat1,
-  [593] = 3,
+      anon_sym_COMMA,
+    STATE(62), 1,
+      aux_sym_enum_values_repeat1,
+  [572] = 3,
     ACTIONS(150), 1,
       anon_sym_RPAREN,
     ACTIONS(152), 1,
       anon_sym_DQUOTE,
-    STATE(55), 1,
+    STATE(52), 1,
       sym_string,
-  [603] = 3,
+  [582] = 3,
     ACTIONS(154), 1,
       anon_sym_COMMA,
     ACTIONS(157), 1,
       anon_sym_RPAREN,
-    STATE(47), 1,
+    STATE(46), 1,
       aux_sym_decorator_arguments_repeat1,
-  [613] = 2,
+  [592] = 2,
     ACTIONS(159), 1,
       anon_sym_AT,
     ACTIONS(161), 2,
       anon_sym_notification,
       sym_identifier,
-  [621] = 3,
+  [600] = 3,
     ACTIONS(163), 1,
       anon_sym_COMMA,
     ACTIONS(166), 1,
       anon_sym_RPAREN,
-    STATE(49), 1,
+    STATE(48), 1,
       aux_sym_function_arguments_repeat1,
-  [631] = 3,
+  [610] = 3,
     ACTIONS(168), 1,
       anon_sym_COMMA,
     ACTIONS(170), 1,
       anon_sym_RPAREN,
-    STATE(47), 1,
+    STATE(46), 1,
       aux_sym_decorator_arguments_repeat1,
-  [641] = 3,
+  [620] = 2,
     ACTIONS(172), 1,
-      anon_sym_RBRACE,
-    ACTIONS(174), 1,
-      anon_sym_COMMA,
-    STATE(64), 1,
-      aux_sym_enum_values_repeat1,
-  [651] = 2,
-    ACTIONS(176), 1,
       anon_sym_AT,
-    ACTIONS(178), 2,
+    ACTIONS(174), 2,
       anon_sym_notification,
       sym_identifier,
-  [659] = 3,
-    ACTIONS(146), 1,
+  [628] = 3,
+    ACTIONS(176), 1,
+      anon_sym_COMMA,
+    ACTIONS(178), 1,
+      anon_sym_RPAREN,
+    STATE(48), 1,
+      aux_sym_function_arguments_repeat1,
+  [638] = 3,
+    ACTIONS(168), 1,
       anon_sym_COMMA,
     ACTIONS(180), 1,
       anon_sym_RPAREN,
     STATE(49), 1,
-      aux_sym_function_arguments_repeat1,
-  [669] = 3,
+      aux_sym_decorator_arguments_repeat1,
+  [648] = 3,
     ACTIONS(182), 1,
       anon_sym_RPAREN,
     ACTIONS(184), 1,
       sym_identifier,
-    STATE(45), 1,
+    STATE(60), 1,
       sym_function_argument,
-  [679] = 3,
-    ACTIONS(168), 1,
-      anon_sym_COMMA,
+  [658] = 2,
     ACTIONS(186), 1,
-      anon_sym_RPAREN,
-    STATE(50), 1,
-      aux_sym_decorator_arguments_repeat1,
-  [689] = 2,
-    ACTIONS(188), 1,
       anon_sym_AT,
-    ACTIONS(190), 2,
+    ACTIONS(188), 2,
       anon_sym_notification,
       sym_identifier,
-  [697] = 3,
+  [666] = 3,
     ACTIONS(152), 1,
       anon_sym_DQUOTE,
-    ACTIONS(192), 1,
+    ACTIONS(190), 1,
       sym_identifier,
     STATE(101), 1,
       sym_string,
-  [707] = 1,
-    ACTIONS(194), 3,
+  [676] = 1,
+    ACTIONS(192), 3,
       anon_sym_SEMI,
       anon_sym_COMMA,
       anon_sym_RPAREN,
-  [713] = 1,
-    ACTIONS(196), 3,
-      anon_sym_SEMI,
+  [682] = 3,
+    ACTIONS(148), 1,
       anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [719] = 2,
-    STATE(93), 1,
+    ACTIONS(194), 1,
+      anon_sym_RBRACE,
+    STATE(44), 1,
+      aux_sym_enum_values_repeat1,
+  [692] = 2,
+    ACTIONS(198), 1,
+      anon_sym_EQ,
+    ACTIONS(196), 2,
+      anon_sym_RBRACE,
+      anon_sym_COMMA,
+  [700] = 2,
+    STATE(90), 1,
       sym_map_key_type,
-    ACTIONS(198), 2,
+    ACTIONS(200), 2,
       anon_sym_int,
       anon_sym_string,
-  [727] = 3,
-    ACTIONS(174), 1,
+  [708] = 3,
+    ACTIONS(176), 1,
       anon_sym_COMMA,
-    ACTIONS(200), 1,
-      anon_sym_RBRACE,
+    ACTIONS(202), 1,
+      anon_sym_RPAREN,
     STATE(51), 1,
-      aux_sym_enum_values_repeat1,
-  [737] = 2,
+      aux_sym_function_arguments_repeat1,
+  [718] = 2,
     ACTIONS(204), 1,
-      anon_sym_EQ,
-    ACTIONS(202), 2,
-      anon_sym_RBRACE,
-      anon_sym_COMMA,
-  [745] = 2,
-    ACTIONS(206), 1,
       anon_sym_AT,
-    ACTIONS(208), 2,
+    ACTIONS(206), 2,
       anon_sym_notification,
       sym_identifier,
-  [753] = 3,
-    ACTIONS(210), 1,
+  [726] = 3,
+    ACTIONS(208), 1,
       anon_sym_RBRACE,
-    ACTIONS(212), 1,
+    ACTIONS(210), 1,
       anon_sym_COMMA,
-    STATE(64), 1,
+    STATE(62), 1,
       aux_sym_enum_values_repeat1,
-  [763] = 1,
+  [736] = 1,
+    ACTIONS(213), 3,
+      anon_sym_SEMI,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [742] = 1,
     ACTIONS(215), 2,
       anon_sym_SEMI,
       anon_sym_COLON,
-  [768] = 2,
+  [747] = 2,
+    ACTIONS(217), 1,
+      anon_sym_COLON,
+    ACTIONS(219), 1,
+      anon_sym_QMARK,
+  [754] = 2,
+    ACTIONS(221), 1,
+      anon_sym_LPAREN,
+    STATE(83), 1,
+      sym_function_arguments,
+  [761] = 1,
+    ACTIONS(157), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [766] = 2,
+    ACTIONS(223), 1,
+      anon_sym_LBRACE,
+    STATE(22), 1,
+      sym_service_functions,
+  [773] = 1,
+    ACTIONS(225), 2,
+      anon_sym_RBRACE,
+      anon_sym_COMMA,
+  [778] = 1,
+    ACTIONS(208), 2,
+      anon_sym_RBRACE,
+      anon_sym_COMMA,
+  [783] = 1,
+    ACTIONS(227), 2,
+      anon_sym_RBRACE,
+      sym_identifier,
+  [788] = 1,
+    ACTIONS(229), 2,
+      anon_sym_SEMI,
+      anon_sym_COLON,
+  [793] = 1,
+    ACTIONS(231), 2,
+      anon_sym_SEMI,
+      anon_sym_COLON,
+  [798] = 1,
+    ACTIONS(166), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [803] = 1,
+    ACTIONS(233), 2,
+      anon_sym_COMMA,
+      anon_sym_RPAREN,
+  [808] = 2,
+    ACTIONS(235), 1,
+      anon_sym_LPAREN,
+    STATE(61), 1,
+      sym_decorator_arguments,
+  [815] = 2,
+    ACTIONS(152), 1,
+      anon_sym_DQUOTE,
+    STATE(67), 1,
+      sym_string,
+  [822] = 2,
+    ACTIONS(152), 1,
+      anon_sym_DQUOTE,
+    STATE(99), 1,
+      sym_string,
+  [829] = 2,
+    ACTIONS(237), 1,
+      anon_sym_LBRACE,
+    STATE(19), 1,
+      sym_enum_values,
+  [836] = 2,
+    ACTIONS(221), 1,
+      anon_sym_LPAREN,
+    STATE(96), 1,
+      sym_function_arguments,
+  [843] = 2,
     ACTIONS(184), 1,
       sym_identifier,
     STATE(74), 1,
       sym_function_argument,
-  [775] = 1,
-    ACTIONS(217), 2,
-      anon_sym_RBRACE,
-      sym_identifier,
-  [780] = 1,
-    ACTIONS(157), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [785] = 2,
-    ACTIONS(219), 1,
-      anon_sym_COLON,
-    ACTIONS(221), 1,
-      anon_sym_QMARK,
-  [792] = 1,
-    ACTIONS(223), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON,
-  [797] = 1,
-    ACTIONS(225), 2,
-      anon_sym_RBRACE,
-      anon_sym_COMMA,
-  [802] = 1,
-    ACTIONS(210), 2,
-      anon_sym_RBRACE,
-      anon_sym_COMMA,
-  [807] = 2,
-    ACTIONS(227), 1,
-      anon_sym_LBRACE,
-    STATE(21), 1,
-      sym_service_functions,
-  [814] = 1,
-    ACTIONS(166), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [819] = 1,
-    ACTIONS(229), 2,
-      anon_sym_RBRACE,
-      anon_sym_COMMA,
-  [824] = 1,
-    ACTIONS(231), 2,
-      anon_sym_COMMA,
-      anon_sym_RPAREN,
-  [829] = 2,
-    ACTIONS(233), 1,
-      anon_sym_LPAREN,
-    STATE(63), 1,
-      sym_decorator_arguments,
-  [836] = 2,
-    ACTIONS(235), 1,
-      anon_sym_LPAREN,
-    STATE(89), 1,
-      sym_function_arguments,
-  [843] = 2,
-    ACTIONS(235), 1,
-      anon_sym_LPAREN,
-    STATE(97), 1,
-      sym_function_arguments,
-  [850] = 2,
-    ACTIONS(152), 1,
-      anon_sym_DQUOTE,
-    STATE(68), 1,
-      sym_string,
-  [857] = 2,
-    ACTIONS(237), 1,
-      anon_sym_LBRACE,
-    STATE(17), 1,
-      sym_enum_values,
-  [864] = 2,
-    ACTIONS(152), 1,
-      anon_sym_DQUOTE,
-    STATE(95), 1,
-      sym_string,
-  [871] = 1,
-    ACTIONS(239), 2,
-      anon_sym_SEMI,
-      anon_sym_COLON,
-  [876] = 1,
-    ACTIONS(241), 1,
-      sym_identifier,
-  [880] = 1,
-    ACTIONS(243), 1,
+  [850] = 1,
+    ACTIONS(239), 1,
       ts_builtin_sym_end,
-  [884] = 1,
-    ACTIONS(245), 1,
+  [854] = 1,
+    ACTIONS(241), 1,
+      anon_sym_COLON,
+  [858] = 1,
+    ACTIONS(243), 1,
       sym_identifier,
-  [888] = 1,
-    ACTIONS(247), 1,
+  [862] = 1,
+    ACTIONS(245), 1,
       anon_sym_SEMI,
-  [892] = 1,
+  [866] = 1,
+    ACTIONS(247), 1,
+      sym_identifier,
+  [870] = 1,
     ACTIONS(249), 1,
       sym_identifier,
-  [896] = 1,
+  [874] = 1,
     ACTIONS(251), 1,
-      anon_sym_COLON,
-  [900] = 1,
+      anon_sym_SEMI,
+  [878] = 1,
     ACTIONS(253), 1,
       anon_sym_SEMI,
-  [904] = 1,
+  [882] = 1,
     ACTIONS(255), 1,
-      sym_identifier,
-  [908] = 1,
+      anon_sym_COMMA,
+  [886] = 1,
     ACTIONS(257), 1,
-      anon_sym_SEMI,
-  [912] = 1,
+      anon_sym_COMMA,
+  [890] = 1,
     ACTIONS(259), 1,
-      anon_sym_COMMA,
-  [916] = 1,
+      sym_number,
+  [894] = 1,
     ACTIONS(261), 1,
-      anon_sym_COMMA,
-  [920] = 1,
-    ACTIONS(263), 1,
       anon_sym_SEMI,
-  [924] = 1,
+  [898] = 1,
+    ACTIONS(263), 1,
+      sym_identifier,
+  [902] = 1,
     ACTIONS(265), 1,
       anon_sym_COLON,
-  [928] = 1,
+  [906] = 1,
     ACTIONS(267), 1,
       anon_sym_SEMI,
-  [932] = 1,
+  [910] = 1,
     ACTIONS(269), 1,
-      sym_number,
-  [936] = 1,
-    ACTIONS(271), 1,
       sym_identifier,
-  [940] = 1,
-    ACTIONS(273), 1,
+  [914] = 1,
+    ACTIONS(271), 1,
       anon_sym_RBRACE,
-  [944] = 1,
-    ACTIONS(275), 1,
+  [918] = 1,
+    ACTIONS(273), 1,
       anon_sym_SEMI,
-  [948] = 1,
+  [922] = 1,
+    ACTIONS(275), 1,
+      anon_sym_COLON,
+  [926] = 1,
     ACTIONS(277), 1,
       anon_sym_SEMI,
-  [952] = 1,
+  [930] = 1,
     ACTIONS(279), 1,
-      anon_sym_COLON,
-  [956] = 1,
-    ACTIONS(281), 1,
       sym_identifier,
 };
 
@@ -2202,244 +2181,241 @@ static const uint32_t ts_small_parse_table_map[] = {
   [SMALL_STATE(2)] = 0,
   [SMALL_STATE(3)] = 28,
   [SMALL_STATE(4)] = 56,
-  [SMALL_STATE(5)] = 80,
-  [SMALL_STATE(6)] = 104,
-  [SMALL_STATE(7)] = 128,
-  [SMALL_STATE(8)] = 152,
-  [SMALL_STATE(9)] = 176,
-  [SMALL_STATE(10)] = 198,
-  [SMALL_STATE(11)] = 220,
-  [SMALL_STATE(12)] = 242,
-  [SMALL_STATE(13)] = 257,
-  [SMALL_STATE(14)] = 275,
-  [SMALL_STATE(15)] = 284,
-  [SMALL_STATE(16)] = 293,
-  [SMALL_STATE(17)] = 302,
-  [SMALL_STATE(18)] = 311,
-  [SMALL_STATE(19)] = 320,
-  [SMALL_STATE(20)] = 329,
-  [SMALL_STATE(21)] = 338,
-  [SMALL_STATE(22)] = 347,
-  [SMALL_STATE(23)] = 356,
-  [SMALL_STATE(24)] = 365,
-  [SMALL_STATE(25)] = 374,
-  [SMALL_STATE(26)] = 383,
-  [SMALL_STATE(27)] = 392,
-  [SMALL_STATE(28)] = 404,
-  [SMALL_STATE(29)] = 418,
-  [SMALL_STATE(30)] = 432,
-  [SMALL_STATE(31)] = 446,
-  [SMALL_STATE(32)] = 460,
-  [SMALL_STATE(33)] = 470,
-  [SMALL_STATE(34)] = 478,
-  [SMALL_STATE(35)] = 489,
-  [SMALL_STATE(36)] = 500,
-  [SMALL_STATE(37)] = 511,
-  [SMALL_STATE(38)] = 524,
-  [SMALL_STATE(39)] = 533,
-  [SMALL_STATE(40)] = 540,
-  [SMALL_STATE(41)] = 547,
-  [SMALL_STATE(42)] = 554,
-  [SMALL_STATE(43)] = 563,
-  [SMALL_STATE(44)] = 572,
-  [SMALL_STATE(45)] = 583,
-  [SMALL_STATE(46)] = 593,
-  [SMALL_STATE(47)] = 603,
-  [SMALL_STATE(48)] = 613,
-  [SMALL_STATE(49)] = 621,
-  [SMALL_STATE(50)] = 631,
-  [SMALL_STATE(51)] = 641,
-  [SMALL_STATE(52)] = 651,
-  [SMALL_STATE(53)] = 659,
-  [SMALL_STATE(54)] = 669,
-  [SMALL_STATE(55)] = 679,
-  [SMALL_STATE(56)] = 689,
-  [SMALL_STATE(57)] = 697,
-  [SMALL_STATE(58)] = 707,
-  [SMALL_STATE(59)] = 713,
-  [SMALL_STATE(60)] = 719,
-  [SMALL_STATE(61)] = 727,
-  [SMALL_STATE(62)] = 737,
-  [SMALL_STATE(63)] = 745,
-  [SMALL_STATE(64)] = 753,
-  [SMALL_STATE(65)] = 763,
-  [SMALL_STATE(66)] = 768,
-  [SMALL_STATE(67)] = 775,
-  [SMALL_STATE(68)] = 780,
-  [SMALL_STATE(69)] = 785,
-  [SMALL_STATE(70)] = 792,
-  [SMALL_STATE(71)] = 797,
-  [SMALL_STATE(72)] = 802,
-  [SMALL_STATE(73)] = 807,
-  [SMALL_STATE(74)] = 814,
-  [SMALL_STATE(75)] = 819,
-  [SMALL_STATE(76)] = 824,
-  [SMALL_STATE(77)] = 829,
-  [SMALL_STATE(78)] = 836,
-  [SMALL_STATE(79)] = 843,
-  [SMALL_STATE(80)] = 850,
-  [SMALL_STATE(81)] = 857,
-  [SMALL_STATE(82)] = 864,
-  [SMALL_STATE(83)] = 871,
-  [SMALL_STATE(84)] = 876,
-  [SMALL_STATE(85)] = 880,
-  [SMALL_STATE(86)] = 884,
-  [SMALL_STATE(87)] = 888,
-  [SMALL_STATE(88)] = 892,
-  [SMALL_STATE(89)] = 896,
-  [SMALL_STATE(90)] = 900,
-  [SMALL_STATE(91)] = 904,
-  [SMALL_STATE(92)] = 908,
-  [SMALL_STATE(93)] = 912,
-  [SMALL_STATE(94)] = 916,
-  [SMALL_STATE(95)] = 920,
-  [SMALL_STATE(96)] = 924,
-  [SMALL_STATE(97)] = 928,
-  [SMALL_STATE(98)] = 932,
-  [SMALL_STATE(99)] = 936,
-  [SMALL_STATE(100)] = 940,
-  [SMALL_STATE(101)] = 944,
-  [SMALL_STATE(102)] = 948,
-  [SMALL_STATE(103)] = 952,
-  [SMALL_STATE(104)] = 956,
+  [SMALL_STATE(5)] = 78,
+  [SMALL_STATE(6)] = 100,
+  [SMALL_STATE(7)] = 122,
+  [SMALL_STATE(8)] = 144,
+  [SMALL_STATE(9)] = 166,
+  [SMALL_STATE(10)] = 188,
+  [SMALL_STATE(11)] = 210,
+  [SMALL_STATE(12)] = 232,
+  [SMALL_STATE(13)] = 247,
+  [SMALL_STATE(14)] = 265,
+  [SMALL_STATE(15)] = 274,
+  [SMALL_STATE(16)] = 283,
+  [SMALL_STATE(17)] = 292,
+  [SMALL_STATE(18)] = 301,
+  [SMALL_STATE(19)] = 310,
+  [SMALL_STATE(20)] = 319,
+  [SMALL_STATE(21)] = 328,
+  [SMALL_STATE(22)] = 337,
+  [SMALL_STATE(23)] = 346,
+  [SMALL_STATE(24)] = 355,
+  [SMALL_STATE(25)] = 364,
+  [SMALL_STATE(26)] = 373,
+  [SMALL_STATE(27)] = 382,
+  [SMALL_STATE(28)] = 394,
+  [SMALL_STATE(29)] = 404,
+  [SMALL_STATE(30)] = 418,
+  [SMALL_STATE(31)] = 426,
+  [SMALL_STATE(32)] = 440,
+  [SMALL_STATE(33)] = 454,
+  [SMALL_STATE(34)] = 466,
+  [SMALL_STATE(35)] = 477,
+  [SMALL_STATE(36)] = 488,
+  [SMALL_STATE(37)] = 497,
+  [SMALL_STATE(38)] = 510,
+  [SMALL_STATE(39)] = 519,
+  [SMALL_STATE(40)] = 530,
+  [SMALL_STATE(41)] = 537,
+  [SMALL_STATE(42)] = 546,
+  [SMALL_STATE(43)] = 555,
+  [SMALL_STATE(44)] = 562,
+  [SMALL_STATE(45)] = 572,
+  [SMALL_STATE(46)] = 582,
+  [SMALL_STATE(47)] = 592,
+  [SMALL_STATE(48)] = 600,
+  [SMALL_STATE(49)] = 610,
+  [SMALL_STATE(50)] = 620,
+  [SMALL_STATE(51)] = 628,
+  [SMALL_STATE(52)] = 638,
+  [SMALL_STATE(53)] = 648,
+  [SMALL_STATE(54)] = 658,
+  [SMALL_STATE(55)] = 666,
+  [SMALL_STATE(56)] = 676,
+  [SMALL_STATE(57)] = 682,
+  [SMALL_STATE(58)] = 692,
+  [SMALL_STATE(59)] = 700,
+  [SMALL_STATE(60)] = 708,
+  [SMALL_STATE(61)] = 718,
+  [SMALL_STATE(62)] = 726,
+  [SMALL_STATE(63)] = 736,
+  [SMALL_STATE(64)] = 742,
+  [SMALL_STATE(65)] = 747,
+  [SMALL_STATE(66)] = 754,
+  [SMALL_STATE(67)] = 761,
+  [SMALL_STATE(68)] = 766,
+  [SMALL_STATE(69)] = 773,
+  [SMALL_STATE(70)] = 778,
+  [SMALL_STATE(71)] = 783,
+  [SMALL_STATE(72)] = 788,
+  [SMALL_STATE(73)] = 793,
+  [SMALL_STATE(74)] = 798,
+  [SMALL_STATE(75)] = 803,
+  [SMALL_STATE(76)] = 808,
+  [SMALL_STATE(77)] = 815,
+  [SMALL_STATE(78)] = 822,
+  [SMALL_STATE(79)] = 829,
+  [SMALL_STATE(80)] = 836,
+  [SMALL_STATE(81)] = 843,
+  [SMALL_STATE(82)] = 850,
+  [SMALL_STATE(83)] = 854,
+  [SMALL_STATE(84)] = 858,
+  [SMALL_STATE(85)] = 862,
+  [SMALL_STATE(86)] = 866,
+  [SMALL_STATE(87)] = 870,
+  [SMALL_STATE(88)] = 874,
+  [SMALL_STATE(89)] = 878,
+  [SMALL_STATE(90)] = 882,
+  [SMALL_STATE(91)] = 886,
+  [SMALL_STATE(92)] = 890,
+  [SMALL_STATE(93)] = 894,
+  [SMALL_STATE(94)] = 898,
+  [SMALL_STATE(95)] = 902,
+  [SMALL_STATE(96)] = 906,
+  [SMALL_STATE(97)] = 910,
+  [SMALL_STATE(98)] = 914,
+  [SMALL_STATE(99)] = 918,
+  [SMALL_STATE(100)] = 922,
+  [SMALL_STATE(101)] = 926,
+  [SMALL_STATE(102)] = 930,
 };
 
 static const TSParseActionEntry ts_parse_actions[] = {
   [0] = {.entry = {.count = 0, .reusable = false}},
   [1] = {.entry = {.count = 1, .reusable = false}}, RECOVER(),
   [3] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 0, 0, 0),
-  [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(88),
-  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(104),
-  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(99),
-  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(82),
-  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
+  [5] = {.entry = {.count = 1, .reusable = true}}, SHIFT(87),
+  [7] = {.entry = {.count = 1, .reusable = true}}, SHIFT(102),
+  [9] = {.entry = {.count = 1, .reusable = true}}, SHIFT(97),
+  [11] = {.entry = {.count = 1, .reusable = true}}, SHIFT(78),
+  [13] = {.entry = {.count = 1, .reusable = true}}, SHIFT(84),
   [15] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_document, 1, 0, 0),
   [17] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0),
-  [19] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(88),
-  [22] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(104),
-  [25] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(99),
-  [28] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(82),
-  [31] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(86),
-  [34] = {.entry = {.count = 1, .reusable = true}}, SHIFT(60),
-  [36] = {.entry = {.count = 1, .reusable = false}}, SHIFT(33),
-  [38] = {.entry = {.count = 1, .reusable = false}}, SHIFT(32),
-  [40] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
-  [42] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
-  [44] = {.entry = {.count = 1, .reusable = false}}, SHIFT(84),
-  [46] = {.entry = {.count = 1, .reusable = false}}, SHIFT(78),
+  [19] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(87),
+  [22] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(102),
+  [25] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(97),
+  [28] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(78),
+  [31] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_document_repeat1, 2, 0, 0), SHIFT_REPEAT(84),
+  [34] = {.entry = {.count = 1, .reusable = true}}, SHIFT(59),
+  [36] = {.entry = {.count = 1, .reusable = false}}, SHIFT(30),
+  [38] = {.entry = {.count = 1, .reusable = false}}, SHIFT(28),
+  [40] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
+  [42] = {.entry = {.count = 1, .reusable = true}}, SHIFT(86),
+  [44] = {.entry = {.count = 1, .reusable = false}}, SHIFT(94),
+  [46] = {.entry = {.count = 1, .reusable = false}}, SHIFT(66),
   [48] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_service_functions_repeat2, 2, 0, 0),
-  [50] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_service_functions_repeat2, 2, 0, 0), SHIFT_REPEAT(91),
-  [53] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_service_functions_repeat2, 2, 0, 0), SHIFT_REPEAT(84),
-  [56] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_service_functions_repeat2, 2, 0, 0), SHIFT_REPEAT(78),
-  [59] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [50] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_service_functions_repeat2, 2, 0, 0), SHIFT_REPEAT(86),
+  [53] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_service_functions_repeat2, 2, 0, 0), SHIFT_REPEAT(94),
+  [56] = {.entry = {.count = 2, .reusable = false}}, REDUCE(aux_sym_service_functions_repeat2, 2, 0, 0), SHIFT_REPEAT(66),
+  [59] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
   [61] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_declaration, 2, 0, 0),
   [63] = {.entry = {.count = 1, .reusable = true}}, SHIFT(37),
-  [65] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_functions, 3, 0, 0),
-  [67] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_values, 3, 0, 0),
-  [69] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_declaration, 3, 0, 0),
-  [71] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_declaration, 3, 0, 0),
-  [73] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attributes, 4, 0, 0),
-  [75] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_values, 4, 0, 0),
+  [65] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_define_declaration, 4, 0, 0),
+  [67] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_functions, 2, 0, 0),
+  [69] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attributes, 4, 0, 0),
+  [71] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_values, 3, 0, 0),
+  [73] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type_declaration, 3, 0, 0),
+  [75] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_declaration, 3, 0, 0),
   [77] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_import_declaration, 3, 0, 0),
-  [79] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_declaration, 3, 0, 0),
-  [81] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attributes, 2, 0, 0),
-  [83] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_functions, 2, 0, 0),
+  [79] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_values, 4, 0, 0),
+  [81] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_declaration, 3, 0, 0),
+  [83] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attributes, 2, 0, 0),
   [85] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_values, 2, 0, 0),
-  [87] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attributes, 3, 0, 0),
-  [89] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_define_declaration, 4, 0, 0),
-  [91] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_service_functions_repeat1, 2, 0, 0), SHIFT_REPEAT(91),
-  [94] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_service_functions_repeat1, 2, 0, 0),
-  [96] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_attributes_repeat1, 2, 0, 0),
-  [98] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_attributes_repeat1, 2, 0, 0), SHIFT_REPEAT(69),
-  [101] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
-  [103] = {.entry = {.count = 1, .reusable = true}}, SHIFT(62),
-  [105] = {.entry = {.count = 1, .reusable = true}}, SHIFT(18),
-  [107] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
-  [109] = {.entry = {.count = 1, .reusable = true}}, SHIFT(25),
-  [111] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_type, 1, 0, 0),
-  [113] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
-  [115] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primitive_type, 1, 0, 0),
-  [117] = {.entry = {.count = 1, .reusable = false}}, SHIFT(58),
-  [119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(36),
-  [121] = {.entry = {.count = 1, .reusable = false}}, SHIFT(59),
-  [123] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
-  [125] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__string_content, 2, 0, 0),
-  [127] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__string_content, 2, 0, 0), SHIFT_REPEAT(36),
-  [130] = {.entry = {.count = 1, .reusable = true}}, SHIFT(22),
-  [132] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_service_functions_repeat2, 2, 0, 0),
-  [134] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_type, 5, 0, 0),
-  [136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array_type, 2, 0, 0),
-  [138] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_notification, 4, 0, 3),
-  [140] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_service_notification, 4, 0, 3),
-  [142] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_function, 5, 0, 5),
-  [144] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_service_function, 5, 0, 5),
-  [146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(66),
-  [148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(83),
-  [150] = {.entry = {.count = 1, .reusable = true}}, SHIFT(56),
-  [152] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
-  [154] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decorator_arguments_repeat1, 2, 0, 0), SHIFT_REPEAT(80),
+  [87] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_functions, 3, 0, 0),
+  [89] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attributes, 3, 0, 0),
+  [91] = {.entry = {.count = 1, .reusable = true}}, SHIFT(24),
+  [93] = {.entry = {.count = 1, .reusable = true}}, SHIFT(58),
+  [95] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym__type, 1, 0, 0),
+  [97] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
+  [99] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_attributes_repeat1, 2, 0, 0),
+  [101] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_attributes_repeat1, 2, 0, 0), SHIFT_REPEAT(65),
+  [104] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_primitive_type, 1, 0, 0),
+  [106] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
+  [108] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
+  [110] = {.entry = {.count = 1, .reusable = true}}, SHIFT(16),
+  [112] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_service_functions_repeat1, 2, 0, 0), SHIFT_REPEAT(86),
+  [115] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_service_functions_repeat1, 2, 0, 0),
+  [117] = {.entry = {.count = 1, .reusable = false}}, SHIFT(56),
+  [119] = {.entry = {.count = 1, .reusable = true}}, SHIFT(35),
+  [121] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym__string_content, 2, 0, 0),
+  [123] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym__string_content, 2, 0, 0), SHIFT_REPEAT(35),
+  [126] = {.entry = {.count = 1, .reusable = false}}, REDUCE(aux_sym_service_functions_repeat2, 2, 0, 0),
+  [128] = {.entry = {.count = 1, .reusable = true}}, SHIFT(23),
+  [130] = {.entry = {.count = 1, .reusable = false}}, SHIFT(63),
+  [132] = {.entry = {.count = 1, .reusable = true}}, SHIFT(34),
+  [134] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_array_type, 2, 0, 0),
+  [136] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_notification, 4, 0, 3),
+  [138] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_service_notification, 4, 0, 3),
+  [140] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_service_function, 5, 0, 5),
+  [142] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_service_function, 5, 0, 5),
+  [144] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_type, 5, 0, 0),
+  [146] = {.entry = {.count = 1, .reusable = true}}, SHIFT(21),
+  [148] = {.entry = {.count = 1, .reusable = true}}, SHIFT(38),
+  [150] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
+  [152] = {.entry = {.count = 1, .reusable = true}}, SHIFT(39),
+  [154] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_decorator_arguments_repeat1, 2, 0, 0), SHIFT_REPEAT(77),
   [157] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_decorator_arguments_repeat1, 2, 0, 0),
   [159] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator_arguments, 4, 0, 0),
   [161] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_decorator_arguments, 4, 0, 0),
-  [163] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_function_arguments_repeat1, 2, 0, 0), SHIFT_REPEAT(66),
+  [163] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_function_arguments_repeat1, 2, 0, 0), SHIFT_REPEAT(81),
   [166] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_function_arguments_repeat1, 2, 0, 0),
-  [168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
-  [170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(48),
-  [172] = {.entry = {.count = 1, .reusable = true}}, SHIFT(19),
-  [174] = {.entry = {.count = 1, .reusable = true}}, SHIFT(44),
-  [176] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator_arguments, 3, 0, 0),
-  [178] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_decorator_arguments, 3, 0, 0),
-  [180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(70),
-  [182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(65),
-  [184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(96),
-  [186] = {.entry = {.count = 1, .reusable = true}}, SHIFT(52),
-  [188] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator_arguments, 2, 0, 0),
-  [190] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_decorator_arguments, 2, 0, 0),
-  [192] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
-  [194] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 3, 0, 0),
-  [196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 2, 0, 0),
-  [198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(94),
-  [200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(15),
-  [202] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_value_declaration, 1, 0, 0),
-  [204] = {.entry = {.count = 1, .reusable = true}}, SHIFT(98),
-  [206] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_decorator, 3, 0, 0),
-  [208] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_decorator, 3, 0, 0),
-  [210] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_enum_values_repeat1, 2, 0, 0),
-  [212] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_enum_values_repeat1, 2, 0, 0), SHIFT_REPEAT(44),
-  [215] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_arguments, 2, 0, 0),
-  [217] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute, 2, 0, 0),
-  [219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
-  [221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(103),
-  [223] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_arguments, 4, 0, 0),
+  [168] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
+  [170] = {.entry = {.count = 1, .reusable = true}}, SHIFT(47),
+  [172] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator_arguments, 3, 0, 0),
+  [174] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_decorator_arguments, 3, 0, 0),
+  [176] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
+  [178] = {.entry = {.count = 1, .reusable = true}}, SHIFT(72),
+  [180] = {.entry = {.count = 1, .reusable = true}}, SHIFT(50),
+  [182] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
+  [184] = {.entry = {.count = 1, .reusable = true}}, SHIFT(95),
+  [186] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_decorator_arguments, 2, 0, 0),
+  [188] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_decorator_arguments, 2, 0, 0),
+  [190] = {.entry = {.count = 1, .reusable = true}}, SHIFT(101),
+  [192] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 3, 0, 0),
+  [194] = {.entry = {.count = 1, .reusable = true}}, SHIFT(17),
+  [196] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_value_declaration, 1, 0, 0),
+  [198] = {.entry = {.count = 1, .reusable = true}}, SHIFT(92),
+  [200] = {.entry = {.count = 1, .reusable = true}}, SHIFT(91),
+  [202] = {.entry = {.count = 1, .reusable = true}}, SHIFT(64),
+  [204] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_decorator, 3, 0, 0),
+  [206] = {.entry = {.count = 1, .reusable = false}}, REDUCE(sym_function_decorator, 3, 0, 0),
+  [208] = {.entry = {.count = 1, .reusable = true}}, REDUCE(aux_sym_enum_values_repeat1, 2, 0, 0),
+  [210] = {.entry = {.count = 2, .reusable = true}}, REDUCE(aux_sym_enum_values_repeat1, 2, 0, 0), SHIFT_REPEAT(38),
+  [213] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_string, 2, 0, 0),
+  [215] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_arguments, 3, 0, 0),
+  [217] = {.entry = {.count = 1, .reusable = true}}, SHIFT(5),
+  [219] = {.entry = {.count = 1, .reusable = true}}, SHIFT(100),
+  [221] = {.entry = {.count = 1, .reusable = true}}, SHIFT(53),
+  [223] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
   [225] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_value_assignment, 3, 0, 0),
-  [227] = {.entry = {.count = 1, .reusable = true}}, SHIFT(11),
-  [229] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_enum_value, 1, 0, 0),
-  [231] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_argument, 3, 0, 4),
-  [233] = {.entry = {.count = 1, .reusable = true}}, SHIFT(46),
-  [235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(54),
-  [237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(29),
-  [239] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_arguments, 3, 0, 0),
-  [241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
-  [243] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
-  [245] = {.entry = {.count = 1, .reusable = true}}, SHIFT(73),
-  [247] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pair, 3, 0, 1),
+  [227] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_attribute, 2, 0, 0),
+  [229] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_arguments, 4, 0, 0),
+  [231] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_arguments, 2, 0, 0),
+  [233] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_function_argument, 3, 0, 4),
+  [235] = {.entry = {.count = 1, .reusable = true}}, SHIFT(45),
+  [237] = {.entry = {.count = 1, .reusable = true}}, SHIFT(27),
+  [239] = {.entry = {.count = 1, .reusable = true}},  ACCEPT_INPUT(),
+  [241] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
+  [243] = {.entry = {.count = 1, .reusable = true}}, SHIFT(68),
+  [245] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pair, 3, 0, 1),
+  [247] = {.entry = {.count = 1, .reusable = true}}, SHIFT(76),
   [249] = {.entry = {.count = 1, .reusable = true}}, SHIFT(12),
-  [251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(8),
-  [253] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
-  [255] = {.entry = {.count = 1, .reusable = true}}, SHIFT(77),
-  [257] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pair, 4, 0, 2),
-  [259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
-  [261] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_key_type, 1, 0, 0),
-  [263] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
+  [251] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
+  [253] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_pair, 4, 0, 2),
+  [255] = {.entry = {.count = 1, .reusable = true}}, SHIFT(6),
+  [257] = {.entry = {.count = 1, .reusable = true}}, REDUCE(sym_map_key_type, 1, 0, 0),
+  [259] = {.entry = {.count = 1, .reusable = true}}, SHIFT(69),
+  [261] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
+  [263] = {.entry = {.count = 1, .reusable = true}}, SHIFT(80),
   [265] = {.entry = {.count = 1, .reusable = true}}, SHIFT(7),
-  [267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(42),
-  [269] = {.entry = {.count = 1, .reusable = true}}, SHIFT(71),
-  [271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(57),
-  [273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(40),
-  [275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(26),
-  [277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(67),
-  [279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
-  [281] = {.entry = {.count = 1, .reusable = true}}, SHIFT(81),
+  [267] = {.entry = {.count = 1, .reusable = true}}, SHIFT(41),
+  [269] = {.entry = {.count = 1, .reusable = true}}, SHIFT(55),
+  [271] = {.entry = {.count = 1, .reusable = true}}, SHIFT(43),
+  [273] = {.entry = {.count = 1, .reusable = true}}, SHIFT(20),
+  [275] = {.entry = {.count = 1, .reusable = true}}, SHIFT(4),
+  [277] = {.entry = {.count = 1, .reusable = true}}, SHIFT(14),
+  [279] = {.entry = {.count = 1, .reusable = true}}, SHIFT(79),
 };
 
 #ifdef __cplusplus