@surrealdb/lezer 1.0.0-beta.8 → 1.0.0

package/src/surrealql.grammar

@@ -1,18 +1,22 @@
 @top SurrealQL {
-	expressions | WhereClause
+	expressions
 }
 
 @top PermissionInput {
 	WhereClause | none | full
 }
 
+@top IndexInput {
+	IndexClause
+}
+
 @top CombinedResults {
-	combinedExpressions
+	CombinedResult { CommentResult expression CommentResultClose { "" } }+
 }
 
 @top Syntax {
 	(
-		(for anyPermission) |
+		(for !for (create | update | delete | select)) |
 		anyKeyword |
 		anyLiteral |
 		SyntaxDescribe { "@" rawident }
@@ -26,21 +30,200 @@
 	binary @left
 	union @left
 	filter
+	for
+	clause
 }
 
 expressions {
 	(expression ";")* expression ";"?
 }
 
-combinedExpressions {
-	CombinedResult { CommentResult expression CommentResultClose { "" } }+
-}
-
 expression {
 	statement |
 	value
 }
 
+paramDefinition[@name=ParamDefinition] {
+	VariableName
+	(":" Type { type })?
+}
+
+escapedParamDefinition[@name=ParamDefinition] {
+	VariableName
+	(":" Type { safeType })?
+}
+
+anyKeyword {
+	access |
+	algorithm |
+	alter |
+	analyzer |
+	any |
+	as |
+	asc |
+	assert |
+	at |
+	authenticate |
+	auto |
+	begin |
+	bm25 |
+	break |
+	by |
+	cancel |
+	capacity |
+	changefeed |
+	changes |
+	columns |
+	comment |
+	commit |
+	concurrently |
+	config |
+	content |
+	continue |
+	create |
+	database |
+	db |
+	default |
+	defer |
+	define |
+	delete |
+	desc |
+	dimension |
+	dist |
+	doc_ids_cache |
+	doc_ids_order |
+	doc_lengths_cache |
+	doc_lengths_order |
+	drop |
+	duplicate |
+	duration |
+	efc |
+	else |
+	end |
+	event |
+	exclude |
+	exists |
+	explain |
+	extend_candidates |
+	fetch |
+	field |
+	fields |
+	filters |
+	flexible |
+	for |
+	from |
+	functions |
+	graphql |
+	group |
+	highlights |
+	hnsw |
+	if |
+	ignore |
+	in |
+	include |
+	index |
+	info |
+	insert |
+	into |
+	issuer |
+	jwt |
+	keep_pruned_connections |
+	key |
+	kill |
+	let |
+	limit |
+	live |
+	lm |
+	m |
+	m0 |
+	merge |
+	mtree |
+	mtree_cache |
+	namespace |
+	noindex |
+	normal |
+	not |
+	ns |
+	on |
+	only |
+	option |
+	order |
+	out |
+	overwrite |
+	parallel |
+	param |
+	passhash |
+	password |
+	patch |
+	permissions |
+	postings_cache |
+	postings_order |
+	readonly |
+	rebuild |
+	record |
+	relate |
+	relation |
+	remove |
+	return |
+	roles |
+	root |
+	sc |
+	schemafull |
+	schemaless |
+	scope |
+	search |
+	select |
+	session |
+	set |
+	show |
+	signin |
+	signup |
+	since |
+	sleep |
+	split |
+	start |
+	structure |
+	table |
+	tables |
+	tb |
+	tempfiles |
+	terms_cache |
+	terms_order |
+	then |
+	throw |
+	timeout |
+	to |
+	token |
+	tokenizers |
+	transaction |
+	typeKeyword |
+	unique |
+	unset |
+	update |
+	upsert |
+	url |
+	use |
+	user |
+	valueKeyword |
+	values |
+	when |
+	where |
+	with
+}
+
+anyLiteral {
+	after |
+	before |
+	diff |
+	false |
+	full |
+	none |
+	null |
+	true |
+
+	IndexTypeClause
+}
+
 SubQuery {
 	"("
 	expression
@@ -51,17 +234,31 @@ Block {
 	"{" expressions? "}"
 }
 
-Closure {
-	ParamList { "|" commaSep<VariableName ":" safeType>? "|" } ("->" type)? Block
+Closure[since=2_0_0] {
+	"|" commaSep<escapedParamDefinition>? "|" ("->" type)? Block
+}
+
+subqueryStatement {
+	IfElseStatement |
+	LetStatement |
+	DeleteStatement |
+	CreateStatement |
+	SelectStatement |
+	RelateStatement |
+	UpdateStatement |
+	RemoveStatement |
+	UpsertStatement |
+	ReturnStatement |
+	AlterStatement |
+	DefineStatement |
+	RebuildStatement |
+	InsertStatement
 }
 
 statement[@isGroup=Statement] {
 	BeginStatement |
 	CancelStatement |
 	CommitStatement |
-	DefineStatement |
-	AlterStatement |
-	RemoveStatement |
 	InfoForStatement |
 	KillStatement |
 	LiveSelectStatement |
@@ -69,21 +266,11 @@ statement[@isGroup=Statement] {
 	SleepStatement |
 	UseStatement |
 	OptionStatement |
-	RebuildStatement |
-	CreateStatement |
-	SelectStatement |
-	DeleteStatement |
-	InsertStatement |
 	BreakStatement |
 	ContinueStatement |
 	ForStatement |
-	ReturnStatement |
 	ThrowStatement |
-	IfElseStatement |
-	LetStatement |
-	RelateStatement |
-	UpdateStatement |
-	UpsertStatement
+	subqueryStatement
 }
 
 // Transaction statements
@@ -97,39 +284,40 @@ CommitStatement { commit transaction? }
 DefineStatement {
 	define
 	(
-	( access defineAccessOptions ) |
-	( namespace defineNamespaceOptions ) |
-	( database defineDatabaseOptions ) |
-	( user defineUserOptions ) |
-	( token defineTokenOptions ) |
-	( event defineEventOptions ) |
-	( field defineFieldOptions ) |
-	( index defineIndexOptions ) |
-	( analyzer defineAnalyzerOptions ) |
-	( functionKw defineFunctionOptions ) |
-	( param defineParamOptions ) |
-	( scope defineScopeOptions ) |
-	( table defineTableOptions )
+		AccessDefinition[since=2_0_0] { access defineAccessOptions } |
+		( namespace defineNamespaceOptions ) |
+		( database defineDatabaseOptions ) |
+		( user defineUserOptions ) |
+		( token defineTokenOptions ) |
+		( event defineEventOptions ) |
+		( field defineFieldOptions ) |
+		( index defineIndexOptions ) |
+		( analyzer defineAnalyzerOptions ) |
+		( functionKw defineFunctionOptions ) |
+		( param defineParamOptions ) |
+		ScopeDefinition[until=2_0_0] { scope defineScopeOptions } |
+		( table defineTableOptions ) |
+		( config defineConfigOptions ) |
+		( api defineApiOptions ) | 
+		( bucket defineBucketOptions )
 	)
 }
 
 defineAccessOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
-	accessClauses1 {
-		OnRootNsDbClause
-		AccessTypeClause
-	}
-	accessClauses2 {
-		AuthenticateClause?
-		DurationClause?
-		CommentClause?
-	}
+	(IfNotExistsClause | OverwriteClause)?
+	value
+	OnRootNsDbClause
+	(
+		AccessTypeClause |
+		AuthenticateClause |
+		DurationClause |
+		CommentClause
+	)*
 }
 
 defineAnalyzerOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
+	(IfNotExistsClause | OverwriteClause)?
+	value
 	(
 		TokenizersClause |
 		FiltersClause |
@@ -139,22 +327,31 @@ defineAnalyzerOptions {
 }
 
 defineEventOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
+	(IfNotExistsClause | OverwriteClause)?
+	value
 	OnTableClause
-	WhenThenClause
-	CommentClause?
+	(
+		WhenClause {
+			when
+			value
+		} |
+		ThenClause {
+			then
+			commaSep<(SubQuery | Block)>
+		} |
+		CommentClause
+	)*
 }
 
 defineDatabaseOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident on Ident
+	(IfNotExistsClause | OverwriteClause)?
+	value on value
 	CommentClause?
 }
 
 defineFieldOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
+	(IfNotExistsClause | OverwriteClause)?
+	Idiom
 	OnTableClause
 	(
 		TypeClause |
@@ -163,14 +360,16 @@ defineFieldOptions {
 		ValueClause |
 		AssertClause |
 		PermissionsForClause |
-		CommentClause
+		CommentClause |
+		ReferenceClause |
+		ComputedClause
 	)*
 }
 
 defineFunctionOptions {
-	(IfNotExistsClause | overwrite)?
+	(IfNotExistsClause | OverwriteClause)?
 	customFunctionName
-	ParamList { "(" commaSep<VariableName ":" type>? ")" }
+	params { "(" commaSep<paramDefinition>? ")" }
 	("->" type)?
 	Block
 	(
@@ -182,34 +381,38 @@ defineFunctionOptions {
 functionKw[@name=Keyword] { function }
 
 defineIndexOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
+	(IfNotExistsClause | OverwriteClause)?
+	value
 	OnTableClause
-	FieldsColumnsClause
 	(
-		UniqueClause |
-		SearchAnalyzerClause |
-		MtreeClause |
-		HnswClause
-	)
+		FieldsColumnsClause |
+		IndexClause |
+		CommentClause |
+		ConcurrentlyClause[since=2_0_0] { concurrently }
+		DeferClause[since=3_0_0] { defer }
+	)*
 }
 
 defineNamespaceOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
+	(IfNotExistsClause | OverwriteClause)?
+	value
 	CommentClause?
 }
 
 defineParamOptions {
-	(IfNotExistsClause | overwrite)?
+	(IfNotExistsClause | OverwriteClause)?
 	VariableName
 	valueKeyword
 	value
+	(
+		PermissionsBasicClause |
+		CommentClause
+	)*
 }
 
 defineScopeOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
+	(IfNotExistsClause | OverwriteClause)?
+	value
 	(
 		SessionClause |
 		SigninClause |
@@ -219,8 +422,8 @@ defineScopeOptions {
 }
 
 defineTableOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
+	(IfNotExistsClause | OverwriteClause)?
+	value
 	(
 		drop |
 		(schemafull | schemaless) |
@@ -232,35 +435,89 @@ defineTableOptions {
 	)*
 }
 
+defineConfigOptions {
+	(IfNotExistsClause | OverwriteClause)?
+	(
+		graphql defineConfigGraphqlOptions |
+		api defineConfigApiOptions
+	)
+}
+
+defineConfigGraphqlOptions {
+	(
+		none |
+		auto |
+		tables ( none | auto | include commaSep<Ident> | exclude commaSep<Ident> ) |
+		functions ( none | auto )
+	)*
+}
+
+defineConfigApiOptions {
+	ApiOptions
+}
+
 defineTokenOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
-	( on ( namespace | database | scope Ident ) )
+	(IfNotExistsClause | OverwriteClause)?
+	value
+	( on ( namespace | database | scope value ) )
 	TokenTypeClause
 	( valueKeyword String )
 }
 
 defineUserOptions {
-	(IfNotExistsClause | overwrite)?
-	Ident
+	(IfNotExistsClause | OverwriteClause)?
+	value
 	OnRootNsDbClause
 	( ( password | passhash ) String )
 	( roles commaSep<Ident> )
 	DurationClause?
 }
 
+defineApiOptions {
+	(IfNotExistsClause | OverwriteClause)?
+	String
+	ApiOptions
+	(
+		for
+		(any | commaSep<HttpMethod>)
+		ApiOptions
+		then Block
+	)+
+}
+
+ApiOptions {
+	(
+		PermissionsBasicClause |
+		MiddlewareClause
+	)*
+}
+
+HttpMethod {
+	get | put | post | delete | patch | trace
+}
+
+defineBucketOptions {
+	(IfNotExistsClause | OverwriteClause)?
+	value
+	(
+		BackendClause |
+		PermissionsBasicClause |
+		CommentClause
+	)*
+}
+
 // Alter statement
 
-AlterStatement {
+AlterStatement[since=2_0_0] {
 	alter
 	(
-	( table alterTableOptions )
+		table alterTableOptions
 	)
 }
 
 alterTableOptions {
 	IfNotExistsClause?
-	Ident
+	value
 	(
 		drop |
 		(schemafull | schemaless) |
@@ -274,18 +531,20 @@ alterTableOptions {
 RemoveStatement {
 	remove
 	(
-	( namespace IfExistsClause? Ident ) |
-	( database IfExistsClause? Ident ) |
-	( user IfExistsClause? Ident on ( root | namespace | database ) ) |
-	( token IfExistsClause? Ident on ( namespace | database | scope ) ) |
-	( event IfExistsClause? Ident on table? Ident ) |
-	( field IfExistsClause? Ident on table? Ident ) |
-	( index IfExistsClause? Ident on table? Ident ) |
-	( analyzer IfExistsClause? Ident ) |
-	( functionKw IfExistsClause? customFunctionName ) |
-	( param IfExistsClause? VariableName ) |
-	( scope IfExistsClause? Ident ) |
-	( table IfExistsClause? Ident )
+		( namespace IfExistsClause? value (and expunge)? ) |
+		( database IfExistsClause? value (and expunge)? ) |
+		( user IfExistsClause? value on ( root | namespace | database ) ) |
+		( token IfExistsClause? value on ( namespace | database | scope ) ) |
+		( event IfExistsClause? value OnTableClause ) |
+		( field IfExistsClause? value OnTableClause ) |
+		( index IfExistsClause? value OnTableClause ) |
+		( analyzer IfExistsClause? value ) |
+		( functionKw IfExistsClause? customFunctionName ) |
+		( param IfExistsClause? VariableName ) |
+		( scope IfExistsClause? value ) |
+		( table IfExistsClause? value (and expunge)? )
+		( api IfExistsClause? value ) |
+		( bucket IfExistsClause? value )
 	)
 }
 
@@ -293,42 +552,39 @@ RemoveStatement {
 
 CreateStatement {
 	create only?
-	createTarget { Ident | VariableName | FunctionCall | RecordId }
+	createTargets { commaSep<Ident | VariableName | FunctionCall | RecordId> }
 	createContent { ContentClause | SetClause | UnsetClause | () }
-	ReturnClause?
-	TimeoutClause?
-	ParallelClause?
+	createOptionals {
+		ReturnClause?
+		TimeoutClause?
+		ParallelClause?
+	}
 }
 
 SelectStatement {
-	(select)
-	(
-		valueKeyword Predicate |
-		commaSep<inclusivePredicate>
-	)
-	(from)
-	(only)?
+	select
+	Fields
+	OmitClause?
+	from
+	only?
 	(
 		statement |
 		(
 			commaSep<value>
-			selectClauses1 {
-				WithClause?
-				WhereClause?
-				SplitClause?
-			}
-			selectClauses2 {
-				GroupClause?
-				OrderClause?
-				LimitStartComboClause?
-			}
-			selectClauses3 {
-				FetchClause?
-				TimeoutClause?
-				ParallelClause?
-				TempfilesClause?
-				ExplainClause?
-			}
+			(
+				WithClause |
+				WhereClause |
+				SplitClause |
+				GroupClause |
+				OrderClause |
+				LimitStartComboClause |
+				FetchClause |
+				TimeoutClause |
+				ParallelClause |
+				TempfilesClause |
+				ExplainClause |
+				VersionClause
+			)*
 		)
 	)
 }
@@ -339,22 +595,28 @@ DeleteStatement {
 		statement |
 		(
 			commaSep<value>
-			WhereClause?
-			ReturnClause?
-			TimeoutClause?
-			ParallelClause?
+			(
+				WhereClause |
+				ReturnClause |
+				TimeoutClause |
+				ParallelClause
+			)*
 		)
 	)
 }
 
 InsertStatement {
 	insert
-	ignore?
-	relation?
-	(into Ident)?
+	insertOptionals {
+		ignore?
+		relation?
+		(into Ident)?
+	}
 	(
+		// TODO this should be value, but cannot easily union with VALUES syntax
 		Object |
-		( "[" commaSep<Object> "]" ) |
+		VariableName |
+		BulkInsert[since=2_0_0] { ( "[" commaSep<Object> "]" ) } |
 		(
 			"(" commaSep<Ident> ")"
 			values
@@ -367,60 +629,7 @@ InsertStatement {
 		on duplicate key update
 		commaSep<FieldAssignment>
 	)?
-}
-
-IfElseStatement {
-	if
-	(
-		Legacy {
-			value
-			then
-			( Block | SubQuery)
-			(
-				else if
-				value
-				then
-				( Block | SubQuery)
-			)*
-			(
-				else
-				( Block | SubQuery)
-			)?
-			end
-		} |
-		Modern {
-			value Block
-			(
-				else if
-				value Block
-			)*
-			(
-				else Block
-			)?
-		}
-	)
-}
-
-relateSubject { Array | Ident | FunctionCall | VariableName | RecordId }
-RelateStatement {
-	relate only?
-	relateSubject "->" relateSubject "->" relateSubject
-	( ContentClause | SetClause )?
-	ReturnClause?
-	TimeoutClause?
-	ParallelClause?
-}
-
-InfoForStatement {
-	info for
-	(
-		root |
-		ns | namespace |
-		db | database |
-		( sc Ident | scope Ident) |
-		( tb Ident | table Ident)
-	)
-	structure?
+	InsertReturnClause[since=2_0_0] { ReturnClause? }
 }
 
 UpdateStatement {
@@ -429,14 +638,15 @@ UpdateStatement {
 		statement |
 		(
 			commaSep<value>
-			updateClause1 {
+			(
 				ContentClause |
+				ReplaceClause |
 				MergeClause |
 				PatchClause |
 				SetClause |
 				UnsetClause
-			}?
-			updateClause2 {
+			)?
+			updateOptionals {
 				WhereClause?
 				ReturnClause?
 				TimeoutClause?
@@ -446,20 +656,21 @@ UpdateStatement {
 	)
 }
 
-UpsertStatement {
+UpsertStatement[since=2_0_0] {
 	upsert only?
 	(
 		statement |
 		(
 			commaSep<value>
-			updateClause1 {
+			(
 				ContentClause |
+				ReplaceClause |
 				MergeClause |
 				PatchClause |
 				SetClause |
 				UnsetClause
-			}?
-			updateClause2 {
+			)?
+			upsertOptionals {
 				WhereClause?
 				ReturnClause?
 				TimeoutClause?
@@ -469,14 +680,75 @@ UpsertStatement {
 	)
 }
 
+relateSubject { Array | Ident | FunctionCall | VariableName | RecordId }
+
+RelateStatement {
+	relate only?
+	relateSubject ("->" | "<-") relateSubject ("->" | "<-") relateSubject
+	( ContentClause | SetClause )?
+	relateOptionals {
+		ReturnClause?
+		TimeoutClause?
+		ParallelClause?
+	}
+}
+
+// Info statement
+
+InfoForStatement {
+	info for
+	(
+		root |
+		ns | namespace |
+		db | database |
+		( sc Ident | scope Ident) |
+		( tb Ident | table Ident)
+	)
+	structure?
+}
+
 // Control statements
+
 BreakStatement { break }
 ContinueStatement { continue }
 ForStatement { for VariableName in ( Array | VariableName | SubQuery | Block ) Block }
 ReturnStatement { return expression }
 ThrowStatement { throw value }
 
+IfElseStatement {
+	if
+	(
+		Legacy {
+			value
+			then
+			( Block | SubQuery)
+			(
+				else if
+				value
+				then
+				( Block | SubQuery)
+			)*
+			(
+				else
+				( Block | SubQuery)
+			)?
+			end
+		} |
+		Modern {
+			value Block
+			(
+				else if
+				value Block
+			)*
+			(
+				else Block
+			)?
+		}
+	)
+}
+
 // Live statements
+
 KillStatement { kill String }
 LiveSelectStatement {
 	live select
@@ -490,40 +762,55 @@ LiveSelectStatement {
 	FetchClause?
 }
 
-// Other statements
+// Let statement
+
 LetStatement {
-	let VariableName (":" type)? "=" value
+	let
+	paramDefinition
+	"="
+	(value | subqueryStatement)
 }
 
+// Show statement
+
 ShowStatement {
 	show changes for table
 	Ident
 	( since String )?
-	( limit Int )?
+	( limit number )?
 }
 
+// Sleep statement
+
 SleepStatement {
 	sleep Duration
 }
 
+// Use statement
+
 useNs { ( ns | namespace ) Ident }
 useDb { ( db | database ) Ident }
+
 UseStatement {
 	use
 	( useNs | useDb | ( useNs useDb ) )
 }
 
+// Option statement
+
 OptionStatement {
-option
-Ident
-( "=" ( true | false ) )?
+	option
+	Ident
+	( "=" ( true | false ) )?
 }
 
-RebuildStatement {
-rebuild index
-IfExistsClause?
-Ident
-OnTableClause
+// Rebuild statement
+
+RebuildStatement[since=1_5_0] {
+	rebuild index
+	IfExistsClause?
+	Ident
+	OnTableClause
 }
 
 // Values
@@ -531,6 +818,7 @@ OnTableClause
 baseValue {
 	String |
 	prefixedString |
+	FormatString |
 	number |
 	true |
 	false |
@@ -540,6 +828,7 @@ baseValue {
 	VariableName |
 	Ident[@dynamicPrecedence=-1] { rawident } |
 	Array |
+	Set |
 	RecordId |
 	FunctionJs |
 	FunctionCall |
@@ -549,55 +838,127 @@ baseValue {
 	Object |
 	TypeCast |
 	Duration |
-	Point { "(" Decimal "," Decimal ")" }
+	Point { "(" number "," number ")" }
 }
 
-Any { "?" }
-AnyStar[@name=Any] { "*" }
-
 value[@isGroup=Value] {
 	baseValue |
 	BinaryExpression |
+	Range |
 	Path
 }
 
+Any { "?" }
+AnyStar[@name=Any] { "*" }
+At[since=2_1_0] { "@" }
+Optional[since=2_0_0] { "?" }
+
 // Binary expressions
 
-BinaryExpression {
-	value !binary Operator value
+BinaryExpression {
+	value !binary Operator value
+}
+
+Range[since=2_0_0] {
+	rangeOpOpenBoth |
+	value !range rangeOpOpenRight |
+	rangeOpOpenLeft !range value |
+	value !range rangeOp !range value
+}
+
+Idiom {
+	Ident ( "." Ident )*
 }
 
 Path {
 	baseValue pathElement+ |
-	GraphPath pathElement*
+	At ( dotPart pathElement* | pathElement+ ) |
+	Lookup pathElement*
 }
 
 pathElement {
-	GraphPath |
+	Lookup |
 	Subscript {
-		"?"?
+		Optional?
 		"."
-		(
-			Ident |
-			FunctionName { rawident !method } ArgumentList |
-			AnyStar |
-			Destructure
-		)
+		dotPart
 	} |
-	Filter { !filter "[" (WhereClause | value | WhereClause { "?" value } ) "]" }
+	Filter { !filter "[" (WhereClause | WhereClause { "?" value } | expression) "]" }
+}
+
+dotPart {
+	At |
+	Ident |
+	IdiomFunction |
+	AnyStar |
+	Destructure |
+	Recurse
+}
+
+Lookup {
+	("<-" | "->" | "<->" | "<~")
+	(Ident | Any | LookupSelection)
 }
 
-GraphPath {
-	("<-" | "->" | "<->")
-	(Ident | Any | "(" commaSep<GraphPredicate> ")")
+LookupSelection {
+	"("
+	GraphFieldSelection[since=2_2_0] {
+		select
+		Fields
+		from
+	}?
+	commaSep<GraphPredicate>
+	(
+		WhereClause |
+		GraphSplitClause[since=2_2_0] { SplitClause } |
+		GraphGroupClause[since=2_2_0] { GroupClause } |
+		GraphOrderClause[since=2_2_0] { OrderClause } |
+		GraphLimitStartComboClause[since=2_2_0] { LimitStartComboClause } |
+		as Ident
+	)*
+	")"
 }
 
 GraphPredicate {
-	(value | Any) WhereClause? (as Ident)?
+	(value | Any)
+}
+
+Destructure[since=2_0_0] {
+	"{" commaSep<((Ident ":")? ( Ident | Lookup ) pathElement* )> "}"
+}
+
+IdiomFunction[since=2_0_0] { 
+	FunctionName { rawident !method } ArgumentList 
+}
+
+// Recursion
+
+Recurse[since=2_1_0] {
+	"{" RecurseRange RecurseOptions "}"
+	( "(" pathElement+ ")" )?
+}
+
+RecurseRange {
+	number |
+	rangeOpOpenBoth |
+	number rangeOpOpenRight |
+	rangeOpOpenLeft number |
+	number rangeOp number
+}
+
+RecurseOptions[since=2_2_0] {
+	("+" recurseOptionName ("=" baseValue)?)*
+}
+
+recurseOptionName[@name=FunctionName] {
+	rawident
 }
 
-Destructure {
-	"{" commaSep<((Ident ":")? Ident pathElement?)> "}"
+// Fields
+
+Fields {
+	valueKeyword Predicate |
+	commaSep<inclusivePredicate>
 }
 
 // Objects
@@ -621,7 +982,19 @@ Object {
 
 // Arrays
 
-Array { "[" commaSep<value>? "]"}
+Array {
+	"[" commaSepTrailing<value>? "]"
+}
+
+// Sets
+
+Set { 
+	"{" (
+		"," |
+		value "," |
+		value "," value ("," value)*
+	) "}"
+}
 
 // Record Ids
 
@@ -631,6 +1004,8 @@ RecordTbIdent {
 	bracketIdent
 }
 
+// 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 |
 	tickIdent |
@@ -639,15 +1014,16 @@ RecordIdIdent {
 
 recordIdValue {
 	RecordIdIdent |
-	Int |
 	Array |
-	Object
+	Object |
+	RecordIdString { prefixedString }
 }
 
 RecordIdRange {
-	( recordIdValue !range ">"? )?
-	".."
-	( !range "="? recordIdValue )?
+	rangeOpOpenBoth |
+	recordIdValue !range rangeOpOpenRight |
+	rangeOpOpenLeft !range recordIdValue |
+	recordIdValue !range rangeOp !range recordIdValue
 }
 
 RecordId {
@@ -677,21 +1053,32 @@ FunctionJs {
 	javaScriptElement {
 		javaScriptContent | javaScriptBraceOpen javaScriptElement* javaScriptBraceClose
 	}
+	BlockComment {
+		"/*" (blockCommentContent | blockCommentNewline)* blockCommentEnd
+	}
+	FormatString {
+		'$"' (formatStringContentDouble | Interpolation)* '"' |
+		"$'" (formatStringContentSingle | Interpolation)* "'"
+	}
+}
+
+Interpolation {
+	"{" expression "}"
 }
 
 // Function invocation
 
 FunctionCall {
-	( count ArgumentListCount ) |
 	(
-	   (FunctionName | customFunctionName | rand)
-    	Version { "<" VersionNumber ">" }?
-    	ArgumentList
-	)
+		(FunctionName | customFunctionName | rand | count)
+		Version { "<" VersionNumber ">" }?
+		ArgumentList
+	) |
+	RecordId ArgumentList |
+	VariableName ArgumentList
 }
 
-ArgumentList { "(" commaSep<value>? ")" }
-ArgumentListCount[@name=ArgumentList] { "(" ( commaSep<value>? | statement ) ")" }
+ArgumentList { "(" (commaSep<value>? | subqueryStatement) ")" }
 
 // Assignment
 
@@ -711,7 +1098,7 @@ PatchClause {
 	patch Array
 }
 
-TableTypeClause {
+TableTypeClause[since=1_4_0] {
 	typeKeyword
 	(
 		any |
@@ -720,6 +1107,7 @@ TableTypeClause {
 			relation
 			( ( in | from ) piped<Ident> )?
 			( ( out | to ) piped<Ident> )?
+			EnforcedClause[since=2_0_0] { enforced? }
 		)
 	)
 }
@@ -764,7 +1152,7 @@ JwtClause {
 }
 
 OnTableClause {
-	on table? Ident
+	on table? value
 }
 
 OnRootNsDbClause {
@@ -774,12 +1162,19 @@ OnRootNsDbClause {
 AccessTypeClause {
 	typeKeyword (
 		( jwt JwtClause ) |
-		( record SignupClause? SigninClause? ( with jwt JwtClause? ( with issuer key Ident )? )? )
+		( record (SignupClause | SigninClause)* ( with jwt JwtClause ( with issuer key Ident )? )? )
 	)
 }
 
 FieldsColumnsClause {
-	( fields | columns ) commaSep<Ident>
+	( fields | columns ) commaSep<Idiom>
+}
+
+IndexClause {
+	UniqueClause |
+	SearchAnalyzerClause |
+	MtreeClause |
+	HnswClause
 }
 
 UniqueClause {
@@ -789,22 +1184,31 @@ UniqueClause {
 SearchAnalyzerClause {
 	search analyzer
 	Ident
-    (Bm25Clause | DocIdsOrderClause | DocLenghtsOrderClause | PostingsOrderClause |
-	 TermsOrderClause | DocIdsCacheClause | DocLenghtsCacheClause | PostingsCacheClause |
-	 TermsCacheClause | highlights)*
-}
-
-Bm25Clause { bm25 ( "(" Float "," Float ")")? }
-DocIdsCacheClause { doc_ids_cache Int }
-DocIdsOrderClause { doc_ids_order Int }
-DocLenghtsCacheClause { doc_lengths_cache Int }
-DocLenghtsOrderClause { doc_lengths_order Int }
-PostingsCacheClause { postings_cache Int }
-PostingsOrderClause { postings_order Int }
-TermsCacheClause { terms_cache Int }
-TermsOrderClause { terms_order Int }
-
-MtreeClause {
+	(
+		Bm25Clause |
+		DocIdsOrderClause |
+		DocLenghtsOrderClause |
+		PostingsOrderClause |
+		TermsOrderClause |
+		DocIdsCacheClause |
+		DocLenghtsCacheClause |
+		PostingsCacheClause |
+		TermsCacheClause |
+		highlights
+	)*
+}
+
+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
 	IndexDimensionClause
 	(
@@ -817,10 +1221,10 @@ MtreeClause {
 	)*
 }
 
-MtreeCacheClause { mtree_cache Int }
-MtreeDistClause { dist ( cosine | euclidean | manhattan ) }
+MtreeCacheClause { mtree_cache number }
+MtreeDistClause { dist ( Distance ) }
 
-HnswClause {
+HnswClause[since=1_5_0] {
 hnsw
 IndexDimensionClause
 	(
@@ -836,15 +1240,14 @@ IndexDimensionClause
 	)*
 }
 
-HnswDistClause { dist ( chebyshev | cosine | euclidean | hamming | jaccard | manhattan | ( minkowski number ) | pearson ) }
+HnswDistClause { dist ( Distance | ( minkowski number )) }
 
-IndexDimensionClause { dimension Int }
-IndexTypeClause { typeKeyword ( f32 | f64 | i16 | i32 | i64 ) }
-IndexCapacityClause { capacity Int }
-IndexLmClause { lm Float }
-IndexM0Clause { m0 Int }
-IndexMClause { m Int }
-IndexEfcClause { efc Int }
+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 }
 
@@ -852,25 +1255,37 @@ ContentClause {
 	content Object
 }
 
+ReplaceClause {
+	replace Object
+}
+
 SetClause {
 	set commaSep<FieldAssignment>
 }
 
+OmitClause {
+	omit commaSep<inclusivePredicate>
+}
+
 UnsetClause {
 unset commaSep<FieldAssignment>
 }
 
-IfNotExistsClause {
+IfNotExistsClause[since=1_3_0] {
 	if not exists
 }
 
-IfExistsClause {
+IfExistsClause[since=1_3_0] {
 	if exists
 }
 
+OverwriteClause[since=2_0_0] {
+	overwrite
+}
+
 ReturnClause {
 	return
-	( before | after | diff | commaSep<inclusivePredicate> )
+	( before | after | diff | Fields )
 }
 
 TimeoutClause {
@@ -882,49 +1297,50 @@ ParallelClause {
 	parallel
 }
 
-TempfilesClause {
+TempfilesClause[since=2_0_0] {
 	tempfiles
 }
 
 FetchClause {
 	fetch
-	commaSep<Ident>
+	commaSep<Path>
 }
 
 StartClause {
 	start
 	at?
-	(Int | VariableName)
+	(number | VariableName)
 }
 
 LimitClause {
 	limit
 	by?
-	(Int | VariableName)
+	(number | VariableName)
 }
 
 LimitStartComboClause {
-	StartClause LimitClause? |
-	LimitClause StartClause?
+	StartClause (!clause LimitClause)? |
+	LimitClause (!clause StartClause)?
 }
 
 GroupClause {
 	group
-	by?
-	commaSep<Ident>
+	(
+	    by? commaSep<Idiom> |
+	    all
+	)
 }
 
 OrderClause {
 	order
 	by?
-	commaSep<Ident>
-	( asc | desc )?
+	(commaSep<Order> | FunctionCall)
 }
 
 SplitClause {
 	split
 	on?
-	Ident
+	Idiom
 }
 
 WhereClause {
@@ -945,7 +1361,12 @@ ExplainClause {
 	full?
 }
 
-TokenizersClause { tokenizers commaSep<AnalyzerTokenizers> }
+VersionClause[since=2_0_0] {
+	version
+	prefixedString
+}
+
+TokenizersClause { tokenizers commaSep<AnalyzerTokenizer> }
 
 FiltersClause {
 	filters
@@ -957,27 +1378,19 @@ FunctionClause {
 	customFunctionName
 }
 
-WhenThenClause {
-	(
-		when
-		value
-	)?
-	then?
-	commaSep<(SubQuery | Block)>
-}
-
 TypeClause {
 	flexible?
 	typeKeyword
 	type
 }
 
-ReadonlyClause {
+ReadonlyClause[since=1_2_0] {
 	readonly
 }
 
 DefaultClause {
 	default
+	DefaultAlways[since=2_2_0] { always? }
 	value
 }
 
@@ -991,13 +1404,23 @@ AssertClause {
 	value
 }
 
+ReferenceClause {
+	reference
+	(on delete (reject | cascade | ignore | unset | then Block))?
+}
+
+ComputedClause {
+	computed
+	value
+}
+
 PermissionsForClause {
 	permissions
 	(
 		none | full |
 		(
 			for
-			commaSep<( selectPermissions | createPermissions | updatePermissions | deletePermissions )>
+			commaSep<select | create | update | delete>
 			( WhereClause | none | full )
 		)+
 	)
@@ -1005,7 +1428,12 @@ PermissionsForClause {
 
 PermissionsBasicClause {
 	permissions
-	none | full | WhereClause
+	(none | full | WhereClause)
+}
+
+MiddlewareClause {
+	middleware
+	commaSep<FunctionCall>
 }
 
 CommentClause {
@@ -1016,44 +1444,32 @@ CommentClause {
 DurationValue {
 	(for token Duration) | (for session Duration)
 }
-  
-DurationClause {
-	duration commaSep<DurationValue>
+
+DurationClause[since=2_0_0] {
+	duration (for session)? commaSep<DurationValue>
 }
 
 TokenTypeClause {
 	typeKeyword
-	(
-		jwks |
-		eddsa |
-		es256 |
-		es384 |
-		es512 |
-		ps256 |
-		ps384 |
-		ps512 |
-		rs256 |
-		rs384 |
-		rs512
-	)
+	TokenType
+}
+
+BackendClause {
+	backend
+	value
 }
 
 // Support
 
-AnalyzerTokenizers {
-	blank |
-	camel |
-	class |
-	punct
+AnalyzerFilters {
+	Filter ("(" (number "," number | Ident) ")")?
 }
 
-AnalyzerFilters {
-	ascii |
-	lowercase |
-	uppercase |
-	( edgengram "(" Int "," Int ")" ) |
-	( ngram "(" Int "," Int ")" ) |
-	( snowball "(" Ident ")" )
+Order {
+	Idiom
+	collate?
+	numeric?
+	( asc | desc )?
 }
 
 Predicate {
@@ -1062,31 +1478,33 @@ Predicate {
 }
 
 inclusivePredicate {
-  AnyStar | Predicate
+	AnyStar | Predicate
 }
 
 // Types
 
-literalType {
+LiteralType[since=2_0_0] {
 	String |
-	ArrayType { "[" type "]" } |
+	number |
+	Duration |
+	ArrayType { "[" commaSep<type> "]" } |
 	ObjectType { objectOpen ObjectTypeContent? "}" }
 	// TODO support number and duration types
 }
 
 singleType {
-    TypeName { rawident } |
-    ParameterizedType { singleType "<" (type | Int) ">" } |
-    LiteralType { literalType }
+	TypeName { rawident } |
+	ParameterizedType { singleType "<" type ">" } |
+	LiteralType
 }
 
 type {
-    singleType |
-    UnionType { type (!union "|" type)+ }
+	singleType |
+	UnionType { type (!union "|" type)+ }
 }
 
 safeType {
-  singleType | "<" type ">"
+	singleType | "<" type ">"
 }
 
 ObjectTypeContent {
@@ -1106,42 +1524,41 @@ Ident {
 	tickIdent
 }
 
-number { Int | Float | Decimal }
+number { ("-" | "+")? (Int | Float | Decimal) }
 
 Operator {
-    binaryOperator |
+	binaryOperator |
 	"-" | "=" | ">" | "<" |
-	and |
-	or |
-	is |
-	( is opNot ) |
-	contains |
-	containsnot |
-	containsall |
-	containsany |
-	containsnone |
-	inside | in |
-	notinside | ( opNot opIn ) |
-	allinside |
-	anyinside |
-	noneinside |
-
-	outside |
-	intersects |
-
-	( "@" Int "@" ) |
+	binaryOperatorKeyword |
+	is | ( is opNot ) |
+	in | ( opNot opIn ) |
+
+	( "@" number "@" ) |
 	(
 		"<|"
-		Int
-		( "," ( Int | chebyshev | cosine | euclidean | hamming | jaccard | manhattan | ( minkowski number ) | pearson ) )
+		number
+		( "," ( number | Distance | ( minkowski number ) ) )
 		"|>"
 	)
 }
 
+@local tokens {
+	blockCommentEnd { "*/" }
+	blockCommentNewline { "\n" }
+	@else blockCommentContent
+}
+
 @external tokens objectToken from "./tokens" {
 	objectOpen[@name=BraceOpen]
 }
 
+@external tokens rangeOperator from "./tokens" {
+	rangeOp[@name=RangeOp],
+	rangeOpOpenBoth[@name=RangeOp],
+	rangeOpOpenLeft[@name=RangeOp],
+	rangeOpOpenRight[@name=RangeOp]
+}
+
 @tokens {
 	// Characters
 	"{"[@name=BraceOpen]
@@ -1149,10 +1566,14 @@ Operator {
 	"[" "]"
 	"<" ">"
 	":"[@name=Colon]
-	"->"[@name=ArrowRight]
-	"<-"[@name=ArrowLeft]
-	"<->"[@name=ArrowBoth]
+	"->"[@name=LookupRight]
+	"<-"[@name=LookupLeft]
+	"<~"[@name=LookupLeft]
+	"<->"[@name=LookupBoth]
 	"|"[@name=Pipe]
+	"~"[until=2_4_0]
+	"!~"[until=2_4_0]
+	"*~"[until=2_4_0]
 
 	// Helpers
 	whitespace { $[ \n\r\t] }
@@ -1165,15 +1586,18 @@ Operator {
 	CommentResult[@name=Comment,closedBy=CommentResultClose] { "-------- Query" ![\n]* }
 
 	// Numbers
-	Int { "-"? @digit+ }
+	Int { @digit+ }
 	frac { '.' @digit+ }
 	exp { $[eE] $[+\-]? @digit+ }
-	Float { "-"? @digit+ (frac exp? | exp) "f"? }
-	Decimal { "-"? @digit+ frac? exp? "dec" }
+	Float { (@digit+ (frac exp? | exp) "f"?) | "Infinity" | "NaN" }
+	Decimal { @digit+ frac? exp? "dec" }
 	VersionNumber { @digit+ ("." @digit+ ("." @digit+)?)? }
 
 	String { "'" (!['\\] | "\\" _)* "'" | '"' (!["\\] | "\\" _)* '"' }
-	prefixedString[@name=String] { $[ruds] String }
+	prefixedString[@name=String] { $[rudbf] String }
+
+	formatStringContentDouble { ("\\" _ | !["{\\])+ }
+	formatStringContentSingle { ("\\" _ | !['{\\])+ }
 
 	// Language
 	VariableName { "$" (rawident | tickIdent | bracketIdent) }
@@ -1186,7 +1610,7 @@ Operator {
 	rawident { (@asciiLetter | "_") (@asciiLetter | @digit | "_")* }
 	numberident {
 		rawident |
-		( @digit+ (@asciiLetter | "_") (@asciiLetter | @digit | "_")* )
+		@digit (@asciiLetter | @digit | "_")*
 	}
 
 	functionNameSegment { (@asciiLetter | "_") (@asciiLetter | "_" | @digit)* }
@@ -1204,12 +1628,13 @@ Operator {
 
 	@precedence { CommentResult Comment Int "-" }
 	@precedence { Comment binaryOperator }
-	@precedence { prefixedString rawident }
-	@precedence { customFunctionName FunctionName rawident }
 	@precedence { Float Decimal Int rawident }
-	@precedence { DurationPart rawident }
-	@precedence { DurationPart Int }
-	@precedence { numberident Int rawident }
+	@precedence { DurationPart Int rawident }
+	@precedence { prefixedString numberident rawident }
+	@precedence { customFunctionName FunctionName rawident }
+	@precedence { "f'" 'f"' rawident }
+	@precedence { "/*" Regex }
+	@precedence { Float FunctionName }
 
 	javaScriptContent { "\n" | ![{}\n'"]+ "\n"? | String }
 	javaScriptBraceOpen { "{" }
@@ -1219,7 +1644,7 @@ Operator {
 		"&&" | "||" | "??" | "?:" | "!=" | "==" | "?=" | "*=" | "~" | "!~" | "*~" |
 		"<=" | ">=" | "+" | "+=" | "-=" | "*" | "×" | "/"  | "÷" | "**" |
 		$[∋∌⊇⊃⊅∈∉⊆⊂⊄] | "@@"
-    }
+	}
 
 	assignmentOperator[@name=Operator] {
 		"="  |
@@ -1240,39 +1665,54 @@ piped<content> {
 	content ("|" content)*
 }
 
-@skip { whitespace | Comment }
+@skip { whitespace | Comment | BlockComment }
 @detectDelim
 
 @external propSource surqlHighlighting from "./highlight"
+@external prop since from "./version"
+@external prop until from "./version"
 
 @external extend { rawident } tokens from "./tokens" {
 	access					[@name=Keyword],
 	algorithm				[@name=Keyword],
+	all						[@name=Keyword],
 	alter					[@name=Keyword],
+	always					[@name=Keyword],
 	analyzer				[@name=Keyword],
+	and						[@name=Keyword],
 	any						[@name=Keyword],
+	api						[@name=Keyword],
 	as						[@name=Keyword],
 	asc						[@name=Keyword],
 	assert					[@name=Keyword],
 	at						[@name=Keyword],
 	authenticate			[@name=Keyword],
+	auto					[@name=Keyword],
+	backend					[@name=Keyword],
 	begin					[@name=Keyword],
 	bm25					[@name=Keyword],
 	break					[@name=Keyword],
+	bucket					[@name=Keyword],
 	by						[@name=Keyword],
 	cancel					[@name=Keyword],
 	capacity				[@name=Keyword],
+	cascade					[@name=Keyword],
 	changefeed				[@name=Keyword],
 	changes					[@name=Keyword],
+	collate					[@name=Keyword],
 	columns					[@name=Keyword],
 	comment					[@name=Keyword],
 	commit					[@name=Keyword],
+	computed				[@name=Keyword],
+	concurrently			[@name=Keyword],
+	config					[@name=Keyword],
 	content					[@name=Keyword],
 	continue				[@name=Keyword],
 	create					[@name=Keyword],
 	database				[@name=Keyword],
 	db						[@name=Keyword],
 	default					[@name=Keyword],
+	defer					[@name=Keyword],
 	define					[@name=Keyword],
 	delete					[@name=Keyword],
 	desc					[@name=Keyword],
@@ -1288,9 +1728,12 @@ piped<content> {
 	efc						[@name=Keyword],
 	else					[@name=Keyword],
 	end						[@name=Keyword],
+	enforced				[@name=Keyword],
 	event					[@name=Keyword],
+	exclude					[@name=Keyword],
 	exists					[@name=Keyword],
 	explain					[@name=Keyword],
+	expunge					[@name=Keyword],
 	extend_candidates		[@name=Keyword],
 	fetch					[@name=Keyword],
 	field					[@name=Keyword],
@@ -1299,12 +1742,16 @@ piped<content> {
 	flexible				[@name=Keyword],
 	for						[@name=Keyword],
 	from					[@name=Keyword],
+	functions				[@name=Keyword],
+	get						[@name=Keyword],
+	graphql					[@name=Keyword],
 	group					[@name=Keyword],
 	highlights				[@name=Keyword],
 	hnsw					[@name=Keyword],
 	if						[@name=Keyword],
 	ignore					[@name=Keyword],
 	in						[@name=Keyword],
+	include					[@name=Keyword],
 	index					[@name=Keyword],
 	info					[@name=Keyword],
 	insert					[@name=Keyword],
@@ -1321,6 +1768,7 @@ piped<content> {
 	m						[@name=Keyword],
 	m0						[@name=Keyword],
 	merge					[@name=Keyword],
+	middleware				[@name=Keyword],
 	mtree					[@name=Keyword],
 	mtree_cache				[@name=Keyword],
 	namespace				[@name=Keyword],
@@ -1328,6 +1776,8 @@ piped<content> {
 	normal					[@name=Keyword],
 	not						[@name=Keyword],
 	ns						[@name=Keyword],
+	numeric					[@name=Keyword],
+	omit					[@name=Keyword],
 	on						[@name=Keyword],
 	only					[@name=Keyword],
 	option					[@name=Keyword],
@@ -1340,14 +1790,19 @@ piped<content> {
 	password				[@name=Keyword],
 	patch					[@name=Keyword],
 	permissions				[@name=Keyword],
+	post					[@name=Keyword],
 	postings_cache			[@name=Keyword],
 	postings_order			[@name=Keyword],
+	put						[@name=Keyword],
 	readonly				[@name=Keyword],
 	rebuild					[@name=Keyword],
 	record					[@name=Keyword],
+	reference				[@name=Keyword],
+	reject					[@name=Keyword],
 	relate					[@name=Keyword],
 	relation				[@name=Keyword],
 	remove					[@name=Keyword],
+	replace					[@name=Keyword],
 	return					[@name=Keyword],
 	roles					[@name=Keyword],
 	root					[@name=Keyword],
@@ -1368,6 +1823,7 @@ piped<content> {
 	start					[@name=Keyword],
 	structure				[@name=Keyword],
 	table					[@name=Keyword],
+	tables					[@name=Keyword],
 	tb						[@name=Keyword],
 	tempfiles				[@name=Keyword],
 	terms_cache				[@name=Keyword],
@@ -1378,6 +1834,7 @@ piped<content> {
 	to						[@name=Keyword],
 	token					[@name=Keyword],
 	tokenizers				[@name=Keyword],
+	trace					[@name=Keyword],
 	transaction				[@name=Keyword],
 	typeKeyword				[@name=Keyword],
 	unique					[@name=Keyword],
@@ -1389,6 +1846,7 @@ piped<content> {
 	user					[@name=Keyword],
 	valueKeyword			[@name=Keyword],
 	values					[@name=Keyword],
+	version					[@name=Keyword],
 	when					[@name=Keyword],
 	where					[@name=Keyword],
 	with					[@name=Keyword],
@@ -1403,243 +1861,22 @@ piped<content> {
 	null					[@name=None],
 	true					[@name=Bool],
 
-	f32						[@name=Literal],
-	f64						[@name=Literal],
-	i16						[@name=Literal],
-	i32						[@name=Literal],
-	i64						[@name=Literal],
-
-	createPermissions		[@name=PermissionTarget],
-	deletePermissions		[@name=PermissionTarget],
-	selectPermissions		[@name=PermissionTarget],
-	updatePermissions		[@name=PermissionTarget],
-
-	jwks					[@name=TokenType],
-	eddsa					[@name=TokenType],
-	es256					[@name=TokenType],
-	es384					[@name=TokenType],
-	es512					[@name=TokenType],
-	ps256					[@name=TokenType],
-	ps384					[@name=TokenType],
-	ps512					[@name=TokenType],
-	rs256					[@name=TokenType],
-	rs384					[@name=TokenType],
-	rs512					[@name=TokenType],
+	IndexTypeClause,
+	TokenType,
 
 	// Operators
-	allinside,
-	and,
-	anyinside,
-	contains,
-	containsall,
-	containsany,
-	containsnone,
-	containsnot,
-	inside,
-	intersects,
+	binaryOperatorKeyword,
 	is,
-	noneinside,
-	notinside,
 	opIn,
 	opNot,
-	or,
-	outside,
-
-	chebyshev 				[@name=Distance],
-	cosine					[@name=Distance],
-	euclidean				[@name=Distance],
-	hamming					[@name=Distance],
-	jaccard					[@name=Distance],
-	manhattan				[@name=Distance],
-	minkowski				[@name=Distance],
-	pearson					[@name=Distance],
 
-	ascii					[@name=Filter],
-	edgengram				[@name=Filter],
-	lowercase				[@name=Filter],
-	ngram					[@name=Filter],
-	snowball				[@name=Filter],
-	uppercase				[@name=Filter],
+	Distance,
+	minkowski				[@name=Distance],
+	Filter,
 
-	blank					[@name=Tokenizer],
-	camel					[@name=Tokenizer],
-	class					[@name=Tokenizer],
-	punct					[@name=Tokenizer],
+	AnalyzerTokenizer,
 
 	function,
 	rand					[@name=FunctionName],
 	count					[@name=FunctionName]
-}
-
-anyKeyword {
-	access |
-	algorithm |
-	alter |
-	analyzer |
-	any |
-	as |
-	asc |
-	assert |
-	at |
-	authenticate |
-	begin |
-	bm25 |
-	break |
-	by |
-	cancel |
-	capacity |
-	changefeed |
-	changes |
-	columns |
-	comment |
-	commit |
-	content |
-	continue |
-	create |
-	database |
-	db |
-	default |
-	define |
-	delete |
-	desc |
-	dimension |
-	dist |
-	doc_ids_cache |
-	doc_ids_order |
-	doc_lengths_cache |
-	doc_lengths_order |
-	drop |
-	duplicate |
-	duration |
-	efc |
-	else |
-	end |
-	event |
-	exists |
-	explain |
-	extend_candidates |
-	fetch |
-	field |
-	fields |
-	filters |
-	flexible |
-	for |
-	from |
-	group |
-	highlights |
-	hnsw |
-	if |
-	ignore |
-	in |
-	index |
-	info |
-	insert |
-	into |
-	issuer |
-	jwt |
-	keep_pruned_connections |
-	key |
-	kill |
-	let |
-	limit |
-	live |
-	lm |
-	m |
-	m0 |
-	merge |
-	mtree |
-	mtree_cache |
-	namespace |
-	noindex |
-	normal |
-	not |
-	ns |
-	on |
-	only |
-	option |
-	order |
-	out |
-	overwrite |
-	parallel |
-	param |
-	passhash |
-	password |
-	patch |
-	permissions |
-	postings_cache |
-	postings_order |
-	readonly |
-	rebuild |
-	record |
-	relate |
-	relation |
-	remove |
-	return |
-	roles |
-	root |
-	sc |
-	schemafull |
-	schemaless |
-	scope |
-	search |
-	select |
-	session |
-	set |
-	show |
-	signin |
-	signup |
-	since |
-	sleep |
-	split |
-	start |
-	structure |
-	table |
-	tb |
-	tempfiles |
-	terms_cache |
-	terms_order |
-	then |
-	throw |
-	timeout |
-	to |
-	token |
-	tokenizers |
-	transaction |
-	typeKeyword |
-	unique |
-	unset |
-	update |
-	upsert |
-	url |
-	use |
-	user |
-	valueKeyword |
-	values |
-	when |
-	where |
-	with
-}
-
-anyLiteral {
-	after |
-	before |
-	diff |
-	false |
-	full |
-	none |
-	null |
-	true |
-
-	f32 |
-	f64 |
-	i16 |
-	i32 |
-	i64
-}
-
-anyPermission {
-	createPermissions |
-	deletePermissions |
-	selectPermissions |
-	updatePermissions
-}
+}