@dbml/parse 7.0.0-alpha.0 → 7.0.0-alpha.1

package/dist/src/compiler/index.d.ts

@@ -3,10 +3,10 @@ import { SyntaxToken } from '../core/lexer/tokens';
 import { Database } from '../core/interpreter/types';
 import { default as Report } from '../core/report';
 import { DBMLCompletionItemProvider, DBMLDefinitionProvider, DBMLReferencesProvider, DBMLDiagnosticsProvider } from '../services/index';
-import { TextEdit, TableNameInput } from './queries/transform';
+import { TextEdit, TableNameInput, DiagramViewSyncOperation, DiagramViewBlock } from './queries/transform';
 import { splitQualifiedIdentifier, unescapeString, escapeString, formatRecordValue, isValidIdentifier, addDoubleQuoteIfNeeded } from './queries/utils';
 export { ScopeKind } from './types';
-export type { TextEdit, TableNameInput };
+export type { TextEdit, TableNameInput, DiagramViewSyncOperation, DiagramViewBlock };
 export { splitQualifiedIdentifier, unescapeString, escapeString, formatRecordValue, isValidIdentifier, addDoubleQuoteIfNeeded };
 export default class Compiler {
     private source;
@@ -17,6 +17,11 @@ export default class Compiler {
     private query;
     private interpret;
     renameTable(oldName: TableNameInput, newName: TableNameInput): string;
+    syncDiagramView(operations: DiagramViewSyncOperation[], blocks?: DiagramViewBlock[]): {
+        newDbml: string;
+        edits: TextEdit[];
+    };
+    findDiagramViewBlocks(): DiagramViewBlock[];
     applyTextEdits(edits: TextEdit[]): string;
     readonly token: {
         invalidStream: () => readonly SyntaxToken[];

package/dist/src/compiler/queries/transform/applyTextEdits.d.ts

@@ -10,4 +10,4 @@ export interface TextEdit {
  * @param edits - Array of text edits to apply
  * @returns The modified source string with all edits applied
  */
-export declare function applyTextEdits(source: string, edits: TextEdit[]): string;
+export declare function applyTextEdits(source: string, edits: TextEdit[], sorted?: boolean): string;

package/dist/src/compiler/queries/transform/index.d.ts

@@ -1,3 +1,4 @@
 export { renameTable } from './renameTable';
 export { applyTextEdits, type TextEdit } from './applyTextEdits';
 export { type TableNameInput } from './utils';
+export { syncDiagramView, findDiagramViewBlocks, type DiagramViewSyncOperation, type DiagramViewBlock } from './syncDiagramView';

package/dist/src/compiler/queries/transform/syncDiagramView.d.ts

@@ -1,3 +1,4 @@
+import { TextEdit } from './applyTextEdits';
 export interface DiagramViewSyncOperation {
     operation: 'create' | 'update' | 'delete';
     name: string;
@@ -18,13 +19,21 @@ export interface DiagramViewSyncOperation {
         }> | null;
     };
 }
+export interface DiagramViewBlock {
+    name: string;
+    startIndex: number;
+    endIndex: number;
+}
+export declare function findDiagramViewBlocks(source: string): DiagramViewBlock[];
 /**
  * Synchronizes DiagramView blocks in DBML source code.
  *
  * @param dbml - The original DBML source code
  * @param operations - Array of operations to apply (create, update, delete)
- * @returns Object containing the new DBML source code
+ * @param blocks - Optional pre-parsed blocks from findDiagramViewBlocks. If not provided, parses internally.
+ * @returns Object containing the new DBML source code and the text edits applied
  */
-export declare function syncDiagramView(dbml: string, operations: DiagramViewSyncOperation[]): {
+export declare function syncDiagramView(dbml: string, operations: DiagramViewSyncOperation[], blocks?: DiagramViewBlock[]): {
     newDbml: string;
+    edits: TextEdit[];
 };

package/dist/src/core/analyzer/validator/elementValidators/checks.d.ts

@@ -1,5 +1,5 @@
 import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { ElementDeclarationNode } from '../../../parser/nodes';
 import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
@@ -11,7 +11,10 @@ export default class ChecksValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/elementValidators/custom.d.ts

@@ -1,4 +1,4 @@
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../parser/nodes';
 import { default as SymbolFactory } from '../../symbol/factory';
 import { SyntaxToken } from '../../../lexer/tokens';
@@ -11,7 +11,10 @@ export default class CustomValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/elementValidators/diagramView.d.ts

@@ -11,14 +11,20 @@ export default class DiagramViewValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;
     registerElement(): CompileError[];
     private validateSettingList;
-    validateBody(body?: FunctionApplicationNode | BlockExpressionNode): (CompileError | CompileWarning)[];
-    validateFields(fields: FunctionApplicationNode[]): (CompileError | CompileWarning)[];
+    validateBody(body?: FunctionApplicationNode | BlockExpressionNode): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
+    validateFields(fields: FunctionApplicationNode[]): CompileError[];
     private validateSubElements;
     private validateSubBlock;
     registerSubBlockFields(sub: ElementDeclarationNode): CompileError[];

package/dist/src/core/analyzer/validator/elementValidators/enum.d.ts

@@ -1,5 +1,5 @@
 import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode, ListExpressionNode } from '../../../parser/nodes';
 import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
@@ -11,7 +11,10 @@ export default class EnumValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/elementValidators/indexes.d.ts

@@ -1,5 +1,5 @@
 import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { ElementDeclarationNode, SyntaxNode } from '../../../parser/nodes';
 import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
@@ -11,7 +11,10 @@ export default class IndexesValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/elementValidators/note.d.ts

@@ -1,5 +1,5 @@
 import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../parser/nodes';
 import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
@@ -11,7 +11,10 @@ export default class NoteValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/elementValidators/project.d.ts

@@ -1,5 +1,5 @@
 import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../parser/nodes';
 import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
@@ -11,7 +11,10 @@ export default class ProjectValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/elementValidators/records.d.ts

@@ -1,5 +1,5 @@
 import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode } from '../../../parser/nodes';
 import { SyntaxToken } from '../../../lexer/tokens';
 import { ElementValidator } from '../types';
@@ -11,7 +11,10 @@ export default class RecordsValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateTopLevelName;

package/dist/src/core/analyzer/validator/elementValidators/ref.d.ts

@@ -1,6 +1,6 @@
 import { SyntaxToken } from '../../../lexer/tokens';
 import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { BlockExpressionNode, ElementDeclarationNode, FunctionApplicationNode, ListExpressionNode } from '../../../parser/nodes';
 import { ElementValidator } from '../types';
 import { default as SymbolTable } from '../../symbol/symbolTable';
@@ -11,7 +11,10 @@ export default class RefValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/elementValidators/table.d.ts

@@ -1,5 +1,5 @@
 import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { BlockExpressionNode, ElementDeclarationNode, ExpressionNode, FunctionApplicationNode } from '../../../parser/nodes';
 import { ElementValidator } from '../types';
 import { SyntaxToken } from '../../../lexer/tokens';
@@ -11,7 +11,10 @@ export default class TableValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/elementValidators/tableGroup.d.ts

@@ -1,4 +1,4 @@
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { ElementValidator } from '../types';
 import { default as SymbolTable } from '../../symbol/symbolTable';
 import { SyntaxToken } from '../../../lexer/tokens';
@@ -11,7 +11,10 @@ export default class TableGroupValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/elementValidators/tablePartial.d.ts

@@ -1,5 +1,5 @@
 import { default as SymbolFactory } from '../../symbol/factory';
-import { CompileError } from '../../../errors';
+import { CompileError, CompileWarning } from '../../../errors';
 import { BlockExpressionNode, ElementDeclarationNode, ExpressionNode, FunctionApplicationNode } from '../../../parser/nodes';
 import { ElementValidator } from '../types';
 import { SyntaxToken } from '../../../lexer/tokens';
@@ -11,7 +11,10 @@ export default class TablePartialValidator implements ElementValidator {
     constructor(declarationNode: ElementDeclarationNode & {
         type: SyntaxToken;
     }, publicSymbolTable: SymbolTable, symbolFactory: SymbolFactory);
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
     private validateContext;
     private validateName;
     private validateAlias;

package/dist/src/core/analyzer/validator/types.d.ts

@@ -1,4 +1,7 @@
-import { CompileError } from '../../errors';
+import { CompileError, CompileWarning } from '../../errors';
 export interface ElementValidator {
-    validate(): CompileError[];
+    validate(): {
+        errors: CompileError[];
+        warnings: CompileWarning[];
+    };
 }

package/dist/src/core/interpreter/types.d.ts

@@ -34,10 +34,6 @@ export interface DiagramView {
     schemaName: string | null;
     visibleEntities: FilterConfig;
     token: TokenPosition;
-    /** Internal: tracks which dims used explicit wildcard (*). Stripped before output. */
-    _explicitWildcards?: Set<string>;
-    /** Internal: tracks which dims were explicitly declared in the DBML. Stripped before output. */
-    _explicitlySet?: Set<string>;
 }
 export interface InterpreterDatabase {
     schema: [];
@@ -59,7 +55,9 @@ export interface InterpreterDatabase {
     recordsElements: ElementDeclarationNode[];
     cachedMergedTables: Map<Table, Table>;
     source: string;
-    diagramViews?: Map<ElementDeclarationNode, DiagramView>;
+    diagramViews: Map<ElementDeclarationNode, DiagramView>;
+    diagramViewWildcards: Map<DiagramView, Set<string>>;
+    diagramViewExplicitlySet: Map<DiagramView, Set<string>>;
 }
 export type RecordValueType = 'string' | 'bool' | 'integer' | 'real' | 'date' | 'time' | 'datetime' | string;
 export interface RecordValue {

package/dist/src/core/lexer/tokens.d.ts

@@ -23,7 +23,8 @@ export declare enum SyntaxTokenKind {
     SEMICOLON = "<semicolon>",
     COLON = "<colon>",
     SINGLE_LINE_COMMENT = "<single-line-comment>",
-    MULTILINE_COMMENT = "<multiline-comment>"
+    MULTILINE_COMMENT = "<multiline-comment>",
+    WILDCARD = "<wildcard>"
 }
 export declare function isTriviaToken(token: SyntaxToken): boolean;
 export declare function isOp(c?: string): boolean;

package/dist/src/core/parser/nodes.d.ts

@@ -39,6 +39,7 @@ export declare enum SyntaxNodeKind {
     PRIMARY_EXPRESSION = "<primary-expression>",
     GROUP_EXPRESSION = "<group-expression>",
     COMMA_EXPRESSION = "<comma-expression>",
+    WILDCARD = "<wildcard>",
     EMPTY = "<dummy>",
     ARRAY = "<array>"
 }
@@ -192,6 +193,12 @@ export declare class LiteralNode extends SyntaxNode {
         literal?: SyntaxToken;
     }, id: SyntaxNodeId);
 }
+export declare class WildcardNode extends SyntaxNode {
+    token?: SyntaxToken;
+    constructor({ token }: {
+        token?: SyntaxToken;
+    }, id: SyntaxNodeId);
+}
 export declare class VariableNode extends SyntaxNode {
     variable?: SyntaxToken;
     constructor({ variable }: {

package/dist/src/core/parser/utils.d.ts

@@ -29,6 +29,7 @@ export declare function isExpressionAVariableNode(value?: unknown): value is Pri
         variable: SyntaxToken;
     };
 };
+export declare function isWildcardExpression(node: SyntaxNode | undefined): boolean;
 export declare function isExpressionAnIdentifierNode(value?: unknown): value is PrimaryExpressionNode & {
     expression: VariableNode & {
         variable: {

package/dist/src/index.d.ts

@@ -8,7 +8,7 @@ export { CompileError, CompileErrorCode, } from './core/errors';
 export { type Position, } from './core/types';
 export { ScopeKind, splitQualifiedIdentifier, unescapeString, escapeString, formatRecordValue, isValidIdentifier, addDoubleQuoteIfNeeded, } from './compiler/index';
 export { type Database, type Table, type Column, type Enum, type Ref, type Project, type TableGroup, type TablePartial, type DiagramView, type FilterConfig, } from './core/interpreter/types';
-export { syncDiagramView } from './compiler/queries/transform/syncDiagramView';
-export type { DiagramViewSyncOperation } from './compiler/queries/transform/syncDiagramView';
+export type { DiagramViewSyncOperation, DiagramViewBlock } from './compiler/queries/transform/syncDiagramView';
+export type { TextEdit } from './compiler/queries/transform/applyTextEdits';
 export { dbmlMonarchTokensProvider } from './services/monarch';
 export { Compiler, services };

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/parse",
-  "version": "7.0.0-alpha.0",
+  "version": "7.0.0-alpha.1",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -45,5 +45,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "cb925c52bc255aa63688dc04db48f2ad5d7129c9"
+  "gitHead": "283f3bcf7373ecab1e808e8a8035ce906ee6a52e"
 }