use [key=value] for messsage id

Author: chaokunyang

compiler/README.md

@@ -37,18 +37,18 @@ Create a `.fdl` file:
 ```fdl
 package demo;
 
-enum Color @101 {
+enum Color [id=101] {
     GREEN = 0;
     RED = 1;
     BLUE = 2;
 }
 
-message Dog @102 {
+message Dog [id=102] {
     optional string name = 1;
     int32 age = 2;
 }
 
-message Cat @103 {
+message Cat [id=103] {
     ref Dog friend = 1;
     optional string name = 2;
     repeated string tags = 3;
@@ -125,7 +125,7 @@ Imports are resolved relative to the importing file. All types from imported fil
 // common.fdl
 package common;
 
-message Address @100 {
+message Address [id=100] {
     string street = 1;
     string city = 2;
 }
@@ -136,7 +136,7 @@ message Address @100 {
 package user;
 import "common.fdl";
 
-message User @101 {
+message User [id=101] {
     string name = 1;
     Address address = 2;  // Uses imported type
 }
@@ -145,7 +145,7 @@ message User @101 {
 ### Enum Definition
 
 ```fdl
-enum Status @100 {
+enum Status [id=100] {
     PENDING = 0;
     ACTIVE = 1;
     INACTIVE = 2;
@@ -155,22 +155,23 @@ enum Status @100 {
 ### Message Definition
 
 ```fdl
-message User @101 {
+message User [id=101] {
     string name = 1;
     int32 age = 2;
     optional string email = 3;
 }
 ```
 
-### Type ID vs Name-based Registration
+### Type Options
 
-Types with `@<id>` use numeric type IDs for efficient serialization:
+Types can have options specified in brackets after the name:
 
 ```fdl
-message User @101 { ... }  // Registered with type ID 101
+message User [id=101] { ... }              // Registered with type ID 101
+message User [id=101, deprecated=true] { ... }  // Multiple options
 ```
 
-Types without `@<id>` use namespace-based registration:
+Types without `[id=...]` use namespace-based registration:
 
 ```fdl
 message Config { ... }  // Registered as "package.Config"

compiler/examples/common.fdl

@@ -19,15 +19,15 @@
 package common;
 
 // Status enum used across multiple domains
-enum Status @100 {
+enum Status [id=100] {
     PENDING = 0;
     ACTIVE = 1;
     COMPLETED = 2;
     CANCELLED = 3;
 }
 
 // Address type for shared use
-message Address @101 {
+message Address [id=101] {
     string street = 1;
     string city = 2;
     string state = 3;
@@ -36,7 +36,7 @@ message Address @101 {
 }
 
 // Contact information
-message Contact @102 {
+message Contact [id=102] {
     optional string email = 1;
     optional string phone = 2;
 }

compiler/examples/demo.fdl

@@ -2,23 +2,23 @@
 
 package demo;
 
-enum Color @101 {
+enum Color [id=101] {
     GREEN = 0;
     RED = 1;
     BLUE = 2;
     WHITE = 3;
 }
 
-message Item @102 {
+message Item [id=102] {
     string name = 1;
 }
 
-message Dog @103 {
+message Dog [id=103] {
     optional string name = 1;
     int32 age = 2;
 }
 
-message Cat @104 {
+message Cat [id=104] {
     ref Dog friend = 1;
     optional string name = 2;
     repeated string tags = 3;
@@ -27,7 +27,7 @@ message Cat @104 {
 }
 
 // Demonstrates primitive arrays for numeric types
-message SensorData @105 {
+message SensorData [id=105] {
     string sensor_id = 1;
     repeated int32 readings = 2;
     repeated float64 temperatures = 3;

compiler/examples/user.fdl

@@ -22,7 +22,7 @@ package user;
 import "common.fdl";
 
 // User profile using imported types
-message User @200 {
+message User [id=200] {
     string id = 1;
     string name = 2;
     optional Address home_address = 3;
@@ -32,7 +32,7 @@ message User @200 {
 }
 
 // User preferences
-message UserPreferences @201 {
+message UserPreferences [id=201] {
     ref User user = 1;
     string language = 2;
     string timezone = 3;

compiler/fory_compiler/parser/lexer.py

@@ -47,7 +47,6 @@ class TokenType(Enum):
     IDENT = auto()
     INT = auto()
     STRING = auto()  # "quoted string"
-    TYPE_ID = auto()  # @123
 
     # Punctuation
     LBRACE = auto()  # {
@@ -215,20 +214,6 @@ def read_number(self) -> str:
             self.advance()
         return self.source[start : self.pos]
 
-    def read_type_id(self) -> str:
-        """Read a type ID (@123)."""
-        self.advance()  # consume @
-        if not self.peek().isdigit():
-            raise LexerError(
-                f"Expected digit after '@', got '{self.peek()}'",
-                self.line,
-                self.column,
-            )
-        start = self.pos
-        while not self.at_end() and self.peek().isdigit():
-            self.advance()
-        return self.source[start : self.pos]
-
     def read_string(self) -> str:
         """Read a quoted string literal."""
         quote_char = self.advance()  # consume opening quote
@@ -279,11 +264,6 @@ def next_token(self) -> Token:
             value = self.read_string()
             return Token(TokenType.STRING, value, line, column)
 
-        # Type ID: @123
-        if ch == "@":
-            value = self.read_type_id()
-            return Token(TokenType.TYPE_ID, value, line, column)
-
         # Punctuation
         if ch in self.PUNCTUATION:
             self.advance()

compiler/fory_compiler/parser/parser.py

@@ -45,6 +45,12 @@
     "edition_defaults",
     "features",
 }
+
+# Known type-level options (for messages and enums)
+KNOWN_TYPE_OPTIONS: Set[str] = {
+    "id",
+    "deprecated",
+}
 from fory_compiler.parser.ast import (
     Schema,
     Message,
@@ -256,15 +262,17 @@ def parse_import(self) -> Import:
         )
 
     def parse_enum(self) -> Enum:
-        """Parse an enum: enum Color @101 { ... }"""
+        """Parse an enum: enum Color [id=101] { ... }"""
         start = self.current()
         self.consume(TokenType.ENUM)
         name = self.consume(TokenType.IDENT, "Expected enum name").value
 
-        # Optional type ID: @101
+        # Optional type options: [id=101, deprecated=true]
         type_id = None
-        if self.match(TokenType.TYPE_ID):
-            type_id = int(self.previous().value)
+        if self.check(TokenType.LBRACKET):
+            options = self.parse_type_options(name)
+            if "id" in options:
+                type_id = options["id"]
 
         self.consume(TokenType.LBRACE, "Expected '{' after enum name")
 
@@ -407,7 +415,7 @@ def parse_enum_value(self) -> EnumValue:
         )
 
     def parse_message(self) -> Message:
-        """Parse a message: message Dog @102 { ... }
+        """Parse a message: message Dog [id=102] { ... }
 
         Supports nested messages and enums:
             message Outer {
@@ -420,10 +428,12 @@ def parse_message(self) -> Message:
         self.consume(TokenType.MESSAGE)
         name = self.consume(TokenType.IDENT, "Expected message name").value
 
-        # Optional type ID: @102
+        # Optional type options: [id=102, deprecated=true]
         type_id = None
-        if self.match(TokenType.TYPE_ID):
-            type_id = int(self.previous().value)
+        if self.check(TokenType.LBRACKET):
+            options = self.parse_type_options(name)
+            if "id" in options:
+                type_id = options["id"]
 
         self.consume(TokenType.LBRACE, "Expected '{' after message name")
 
@@ -544,6 +554,65 @@ def parse_field_options(self, field_name: str):
 
         self.consume(TokenType.RBRACKET, "Expected ']' after field options")
 
+    def parse_type_options(self, type_name: str) -> dict:
+        """Parse type options: [id=100, deprecated=true]
+
+        Returns a dict of option names to values.
+        Warns about unknown options.
+        """
+        self.consume(TokenType.LBRACKET)
+        options = {}
+
+        while True:
+            # Parse option name
+            name_token = self.consume(TokenType.IDENT, "Expected option name")
+            option_name = name_token.value
+
+            self.consume(TokenType.EQUALS, "Expected '=' after option name")
+
+            # Parse option value (can be string, bool, int, or identifier)
+            if self.check(TokenType.STRING):
+                option_value = self.advance().value
+            elif self.check(TokenType.TRUE):
+                self.advance()
+                option_value = True
+            elif self.check(TokenType.FALSE):
+                self.advance()
+                option_value = False
+            elif self.check(TokenType.INT):
+                option_value = int(self.advance().value)
+            elif self.check(TokenType.IDENT):
+                option_value = self.advance().value
+            else:
+                raise self.error(f"Expected option value, got {self.current().type.name}")
+
+            # Validate 'id' option must be a positive integer
+            if option_name == "id":
+                if not isinstance(option_value, int):
+                    raise self.error(f"Type option 'id' must be an integer, got {type(option_value).__name__}")
+                if option_value <= 0:
+                    raise self.error(f"Type option 'id' must be a positive integer, got {option_value}")
+
+            # Warn about unknown type options
+            if option_name not in KNOWN_TYPE_OPTIONS:
+                warnings.warn(
+                    f"Line {name_token.line}: ignoring unknown type option '{option_name}' on type '{type_name}'",
+                    stacklevel=2
+                )
+
+            options[option_name] = option_value
+
+            # Check for comma (more options) or closing bracket (end)
+            if self.check(TokenType.COMMA):
+                self.advance()
+            elif self.check(TokenType.RBRACKET):
+                break
+            else:
+                raise self.error("Expected ',' or ']' in type options")
+
+        self.consume(TokenType.RBRACKET, "Expected ']' after type options")
+        return options
+
     def parse_type(self) -> FieldType:
         """Parse a type: int32, string, map<K, V>, Parent.Child, or a named type."""
         if self.check(TokenType.MAP):