@surrealdb/lezer 1.0.4 → 1.0.5

package/src/parser.terms.js

@@ -217,172 +217,173 @@ export const
   LiveSelectStatement = 210,
   Predicate = 211,
   prefixedString = 212,
-  FormatString = 213,
-  Interpolation = 216,
-  Int = 217,
-  Float = 218,
-  Decimal = 219,
-  Regex = 220,
-  VariableName = 221,
-  Array = 225,
-  Set = 226,
-  RecordId = 227,
-  RecordTbIdent = 228,
-  RecordIdIdent = 230,
-  Object = 231,
-  ObjectContent = 232,
-  ObjectProperty = 233,
-  ObjectKey = 234,
-  RecordIdRange = 237,
-  FunctionJs = 238,
-  ArgumentList = 240,
-  IfElseStatement = 241,
-  Block = 243,
-  SubQuery = 244,
-  LetStatement = 246,
-  paramDefinition = 247,
-  LiteralType = 253,
-  Duration = 254,
-  DurationPart = 255,
-  ObjectTypeContent = 258,
-  ObjectTypeProperty = 259,
-  DeleteStatement = 262,
-  WhereClause = 263,
-  ReturnClause = 264,
-  Fields = 265,
-  AnyStar = 266,
-  TimeoutClause = 267,
-  ParallelClause = 268,
-  CreateStatement = 269,
-  FunctionCall = 270,
-  FunctionName = 271,
-  customFunctionName = 272,
-  VersionNumber = 274,
-  ContentClause = 275,
-  SetClause = 276,
-  FieldAssignment = 277,
-  assignmentOperator = 278,
-  UnsetClause = 279,
-  SelectStatement = 280,
-  OmitClause = 281,
-  WithClause = 282,
-  SplitClause = 283,
-  Idiom = 284,
-  GroupClause = 285,
-  OrderClause = 286,
-  Order = 287,
-  LimitStartComboClause = 288,
-  StartClause = 289,
-  LimitClause = 290,
-  FetchClause = 291,
-  Path = 292,
-  Lookup = 293,
-  Any = 298,
-  LookupSelection = 299,
-  GraphPredicate = 301,
-  Optional = 307,
-  At = 308,
-  IdiomFunction = 309,
-  Destructure = 311,
-  Recurse = 312,
-  RecurseRange = 313,
-  RecurseOptions = 314,
-  recurseOptionName = 315,
-  TempfilesClause = 318,
-  ExplainClause = 319,
-  VersionClause = 320,
-  RelateStatement = 321,
-  UpdateStatement = 322,
-  MergeClause = 323,
-  PatchClause = 324,
-  ReplaceClause = 325,
-  RemoveStatement = 326,
-  IfExistsClause = 327,
-  OnTableClause = 328,
-  functionKw = 329,
-  UpsertStatement = 330,
-  ReturnStatement = 331,
-  AlterStatement = 332,
-  IfNotExistsClause = 333,
-  PermissionsForClause = 334,
-  PermissionGroup = 335,
-  CommentClause = 336,
-  DefineStatement = 337,
-  OverwriteClause = 339,
-  OnRootNsDbClause = 340,
-  AccessTypeClause = 341,
-  JwtClause = 342,
-  SignupClause = 343,
-  SigninClause = 344,
-  AuthenticateClause = 345,
-  DurationClause = 346,
-  DurationValue = 347,
-  TokenTypeClause = 348,
-  TypeClause = 351,
-  DefaultClause = 352,
-  ReadonlyClause = 354,
-  ValueClause = 355,
-  AssertClause = 356,
-  ReferenceClause = 357,
-  ComputedClause = 358,
-  FieldsColumnsClause = 359,
-  IndexClause = 360,
-  UniqueClause = 361,
-  SearchAnalyzerClause = 362,
-  Bm25Clause = 363,
-  DocIdsOrderClause = 364,
-  DocLenghtsOrderClause = 365,
-  PostingsOrderClause = 366,
-  TermsOrderClause = 367,
-  DocIdsCacheClause = 368,
-  DocLenghtsCacheClause = 369,
-  PostingsCacheClause = 370,
-  TermsCacheClause = 371,
-  MtreeClause = 372,
-  IndexDimensionClause = 373,
-  MtreeDistClause = 374,
-  IndexCapacityClause = 375,
-  MtreeCacheClause = 376,
-  HnswClause = 377,
-  HnswDistClause = 378,
-  IndexLmClause = 379,
-  IndexM0Clause = 380,
-  IndexMClause = 381,
-  IndexEfcClause = 382,
-  IndexExtendCandidatesClause = 383,
-  IndexKeepPrunedConnectionsClause = 384,
-  TokenizersClause = 387,
-  FiltersClause = 388,
-  AnalyzerFilters = 389,
-  FunctionClause = 390,
-  PermissionsBasicClause = 391,
-  SessionClause = 393,
-  TableTypeClause = 394,
-  TableViewClause = 396,
-  ChangefeedClause = 397,
-  ApiOptions = 398,
-  MiddlewareClause = 399,
-  HttpMethod = 400,
-  BackendClause = 401,
-  RebuildStatement = 402,
-  InsertStatement = 403,
-  JavaScriptBlock = 405,
-  Closure = 407,
-  escapedParamDefinition = 408,
-  TypeCast = 410,
-  BinaryExpression = 412,
-  Operator = 413,
-  Range = 414,
-  ShowStatement = 415,
-  SleepStatement = 416,
-  UseStatement = 417,
-  OptionStatement = 418,
-  BreakStatement = 419,
-  ContinueStatement = 420,
-  ForStatement = 421,
-  ThrowStatement = 422,
-  PermissionInput = 423,
-  IndexInput = 424,
-  CombinedResults = 425,
-  CommentResult = 427,
-  Syntax = 429
+  Number = 213,
+  Int = 214,
+  Float = 215,
+  Decimal = 216,
+  Array = 219,
+  Set = 222,
+  RecordId = 223,
+  RecordTbIdent = 224,
+  RecordIdIdent = 226,
+  Object = 227,
+  ObjectContent = 228,
+  ObjectProperty = 229,
+  ObjectKey = 230,
+  RecordIdRange = 233,
+  Duration = 234,
+  DurationPart = 235,
+  FormatString = 237,
+  Interpolation = 238,
+  Regex = 239,
+  VariableName = 240,
+  FunctionJs = 242,
+  ArgumentList = 244,
+  IfElseStatement = 245,
+  Block = 247,
+  SubQuery = 248,
+  LetStatement = 250,
+  paramDefinition = 251,
+  LiteralType = 257,
+  ObjectTypeContent = 260,
+  ObjectTypeProperty = 261,
+  DeleteStatement = 264,
+  WhereClause = 265,
+  ReturnClause = 266,
+  Fields = 267,
+  AnyStar = 268,
+  TimeoutClause = 269,
+  ParallelClause = 270,
+  CreateStatement = 271,
+  FunctionCall = 272,
+  FunctionName = 273,
+  customFunctionName = 274,
+  VersionNumber = 276,
+  ContentClause = 277,
+  SetClause = 278,
+  FieldAssignment = 279,
+  assignmentOperator = 280,
+  UnsetClause = 281,
+  SelectStatement = 282,
+  OmitClause = 283,
+  WithClause = 284,
+  SplitClause = 285,
+  Idiom = 286,
+  GroupClause = 287,
+  OrderClause = 288,
+  Order = 289,
+  LimitStartComboClause = 290,
+  StartClause = 291,
+  LimitClause = 292,
+  FetchClause = 293,
+  TempfilesClause = 294,
+  ExplainClause = 295,
+  VersionClause = 296,
+  RelateStatement = 297,
+  UpdateStatement = 300,
+  MergeClause = 301,
+  PatchClause = 302,
+  ReplaceClause = 303,
+  RemoveStatement = 304,
+  IfExistsClause = 305,
+  OnTableClause = 306,
+  functionKw = 307,
+  UpsertStatement = 308,
+  ReturnStatement = 309,
+  AlterStatement = 310,
+  IfNotExistsClause = 311,
+  PermissionsForClause = 312,
+  PermissionGroup = 313,
+  CommentClause = 314,
+  DefineStatement = 315,
+  OverwriteClause = 317,
+  OnRootNsDbClause = 318,
+  AccessTypeClause = 319,
+  JwtClause = 320,
+  SignupClause = 321,
+  SigninClause = 322,
+  AuthenticateClause = 323,
+  DurationClause = 324,
+  DurationValue = 325,
+  TokenTypeClause = 326,
+  TypeClause = 329,
+  DefaultClause = 330,
+  ReadonlyClause = 332,
+  ValueClause = 333,
+  AssertClause = 334,
+  ReferenceClause = 335,
+  ComputedClause = 336,
+  FieldsColumnsClause = 337,
+  IndexClause = 338,
+  UniqueClause = 339,
+  SearchAnalyzerClause = 340,
+  Bm25Clause = 341,
+  DocIdsOrderClause = 342,
+  DocLenghtsOrderClause = 343,
+  PostingsOrderClause = 344,
+  TermsOrderClause = 345,
+  DocIdsCacheClause = 346,
+  DocLenghtsCacheClause = 347,
+  PostingsCacheClause = 348,
+  TermsCacheClause = 349,
+  MtreeClause = 350,
+  IndexDimensionClause = 351,
+  MtreeDistClause = 352,
+  IndexCapacityClause = 353,
+  MtreeCacheClause = 354,
+  HnswClause = 355,
+  HnswDistClause = 356,
+  IndexLmClause = 357,
+  IndexM0Clause = 358,
+  IndexMClause = 359,
+  IndexEfcClause = 360,
+  IndexExtendCandidatesClause = 361,
+  IndexKeepPrunedConnectionsClause = 362,
+  TokenizersClause = 365,
+  FiltersClause = 366,
+  AnalyzerFilters = 367,
+  FunctionClause = 368,
+  PermissionsBasicClause = 369,
+  SessionClause = 371,
+  TableTypeClause = 372,
+  TableViewClause = 374,
+  ChangefeedClause = 375,
+  ApiOptions = 376,
+  MiddlewareClause = 377,
+  HttpMethod = 378,
+  BackendClause = 379,
+  RebuildStatement = 380,
+  InsertStatement = 381,
+  JavaScriptBlock = 383,
+  Closure = 385,
+  escapedParamDefinition = 386,
+  TypeCast = 388,
+  BinaryExpression = 389,
+  Operator = 390,
+  Range = 391,
+  Path = 392,
+  Lookup = 393,
+  Any = 396,
+  LookupSelection = 397,
+  GraphPredicate = 399,
+  Optional = 405,
+  At = 406,
+  IdiomFunction = 407,
+  Destructure = 409,
+  Recurse = 410,
+  RecurseRange = 411,
+  RecurseOptions = 412,
+  recurseOptionName = 413,
+  ShowStatement = 416,
+  SleepStatement = 417,
+  UseStatement = 418,
+  OptionStatement = 419,
+  BreakStatement = 420,
+  ContinueStatement = 421,
+  ForStatement = 422,
+  ThrowStatement = 423,
+  PermissionInput = 424,
+  IndexInput = 425,
+  CombinedResults = 426,
+  CommentResult = 428,
+  Syntax = 430

package/src/surrealql.grammar

@@ -778,7 +778,7 @@ ShowStatement {
 	show changes for table
 	Ident
 	( since String )?
-	( limit number )?
+	( limit Number )?
 }
 
 // Sleep statement
@@ -816,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] {
@@ -940,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] {
@@ -1005,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 |
@@ -1199,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
@@ -1222,7 +1226,7 @@ MtreeClause[since=1_3_0] {
 	)*
 }
 
-MtreeCacheClause { mtree_cache number }
+MtreeCacheClause { mtree_cache Number }
 MtreeDistClause { dist ( Distance ) }
 
 HnswClause[since=1_5_0] {
@@ -1241,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 }
 
@@ -1304,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 {
@@ -1465,7 +1469,7 @@ BackendClause {
 // Support
 
 AnalyzerFilters {
-	Filter ("(" (number "," number | Ident) ")")?
+	Filter ("(" (Number "," Number | Ident) ")")?
 }
 
 Order {
@@ -1488,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 {
@@ -1527,7 +1531,7 @@ Ident {
 	tickIdent
 }
 
-number { ("-" | "+")? (Int | Float | Decimal) }
+Number { ("-" | "+")? (Int | Float | Decimal) }
 
 Operator {
 	binaryOperator |
@@ -1536,11 +1540,11 @@ Operator {
 	is | ( is opNot ) |
 	in | ( opNot opIn ) |
 
-	( "@" number "@" ) |
+	( "@" Number "@" ) |
 	(
 		"<|"
-		number
-		( "," ( number | Distance | ( minkowski number ) ) )
+		Number
+		( "," ( Number | Distance | ( minkowski Number ) ) )
 		"|>"
 	)
 }

package/test/misc/comments.txt

@@ -5,7 +5,7 @@
 
 ==>
 
-SurrealQL(Comment,Int)
+SurrealQL(Comment,Number(Int))
 
 # Dash comment
 
@@ -14,7 +14,7 @@ SurrealQL(Comment,Int)
 
 ==>
 
-SurrealQL(Comment,Int)
+SurrealQL(Comment,Number(Int))
 
 # Slash comment
 
@@ -23,7 +23,7 @@ SurrealQL(Comment,Int)
 
 ==>
 
-SurrealQL(Comment,Int)
+SurrealQL(Comment,Number(Int))
 
 # Block comment
 
@@ -33,7 +33,7 @@ SurrealQL(Comment,Int)
 
 ==>
 
-SurrealQL(BinaryExpression(Int,BlockComment,Operator,Int))
+SurrealQL(BinaryExpression(Number(Int),BlockComment,Operator,Number(Int)))
 
 # Block comment standalone
 
@@ -41,4 +41,4 @@ SurrealQL(BinaryExpression(Int,BlockComment,Operator,Int))
 
 ==>
 
-SurrealQL(BlockComment,Int)
+SurrealQL(BlockComment,Number(Int))

package/test/misc/functions.txt

@@ -12,7 +12,7 @@ fn::one::two(1, a)
 
 ==>
 
-SurrealQL(FunctionCall(FunctionName,ArgumentList(Int,Ident)))
+SurrealQL(FunctionCall(FunctionName,ArgumentList(Number(Int),Ident)))
 
 # Rand function
 
@@ -20,7 +20,7 @@ rand(3)
 
 ==>
 
-SurrealQL(FunctionCall(FunctionName,ArgumentList(Int)))
+SurrealQL(FunctionCall(FunctionName,ArgumentList(Number(Int))))
 
 # Count function
 
@@ -60,4 +60,4 @@ $func(1)
 
 ==>
 
-SurrealQL(FunctionCall(VariableName,ArgumentList(Int)))
+SurrealQL(FunctionCall(VariableName,ArgumentList(Number(Int))))

package/test/misc/identifiers.txt

@@ -16,7 +16,7 @@ create bla set true = 1, false = 2, null = 3, none = 4
 SurrealQL(CreateStatement(
   Keyword,Ident,
   SetClause( Keyword,
-    FieldAssignment(Ident,Operator,Int),
-    FieldAssignment(Ident,Operator,Int),
-    FieldAssignment(Ident,Operator,Int),
-    FieldAssignment(Ident,Operator,Int))))
+    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

@@ -12,7 +12,7 @@ function(123, 1d2h) {
 SurrealQL(
   FunctionJs(
     FunctionName,
-    ArgumentList(Int,Duration(DurationPart,DurationPart)),
+    ArgumentList(Number(Int),Duration(DurationPart,DurationPart)),
     JavaScriptBlock(BraceOpen,JavaScriptContent,BraceClose)
   )
 )