@surrealdb/lezer 1.0.4 → 1.0.8

package/test/statements/if-else.txt

@@ -4,7 +4,7 @@ IF $age > 18 { RETURN "adult" }
 
 ==>
 
-SurrealQL(IfElseStatement(Keyword,Modern(BinaryExpression(VariableName,Operator,Int),Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose))))
+SurrealQL(IfElseStatement(Keyword,Modern(BinaryExpression(VariableName,Operator,Number(Int)),Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose))))
 
 # Modern if else
 
@@ -12,7 +12,7 @@ IF $age > 18 { RETURN "adult" } ELSE { RETURN "minor" }
 
 ==>
 
-SurrealQL(IfElseStatement(Keyword,Modern(BinaryExpression(VariableName,Operator,Int),Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose),Keyword,Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose))))
+SurrealQL(IfElseStatement(Keyword,Modern(BinaryExpression(VariableName,Operator,Number(Int)),Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose),Keyword,Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose))))
 
 # Modern if else if else
 
@@ -20,7 +20,7 @@ IF $age > 65 { RETURN "senior" } ELSE IF $age > 18 { RETURN "adult" } ELSE { RET
 
 ==>
 
-SurrealQL(IfElseStatement(Keyword,Modern(BinaryExpression(VariableName,Operator,Int),Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose),Keyword,Keyword,BinaryExpression(VariableName,Operator,Int),Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose),Keyword,Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose))))
+SurrealQL(IfElseStatement(Keyword,Modern(BinaryExpression(VariableName,Operator,Number(Int)),Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose),Keyword,Keyword,BinaryExpression(VariableName,Operator,Number(Int)),Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose),Keyword,Block(BraceOpen,ReturnStatement(Keyword,String),BraceClose))))
 
 # Legacy if then end
 
@@ -28,7 +28,7 @@ IF $age > 18 THEN (RETURN "adult") END
 
 ==>
 
-SurrealQL(IfElseStatement(Keyword,Legacy(BinaryExpression(VariableName,Operator,Int),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword)))
+SurrealQL(IfElseStatement(Keyword,Legacy(BinaryExpression(VariableName,Operator,Number(Int)),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword)))
 
 # Legacy if then else end
 
@@ -36,7 +36,7 @@ IF $age > 18 THEN (RETURN "adult") ELSE (RETURN "minor") END
 
 ==>
 
-SurrealQL(IfElseStatement(Keyword,Legacy(BinaryExpression(VariableName,Operator,Int),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword)))
+SurrealQL(IfElseStatement(Keyword,Legacy(BinaryExpression(VariableName,Operator,Number(Int)),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword)))
 
 # Legacy if then else if then else end
 
@@ -44,4 +44,4 @@ IF $age > 65 THEN (RETURN "senior") ELSE IF $age > 18 THEN (RETURN "adult") ELSE
 
 ==>
 
-SurrealQL(IfElseStatement(Keyword,Legacy(BinaryExpression(VariableName,Operator,Int),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword,Keyword,BinaryExpression(VariableName,Operator,Int),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword)))
+SurrealQL(IfElseStatement(Keyword,Legacy(BinaryExpression(VariableName,Operator,Number(Int)),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword,Keyword,BinaryExpression(VariableName,Operator,Number(Int)),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword,SubQuery(ReturnStatement(Keyword,String)),Keyword)))

package/test/statements/insert.txt

@@ -12,7 +12,7 @@ INSERT INTO person (name, age) VALUES ("Tobie", 30)
 
 ==>
 
-SurrealQL(InsertStatement(Keyword,Keyword,Ident,Ident,Ident,Keyword,String,Int))
+SurrealQL(InsertStatement(Keyword,Keyword,Ident,Ident,Ident,Keyword,String,Number(Int)))
 
 # Insert with IGNORE
 
@@ -44,7 +44,7 @@ INSERT INTO person {name: "Tobie"} ON DUPLICATE KEY UPDATE age = 31
 
 ==>
 
-SurrealQL(InsertStatement(Keyword,Keyword,Ident,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,String)),BraceClose),Keyword,Keyword,Keyword,Keyword,FieldAssignment(Ident,Operator,Int)))
+SurrealQL(InsertStatement(Keyword,Keyword,Ident,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,String)),BraceClose),Keyword,Keyword,Keyword,Keyword,FieldAssignment(Ident,Operator,Number(Int))))
 
 # Insert with RETURN
 

package/test/statements/let.txt

@@ -12,7 +12,7 @@ LET $age = 30
 
 ==>
 
-SurrealQL(LetStatement(Keyword,ParamDefinition(VariableName),Int))
+SurrealQL(LetStatement(Keyword,ParamDefinition(VariableName),Number(Int)))
 
 # Let with subquery in parens
 
@@ -20,7 +20,7 @@ LET $bla = (SELECT * FROM 123)
 
 ==>
 
-SurrealQL(LetStatement(Keyword,ParamDefinition(VariableName),SubQuery(SelectStatement(Keyword,Fields(Any),Keyword,Int))))
+SurrealQL(LetStatement(Keyword,ParamDefinition(VariableName),SubQuery(SelectStatement(Keyword,Fields(Any),Keyword,Number(Int)))))
 
 # Let with subquery statement
 
@@ -28,7 +28,7 @@ LET $bla = SELECT * FROM 123
 
 ==>
 
-SurrealQL(LetStatement(Keyword,ParamDefinition(VariableName),SelectStatement(Keyword,Fields(Any),Keyword,Int)))
+SurrealQL(LetStatement(Keyword,ParamDefinition(VariableName),SelectStatement(Keyword,Fields(Any),Keyword,Number(Int))))
 
 # Let with typed parameter
 

package/test/statements/live.txt

@@ -36,7 +36,7 @@ LIVE SELECT * FROM person WHERE age > 18
 
 ==>
 
-SurrealQL(LiveSelectStatement(Keyword,Keyword,Any,Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Int))))
+SurrealQL(LiveSelectStatement(Keyword,Keyword,Any,Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Number(Int)))))
 
 # Kill statement
 

package/test/statements/return.txt

@@ -4,7 +4,7 @@ RETURN 42
 
 ==>
 
-SurrealQL(ReturnStatement(Keyword,Int))
+SurrealQL(ReturnStatement(Keyword,Number(Int)))
 
 # Return string
 
@@ -20,7 +20,7 @@ RETURN 1 + 2
 
 ==>
 
-SurrealQL(ReturnStatement(Keyword,BinaryExpression(Int,Operator,Int)))
+SurrealQL(ReturnStatement(Keyword,BinaryExpression(Number(Int),Operator,Number(Int))))
 
 # Return variable
 

package/test/statements/select.txt

@@ -44,7 +44,7 @@ SELECT * FROM person WHERE age > 18
 
 ==>
 
-SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Int))))
+SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Number(Int)))))
 
 # Select with ORDER BY
 
@@ -84,7 +84,7 @@ SELECT * FROM person LIMIT 10
 
 ==>
 
-SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(LimitClause(Keyword,Int))))
+SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(LimitClause(Keyword,Number(Int)))))
 
 # Select with LIMIT BY
 
@@ -92,7 +92,7 @@ SELECT * FROM person LIMIT BY 10
 
 ==>
 
-SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(LimitClause(Keyword,Keyword,Int))))
+SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(LimitClause(Keyword,Keyword,Number(Int)))))
 
 # Select with START
 
@@ -100,7 +100,7 @@ SELECT * FROM person START 5
 
 ==>
 
-SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(StartClause(Keyword,Int))))
+SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(StartClause(Keyword,Number(Int)))))
 
 # Select with START AT
 
@@ -108,7 +108,7 @@ SELECT * FROM person START AT 5
 
 ==>
 
-SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(StartClause(Keyword,Keyword,Int))))
+SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(StartClause(Keyword,Keyword,Number(Int)))))
 
 # Select with LIMIT and START
 
@@ -116,7 +116,7 @@ SELECT * FROM person LIMIT 10 START 5
 
 ==>
 
-SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(LimitClause(Keyword,Int),StartClause(Keyword,Int))))
+SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,LimitStartComboClause(LimitClause(Keyword,Number(Int)),StartClause(Keyword,Number(Int)))))
 
 # Select with FETCH
 
@@ -124,7 +124,7 @@ SELECT * FROM person FETCH posts
 
 ==>
 
-SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,FetchClause(Keyword,Path(Ident,⚠))))
+SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,FetchClause(Keyword,Idiom(Ident))))
 
 # Select with SPLIT
 
@@ -212,7 +212,7 @@ SELECT * FROM person WHERE age > 18 ORDER BY name LIMIT 10
 
 ==>
 
-SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Int)),OrderClause(Keyword,Keyword,Order(Idiom(Ident))),LimitStartComboClause(LimitClause(Keyword,Int))))
+SurrealQL(SelectStatement(Keyword,Fields(Any),Keyword,Ident,WhereClause(Keyword,BinaryExpression(Ident,Operator,Number(Int))),OrderClause(Keyword,Keyword,Order(Idiom(Ident))),LimitStartComboClause(LimitClause(Keyword,Number(Int)))))
 
 # Select from multiple targets
 

package/test/statements/show.txt

@@ -20,7 +20,7 @@ SHOW CHANGES FOR TABLE person LIMIT 10
 
 ==>
 
-SurrealQL(ShowStatement(Keyword,Keyword,Keyword,Keyword,Ident,Keyword,Int))
+SurrealQL(ShowStatement(Keyword,Keyword,Keyword,Keyword,Ident,Keyword,Number(Int)))
 
 # Show changes with since and limit
 
@@ -28,4 +28,4 @@ SHOW CHANGES FOR TABLE person SINCE "2024-01-01T00:00:00Z" LIMIT 10
 
 ==>
 
-SurrealQL(ShowStatement(Keyword,Keyword,Keyword,Keyword,Ident,Keyword,String,Keyword,Int))
+SurrealQL(ShowStatement(Keyword,Keyword,Keyword,Keyword,Ident,Keyword,String,Keyword,Number(Int)))

package/test/statements/update.txt

@@ -20,7 +20,7 @@ UPDATE person SET age = 31
 
 ==>
 
-SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Int))))
+SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Number(Int)))))
 
 # Update with CONTENT
 
@@ -36,7 +36,15 @@ UPDATE person MERGE {age: 31}
 
 ==>
 
-SurrealQL(UpdateStatement(Keyword,Ident,MergeClause(Keyword,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Int)),BraceClose))))
+SurrealQL(UpdateStatement(Keyword,Ident,MergeClause(Keyword,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Number(Int))),BraceClose))))
+
+# Update path target with MERGE expression
+
+UPDATE $object.id MERGE ($object + {updatedBy: $user});
+
+==>
+
+SurrealQL(UpdateStatement(Keyword,Path(VariableName,Subscript(Ident)),MergeClause(Keyword,SubQuery(BinaryExpression(VariableName,Operator,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,VariableName)),BraceClose))))))
 
 # Update with REPLACE
 
@@ -52,7 +60,7 @@ UPDATE person UNSET temp = 0
 
 ==>
 
-SurrealQL(UpdateStatement(Keyword,Ident,UnsetClause(Keyword,FieldAssignment(Ident,Operator,Int))))
+SurrealQL(UpdateStatement(Keyword,Ident,UnsetClause(Keyword,FieldAssignment(Ident,Operator,Number(Int)))))
 
 # Update with WHERE
 
@@ -60,7 +68,7 @@ UPDATE person SET age = 31 WHERE name = "Tobie"
 
 ==>
 
-SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Int)),WhereClause(Keyword,BinaryExpression(Ident,Operator,String))))
+SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Number(Int))),WhereClause(Keyword,BinaryExpression(Ident,Operator,String))))
 
 # Update with RETURN
 
@@ -68,7 +76,7 @@ UPDATE person SET age = 31 RETURN AFTER
 
 ==>
 
-SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Int)),ReturnClause(Keyword,Literal)))
+SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Number(Int))),ReturnClause(Keyword,Literal)))
 
 # Update with TIMEOUT
 
@@ -76,7 +84,7 @@ UPDATE person SET age = 31 TIMEOUT 5s
 
 ==>
 
-SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Int)),TimeoutClause(Keyword,Duration(DurationPart))))
+SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Number(Int))),TimeoutClause(Keyword,Duration(DurationPart))))
 
 # Update with PARALLEL
 
@@ -84,4 +92,4 @@ UPDATE person SET age = 31 PARALLEL
 
 ==>
 
-SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Int)),ParallelClause(Keyword)))
+SurrealQL(UpdateStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Number(Int))),ParallelClause(Keyword)))

package/test/statements/upsert.txt

@@ -36,7 +36,7 @@ UPSERT person MERGE {age: 31}
 
 ==>
 
-SurrealQL(UpsertStatement(Keyword,Ident,MergeClause(Keyword,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Int)),BraceClose))))
+SurrealQL(UpsertStatement(Keyword,Ident,MergeClause(Keyword,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Number(Int))),BraceClose))))
 
 # Upsert with WHERE
 
@@ -44,7 +44,7 @@ UPSERT person SET age = 31 WHERE name = "Tobie"
 
 ==>
 
-SurrealQL(UpsertStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Int)),WhereClause(Keyword,BinaryExpression(Ident,Operator,String))))
+SurrealQL(UpsertStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Number(Int))),WhereClause(Keyword,BinaryExpression(Ident,Operator,String))))
 
 # Upsert with RETURN
 
@@ -52,4 +52,4 @@ UPSERT person SET age = 31 RETURN AFTER
 
 ==>
 
-SurrealQL(UpsertStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Int)),ReturnClause(Keyword,Literal)))
+SurrealQL(UpsertStatement(Keyword,Ident,SetClause(Keyword,FieldAssignment(Ident,Operator,Number(Int))),ReturnClause(Keyword,Literal)))

package/test/values/arrays.txt

@@ -12,7 +12,7 @@ SurrealQL(Array("[","]"))
 
 ==>
 
-SurrealQL(Array("[",Int,"]"))
+SurrealQL(Array("[",Number(Int),"]"))
 
 # Multiple elements
 
@@ -20,7 +20,7 @@ SurrealQL(Array("[",Int,"]"))
 
 ==>
 
-SurrealQL(Array("[",Int,Int,Int,"]"))
+SurrealQL(Array("[",Number(Int),Number(Int),Number(Int),"]"))
 
 # Trailing comma
 
@@ -28,7 +28,7 @@ SurrealQL(Array("[",Int,Int,Int,"]"))
 
 ==>
 
-SurrealQL(Array("[",Int,Int,Int,"]"))
+SurrealQL(Array("[",Number(Int),Number(Int),Number(Int),"]"))
 
 # Nested arrays
 
@@ -36,7 +36,7 @@ SurrealQL(Array("[",Int,Int,Int,"]"))
 
 ==>
 
-SurrealQL(Array("[",Array("[",Int,Int,"]"),Array("[",Int,Int,"]"),"]"))
+SurrealQL(Array("[",Array("[",Number(Int),Number(Int),"]"),Array("[",Number(Int),Number(Int),"]"),"]"))
 
 # Mixed types
 
@@ -44,4 +44,4 @@ SurrealQL(Array("[",Array("[",Int,Int,"]"),Array("[",Int,Int,"]"),"]"))
 
 ==>
 
-SurrealQL(Array("[",Int,String,Bool,None,"]"))
+SurrealQL(Array("[",Number(Int),String,Bool,None,"]"))

package/test/values/closures.txt

@@ -4,7 +4,7 @@
 
 ==>
 
-SurrealQL(Closure(Pipe,Pipe,Block(BraceOpen,Int,BraceClose)))
+SurrealQL(Closure(Pipe,Pipe,Block(BraceOpen,Number(Int),BraceClose)))
 
 # Closure with param
 
@@ -20,7 +20,7 @@ SurrealQL(Closure(Pipe,ParamDefinition(VariableName),Pipe,Block(BraceOpen,Variab
 
 ==>
 
-SurrealQL(Closure(Pipe,ParamDefinition(VariableName,Colon,Type(TypeName)),Pipe,Block(BraceOpen,BinaryExpression(VariableName,Operator,Int),BraceClose)))
+SurrealQL(Closure(Pipe,ParamDefinition(VariableName,Colon,Type(TypeName)),Pipe,Block(BraceOpen,BinaryExpression(VariableName,Operator,Number(Int)),BraceClose)))
 
 # Closure with multiple params
 
@@ -36,4 +36,4 @@ SurrealQL(Closure(Pipe,ParamDefinition(VariableName),ParamDefinition(VariableNam
 
 ==>
 
-SurrealQL(Closure(Pipe,ParamDefinition(VariableName,Colon,Type(TypeName)),Pipe,LookupRight,TypeName,Block(BraceOpen,BinaryExpression(VariableName,Operator,Int),BraceClose)))
+SurrealQL(Closure(Pipe,ParamDefinition(VariableName,Colon,Type(TypeName)),Pipe,LookupRight,TypeName,Block(BraceOpen,BinaryExpression(VariableName,Operator,Number(Int)),BraceClose)))

package/test/values/format-strings.txt

@@ -12,7 +12,7 @@ $"result is {1 + 2 + 3}"
 
 ==>
 
-SurrealQL(FormatString(Interpolation(BraceOpen,BinaryExpression(BinaryExpression(Int,Operator,Int),Operator,Int),BraceClose)))
+SurrealQL(FormatString(Interpolation(BraceOpen,BinaryExpression(BinaryExpression(Number(Int),Operator,Number(Int)),Operator,Number(Int)),BraceClose)))
 
 # Escaped quote in format string
 
@@ -20,7 +20,7 @@ $"some \" quote {1 + 2 + 3} and \{ some } brackets"
 
 ==>
 
-SurrealQL(FormatString(Interpolation(BraceOpen,BinaryExpression(BinaryExpression(Int,Operator,Int),Operator,Int),BraceClose)))
+SurrealQL(FormatString(Interpolation(BraceOpen,BinaryExpression(BinaryExpression(Number(Int),Operator,Number(Int)),Operator,Number(Int)),BraceClose)))
 
 # Nested format strings
 
@@ -28,7 +28,7 @@ $'nested {$"string {22}"}'
 
 ==>
 
-SurrealQL(FormatString(Interpolation(BraceOpen,FormatString(Interpolation(BraceOpen,Int,BraceClose)),BraceClose)))
+SurrealQL(FormatString(Interpolation(BraceOpen,FormatString(Interpolation(BraceOpen,Number(Int),BraceClose)),BraceClose)))
 
 # Single quoted format string
 

package/test/values/geometries.txt

@@ -4,7 +4,7 @@
 
 ==>
 
-SurrealQL(Point(Decimal,Decimal))
+SurrealQL(Point(Number(Decimal),Number(Decimal)))
 
 # Point with integers
 
@@ -12,7 +12,7 @@ SurrealQL(Point(Decimal,Decimal))
 
 ==>
 
-SurrealQL(Point(Int,Int))
+SurrealQL(Point(Number(Int),Number(Int)))
 
 # Point with floats
 
@@ -20,4 +20,4 @@ SurrealQL(Point(Int,Int))
 
 ==>
 
-SurrealQL(Point(Float,Float))
+SurrealQL(Point(Number(Float),Number(Float)))

package/test/values/idioms.txt

@@ -60,7 +60,7 @@ SurrealQL(SelectStatement(Keyword,Fields(Predicate(Path(Lookup(LookupRight,Ident
 
 ==>
 
-SurrealQL(Path(Int,Subscript(IdiomFunction(FunctionName,ArgumentList))))
+SurrealQL(Path(Number(Int),Subscript(IdiomFunction(FunctionName,ArgumentList))))
 
 # Filter with variable key
 
@@ -100,7 +100,7 @@ SurrealQL(Path(RecordId(RecordTbIdent,Colon,RecordIdIdent),Filter("[",Ident,"]")
 
 ==>
 
-SurrealQL(Path(Array("[","]"),Filter("[",Int,"]")))
+SurrealQL(Path(Array("[","]"),Filter("[",Number(Int),"]")))
 
 # Array variable access
 
@@ -116,7 +116,7 @@ SurrealQL(Path(Array("[","]"),Filter("[",VariableName,"]")))
 
 ==>
 
-SurrealQL(Path(Array("[","]"),Filter("[",WhereClause(Keyword,BinaryExpression(Ident,Operator,Int)),"]")))
+SurrealQL(Path(Array("[","]"),Filter("[",WhereClause(Keyword,BinaryExpression(Ident,Operator,Number(Int))),"]")))
 
 # Array question mark filter
 
@@ -124,7 +124,7 @@ SurrealQL(Path(Array("[","]"),Filter("[",WhereClause(Keyword,BinaryExpression(Id
 
 ==>
 
-SurrealQL(Path(Array("[","]"),Filter("[",WhereClause(BinaryExpression(Ident,Operator,Int)),"]")))
+SurrealQL(Path(Array("[","]"),Filter("[",WhereClause(BinaryExpression(Ident,Operator,Number(Int))),"]")))
 
 # Recurse unbounded
 
@@ -175,7 +175,7 @@ a:b.{1}
 
 SurrealQL(Path(
   RecordId(RecordTbIdent,Colon,RecordIdIdent),
-  Subscript(Recurse(BraceOpen,RecurseRange(Int),RecurseOptions,BraceClose))
+  Subscript(Recurse(BraceOpen,RecurseRange(Number(Int)),RecurseOptions,BraceClose))
 ))
 
 # Recurse with min range
@@ -186,7 +186,7 @@ a:b.{1..}
 
 SurrealQL(Path(
   RecordId(RecordTbIdent,Colon,RecordIdIdent),
-  Subscript(Recurse(BraceOpen,RecurseRange(Int,RangeOp),RecurseOptions,BraceClose))
+  Subscript(Recurse(BraceOpen,RecurseRange(Number(Int),RangeOp),RecurseOptions,BraceClose))
 ))
 
 # Recurse with full range
@@ -197,7 +197,7 @@ a:b.{1..2}
 
 SurrealQL(Path(
   RecordId(RecordTbIdent,Colon,RecordIdIdent),
-  Subscript(Recurse(BraceOpen,RecurseRange(Int,RangeOp,Int),RecurseOptions,BraceClose))
+  Subscript(Recurse(BraceOpen,RecurseRange(Number(Int),RangeOp,Number(Int)),RecurseOptions,BraceClose))
 ))
 
 # Recurse with max range
@@ -208,7 +208,7 @@ a:b.{..2}
 
 SurrealQL(Path(
   RecordId(RecordTbIdent,Colon,RecordIdIdent),
-  Subscript(Recurse(BraceOpen,RecurseRange(RangeOp,Int),RecurseOptions,BraceClose))
+  Subscript(Recurse(BraceOpen,RecurseRange(RangeOp,Number(Int)),RecurseOptions,BraceClose))
 ))
 
 # At reference with subscript

package/test/values/numbers.txt

@@ -6,7 +6,7 @@
 
 ==>
 
-SurrealQL(Int,Int,Int)
+SurrealQL(Number(Int),Number(Int),Number(Int))
 
 # Float
 
@@ -16,7 +16,7 @@ SurrealQL(Int,Int,Int)
 
 ==>
 
-SurrealQL(Float,Float,Float)
+SurrealQL(Number(Float),Number(Float),Number(Float))
 
 # Float with exponent
 
@@ -27,16 +27,28 @@ SurrealQL(Float,Float,Float)
 
 ==>
 
-SurrealQL(Float,Float,Float,Float)
+SurrealQL(Number(Float),Number(Float),Number(Float),Number(Float))
 
 # Float with f suffix
 
 2e4f;
-3.14f
+3.14f;
+100f
 
 ==>
 
-SurrealQL(Float,Float)
+SurrealQL(Number(Float),Number(Float),Number(Float))
+
+# Underscore separators
+
+1_000_000;
+1_000_000.99;
+1_000.5f;
+2_000_000dec
+
+==>
+
+SurrealQL(Number(Int),Number(Float),Number(Float),Number(Decimal))
 
 # Float special values
 
@@ -45,7 +57,7 @@ NaN
 
 ==>
 
-SurrealQL(Float,Float)
+SurrealQL(Number(Float),Number(Float))
 
 # Decimal
 
@@ -54,7 +66,7 @@ SurrealQL(Float,Float)
 
 ==>
 
-SurrealQL(Decimal,Decimal)
+SurrealQL(Number(Decimal),Number(Decimal))
 
 # Negative numbers
 
@@ -63,7 +75,7 @@ SurrealQL(Decimal,Decimal)
 
 ==>
 
-SurrealQL(Int,Float)
+SurrealQL(Number(Int),Number(Float))
 
 # Positive explicit sign
 
@@ -72,4 +84,4 @@ SurrealQL(Int,Float)
 
 ==>
 
-SurrealQL(Int,Float)
+SurrealQL(Number(Int),Number(Float))

package/test/values/objects.txt

@@ -4,7 +4,7 @@
 
 ==>
 
-SurrealQL(Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Int)),BraceClose))
+SurrealQL(Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Number(Int))),BraceClose))
 
 # Object with string keys
 
@@ -13,8 +13,8 @@ SurrealQL(Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon
 ==>
 
 SurrealQL(Object(BraceOpen,ObjectContent(
-  ObjectProperty(ObjectKey(String),Colon,Int),
-  ObjectProperty(ObjectKey(String),Colon,Int)
+  ObjectProperty(ObjectKey(String),Colon,Number(Int)),
+  ObjectProperty(ObjectKey(String),Colon,Number(Int))
 ),BraceClose))
 
 # Empty object
@@ -49,8 +49,8 @@ SurrealQL(Block(BraceOpen,Ident,BraceClose))
 ==>
 
 SurrealQL(
-  Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Int)),BraceClose),
-  Int
+  Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Number(Int))),BraceClose),
+  Number(Int)
 )
 
 # Nested objects
@@ -60,5 +60,5 @@ SurrealQL(
 ==>
 
 SurrealQL(Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,
-  Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Int)),BraceClose)
+  Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Number(Int))),BraceClose)
 )),BraceClose))

package/test/values/ranges.txt

@@ -4,7 +4,7 @@
 
 ==>
 
-SurrealQL(Range(Int,RangeOp,Int))
+SurrealQL(Range(Number(Int),RangeOp,Number(Int)))
 
 # Right-open range
 
@@ -12,7 +12,7 @@ SurrealQL(Range(Int,RangeOp,Int))
 
 ==>
 
-SurrealQL(Range(Int,RangeOp))
+SurrealQL(Range(Number(Int),RangeOp))
 
 # Left-open inclusive range
 
@@ -28,4 +28,4 @@ SurrealQL(Range(RangeOp,String))
 
 ==>
 
-SurrealQL(Range(Int,RangeOp,Int))
+SurrealQL(Range(Number(Int),RangeOp,Number(Int)))

package/test/values/record-ids.txt

@@ -52,7 +52,7 @@ test:{a: 1}
 
 ==>
 
-SurrealQL(RecordId(RecordTbIdent,Colon,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Int)),BraceClose)))
+SurrealQL(RecordId(RecordTbIdent,Colon,Object(BraceOpen,ObjectContent(ObjectProperty(ObjectKey(KeyName),Colon,Number(Int))),BraceClose)))
 
 # Record ID with array value
 
@@ -60,7 +60,7 @@ test:[1, 2]
 
 ==>
 
-SurrealQL(RecordId(RecordTbIdent,Colon,Array("[",Int,Int,"]")))
+SurrealQL(RecordId(RecordTbIdent,Colon,Array("[",Number(Int),Number(Int),"]")))
 
 # Record ID with prefixed string value
 

package/test/values/sets.txt

@@ -4,7 +4,7 @@
 
 ==>
 
-SurrealQL(Set(BraceOpen,Int,BraceClose))
+SurrealQL(Set(BraceOpen,Number(Int),BraceClose))
 
 # Set with lone comma
 
@@ -20,7 +20,7 @@ SurrealQL(Set(BraceOpen,BraceClose))
 
 ==>
 
-SurrealQL(Set(BraceOpen,Int,Int,BraceClose))
+SurrealQL(Set(BraceOpen,Number(Int),Number(Int),BraceClose))
 
 # Set with three elements
 
@@ -28,4 +28,4 @@ SurrealQL(Set(BraceOpen,Int,Int,BraceClose))
 
 ==>
 
-SurrealQL(Set(BraceOpen,Int,Int,Int,BraceClose))
+SurrealQL(Set(BraceOpen,Number(Int),Number(Int),Number(Int),BraceClose))