@surrealdb/lezer 1.0.2 → 1.0.4

package/src/parser.terms.js

@@ -153,234 +153,236 @@ export const
   sleep = 151,
   split = 152,
   start = 153,
-  structure = 154,
-  table = 155,
-  tables = 156,
-  tb = 157,
-  tempfiles = 158,
-  terms_cache = 159,
-  terms_order = 160,
-  then = 161,
-  _throw = 162,
-  timeout = 163,
-  to = 164,
-  token = 165,
-  tokenizers = 166,
-  trace = 167,
-  transaction = 168,
-  typeKeyword = 169,
-  unique = 170,
-  unset = 171,
-  update = 172,
-  upsert = 173,
-  url = 174,
-  use = 175,
-  user = 176,
-  valueKeyword = 177,
-  values = 178,
-  version = 179,
-  when = 180,
-  where = 181,
-  _with = 182,
-  after = 183,
-  before = 184,
-  diff = 185,
-  _false = 186,
-  full = 187,
-  none = 188,
-  _null = 189,
-  _true = 190,
-  IndexTypeClause = 191,
-  TokenType = 192,
-  binaryOperatorKeyword = 492,
-  is = 493,
-  opIn = 494,
-  opNot = 495,
-  Distance = 193,
-  minkowski = 194,
-  Filter = 195,
-  AnalyzerTokenizer = 196,
-  _function = 496,
-  rand = 197,
-  count = 198,
-  Comment = 199,
-  BlockComment = 200,
-  SurrealQL = 201,
-  BeginStatement = 202,
-  CancelStatement = 203,
-  CommitStatement = 204,
-  InfoForStatement = 205,
-  Ident = 206,
-  KillStatement = 207,
-  String = 208,
-  LiveSelectStatement = 209,
-  Predicate = 210,
-  prefixedString = 211,
-  FormatString = 212,
-  Interpolation = 215,
-  Int = 216,
-  Float = 217,
-  Decimal = 218,
-  Regex = 219,
-  VariableName = 220,
-  Array = 224,
-  Set = 225,
-  RecordId = 226,
-  RecordTbIdent = 227,
-  RecordIdIdent = 229,
-  Object = 230,
-  ObjectContent = 231,
-  ObjectProperty = 232,
-  ObjectKey = 233,
-  RecordIdRange = 236,
-  FunctionJs = 237,
-  ArgumentList = 239,
-  IfElseStatement = 240,
-  Block = 242,
-  SubQuery = 243,
-  LetStatement = 245,
-  paramDefinition = 246,
-  LiteralType = 252,
-  Duration = 253,
-  DurationPart = 254,
-  ObjectTypeContent = 257,
-  ObjectTypeProperty = 258,
-  DeleteStatement = 261,
-  WhereClause = 262,
-  ReturnClause = 263,
-  Fields = 264,
-  AnyStar = 265,
-  TimeoutClause = 266,
-  ParallelClause = 267,
-  CreateStatement = 268,
-  FunctionCall = 269,
-  FunctionName = 270,
-  customFunctionName = 271,
-  VersionNumber = 273,
-  ContentClause = 274,
-  SetClause = 275,
-  FieldAssignment = 276,
-  assignmentOperator = 277,
-  UnsetClause = 278,
-  SelectStatement = 279,
-  OmitClause = 280,
-  WithClause = 281,
-  SplitClause = 282,
-  Idiom = 283,
-  GroupClause = 284,
-  OrderClause = 285,
-  Order = 286,
-  LimitStartComboClause = 287,
-  StartClause = 288,
-  LimitClause = 289,
-  FetchClause = 290,
-  Path = 291,
-  Lookup = 292,
-  Any = 297,
-  LookupSelection = 298,
-  GraphPredicate = 300,
-  Optional = 306,
-  At = 307,
-  IdiomFunction = 308,
-  Destructure = 310,
-  Recurse = 311,
-  RecurseRange = 312,
-  RecurseOptions = 313,
-  recurseOptionName = 314,
-  TempfilesClause = 317,
-  ExplainClause = 318,
-  VersionClause = 319,
-  RelateStatement = 320,
-  UpdateStatement = 321,
-  ReplaceClause = 322,
+  strict = 154,
+  structure = 155,
+  table = 156,
+  tables = 157,
+  tb = 158,
+  tempfiles = 159,
+  terms_cache = 160,
+  terms_order = 161,
+  then = 162,
+  _throw = 163,
+  timeout = 164,
+  to = 165,
+  token = 166,
+  tokenizers = 167,
+  trace = 168,
+  transaction = 169,
+  typeKeyword = 170,
+  unique = 171,
+  unset = 172,
+  update = 173,
+  upsert = 174,
+  url = 175,
+  use = 176,
+  user = 177,
+  valueKeyword = 178,
+  values = 179,
+  version = 180,
+  when = 181,
+  where = 182,
+  _with = 183,
+  after = 184,
+  before = 185,
+  diff = 186,
+  _false = 187,
+  full = 188,
+  none = 189,
+  _null = 190,
+  _true = 191,
+  IndexTypeClause = 192,
+  TokenType = 193,
+  binaryOperatorKeyword = 493,
+  is = 494,
+  opIn = 495,
+  opNot = 496,
+  Distance = 194,
+  minkowski = 195,
+  Filter = 196,
+  AnalyzerTokenizer = 197,
+  _function = 497,
+  rand = 198,
+  count = 199,
+  Comment = 200,
+  BlockComment = 201,
+  SurrealQL = 202,
+  BeginStatement = 203,
+  CancelStatement = 204,
+  CommitStatement = 205,
+  InfoForStatement = 206,
+  Ident = 207,
+  KillStatement = 208,
+  String = 209,
+  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,
-  RemoveStatement = 325,
-  IfExistsClause = 326,
-  OnTableClause = 327,
-  functionKw = 328,
-  UpsertStatement = 329,
-  ReturnStatement = 330,
-  AlterStatement = 331,
-  IfNotExistsClause = 332,
-  PermissionsForClause = 333,
-  CommentClause = 334,
-  DefineStatement = 335,
-  OverwriteClause = 337,
-  OnRootNsDbClause = 338,
-  AccessTypeClause = 339,
-  JwtClause = 340,
-  SignupClause = 341,
-  SigninClause = 342,
-  AuthenticateClause = 343,
-  DurationClause = 344,
-  DurationValue = 345,
-  TokenTypeClause = 346,
-  TypeClause = 349,
-  DefaultClause = 350,
-  ReadonlyClause = 352,
-  ValueClause = 353,
-  AssertClause = 354,
-  ReferenceClause = 355,
-  ComputedClause = 356,
-  FieldsColumnsClause = 357,
-  IndexClause = 358,
-  UniqueClause = 359,
-  SearchAnalyzerClause = 360,
-  Bm25Clause = 361,
-  DocIdsOrderClause = 362,
-  DocLenghtsOrderClause = 363,
-  PostingsOrderClause = 364,
-  TermsOrderClause = 365,
-  DocIdsCacheClause = 366,
-  DocLenghtsCacheClause = 367,
-  PostingsCacheClause = 368,
-  TermsCacheClause = 369,
-  MtreeClause = 370,
-  IndexDimensionClause = 371,
-  MtreeDistClause = 372,
-  IndexCapacityClause = 373,
-  MtreeCacheClause = 374,
-  HnswClause = 375,
-  HnswDistClause = 376,
-  IndexLmClause = 377,
-  IndexM0Clause = 378,
-  IndexMClause = 379,
-  IndexEfcClause = 380,
-  IndexExtendCandidatesClause = 381,
-  IndexKeepPrunedConnectionsClause = 382,
-  TokenizersClause = 385,
-  FiltersClause = 386,
-  AnalyzerFilters = 387,
-  FunctionClause = 388,
-  PermissionsBasicClause = 389,
-  SessionClause = 391,
-  TableTypeClause = 392,
-  TableViewClause = 394,
-  ChangefeedClause = 395,
-  ApiOptions = 396,
-  MiddlewareClause = 397,
-  HttpMethod = 398,
-  BackendClause = 399,
-  RebuildStatement = 400,
-  InsertStatement = 401,
-  JavaScriptBlock = 404,
-  Closure = 406,
-  escapedParamDefinition = 407,
-  TypeCast = 409,
-  BinaryExpression = 411,
-  Operator = 412,
-  Range = 413,
-  ShowStatement = 414,
-  SleepStatement = 415,
-  UseStatement = 416,
-  OptionStatement = 417,
-  BreakStatement = 418,
-  ContinueStatement = 419,
-  ForStatement = 420,
-  ThrowStatement = 421,
-  PermissionInput = 422,
-  IndexInput = 423,
-  CombinedResults = 424,
-  CommentResult = 426,
-  Syntax = 428
+  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

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?
@@ -1414,15 +1415,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+
 	)
 }
 
@@ -1821,6 +1824,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,Int)
+
+# Dash comment
+
+-- this is a comment
+42
+
+==>
+
+SurrealQL(Comment,Int)
+
+# Slash comment
+
+// this is a comment
+42
+
+==>
+
+SurrealQL(Comment,Int)
+
+# Block comment
+
+1 /* this is
+     a block
+     comment */ + 2
+
+==>
+
+SurrealQL(BinaryExpression(Int,BlockComment,Operator,Int))
+
+# Block comment standalone
+
+/* block */ 42
+
+==>
+
+SurrealQL(BlockComment,Int)