@prisma-next/psl-parser 0.14.0-dev.4 → 0.14.0-dev.41

package/src/syntax/ast/declarations.ts

@@ -1,7 +1,6 @@
-import type { Token } from '../../tokenizer';
-import type { AstNode } from '../ast-helpers';
+import type { AstNode, BracedBlock } from '../ast-helpers';
 import { filterChildren, findChildToken, findFirstChild } from '../ast-helpers';
-import { SyntaxNode } from '../red';
+import { SyntaxNode, type SyntaxToken } from '../red';
 import { FieldAttributeAst, ModelAttributeAst } from './attributes';
 import type { ExpressionAst } from './expressions';
 import { castExpression } from './expressions';
@@ -18,6 +17,11 @@ export type NamespaceMemberAst =
   | CompositeTypeDeclarationAst
   | GenericBlockDeclarationAst;
 
+export type DeclarationAst = NamespaceMemberAst | TypesBlockAst | NamespaceDeclarationAst;
+export type AttributeAst = FieldAttributeAst | ModelAttributeAst;
+export type BlockMemberAst = FieldDeclarationAst | ModelAttributeAst;
+export type GenericBlockMemberAst = KeyValuePairAst | ModelAttributeAst;
+
 function castNamespaceMember(node: SyntaxNode): NamespaceMemberAst | undefined {
   return (
     ModelDeclarationAst.cast(node) ??
@@ -33,7 +37,7 @@ export class DocumentAst implements AstNode {
     this.syntax = syntax;
   }
 
-  *declarations(): Iterable<NamespaceMemberAst | TypesBlockAst | NamespaceDeclarationAst> {
+  *declarations(): Iterable<DeclarationAst> {
     yield* filterChildren(
       this.syntax,
       (node) =>
@@ -46,14 +50,14 @@ export class DocumentAst implements AstNode {
   }
 }
 
-export class ModelDeclarationAst implements AstNode {
+export class ModelDeclarationAst implements BracedBlock {
   readonly syntax: SyntaxNode;
 
   constructor(syntax: SyntaxNode) {
     this.syntax = syntax;
   }
 
-  keyword(): Token | undefined {
+  keyword(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Ident');
   }
 
@@ -61,11 +65,11 @@ export class ModelDeclarationAst implements AstNode {
     return findFirstChild(this.syntax, IdentifierAst.cast);
   }
 
-  lbrace(): Token | undefined {
+  lbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'LBrace');
   }
 
-  rbrace(): Token | undefined {
+  rbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'RBrace');
   }
 
@@ -77,19 +81,26 @@ export class ModelDeclarationAst implements AstNode {
     yield* filterChildren(this.syntax, ModelAttributeAst.cast);
   }
 
+  *members(): Iterable<BlockMemberAst> {
+    yield* filterChildren(
+      this.syntax,
+      (node) => FieldDeclarationAst.cast(node) ?? ModelAttributeAst.cast(node),
+    );
+  }
+
   static cast(node: SyntaxNode): ModelDeclarationAst | undefined {
     return node.kind === 'ModelDeclaration' ? new ModelDeclarationAst(node) : undefined;
   }
 }
 
-export class CompositeTypeDeclarationAst implements AstNode {
+export class CompositeTypeDeclarationAst implements BracedBlock {
   readonly syntax: SyntaxNode;
 
   constructor(syntax: SyntaxNode) {
     this.syntax = syntax;
   }
 
-  keyword(): Token | undefined {
+  keyword(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Ident');
   }
 
@@ -97,11 +108,11 @@ export class CompositeTypeDeclarationAst implements AstNode {
     return findFirstChild(this.syntax, IdentifierAst.cast);
   }
 
-  lbrace(): Token | undefined {
+  lbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'LBrace');
   }
 
-  rbrace(): Token | undefined {
+  rbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'RBrace');
   }
 
@@ -113,6 +124,13 @@ export class CompositeTypeDeclarationAst implements AstNode {
     yield* filterChildren(this.syntax, ModelAttributeAst.cast);
   }
 
+  *members(): Iterable<BlockMemberAst> {
+    yield* filterChildren(
+      this.syntax,
+      (node) => FieldDeclarationAst.cast(node) ?? ModelAttributeAst.cast(node),
+    );
+  }
+
   static cast(node: SyntaxNode): CompositeTypeDeclarationAst | undefined {
     return node.kind === 'CompositeTypeDeclaration'
       ? new CompositeTypeDeclarationAst(node)
@@ -120,14 +138,14 @@ export class CompositeTypeDeclarationAst implements AstNode {
   }
 }
 
-export class NamespaceDeclarationAst implements AstNode {
+export class NamespaceDeclarationAst implements BracedBlock {
   readonly syntax: SyntaxNode;
 
   constructor(syntax: SyntaxNode) {
     this.syntax = syntax;
   }
 
-  keyword(): Token | undefined {
+  keyword(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Ident');
   }
 
@@ -135,11 +153,11 @@ export class NamespaceDeclarationAst implements AstNode {
     return findFirstChild(this.syntax, IdentifierAst.cast);
   }
 
-  lbrace(): Token | undefined {
+  lbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'LBrace');
   }
 
-  rbrace(): Token | undefined {
+  rbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'RBrace');
   }
 
@@ -152,22 +170,22 @@ export class NamespaceDeclarationAst implements AstNode {
   }
 }
 
-export class TypesBlockAst implements AstNode {
+export class TypesBlockAst implements BracedBlock {
   readonly syntax: SyntaxNode;
 
   constructor(syntax: SyntaxNode) {
     this.syntax = syntax;
   }
 
-  keyword(): Token | undefined {
+  keyword(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Ident');
   }
 
-  lbrace(): Token | undefined {
+  lbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'LBrace');
   }
 
-  rbrace(): Token | undefined {
+  rbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'RBrace');
   }
 
@@ -180,14 +198,14 @@ export class TypesBlockAst implements AstNode {
   }
 }
 
-export class GenericBlockDeclarationAst implements AstNode {
+export class GenericBlockDeclarationAst implements BracedBlock {
   readonly syntax: SyntaxNode;
 
   constructor(syntax: SyntaxNode) {
     this.syntax = syntax;
   }
 
-  keyword(): Token | undefined {
+  keyword(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Ident');
   }
 
@@ -195,11 +213,11 @@ export class GenericBlockDeclarationAst implements AstNode {
     return findFirstChild(this.syntax, IdentifierAst.cast);
   }
 
-  lbrace(): Token | undefined {
+  lbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'LBrace');
   }
 
-  rbrace(): Token | undefined {
+  rbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'RBrace');
   }
 
@@ -211,6 +229,13 @@ export class GenericBlockDeclarationAst implements AstNode {
     yield* filterChildren(this.syntax, ModelAttributeAst.cast);
   }
 
+  *members(): Iterable<GenericBlockMemberAst> {
+    yield* filterChildren(
+      this.syntax,
+      (node) => KeyValuePairAst.cast(node) ?? ModelAttributeAst.cast(node),
+    );
+  }
+
   static cast(node: SyntaxNode): GenericBlockDeclarationAst | undefined {
     return node.kind === 'GenericBlockDeclaration'
       ? new GenericBlockDeclarationAst(node)
@@ -229,7 +254,7 @@ export class KeyValuePairAst implements AstNode {
     return findFirstChild(this.syntax, IdentifierAst.cast);
   }
 
-  equals(): Token | undefined {
+  equals(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Equals');
   }
 
@@ -288,7 +313,7 @@ export class NamedTypeDeclarationAst implements AstNode {
     return findFirstChild(this.syntax, IdentifierAst.cast);
   }
 
-  equals(): Token | undefined {
+  equals(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Equals');
   }
 

package/src/syntax/ast/expressions.ts

@@ -1,7 +1,6 @@
-import type { Token } from '../../tokenizer';
 import type { AstNode } from '../ast-helpers';
 import { filterChildren, findChildToken, findFirstChild } from '../ast-helpers';
-import { SyntaxNode } from '../red';
+import { SyntaxNode, type SyntaxToken } from '../red';
 import { IdentifierAst } from './identifier';
 import { QualifiedNameAst } from './qualified-name';
 
@@ -32,11 +31,11 @@ export class FunctionCallAst implements AstNode {
     return segments;
   }
 
-  lparen(): Token | undefined {
+  lparen(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'LParen');
   }
 
-  rparen(): Token | undefined {
+  rparen(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'RParen');
   }
 
@@ -56,11 +55,11 @@ export class ArrayLiteralAst implements AstNode {
     this.syntax = syntax;
   }
 
-  lbracket(): Token | undefined {
+  lbracket(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'LBracket');
   }
 
-  rbracket(): Token | undefined {
+  rbracket(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'RBracket');
   }
 
@@ -156,7 +155,7 @@ export class StringLiteralExprAst implements AstNode {
     this.syntax = syntax;
   }
 
-  token(): Token | undefined {
+  token(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'StringLiteral');
   }
 
@@ -178,7 +177,7 @@ export class NumberLiteralExprAst implements AstNode {
     this.syntax = syntax;
   }
 
-  token(): Token | undefined {
+  token(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'NumberLiteral');
   }
 
@@ -200,7 +199,7 @@ export class BooleanLiteralExprAst implements AstNode {
     this.syntax = syntax;
   }
 
-  token(): Token | undefined {
+  token(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Ident');
   }
 
@@ -224,11 +223,11 @@ export class ObjectLiteralExprAst implements AstNode {
     this.syntax = syntax;
   }
 
-  lbrace(): Token | undefined {
+  lbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'LBrace');
   }
 
-  rbrace(): Token | undefined {
+  rbrace(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'RBrace');
   }
 
@@ -279,7 +278,7 @@ export class ObjectFieldAst implements AstNode {
     return undefined;
   }
 
-  colon(): Token | undefined {
+  colon(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Colon');
   }
 
@@ -339,7 +338,7 @@ export class AttributeArgAst implements AstNode {
     return findFirstChild(this.syntax, IdentifierAst.cast);
   }
 
-  colon(): Token | undefined {
+  colon(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Colon');
   }
 

package/src/syntax/ast/identifier.ts

@@ -1,7 +1,6 @@
-import type { Token } from '../../tokenizer';
 import type { AstNode } from '../ast-helpers';
 import { findChildToken } from '../ast-helpers';
-import type { SyntaxNode } from '../red';
+import type { SyntaxNode, SyntaxToken } from '../red';
 
 export class IdentifierAst implements AstNode {
   readonly syntax: SyntaxNode;
@@ -10,7 +9,7 @@ export class IdentifierAst implements AstNode {
     this.syntax = syntax;
   }
 
-  token(): Token | undefined {
+  token(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Ident');
   }
 

package/src/syntax/ast/qualified-name.ts

@@ -1,7 +1,6 @@
-import type { Token } from '../../tokenizer';
 import type { AstNode } from '../ast-helpers';
 import { filterChildren, findChildToken, findFirstChild } from '../ast-helpers';
-import { SyntaxNode } from '../red';
+import { SyntaxNode, type SyntaxToken } from '../red';
 import { IdentifierAst } from './identifier';
 
 /** A namespace-qualified name, e.g. `pgvector.Vector` or `supabase:auth.User`. */
@@ -12,22 +11,20 @@ export class QualifiedNameAst implements AstNode {
     this.syntax = syntax;
   }
 
-  #lastSegment(): IdentifierAst | undefined {
-    let last: IdentifierAst | undefined;
+  #segmentBefore(boundary: number): IdentifierAst | undefined {
+    let found: IdentifierAst | undefined;
     for (const segment of filterChildren(this.syntax, IdentifierAst.cast)) {
-      last = segment;
+      if (segment.syntax.offset >= boundary) break;
+      found = segment;
     }
-    return last;
+    return found;
   }
 
-  #penultimateSegment(): IdentifierAst | undefined {
-    let last: IdentifierAst | undefined;
-    let penultimate: IdentifierAst | undefined;
+  #segmentAfter(boundary: number): IdentifierAst | undefined {
     for (const segment of filterChildren(this.syntax, IdentifierAst.cast)) {
-      penultimate = last;
-      last = segment;
+      if (segment.syntax.offset > boundary) return segment;
     }
-    return penultimate;
+    return undefined;
   }
 
   #separatorCount(kind: 'Dot' | 'Colon'): number {
@@ -38,26 +35,32 @@ export class QualifiedNameAst implements AstNode {
     return count;
   }
 
-  colon(): Token | undefined {
+  colon(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Colon');
   }
 
-  dot(): Token | undefined {
+  dot(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Dot');
   }
 
   space(): IdentifierAst | undefined {
-    if (!this.colon()) return undefined;
-    return findFirstChild(this.syntax, IdentifierAst.cast);
+    const colon = this.colon();
+    if (!colon) return undefined;
+    return this.#segmentBefore(colon.offset);
   }
 
   namespace(): IdentifierAst | undefined {
-    if (!this.dot()) return undefined;
-    return this.#penultimateSegment();
+    const dot = this.dot();
+    if (!dot) return undefined;
+    return this.#segmentBefore(dot.offset);
   }
 
   identifier(): IdentifierAst | undefined {
-    return this.#lastSegment();
+    const dot = this.dot();
+    if (dot) return this.#segmentAfter(dot.offset);
+    const colon = this.colon();
+    if (colon) return this.#segmentAfter(colon.offset);
+    return findFirstChild(this.syntax, IdentifierAst.cast);
   }
 
   /**

package/src/syntax/ast/type-annotation.ts

@@ -1,7 +1,6 @@
-import type { Token } from '../../tokenizer';
 import type { AstNode } from '../ast-helpers';
 import { findChildToken, findFirstChild } from '../ast-helpers';
-import type { SyntaxNode } from '../red';
+import type { SyntaxNode, SyntaxToken } from '../red';
 import { AttributeArgListAst } from './attributes';
 import { QualifiedNameAst } from './qualified-name';
 
@@ -26,15 +25,15 @@ export class TypeAnnotationAst implements AstNode {
     return this.argList() !== undefined;
   }
 
-  lbracket(): Token | undefined {
+  lbracket(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'LBracket');
   }
 
-  rbracket(): Token | undefined {
+  rbracket(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'RBracket');
   }
 
-  questionMark(): Token | undefined {
+  questionMark(): SyntaxToken | undefined {
     return findChildToken(this.syntax, 'Question');
   }
 

package/src/syntax/ast-helpers.ts

@@ -1,11 +1,16 @@
-import type { Token, TokenKind } from '../tokenizer';
-import { SyntaxNode } from './red';
+import type { TokenKind } from '../tokenizer';
+import { SyntaxNode, type SyntaxToken } from './red';
 
 export interface AstNode {
   readonly syntax: SyntaxNode;
 }
 
-export function findChildToken(node: SyntaxNode, kind: TokenKind): Token | undefined {
+export interface BracedBlock extends AstNode {
+  lbrace(): SyntaxToken | undefined;
+  rbrace(): SyntaxToken | undefined;
+}
+
+export function findChildToken(node: SyntaxNode, kind: TokenKind): SyntaxToken | undefined {
   for (const child of node.children()) {
     if (!(child instanceof SyntaxNode) && child.kind === kind) {
       return child;
@@ -35,6 +40,25 @@ export function* filterChildren<T>(
   }
 }
 
+type CastTarget<C> = C extends (node: SyntaxNode) => infer R ? Exclude<R, undefined> : never;
+
+export function any<Casts extends readonly ((node: SyntaxNode) => unknown)[]>(
+  ...casts: Casts
+): (node: SyntaxNode) => CastTarget<Casts[number]> | undefined;
+export function any(
+  ...casts: ReadonlyArray<(node: SyntaxNode) => unknown>
+): (node: SyntaxNode) => unknown {
+  return (node) => {
+    for (const cast of casts) {
+      const result = cast(node);
+      if (result !== undefined) {
+        return result;
+      }
+    }
+    return undefined;
+  };
+}
+
 /**
  * Raw source text of a CST node, verbatim (quotes and brackets preserved). For
  * the decoded value of a string literal, decode it instead.

package/src/syntax/navigation.ts

@@ -0,0 +1,55 @@
+import type { TokenKind } from '../tokenizer';
+import { type SyntaxElement, SyntaxToken } from './red';
+
+/** Direction of a sibling/token walk. */
+export type Direction = 'next' | 'prev';
+
+const TRIVIA_KINDS: ReadonlySet<TokenKind> = new Set<TokenKind>([
+  'Whitespace',
+  'Newline',
+  'Comment',
+]);
+
+/** Whether a token kind is trivia (whitespace, newline, or comment). */
+export function isTriviaKind(kind: TokenKind): boolean {
+  return TRIVIA_KINDS.has(kind);
+}
+
+/** Whether a token is trivia. */
+export function isTrivia(token: SyntaxToken): boolean {
+  return isTriviaKind(token.kind);
+}
+
+/**
+ * The first non-trivia token at or beyond `token` in `direction`. Returns
+ * `token` itself when it is already significant.
+ */
+export function skipTriviaToken(token: SyntaxToken, direction: Direction): SyntaxToken | undefined {
+  let current: SyntaxToken | undefined = token;
+  while (current !== undefined && isTrivia(current)) {
+    current = direction === 'next' ? current.nextToken : current.prevToken;
+  }
+  return current;
+}
+
+/**
+ * The nearest sibling of `element` (within the same parent) in `direction` that
+ * is not a trivia token. Nodes are always significant.
+ */
+export function nonTriviaSibling(
+  element: SyntaxElement,
+  direction: Direction,
+): SyntaxElement | undefined {
+  let sibling = step(element, direction);
+  while (sibling !== undefined) {
+    if (!(sibling instanceof SyntaxToken) || !isTrivia(sibling)) {
+      return sibling;
+    }
+    sibling = step(sibling, direction);
+  }
+  return undefined;
+}
+
+function step(element: SyntaxElement, direction: Direction): SyntaxElement | undefined {
+  return direction === 'next' ? element.nextSiblingOrToken : element.prevSiblingOrToken;
+}