@surrealdb/lezer 1.0.5 → 1.0.8

package/src/surrealql.grammar

@@ -32,6 +32,7 @@
 	filter
 	for
 	clause
+	flexibleAfter
 }
 
 expressions {
@@ -63,6 +64,7 @@ anyKeyword {
 	asc |
 	assert |
 	at |
+	async |
 	authenticate |
 	auto |
 	begin |
@@ -336,6 +338,7 @@ defineEventOptions {
 			value
 		} |
 		ThenClause {
+			async?
 			then
 			commaSep<(SubQuery | Block)>
 		} |
@@ -872,7 +875,12 @@ Range[since=2_0_0] {
 }
 
 Idiom {
-	Ident ( "." Ident )*
+	Ident idiomPart*
+}
+
+idiomPart {
+	"." ( Ident | AnyStar ) |
+	"[" AnyStar "]"
 }
 
 Path {
@@ -1096,7 +1104,7 @@ FieldAssignment {
 // Clauses
 
 MergeClause {
-	merge Object
+	merge value
 }
 
 PatchClause {
@@ -1384,9 +1392,9 @@ FunctionClause {
 }
 
 TypeClause {
-	flexible?
-	typeKeyword
-	type
+	( flexible typeKeyword type ) |
+	( typeKeyword type !flexibleAfter flexible ) |
+	( typeKeyword type )
 }
 
 ReadonlyClause[since=1_2_0] {
@@ -1593,12 +1601,13 @@ Operator {
 	CommentResult[@name=Comment,closedBy=CommentResultClose] { "-------- Query" ![\n]* }
 
 	// Numbers
-	Int { @digit+ }
-	frac { '.' @digit+ }
-	exp { $[eE] $[+\-]? @digit+ }
-	Float { (@digit+ (frac exp? | exp) "f"?) | "Infinity" | "NaN" }
-	Decimal { @digit+ frac? exp? "dec" }
-	VersionNumber { @digit+ ("." @digit+ ("." @digit+)?)? }
+	digitSeq { @digit+ ("_" @digit+)* }
+	Int { digitSeq }
+	frac { '.' digitSeq }
+	exp { $[eE] $[+\-]? digitSeq }
+	Float { (digitSeq "f") | (digitSeq (frac exp? | exp) "f"?) | "Infinity" | "NaN" }
+	Decimal { digitSeq frac? exp? "dec" }
+	VersionNumber { digitSeq ("." digitSeq ("." digitSeq)?)? }
 
 	String { "'" (!['\\] | "\\" _)* "'" | '"' (!["\\] | "\\" _)* '"' }
 	prefixedString[@name=String] { $[rudbf] String }
@@ -1631,7 +1640,7 @@ Operator {
 	Regex { "/" (![/\\\n[] | "\\" ![\n] | "[" (![\n\\\]] | "\\" ![\n])* "]")+ ("/" $[dgimsuvy]*)? }
 
 	durationUnit { "ns" | "us" | "µs" | "ms" | "s" | "m" | "h" | "d" | "w" | "y"}
-	DurationPart { @digit+ " "* durationUnit }
+	DurationPart { digitSeq " "* durationUnit }
 
 	@precedence { CommentResult Comment Int "-" }
 	@precedence { Comment binaryOperator }
@@ -1693,6 +1702,7 @@ piped<content> {
 	asc						[@name=Keyword],
 	assert					[@name=Keyword],
 	at						[@name=Keyword],
+	async					[@name=Keyword],
 	authenticate			[@name=Keyword],
 	auto					[@name=Keyword],
 	backend					[@name=Keyword],

package/src/tokens.js

@@ -25,6 +25,7 @@ import {
 	asc,
 	assert,
 	at,
+	async,
 	authenticate,
 	auto,
 	backend,
@@ -222,6 +223,7 @@ const tokenMap = {
 	asc,
 	assert,
 	at,
+	async,
 	authenticate,
 	auto,
 	backend,

package/test/statements/define.txt

@@ -46,6 +46,14 @@ DEFINE EVENT myevent ON TABLE person WHEN $event = "CREATE" THEN (CREATE log)
 
 SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),WhenClause(Keyword,BinaryExpression(VariableName,Operator,String)),ThenClause(Keyword,SubQuery(CreateStatement(Keyword,Ident)))))
 
+# Define event with async
+
+DEFINE EVENT e ON TABLE file WHEN $event = 'DELETE' ASYNC THEN { };
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),WhenClause(Keyword,BinaryExpression(VariableName,Operator,String)),ThenClause(Keyword,Keyword,Block(BraceOpen,BraceClose))))
+
 # Define field
 
 DEFINE FIELD name ON TABLE person TYPE string
@@ -86,6 +94,22 @@ DEFINE FIELD data ON TABLE person FLEXIBLE TYPE object
 
 SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,Keyword,TypeName)))
 
+# Define field with flexible after type clause
+
+DEFINE FIELD metadata ON TABLE user TYPE object FLEXIBLE
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,TypeName,Keyword)))
+
+# Define field flexible after parameterized object type
+
+DEFINE FIELD alternatives ON file TYPE option<object> FLEXIBLE
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Ident),TypeClause(Keyword,ParameterizedType(TypeName,"<",TypeName,">"),Keyword)))
+
 # Define field with permissions
 
 DEFINE FIELD secret ON TABLE person TYPE string PERMISSIONS FOR select, create WHERE $auth.admin = true
@@ -110,6 +134,30 @@ DEFINE FIELD fullname ON TABLE person COMPUTED $value.first + " " + $value.last
 
 SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident),OnTableClause(Keyword,Keyword,Ident),ComputedClause(Keyword,BinaryExpression(BinaryExpression(Path(VariableName,Subscript(Ident)),Operator,String),Operator,Path(VariableName,Subscript(Ident))))))
 
+# Define field on array items
+
+DEFINE FIELD children.* ON parent TYPE record<child> PERMISSIONS FULL
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident,Any),OnTableClause(Keyword,Ident),TypeClause(Keyword,ParameterizedType(TypeName,"<",TypeName,">")),PermissionsForClause(Keyword,Literal)))
+
+# Define field on array items with bracket wildcard
+
+DEFINE FIELD tags[*] ON TABLE person TYPE string
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident,"[",Any,"]"),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,TypeName)))
+
+# Define field nested below array items
+
+DEFINE FIELD comments.*.title ON TABLE post TYPE string
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Idiom(Ident,Any,Ident),OnTableClause(Keyword,Keyword,Ident),TypeClause(Keyword,TypeName)))
+
 # Define index unique
 
 DEFINE INDEX idx_email ON TABLE person FIELDS email UNIQUE
@@ -118,6 +166,14 @@ DEFINE INDEX idx_email ON TABLE person FIELDS email UNIQUE
 
 SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),FieldsColumnsClause(Keyword,Idiom(Ident)),IndexClause(UniqueClause(Keyword))))
 
+# Define index on array items
+
+DEFINE INDEX idx_tags ON TABLE person FIELDS tags.* UNIQUE
+
+==>
+
+SurrealQL(DefineStatement(Keyword,Keyword,Ident,OnTableClause(Keyword,Keyword,Ident),FieldsColumnsClause(Keyword,Idiom(Ident,Any)),IndexClause(UniqueClause(Keyword))))
+
 # Define index search analyzer
 
 DEFINE INDEX idx_search ON TABLE person FIELDS name SEARCH ANALYZER my_analyzer BM25

package/test/statements/update.txt

@@ -38,6 +38,14 @@ UPDATE person MERGE {age: 31}
 
 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
 
 UPDATE person REPLACE {name: "Tobie"}

package/test/values/numbers.txt

@@ -32,11 +32,23 @@ SurrealQL(Number(Float),Number(Float),Number(Float),Number(Float))
 # Float with f suffix
 
 2e4f;
-3.14f
+3.14f;
+100f
 
 ==>
 
-SurrealQL(Number(Float),Number(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