@surrealdb/lezer 1.0.3 → 1.0.5

package/src/surrealql.grammar

@@ -345,7 +345,8 @@ defineEventOptions {
 
 defineDatabaseOptions {
 	(IfNotExistsClause | OverwriteClause)?
-	value on value
+	value
+	strict?
 	CommentClause?
 }
 
@@ -548,6 +549,33 @@ RemoveStatement {
 	)
 }
 
+// Clause groups
+
+modifierClause[@isGroup=ModifierClause] {
+	WithClause |
+	WhereClause |
+	SplitClause |
+	GroupClause |
+	OrderClause |
+	LimitStartComboClause |
+	FetchClause |
+	TimeoutClause |
+	ParallelClause |
+	TempfilesClause |
+	ExplainClause |
+	VersionClause |
+	ReturnClause
+}
+
+dataClause[@isGroup=DataClause] {
+	ContentClause |
+	SetClause |
+	MergeClause |
+	PatchClause |
+	ReplaceClause |
+	UnsetClause
+}
+
 // Data statements
 
 CreateStatement {
@@ -571,20 +599,7 @@ SelectStatement {
 		statement |
 		(
 			commaSep<value>
-			(
-				WithClause |
-				WhereClause |
-				SplitClause |
-				GroupClause |
-				OrderClause |
-				LimitStartComboClause |
-				FetchClause |
-				TimeoutClause |
-				ParallelClause |
-				TempfilesClause |
-				ExplainClause |
-				VersionClause
-			)*
+			modifierClause*
 		)
 	)
 }
@@ -629,7 +644,7 @@ InsertStatement {
 		on duplicate key update
 		commaSep<FieldAssignment>
 	)?
-	InsertReturnClause[since=2_0_0] { ReturnClause? }
+	ReturnClause?
 }
 
 UpdateStatement {
@@ -638,14 +653,7 @@ UpdateStatement {
 		statement |
 		(
 			commaSep<value>
-			(
-				ContentClause |
-				ReplaceClause |
-				MergeClause |
-				PatchClause |
-				SetClause |
-				UnsetClause
-			)?
+			dataClause?
 			updateOptionals {
 				WhereClause?
 				ReturnClause?
@@ -662,14 +670,7 @@ UpsertStatement[since=2_0_0] {
 		statement |
 		(
 			commaSep<value>
-			(
-				ContentClause |
-				ReplaceClause |
-				MergeClause |
-				PatchClause |
-				SetClause |
-				UnsetClause
-			)?
+			dataClause?
 			upsertOptionals {
 				WhereClause?
 				ReturnClause?
@@ -777,7 +778,7 @@ ShowStatement {
 	show changes for table
 	Ident
 	( since String )?
-	( limit number )?
+	( limit Number )?
 }
 
 // Sleep statement
@@ -815,30 +816,34 @@ RebuildStatement[since=1_5_0] {
 
 // Values
 
-baseValue {
+computedValue[@isGroup=Value] {
 	String |
 	prefixedString |
-	FormatString |
-	number |
+	Number |
 	true |
 	false |
 	null |
 	none |
-	Regex |
-	VariableName |
-	Ident[@dynamicPrecedence=-1] { rawident } |
 	Array |
 	Set |
 	RecordId |
+	Object |
+	Duration |
+	Point { "(" Number "," Number ")" }
+}
+
+baseValue[@isGroup=Value] {
+	computedValue |
+	FormatString |
+	Regex |
+	VariableName |
+	Ident[@dynamicPrecedence=-1] { rawident } |
 	FunctionJs |
 	FunctionCall |
 	SubQuery |
 	Block |
 	Closure |
-	Object |
-	TypeCast |
-	Duration |
-	Point { "(" number "," number ")" }
+	TypeCast
 }
 
 value[@isGroup=Value] {
@@ -939,11 +944,11 @@ Recurse[since=2_1_0] {
 }
 
 RecurseRange {
-	number |
+	Number |
 	rangeOpOpenBoth |
-	number rangeOpOpenRight |
-	rangeOpOpenLeft number |
-	number rangeOp number
+	Number rangeOpOpenRight |
+	rangeOpOpenLeft Number |
+	Number rangeOp Number
 }
 
 RecurseOptions[since=2_2_0] {
@@ -1004,7 +1009,7 @@ RecordTbIdent {
 	bracketIdent
 }
 
-// Ideally we match "number" here, but I cannot for the life of me get it to
+// Ideally we match "Number" here, but I cannot for the life of me get it to
 // fall back to numberident after. This will suffice for now.
 RecordIdIdent {
 	numberident |
@@ -1198,15 +1203,15 @@ SearchAnalyzerClause {
 	)*
 }
 
-Bm25Clause { bm25 ( "(" number "," number ")")? }
-DocIdsCacheClause { doc_ids_cache number }
-DocIdsOrderClause { doc_ids_order number }
-DocLenghtsCacheClause { doc_lengths_cache number }
-DocLenghtsOrderClause { doc_lengths_order number }
-PostingsCacheClause { postings_cache number }
-PostingsOrderClause { postings_order number }
-TermsCacheClause { terms_cache number }
-TermsOrderClause { terms_order number }
+Bm25Clause { bm25 ( "(" Number "," Number ")")? }
+DocIdsCacheClause { doc_ids_cache Number }
+DocIdsOrderClause { doc_ids_order Number }
+DocLenghtsCacheClause { doc_lengths_cache Number }
+DocLenghtsOrderClause { doc_lengths_order Number }
+PostingsCacheClause { postings_cache Number }
+PostingsOrderClause { postings_order Number }
+TermsCacheClause { terms_cache Number }
+TermsOrderClause { terms_order Number }
 
 MtreeClause[since=1_3_0] {
 	mtree
@@ -1221,7 +1226,7 @@ MtreeClause[since=1_3_0] {
 	)*
 }
 
-MtreeCacheClause { mtree_cache number }
+MtreeCacheClause { mtree_cache Number }
 MtreeDistClause { dist ( Distance ) }
 
 HnswClause[since=1_5_0] {
@@ -1240,14 +1245,14 @@ IndexDimensionClause
 	)*
 }
 
-HnswDistClause { dist ( Distance | ( minkowski number )) }
+HnswDistClause { dist ( Distance | ( minkowski Number )) }
 
-IndexDimensionClause { dimension number }
-IndexCapacityClause { capacity number }
-IndexLmClause { lm number }
-IndexM0Clause { m0 number }
-IndexMClause { m number }
-IndexEfcClause { efc number }
+IndexDimensionClause { dimension Number }
+IndexCapacityClause { capacity Number }
+IndexLmClause { lm Number }
+IndexM0Clause { m0 Number }
+IndexMClause { m Number }
+IndexEfcClause { efc Number }
 IndexExtendCandidatesClause { extend_candidates }
 IndexKeepPrunedConnectionsClause { keep_pruned_connections }
 
@@ -1303,19 +1308,19 @@ TempfilesClause[since=2_0_0] {
 
 FetchClause {
 	fetch
-	commaSep<Path>
+	commaSep<Idiom>
 }
 
 StartClause {
 	start
 	at?
-	(number | VariableName)
+	(Number | VariableName)
 }
 
 LimitClause {
 	limit
 	by?
-	(number | VariableName)
+	(Number | VariableName)
 }
 
 LimitStartComboClause {
@@ -1414,15 +1419,17 @@ ComputedClause {
 	value
 }
 
+PermissionGroup {
+	for
+	commaSep<select | create | update | delete>
+	( WhereClause | none | full )
+}
+
 PermissionsForClause {
 	permissions
 	(
 		none | full |
-		(
-			for
-			commaSep<select | create | update | delete>
-			( WhereClause | none | full )
-		)+
+		PermissionGroup+
 	)
 }
 
@@ -1462,7 +1469,7 @@ BackendClause {
 // Support
 
 AnalyzerFilters {
-	Filter ("(" (number "," number | Ident) ")")?
+	Filter ("(" (Number "," Number | Ident) ")")?
 }
 
 Order {
@@ -1485,11 +1492,11 @@ inclusivePredicate {
 
 LiteralType[since=2_0_0] {
 	String |
-	number |
+	Number |
 	Duration |
 	ArrayType { "[" commaSep<type> "]" } |
 	ObjectType { objectOpen ObjectTypeContent? "}" }
-	// TODO support number and duration types
+	// TODO support Number and duration types
 }
 
 singleType {
@@ -1524,7 +1531,7 @@ Ident {
 	tickIdent
 }
 
-number { ("-" | "+")? (Int | Float | Decimal) }
+Number { ("-" | "+")? (Int | Float | Decimal) }
 
 Operator {
 	binaryOperator |
@@ -1533,11 +1540,11 @@ Operator {
 	is | ( is opNot ) |
 	in | ( opNot opIn ) |
 
-	( "@" number "@" ) |
+	( "@" Number "@" ) |
 	(
 		"<|"
-		number
-		( "," ( number | Distance | ( minkowski number ) ) )
+		Number
+		( "," ( Number | Distance | ( minkowski Number ) ) )
 		"|>"
 	)
 }
@@ -1821,6 +1828,7 @@ piped<content> {
 	sleep					[@name=Keyword],
 	split					[@name=Keyword],
 	start					[@name=Keyword],
+	strict					[@name=Keyword],
 	structure				[@name=Keyword],
 	table					[@name=Keyword],
 	tables					[@name=Keyword],

package/src/tokens.js

@@ -150,6 +150,7 @@ import {
 	sleep,
 	split,
 	start,
+	strict,
 	structure,
 	table,
 	tables,
@@ -356,6 +357,7 @@ const tokenMap = {
 	sleep,
 	split,
 	start,
+	strict,
 	structure,
 	table,
 	tables,

package/test/misc/comments.txt

@@ -0,0 +1,44 @@
+# Hash comment
+
+# this is a comment
+42
+
+==>
+
+SurrealQL(Comment,Number(Int))
+
+# Dash comment
+
+-- this is a comment
+42
+
+==>
+
+SurrealQL(Comment,Number(Int))
+
+# Slash comment
+
+// this is a comment
+42
+
+==>
+
+SurrealQL(Comment,Number(Int))
+
+# Block comment
+
+1 /* this is
+     a block
+     comment */ + 2
+
+==>
+
+SurrealQL(BinaryExpression(Number(Int),BlockComment,Operator,Number(Int)))
+
+# Block comment standalone
+
+/* block */ 42
+
+==>
+
+SurrealQL(BlockComment,Number(Int))

package/test/misc/functions.txt

@@ -0,0 +1,63 @@
+# Namespaced function call
+
+a::b()
+
+==>
+
+SurrealQL(FunctionCall(FunctionName,ArgumentList))
+
+# Custom function call
+
+fn::one::two(1, a)
+
+==>
+
+SurrealQL(FunctionCall(FunctionName,ArgumentList(Number(Int),Ident)))
+
+# Rand function
+
+rand(3)
+
+==>
+
+SurrealQL(FunctionCall(FunctionName,ArgumentList(Number(Int))))
+
+# Count function
+
+count(x)
+
+==>
+
+SurrealQL(FunctionCall(FunctionName,ArgumentList(Ident)))
+
+# Versioned function call
+
+some::versioned::function<1.2.3>(a)
+
+==>
+
+SurrealQL(FunctionCall(FunctionName,Version("<",VersionNumber,">"),ArgumentList(Ident)))
+
+# No-argument function call
+
+a::b()
+
+==>
+
+SurrealQL(FunctionCall(FunctionName,ArgumentList))
+
+# Multiple argument function call
+
+string::concat("hello", " ", "world")
+
+==>
+
+SurrealQL(FunctionCall(FunctionName,ArgumentList(String,String,String)))
+
+# Variable function call
+
+$func(1)
+
+==>
+
+SurrealQL(FunctionCall(VariableName,ArgumentList(Number(Int))))

package/test/misc/identifiers.txt

@@ -0,0 +1,22 @@
+# Raw identifiers
+
+theVar;
+theVar2
+
+==>
+
+SurrealQL(Ident,Ident)
+
+# Keywords used as identifiers in field position
+
+create bla set true = 1, false = 2, null = 3, none = 4
+
+==>
+
+SurrealQL(CreateStatement(
+  Keyword,Ident,
+  SetClause( Keyword,
+    FieldAssignment(Ident,Operator,Number(Int)),
+    FieldAssignment(Ident,Operator,Number(Int)),
+    FieldAssignment(Ident,Operator,Number(Int)),
+    FieldAssignment(Ident,Operator,Number(Int)))))

package/test/misc/javascript.txt

@@ -0,0 +1,34 @@
+# JavaScript function with args
+
+function(123, 1d2h) {
+	const number = 123;
+	if (test("{")) {
+		return number.toString();
+	}
+}
+
+==>
+
+SurrealQL(
+  FunctionJs(
+    FunctionName,
+    ArgumentList(Number(Int),Duration(DurationPart,DurationPart)),
+    JavaScriptBlock(BraceOpen,JavaScriptContent,BraceClose)
+  )
+)
+
+# Simple JavaScript function
+
+function() {
+	return 42;
+}
+
+==>
+
+SurrealQL(
+  FunctionJs(
+    FunctionName,
+    ArgumentList,
+    JavaScriptBlock(BraceOpen,JavaScriptContent,BraceClose)
+  )
+)

package/test/misc/operators.txt

@@ -0,0 +1,213 @@
+# Addition
+
+1 + 2
+
+==>
+
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
+
+# Subtraction
+
+5 - 3
+
+==>
+
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
+
+# Multiplication
+
+2 * 3
+
+==>
+
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
+
+# Division
+
+10 / 2
+
+==>
+
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
+
+# Power
+
+2 ** 3
+
+==>
+
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
+
+# Equality
+
+a == b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Inequality
+
+a != b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Less than
+
+a < b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Greater than
+
+a > b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Less than or equal
+
+a <= b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Greater than or equal
+
+a >= b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Logical AND
+
+a && b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Logical OR
+
+a || b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Null coalescing
+
+a ?? b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Elvis operator
+
+a ?: b
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Unicode containment operators
+
+a ∈ z;
+x ∉ y;
+a ⊆ b
+
+==>
+
+SurrealQL(
+  BinaryExpression(Ident,Operator,Ident),
+  BinaryExpression(Ident,Operator,Ident),
+  BinaryExpression(Ident,Operator,Ident)
+)
+
+# Keyword operator containsnot
+
+x containsnot y
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# IS operator
+
+x IS y
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# IN keyword operator
+
+x IN y
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator(Keyword),Ident))
+
+# Fuzzy match
+
+x ?= y
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# All match
+
+x *= y
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Ident))
+
+# Unicode multiplication
+
+2 × 3
+
+==>
+
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
+
+# Unicode division
+
+10 ÷ 2
+
+==>
+
+SurrealQL(BinaryExpression(Number(Int),Operator,Number(Int)))
+
+# Matches operator with distance
+
+x @1@ y
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator(Number(Int)),Ident))
+
+# Addition assignment in expression
+
+a += 1
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Number(Int)))
+
+# Subtraction assignment in expression
+
+a -= 1
+
+==>
+
+SurrealQL(BinaryExpression(Ident,Operator,Number(Int)))