Fix parsing of re-export and unquoted string in list

corpus/decl/module.nu

@@ -37,3 +37,21 @@ export module iter {}
   (decl_module
     (cmd_identifier)
     (block)))
+
+=====
+module-004-re-export
+=====
+
+export module another.nu
+export module 'other.nu'
+export module others
+
+----
+
+(nu_script
+  (decl_module
+    (cmd_identifier))
+  (decl_module
+    (val_string))
+  (decl_module
+    (cmd_identifier)))

corpus/expr/list.nu

@@ -0,0 +1,27 @@
+=====
+list-001-item-string
+=====
+
+[
+  unquoted
+  'single quoted'
+  "double quoted"
+  unquoted.nu
+  -u
+  -unquoted
+  --unquoted-string
+]
+
+-----
+
+(nu_script
+  (pipeline
+    (pipe_element
+      (val_list
+        (val_string)
+        (val_string)
+        (val_string)
+        (val_string)
+        (val_string)
+        (val_string)
+        (val_string)))))

grammar.js

@@ -20,6 +20,7 @@ module.exports = grammar({
     [$.block, $.val_closure],
     [$.ctrl_if_parenthesized],
     [$.ctrl_try_parenthesized],
+    [$.decl_module],
   ],
 
   rules: {
@@ -49,7 +50,7 @@ module.exports = grammar({
     // for simplicity, i used the `rust` definition of an identifier and some symbols
     // but in `nu` the rule is way more relaxed than this
 
-    cmd_identifier: ($) => token(/[_\p{XID_Start}][_\-\p{XID_Continue}!?]*/),
+    cmd_identifier: ($) => token(/[_\p{XID_Start}][_\-\p{XID_Continue}!?.]*/),
 
     identifier: ($) => token(/[_\p{XID_Start}][_\p{XID_Continue}]*/),
 
@@ -101,7 +102,7 @@ module.exports = grammar({
         optional(MODIFIER().visibility),
         KEYWORD().module,
         field("name", $._command_name),
-        field("body", $.block),
+        optional(field("body", $.block)),
       ),
 
     decl_use: ($) =>
@@ -893,7 +894,12 @@ module.exports = grammar({
           field(
             "item",
             seq(
-              choice($._expression, alias($.cmd_identifier, $.val_string)),
+              choice(
+                $._expression,
+                alias($.cmd_identifier, $.val_string),
+                alias($.short_flag, $.val_string),
+                alias($.long_flag, $.val_string),
+              ),
               optional(PUNC().comma),
             ),
           ),

src/grammar.json

@@ -1298,7 +1298,7 @@
       "type": "TOKEN",
       "content": {
         "type": "PATTERN",
-        "value": "[_\\p{XID_Start}][_\\-\\p{XID_Continue}!?]*"
+        "value": "[_\\p{XID_Start}][_\\-\\p{XID_Continue}!?.]*"
       }
     },
     "identifier": {
@@ -1560,12 +1560,20 @@
           }
         },
         {
-          "type": "FIELD",
-          "name": "body",
-          "content": {
-            "type": "SYMBOL",
-            "name": "block"
-          }
+          "type": "CHOICE",
+          "members": [
+            {
+              "type": "FIELD",
+              "name": "body",
+              "content": {
+                "type": "SYMBOL",
+                "name": "block"
+              }
+            },
+            {
+              "type": "BLANK"
+            }
+          ]
         }
       ]
     },
@@ -7580,6 +7588,24 @@
                       },
                       "named": true,
                       "value": "val_string"
+                    },
+                    {
+                      "type": "ALIAS",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "short_flag"
+                      },
+                      "named": true,
+                      "value": "val_string"
+                    },
+                    {
+                      "type": "ALIAS",
+                      "content": {
+                        "type": "SYMBOL",
+                        "name": "long_flag"
+                      },
+                      "named": true,
+                      "value": "val_string"
                     }
                   ]
                 },
@@ -8746,6 +8772,9 @@
     ],
     [
       "ctrl_try_parenthesized"
+    ],
+    [
+      "decl_module"
     ]
   ],
   "precedences": [],

src/node-types.json

@@ -1376,7 +1376,7 @@
     "fields": {
       "body": {
         "multiple": false,
-        "required": true,
+        "required": false,
         "types": [
           {
             "type": "block",