Automated update of artifacts

.changeset/salty-houses-camp.md

@@ -0,0 +1,5 @@
+---
+'@neo4j-cypher/language-support': patch
+---
+
+Updates grammar and semantic analysis to version 2025.06

packages/language-support/src/antlr-grammar/Cypher25Lexer.g4

@@ -107,6 +107,10 @@ ACTIVE
    : A C T I V E
    ;
 
+ADD
+   : A D D
+   ;
+
 ADMIN
    : A D M I N
    ;
@@ -131,6 +135,10 @@ ALL
    : A L L
    ;
 
+ALLREDUCE
+  : A L L R E D U C E
+  ;
+
 ALTER
    : A L T E R
    ;
@@ -740,6 +748,10 @@ PERCENT
    : '%'
    ;
 
+IMPLIES
+  : I M P L I E S
+  ;
+
 INVALID_NEQ
    : '!='
    ;
@@ -780,6 +792,10 @@ NEW
    : N E W
    ;
 
+NEXT
+   : N E X T
+   ;
+
 NODE
    : N O D E
    ;

packages/language-support/src/antlr-grammar/Cypher25Parser.g4

@@ -23,7 +23,11 @@ statements
    ;
 
 statement
-   : command | regularQuery
+   : command | nextStatement
+   ;
+
+nextStatement
+   : regularQuery (NEXT regularQuery)*
    ;
 
 regularQuery
@@ -48,7 +52,7 @@ elseBranch
 
 singleQuery
    : clause+
-   | useClause? LCURLY regularQuery RCURLY
+   | useClause? LCURLY nextStatement RCURLY
    ;
 
 clause
@@ -241,7 +245,7 @@ foreachClause
    ;
 
 subqueryClause
-   : OPTIONAL? CALL subqueryScope? LCURLY regularQuery RCURLY subqueryInTransactionsParameters?
+   : OPTIONAL? CALL subqueryScope? LCURLY nextStatement RCURLY subqueryInTransactionsParameters?
    ;
 
 subqueryScope
@@ -563,6 +567,7 @@ expression1
    | listLiteral
    | patternComprehension
    | reduceExpression
+   | allReduceExpression
    | listItemsPredicate
    | normalizeFunction
    | vectorFunction
@@ -632,6 +637,10 @@ reduceExpression
    : REDUCE LPAREN variable EQ expression COMMA variable IN expression BAR expression RPAREN
    ;
 
+allReduceExpression
+   : ALLREDUCE LPAREN variable EQ expression COMMA expression COMMA expression RPAREN
+   ;
+
 listItemsPredicate
    : (
       ALL
@@ -681,15 +690,15 @@ countStar
    ;
 
 existsExpression
-   : EXISTS LCURLY (regularQuery | matchMode? patternList whereClause?) RCURLY
+   : EXISTS LCURLY (nextStatement | matchMode? patternList whereClause?) RCURLY
    ;
 
 countExpression
-   : COUNT LCURLY (regularQuery | matchMode? patternList whereClause?) RCURLY
+   : COUNT LCURLY (nextStatement | matchMode? patternList whereClause?) RCURLY
    ;
 
 collectExpression
-   : COLLECT LCURLY regularQuery RCURLY
+   : COLLECT LCURLY nextStatement RCURLY
    ;
 
 numberLiteral
@@ -856,6 +865,17 @@ createCommand
    )
    ;
 
+alterCommand
+   : ALTER (
+      alterAlias
+      | alterCurrentUser
+      | alterCurrentGraphType
+      | alterDatabase
+      | alterUser
+      | alterServer
+   )
+   ;
+
 dropCommand
    : DROP (
       dropAlias
@@ -1100,18 +1120,138 @@ enclosedPropertyList
    : variable property (COMMA variable property)*
    ;
 
-// Admin commands
+// Graph Type Specification
 
-alterCommand
-   : ALTER (
-      alterAlias
-      | alterCurrentUser
-      | alterDatabase
-      | alterUser
-      | alterServer
-   )
+alterCurrentGraphType
+   : CURRENT GRAPH TYPE ( (SET | ADD | ALTER) graphTypeSpecification | DROP graphTypeDropSpecification )
+   ;
+
+graphTypeSpecification
+   : LCURLY graphTypeSpecificationBody? RCURLY
+   ;
+
+graphTypeDropSpecification
+   : LCURLY graphTypeDropSpecificationBody? RCURLY
+   ;
+
+graphTypeSpecificationBody
+   : graphTypeElement (COMMA graphTypeElement)*
+   ;
+
+graphTypeDropSpecificationBody
+   : graphTypeDropElement (COMMA graphTypeDropElement)*
    ;
 
+graphTypeElement
+  : edgeTypeSpecification
+  | nodeTypeSpecification
+  | constraintSpecification
+  ;
+
+graphTypeDropElement
+  : edgeTypeSpecification
+  | nodeTypeSpecification
+  | CONSTRAINT symbolicNameString
+  ;
+
+nodeTypeInlineConstraintList
+   : (constraintType commandOptions?)+
+   ;
+
+edgeTypeInlineConstraintList
+   : (constraintType commandOptions?)+
+   ;
+
+implies
+  : EQ rightArrow
+  | IMPLIES
+  ;
+
+// Node type specification
+
+nodeTypeSpecification
+  : LPAREN variable? identifyingLabel impliedLabelSet? propertyTypeList? RPAREN nodeTypeInlineConstraintList?
+  ;
+
+impliedLabelSet
+  : labelType ( AMPERSAND symbolicNameString )*
+  ;
+
+identifyingLabel
+  : labelType implies
+  ;
+
+// Node type reference
+
+nodeTypeReference
+  : nodeTypeAliasReference
+  | nodeTypeInSituReference
+  ;
+
+nodeTypeAliasReference
+  : LPAREN variable RPAREN
+  ;
+
+nodeTypeInSituReference
+  : LPAREN ( variable? labelType implies? )? RPAREN
+  ;
+
+// Edge type specifcation
+
+edgeTypeSpecification
+  : nodeTypeReference arcTypePointingRight nodeTypeReference edgeTypeInlineConstraintList?
+  ;
+
+arcTypePointingRight
+  : arrowLine LBRACKET variable? identifyingRelationship propertyTypeList? RBRACKET arrowLine rightArrow
+  ;
+
+identifyingRelationship
+  : relType implies
+  ;
+
+// Edge type reference
+
+edgeTypeReference
+  : edgeTypeAliasReference
+  | edgeTypeInSituReference
+  ;
+
+edgeTypeAliasReference
+  : LPAREN RPAREN arrowLine LBRACKET variable RBRACKET arrowLine rightArrow LPAREN RPAREN
+  ;
+
+edgeTypeInSituReference
+  : LPAREN RPAREN arrowLine LBRACKET variable? relType implies? RBRACKET arrowLine rightArrow LPAREN RPAREN
+  ;
+
+// Property Types
+
+propertyTypeList
+  : LCURLY (propertyType ( COMMA propertyType )* )? RCURLY
+  ;
+
+propertyType
+  : propertyKeyName typed? type propertyTypeInlineConstraint?
+  ;
+
+propertyTypeInlineConstraint
+  : IS  ( NODE | RELATIONSHIP | REL )? (KEY | UNIQUE)
+  ;
+
+typed
+  : COLONCOLON
+  | TYPED
+  ;
+
+// Graph Type constraint specification
+
+constraintSpecification
+  : CONSTRAINT symbolicNameString? FOR (nodeTypeReference | edgeTypeReference) constraintType commandOptions?
+  ;
+
+// Admin commands
+
 renameCommand
    : RENAME (renameRole | renameServer | renameUser)
    ;
@@ -1598,7 +1738,7 @@ shards
    ;
 
 graphShard
-   : GRAPH SHARD LCURLY (SET? topology)? RCURLY
+   : GRAPH SHARD LCURLY (topology)? RCURLY
    ;
 
 propertyShard
@@ -1839,12 +1979,14 @@ unescapedSymbolicNameString_
    : IDENTIFIER
    | ACCESS
    | ACTIVE
+   | ADD
    | ADMIN
    | ADMINISTRATOR
    | ALIAS
    | ALIASES
    | ALL_SHORTEST_PATHS
    | ALL
+   | ALLREDUCE
    | ALTER
    | AND
    | ANY
@@ -1945,6 +2087,7 @@ unescapedSymbolicNameString_
    | IF
    | IMMUTABLE
    | IMPERSONATE
+   | IMPLIES
    | IN
    | INDEX
    | INDEXES
@@ -1982,6 +2125,7 @@ unescapedSymbolicNameString_
    | NAMES
    | NAN
    | NEW
+   | NEXT
    | NFC
    | NFD
    | NFKC

packages/language-support/src/formatting/formatting.ts

@@ -1784,10 +1784,10 @@ export class TreePrintVisitor extends CypherCmdParserVisitor<void> {
     this._visit(ctx.EXISTS());
     this.avoidBreakBetween();
     this._visit(ctx.LCURLY());
-    if (ctx.regularQuery()) {
+    if (ctx.nextStatement()) {
       this.breakLine();
       const queryIndent = this.addIndentation();
-      this._visit(ctx.regularQuery());
+      this._visit(ctx.nextStatement());
       this.removeIndentation(queryIndent);
       this.mustBreakBetween();
       this._visit(ctx.RCURLY());
@@ -1814,7 +1814,7 @@ export class TreePrintVisitor extends CypherCmdParserVisitor<void> {
     this.avoidBreakBetween();
     this._visit(ctx.LCURLY());
     const queryIndent = this.addIndentation();
-    this._visit(ctx.regularQuery());
+    this._visit(ctx.nextStatement());
     this.removeIndentation(queryIndent);
     this.breakLine();
     this._visit(ctx.RCURLY());
@@ -1825,9 +1825,9 @@ export class TreePrintVisitor extends CypherCmdParserVisitor<void> {
     this.avoidBreakBetween();
     this._visit(ctx.LCURLY());
 
-    if (ctx.regularQuery()) {
+    if (ctx.nextStatement()) {
       const queryIndent = this.addIndentation();
-      this._visit(ctx.regularQuery());
+      this._visit(ctx.nextStatement());
       this.removeIndentation(queryIndent);
       this.breakLine();
       this.mustBreakBetween();
@@ -1943,7 +1943,7 @@ export class TreePrintVisitor extends CypherCmdParserVisitor<void> {
     this._visit(ctx.LCURLY());
     const queryIndent = this.addIndentation();
     this.breakLine();
-    this._visit(ctx.regularQuery());
+    this._visit(ctx.nextStatement());
     this.removeIndentation(queryIndent);
     this.breakLine();
     this._visit(ctx.RCURLY());

packages/language-support/src/lexerSymbols.ts

@@ -102,11 +102,13 @@ export const lexerComment = [
 export const lexerKeywords = [
   CypherLexer.ACCESS,
   CypherLexer.ACTIVE,
+  CypherLexer.ADD,
   CypherLexer.ADMIN,
   CypherLexer.ADMINISTRATOR,
   CypherLexer.ALIAS,
   CypherLexer.ALIASES,
   CypherLexer.ALL,
+  CypherLexer.ALLREDUCE,
   CypherLexer.ALL_SHORTEST_PATHS,
   CypherLexer.ALTER,
   CypherLexer.AND,
@@ -208,6 +210,7 @@ export const lexerKeywords = [
   CypherLexer.IF,
   CypherLexer.IMMUTABLE,
   CypherLexer.IMPERSONATE,
+  CypherLexer.IMPLIES,
   CypherLexer.IN,
   CypherLexer.INDEX,
   CypherLexer.INDEXES,
@@ -245,6 +248,7 @@ export const lexerKeywords = [
   CypherLexer.NAMES,
   CypherLexer.NAN,
   CypherLexer.NEW,
+  CypherLexer.NEXT,
   CypherLexer.NFC,
   CypherLexer.NFD,
   CypherLexer.NFKC,