feat: relax module constraining, allow generic module exprs

Author: nkrkv

grammar.js

@@ -1273,20 +1273,20 @@ module.exports = grammar({
       choice($.module_expression, $.block)
     )),
 
-    _module_type_constraint: $ => seq(
+    _module_type_constraint_with: $ => prec.right(seq(
       'with',
       sep1(choice('and', 'with'),
         choice($.constrain_module, $.constrain_type)
       ),
-    ),
+    )),
 
     module_type_constraint: $ => prec.left(choice(
-      seq($.module_identifier, $._module_type_constraint),
+      seq($.module_expression, $._module_type_constraint_with),
       seq(
         '(',
-        $.module_identifier, $._module_type_constraint,
+        $.module_expression, $._module_type_constraint_with,
         ')',
-        $._module_type_constraint
+        $._module_type_constraint_with
       )
     )),
 

test/corpus/modules.txt

@@ -60,15 +60,15 @@ include module type of {
   (include_statement
     (functor_parameter (module_identifier)
     (module_type_annotation
-      (module_type_of
       (module_type_constraint
-        (module_identifier)
+        (module_type_of (module_identifier))
         (constrain_module
           (module_identifier)
           (module_identifier_path (module_identifier) (module_identifier)))
         (constrain_module
           (module_identifier)
-          (module_identifier_path (module_identifier) (module_identifier))))))))
+          (module_identifier_path (module_identifier)
+          (module_identifier)))))))
 
   (include_statement
     (module_type_of