add type_binding

Author: aspeddro

grammar.js

@@ -83,7 +83,8 @@ module.exports = grammar({
     [$.array, $.array_pattern],
     [$.record_field, $.record_pattern],
     [$.expression_statement, $.ternary_expression],
-    [$._type_declaration],
+    [$.type_declaration],
+    [$.type_binding],
     [$.let_declaration],
     [$.let_declaration, $.ternary_expression],
     [$.variant_identifier, $.module_identifier],
@@ -110,6 +111,7 @@ module.exports = grammar({
     [$.polyvar_type],
     [$.let_binding, $.or_pattern],
     [$.exception_pattern, $.or_pattern],
+    [$.type_binding, $._inline_type]
   ],
 
   rules: {
@@ -262,31 +264,24 @@ module.exports = grammar({
       optional('export'),
       'type',
       optional('rec'),
-      $._type_declaration
+      sep1(
+        seq(repeat($._newline), repeat($.decorator), 'and'),
+        $.type_binding
+      )
     ),
 
-    _type_declaration: $ => seq(
-      choice($.type_identifier, $.type_identifier_path),
+    type_binding: $ => seq(
+      field('name', choice($.type_identifier, $.type_identifier_path)),
       optional($.type_parameters),
       optional(seq(
-        optional(seq('=', $._type)),
+        optional(seq('=', $._non_function_inline_type)),
         optional(seq(
           choice('=', '+='),
           optional('private'),
-          $._type,
+          field('body', $._type),
         )),
         repeat($.type_constraint),
       )),
-      optional(alias($._type_declaration_and, $.type_declaration))
-    ),
-
-    _type_declaration_and: $ => seq(
-      // New line here not necessary terminates the statement,
-      // show this doubt to the parser
-      repeat($._newline),
-      repeat($.decorator),
-      'and',
-      $._type_declaration
     ),
 
     type_parameters: $ => seq(

test/corpus/decorators.txt

@@ -106,17 +106,18 @@ and bar = {bar: int}
   (decorated
     (decorator (decorator_identifier))
     (type_declaration
-      (type_identifier)
-      (record_type (record_type_field (property_identifier) (type_annotation (type_identifier))))
-      (type_declaration
-        (decorator (decorator_identifier))
+      (type_binding
         (type_identifier)
-        (record_type (record_type_field (property_identifier) (type_annotation (type_identifier))))
-        (type_declaration
-          (decorator (decorator_identifier))
-          (decorator (decorator_identifier))
+        (record_type (record_type_field (property_identifier) (type_annotation (type_identifier)))))
+      (decorator (decorator_identifier))
+      (type_binding
+        (type_identifier)
+        (record_type (record_type_field (property_identifier) (type_annotation (type_identifier)))))
+        (decorator (decorator_identifier))
+        (decorator (decorator_identifier))
+        (type_binding
           (type_identifier)
-          (record_type (record_type_field (property_identifier) (type_annotation (type_identifier)))))))))
+          (record_type (record_type_field (property_identifier) (type_annotation (type_identifier))))))))
 
 ============================================
 Decorator with type

test/corpus/modules.txt

@@ -48,7 +48,7 @@ include module type of {
       (module_identifier_path (module_identifier) (module_identifier))
       (arguments
         (block
-          (type_declaration (type_identifier))
+          (type_declaration (type_binding (type_identifier)))
           (let_declaration
             (let_binding
               (value_identifier)
@@ -93,7 +93,7 @@ module MyModule = {
 (source_file
   (module_declaration
     (module_identifier)
-    (block (type_declaration (type_identifier)))))
+    (block (type_declaration (type_binding (type_identifier))))))
 
 ===========================================
 Signature and definition
@@ -133,11 +133,24 @@ module MyModule: {
   (module_declaration
     name: (module_identifier)
     signature: (module_identifier_path (module_identifier) (module_identifier))
-    definition: (block (type_declaration (type_identifier))))
+    definition:
+      (block
+        (type_declaration
+          (type_binding
+            name: (type_identifier)))))
   (module_declaration
     name: (module_identifier)
-    signature: (block (type_declaration (type_identifier)))
-    definition: (block (type_declaration (type_identifier) (type_identifier)))))
+    signature: 
+      (block
+        (type_declaration
+          (type_binding
+            name: (type_identifier))))
+    definition:
+      (block
+        (type_declaration
+          (type_binding
+            name: (type_identifier)
+            (type_identifier))))))
 
 ===========================================
 Module types
@@ -152,7 +165,7 @@ module type t
 (source_file
   (module_declaration
     (module_identifier)
-    (block (type_declaration (type_identifier))))
+    (block (type_declaration (type_binding (type_identifier)))))
   (module_declaration
     (module_identifier)
     (module_type_of
@@ -185,7 +198,7 @@ module(SomeFunctor(unpack(x)))
   (expression_statement
     (module_pack
       (block
-        (type_declaration (type_identifier))
+        (type_declaration (type_binding (type_identifier)))
         (let_declaration
           (let_binding
             (value_identifier)
@@ -218,19 +231,25 @@ module MyFunctor = (X: {type t}, Y: {type t}): {type tx; type ty} => {
       parameters: (functor_parameters
         (functor_parameter
           (module_identifier)
-          (module_type_annotation (block (type_declaration (type_identifier)))))
+          (module_type_annotation (block (type_declaration (type_binding name: (type_identifier))))))
         (functor_parameter
           (module_identifier)
-          (module_type_annotation (block (type_declaration (type_identifier))))))
+          (module_type_annotation (block (type_declaration (type_binding name: (type_identifier)))))))
       return_module_type: (module_type_annotation
-          (block (type_declaration (type_identifier)) (type_declaration (type_identifier))))
+          (block 
+            (type_declaration
+              (type_binding name: (type_identifier)))
+            (type_declaration
+              (type_binding name: (type_identifier)))))
       body: (block
         (type_declaration
-          (type_identifier)
-          (type_identifier_path (module_identifier) (type_identifier)))
+          (type_binding
+            name: (type_identifier)
+            (type_identifier_path (module_identifier) (type_identifier))))
         (type_declaration
-          (type_identifier)
-          (type_identifier_path (module_identifier) (type_identifier)))))))
+          (type_binding
+            name: (type_identifier)
+            (type_identifier_path (module_identifier) (type_identifier))))))))
 
 ===========================================
 Functor signature