fix: model parsing

victorhqc · Sep 19, 2019 · 27fe749 · 27fe749
1 parent dbfd7c4
commit 27fe749
Show file tree

Hide file tree

Showing 5 changed files with 2,228 additions and 3,241 deletions.
diff --git a/corpus/model.txt b/corpus/model.txt
@@ -20,36 +20,31 @@ model User {
         (column_type
           (identifier)
         )
-        (new_line)
       )
       (column_declaration
         (identifier)
         (column_type
           (identifier)
         )
-        (new_line)
       )
       (column_declaration
         (identifier)
         (column_type
           (identifier)
           (array)
         )
-        (new_line)
       )
       (column_declaration
         (identifier)
         (column_type
           (identifier)
         )
-        (new_line)
       )
       (column_declaration
         (identifier)
         (column_type
           (identifier)
         )
-        (new_line)
       )
     )
   )
@@ -75,50 +70,113 @@ model User {
         (column_type
           (identifier)
         )
-        (column_relation
-          (namespace
-            (call_expression
-              (identifier)
-              (arguments
-                (call_expression
-                  (identifier)
-                  (arguments)
-                )
+        (namespace
+          (call_expression
+            (identifier)
+            (arguments
+              (call_expression
+                (identifier)
+                (arguments)
               )
             )
           )
-          (namespace
+        )
+        (namespace
+          (identifier)
+        )
+      )
+      (column_declaration
+        (identifier)
+        (column_type
+          (identifier)
+        )
+        (namespace
+          (identifier)
+        )
+      )
+      (column_declaration
+        (identifier)
+        (column_type
+          (identifier)
+        )
+        (namespace
+          (call_expression
             (identifier)
+            (arguments)
           )
         )
-        (new_line)
       )
+    )
+  )
+)
+
+=========================
+Model with object namespace
+=========================
+
+model User {
+  id  Number  @id @db.int
+}
+
+---
+
+(program
+  (model_declaration (identifier)
+    (statement_block
       (column_declaration
         (identifier)
         (column_type
           (identifier)
         )
-        (column_relation
-          (namespace
+        (namespace
+          (identifier)
+        )
+        (namespace
+          (member_expression
             (identifier)
+            (property_identifier)
           )
         )
-        (new_line)
       )
+    )
+  )
+)
+
+===============================
+Model with multiline column
+===============================
+
+model User {
+  id          String       @id
+                           @default
+  first_name  LongNumeric  @default
+}
+
+---
+
+(program
+  (model_declaration (identifier)
+    (statement_block
       (column_declaration
         (identifier)
         (column_type
           (identifier)
         )
-        (column_relation
-          (namespace
-            (call_expression
-              (identifier)
-              (arguments)
-            )
-          )
+        (namespace
+          (identifier)
+        )
+        (namespace
+          (identifier)
+        )
+      )
+      (column_declaration
+        (identifier)
+        (column_type
+          (identifier)
+        )
+        (namespace
+          (identifier)
         )
-        (new_line)
       )
     )
   )

diff --git a/grammar.js b/grammar.js
@@ -118,9 +118,9 @@ module.exports = grammar({
     column_declaration: $ => seq(
       $.identifier,
       $.column_type,
-      optional($.column_relation),
-      // TODO: Check if it's really needed
-      $.new_line,
+      optional(repeat(
+        $.namespace
+      )),
     ),
 
     assignment_pattern: $ => seq(
@@ -197,10 +197,6 @@ module.exports = grammar({
       optional($.array),
     ),
 
-    column_relation: $ => repeat1(
-      $.namespace,
-    ),
-
     type_expression: $ => seq(
       $.identifier,
       ':',
@@ -277,12 +273,6 @@ module.exports = grammar({
       ']'
     ),
 
-    // TODO: Check if it's really needed.
-    new_line: $ => seq(
-      '\n',
-    ),
-
-
     true: $ => 'true',
     false: $ => 'false',
     null: $ => 'null',

diff --git a/src/grammar.json b/src/grammar.json
@@ -217,17 +217,16 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "column_relation"
+              "type": "REPEAT",
+              "content": {
+                "type": "SYMBOL",
+                "name": "namespace"
+              }
             },
             {
               "type": "BLANK"
             }
           ]
-        },
-        {
-          "type": "SYMBOL",
-          "name": "new_line"
         }
       ]
     },
@@ -845,13 +844,6 @@
         }
       ]
     },
-    "column_relation": {
-      "type": "REPEAT1",
-      "content": {
-        "type": "SYMBOL",
-        "name": "namespace"
-      }
-    },
     "type_expression": {
       "type": "SEQ",
       "members": [
@@ -1200,15 +1192,6 @@
         }
       ]
     },
-    "new_line": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "STRING",
-          "value": "\n"
-        }
-      ]
-    },
     "true": {
       "type": "STRING",
       "value": "true"

diff --git a/src/node-types.json b/src/node-types.json
@@ -468,10 +468,6 @@
       "multiple": true,
       "required": false,
       "types": [
-        {
-          "type": "column_relation",
-          "named": true
-        },
         {
           "type": "column_type",
           "named": true
@@ -480,21 +476,6 @@
           "type": "identifier",
           "named": true
         },
-        {
-          "type": "new_line",
-          "named": true
-        }
-      ]
-    }
-  },
-  {
-    "type": "column_relation",
-    "named": true,
-    "fields": {},
-    "children": {
-      "multiple": true,
-      "required": false,
-      "types": [
         {
           "type": "namespace",
           "named": true
@@ -739,11 +720,6 @@
       ]
     }
   },
-  {
-    "type": "new_line",
-    "named": true,
-    "fields": {}
-  },
   {
     "type": "program",
     "named": true,
@@ -1100,10 +1076,6 @@
     "type": "]",
     "named": false
   },
-  {
-    "type": "\n",
-    "named": false
-  },
   {
     "type": "true",
     "named": true