allow using primitive type as field names

Zzzen · Dec 3, 2020 · 983a3b7 · 983a3b7
1 parent 93ca4a7
commit 983a3b7
Show file tree

Hide file tree

Showing 3 changed files with 246 additions and 1 deletion.
diff --git a/src/parser.ts b/src/parser.ts
@@ -429,7 +429,9 @@ export class Parser {
    */
   parseField(hasValueType = true): Field {
     const valueType = hasValueType ? this.parseValueType() : undefined;
-    const id = this.consume(TokenType.IDENTIFIER);
+    const id = this.check(TokenType.PRIMITIVE_TYPE)
+      ? this.consume(TokenType.PRIMITIVE_TYPE)
+      : this.consume(TokenType.IDENTIFIER);
 
     this.consume(TokenType.EQUAL);
 

diff --git a/test/__snapshots__/parser.spec.ts.snap b/test/__snapshots__/parser.spec.ts.snap
@@ -5077,6 +5077,239 @@ Object {
 }
 `;
 
+exports[`Parser parse fields with special name 1`] = `
+Object {
+  "body": Array [
+    Object {
+      "body": Array [
+        Object {
+          "end": 41,
+          "endToken": Object {
+            "end": 41,
+            "leadingTrivia": Array [],
+            "lexeme": ";",
+            "literal": undefined,
+            "loc": Object {
+              "end": Object {
+                "column": 28,
+                "line": 3,
+              },
+              "start": Object {
+                "column": 27,
+                "line": 3,
+              },
+            },
+            "start": 40,
+            "trailingTrivia": Array [],
+            "type": "SEMICOLON",
+          },
+          "fieldNumber": 1,
+          "fieldOptions": Array [],
+          "fieldType": Object {
+            "end": 29,
+            "endToken": Object {
+              "end": 29,
+              "leadingTrivia": Array [],
+              "lexeme": "bytes",
+              "literal": "bytes",
+              "loc": Object {
+                "end": Object {
+                  "column": 16,
+                  "line": 3,
+                },
+                "start": Object {
+                  "column": 11,
+                  "line": 3,
+                },
+              },
+              "start": 24,
+              "trailingTrivia": Array [],
+              "type": "PRIMITIVE_TYPE",
+            },
+            "leadingComments": Array [],
+            "loc": Object {
+              "end": Object {
+                "column": 16,
+                "line": 3,
+              },
+              "start": Object {
+                "column": 11,
+                "line": 3,
+              },
+            },
+            "start": 24,
+            "startToken": Object {
+              "end": 29,
+              "leadingTrivia": Array [],
+              "lexeme": "bytes",
+              "literal": "bytes",
+              "loc": Object {
+                "end": Object {
+                  "column": 16,
+                  "line": 3,
+                },
+                "start": Object {
+                  "column": 11,
+                  "line": 3,
+                },
+              },
+              "start": 24,
+              "trailingTrivia": Array [],
+              "type": "PRIMITIVE_TYPE",
+            },
+            "trailingComments": Array [],
+            "type": "ValueType",
+            "value": "bytes",
+          },
+          "label": "optional",
+          "leadingComments": Array [],
+          "loc": Object {
+            "end": Object {
+              "column": 28,
+              "line": 3,
+            },
+            "start": Object {
+              "column": 2,
+              "line": 3,
+            },
+          },
+          "name": "string",
+          "start": 15,
+          "startToken": Object {
+            "end": 23,
+            "leadingTrivia": Array [],
+            "lexeme": "optional",
+            "literal": "optional",
+            "loc": Object {
+              "end": Object {
+                "column": 10,
+                "line": 3,
+              },
+              "start": Object {
+                "column": 2,
+                "line": 3,
+              },
+            },
+            "start": 15,
+            "trailingTrivia": Array [],
+            "type": "IDENTIFIER",
+          },
+          "trailingComments": Array [],
+          "type": "Field",
+        },
+      ],
+      "end": 43,
+      "endToken": Object {
+        "end": 43,
+        "leadingTrivia": Array [],
+        "lexeme": "}",
+        "literal": undefined,
+        "loc": Object {
+          "end": Object {
+            "column": 1,
+            "line": 4,
+          },
+          "start": Object {
+            "column": 0,
+            "line": 4,
+          },
+        },
+        "start": 42,
+        "trailingTrivia": Array [],
+        "type": "RIGHT_BRACE",
+      },
+      "leadingComments": Array [],
+      "loc": Object {
+        "end": Object {
+          "column": 1,
+          "line": 4,
+        },
+        "start": Object {
+          "column": 0,
+          "line": 2,
+        },
+      },
+      "name": "M",
+      "start": 1,
+      "startToken": Object {
+        "end": 8,
+        "leadingTrivia": Array [],
+        "lexeme": "message",
+        "literal": "message",
+        "loc": Object {
+          "end": Object {
+            "column": 7,
+            "line": 2,
+          },
+          "start": Object {
+            "column": 0,
+            "line": 2,
+          },
+        },
+        "start": 1,
+        "trailingTrivia": Array [],
+        "type": "IDENTIFIER",
+      },
+      "trailingComments": Array [],
+      "type": "Message",
+    },
+  ],
+  "end": 50,
+  "endToken": Object {
+    "end": 50,
+    "leadingTrivia": Array [],
+    "lexeme": "",
+    "loc": Object {
+      "end": Object {
+        "column": 6,
+        "line": 5,
+      },
+      "start": Object {
+        "column": 6,
+        "line": 5,
+      },
+    },
+    "start": 49,
+    "trailingTrivia": Array [],
+    "type": "EOF",
+  },
+  "leadingComments": Array [],
+  "loc": Object {
+    "end": Object {
+      "column": 6,
+      "line": 5,
+    },
+    "start": Object {
+      "column": 0,
+      "line": 2,
+    },
+  },
+  "start": 1,
+  "startToken": Object {
+    "end": 8,
+    "leadingTrivia": Array [],
+    "lexeme": "message",
+    "literal": "message",
+    "loc": Object {
+      "end": Object {
+        "column": 7,
+        "line": 2,
+      },
+      "start": Object {
+        "column": 0,
+        "line": 2,
+      },
+    },
+    "start": 1,
+    "trailingTrivia": Array [],
+    "type": "IDENTIFIER",
+  },
+  "syntax": undefined,
+  "trailingComments": Array [],
+  "type": "ProtoFile",
+}
+`;
+
 exports[`Parser parse import 1`] = `
 Object {
   "body": Array [

diff --git a/test/parser.spec.ts b/test/parser.spec.ts
@@ -162,6 +162,16 @@ message M {
     ).toMatchSnapshot();
   });
 
+  it("parse fields with special name", () => {
+    expect(
+      parse(`
+message M {
+  optional bytes string = 1;
+}
+      `)
+    ).toMatchSnapshot();
+  });
+
   it("parse service", () => {
     expect(
       parse(`